fix bug

Assets/arts/atlas/icon/buff.asset

@@ -28,6 +28,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: cb55ab7ffa8c4495fa2610a352a53c16, type: 3}
   - {fileID: 21300000, guid: b3f47bc2c10ea4f5cb8e51f51da33926, type: 3}
   - {fileID: 21300000, guid: 420ade8b234c24e74b7c50686ae02ac8, type: 3}
+  - {fileID: 21300000, guid: c67bd679acbc94c28b4468a5c8828caa, type: 3}
   - {fileID: 21300000, guid: 4d5743e9d0a6ae447bad491b2a0c6cc6, type: 3}
   - {fileID: 21300000, guid: 487844becee23a94d97386cf66bf5252, type: 3}
   - {fileID: 21300000, guid: 42e30d11fda48bb498c8aea2b7221e08, type: 3}
@@ -47,4 +48,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 020a89104d6668248bc2518cce1fc6cc, type: 3}
   - {fileID: 21300000, guid: 6568b6c56e8900547b76bf3fc6307823, type: 3}
   - {fileID: 21300000, guid: 232ebdf92251f9446aa2ff109a3a189f, type: 3}
-  spriteNameList: 3bb554de3a9f9705cf512e00d7d7a3050de6ee3844d744fcbce45674f4b873f69200aa050cc1401e7a7e5d04e7415e8e5cfd091af5ec0eef143e942f9ed464f6a01289b4832c60b9cfbbd3ea10d4ad7d2bc532008284f110e38ff110086f6cc56c4e7640fb662f9b691f28cab508f5309f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0
+  spriteNameList: 3bb554de3a9f9705cf512e00d7d7a3050de6ee3844d744fcbce45674f4b873f69200aa050cc1401e7a7e5d04e7415e8e5cfd091af5ec0eef143e942fc236421c9ed464f6a01289b4832c60b9af57f9e610d4ad7d2bc532008284f110e38ff110086f6cc56c4e7640fb662f9b691f28cab508f5309f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0

Assets/arts/atlas/icon/buff.spriteatlas

@@ -84,6 +84,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 5f894bd8341956645b5f8643c6442326, type: 3}
   - {fileID: 21300000, guid: 6bd6b8f81811c3f49a743cb13b3d16cc, type: 3}
   - {fileID: 21300000, guid: c70ea649b4ac6ba4cb17164f11d555a9, type: 3}
+  - {fileID: 21300000, guid: c67bd679acbc94c28b4468a5c8828caa, type: 3}
   - {fileID: 21300000, guid: 0e68ebc982e8cac4d92bc662d3ca5b2f, type: 3}
   - {fileID: 21300000, guid: 4d5743e9d0a6ae447bad491b2a0c6cc6, type: 3}
   - {fileID: 21300000, guid: 232ebdf92251f9446aa2ff109a3a189f, type: 3}
@@ -106,7 +107,7 @@ SpriteAtlas:
   - charm
   - dec_dmg_green_add
   - dec_dmg_red_add
-  - Imprison
+  - imprison
   - poison
   - counterattack
   - attr_normal_hurtp_all_add
@@ -119,6 +120,7 @@ SpriteAtlas:
   - normal_attack_dec
   - thorns
   - curse
+  - dmg_add_all
   - death_summon
   - first_hand
   - weaken

Assets/arts/atlas/ui/arena.asset

@@ -14,6 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   spriteList:
   - {fileID: 21300000, guid: fc9944ae841b4fd45a9ce663ddb5a985, type: 3}
+  - {fileID: 21300000, guid: e5b2eea33327b4c1b82ea6447624b72e, type: 3}
+  - {fileID: 21300000, guid: ef99a35c170f445ddac9338c4ed31f41, type: 3}
   - {fileID: 21300000, guid: 6e16d76b4399b054b923180c8868eea0, type: 3}
   - {fileID: 21300000, guid: 7874c7c7cdea0be468135b9ce02eae3b, type: 3}
   - {fileID: 21300000, guid: f23950c02c25c4ee39c71a0656a8d5c5, type: 3}
@@ -53,4 +55,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 369ef0e04cb680441baa4814f5e7ec28, type: 3}
   - {fileID: 21300000, guid: aa1e20165075b4269a4b0ba00f1f2e33, type: 3}
   - {fileID: 21300000, guid: 38b0d1351156343c48dc0ae70b00916d, type: 3}
