diff --git a/Assets/Artists/Arts/Icons/like_xue_microphone.png b/Assets/Artists/Arts/Icons/like_xue_microphone.png new file mode 100644 index 000000000..65721d02d Binary files /dev/null and b/Assets/Artists/Arts/Icons/like_xue_microphone.png differ diff --git a/Assets/Artists/Arts/Icons/like_xue_microphone.png.meta b/Assets/Artists/Arts/Icons/like_xue_microphone.png.meta new file mode 100644 index 000000000..2d5ed637a --- /dev/null +++ b/Assets/Artists/Arts/Icons/like_xue_microphone.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 3948f198a47dcee4f8f690d4dbcefad0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Arts/Textures/texture_selfie_wall.png b/Assets/Artists/Arts/Textures/texture_selfie_wall.png new file mode 100644 index 000000000..bd1a5407e Binary files /dev/null and b/Assets/Artists/Arts/Textures/texture_selfie_wall.png differ diff --git a/Assets/Artists/Arts/Textures/texture_selfie_wall.png.meta b/Assets/Artists/Arts/Textures/texture_selfie_wall.png.meta new file mode 100644 index 000000000..52e9acfcf --- /dev/null +++ b/Assets/Artists/Arts/Textures/texture_selfie_wall.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 340dabfa36e852047acf7fe2119a65d1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/BuyStation/NewScriptableBuyStationItemList.asset b/Assets/Artists/Configs/BuyStation/NewScriptableBuyStationItemList.asset index f3c5246f9..b4e44c10a 100644 --- a/Assets/Artists/Configs/BuyStation/NewScriptableBuyStationItemList.asset +++ b/Assets/Artists/Configs/BuyStation/NewScriptableBuyStationItemList.asset @@ -607,3 +607,19 @@ MonoBehaviour: price: 0 - scriptableItem: {fileID: 11400000, guid: 96e944813d641f24c98892f3e5249143, type: 2} price: 0 + - scriptableItem: {fileID: 11400000, guid: fc13f031330f08d4a8c8159c8e8b7911, type: 2} + price: 0 + - scriptableItem: {fileID: 11400000, guid: 1917d5d2ffcb4e942b81bc925a016fcd, type: 2} + price: 0 + - scriptableItem: {fileID: 11400000, guid: 5ef0ffa46e72cda4cbb3ac81b2551845, type: 2} + price: 0 + - scriptableItem: {fileID: 11400000, guid: 02ff77979510ae34c970c272cb1e4119, type: 2} + price: 0 + - scriptableItem: {fileID: 11400000, guid: e1653a72feb81d04b98525a303c208eb, type: 2} + price: 0 + - scriptableItem: {fileID: 11400000, guid: eb0b3e12c7a7fc34ea2644d41c80fad8, type: 2} + price: 0 + - scriptableItem: {fileID: 11400000, guid: a42c837f63bc9de4a9e662611ade4489, type: 2} + price: 0 + - scriptableItem: {fileID: 11400000, guid: 0e7bf1cc3f6fa254ab19501a4d3f10a1, type: 2} + price: 0 diff --git a/Assets/Artists/Configs/Items/Boba_01.asset b/Assets/Artists/Configs/Items/Boba_01.asset new file mode 100644 index 000000000..e00416d92 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_01.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: Boba_01 + m_EditorClassIdentifier: + id: 1280300 + displayName: + rid: 1137998481239048211 + description: + rid: 1137998481239048212 + icon: {fileID: 21300000, guid: 9f74f9db6cfda8b4e8cb72bbf81a8cfc, type: 3} + rectangleIcon: {fileID: 0} + quality: 0 + maxStack: 1 + model: {fileID: 400000, guid: e437e588ce933594abbdacbd13265a4f, type: 3} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1137998481239048211 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_01 + - rid: 1137998481239048212 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_01:description diff --git a/Assets/Artists/Configs/Items/Boba_01.asset.meta b/Assets/Artists/Configs/Items/Boba_01.asset.meta new file mode 100644 index 000000000..01173ff5c --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_01.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fc13f031330f08d4a8c8159c8e8b7911 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/Boba_02.asset b/Assets/Artists/Configs/Items/Boba_02.asset new file mode 100644 index 000000000..06d9b724f --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_02.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: Boba_02 + m_EditorClassIdentifier: + id: 1280362 + displayName: + rid: 1137998481239048213 + description: + rid: 1137998481239048214 + icon: {fileID: 21300000, guid: df6ce18e38bb9b140b1eb3571fb11b68, type: 3} + rectangleIcon: {fileID: 0} + quality: 0 + maxStack: 1 + model: {fileID: 400000, guid: fdead08e17c3bf94aa05ace51cabdc65, type: 3} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1137998481239048213 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_02 + - rid: 1137998481239048214 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_02:description diff --git a/Assets/Artists/Configs/Items/Boba_02.asset.meta b/Assets/Artists/Configs/Items/Boba_02.asset.meta new file mode 100644 index 000000000..5139e103d --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_02.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1917d5d2ffcb4e942b81bc925a016fcd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/Boba_03.asset b/Assets/Artists/Configs/Items/Boba_03.asset new file mode 100644 index 000000000..07db621a5 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_03.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: Boba_03 + m_EditorClassIdentifier: + id: 1280026 + displayName: + rid: 1137998481239048215 + description: + rid: 1137998481239048216 + icon: {fileID: 21300000, guid: 688599fb925efdd4d984c0c13c09d75d, type: 3} + rectangleIcon: {fileID: 0} + quality: 0 + maxStack: 1 + model: {fileID: 400000, guid: 92bfa3acace38fc4d99188f5f94bc6d4, type: 3} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1137998481239048215 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_03 + - rid: 1137998481239048216 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_03:description diff --git a/Assets/Artists/Configs/Items/Boba_03.asset.meta b/Assets/Artists/Configs/Items/Boba_03.asset.meta new file mode 100644 index 000000000..40c1b45b6 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_03.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ef0ffa46e72cda4cbb3ac81b2551845 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/Boba_04.asset b/Assets/Artists/Configs/Items/Boba_04.asset new file mode 100644 index 000000000..86f6114ed --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_04.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: Boba_04 + m_EditorClassIdentifier: + id: 1279964 + displayName: + rid: 1137998481239048217 + description: + rid: 1137998481239048218 + icon: {fileID: 21300000, guid: 70f5877fcc895a945bf51ed2abf09d36, type: 3} + rectangleIcon: {fileID: 0} + quality: 0 + maxStack: 1 + model: {fileID: 400000, guid: cc990cd6e14f5b243a14b72376743ccf, type: 3} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1137998481239048217 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_04 + - rid: 1137998481239048218 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_04:description diff --git a/Assets/Artists/Configs/Items/Boba_04.asset.meta b/Assets/Artists/Configs/Items/Boba_04.asset.meta new file mode 100644 index 000000000..dd1d34f13 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_04.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02ff77979510ae34c970c272cb1e4119 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/Boba_05.asset b/Assets/Artists/Configs/Items/Boba_05.asset new file mode 100644 index 000000000..007e4a1e5 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_05.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: Boba_05 + m_EditorClassIdentifier: + id: 1280916 + displayName: + rid: 1137998481239048219 + description: + rid: 1137998481239048220 + icon: {fileID: 21300000, guid: b6e10a01cda247643a80875d08409f48, type: 3} + rectangleIcon: {fileID: 0} + quality: 0 + maxStack: 1 + model: {fileID: 400000, guid: f5ea1d8f161f1c047929eb8daeb5bc36, type: 3} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1137998481239048219 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_05 + - rid: 1137998481239048220 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_05:description diff --git a/Assets/Artists/Configs/Items/Boba_05.asset.meta b/Assets/Artists/Configs/Items/Boba_05.asset.meta new file mode 100644 index 000000000..03b150e23 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_05.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1653a72feb81d04b98525a303c208eb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/Boba_06.asset b/Assets/Artists/Configs/Items/Boba_06.asset new file mode 100644 index 000000000..82ed2c835 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_06.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: Boba_06 + m_EditorClassIdentifier: + id: 1280506 + displayName: + rid: 1137998481239048221 + description: + rid: 1137998481239048222 + icon: {fileID: 21300000, guid: a9ab56a36bfbde94cbb7dc9e3cee4e4f, type: 3} + rectangleIcon: {fileID: 0} + quality: 0 + maxStack: 1 + model: {fileID: 400000, guid: 771c5baf94a4d5d40ba98335a90fe581, type: 3} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1137998481239048221 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_06 + - rid: 1137998481239048222 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_06:description diff --git a/Assets/Artists/Configs/Items/Boba_06.asset.meta b/Assets/Artists/Configs/Items/Boba_06.asset.meta new file mode 100644 index 000000000..f41d908c2 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_06.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb0b3e12c7a7fc34ea2644d41c80fad8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/Boba_07.asset b/Assets/Artists/Configs/Items/Boba_07.asset new file mode 100644 index 000000000..a13513582 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_07.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: Boba_07 + m_EditorClassIdentifier: + id: 1280650 + displayName: + rid: 1137998481239048223 + description: + rid: 1137998481239048224 + icon: {fileID: 21300000, guid: c1301c17ac21f054b946c321b50b9db2, type: 3} + rectangleIcon: {fileID: 0} + quality: 0 + maxStack: 1 + model: {fileID: 400000, guid: a2bb20100842e2440aef70d8ab844020, type: 3} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1137998481239048223 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_07 + - rid: 1137998481239048224 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_07:description diff --git a/Assets/Artists/Configs/Items/Boba_07.asset.meta b/Assets/Artists/Configs/Items/Boba_07.asset.meta new file mode 100644 index 000000000..a4c58b0f2 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_07.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a42c837f63bc9de4a9e662611ade4489 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/Items/Boba_08.asset b/Assets/Artists/Configs/Items/Boba_08.asset new file mode 100644 index 000000000..a4ffe59a6 --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_08.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1bd480dd5d8fd4487b77d0b0f56ab5, type: 3} + m_Name: Boba_08 + m_EditorClassIdentifier: + id: 1280040 + displayName: + rid: 1137998481239048225 + description: + rid: 1137998481239048226 + icon: {fileID: 21300000, guid: 9fe77af2e026c6f4ba96f209e524cef6, type: 3} + rectangleIcon: {fileID: 0} + quality: 0 + maxStack: 1 + model: {fileID: 400000, guid: d3181cf4ab4b24a4595c83bebfe1d53b, type: 3} + value: 0 + isImprovised: 0 + allowUseWhileKnocked: 0 + properties: [] + factoryProperty: [] + controllerClass: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1137998481239048225 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_08 + - rid: 1137998481239048226 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Boba_08:description diff --git a/Assets/Artists/Configs/Items/Boba_08.asset.meta b/Assets/Artists/Configs/Items/Boba_08.asset.meta new file mode 100644 index 000000000..94795e9db --- /dev/null +++ b/Assets/Artists/Configs/Items/Boba_08.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e7bf1cc3f6fa254ab19501a4d3f10a1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Artists/Configs/reference_dictionary.asset b/Assets/Artists/Configs/reference_dictionary.asset index 876777f82..f4beb589b 100644 --- a/Assets/Artists/Configs/reference_dictionary.asset +++ b/Assets/Artists/Configs/reference_dictionary.asset @@ -609,3 +609,19 @@ MonoBehaviour: Value: SM_Vitamin_01_4 - Key: 90470 Value: SM_Vitamin_01_5 + - Key: 1280300 + Value: Boba_01 + - Key: 1280362 + Value: Boba_02 + - Key: 1280026 + Value: Boba_03 + - Key: 1279964 + Value: Boba_04 + - Key: 1280916 + Value: Boba_05 + - Key: 1280506 + Value: Boba_06 + - Key: 1280650 + Value: Boba_07 + - Key: 1280040 + Value: Boba_08 diff --git a/Assets/Artists/Prefabs/Player_Base.prefab b/Assets/Artists/Prefabs/Player_Base.prefab index 61527e8ed..4548d5a9a 100644 --- a/Assets/Artists/Prefabs/Player_Base.prefab +++ b/Assets/Artists/Prefabs/Player_Base.prefab @@ -651,7 +651,7 @@ MonoBehaviour: UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"tps_model":{"_value":[7,8,9],"_name":"tps_model","_id":"10388b0b-9298-4c41-9931-18448abe463f","$type":"NodeCanvas.Framework.Variable`1[[System.Collections.Generic.List`1[[UnityEngine.Renderer, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], - mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"layer_interaction":{"_value":{"value":2081},"_name":"layer_interaction","_id":"0ff45185-aa6c-4b6f-9575-4f0320c975d9","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.LayerMask, + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"layer_interaction":{"_value":{"value":1537},"_name":"layer_interaction","_id":"0ff45185-aa6c-4b6f-9575-4f0320c975d9","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.LayerMask, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"camera_death":{"_value":10,"_name":"camera_death","_id":"c17d11ca-5a73-47c3-9b75-acca2f8a20b5","$type":"NodeCanvas.Framework.Variable`1[[Cinemachine.CinemachineVirtualCamera, Cinemachine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"player_model":{"_value":11,"_name":"player_model","_id":"77510471-a7ec-4b6c-be1d-d26d3b3e8d87","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"animator_arm":{"_value":12,"_name":"animator_arm","_id":"b575233a-16de-42f8-8a26-fd1957e56676","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Animator, @@ -722,7 +722,7 @@ MonoBehaviour: - {fileID: 3335167979914325747} - {fileID: 8157874665059077420} - {fileID: 5674568043931630013} - - _json: '{"_value":{"value":2081},"_name":"layer_interaction","_id":"0ff45185-aa6c-4b6f-9575-4f0320c975d9","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.LayerMask, + - _json: '{"_value":{"value":1537},"_name":"layer_interaction","_id":"0ff45185-aa6c-4b6f-9575-4f0320c975d9","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.LayerMask, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}' _references: [] - _json: '{"_value":1,"_name":"camera_death","_id":"c17d11ca-5a73-47c3-9b75-acca2f8a20b5","$type":"NodeCanvas.Framework.Variable`1[[Cinemachine.CinemachineVirtualCamera, diff --git a/Assets/Artists/Scripts/UX/UXEscMenu.cs b/Assets/Artists/Scripts/UX/UXEscMenu.cs index 473719b94..9c676f126 100644 --- a/Assets/Artists/Scripts/UX/UXEscMenu.cs +++ b/Assets/Artists/Scripts/UX/UXEscMenu.cs @@ -199,6 +199,7 @@ arg2.Inject(this); { _returnButton.clicked += UXService.Return; _exitButton.clicked +=()=> _gameMapService.StopMapAsync().Forget(); + _exitButton.clicked += UXService.Entry; _enableChsToggle.RegisterValueChangedCallback(x => { diff --git a/Assets/Artists/Scripts/UX/UXHud.cs b/Assets/Artists/Scripts/UX/UXHud.cs index 8debc158d..9ef1ca24a 100644 --- a/Assets/Artists/Scripts/UX/UXHud.cs +++ b/Assets/Artists/Scripts/UX/UXHud.cs @@ -131,7 +131,10 @@ namespace Net.Like.Xue.Tokyo.UX private void OnMapChanged(Guid arg1, string arg2) { - UXService.Entry(); + if (string.IsNullOrEmpty(arg2) is false) + { + UXService.Entry(); + } } protected override string DocumentPath => "ux_hud"; diff --git a/Assets/Artists/UX/App/ui_app_feed.uxml b/Assets/Artists/UX/App/ui_app_feed.uxml index cfc9d7230..00fef350b 100644 --- a/Assets/Artists/UX/App/ui_app_feed.uxml +++ b/Assets/Artists/UX/App/ui_app_feed.uxml @@ -4,11 +4,19 @@