diff --git a/Assets/arts/atlas/icon/hero.asset b/Assets/arts/atlas/icon/hero.asset index 825a50fd3..78362c619 100644 --- a/Assets/arts/atlas/icon/hero.asset +++ b/Assets/arts/atlas/icon/hero.asset @@ -28,6 +28,11 @@ MonoBehaviour: - {fileID: 21300000, guid: db9fdfeabbb947b4491573fd3066a695, type: 3} - {fileID: 21300000, guid: c0749e7b392e1e044b5a7c8cbe3d1d2e, type: 3} - {fileID: 21300000, guid: 8f0d52f5b73b61f4da2d353433c9a3eb, type: 3} + - {fileID: 21300000, guid: 859ffdecd8e7dbc4298a00723aafc515, type: 3} + - {fileID: 21300000, guid: 99828235d94f29e46aaabb3d4581a12e, type: 3} + - {fileID: 21300000, guid: ed2b401a38a042e40837b9fa4f259266, type: 3} + - {fileID: 21300000, guid: e2fb141e60a527348b9002709b19f256, type: 3} + - {fileID: 21300000, guid: eadd8d5ea71f634479a6268bba7bdfb4, type: 3} - {fileID: 21300000, guid: ea4d65d6d3df27d46b554d322c49fd49, type: 3} - {fileID: 21300000, guid: 063945c3b6adee543ada4d5f7cdd0a26, type: 3} - {fileID: 21300000, guid: ebc7d1b99efb72e4f9bd40e27de0fef6, type: 3} @@ -36,4 +41,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb4e7dbdf89792644a8941a7e107e9ce, type: 3} - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3} - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3} - spriteNameList: 310000003200000033000000340000003500000036000000370000003800000008e5a305e00dcedbe10dcedbe20dcedb68d8146369d814636ad8146384439896f59c08cbec06330037881e3238881e3239881e323a881e323b881e32 + spriteNameList: 310000003200000033000000340000003500000036000000370000003800000008e5a305e00dcedbe10dcedbe20dcedb68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cbec06330037881e3238881e3239881e323a881e323b881e32 diff --git a/Assets/arts/atlas/icon/hero.spriteatlas b/Assets/arts/atlas/icon/hero.spriteatlas index 9efd20eb3..fcfc0d09a 100644 --- a/Assets/arts/atlas/icon/hero.spriteatlas +++ b/Assets/arts/atlas/icon/hero.spriteatlas @@ -66,6 +66,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 056b0c62d8026c546bd043ae92411b15, type: 3} - {fileID: 21300000, guid: 063945c3b6adee543ada4d5f7cdd0a26, type: 3} - {fileID: 21300000, guid: 31d65db45a06f7b4f8e38cd94da730f9, type: 3} + - {fileID: 21300000, guid: 99828235d94f29e46aaabb3d4581a12e, type: 3} - {fileID: 21300000, guid: 1fac7f85b1398064bb2fe6291b431566, type: 3} - {fileID: 21300000, guid: 8f0d52f5b73b61f4da2d353433c9a3eb, type: 3} - {fileID: 21300000, guid: 5f59eb2671e1f8047bb5c912ab31a4e9, type: 3} @@ -77,12 +78,16 @@ SpriteAtlas: - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3} - {fileID: 21300000, guid: ebc7d1b99efb72e4f9bd40e27de0fef6, type: 3} - {fileID: 21300000, guid: b07e73b9fc9a6a24dab9f8d9d3a46cba, type: 3} + - {fileID: 21300000, guid: ed2b401a38a042e40837b9fa4f259266, type: 3} - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3} - {fileID: 21300000, guid: db9fdfeabbb947b4491573fd3066a695, type: 3} - {fileID: 21300000, guid: 25dfe02b2474b6b429a9405bfe8a4cbe, type: 3} - {fileID: 21300000, guid: c0749e7b392e1e044b5a7c8cbe3d1d2e, type: 3} + - {fileID: 21300000, guid: 859ffdecd8e7dbc4298a00723aafc515, type: 3} - {fileID: 21300000, guid: 72b9b64de3f480041b53bc58450bcc29, type: 3} - {fileID: 21300000, guid: bb4e7dbdf89792644a8941a7e107e9ce, type: 3} + - {fileID: 21300000, guid: e2fb141e60a527348b9002709b19f256, type: 3} + - {fileID: 21300000, guid: eadd8d5ea71f634479a6268bba7bdfb4, type: 3} - {fileID: 21300000, guid: 088f38efb568c544099a97e96b72139d, type: 3} m_PackedSpriteNamesToIndex: - 1 @@ -90,6 +95,7 @@ SpriteAtlas: - 8 - hero_fragment - 5 + - frame_small_2 - match_1 - frame_gray_4 - frame_2 @@ -101,12 +107,16 @@ SpriteAtlas: - match_4 - mask - frame_3 + - frame_small_3 - match_5 - frame_gray_2 - 7 - frame_gray_3 + - frame_small_1 - check - match_3 + - frame_small_4 + - frame_small_5 - match_2 m_RenderDataMap: {} m_Tag: hero diff --git a/Assets/arts/atlas/icon/skill_rogue.asset b/Assets/arts/atlas/icon/skill_rogue.asset index 462b0e3c7..dac65a412 100644 --- a/Assets/arts/atlas/icon/skill_rogue.asset +++ b/Assets/arts/atlas/icon/skill_rogue.asset @@ -79,9 +79,10 @@ MonoBehaviour: - {fileID: 21300000, guid: df70566076eb28945978fea59ac48903, type: 3} - {fileID: 21300000, guid: 1bc2a6469eb4c3d448cc9daf8457ead4, type: 3} - {fileID: 21300000, guid: 8742d6882ea6b4b498b99dd1d0840f21, type: 3} + - {fileID: 21300000, guid: 5822f77cebb93414ea273972af428194, type: 3} - {fileID: 21300000, guid: 3dbdd32f18ba12049889038e2bcf6f08, type: 3} - {fileID: 21300000, guid: 5b1e11b3ff3478e48abab1dd5c7929dd, type: 3} - {fileID: 21300000, guid: 1aed4e854fb09f44bad096fa624899b2, type: 3} - {fileID: 21300000, guid: 05bb3835385607a498a9d34cddab4734, type: 3} - {fileID: 21300000, guid: ee61e6e8276ad8b4dbad2f1801896b8d, type: 3} - spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f060000800600008106000082060000830600008406000085060000350000009b0600009c0600009d0600009e0600009f060000a0060000a1060000a2060000a3060000a406000036000000ba060000bb060000bc060000370000003800000039000000de0dcedbe00dcedbe10dcedbe20dcedbf118ca6ef218ca6ef318ca6ef418ca6ef518ca6e + spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f060000800600008106000082060000830600008406000085060000350000009b0600009c0600009d0600009e0600009f060000a0060000a1060000a2060000a3060000a406000036000000ba060000bb060000bc060000370000003800000039000000de0dcedbe00dcedbe10dcedbe20dcedbff501a0cf118ca6ef218ca6ef318ca6ef418ca6ef518ca6e diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index 0009fd390..9c35ab6ae 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -30,6 +30,9 @@ MonoBehaviour: - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} - {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} + - {fileID: 21300000, guid: e71034853e8f2eb4e9be049af351872e, type: 3} + - {fileID: 21300000, guid: 2097e79c28658fb4e9abc7fe576293e0, type: 3} + - {fileID: 21300000, guid: b7ec10a4771dc744eba18a4cc4491c01, type: 3} - {fileID: 21300000, guid: c0d66e84bb441904390a26e5f00c0b59, type: 3} - {fileID: 21300000, guid: c005d0dc9d400304ca941b48135dcb04, type: 3} - {fileID: 21300000, guid: 8e279276358266d4abd13f0e7fde1e50, type: 3} @@ -58,4 +61,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3} - {fileID: 21300000, guid: b8056a6868f41394c95a779ca9ccc217, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - spriteNameList: e9a43d8d0ae27a1a2757a7718b243e8d8c243e8dc48e80a0c58e80a0c68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a001853b19be2eb195bf2eb195c02eb1950c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc922ecadc9e0c7a11ae1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11affce428da07f7c4e3c864f1b7351fb6991c62c357451fb69b6ad7c4fb7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fc569b158 + spriteNameList: e9a43d8d0ae27a1a2757a7718b243e8d8c243e8dc48e80a0c58e80a0c68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a001853b19be2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc922ecadc9e0c7a11ae1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11affce428da07f7c4e3c864f1b7351fb6991c62c357451fb69b6ad7c4fb7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fc569b158 diff --git a/Assets/arts/atlas/ui/tutorial.asset b/Assets/arts/atlas/ui/tutorial.asset new file mode 100644 index 000000000..98802fc7e --- /dev/null +++ b/Assets/arts/atlas/ui/tutorial.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a48bfa163a714a6d8469f9c542e223f, type: 3} + m_Name: tutorial + m_EditorClassIdentifier: + spriteList: + - {fileID: 21300000, guid: d98460a1198de6d4390ca9da424d5d42, type: 3} + - {fileID: 21300000, guid: 76b4356e609315a44bfdb2b26213f46b, type: 3} + spriteNameList: d1a86f2c13a70f54 diff --git a/Assets/arts/atlas/ui/tutorial.asset.meta b/Assets/arts/atlas/ui/tutorial.asset.meta new file mode 100644 index 000000000..f4c918d01 --- /dev/null +++ b/Assets/arts/atlas/ui/tutorial.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e6ba415f16eea647afc89a3a677d088 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/atlas/ui/tutorial.spriteatlas b/Assets/arts/atlas/ui/tutorial.spriteatlas new file mode 100644 index 000000000..4b73197fa --- /dev/null +++ b/Assets/arts/atlas/ui/tutorial.spriteatlas @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!687078895 &4343727234628468602 +SpriteAtlas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: tutorial + m_EditorData: + serializedVersion: 2 + textureSettings: + serializedVersion: 2 + anisoLevel: 0 + compressionQuality: 0 + maxTextureSize: 0 + textureCompression: 0 + filterMode: 1 + generateMipMaps: 0 + readable: 0 + crunchedCompression: 0 + sRGB: 1 + platformSettings: + - serializedVersion: 3 + m_BuildTarget: Android + m_MaxTextureSize: 2048 + m_ResizeAlgorithm: 0 + m_TextureFormat: 47 + m_TextureCompression: 1 + m_CompressionQuality: 50 + m_CrunchedCompression: 0 + m_AllowsAlphaSplitting: 0 + m_Overridden: 1 + m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + m_BuildTarget: iPhone + m_MaxTextureSize: 2048 + m_ResizeAlgorithm: 0 + m_TextureFormat: 50 + m_TextureCompression: 1 + m_CompressionQuality: 50 + m_CrunchedCompression: 0 + m_AllowsAlphaSplitting: 0 + m_Overridden: 1 + m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 0 + packingSettings: + serializedVersion: 2 + padding: 4 + blockOffset: 0 + allowAlphaSplitting: 0 + enableRotation: 0 + enableTightPacking: 0 + secondaryTextureSettings: {} + variantMultiplier: 1 + packables: + - {fileID: 102900000, guid: 708fddba644bfd449b3eeb7d91a96cdd, type: 3} + bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + m_MasterAtlas: {fileID: 0} + m_PackedSprites: + - {fileID: 21300000, guid: d98460a1198de6d4390ca9da424d5d42, type: 3} + - {fileID: 21300000, guid: 76b4356e609315a44bfdb2b26213f46b, type: 3} + m_PackedSpriteNamesToIndex: + - tutorial_circle + - tutorial_dec_1 + m_RenderDataMap: {} + m_Tag: tutorial + m_IsVariant: 0 diff --git a/Assets/arts/atlas/ui/tutorial.spriteatlas.meta b/Assets/arts/atlas/ui/tutorial.spriteatlas.meta new file mode 100644 index 000000000..5b169508d --- /dev/null +++ b/Assets/arts/atlas/ui/tutorial.spriteatlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9cc366fcd2207304aa7588b93b75c4a3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4343727234628468602 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/hero/frame_small_1.png b/Assets/arts/textures/icon/hero/frame_small_1.png new file mode 100644 index 000000000..5e3d2c075 Binary files /dev/null and b/Assets/arts/textures/icon/hero/frame_small_1.png differ diff --git a/Assets/arts/textures/icon/hero/frame_small_1.png.meta b/Assets/arts/textures/icon/hero/frame_small_1.png.meta new file mode 100644 index 000000000..6e35209be --- /dev/null +++ b/Assets/arts/textures/icon/hero/frame_small_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 859ffdecd8e7dbc4298a00723aafc515 +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/icon/hero/frame_small_2.png b/Assets/arts/textures/icon/hero/frame_small_2.png new file mode 100644 index 000000000..fcae300b9 Binary files /dev/null and b/Assets/arts/textures/icon/hero/frame_small_2.png differ diff --git a/Assets/arts/textures/icon/hero/frame_small_2.png.meta b/Assets/arts/textures/icon/hero/frame_small_2.png.meta new file mode 100644 index 000000000..a87062ef3 --- /dev/null +++ b/Assets/arts/textures/icon/hero/frame_small_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 99828235d94f29e46aaabb3d4581a12e +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/icon/hero/frame_small_3.png b/Assets/arts/textures/icon/hero/frame_small_3.png new file mode 100644 index 000000000..f817b1d8c Binary files /dev/null and b/Assets/arts/textures/icon/hero/frame_small_3.png differ diff --git a/Assets/arts/textures/icon/hero/frame_small_3.png.meta b/Assets/arts/textures/icon/hero/frame_small_3.png.meta new file mode 100644 index 000000000..0fc988bf4 --- /dev/null +++ b/Assets/arts/textures/icon/hero/frame_small_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: ed2b401a38a042e40837b9fa4f259266 +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/icon/hero/frame_small_4.png b/Assets/arts/textures/icon/hero/frame_small_4.png new file mode 100644 index 000000000..f48befe49 Binary files /dev/null and b/Assets/arts/textures/icon/hero/frame_small_4.png differ diff --git a/Assets/arts/textures/icon/hero/frame_small_4.png.meta b/Assets/arts/textures/icon/hero/frame_small_4.png.meta new file mode 100644 index 000000000..de26d50f4 --- /dev/null +++ b/Assets/arts/textures/icon/hero/frame_small_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: e2fb141e60a527348b9002709b19f256 +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/icon/hero/frame_small_5.png b/Assets/arts/textures/icon/hero/frame_small_5.png new file mode 100644 index 000000000..aa1f5cd6b Binary files /dev/null and b/Assets/arts/textures/icon/hero/frame_small_5.png differ diff --git a/Assets/arts/textures/icon/hero/frame_small_5.png.meta b/Assets/arts/textures/icon/hero/frame_small_5.png.meta new file mode 100644 index 000000000..92acd8981 --- /dev/null +++ b/Assets/arts/textures/icon/hero/frame_small_5.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: eadd8d5ea71f634479a6268bba7bdfb4 +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/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index 7e2dcc701..e916d1685 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/module/hero/hero_manager.lua.bytes b/Assets/lua/app/module/hero/hero_manager.lua.bytes index 333fa4560..2c2d5edd5 100644 Binary files a/Assets/lua/app/module/hero/hero_manager.lua.bytes and b/Assets/lua/app/module/hero/hero_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes b/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes index 4b7be6337..9783f08a9 100644 Binary files a/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes and b/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index 7bf6678e2..b64baab34 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7156597497233077380} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -174,7 +174,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7156597497233077380} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -249,7 +249,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1112461946326730134} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -318,7 +318,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7856976683170364790} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -387,7 +387,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7856976683170364790} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -607,6 +607,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4516354993757812848} - {fileID: 3843698861260595511} - {fileID: 9014929677433328641} - {fileID: 58389089297126115} @@ -644,6 +645,10 @@ MonoBehaviour: hashName: 3650676873 objectType: 0 gameObject: {fileID: 6943042458999037975} + - name: unit_result_report_cell.frame + hashName: 3636396165 + objectType: 0 + gameObject: {fileID: 6470886995892547582} --- !u!1 &3741600256466645460 GameObject: m_ObjectHideFlags: 0 @@ -898,7 +903,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5637448674548143003} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1184,6 +1189,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4474373560228763868} - {fileID: 8997295221643936833} - {fileID: 6852101474593447195} - {fileID: 4966872020525245394} @@ -1221,6 +1227,10 @@ MonoBehaviour: hashName: 3650676873 objectType: 0 gameObject: {fileID: 3897439462126193203} + - name: unit_result_report_cell.frame + hashName: 3636396165 + objectType: 0 + gameObject: {fileID: 5799622658638204370} --- !u!1 &4484093391873524961 GameObject: m_ObjectHideFlags: 0 @@ -1256,7 +1266,7 @@ RectTransform: 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: 690, y: 170} + m_SizeDelta: {x: 600, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5214828052616705242 CanvasRenderer: @@ -1543,7 +1553,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7856976683170364790} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1895,6 +1905,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 3671325978274513113} - {fileID: 8789708312057747045} - {fileID: 2314418690377365568} - {fileID: 7039005353085213621} @@ -1932,6 +1943,10 @@ MonoBehaviour: hashName: 3650676873 objectType: 0 gameObject: {fileID: 7164966048841651247} + - name: unit_result_report_cell.frame + hashName: 3636396165 + objectType: 0 + gameObject: {fileID: 7896213854278286178} --- !u!1 &5399368337075687823 GameObject: m_ObjectHideFlags: 0 @@ -2052,7 +2067,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7156597497233077380} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2127,7 +2142,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7156597497233077380} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2261,7 +2276,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7856976683170364790} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -2306,6 +2321,156 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5799622658638204370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4474373560228763868} + - component: {fileID: 5380197591576873198} + - component: {fileID: 4928412424872206229} + m_Layer: 0 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4474373560228763868 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5799622658638204370} + 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: 5637448674548143003} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5380197591576873198 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5799622658638204370} + m_CullTransparentMesh: 1 +--- !u!114 &4928412424872206229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5799622658638204370} + 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: 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: 859ffdecd8e7dbc4298a00723aafc515, 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 &6470886995892547582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4516354993757812848} + - component: {fileID: 1884808098221118238} + - component: {fileID: 8665273923927140025} + m_Layer: 0 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4516354993757812848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470886995892547582} + 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: 1395054053664364182} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &1884808098221118238 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470886995892547582} + m_CullTransparentMesh: 1 +--- !u!114 &8665273923927140025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470886995892547582} + 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: 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: 859ffdecd8e7dbc4298a00723aafc515, 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 &6606104105387947548 GameObject: m_ObjectHideFlags: 0 @@ -2485,6 +2650,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8423993013242370153} - {fileID: 4696245268642532715} - {fileID: 1266341984854585330} - {fileID: 7619075263467068112} @@ -2522,6 +2688,10 @@ MonoBehaviour: hashName: 3650676873 objectType: 0 gameObject: {fileID: 5046246927649095494} + - name: unit_result_report_cell.frame + hashName: 3636396165 + objectType: 0 + gameObject: {fileID: 7073680569091588231} --- !u!1 &6943042458999037975 GameObject: m_ObjectHideFlags: 0 @@ -2552,7 +2722,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1395054053664364182} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2656,6 +2826,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7073680569091588231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8423993013242370153} + - component: {fileID: 6676044087549815826} + - component: {fileID: 4887606162866333611} + m_Layer: 0 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8423993013242370153 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073680569091588231} + 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: 7856976683170364790} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6676044087549815826 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073680569091588231} + m_CullTransparentMesh: 1 +--- !u!114 &4887606162866333611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073680569091588231} + 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: 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: 859ffdecd8e7dbc4298a00723aafc515, 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 &7164966048841651247 GameObject: m_ObjectHideFlags: 0 @@ -2686,7 +2931,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1112461946326730134} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2892,7 +3137,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5637448674548143003} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -3005,7 +3250,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5637448674548143003} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -3136,6 +3381,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 +--- !u!1 &7572218985910848447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 587015162531878706} + - component: {fileID: 7368139389062917752} + - component: {fileID: 6906114774764694659} + m_Layer: 0 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &587015162531878706 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7572218985910848447} + 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: 7156597497233077380} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &7368139389062917752 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7572218985910848447} + m_CullTransparentMesh: 1 +--- !u!114 &6906114774764694659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7572218985910848447} + 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: 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: 859ffdecd8e7dbc4298a00723aafc515, 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 &7755420184075982668 GameObject: m_ObjectHideFlags: 0 @@ -3174,7 +3494,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -376} - m_SizeDelta: {x: 690, y: 170} + m_SizeDelta: {x: 600, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7713147140649759855 CanvasRenderer: @@ -3263,8 +3583,8 @@ MonoBehaviour: downRecoveryOffset: 0 direction: 0 reverse: 0 - cellWidth: 115 - cellHeight: 115 + cellWidth: 130 + cellHeight: 130 perLineNum: 5 --- !u!1 &7840130698723737052 GameObject: @@ -3296,7 +3616,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1112461946326730134} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -3369,6 +3689,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 587015162531878706} - {fileID: 2131785248737886880} - {fileID: 6693438461061620862} - {fileID: 8868055871964016938} @@ -3406,6 +3727,85 @@ MonoBehaviour: hashName: 3650676873 objectType: 0 gameObject: {fileID: 5659753723928598789} + - name: unit_result_report_cell.frame + hashName: 3636396165 + objectType: 0 + gameObject: {fileID: 7572218985910848447} +--- !u!1 &7896213854278286178 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3671325978274513113} + - component: {fileID: 6849006816374616705} + - component: {fileID: 6428968027888708141} + m_Layer: 0 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3671325978274513113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7896213854278286178} + 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: 1112461946326730134} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6849006816374616705 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7896213854278286178} + m_CullTransparentMesh: 1 +--- !u!114 &6428968027888708141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7896213854278286178} + 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: 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: 859ffdecd8e7dbc4298a00723aafc515, 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 &7936986928946906401 GameObject: m_ObjectHideFlags: 0 @@ -3570,7 +3970,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1395054053664364182} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -3930,7 +4330,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1112461946326730134} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -4005,7 +4405,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1395054053664364182} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4388,7 +4788,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1395054053664364182} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -4463,7 +4863,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5637448674548143003} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1}