-  spriteNameList: 70b6df2dcdd30808f7ed40fbced30808566241fbcfd30808ef5c00f821410b0822410b0823410b0824410b0825410b0826410b08f05c00f8f15c00f8f25c00f8f35c00f8f45c00f8f55c00f8f65c00f8f75c00f8d6671108cbf32408ccf32408cdf32408fc9b2608b4e3acfcb5e3acfcb6e3acfcb7e3acfcb8e3acfcb9e3acfcfd9b2608fe9b2608ff9b2608009c2608019c2608029c2608039c2608049c2608
+  spriteNameList: 70b6df2d16d658f517d658f5cdd30808f7ed40fbced30808566241fbcfd30808ef5c00f821410b0822410b0823410b0824410b0825410b0826410b08f05c00f8f15c00f8f25c00f8f35c00f8f45c00f8f55c00f8f65c00f8f75c00f8d6671108cbf32408ccf32408cdf32408fc9b2608b4e3acfcb5e3acfcb6e3acfcb7e3acfcb8e3acfcb9e3acfcfd9b2608fe9b2608ff9b2608009c2608019c2608029c2608039c2608049c2608

Assets/arts/atlas/ui/arena.spriteatlas

@@ -69,6 +69,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 89a4b011c2621433f8df0443aad3cb3f, type: 3}
   - {fileID: 21300000, guid: 8eede3e1b3ffa42df80b57515981d96c, type: 3}
   - {fileID: 21300000, guid: 91ddc4732fc8b431e8a97536eb73ae72, type: 3}
+  - {fileID: 21300000, guid: e5b2eea33327b4c1b82ea6447624b72e, type: 3}
   - {fileID: 21300000, guid: 378e6814842094f52953d7fb1868a7d9, type: 3}
   - {fileID: 21300000, guid: 38b0d1351156343c48dc0ae70b00916d, type: 3}
   - {fileID: 21300000, guid: 06339b5598fb34d2d8f5ee6448ae47ec, type: 3}
@@ -89,6 +90,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 6e16d76b4399b054b923180c8868eea0, type: 3}
   - {fileID: 21300000, guid: 007c969b0af3d4012ab260defb014eaa, type: 3}
   - {fileID: 21300000, guid: 4ea6b3bb4fd06471a8acd60ae0315384, type: 3}
+  - {fileID: 21300000, guid: ef99a35c170f445ddac9338c4ed31f41, type: 3}
   - {fileID: 21300000, guid: d51156ccd8129465b84b16ded938714f, type: 3}
   - {fileID: 21300000, guid: a356b36deef7a1b4a9558d6a724921e1, type: 3}
   - {fileID: 21300000, guid: d996118dd50974549a0bf6b22f9d1529, type: 3}
@@ -110,6 +112,7 @@ SpriteAtlas:
   - arena_dan_1
   - arena_bg_10
   - arena_bg_8
+  - arena_banner_1
   - arena_bar_2_bg
   - arena_dec_9
   - arena_dec_13
@@ -130,6 +133,7 @@ SpriteAtlas:
   - arena_bar_1
   - arena_dan_2
   - arena_bar_3
+  - arena_banner_2
   - arena_dec_11
   - arena_bg_2
   - arena_dec_12

Assets/arts/atlas/ui/common.asset

@@ -145,6 +145,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: baeff88190bbfdb4a926b47619fcb1e6, type: 3}
   - {fileID: 21300000, guid: e74dcab94de80bd4199e8ddd36ce28d4, type: 3}
   - {fileID: 21300000, guid: 5140a3a33b636314fb3d07bdc4c9c0f3, type: 3}
+  - {fileID: 21300000, guid: 60e143f7dac7547a0b16b71a45f8a394, type: 3}
+  - {fileID: 21300000, guid: 28f8a59c2e2c84857a45977a42025b63, type: 3}
   - {fileID: 21300000, guid: 9f829ddca22584587ad74666add915d3, type: 3}
   - {fileID: 21300000, guid: d60a8bacfc5b246be9f42cd699266114, type: 3}
   - {fileID: 21300000, guid: 09f534928469c4be8ab76af3a36e2984, type: 3}
@@ -179,4 +181,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3}
   - {fileID: 21300000, guid: 5aa123eeba3874e96a77af3433b3f977, type: 3}
   - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
