diff --git a/Assets/arts/animations/ui/ani_node/idle.anim b/Assets/arts/animations/ui/ani_node/idle.anim index e34b49709..3db34b272 100644 --- a/Assets/arts/animations/ui/ani_node/idle.anim +++ b/Assets/arts/animations/ui/ani_node/idle.anim @@ -13,32 +13,7 @@ AnimationClip: m_UseHighQualityCurve: 1 m_RotationCurves: [] m_CompressedRotationCurves: [] - m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.8333333 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: + m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: - curve: @@ -276,6 +251,34 @@ AnimationClip: path: classID: 224 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -307,10 +310,10 @@ AnimationClip: isPPtrCurve: 0 - serializedVersion: 2 path: 0 - attribute: 4 + attribute: 1460864421 script: {fileID: 0} - typeID: 4 - customType: 4 + typeID: 224 + customType: 28 isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: @@ -607,90 +610,6 @@ AnimationClip: path: ani_node classID: 224 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: - classID: 224 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: - classID: 224 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: - classID: 224 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -837,37 +756,35 @@ AnimationClip: path: classID: 224 script: {fileID: 0} - m_EulerEditorCurves: - curve: serializedVersion: 2 - m_Curve: [] + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x + attribute: m_AnchoredPosition.x path: classID: 224 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: - classID: 224 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: - classID: 224 - script: {fileID: 0} - m_HasGenericRootTransform: 1 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index a33775b06..28c2912af 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -84,6 +84,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 0928e747552d400468dcd7ba0a5cf10a, type: 3} - {fileID: 21300000, guid: 8dac4cd77ddbe4544b8a44602bb5c9be, type: 3} - {fileID: 21300000, guid: fe261bf7aa095154c959b88cc97168f3, type: 3} + - {fileID: 21300000, guid: c2461f38eb50425419e412a32e1b2a64, type: 3} - {fileID: 21300000, guid: 79656e8810168454eabe93c524a9878a, type: 3} - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} - {fileID: 21300000, guid: 331e6bd86c6815246bbdc3582757afde, type: 3} @@ -138,6 +139,7 @@ SpriteAtlas: - battle_dec_3 - battle_skill_bg_green_1 - battle_skill_bg_red_1 + - battle_circle - stone_2 - red_1 - battle_progress_bg_1 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index d16a5492e..2083c9d19 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -72,6 +72,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - {fileID: 21300000, guid: c0d66e84bb441904390a26e5f00c0b59, type: 3} - {fileID: 21300000, guid: 4f0b41158f74bfd4a9b0ee0116ff6bb0, type: 3} + - {fileID: 21300000, guid: bf5180354d324cb4685dcfb6480b6a65, type: 3} - {fileID: 21300000, guid: 8e279276358266d4abd13f0e7fde1e50, type: 3} - {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3} - {fileID: 21300000, guid: 31c5ffb6550fe564ab9f5159f4e9a1a6, type: 3} @@ -117,6 +118,7 @@ SpriteAtlas: - common_btn_green_2 - common_btn_red_1 - common_ad_1 + - common_lock - common_btn_red_3 - common_board_1 - common_progress_2 diff --git a/Assets/arts/textures/ui/battle/battle_circle.png b/Assets/arts/textures/ui/battle/battle_circle.png new file mode 100644 index 000000000..b1479580e Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_circle.png differ diff --git a/Assets/arts/textures/ui/battle/battle_circle.png.meta b/Assets/arts/textures/ui/battle/battle_circle.png.meta new file mode 100644 index 000000000..81c91024f --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_circle.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: c2461f38eb50425419e412a32e1b2a64 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 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: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_lock.png b/Assets/arts/textures/ui/common/common_lock.png new file mode 100644 index 000000000..e6c585b6a Binary files /dev/null and b/Assets/arts/textures/ui/common/common_lock.png differ diff --git a/Assets/arts/textures/ui/common/common_lock.png.meta b/Assets/arts/textures/ui/common/common_lock.png.meta new file mode 100644 index 000000000..6369837c1 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_lock.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: bf5180354d324cb4685dcfb6480b6a65 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 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: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index 3275deb2f..4c854289a 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_manager.lua.bytes b/Assets/lua/app/module/battle/battle_manager.lua.bytes index 176453074..8de10e851 100644 Binary files a/Assets/lua/app/module/battle/battle_manager.lua.bytes and b/Assets/lua/app/module/battle/battle_manager.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes index 77f484f86..47a385b71 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_ui.lua.bytes index 5e45022ca..4ddee8184 100644 Binary files a/Assets/lua/app/ui/battle/battle_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes b/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes index 2f8232b0a..560983f8d 100644 Binary files a/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes and b/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes differ diff --git a/Assets/prefabs/effects/battle/sfx_piece_line_b01.prefab b/Assets/prefabs/effects/battle/sfx_piece_line_b01.prefab index 7a41b3289..3b0d0974d 100644 --- a/Assets/prefabs/effects/battle/sfx_piece_line_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_piece_line_b01.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 8658021691811601930} - component: {fileID: -7433871354176970415} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_line_b01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -61,7 +61,7 @@ GameObject: - component: {fileID: 6020969536548151276} - component: {fileID: 6020969536548151278} - component: {fileID: 6020969536548151277} - m_Layer: 0 + m_Layer: 5 m_Name: line01 (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4925,7 +4925,7 @@ GameObject: - component: {fileID: 6020969537275696782} - component: {fileID: 6020969537275696816} - component: {fileID: 6020969537275696783} - m_Layer: 0 + m_Layer: 5 m_Name: line01 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -9787,7 +9787,7 @@ GameObject: - component: {fileID: 6020969537708257028} - component: {fileID: 6020969537708257030} - component: {fileID: 6020969537708257029} - m_Layer: 0 + m_Layer: 5 m_Name: line01 (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -14649,7 +14649,7 @@ GameObject: - component: {fileID: 611355985573016466} - component: {fileID: 4920723364431128826} - component: {fileID: 9139158115016029458} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_line_b01 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/effects/battle/sfx_piece_qizi_b01.prefab b/Assets/prefabs/effects/battle/sfx_piece_qizi_b01.prefab index cd3591a4a..b45c46deb 100644 --- a/Assets/prefabs/effects/battle/sfx_piece_qizi_b01.prefab +++ b/Assets/prefabs/effects/battle/sfx_piece_qizi_b01.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8332921815399121636} - component: {fileID: 4581971641431841164} - component: {fileID: 363466486695330916} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -109,7 +109,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -4817,7 +4817,7 @@ GameObject: - component: {fileID: 2905176759068205164} - component: {fileID: 2905176759068205154} - component: {fileID: 2905176759068205165} - m_Layer: 0 + m_Layer: 5 m_Name: qizi01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4913,7 +4913,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -9679,7 +9679,7 @@ GameObject: - component: {fileID: 1299105822817324843} - component: {fileID: 6244641300882511241} - component: {fileID: 5815460994240492956} - m_Layer: 0 + m_Layer: 5 m_Name: Particle System (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -9775,7 +9775,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -14491,7 +14491,7 @@ GameObject: m_Component: - component: {fileID: 286257719459590012} - component: {fileID: 6279614151804708720} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b01 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/effects/battle/sfx_piece_qizi_b02.prefab b/Assets/prefabs/effects/battle/sfx_piece_qizi_b02.prefab index 68c0f947f..d25980e0a 100644 --- a/Assets/prefabs/effects/battle/sfx_piece_qizi_b02.prefab +++ b/Assets/prefabs/effects/battle/sfx_piece_qizi_b02.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 5066412340583221210} - component: {fileID: -2689647273646793911} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 8800332881566183722} + EffectDuration: -1 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 @@ -61,7 +61,7 @@ GameObject: - component: {fileID: 6915539812606859693} - component: {fileID: 3338802046554219589} - component: {fileID: 1162172747638580204} - m_Layer: 0 + m_Layer: 5 m_Name: Particle System (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -157,7 +157,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -4874,7 +4874,7 @@ GameObject: - component: {fileID: 3896461343686109762} - component: {fileID: 8800332881566183722} - component: {fileID: 4664660589043805378} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4972,7 +4972,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -9680,7 +9680,7 @@ GameObject: - component: {fileID: 7919083042407139530} - component: {fileID: 7919083042407139524} - component: {fileID: 7919083042407139531} - m_Layer: 0 + m_Layer: 5 m_Name: qizi01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -9776,7 +9776,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 diff --git a/Assets/prefabs/effects/battle/sfx_piece_qizi_b03.prefab b/Assets/prefabs/effects/battle/sfx_piece_qizi_b03.prefab index adcc9de5f..7fc980e16 100644 --- a/Assets/prefabs/effects/battle/sfx_piece_qizi_b03.prefab +++ b/Assets/prefabs/effects/battle/sfx_piece_qizi_b03.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 7785871606843763053} - component: {fileID: 8329848775738029927} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 5792310778419191709} + EffectDuration: -1 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 @@ -61,7 +61,7 @@ GameObject: - component: {fileID: 5011729214722477253} - component: {fileID: 462312815036244889} - component: {fileID: 7426615784907216566} - m_Layer: 0 + m_Layer: 5 m_Name: Particle System (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -157,7 +157,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -4874,7 +4874,7 @@ GameObject: - component: {fileID: 5162611463845176957} - component: {fileID: 5162611463845176947} - component: {fileID: 5162611463845176956} - m_Layer: 0 + m_Layer: 5 m_Name: qizi01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4970,7 +4970,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -9736,7 +9736,7 @@ GameObject: - component: {fileID: 2040263833063589109} - component: {fileID: 5792310778419191709} - component: {fileID: 7709968776239694453} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -9834,7 +9834,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 diff --git a/Assets/prefabs/effects/battle/sfx_piece_qizi_b04.prefab b/Assets/prefabs/effects/battle/sfx_piece_qizi_b04.prefab index 93d1f14ea..b20717106 100644 --- a/Assets/prefabs/effects/battle/sfx_piece_qizi_b04.prefab +++ b/Assets/prefabs/effects/battle/sfx_piece_qizi_b04.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 6378442407063986810} - component: {fileID: 4887398145996742612} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b04 m_TagString: Untagged m_Icon: {fileID: 0} @@ -45,8 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 - RootParticle: {fileID: 0} - EffectDuration: 0 + RootParticle: {fileID: 7271717578638709898} + EffectDuration: -1 AnimatorCount: 0 TrailRendererCount: 0 EulerAnglesFlip: 0 @@ -61,7 +61,7 @@ GameObject: - component: {fileID: 2677482906170451878} - component: {fileID: 6309449032504941811} - component: {fileID: 3533195814294026767} - m_Layer: 0 + m_Layer: 5 m_Name: Particle System (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -157,7 +157,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -4874,7 +4874,7 @@ GameObject: - component: {fileID: 2943179665834758114} - component: {fileID: 7271717578638709898} - component: {fileID: 6807033238262909282} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b04 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4972,7 +4972,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -9680,7 +9680,7 @@ GameObject: - component: {fileID: 8299422370762272106} - component: {fileID: 8299422370762272100} - component: {fileID: 8299422370762272107} - m_Layer: 0 + m_Layer: 5 m_Name: qizi01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -9776,7 +9776,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 diff --git a/Assets/prefabs/effects/battle/sfx_piece_qizi_b05.prefab b/Assets/prefabs/effects/battle/sfx_piece_qizi_b05.prefab index 3cb525697..e4df0fb57 100644 --- a/Assets/prefabs/effects/battle/sfx_piece_qizi_b05.prefab +++ b/Assets/prefabs/effects/battle/sfx_piece_qizi_b05.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 4882306215676873866} - component: {fileID: -7195526064189976999} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b05 m_TagString: Untagged m_Icon: {fileID: 0} @@ -61,7 +61,7 @@ GameObject: - component: {fileID: 2916876266786442857} - component: {fileID: 1412855663418918468} - component: {fileID: 9143418962815720233} - m_Layer: 0 + m_Layer: 5 m_Name: qizi01 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -157,7 +157,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -4923,7 +4923,7 @@ GameObject: - component: {fileID: 6180301115262442279} - component: {fileID: 1233702374964997133} - component: {fileID: 8779616286513150017} - m_Layer: 0 + m_Layer: 5 m_Name: Particle System (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -5019,7 +5019,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -9736,7 +9736,7 @@ GameObject: - component: {fileID: 3719391094081315090} - component: {fileID: 9200850387441384058} - component: {fileID: 4986285900632434578} - m_Layer: 0 + m_Layer: 5 m_Name: sfx_piece_qizi_b05 m_TagString: Untagged m_Icon: {fileID: 0} @@ -9834,7 +9834,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 53822c94a..242777bf6 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -1,92 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &59418107667476506 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4154023163311104814} - - component: {fileID: 8819637849262180348} - - component: {fileID: 759241008182694639} - - component: {fileID: 184482054925211119} - m_Layer: 5 - m_Name: battle_number_red - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4154023163311104814 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 59418107667476506} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4206540505599419886} - m_Father: {fileID: 492306983373432447} - m_RootOrder: 1 - 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!225 &8819637849262180348 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 59418107667476506} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!95 &759241008182694639 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 59418107667476506} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 72b249a91f8c09346b7e6483a4bf9213, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &184482054925211119 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 59418107667476506} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabList: - - name: battle_number.text_number - hashName: 4168273501 - objectType: 0 - gameObject: {fileID: 8702626040426644978} --- !u!1 &156585338589463865 GameObject: m_ObjectHideFlags: 0 @@ -565,12 +478,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8218123047022309772} - - component: {fileID: 9169016088919175857} - component: {fileID: 5571968080124832430} - component: {fileID: 2367446845432208974} - - component: {fileID: 8687072050442867506} - - component: {fileID: 7285475134766962647} - - component: {fileID: 1973265514322597013} m_Layer: 5 m_Name: board_node m_TagString: Untagged @@ -589,7 +498,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3537642348667792295} + - {fileID: 3923281239816618664} m_Father: {fileID: 8367488913663849825} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -598,20 +507,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 47} m_SizeDelta: {x: 702, y: 702} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &9169016088919175857 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 606870700976508775} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: {x: 0, y: 0, z: 0, w: 0} - m_Softness: {x: 0, y: 0} --- !u!222 &5571968080124832430 CanvasRenderer: m_ObjectHideFlags: 0 @@ -647,57 +542,6 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!223 &8687072050442867506 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 606870700976508775} - 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 &7285475134766962647 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 606870700976508775} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} - m_Name: - m_EditorClassIdentifier: - GroupOrder: 10 ---- !u!114 &1973265514322597013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 606870700976508775} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!1 &634055907447216373 GameObject: m_ObjectHideFlags: 0 @@ -1061,176 +905,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 ---- !u!1 &926735555666609420 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5302449384364047852} - m_Layer: 5 - m_Name: move_root - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5302449384364047852 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 926735555666609420} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 5117910137536204728} - m_Father: {fileID: 2849750981476695837} - m_RootOrder: 0 - 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!1 &947117176163677551 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3117968393333112413} - - component: {fileID: 9058705213107048094} - - component: {fileID: 5551225845999134715} - m_Layer: 5 - m_Name: text_number - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3117968393333112413 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 947117176163677551} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7294009457197050515} - m_RootOrder: 0 - 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: 60, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9058705213107048094 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 947117176163677551} - m_CullTransparentMesh: 1 ---- !u!114 &5551225845999134715 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 947117176163677551} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9533c5a9cf3ecb44c991c2365eab4751, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 3adaf1230473d6b4da5cc08eae75f725, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 0.06666667, g: 0.9529412, b: 0.07450981, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 0 - m_fontSizeMax: 0 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &995533560154852757 GameObject: m_ObjectHideFlags: 0 @@ -1854,7 +1528,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1634541387907647189 +--- !u!1 &1788174972612343598 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1862,31 +1536,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 492306983373432447} + - component: {fileID: 5339492179532882828} m_Layer: 5 - m_Name: cache_node + m_Name: move_root m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &492306983373432447 + m_IsActive: 1 +--- !u!224 &5339492179532882828 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634541387907647189} + m_GameObject: {fileID: 1788174972612343598} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2849750981476695837} - - {fileID: 4154023163311104814} - - {fileID: 6359500310640858107} - - {fileID: 5311779403901558058} - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 6 + - {fileID: 1548846486690487074} + - {fileID: 6628078510069900498} + m_Father: {fileID: 4850263739978489519} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2056,42 +1728,6 @@ MonoBehaviour: hashName: 10298188 objectType: 0 gameObject: {fileID: 3045301690407821396} ---- !u!1 &2527554268988441663 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4206540505599419886} - m_Layer: 5 - m_Name: move_root - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4206540505599419886 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2527554268988441663} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8680204325609691778} - m_Father: {fileID: 4154023163311104814} - m_RootOrder: 0 - 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!1 &2539305267160673479 GameObject: m_ObjectHideFlags: 0 @@ -3375,93 +3011,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 ---- !u!1 &3699395735338940180 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2849750981476695837} - - component: {fileID: 863192350366472075} - - component: {fileID: 3832871191462434809} - - component: {fileID: 1627580771684096144} - m_Layer: 5 - m_Name: battle_number - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2849750981476695837 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3699395735338940180} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 5302449384364047852} - m_Father: {fileID: 492306983373432447} - m_RootOrder: 0 - 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!225 &863192350366472075 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3699395735338940180} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!95 &3832871191462434809 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3699395735338940180} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 72b249a91f8c09346b7e6483a4bf9213, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &1627580771684096144 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3699395735338940180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabList: - - name: battle_number.text_number - hashName: 4168273501 - objectType: 0 - gameObject: {fileID: 6263993734112457852} --- !u!1 &3919187627067218253 GameObject: m_ObjectHideFlags: 0 @@ -3640,93 +3189,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 ---- !u!1 &4153686106914967176 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5311779403901558058} - - component: {fileID: 3360901496536918567} - - component: {fileID: 9060631204690986348} - - component: {fileID: 403082068980058992} - m_Layer: 5 - m_Name: battle_number_yellow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5311779403901558058 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4153686106914967176} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3643537443984404815} - m_Father: {fileID: 492306983373432447} - 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} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!225 &3360901496536918567 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4153686106914967176} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!95 &9060631204690986348 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4153686106914967176} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 72b249a91f8c09346b7e6483a4bf9213, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &403082068980058992 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4153686106914967176} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabList: - - name: battle_number.text_number - hashName: 4168273501 - objectType: 0 - gameObject: {fileID: 8318672348713658429} --- !u!1 &4164635855224637439 GameObject: m_ObjectHideFlags: 0 @@ -4782,6 +4244,111 @@ MonoBehaviour: m_FillOrigin: 2 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5394385728484818921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3923281239816618664} + - component: {fileID: 4547258755282419480} + - component: {fileID: 3229002833173420972} + - component: {fileID: 4804998204366273849} + - component: {fileID: 6579014816250551306} + m_Layer: 5 + m_Name: grid_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3923281239816618664 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5394385728484818921} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3537642348667792295} + m_Father: {fileID: 8218123047022309772} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &4547258755282419480 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5394385728484818921} + 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 &3229002833173420972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5394385728484818921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} + m_Name: + m_EditorClassIdentifier: + GroupOrder: 15 +--- !u!114 &4804998204366273849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5394385728484818921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &6579014816250551306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5394385728484818921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &5606364569955751555 GameObject: m_ObjectHideFlags: 0 @@ -5055,6 +4622,85 @@ MonoBehaviour: hashName: 210933412 objectType: 0 gameObject: {fileID: 5186993679195573861} +--- !u!1 &5754324999725931910 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6628078510069900498} + - component: {fileID: 7737170066712031785} + - component: {fileID: 8666339588536338649} + m_Layer: 5 + m_Name: text_number + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6628078510069900498 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5754324999725931910} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5339492179532882828} + m_RootOrder: 1 + 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: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7737170066712031785 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5754324999725931910} + m_CullTransparentMesh: 1 +--- !u!114 &8666339588536338649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5754324999725931910} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 40bc4ab0bf1c8484ab86eff28c6e335a, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: --- !u!1 &5920467276780448804 GameObject: m_ObjectHideFlags: 0 @@ -5631,140 +5277,6 @@ MonoBehaviour: m_FillOrigin: 2 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6263993734112457852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5117910137536204728} - - component: {fileID: 7249738031692561792} - - component: {fileID: 5225954586214533146} - m_Layer: 5 - m_Name: text_number - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5117910137536204728 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6263993734112457852} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5302449384364047852} - m_RootOrder: 0 - 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: 60, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7249738031692561792 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6263993734112457852} - m_CullTransparentMesh: 1 ---- !u!114 &5225954586214533146 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6263993734112457852} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9533c5a9cf3ecb44c991c2365eab4751, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 30855d52888604a45a8eb0d5855f3eba, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 0 - m_fontSizeMax: 0 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6286489578205876050 GameObject: m_ObjectHideFlags: 0 @@ -6060,42 +5572,6 @@ MonoBehaviour: m_FillOrigin: 2 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6623303197366216753 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3643537443984404815} - m_Layer: 5 - m_Name: move_root - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3643537443984404815 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6623303197366216753} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4992915880943224842} - m_Father: {fileID: 5311779403901558058} - m_RootOrder: 0 - 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!1 &6687135963599005916 GameObject: m_ObjectHideFlags: 0 @@ -6380,42 +5856,6 @@ MonoBehaviour: m_FillOrigin: 2 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7011523633308304517 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7294009457197050515} - m_Layer: 5 - m_Name: move_root - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7294009457197050515 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7011523633308304517} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3117968393333112413} - m_Father: {fileID: 6359500310640858107} - m_RootOrder: 0 - 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!1 &7083973346928295720 GameObject: m_ObjectHideFlags: 0 @@ -6728,6 +6168,97 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 +--- !u!1 &7215588411953724065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4850263739978489519} + - component: {fileID: 8186156159171421614} + - component: {fileID: 4919275826242974964} + - component: {fileID: 6462632266840483568} + m_Layer: 5 + m_Name: battle_number + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4850263739978489519 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7215588411953724065} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 5339492179532882828} + m_Father: {fileID: 5146938743224756479} + m_RootOrder: 0 + 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!114 &8186156159171421614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7215588411953724065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabList: + - name: battle_number.text_number + hashName: 4168273501 + objectType: 0 + gameObject: {fileID: 5754324999725931910} + - name: battle_number.text + hashName: 624010155 + objectType: 0 + gameObject: {fileID: 9095176649503462928} +--- !u!225 &4919275826242974964 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7215588411953724065} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!95 &6462632266840483568 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7215588411953724065} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 72b249a91f8c09346b7e6483a4bf9213, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &7408090117430256196 GameObject: m_ObjectHideFlags: 0 @@ -6937,93 +6468,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7482273837233188892 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6359500310640858107} - - component: {fileID: 5744288096764370499} - - component: {fileID: 820608416248822066} - - component: {fileID: 3698183127762805527} - m_Layer: 5 - m_Name: battle_number_green - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6359500310640858107 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7482273837233188892} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7294009457197050515} - m_Father: {fileID: 492306983373432447} - 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!225 &5744288096764370499 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7482273837233188892} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!95 &820608416248822066 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7482273837233188892} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 72b249a91f8c09346b7e6483a4bf9213, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &3698183127762805527 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7482273837233188892} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabList: - - name: battle_number.text_number - hashName: 4168273501 - objectType: 0 - gameObject: {fileID: 947117176163677551} --- !u!1 &7515675279893746756 GameObject: m_ObjectHideFlags: 0 @@ -7231,7 +6675,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8218123047022309772} + m_Father: {fileID: 3923281239816618664} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -7641,140 +7085,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8318672348713658429 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4992915880943224842} - - component: {fileID: 532009458719522998} - - component: {fileID: 2108365451230188704} - m_Layer: 5 - m_Name: text_number - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4992915880943224842 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8318672348713658429} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3643537443984404815} - m_RootOrder: 0 - 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: 60, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &532009458719522998 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8318672348713658429} - m_CullTransparentMesh: 1 ---- !u!114 &2108365451230188704 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8318672348713658429} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9533c5a9cf3ecb44c991c2365eab4751, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 461ba01817436fd49ae3bfc210162358, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4279822335 - m_fontColor: {r: 0.93333334, g: 0.3254902, b: 0.003921569, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 0 - m_fontSizeMax: 0 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8481230358941673083 GameObject: m_ObjectHideFlags: 0 @@ -7801,7 +7111,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 4850263739978489519} m_Father: {fileID: 4165930251451731960} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8170,140 +7481,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8702626040426644978 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8680204325609691778} - - component: {fileID: 4998130304050023780} - - component: {fileID: 4002767411646399126} - m_Layer: 5 - m_Name: text_number - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8680204325609691778 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8702626040426644978} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4206540505599419886} - m_RootOrder: 0 - 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: 60, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4998130304050023780 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8702626040426644978} - m_CullTransparentMesh: 1 ---- !u!114 &4002767411646399126 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8702626040426644978} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9533c5a9cf3ecb44c991c2365eab4751, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 0e233b02e5e872244a60f59e8a5feef1, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 0.9411765, g: 0.18431373, b: 0.18431373, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 0 - m_fontSizeMax: 0 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8727449664879014232 GameObject: m_ObjectHideFlags: 0 @@ -8430,7 +7607,6 @@ RectTransform: - {fileID: 8367488913663849825} - {fileID: 1493758059695593667} - {fileID: 2868547218605158834} - - {fileID: 492306983373432447} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8538,6 +7714,10 @@ MonoBehaviour: hashName: 96138628 objectType: 0 gameObject: {fileID: 8481230358941673083} + - name: battle_ui.battle_number_node.battle_number + hashName: 2915434950 + objectType: 1 + gameObject: {fileID: 7215588411953724065} - name: battle_ui.bg_2.skill_node hashName: 2395166643 objectType: 0 @@ -8710,22 +7890,10 @@ MonoBehaviour: hashName: 3880968030 objectType: 1 gameObject: {fileID: 2382144257696523176} - - name: battle_ui.cache_node.battle_number - hashName: 989526196 - objectType: 1 - gameObject: {fileID: 3699395735338940180} - - name: battle_ui.cache_node.battle_number_red - hashName: 3738461830 - objectType: 1 - gameObject: {fileID: 59418107667476506} - - name: battle_ui.cache_node.battle_number_green - hashName: 2059391928 - objectType: 1 - gameObject: {fileID: 7482273837233188892} - - name: battle_ui.cache_node.battle_number_yellow - hashName: 4215141983 - objectType: 1 - gameObject: {fileID: 4153686106914967176} + - name: battle_ui.bg_2.board_node.grid_node + hashName: 3304414635 + objectType: 0 + gameObject: {fileID: 5394385728484818921} --- !u!114 &305814484176852896 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8739,7 +7907,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: EffectList: - - {fileID: 7285475134766962647} + - {fileID: 3229002833173420972} - {fileID: 3446100497241661549} - {fileID: 2127627616384160167} - {fileID: 7449896261673731027} @@ -8858,6 +8026,140 @@ RectTransform: m_AnchoredPosition: {x: 306, y: -88} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9095176649503462928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1548846486690487074} + - component: {fileID: 2266706523792693693} + - component: {fileID: 5059432078774877571} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1548846486690487074 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9095176649503462928} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5339492179532882828} + m_RootOrder: 0 + 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: 40} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2266706523792693693 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9095176649503462928} + m_CullTransparentMesh: 1 +--- !u!114 &5059432078774877571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9095176649503462928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1001 &164396171060211616 PrefabInstance: m_ObjectHideFlags: 0 @@ -9150,16 +8452,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 &5688246229370211124 PrefabInstance: m_ObjectHideFlags: 0 @@ -9603,13 +8905,13 @@ 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 +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 7292576075314493597} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/battle/cell/grid_cell.prefab b/Assets/prefabs/ui/battle/cell/grid_cell.prefab index 8e88dbf37..38448afe3 100644 --- a/Assets/prefabs/ui/battle/cell/grid_cell.prefab +++ b/Assets/prefabs/ui/battle/cell/grid_cell.prefab @@ -1,5 +1,45 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &334340831019912387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9006972138829277768} + m_Layer: 5 + m_Name: effect_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9006972138829277768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334340831019912387} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4920127095859287359} + - {fileID: 1043772657509923152} + - {fileID: 4158070930525317561} + - {fileID: 3555702982026378675} + - {fileID: 394181014123432448} + m_Father: {fileID: 7856954192772629694} + m_RootOrder: 8 + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1852080090429023675 GameObject: m_ObjectHideFlags: 0 @@ -11,7 +51,7 @@ GameObject: - component: {fileID: 6203149083194507068} - component: {fileID: 4495721600529669427} - component: {fileID: 1654729621752998639} - m_Layer: 0 + m_Layer: 5 m_Name: mask m_TagString: Untagged m_Icon: {fileID: 0} @@ -86,7 +126,7 @@ GameObject: - component: {fileID: 2821193627627944689} - component: {fileID: 4308545892632040719} - component: {fileID: 8421377924459679362} - m_Layer: 0 + m_Layer: 5 m_Name: count m_TagString: Untagged m_Icon: {fileID: 0} @@ -221,8 +261,8 @@ GameObject: - component: {fileID: 89005737401758282} - component: {fileID: 7373419677804039580} - component: {fileID: 8905952255341264435} - - component: {fileID: 7320169944722716005} - m_Layer: 0 + - component: {fileID: 620084716785035260} + m_Layer: 5 m_Name: touch_node m_TagString: Untagged m_Icon: {fileID: 0} @@ -289,7 +329,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cff37445e8036d54e82348b618225833, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!95 &7320169944722716005 +--- !u!95 &620084716785035260 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 @@ -297,7 +337,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3878001127691178925} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 29eec88da5851364cbf1aa6b953ceec4, type: 2} m_CullingMode: 0 @@ -319,7 +359,7 @@ GameObject: - component: {fileID: 4945865587062973861} - component: {fileID: 7812673054034839215} - component: {fileID: 651146167238874100} - m_Layer: 0 + m_Layer: 5 m_Name: circle m_TagString: Untagged m_Icon: {fileID: 0} @@ -373,7 +413,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63805602ca8fdd74b9a1696bbe71d217, type: 3} + m_Sprite: {fileID: 21300000, guid: c2461f38eb50425419e412a32e1b2a64, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -394,7 +434,7 @@ GameObject: - component: {fileID: 2083280137994219570} - component: {fileID: 2796302420299780421} - component: {fileID: 1391648870253585208} - m_Layer: 0 + m_Layer: 5 m_Name: down_bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -469,7 +509,7 @@ GameObject: - component: {fileID: 5021351875852543974} - component: {fileID: 28783238052411172} - component: {fileID: 8280191614765845069} - m_Layer: 0 + m_Layer: 5 m_Name: middle_bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -544,7 +584,7 @@ GameObject: - component: {fileID: 4664058343642732121} - component: {fileID: 8866022764212735008} - component: {fileID: 7626910503310813174} - m_Layer: 0 + m_Layer: 5 m_Name: grid_cell m_TagString: Untagged m_Icon: {fileID: 0} @@ -632,6 +672,26 @@ MonoBehaviour: hashName: 943251518 objectType: 0 gameObject: {fileID: 5980598470212332410} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b01 + hashName: 739436676 + objectType: 2 + gameObject: {fileID: 771634827350088993} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b02 + hashName: 739436677 + objectType: 2 + gameObject: {fileID: 4651815979856621902} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b03 + hashName: 739436678 + objectType: 2 + gameObject: {fileID: 8594775965272695207} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b04 + hashName: 739436679 + objectType: 2 + gameObject: {fileID: 9199390910335989165} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b05 + hashName: 739436680 + objectType: 2 + gameObject: {fileID: 5443376147976274462} --- !u!1 &5199997431598361344 GameObject: m_ObjectHideFlags: 0 @@ -643,7 +703,7 @@ GameObject: - component: {fileID: 2711150934767594651} - component: {fileID: 3183744554188501349} - component: {fileID: 483366286163144172} - m_Layer: 0 + m_Layer: 5 m_Name: up_bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -716,7 +776,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7856954192772629694} - m_Layer: 0 + m_Layer: 5 m_Name: ani_node m_TagString: Untagged m_Icon: {fileID: 0} @@ -742,12 +802,13 @@ RectTransform: - {fileID: 7296449723806357941} - {fileID: 4945865587062973861} - {fileID: 2821193627627944689} + - {fileID: 9006972138829277768} m_Father: {fileID: 6400070175808932077} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.5999985} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7885636903725020540 @@ -761,7 +822,7 @@ GameObject: - component: {fileID: 7296449723806357941} - component: {fileID: 200150018011086864} - component: {fileID: 8174836229848617367} - m_Layer: 0 + m_Layer: 5 m_Name: obstacle m_TagString: Untagged m_Icon: {fileID: 0} @@ -836,7 +897,7 @@ GameObject: - component: {fileID: 9057446020227572761} - component: {fileID: 7258035868469557576} - component: {fileID: 209871295083655420} - m_Layer: 0 + m_Layer: 5 m_Name: skill_icon m_TagString: Untagged m_Icon: {fileID: 0} @@ -900,3 +961,510 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &5096111228827059850 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: -7195526064189976999, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: RootParticle + value: + objectReference: {fileID: 4113750755916692720} + - target: {fileID: -7195526064189976999, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: EffectDuration + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 951323769793152148, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b05 + objectReference: {fileID: 0} + - target: {fileID: 951323769793152148, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1298399236576864197, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5558369023913320574, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} +--- !u!1 &5443376147976274462 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 951323769793152148, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + m_PrefabInstance: {fileID: 5096111228827059850} + m_PrefabAsset: {fileID: 0} +--- !u!4 &394181014123432448 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4882306215676873866, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + m_PrefabInstance: {fileID: 5096111228827059850} + m_PrefabAsset: {fileID: 0} +--- !u!198 &4113750755916692720 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 9200850387441384058, guid: 3b449f6dbbb4b3140a1c7286b2dfd6b7, type: 3} + m_PrefabInstance: {fileID: 5096111228827059850} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5169904118414555715 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 944306138967655304, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2905176759068205167, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5551343696507053922, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b01 + objectReference: {fileID: 0} + - target: {fileID: 5551343696507053922, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} +--- !u!1 &771634827350088993 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5551343696507053922, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + m_PrefabInstance: {fileID: 5169904118414555715} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4920127095859287359 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 286257719459590012, guid: 052f632613cdf1441bc5ea899e239e68, type: 3} + m_PrefabInstance: {fileID: 5169904118414555715} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5202707181962182282 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: -2689647273646793911, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: RootParticle + value: + objectReference: {fileID: 3608133979226214304} + - target: {fileID: -2689647273646793911, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: EffectDuration + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 629707219938332612, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b02 + objectReference: {fileID: 0} + - target: {fileID: 629707219938332612, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5237026253527526190, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7919083042407139529, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} +--- !u!4 &1043772657509923152 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + m_PrefabInstance: {fileID: 5202707181962182282} + m_PrefabAsset: {fileID: 0} +--- !u!198 &3608133979226214304 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 8800332881566183722, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + m_PrefabInstance: {fileID: 5202707181962182282} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4651815979856621902 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 629707219938332612, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3} + m_PrefabInstance: {fileID: 5202707181962182282} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6176853476701503700 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: 2521541586979578227, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b03 + objectReference: {fileID: 0} + - target: {fileID: 2521541586979578227, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5162611463845176958, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7128877662059201945, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8329848775738029927, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: RootParticle + value: + objectReference: {fileID: 421927092208901961} + - target: {fileID: 8329848775738029927, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + propertyPath: EffectDuration + value: -1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} +--- !u!1 &8594775965272695207 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2521541586979578227, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + m_PrefabInstance: {fileID: 6176853476701503700} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4158070930525317561 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + m_PrefabInstance: {fileID: 6176853476701503700} + m_PrefabAsset: {fileID: 0} +--- !u!198 &421927092208901961 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 5792310778419191709, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3} + m_PrefabInstance: {fileID: 6176853476701503700} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7628150637597597641 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: 1618604107703265892, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b04 + objectReference: {fileID: 0} + - target: {fileID: 1618604107703265892, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4887398145996742612, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: RootParticle + value: + objectReference: {fileID: 952218896639052611} + - target: {fileID: 4887398145996742612, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: EffectDuration + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 6225913244615134862, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299422370762272105, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} +--- !u!1 &9199390910335989165 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1618604107703265892, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + m_PrefabInstance: {fileID: 7628150637597597641} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3555702982026378675 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + m_PrefabInstance: {fileID: 7628150637597597641} + m_PrefabAsset: {fileID: 0} +--- !u!198 &952218896639052611 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 7271717578638709898, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + m_PrefabInstance: {fileID: 7628150637597597641} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/common/hero_cell.prefab b/Assets/prefabs/ui/common/hero_cell.prefab index 0560ea5e4..4fcc24c65 100644 --- a/Assets/prefabs/ui/common/hero_cell.prefab +++ b/Assets/prefabs/ui/common/hero_cell.prefab @@ -243,8 +243,8 @@ RectTransform: 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: -56, y: 150} - m_SizeDelta: {x: 44, y: 44} + m_AnchoredPosition: {x: 56, y: 150} + m_SizeDelta: {x: 34, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1295362842029712067 CanvasRenderer: @@ -274,7 +274,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4f0b41158f74bfd4a9b0ee0116ff6bb0, type: 3} + m_Sprite: {fileID: 21300000, guid: bf5180354d324cb4685dcfb6480b6a65, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1