diff --git a/Assets/arts/atlas/ui/battle.asset b/Assets/arts/atlas/ui/battle.asset index 3a7431d56..933a7589f 100644 --- a/Assets/arts/atlas/ui/battle.asset +++ b/Assets/arts/atlas/ui/battle.asset @@ -192,6 +192,8 @@ MonoBehaviour: - {fileID: 21300000, guid: de67ff43cf9c86c46be7127c2fb7cc84, type: 3} - {fileID: 21300000, guid: 77026c4d6ad5e0f4d941920a0ef3f272, type: 3} - {fileID: 21300000, guid: 1421585b364b1fb4ab0d951bb5d0f35d, type: 3} + - {fileID: 21300000, guid: ba80f2cd1f8314aa3b65b43f62bcb396, type: 3} + - {fileID: 21300000, guid: 5d98d89ce33614fc2a5d89c31d20a850, type: 3} - {fileID: 21300000, guid: 9bb2f10b15aa44a4fa22ec0655146511, type: 3} - {fileID: 21300000, guid: 95cd17a5a247f4ebfa4b9c50ef1be9b2, type: 3} - {fileID: 21300000, guid: be484dcfccac44f48bece88cc9294c8f, type: 3} @@ -201,4 +203,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3} - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - spriteNameList: 49a2b2e673ef759674ef7596be18769666b70a59de354ed3128678961386789614867896158678961686789617867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed3e5354ed3e6354ed37d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a667213652f396c3f22b5421523b5421537aa723a477b8a9601d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e6993388ac76fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686c3bd7e2dfa4afbba06a2996ce6b2996ce6c2996ce6d2996ce3c74a00aa27677cff90ee7ab9afa36db9bfa36db9cfa36db0196263e0b488cc50c488cc5029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2006bb0e7016bb0e7415abdf4495bbdf4c767bdf4948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f9082d7adbdc7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b3523268edc03869edc03827d43a4dcd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c978c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6 + spriteNameList: 49a2b2e673ef759674ef7596be18769666b70a59de354ed3128678961386789614867896158678961686789617867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed3e5354ed3e6354ed37d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a667213652f396c3f22b5421523b5421537aa723a477b8a9601d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e6993388ac76fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686c3bd7e2dfa4afbba06a2996ce6b2996ce6c2996ce6d2996ce3c74a00aa27677cff90ee7ab9afa36db9bfa36db9cfa36db0196263e0b488cc50c488cc5029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2006bb0e7016bb0e7415abdf4495bbdf4c767bdf4948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f9082d7adbdc7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b3523268edc03869edc03827d43a4dcd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c97a0c7eae2a1c7eae28c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6 diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index 445710eab..8d1380def 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -202,6 +202,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 13d42d3c15e8e404fbab8e5ea5dfa174, type: 3} - {fileID: 21300000, guid: 0251428c4fe5b4170a1c5828842659d6, type: 3} - {fileID: 21300000, guid: 67bbbb8c1478fd2499c68c245a3aadcf, type: 3} + - {fileID: 21300000, guid: 5d98d89ce33614fc2a5d89c31d20a850, type: 3} - {fileID: 21300000, guid: fb021e9c9325c3b47ade91fa2d9941b5, type: 3} - {fileID: 21300000, guid: 02e087bccc0cfff4a8e3c03bf0cf9e8b, type: 3} - {fileID: 21300000, guid: 9fb63dbcd013f7b48af38385f1ae4f2e, type: 3} @@ -217,6 +218,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 5f8fc78dee9091c49b9e25119348de4e, type: 3} - {fileID: 21300000, guid: 6b4e4c9d2a3764af8a4909bb386ca50b, type: 3} - {fileID: 21300000, guid: ccdd0fbd8c994c949b4ec8cd609f07df, type: 3} + - {fileID: 21300000, guid: ba80f2cd1f8314aa3b65b43f62bcb396, type: 3} - {fileID: 21300000, guid: b772dddd9774a044baf891b0c0c1af8a, type: 3} - {fileID: 21300000, guid: 244d7eed152c55143a86488b35612615, type: 3} - {fileID: 21300000, guid: 6dfca10eb924ea54683c3961dad94d26, type: 3} @@ -391,6 +393,7 @@ SpriteAtlas: - battle_progress1 - battle_bag_2 - battle_skill_bg_red_2 + - battle_x2 - battle_hinder_30 - battle_obstacle_altar_1 - battle_hinder_18 @@ -406,6 +409,7 @@ SpriteAtlas: - battle_obstacle_stump_1 - battle_rouge_board_2 - battle_hinder_13 + - battle_x1 - battle_star_1 - battle_obstacle_ice - battle_obstacle_stump_2 diff --git a/Assets/arts/textures/ui/battle/battle_x1.png b/Assets/arts/textures/ui/battle/battle_x1.png new file mode 100755 index 000000000..dbe287457 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_x1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_x1.png.meta b/Assets/arts/textures/ui/battle/battle_x1.png.meta new file mode 100644 index 000000000..5f472a46b --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_x1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: ba80f2cd1f8314aa3b65b43f62bcb396 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/battle_x2.png b/Assets/arts/textures/ui/battle/battle_x2.png new file mode 100755 index 000000000..20b3cc665 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_x2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_x2.png.meta b/Assets/arts/textures/ui/battle/battle_x2.png.meta new file mode 100644 index 000000000..3ebbe90d4 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_x2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 5d98d89ce33614fc2a5d89c31d20a850 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index 09a94b368..074f699d4 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index fd9a833e8..c00ee715e 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller_boss_rush.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller_boss_rush.lua.bytes index 8ca544d55..ec1be6861 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller_boss_rush.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller_boss_rush.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes index 8fba02a93..4852541cb 100644 Binary files a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes b/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes index 15248b3a2..56c544abd 100644 Binary files a/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes and b/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/talent/talent_data.lua.bytes b/Assets/lua/app/userdata/talent/talent_data.lua.bytes index dfd92f50d..9d03ebd5d 100644 Binary files a/Assets/lua/app/userdata/talent/talent_data.lua.bytes and b/Assets/lua/app/userdata/talent/talent_data.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 00eae796d..af575b9de 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -135,6 +135,97 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &38436438371506524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6065502693675182359} + - component: {fileID: 328386549500582503} + - component: {fileID: 2059316517023669346} + - component: {fileID: 6087645317145312611} + m_Layer: 5 + m_Name: speed_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6065502693675182359 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38436438371506524} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4936881365129531815} + m_Father: {fileID: 1493758059695593667} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -314, y: -271} + m_SizeDelta: {x: 58, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &328386549500582503 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38436438371506524} + m_CullTransparentMesh: 1 +--- !u!114 &2059316517023669346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38436438371506524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 111fa2e75dc3d47c0bad6dce4490f997, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6087645317145312611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38436438371506524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &46138973104376126 GameObject: m_ObjectHideFlags: 0 @@ -2028,6 +2119,7 @@ RectTransform: - {fileID: 8641367425872377614} - {fileID: 1979107619555914757} - {fileID: 7034394388240418356} + - {fileID: 6065502693675182359} m_Father: {fileID: 4165930251451731960} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7123,6 +7215,82 @@ MonoBehaviour: m_FillDirection: 0 m_Value: 1 m_FillCenter: 1 +--- !u!1 &4208169014728886542 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4936881365129531815} + - component: {fileID: 7781863473600245521} + - component: {fileID: 4377886877532850557} + m_Layer: 5 + m_Name: img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4936881365129531815 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4208169014728886542} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6065502693675182359} + 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: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7781863473600245521 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4208169014728886542} + m_CullTransparentMesh: 1 +--- !u!114 &4377886877532850557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4208169014728886542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: ba80f2cd1f8314aa3b65b43f62bcb396, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4328396571218154100 GameObject: m_ObjectHideFlags: 0 @@ -15332,6 +15500,14 @@ MonoBehaviour: hashName: 4025019357 objectType: 0 gameObject: {fileID: 7633637597024204544} + - name: battle_ui.top_node.speed_btn + hashName: 2900671221 + objectType: 0 + gameObject: {fileID: 38436438371506524} + - name: battle_ui.top_node.speed_btn.img + hashName: 3851073866 + objectType: 0 + gameObject: {fileID: 4208169014728886542} --- !u!114 &305814484176852896 MonoBehaviour: m_ObjectHideFlags: 0