-  spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d816d861a91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a1213850349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158
+  spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d816d861a91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a1213850349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d357551fb694faf2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158

Assets/arts/atlas/ui/common.spriteatlas

@@ -147,6 +147,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3}
   - {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3}
   - {fileID: 21300000, guid: 111fa2e75dc3d47c0bad6dce4490f997, type: 3}
+  - {fileID: 21300000, guid: 60e143f7dac7547a0b16b71a45f8a394, type: 3}
   - {fileID: 21300000, guid: 438379085b5f94865aa21e11bb5fa6c1, type: 3}
   - {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3}
   - {fileID: 21300000, guid: 3427d728ce5bf43f5972607e45c43df6, type: 3}
@@ -194,6 +195,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 0878152c45dfc4c7fa2ddfe21a5a6d1b, type: 3}
   - {fileID: 21300000, guid: 9bd8c39c611ad4e0aa3de35a72870661, type: 3}
   - {fileID: 21300000, guid: 92f0559c7dc7a4f748e4f471741dc664, type: 3}
+  - {fileID: 21300000, guid: 28f8a59c2e2c84857a45977a42025b63, type: 3}
   - {fileID: 21300000, guid: 2097e79c28658fb4e9abc7fe576293e0, type: 3}
   - {fileID: 21300000, guid: 4b4d73ac48dffca4fa760e7a48e51ad2, type: 3}
   - {fileID: 21300000, guid: d60a8bacfc5b246be9f42cd699266114, type: 3}
@@ -314,6 +316,7 @@ SpriteAtlas:
   - common_bg_4
   - common_bg_7
   - common_bg_23
+  - common_progress_3
   - common_bg_power
   - common_tips_4
   - common_btn_find
@@ -361,6 +364,7 @@ SpriteAtlas:
   - common_bottom_bg_3
   - common_bg_21
   - common_icon_mail
+  - common_progress_3_bg
   - common_btn_grey_2
   - common_bg_9
   - common_quality_2

Assets/arts/textures/icon/buff/dmg_add_all.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: c67bd679acbc94c28b4468a5c8828caa
+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: 

Assets/arts/textures/icon/buff/imprison.png.meta

@@ -63,20 +63,8 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 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
@@ -113,6 +101,18 @@ TextureImporter:
     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
@@ -143,5 +143,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/textures/icon/buff.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/textures/ui/arena/arena_banner_1.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: e5b2eea33327b4c1b82ea6447624b72e
+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: 

Assets/arts/textures/ui/arena/arena_banner_2.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: ef99a35c170f445ddac9338c4ed31f41
+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: 

Assets/arts/textures/ui/common/common_progress_3.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 60e143f7dac7547a0b16b71a45f8a394
+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: 8, y: 10, z: 8, w: 10}
+  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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/textures/ui/common/common_progress_3_bg.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 28f8a59c2e2c84857a45977a42025b63
+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: 12, y: 12, z: 12, w: 12}
+  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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/prefabs/ui/battle/battle_box_open_ui.prefab

@@ -39,7 +39,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 161}
-  m_SizeDelta: {x: 380, y: 100}
+  m_SizeDelta: {x: 350, y: 95}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3333051626963470732
 CanvasRenderer:
@@ -69,8 +69,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b8056a6868f41394c95a779ca9ccc217, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3d7caae5e90a442449b68a9427558f6e, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -743,11 +743,11 @@ RectTransform:
   m_Father: {fileID: 7355997178942038764}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -27}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 200, y: 32}
+  m_SizeDelta: {x: 200, y: 50}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &637489419934158580
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -803,8 +803,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 34
+  m_fontSize: 40
-  m_fontSizeBase: 34
+  m_fontSizeBase: 40
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -991,6 +991,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: ui_spine_obj
       objectReference: {fileID: 0}
+    - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: referenceSize.x
       value: 0

Assets/prefabs/ui/battle/battle_result_ui.prefab

@@ -385,7 +385,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4567631707956313030
 RectTransform:
   m_ObjectHideFlags: 0
@@ -472,7 +472,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: 376, y: 28}
+  m_SizeDelta: {x: 378, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1489806781161470510
 CanvasRenderer:
@@ -502,7 +502,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: f23950c02c25c4ee39c71a0656a8d5c5, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 60e143f7dac7547a0b16b71a45f8a394, type: 3}
   m_FillDirection: 0
   m_Value: 1
   m_FillCenter: 1
