diff --git a/Assets/Editor/Package.cs b/Assets/Editor/Package.cs index b6fe8eed5..15f9f0897 100644 --- a/Assets/Editor/Package.cs +++ b/Assets/Editor/Package.cs @@ -715,12 +715,12 @@ public class Package { CFBundleURLSchemes - fb201089202542977 + fb222326627097275 FacebookAppID - 201089202542977 + 222326627097275 FacebookClientToken 63ee45cf6edfede0ab7cd532592fb3f1 FacebookDisplayName diff --git a/Assets/arts/effects/texture/fire/fire_tom_0052.png.meta b/Assets/arts/effects/texture/fire/fire_tom_0052.png.meta index f81618cf7..b74f2d604 100644 --- a/Assets/arts/effects/texture/fire/fire_tom_0052.png.meta +++ b/Assets/arts/effects/texture/fire/fire_tom_0052.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: 6cf6d75ae4aeb0640a867d23e035c581 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 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 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/glow/spark_dzh_0001_huang.png.meta b/Assets/arts/effects/texture/glow/spark_dzh_0001_huang.png.meta index aaff3a673..8bb26e4c3 100644 --- a/Assets/arts/effects/texture/glow/spark_dzh_0001_huang.png.meta +++ b/Assets/arts/effects/texture/glow/spark_dzh_0001_huang.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 guid: 2e60b89b92dc34045bc5de3720e270e6 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,6 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -87,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/noise/fx_d_noise_014.png.meta b/Assets/arts/effects/texture/noise/fx_d_noise_014.png.meta index e24ca56cc..5a9047cc5 100644 --- a/Assets/arts/effects/texture/noise/fx_d_noise_014.png.meta +++ b/Assets/arts/effects/texture/noise/fx_d_noise_014.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 7a1c71242..cf0e8f0d4 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -1610,6 +1610,8 @@ GameObject: m_Component: - component: {fileID: 8562132437100456793} - component: {fileID: 3082504113268690477} + - component: {fileID: 2364977246809205693} + - component: {fileID: 3847492253852817566} m_Layer: 5 m_Name: combo m_TagString: Untagged @@ -1628,6 +1630,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6329628742520661660} + - {fileID: 8899478572343912982} - {fileID: 8944463091071881215} - {fileID: 4623840619513984981} - {fileID: 7748675854988229536} @@ -1658,6 +1662,40 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!223 &2364977246809205693 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023275448402990557} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3847492253852817566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023275448402990557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} + m_Name: + m_EditorClassIdentifier: + GroupOrder: 50 --- !u!1 &1039420649164977667 GameObject: m_ObjectHideFlags: 0 @@ -4106,7 +4144,7 @@ RectTransform: m_Children: - {fileID: 1675350049599137945} m_Father: {fileID: 8562132437100456793} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4536,6 +4574,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8944463091071881215} + - component: {fileID: 5805854289262406027} + - component: {fileID: 4077505711805122430} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -4558,13 +4598,47 @@ RectTransform: - {fileID: 2716395904552401380} - {fileID: 5480650971868787697} m_Father: {fileID: 8562132437100456793} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &5805854289262406027 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944962995324791259} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &4077505711805122430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944962995324791259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} + m_Name: + m_EditorClassIdentifier: + GroupOrder: 20 --- !u!1 &3982000750640371963 GameObject: m_ObjectHideFlags: 0 @@ -5914,7 +5988,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8562132437100456793} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11893,6 +11967,14 @@ MonoBehaviour: hashName: 1566250507 objectType: 0 gameObject: {fileID: 3038166334241212362} + - name: battle_ui.top_node.combo.vfx_ui_hit_b01 + hashName: 1447261330 + objectType: 2 + gameObject: {fileID: 6329628742520661661} + - name: battle_ui.top_node.combo.vfx_ui_hit_b02 + hashName: 1447261331 + objectType: 2 + gameObject: {fileID: 8899478572343912983} --- !u!114 &305814484176852896 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11919,6 +12001,10 @@ MonoBehaviour: - {fileID: 6184880896390281501} - {fileID: 5340034205836671868} - {fileID: 1212123096074296184} + - {fileID: 3847492253852817566} + - {fileID: 71845994348189431} + - {fileID: 8575182577441784083} + - {fileID: 4077505711805122430} NotchScreenNodeList: - gameObject: {fileID: 822431826545976571} adjustHeight: 0 @@ -12537,16 +12623,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &4345343870430669859 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 63153399885659567} - m_PrefabAsset: {fileID: 0} --- !u!224 &4637104479082081270 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 63153399885659567} m_PrefabAsset: {fileID: 0} +--- !u!1 &4345343870430669859 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 63153399885659567} + m_PrefabAsset: {fileID: 0} --- !u!1001 &164396171060211616 PrefabInstance: m_ObjectHideFlags: 0 @@ -12692,16 +12778,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!224 &4823950210164062713 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 164396171060211616} - m_PrefabAsset: {fileID: 0} --- !u!1 &4532191219610058284 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 164396171060211616} m_PrefabAsset: {fileID: 0} +--- !u!224 &4823950210164062713 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 164396171060211616} + m_PrefabAsset: {fileID: 0} --- !u!1001 &352145542058850513 PrefabInstance: m_ObjectHideFlags: 0 @@ -12803,6 +12889,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} +--- !u!224 &9134045761788230802 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} + m_PrefabInstance: {fileID: 352145542058850513} + m_PrefabAsset: {fileID: 0} --- !u!114 &2126919252421461927 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} @@ -12814,11 +12905,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &9134045761788230802 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} - m_PrefabInstance: {fileID: 352145542058850513} - m_PrefabAsset: {fileID: 0} --- !u!1 &7942625283249203436 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} @@ -12933,16 +13019,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} ---- !u!1 &8966627238146631254 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} - m_PrefabInstance: {fileID: 550390724268313014} - m_PrefabAsset: {fileID: 0} --- !u!224 &8776953998852728741 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} m_PrefabInstance: {fileID: 550390724268313014} m_PrefabAsset: {fileID: 0} +--- !u!1 &8966627238146631254 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} + m_PrefabInstance: {fileID: 550390724268313014} + m_PrefabAsset: {fileID: 0} --- !u!1001 &841217587773382563 PrefabInstance: m_ObjectHideFlags: 0 @@ -13044,6 +13130,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ce2b9c61135cb754891c1af3abd6920c, type: 3} +--- !u!224 &4895953385856529162 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5214448576181202089, guid: ce2b9c61135cb754891c1af3abd6920c, type: 3} + m_PrefabInstance: {fileID: 841217587773382563} + m_PrefabAsset: {fileID: 0} --- !u!1 &5074370152592619743 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5604538647499745148, guid: ce2b9c61135cb754891c1af3abd6920c, type: 3} @@ -13060,11 +13151,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &4895953385856529162 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5214448576181202089, guid: ce2b9c61135cb754891c1af3abd6920c, type: 3} - m_PrefabInstance: {fileID: 841217587773382563} - m_PrefabAsset: {fileID: 0} --- !u!223 &2038993383014701783 Canvas: m_ObjectHideFlags: 0 @@ -13338,16 +13424,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} ---- !u!224 &5787140266575255053 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4761775941995675060, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} - m_PrefabInstance: {fileID: 1316516279224691641} - m_PrefabAsset: {fileID: 0} --- !u!1 &8916792727891342590 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7636973753184493383, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} m_PrefabInstance: {fileID: 1316516279224691641} m_PrefabAsset: {fileID: 0} +--- !u!224 &5787140266575255053 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4761775941995675060, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} + m_PrefabInstance: {fileID: 1316516279224691641} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2183942131524537344 PrefabInstance: m_ObjectHideFlags: 0 @@ -13445,16 +13531,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} ---- !u!1 &1491568122669720057 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} - m_PrefabInstance: {fileID: 2183942131524537344} - m_PrefabAsset: {fileID: 0} --- !u!224 &3849460888154131319 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3108296850535892855, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} m_PrefabInstance: {fileID: 2183942131524537344} m_PrefabAsset: {fileID: 0} +--- !u!1 &1491568122669720057 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} + m_PrefabInstance: {fileID: 2183942131524537344} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2184053942115528472 PrefabInstance: m_ObjectHideFlags: 0 @@ -13552,16 +13638,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} ---- !u!224 &6654746300987298476 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4761775941995675060, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} - m_PrefabInstance: {fileID: 2184053942115528472} - m_PrefabAsset: {fileID: 0} --- !u!1 &8625706479571005535 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7636973753184493383, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} m_PrefabInstance: {fileID: 2184053942115528472} m_PrefabAsset: {fileID: 0} +--- !u!224 &6654746300987298476 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4761775941995675060, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} + m_PrefabInstance: {fileID: 2184053942115528472} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2637949698329948513 PrefabInstance: m_ObjectHideFlags: 0 @@ -13659,16 +13745,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} ---- !u!1 &3343385904249035928 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} - m_PrefabInstance: {fileID: 2637949698329948513} - m_PrefabAsset: {fileID: 0} --- !u!224 &1132939814864582166 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3108296850535892855, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} m_PrefabInstance: {fileID: 2637949698329948513} m_PrefabAsset: {fileID: 0} +--- !u!1 &3343385904249035928 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} + m_PrefabInstance: {fileID: 2637949698329948513} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2791001805797450879 PrefabInstance: m_ObjectHideFlags: 0 @@ -13780,6 +13866,128 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5453798199138334034, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} m_PrefabInstance: {fileID: 2791001805797450879} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2852916185352659568 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8562132437100456793} + m_Modifications: + - target: {fileID: -3416346208621223069, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: GroupOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_AnchoredPosition.x + value: -76 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_AnchoredPosition.y + value: -33 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6635725003137091687, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + propertyPath: m_Name + value: vfx_ui_hit_b02 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} +--- !u!114 &8575182577441784083 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -3416346208621223069, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + m_PrefabInstance: {fileID: 2852916185352659568} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899478572343912983} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &8899478572343912982 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + m_PrefabInstance: {fileID: 2852916185352659568} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8899478572343912983 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6635725003137091687, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3} + m_PrefabInstance: {fileID: 2852916185352659568} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2963387977643518837 PrefabInstance: m_ObjectHideFlags: 0 @@ -13999,16 +14207,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} ---- !u!1 &2170561876212011907 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3514605781486775174, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} - m_PrefabInstance: {fileID: 3375731392608663557} - m_PrefabAsset: {fileID: 0} --- !u!224 &8285531268570299290 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6639747425228866463, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} m_PrefabInstance: {fileID: 3375731392608663557} m_PrefabAsset: {fileID: 0} +--- !u!1 &2170561876212011907 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3514605781486775174, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} + m_PrefabInstance: {fileID: 3375731392608663557} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3382862505916376121 PrefabInstance: m_ObjectHideFlags: 0 @@ -14213,16 +14421,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} ---- !u!1 &1580384506931628838 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} - m_PrefabInstance: {fileID: 3501028591294518496} - m_PrefabAsset: {fileID: 0} --- !u!224 &1217576256522215903 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} m_PrefabInstance: {fileID: 3501028591294518496} m_PrefabAsset: {fileID: 0} +--- !u!1 &1580384506931628838 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} + m_PrefabInstance: {fileID: 3501028591294518496} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3558904395021134129 PrefabInstance: m_ObjectHideFlags: 0 @@ -14657,16 +14865,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946f25630e86bd847a044f0166fad320, type: 3} ---- !u!1 &617831506653770815 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} - m_PrefabInstance: {fileID: 3992249562554997052} - m_PrefabAsset: {fileID: 0} --- !u!224 &980076116987371206 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3} m_PrefabInstance: {fileID: 3992249562554997052} m_PrefabAsset: {fileID: 0} +--- !u!1 &617831506653770815 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} + m_PrefabInstance: {fileID: 3992249562554997052} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4049595544030705493 PrefabInstance: m_ObjectHideFlags: 0 @@ -14923,16 +15131,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!224 &9127562339067980475 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 4472511813709528290} - m_PrefabAsset: {fileID: 0} --- !u!1 &197053755942694254 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 4472511813709528290} m_PrefabAsset: {fileID: 0} +--- !u!224 &9127562339067980475 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 4472511813709528290} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4535421895216219151 PrefabInstance: m_ObjectHideFlags: 0 @@ -15034,16 +15242,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946f25630e86bd847a044f0166fad320, type: 3} ---- !u!224 &292648168670659573 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3} - m_PrefabInstance: {fileID: 4535421895216219151} - m_PrefabAsset: {fileID: 0} --- !u!1 &73365493201545484 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} m_PrefabInstance: {fileID: 4535421895216219151} m_PrefabAsset: {fileID: 0} +--- !u!224 &292648168670659573 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3} + m_PrefabInstance: {fileID: 4535421895216219151} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4594038489666354068 PrefabInstance: m_ObjectHideFlags: 0 @@ -15141,16 +15349,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} ---- !u!224 &2284125976732667563 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} - m_PrefabInstance: {fileID: 4594038489666354068} - m_PrefabAsset: {fileID: 0} --- !u!1 &1925794663858480210 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} m_PrefabInstance: {fileID: 4594038489666354068} m_PrefabAsset: {fileID: 0} +--- !u!224 &2284125976732667563 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3} + m_PrefabInstance: {fileID: 4594038489666354068} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4723091670869515410 PrefabInstance: m_ObjectHideFlags: 0 @@ -15359,16 +15567,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} ---- !u!224 &2276664580299923630 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6639747425228866463, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} - m_PrefabInstance: {fileID: 4881138132552606513} - m_PrefabAsset: {fileID: 0} --- !u!1 &8321290999223863479 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3514605781486775174, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} m_PrefabInstance: {fileID: 4881138132552606513} m_PrefabAsset: {fileID: 0} +--- !u!224 &2276664580299923630 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6639747425228866463, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} + m_PrefabInstance: {fileID: 4881138132552606513} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4886286828465214128 PrefabInstance: m_ObjectHideFlags: 0 @@ -15695,16 +15903,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} ---- !u!224 &7962067130932980051 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3108296850535892855, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} - m_PrefabInstance: {fileID: 4997889866541477412} - m_PrefabAsset: {fileID: 0} --- !u!1 &5738119019433247709 stripped GameObject: m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} m_PrefabInstance: {fileID: 4997889866541477412} m_PrefabAsset: {fileID: 0} +--- !u!224 &7962067130932980051 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3108296850535892855, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3} + m_PrefabInstance: {fileID: 4997889866541477412} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4998911100362425765 PrefabInstance: m_ObjectHideFlags: 0 @@ -15806,16 +16014,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} ---- !u!224 &1076496341155328247 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5453798199138334034, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} - m_PrefabInstance: {fileID: 4998911100362425765} - m_PrefabAsset: {fileID: 0} --- !u!1 &4398461508904942925 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8671059141782796520, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} m_PrefabInstance: {fileID: 4998911100362425765} m_PrefabAsset: {fileID: 0} +--- !u!224 &1076496341155328247 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5453798199138334034, guid: 9bfac219775267f418c78bc75c2f536b, type: 3} + m_PrefabInstance: {fileID: 4998911100362425765} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5048097995461864947 PrefabInstance: m_ObjectHideFlags: 0 @@ -15913,16 +16121,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} ---- !u!1 &8559110023124354677 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3514605781486775174, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} - m_PrefabInstance: {fileID: 5048097995461864947} - m_PrefabAsset: {fileID: 0} --- !u!224 &1885721244935482988 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6639747425228866463, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} m_PrefabInstance: {fileID: 5048097995461864947} m_PrefabAsset: {fileID: 0} +--- !u!1 &8559110023124354677 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3514605781486775174, guid: 7ad4291194d9abc4e87fbc51e6265d26, type: 3} + m_PrefabInstance: {fileID: 5048097995461864947} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5351464385034910283 PrefabInstance: m_ObjectHideFlags: 0 @@ -16068,16 +16276,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &8568562378450594759 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 5351464385034910283} - m_PrefabAsset: {fileID: 0} --- !u!224 &792115507450702866 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 5351464385034910283} m_PrefabAsset: {fileID: 0} +--- !u!1 &8568562378450594759 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 5351464385034910283} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5601310105526688421 PrefabInstance: m_ObjectHideFlags: 0 @@ -16187,16 +16395,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} ---- !u!224 &3735376932109825206 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} - m_PrefabInstance: {fileID: 5601310105526688421} - m_PrefabAsset: {fileID: 0} --- !u!1 &3924714834046088517 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} m_PrefabInstance: {fileID: 5601310105526688421} m_PrefabAsset: {fileID: 0} +--- !u!224 &3735376932109825206 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} + m_PrefabInstance: {fileID: 5601310105526688421} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5688246229370211124 PrefabInstance: m_ObjectHideFlags: 0 @@ -16342,16 +16550,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!224 &1029817523774987629 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 5688246229370211124} - m_PrefabAsset: {fileID: 0} --- !u!1 &8240790560213506744 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 5688246229370211124} m_PrefabAsset: {fileID: 0} +--- !u!224 &1029817523774987629 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 5688246229370211124} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5730118907961866331 PrefabInstance: m_ObjectHideFlags: 0 @@ -17298,16 +17506,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} ---- !u!1 &2704353607336334181 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} - m_PrefabInstance: {fileID: 6794649544159706245} - m_PrefabAsset: {fileID: 0} --- !u!224 &2316558405223436950 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} m_PrefabInstance: {fileID: 6794649544159706245} m_PrefabAsset: {fileID: 0} +--- !u!1 &2704353607336334181 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} + m_PrefabInstance: {fileID: 6794649544159706245} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6931473696039884924 PrefabInstance: m_ObjectHideFlags: 0 @@ -17405,16 +17613,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} ---- !u!1 &3586196789030832802 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5905679678307275486, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} - m_PrefabInstance: {fileID: 6931473696039884924} - m_PrefabAsset: {fileID: 0} --- !u!224 &3805452112780877915 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6124372206462679079, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} m_PrefabInstance: {fileID: 6931473696039884924} m_PrefabAsset: {fileID: 0} +--- !u!1 &3586196789030832802 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5905679678307275486, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3} + m_PrefabInstance: {fileID: 6931473696039884924} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7292576075314493597 PrefabInstance: m_ObjectHideFlags: 0 @@ -17560,15 +17768,137 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} +--- !u!1 &6456457455187257617 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 7292576075314493597} + m_PrefabAsset: {fileID: 0} --- !u!224 &2706240165845954244 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 7292576075314493597} m_PrefabAsset: {fileID: 0} ---- !u!1 &6456457455187257617 stripped +--- !u!1001 &7297353101838581832 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8562132437100456793} + m_Modifications: + - target: {fileID: -1893103426573199681, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: GroupOrder + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_AnchoredPosition.x + value: -61 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_AnchoredPosition.y + value: -36 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3644041249471915733, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + propertyPath: m_Name + value: vfx_ui_hit_b01 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} +--- !u!224 &6329628742520661660 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + m_PrefabInstance: {fileID: 7297353101838581832} + m_PrefabAsset: {fileID: 0} +--- !u!114 &71845994348189431 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -1893103426573199681, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + m_PrefabInstance: {fileID: 7297353101838581832} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6329628742520661661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6329628742520661661 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 7292576075314493597} + m_CorrespondingSourceObject: {fileID: 3644041249471915733, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3} + m_PrefabInstance: {fileID: 7297353101838581832} m_PrefabAsset: {fileID: 0} --- !u!1001 &7445218059838062246 PrefabInstance: @@ -17782,16 +18112,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 946f25630e86bd847a044f0166fad320, type: 3} ---- !u!1 &6270971405793822220 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} - m_PrefabInstance: {fileID: 7562490370736646927} - m_PrefabAsset: {fileID: 0} --- !u!224 &5912631710200966389 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3} m_PrefabInstance: {fileID: 7562490370736646927} m_PrefabAsset: {fileID: 0} +--- !u!1 &6270971405793822220 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3} + m_PrefabInstance: {fileID: 7562490370736646927} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8078068027231336684 PrefabInstance: m_ObjectHideFlags: 0 @@ -17889,16 +18219,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} ---- !u!224 &3606866461269116248 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4761775941995675060, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} - m_PrefabInstance: {fileID: 8078068027231336684} - m_PrefabAsset: {fileID: 0} --- !u!1 &1864748874822543275 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7636973753184493383, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} m_PrefabInstance: {fileID: 8078068027231336684} m_PrefabAsset: {fileID: 0} +--- !u!224 &3606866461269116248 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4761775941995675060, guid: 99e579a6c3664c845a57030a7b324b3f, type: 3} + m_PrefabInstance: {fileID: 8078068027231336684} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8559068278985568436 PrefabInstance: m_ObjectHideFlags: 0 @@ -18000,16 +18330,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} ---- !u!224 &929535894792484087 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} - m_PrefabInstance: {fileID: 8559068278985568436} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2025817585282637961 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} - m_PrefabInstance: {fileID: 8559068278985568436} - m_PrefabAsset: {fileID: 0} --- !u!114 &8043618101018578882 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} @@ -18021,6 +18341,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2025817585282637961 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} + m_PrefabInstance: {fileID: 8559068278985568436} + m_PrefabAsset: {fileID: 0} +--- !u!224 &929535894792484087 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} + m_PrefabInstance: {fileID: 8559068278985568436} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8716013083112042527 PrefabInstance: m_ObjectHideFlags: 0 @@ -18332,16 +18662,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7eedb9d145640d4480d379b31559783, type: 3} ---- !u!1 &6919387242390991868 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2000459851088434535, guid: f7eedb9d145640d4480d379b31559783, type: 3} - m_PrefabInstance: {fileID: 8918699202735449755} - m_PrefabAsset: {fileID: 0} --- !u!224 &6919387242390991869 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2000459851088434534, guid: f7eedb9d145640d4480d379b31559783, type: 3} m_PrefabInstance: {fileID: 8918699202735449755} m_PrefabAsset: {fileID: 0} +--- !u!1 &6919387242390991868 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2000459851088434535, guid: f7eedb9d145640d4480d379b31559783, type: 3} + m_PrefabInstance: {fileID: 8918699202735449755} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9118334328579025398 PrefabInstance: m_ObjectHideFlags: 0 @@ -18443,6 +18773,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} +--- !u!224 &336468674541579701 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} + m_PrefabInstance: {fileID: 9118334328579025398} + m_PrefabAsset: {fileID: 0} --- !u!114 &7488803974071522944 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} @@ -18459,11 +18794,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} m_PrefabInstance: {fileID: 9118334328579025398} m_PrefabAsset: {fileID: 0} ---- !u!224 &336468674541579701 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3} - m_PrefabInstance: {fileID: 9118334328579025398} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9162792165743446020 PrefabInstance: m_ObjectHideFlags: 0 @@ -18609,13 +18939,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &4865392249638541704 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 9162792165743446020} - m_PrefabAsset: {fileID: 0} --- !u!224 &4580959855365021277 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 9162792165743446020} m_PrefabAsset: {fileID: 0} +--- !u!1 &4865392249638541704 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 9162792165743446020} + m_PrefabAsset: {fileID: 0} diff --git a/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml b/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml index 5611f28e0..13ad0e024 100644 --- a/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml +++ b/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml @@ -21,10 +21,10 @@ - + - + diff --git a/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml b/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml index 83bcbd6e8..177e5653e 100644 --- a/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml +++ b/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml @@ -33,11 +33,11 @@ - + - +