@@ -1077,7 +1077,7 @@ RectTransform:
   m_Children:
   - {fileID: 1679443109954253011}
   m_Father: {fileID: 4322956751028045404}
-  m_RootOrder: 2
+  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}
@@ -1112,7 +1112,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1208,14 +1208,14 @@ GameObject:
   m_Component:
   - component: {fileID: 4322956751028045404}
   - component: {fileID: 1686228162405384228}
-  - component: {fileID: 3209037391011720426}
+  - component: {fileID: 5221544701700801690}
   m_Layer: 5
   m_Name: arena_box_node
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4322956751028045404
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1228,7 +1228,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1928282534933530993}
   - {fileID: 2492967680071684038}
   - {fileID: 8068479440165697309}
   m_Father: {fileID: 4165930251451731960}
@@ -1247,7 +1246,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3138193055603967192}
   m_CullTransparentMesh: 1
---- !u!114 &3209037391011720426
+--- !u!114 &5221544701700801690
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1259,7 +1258,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
+  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}
@@ -1267,7 +1266,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 02a079d6dd048e349a54f81f4d089eef, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e5b2eea33327b4c1b82ea6447624b72e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1782,7 +1781,7 @@ 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: 0, y: -53}
+  m_AnchoredPosition: {x: 0, y: -52}
   m_SizeDelta: {x: 400, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1076884780693882158
@@ -1918,7 +1917,7 @@ 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: 0, y: 28}
+  m_AnchoredPosition: {x: 0, y: 16}
   m_SizeDelta: {x: 200, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7449504550375705862
@@ -1976,8 +1975,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 90
+  m_fontSize: 56
-  m_fontSizeBase: 90
+  m_fontSizeBase: 56
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -3387,7 +3386,7 @@ 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: 0, y: -94}
+  m_AnchoredPosition: {x: 0, y: -93}
   m_SizeDelta: {x: 400, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &523166506901669116
@@ -3795,7 +3794,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -155}
-  m_SizeDelta: {x: 378, y: 30}
+  m_SizeDelta: {x: 384, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4016023009979746751
 CanvasRenderer:
@@ -3825,7 +3824,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 378e6814842094f52953d7fb1868a7d9, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 28f8a59c2e2c84857a45977a42025b63, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4006,7 +4005,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 380}
-  m_SizeDelta: {x: 358, y: 90}
+  m_SizeDelta: {x: 470, y: 104}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4181552087915593989
 CanvasRenderer:
@@ -4292,82 +4291,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &6956708165739389666
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1928282534933530993}
-  - component: {fileID: 6664728097961866892}
-  - component: {fileID: 5822700851923299808}
-  m_Layer: 5
-  m_Name: img_box
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1928282534933530993
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6956708165739389666}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.35, y: 0.35, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4322956751028045404}
-  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: -115, y: 25}
-  m_SizeDelta: {x: 290, y: 262}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6664728097961866892
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6956708165739389666}
-  m_CullTransparentMesh: 1
---- !u!114 &5822700851923299808
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6956708165739389666}
-  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: 035848b780a057a489b681fb592e2ce4, 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 &7073680569091588231
 GameObject:
   m_ObjectHideFlags: 0
@@ -5518,7 +5441,7 @@ 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: 0, y: 28}
+  m_AnchoredPosition: {x: 0, y: 16}
   m_SizeDelta: {x: 200, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &507906359981443689
@@ -5576,8 +5499,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 90
+  m_fontSize: 56
-  m_fontSizeBase: 90
+  m_fontSizeBase: 56
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -5866,7 +5789,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 380}
-  m_SizeDelta: {x: 358, y: 90}
+  m_SizeDelta: {x: 470, y: 104}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8699042973596539339
 CanvasRenderer:
@@ -6282,12 +6205,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4322956751028045404}
-  m_RootOrder: 1
+  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: -115, y: -40}
+  m_AnchoredPosition: {x: -125, y: -41}
-  m_SizeDelta: {x: 235, y: 50}
+  m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5177685932959120571
 CanvasRenderer:
@@ -6685,7 +6608,7 @@ MonoBehaviour:
   - name: battle_result_ui.arena_box_node.img_box
     hashName: 1705126190
     objectType: 0
-    gameObject: {fileID: 6956708165739389666}
+    gameObject: {fileID: 0}
   - name: battle_result_ui.arena_box_node.tx_box
     hashName: 3843531729
     objectType: 0
@@ -7407,18 +7330,6 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
   m_PrefabInstance: {fileID: 6420976849310439466}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1140080128496271439
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 297796708359802272}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!225 &3938614773036603208
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -7431,6 +7342,18 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!114 &1140080128496271439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 297796708359802272}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &8844241197376841854 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}

Assets/prefabs/ui/battle/battle_ui.prefab

@@ -11313,8 +11313,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: 264, y: -320.5}
+  m_AnchoredPosition: {x: 264, y: -280}
-  m_SizeDelta: {x: 138, y: 138}
+  m_SizeDelta: {x: 90, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &537056727248252968
 CanvasRenderer:
@@ -11344,7 +11344,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: adb1bb1275f590d458ba285b7d35c55c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 58ed55e2265274458a11984028ac727e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -14677,7 +14677,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ae25f604f52cd4e45ad31f31bdea5fbd, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/prefabs/ui/commerce/buy_vit_ui.prefab

@@ -126,7 +126,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -34, y: -112}
-  m_SizeDelta: {x: 70, y: 38}
+  m_SizeDelta: {x: 41, y: 44}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2666222381294916621
 CanvasRenderer:
@@ -156,7 +156,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4f0b41158f74bfd4a9b0ee0116ff6bb0, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -318,7 +318,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3157527676219628998
 RectTransform:
   m_ObjectHideFlags: 0
@@ -570,16 +570,16 @@ RectTransform:
   m_GameObject: {fileID: 3652563006717050702}
   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_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 4099233909764425503}
   m_RootOrder: 5
   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: -108}
+  m_AnchoredPosition: {x: 0, y: -112}
-  m_SizeDelta: {x: 61, y: 54}
+  m_SizeDelta: {x: 86, y: 61}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2477989125865946806
 CanvasRenderer:
@@ -609,7 +609,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1134,7 +1134,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 07ea4006b8ffde04f97a0cc804fe5400, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4808c6ae4ca262b45a174213786a7557, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1174,7 +1174,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &9051265468839415530
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1687,16 +1687,16 @@ RectTransform:
   m_GameObject: {fileID: 7431592622391823566}
   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_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 3903058654119117627}
   m_RootOrder: 5
   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: -108}
+  m_AnchoredPosition: {x: 0, y: -112}
-  m_SizeDelta: {x: 61, y: 54}
+  m_SizeDelta: {x: 86, y: 61}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7608865603443428722
 CanvasRenderer:
@@ -1726,7 +1726,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1944,7 +1944,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 20b8e9a471c37674680e009fcf0f5449, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e08fc80d560e147379f90667ecd2ea08, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/prefabs/ui/main_city/module_unlock_ui.prefab

@@ -465,10 +465,9 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 569071118488430186}
   m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 2
+  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}
@@ -558,6 +557,7 @@ RectTransform:
   m_Children:
   - {fileID: 7870804908802134986}
   - {fileID: 5241113350200150230}
+  - {fileID: 569071118488430186}
   - {fileID: 1723444737742265919}
   - {fileID: 7045546709728399258}
   m_Father: {fileID: 0}
@@ -643,8 +643,8 @@ MonoBehaviour:
     hashName: 820924453
     objectType: 6
     gameObject: {fileID: 7966668418990516853}
-  - name: module_unlock_ui.icon.spine_circle
+  - name: module_unlock_ui.spine_circle
-    hashName: 1883531631
+    hashName: 2398379390
     objectType: 6
     gameObject: {fileID: 3798302052587626636}
   - name: module_unlock_ui.spine_star
@@ -795,7 +795,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1723444737742265919}
+    m_TransformParent: {fileID: 4165930251451731960}
     m_Modifications:
     - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_Name
@@ -823,7 +823,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_RootOrder
-      value: 0
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchorMax.x
@@ -867,15 +867,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchoredPosition.x
@@ -883,7 +883,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -942,7 +942,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchorMax.x

Assets/prefabs/ui/summon/summon_main_ui.prefab

@@ -4530,7 +4530,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GroupOrder: 20
+  GroupOrder: 1
 --- !u!1 &5362555893550286612
 GameObject:
   m_ObjectHideFlags: 0
@@ -5417,7 +5417,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GroupOrder: 20
+  GroupOrder: 1
 --- !u!1 &7775476082374568441
 GameObject:
   m_ObjectHideFlags: 0