Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev

Assets/arts/atlas/ui/common.asset

@@ -40,6 +40,11 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3}
   - {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3}
   - {fileID: 21300000, guid: 3cef9afc451ec9f4682eca5f161cd556, type: 3}
+  - {fileID: 21300000, guid: f90c4f99f71e3154e84b7c859c58a6cb, type: 3}
+  - {fileID: 21300000, guid: 9266dfc5adcc5aa4dbb3c4229d655543, type: 3}
+  - {fileID: 21300000, guid: 2c02dd0fac140614899bd855278c7f3c, type: 3}
+  - {fileID: 21300000, guid: 58e2103287a3baf44aeb0b1dbcc3391f, type: 3}
+  - {fileID: 21300000, guid: cfbd8cf77f2c1e941911324a3717bcf1, type: 3}
   - {fileID: 21300000, guid: cf89f3bc92056c548b62a7278c2c6522, type: 3}
   - {fileID: 21300000, guid: baac6818c7f9ee248a78358bd8adf2ed, type: 3}
   - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3}
@@ -70,6 +75,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3}
   - {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3}
   - {fileID: 21300000, guid: 7372681aea33b7b4099e3685b7ee975e, type: 3}
+  - {fileID: 21300000, guid: f006cfdf7637acd4daa55cc3f743ac29, type: 3}
   - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3}
   - {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3}
   - {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3}
@@ -136,4 +142,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3}
   - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
   - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3}
-  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782ee49916fef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19be2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a5034973951349739523497395334973954349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158
+  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ee49916fef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a5034973951349739523497395334973954349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158

Assets/arts/atlas/ui/common.spriteatlas

@@ -78,6 +78,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 55feeb1282994f248bebbf10510de820, type: 3}
   - {fileID: 21300000, guid: b3ebf3220061a824c8f4a3919ee39a33, type: 3}
   - {fileID: 21300000, guid: 25abc92244e96c1499c3f11397048a47, type: 3}
+  - {fileID: 21300000, guid: 58e2103287a3baf44aeb0b1dbcc3391f, type: 3}
   - {fileID: 21300000, guid: f9818742fe98d6a45bd01d434ce7976b, type: 3}
   - {fileID: 21300000, guid: b9543992e195f2f47a68966feb242e7a, type: 3}
   - {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3}
@@ -100,6 +101,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 070fd6553e0b5bf4a816757085221bda, type: 3}
   - {fileID: 21300000, guid: 59664f7585dc89f4aa7d96b2f601d19b, type: 3}
   - {fileID: 21300000, guid: e71034853e8f2eb4e9be049af351872e, type: 3}
+  - {fileID: 21300000, guid: 9266dfc5adcc5aa4dbb3c4229d655543, type: 3}
   - {fileID: 21300000, guid: 27bcccd51cdee104bad42c0e2d59d35e, type: 3}
   - {fileID: 21300000, guid: 33eb4a26b60c789498ae5382b6b6251b, type: 3}
   - {fileID: 21300000, guid: b4017b266d8fb3d4ead6f5b5a355ed7e, type: 3}
@@ -117,6 +119,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: c4514947f60678c4e90c498ef095db61, type: 3}
   - {fileID: 21300000, guid: 841a1467a1c47414c91ac18891f9c65d, type: 3}
   - {fileID: 21300000, guid: c9a70ad71344ef54cb824c55bdae85cb, type: 3}
+  - {fileID: 21300000, guid: cfbd8cf77f2c1e941911324a3717bcf1, type: 3}
   - {fileID: 21300000, guid: baac6818c7f9ee248a78358bd8adf2ed, type: 3}
   - {fileID: 21300000, guid: 75eeb868e0670844e959094562d14ec7, type: 3}
   - {fileID: 21300000, guid: b8056a6868f41394c95a779ca9ccc217, type: 3}
@@ -135,6 +138,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 15a10479bd4a42c459af0778f0f3c004, type: 3}
   - {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3}
   - {fileID: 21300000, guid: 15dba989362b02149bdcef5c42ca474c, type: 3}
+  - {fileID: 21300000, guid: f90c4f99f71e3154e84b7c859c58a6cb, type: 3}
   - {fileID: 21300000, guid: 4ab1c4c9276157d4e9a5c3b3c29ccfab, type: 3}
   - {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3}
   - {fileID: 21300000, guid: 3867c71afb1f02049b1fee7399381aaa, type: 3}
@@ -177,12 +181,14 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3}
   - {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3}
   - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3}
+  - {fileID: 21300000, guid: 2c02dd0fac140614899bd855278c7f3c, type: 3}
   - {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, type: 3}
   - {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3}
   - {fileID: 21300000, guid: c3e22e3f5adf9604295b23ca385609ee, type: 3}
   - {fileID: 21300000, guid: b5366e3fbfd5bde4c85d58b28af1a050, type: 3}
   - {fileID: 21300000, guid: 70658f5f22e6038469c551a1665ae009, type: 3}
   - {fileID: 21300000, guid: 2e3a1fdfbb599ba4babe604659b6e1df, type: 3}
+  - {fileID: 21300000, guid: f006cfdf7637acd4daa55cc3f743ac29, type: 3}
   - {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3}
   m_PackedSpriteNamesToIndex:
   - common_board_24
@@ -202,6 +208,7 @@ SpriteAtlas:
   - common_progress_3
   - common_btn_yellow_2
   - common_board_27
+  - common_board_117
   - common_title_11
   - common_title_6
   - common_board_2
@@ -224,6 +231,7 @@ SpriteAtlas:
   - common_line_4
   - common_line_2
   - common_btn_grey_1
+  - common_board_115
   - common_board_18
   - common_chest_2
   - common_board_28
@@ -241,6 +249,7 @@ SpriteAtlas:
   - common_progress_4
   - common_title_10
   - common_ad_4
+  - common_board_118
   - common_board_13
   - common_progress_4_bg
   - common_title_5
@@ -259,6 +268,7 @@ SpriteAtlas:
   - common_dec_11
   - common_line_1
   - common_dec_13
+  - common_board_114
   - common_plus_2
   - common_check
   - common_board_20
@@ -301,12 +311,14 @@ SpriteAtlas:
   - common_board_9
   - common_board_112
   - common_board_14
+  - common_board_116
   - common_chest_1
   - common_btn_blue_1
   - common_board_108
   - common_board_17
   - common_dec_5
   - common_dec_7
+  - common_btn_dark_4
   - common_info
   m_RenderDataMap: {}
   m_Tag: common

Assets/arts/atlas/ui/daily_challenge.asset

@@ -15,6 +15,7 @@ MonoBehaviour:
   spriteList:
   - {fileID: 21300000, guid: 65f16667047638445b0a1726b5d82d81, type: 3}
   - {fileID: 21300000, guid: f913666b4ff2e6d47880874f3b8924fa, type: 3}
+  - {fileID: 21300000, guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2, type: 3}
   - {fileID: 21300000, guid: 8e2ea7e29fa354444bb33f2a55d2139e, type: 3}
   - {fileID: 21300000, guid: bd513be42a90eb34fa3e2c08bea32d99, type: 3}
   - {fileID: 21300000, guid: bb24738731881e742b8b668f9e12ec10, type: 3}
@@ -22,4 +23,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: dc54318f908891e4a819c6f9cde70ad4, type: 3}
   - {fileID: 21300000, guid: e843643442bc8f84a85ab9f65f8331a0, type: 3}
   - {fileID: 21300000, guid: 390d6248a7a2fcf408d0a276582978e7, type: 3}
-  spriteNameList: 1dddfd5a1eddfd5a2b54c4932c54c493f917902afa17902a78f3912addb467b1deb467b1
+  spriteNameList: 1dddfd5a1eddfd5a1fddfd5a2b54c4932c54c493f917902afa17902a78f3912addb467b1deb467b1

Assets/arts/atlas/ui/daily_challenge.spriteatlas

@@ -62,6 +62,7 @@ SpriteAtlas:
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: 45b80e20fe688ef45b04e1b37bb26b83, type: 3}
+  - {fileID: 21300000, guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2, type: 3}
   - {fileID: 21300000, guid: 8e2ea7e29fa354444bb33f2a55d2139e, type: 3}
   - {fileID: 21300000, guid: e843643442bc8f84a85ab9f65f8331a0, type: 3}
   - {fileID: 21300000, guid: bd513be42a90eb34fa3e2c08bea32d99, type: 3}
@@ -72,6 +73,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: dc54318f908891e4a819c6f9cde70ad4, type: 3}
   m_PackedSpriteNamesToIndex:
   - daily_challenge_bg_2
+  - daily_bg_3
   - daily_buff_1
   - daily_task_1
   - daily_buff_2

Assets/arts/atlas/ui/task.asset

@@ -17,8 +17,9 @@ MonoBehaviour:
   - {fileID: 21300000, guid: a89df2b31f34c4a4ca0edc2772c4e9cd, type: 3}
   - {fileID: 21300000, guid: 56a2f99780f9507468e6ea3685e67dce, type: 3}
   - {fileID: 21300000, guid: 5795c5e25e28e8549a72b1fb7022d695, type: 3}
+  - {fileID: 21300000, guid: 8deb17ac17dbddd40a09e640f55f093a, type: 3}
   - {fileID: 21300000, guid: d79621df020e67241a8606dfab75b671, type: 3}
   - {fileID: 21300000, guid: ef09ff7c71cbc9f4ba770ddbc3402182, type: 3}
   - {fileID: 21300000, guid: ccba52bfd6b5f8d479cc8de3e271c2a4, type: 3}
   - {fileID: 21300000, guid: fea559dfd4b4df044bdcc6e636ca8ce3, type: 3}
-  spriteNameList: 3149c00a3249c00a3349c00a3449c00ab9bd9455babd9455fa37644dfb37644d
+  spriteNameList: 3149c00a3249c00a3349c00a3449c00a3549c00ab9bd9455babd9455fa37644dfb37644d

Assets/arts/atlas/ui/task.spriteatlas

@@ -65,6 +65,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: a89df2b31f34c4a4ca0edc2772c4e9cd, type: 3}
   - {fileID: 21300000, guid: 56a2f99780f9507468e6ea3685e67dce, type: 3}
   - {fileID: 21300000, guid: ef09ff7c71cbc9f4ba770ddbc3402182, type: 3}
+  - {fileID: 21300000, guid: 8deb17ac17dbddd40a09e640f55f093a, type: 3}
   - {fileID: 21300000, guid: f5e5a89d44a6cde498b63f5d5359bd44, type: 3}
   - {fileID: 21300000, guid: ccba52bfd6b5f8d479cc8de3e271c2a4, type: 3}
   - {fileID: 21300000, guid: d79621df020e67241a8606dfab75b671, type: 3}
@@ -74,6 +75,7 @@ SpriteAtlas:
   - task_bg_2
   - task_bg_3
   - task_chest_2
+  - task_bg_5
   - task_bg_1
   - task_dec_1
   - task_chest_1

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

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: f90c4f99f71e3154e84b7c859c58a6cb
+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: 31, y: 31, z: 31, w: 2}
+  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: 

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

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 9266dfc5adcc5aa4dbb3c4229d655543
+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: 14, y: 17, z: 14, w: 17}
+  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: 

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

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 2c02dd0fac140614899bd855278c7f3c
+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: 28, y: 28, z: 28, w: 28}
+  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: 

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

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 58e2103287a3baf44aeb0b1dbcc3391f
+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: 26, y: 26, z: 26, w: 26}
+  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: 

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

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: cfbd8cf77f2c1e941911324a3717bcf1
+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: 27, y: 27, z: 27, w: 27}
+  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: 

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

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: f006cfdf7637acd4daa55cc3f743ac29
+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: 19, y: 19, z: 19, w: 19}
+  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: 

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

@@ -47,7 +47,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 14, y: 12, z: 14, w: 12}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1

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

@@ -47,7 +47,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 32, y: 0, z: 32, w: 0}
+  spriteBorder: {x: 92, y: 0, z: 92, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1

Assets/arts/textures/ui/daily_challenge/daily_bg_3.png.meta

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

Assets/arts/textures/ui/shop/shop_bg_6.png.meta

@@ -47,7 +47,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 8, y: 0, z: 22, w: 0}
+  spriteBorder: {x: 9, y: 0, z: 16, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1

Assets/arts/textures/ui/task/task_bg_5.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 8deb17ac17dbddd40a09e640f55f093a
+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: 

Assets/prefabs/ui/battle/battle_ui.prefab

@@ -5544,7 +5544,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -308, y: -120}
-  m_SizeDelta: {x: 68, y: 63}
+  m_SizeDelta: {x: 78, y: 84}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6341968543497613430
 CanvasRenderer:

Assets/prefabs/ui/common/message_box.prefab

@@ -34,7 +34,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: 47, y: 64}
+  m_AnchoredPosition: {x: 47, y: 61}
   m_SizeDelta: {x: 330, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &832590403912408616
@@ -238,13 +238,88 @@ RectTransform:
   m_Children:
   - {fileID: 3319119855870404306}
   m_Father: {fileID: 4002258812364763181}
-  m_RootOrder: 4
+  m_RootOrder: 6
   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: 128}
+  m_AnchoredPosition: {x: 0, y: 144}
   m_SizeDelta: {x: 550, y: 174}
   m_Pivot: {x: 0.5, y: 1}
+--- !u!1 &1376661816950440271
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3270613892521539612}
+  - component: {fileID: 8754930572931908129}
+  - component: {fileID: 4752099959868423494}
+  m_Layer: 0
+  m_Name: bg_2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3270613892521539612
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1376661816950440271}
+  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: 4002258812364763181}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 66}
+  m_SizeDelta: {x: 554, y: 203}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8754930572931908129
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1376661816950440271}
+  m_CullTransparentMesh: 1
+--- !u!114 &4752099959868423494
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1376661816950440271}
+  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: 182116de280b5e64884b108d91b70b93, 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 &3068702869260340252
 GameObject:
   m_ObjectHideFlags: 0
@@ -441,12 +516,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4002258812364763181}
-  m_RootOrder: 2
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 23}
+  m_AnchoredPosition: {x: 0, y: 25}
-  m_SizeDelta: {x: 638, y: 100}
+  m_SizeDelta: {x: 648, y: 96}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8626968315535379403
 CanvasRenderer:
@@ -516,11 +591,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4002258812364763181}
-  m_RootOrder: 3
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 4}
+  m_AnchoredPosition: {x: 0, y: 3}
   m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4149158187376799623
@@ -578,8 +653,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 44
+  m_fontSize: 35
-  m_fontSizeBase: 44
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -784,11 +859,11 @@ RectTransform:
   - {fileID: 5535816440748046611}
   - {fileID: 3647064225284467116}
   m_Father: {fileID: 4002258812364763181}
-  m_RootOrder: 5
+  m_RootOrder: 7
   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: -136}
+  m_AnchoredPosition: {x: 0, y: -120}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4918340139958855498
@@ -823,7 +898,7 @@ RectTransform:
   - {fileID: 6412234626851302671}
   - {fileID: 7209293347416129617}
   m_Father: {fileID: 4002258812364763181}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -851,7 +926,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -987,6 +1062,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 3270613892521539612}
+  - {fileID: 3161288776437297628}
   - {fileID: 7060983534625811695}
   - {fileID: 9188324771489412851}
   - {fileID: 5424090435795889818}
@@ -1029,7 +1106,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3}
+  m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1056,7 +1133,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &9188324771489412851
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1069,7 +1146,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4002258812364763181}
-  m_RootOrder: 1
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1425,6 +1502,81 @@ MonoBehaviour:
     hashName: 1800690425
     objectType: 0
     gameObject: {fileID: 4847684170095283056}
+--- !u!1 &7764244692022379159
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3161288776437297628}
+  - component: {fileID: 9063726392972117621}
+  - component: {fileID: 2907489567658645789}
+  m_Layer: 0
+  m_Name: line_img
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3161288776437297628
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7764244692022379159}
+  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: 4002258812364763181}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -35}
+  m_SizeDelta: {x: 554, y: 4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9063726392972117621
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7764244692022379159}
+  m_CullTransparentMesh: 1
+--- !u!114 &2907489567658645789
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7764244692022379159}
+  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: 14da6211cc49d5a4a8c31d4e949b3135, 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 &7884661295923494243
 GameObject:
   m_ObjectHideFlags: 0
@@ -1594,7 +1746,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -8}
-  m_SizeDelta: {x: 544, y: 152}
+  m_SizeDelta: {x: 510, y: 152}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1112107140792425333
 CanvasRenderer:
@@ -1651,12 +1803,12 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
+  m_fontSize: 26
   m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 1
   m_fontSizeMin: 22
-  m_fontSizeMax: 30
+  m_fontSizeMax: 26
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
@@ -1730,7 +1882,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: -45, y: 64}
+  m_AnchoredPosition: {x: -45, y: 61}
   m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8138152585163357604

Assets/prefabs/ui/daily_challenge/daily_challenge_task_ui.prefab

@@ -168,8 +168,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 7}
+  m_AnchoredPosition: {x: 0, y: 20}
-  m_SizeDelta: {x: 666, y: 100}
+  m_SizeDelta: {x: 648, y: 96}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6214470338001202407
 CanvasRenderer:
@@ -453,9 +453,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -89}
+  m_AnchoredPosition: {x: 0, y: -22}
   m_SizeDelta: {x: 92, y: 98}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5542832805128162729
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -624,7 +624,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: 604, y: 579}
+  m_SizeDelta: {x: 604, y: 580}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6285888487367744354
 CanvasRenderer:
@@ -654,7 +654,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d9bf4f9aeccbaef4db450cefbf2c0f2d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3e59dd84e2531004687f4aac9e94a88e, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -701,8 +701,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -401}
+  m_AnchoredPosition: {x: 0, y: -393}
-  m_SizeDelta: {x: 546, y: 146}
+  m_SizeDelta: {x: 548, y: 140}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &7890584390736762267
 MonoBehaviour:
@@ -913,8 +913,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: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -2.0478}
-  m_SizeDelta: {x: 580, y: 558}
+  m_SizeDelta: {x: 604, y: 539.9044}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5992156693851200596
 CanvasRenderer:
@@ -944,7 +944,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: fae9e7155a31e9d47a2492dcb472b22f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1303,8 +1303,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bdcabd5093d701f498daa8906bfd6eb3, type: 3}
+  m_Sprite: {fileID: 21300000, guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1378,8 +1378,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bdcabd5093d701f498daa8906bfd6eb3, type: 3}
+  m_Sprite: {fileID: 21300000, guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1501,7 +1501,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -89}
-  m_SizeDelta: {x: 546, y: 146}
+  m_SizeDelta: {x: 548, y: 140}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &7837131648353339071
 MonoBehaviour:
@@ -1562,7 +1562,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -11}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 42}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6006891100802652045
@@ -1620,8 +1620,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 44
+  m_fontSize: 35
-  m_fontSizeBase: 44
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -1727,8 +1727,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bdcabd5093d701f498daa8906bfd6eb3, type: 3}
+  m_Sprite: {fileID: 21300000, guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1889,8 +1889,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -245}
+  m_AnchoredPosition: {x: 0, y: -241}
-  m_SizeDelta: {x: 546, y: 146}
+  m_SizeDelta: {x: 548, y: 140}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1340239576367697435
 MonoBehaviour:

Assets/prefabs/ui/hero/hero_ui.prefab

@@ -527,7 +527,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 254}
-  m_SizeDelta: {x: 398, y: 66}
+  m_SizeDelta: {x: 398, y: 58}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2949573756051292502
 CanvasRenderer:
@@ -557,7 +557,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a806bb907d2075d44a8ea0a190a92c52, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 78476f8317662dd4bb348718015e3658, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -679,8 +679,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 372}
+  m_AnchoredPosition: {x: 0, y: 381}
-  m_SizeDelta: {x: 0, y: -896}
+  m_SizeDelta: {x: 0, y: -878}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4646135893159883983
 GameObject:
@@ -927,7 +927,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 20}
   m_SizeDelta: {x: 670, y: 220}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!1 &4992365693003851834
@@ -964,7 +964,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: 6}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2288057476840783197
@@ -1100,7 +1100,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -142}
-  m_SizeDelta: {x: 372, y: 74}
+  m_SizeDelta: {x: 372, y: 68}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8235367312161999114
 CanvasRenderer:
@@ -1130,7 +1130,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b9543992e195f2f47a68966feb242e7a, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2295,7 +2295,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -229.1
+      value: -209.1
       objectReference: {fileID: 0}
     - target: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Assets/prefabs/ui/idle/idle_drop_ui.prefab

@@ -36,8 +36,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: -132, y: 144}
+  m_AnchoredPosition: {x: -146, y: 144}
-  m_SizeDelta: {x: 206, y: 54}
+  m_SizeDelta: {x: 248, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6552867063905318727
 CanvasRenderer:
@@ -60,14 +60,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.78431374}
+  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: dc05a38a7a24b1e46be66fd07ad92ef8, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3cef9afc451ec9f4682eca5f161cd556, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -128,7 +128,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -114}
-  m_SizeDelta: {x: 604, y: 656}
+  m_SizeDelta: {x: 612, y: 735}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5685410845323470072
 CanvasRenderer:
@@ -158,7 +158,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3e59dd84e2531004687f4aac9e94a88e, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -168,6 +168,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1678025939562687179
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2374291485168383990}
+  - component: {fileID: 7889504456860879318}
+  - component: {fileID: 8370875507356587544}
+  m_Layer: 0
+  m_Name: time_dec
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2374291485168383990
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1678025939562687179}
+  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: 6982726213611709335}
+  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: -124.5, y: 0}
+  m_SizeDelta: {x: 42, y: 42}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7889504456860879318
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1678025939562687179}
+  m_CullTransparentMesh: 1
+--- !u!114 &8370875507356587544
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1678025939562687179}
+  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: f68fde5de9bc3bb4bb20c8c2e8de00e1, 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 &1760938599763637460
 GameObject:
   m_ObjectHideFlags: 0
@@ -292,8 +367,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: 0, y: -20}
+  m_AnchoredPosition: {x: 0, y: 18}
-  m_SizeDelta: {x: 596, y: 244}
+  m_SizeDelta: {x: 612, y: 735}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5490311891197222929
 CanvasRenderer:
@@ -323,8 +398,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 09f9c16e1cfc25c49a29ff0c74978b2e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -367,8 +442,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 3}
+  m_AnchoredPosition: {x: 0, y: 29}
-  m_SizeDelta: {x: 596, y: 183}
+  m_SizeDelta: {x: 590, y: 168}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8870385258505200731
 CanvasRenderer:
@@ -398,7 +473,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7cc4f1e808d2d6c45a721ee91ea63866, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c3e22e3f5adf9604295b23ca385609ee, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -444,8 +519,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: 132, y: 144}
+  m_AnchoredPosition: {x: 146, y: 144}
-  m_SizeDelta: {x: 206, y: 54}
+  m_SizeDelta: {x: 248, y: 62}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7165569897298718251
 CanvasRenderer:
@@ -468,14 +543,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.78431374}
+  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: dc05a38a7a24b1e46be66fd07ad92ef8, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3cef9afc451ec9f4682eca5f161cd556, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -519,8 +594,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: 0, y: 484}
+  m_AnchoredPosition: {x: 0, y: 550}
-  m_SizeDelta: {x: 578, y: 266}
+  m_SizeDelta: {x: 607, y: 307}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4239214772300553184
 CanvasRenderer:
@@ -591,8 +666,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: 20, y: 0}
+  m_AnchoredPosition: {x: 32, y: 0}
-  m_SizeDelta: {x: 160, y: 34}
+  m_SizeDelta: {x: 164, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5181204494681065324
 CanvasRenderer:
@@ -631,8 +706,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4293517023
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -649,8 +724,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 28
+  m_fontSize: 30
-  m_fontSizeBase: 28
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -727,8 +802,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: -132, y: -244}
+  m_AnchoredPosition: {x: -140, y: -268}
-  m_SizeDelta: {x: 208, y: 98}
+  m_SizeDelta: {x: 260, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5560039714779898781
 CanvasRenderer:
@@ -996,8 +1071,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: 132, y: -244}
+  m_AnchoredPosition: {x: 140, y: -268}
-  m_SizeDelta: {x: 208, y: 98}
+  m_SizeDelta: {x: 260, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &238441500098194066
 CanvasRenderer:
@@ -1084,7 +1159,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: 258}
+  m_AnchoredPosition: {x: 0, y: 284}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8155127487110914316
@@ -1118,14 +1193,14 @@ MonoBehaviour:
   m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
-  m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294958259
+    rgba: 4293517023
-  m_fontColor: {r: 0.7019608, g: 0.8627451, b: 1, a: 1}
+  m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -1142,8 +1217,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 20
+  m_fontSize: 26
-  m_fontSizeBase: 20
+  m_fontSizeBase: 26
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -1218,8 +1293,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 23}
+  m_AnchoredPosition: {x: 0, y: 41.76}
-  m_SizeDelta: {x: 658, y: 74}
+  m_SizeDelta: {x: 648, y: 96}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9052500249652226140
 CanvasRenderer:
@@ -1249,7 +1324,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1427,7 +1502,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: -168}
+  m_AnchoredPosition: {x: 0, y: -194}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6848581845443191176
@@ -1461,14 +1536,14 @@ MonoBehaviour:
   m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
-  m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294954401
+    rgba: 4293517023
-  m_fontColor: {r: 0.6313726, g: 0.8039216, b: 1, a: 1}
+  m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -1561,8 +1636,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: -148, y: 0}
+  m_AnchoredPosition: {x: -126, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 84, y: 84}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4647099537024617704
 CanvasRenderer:
@@ -1635,11 +1710,11 @@ RectTransform:
   m_Father: {fileID: 4656524465772686178}
   m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -417}
+  m_AnchoredPosition: {x: 0, y: -22}
   m_SizeDelta: {x: 92, y: 98}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9001723403354976398
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1892,8 +1967,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: -148, y: 0}
+  m_AnchoredPosition: {x: -125.5, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5194642066222139601
 CanvasRenderer:
@@ -2081,7 +2156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.9411765}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.972549}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2132,7 +2207,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 14}
+  m_AnchoredPosition: {x: 0, y: 18}
   m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8144507241992321707
@@ -2190,8 +2265,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 38
+  m_fontSize: 35
-  m_fontSizeBase: 38
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -2264,7 +2339,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: 387}
+  m_AnchoredPosition: {x: 0, y: 437}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8393883470758287776
@@ -2301,8 +2376,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: 20, y: 0}
+  m_AnchoredPosition: {x: 32, y: 0}
-  m_SizeDelta: {x: 160, y: 34}
+  m_SizeDelta: {x: 164, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &974454302075167247
 CanvasRenderer:
@@ -2429,13 +2504,14 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 2374291485168383990}
   m_Father: {fileID: 4656524465772686178}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 211}
+  m_AnchoredPosition: {x: 0, y: 219.1}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4548870878236080045
@@ -2475,8 +2551,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4288151295
+    rgba: 4279293947
-  m_fontColor: {r: 1, g: 0.99607843, b: 0.5921569, a: 1}
+  m_fontColor: {r: 0.9843137, g: 0.84313726, b: 0.0627451, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -2569,8 +2645,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: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -168}
-  m_SizeDelta: {x: 586, y: 638}
+  m_SizeDelta: {x: 590, y: 4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1100138074617284219
 CanvasRenderer:
@@ -2600,8 +2676,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4

Assets/prefabs/ui/idle/idle_quick_drop_ui.prefab

@@ -179,8 +179,9 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 4270264247505449661}
   - {fileID: 6389960186548556780}
+  - {fileID: 4270264247505449661}
+  - {fileID: 758361608683712964}
   - {fileID: 7049029323044508209}
   - {fileID: 4221149372679583734}
   - {fileID: 4420284031895143845}
@@ -226,7 +227,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3e59dd84e2531004687f4aac9e94a88e, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -266,11 +267,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -15}
+  m_AnchoredPosition: {x: 0, y: -19.2}
   m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1105981278997628609
@@ -328,8 +329,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 38
+  m_fontSize: 35
-  m_fontSizeBase: 38
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -400,12 +401,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -27}
-  m_SizeDelta: {x: 658, y: 100}
+  m_SizeDelta: {x: 648, y: 96}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3535639259602342664
 CanvasRenderer:
@@ -475,12 +476,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 98}
+  m_AnchoredPosition: {x: 0, y: 332}
-  m_SizeDelta: {x: 596, y: 190}
+  m_SizeDelta: {x: 576, y: 253}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2802023989789994762
 CanvasRenderer:
@@ -510,8 +511,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7cc4f1e808d2d6c45a721ee91ea63866, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -550,11 +551,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 128, y: 162}
+  m_AnchoredPosition: {x: 128, y: 178}
   m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2146545294632043859
@@ -684,12 +685,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5824817785426559824}
-  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: 3, y: 0}
+  m_AnchoredPosition: {x: 3, y: 18}
-  m_SizeDelta: {x: 580, y: 488}
+  m_SizeDelta: {x: 604, y: 512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8057384570534877082
 CanvasRenderer:
@@ -719,7 +720,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3}
+  m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -804,11 +805,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -128, y: 162}
+  m_AnchoredPosition: {x: -128, y: 178}
   m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5422128264756802460
@@ -939,7 +940,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1320,7 +1321,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -1364,8 +1365,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4293517023
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -1457,12 +1458,12 @@ RectTransform:
   - {fileID: 4697163360925500842}
   - {fileID: 3829783116499395527}
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 128, y: 82}
+  m_AnchoredPosition: {x: 142, y: 98}
-  m_SizeDelta: {x: 208, y: 98}
+  m_SizeDelta: {x: 260, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4476084347139963026
 CanvasRenderer:
@@ -1621,12 +1622,12 @@ RectTransform:
   m_Children:
   - {fileID: 9199376469887762578}
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 5
+  m_RootOrder: 6
   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: 17}
+  m_AnchoredPosition: {x: 0, y: 27.098}
-  m_SizeDelta: {x: 540, y: 160}
+  m_SizeDelta: {x: 540, y: 139.804}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5435679284725380852
 MonoBehaviour:
@@ -1680,6 +1681,81 @@ MonoBehaviour:
   cellWidth: 110
   cellHeight: 110
   perLineNum: 5
+--- !u!1 &7448972228115073334
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 758361608683712964}
+  - component: {fileID: 2297742076330956749}
+  - component: {fileID: 3386557799625179306}
+  m_Layer: 0
+  m_Name: line_img
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &758361608683712964
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448972228115073334}
+  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: 5824817785426559824}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -50}
+  m_SizeDelta: {x: 576, y: 4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2297742076330956749
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448972228115073334}
+  m_CullTransparentMesh: 1
+--- !u!114 &3386557799625179306
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448972228115073334}
+  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: 14da6211cc49d5a4a8c31d4e949b3135, 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 &8500447877503011717
 GameObject:
   m_ObjectHideFlags: 0
@@ -1847,12 +1923,12 @@ RectTransform:
   - {fileID: 8794124783256451373}
   - {fileID: 7393112978515928227}
   m_Father: {fileID: 5824817785426559824}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -128, y: 82}
+  m_AnchoredPosition: {x: -142, y: 98}
-  m_SizeDelta: {x: 208, y: 98}
+  m_SizeDelta: {x: 260, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9137130774746693871
 CanvasRenderer:
@@ -2108,16 +2184,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
---- !u!224 &432352143166637718 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
-  m_PrefabInstance: {fileID: 2713118702985934530}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8691094051543786312 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
   m_PrefabInstance: {fileID: 2713118702985934530}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &432352143166637718 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
+  m_PrefabInstance: {fileID: 2713118702985934530}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &8384887845503554016
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/prefabs/ui/setting/account_delete_ui.prefab

@@ -165,6 +165,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2762441095124849290}
+  - {fileID: 2803354640743852975}
   - {fileID: 1272262770565773330}
   - {fileID: 2537823800076304984}
   - {fileID: 8062662385405965680}
@@ -207,7 +208,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3}
+  m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -230,6 +231,81 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   IsShowClickAnimation: 0
+--- !u!1 &3188092665078224429
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2803354640743852975}
+  - component: {fileID: 4256089847539201819}
+  - component: {fileID: 4351789992757987905}
+  m_Layer: 0
+  m_Name: line_img
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2803354640743852975
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3188092665078224429}
+  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: 7133449724374758546}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -73}
+  m_SizeDelta: {x: 554, y: 4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4256089847539201819
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3188092665078224429}
+  m_CullTransparentMesh: 1
+--- !u!114 &4351789992757987905
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3188092665078224429}
+  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: 14da6211cc49d5a4a8c31d4e949b3135, 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 &3370186581706434975
 GameObject:
   m_ObjectHideFlags: 0
@@ -260,12 +336,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7133449724374758546}
-  m_RootOrder: 4
+  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: 68}
+  m_AnchoredPosition: {x: 0, y: 74}
-  m_SizeDelta: {x: 480, y: 94}
+  m_SizeDelta: {x: 480, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8668314952455990914
 CanvasRenderer:
@@ -394,12 +470,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7133449724374758546}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 23}
-  m_SizeDelta: {x: 638, y: 100}
+  m_SizeDelta: {x: 648, y: 98}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &753967020505844501
 CanvasRenderer:
@@ -470,7 +546,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7133449724374758546}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -560,12 +636,12 @@ RectTransform:
   m_Children:
   - {fileID: 2836842110304094354}
   m_Father: {fileID: 7133449724374758546}
-  m_RootOrder: 5
+  m_RootOrder: 6
   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: -30}
+  m_AnchoredPosition: {x: 0, y: -26}
-  m_SizeDelta: {x: 490, y: 70}
+  m_SizeDelta: {x: 484, y: 66}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8069970846450131700
 CanvasRenderer:
@@ -595,7 +671,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: dc05a38a7a24b1e46be66fd07ad92ef8, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9266dfc5adcc5aa4dbb3c4229d655543, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -785,11 +861,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7133449724374758546}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 4}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1316726522710191706
@@ -847,8 +923,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 44
+  m_fontSize: 35
-  m_fontSizeBase: 44
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -1212,8 +1288,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: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 64}
-  m_SizeDelta: {x: 552, y: 402}
+  m_SizeDelta: {x: 554, y: 276}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5683995592270356894
 CanvasRenderer:
@@ -1243,8 +1319,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1312,7 +1388,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.9411765}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.972549}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1569,11 +1645,11 @@ RectTransform:
   - {fileID: 4938657433699279697}
   - {fileID: 7593470071151554287}
   m_Father: {fileID: 7133449724374758546}
-  m_RootOrder: 6
+  m_RootOrder: 7
   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: -134}
+  m_AnchoredPosition: {x: 0, y: -138}
   m_SizeDelta: {x: 200, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2481405032920487095

Assets/prefabs/ui/setting/game_setting_ui.prefab

@@ -524,7 +524,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.98039216}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.972549}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -608,7 +608,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2401,7 +2401,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/prefabs/ui/setting/language_ui.prefab

@@ -34,8 +34,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 4}
+  m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: 263, y: 30}
+  m_SizeDelta: {x: 263, y: 60}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1572974857966272460
 CanvasRenderer:
@@ -92,8 +92,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 38
+  m_fontSize: 35
-  m_fontSizeBase: 38
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -199,7 +199,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: dc05a38a7a24b1e46be66fd07ad92ef8, type: 3}
+  m_Sprite: {fileID: 21300000, guid: f006cfdf7637acd4daa55cc3f743ac29, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -294,8 +294,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 18}
+  m_AnchoredPosition: {x: 0, y: -81}
-  m_SizeDelta: {x: 666, y: 76}
+  m_SizeDelta: {x: 588, y: 4}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7367952473038335167
 CanvasRenderer:
@@ -325,8 +325,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -373,7 +373,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -55}
+  m_AnchoredPosition: {x: 0, y: -166}
   m_SizeDelta: {x: 560, y: 641}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &7791765319350537533
@@ -502,10 +502,10 @@ RectTransform:
   m_Father: {fileID: 6532261956592226185}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -402}
+  m_AnchoredPosition: {x: 0, y: -22}
-  m_SizeDelta: {x: 110, y: 112}
+  m_SizeDelta: {x: 92, y: 98}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1394063912138427145
 CanvasRenderer:
@@ -616,7 +616,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.9411765}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.972549}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -674,7 +674,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 38}
-  m_SizeDelta: {x: 604, y: 724}
+  m_SizeDelta: {x: 610, y: 950}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5192491331257177057
 CanvasRenderer:
@@ -704,7 +704,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3}
+  m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -797,7 +797,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: 0}
+  m_AnchoredPosition: {x: 0, y: 2}
   m_SizeDelta: {x: 280, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6025049629819227328
@@ -984,8 +984,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: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -37}
-  m_SizeDelta: {x: 580, y: 700}
+  m_SizeDelta: {x: 588, y: 854}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &322732028285703719
 CanvasRenderer:
@@ -1015,7 +1015,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3}
+  m_Sprite: {fileID: 21300000, guid: f90c4f99f71e3154e84b7c859c58a6cb, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/prefabs/ui/shop/cell/gem_cell.prefab

@@ -1457,7 +1457,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -55, y: -11}
-  m_SizeDelta: {x: 32, y: 32}
+  m_SizeDelta: {x: 40, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3564436532434238824
 CanvasRenderer:

Assets/prefabs/ui/task/task_main_ui.prefab

@@ -30,11 +30,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 4
+  m_RootOrder: 7
   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: 473.99988}
+  m_AnchoredPosition: {x: 0, y: 483}
   m_SizeDelta: {x: 600, y: 50}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1572974857966272460
@@ -92,8 +92,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 38
+  m_fontSize: 35
-  m_fontSizeBase: 38
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -168,7 +168,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: -27}
+  m_AnchoredPosition: {x: 0, y: -24}
   m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5301918960717275302
@@ -199,7 +199,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 
+  m_text: 7/10
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
@@ -354,8 +354,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: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 34.5}
-  m_SizeDelta: {x: 260, y: 78}
+  m_SizeDelta: {x: 224, y: 147}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &253170149855149243
 CanvasRenderer:
@@ -385,7 +385,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: cc36a2865259e6a449af8d0bfe2b7165, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 58e2103287a3baf44aeb0b1dbcc3391f, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -429,8 +429,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: -68, y: 26}
+  m_AnchoredPosition: {x: -56, y: 26}
-  m_SizeDelta: {x: 360, y: 42}
+  m_SizeDelta: {x: 340, y: 42}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7027714996318051783
 CanvasRenderer:
@@ -463,13 +463,13 @@ MonoBehaviour:
   m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
-  m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278193712
+    rgba: 4294967295
   m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -562,7 +562,7 @@ RectTransform:
   - {fileID: 4086456811391204939}
   - {fileID: 8690509390277946908}
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 0
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -604,8 +604,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: 0, y: 5.5}
+  m_AnchoredPosition: {x: 0, y: 40}
-  m_SizeDelta: {x: 260, y: 67}
+  m_SizeDelta: {x: 224, y: 136}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1268972668852625135
 CanvasRenderer:
@@ -635,7 +635,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3}
+  m_Sprite: {fileID: 21300000, guid: cfbd8cf77f2c1e941911324a3717bcf1, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -844,7 +844,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: -18, y: -27}
+  m_AnchoredPosition: {x: -18, y: -24}
   m_SizeDelta: {x: 372, y: 26}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2397443413598753022
@@ -875,7 +875,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 55feeb1282994f248bebbf10510de820, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3b14bc3747e2c3248b47a3ac14d44d6d, type: 3}
   m_FillDirection: 0
   m_Value: 1
   m_FillCenter: 1
@@ -913,7 +913,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: 6.3}
+  m_AnchoredPosition: {x: 0, y: -25}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1823954749724519850
@@ -953,8 +953,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4294959086
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 0.93333334, g: 0.8745098, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -1128,8 +1128,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: 0, y: 332}
+  m_AnchoredPosition: {x: 0, y: 328}
-  m_SizeDelta: {x: 590, y: 126}
+  m_SizeDelta: {x: 540, y: 123}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4329238011457931236
 CanvasRenderer:
@@ -1199,7 +1199,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 8
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1234,7 +1234,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 
+  m_text: 22
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2}
@@ -1243,8 +1243,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 1862270975
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 1, g: 1, b: 1, a: 0.43137255}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -1338,8 +1338,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: 0, y: 5.5}
+  m_AnchoredPosition: {x: 0, y: 40}
-  m_SizeDelta: {x: 260, y: 67}
+  m_SizeDelta: {x: 224, y: 136}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2622621704480206608
 CanvasRenderer:
@@ -1369,7 +1369,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3}
+  m_Sprite: {fileID: 21300000, guid: cfbd8cf77f2c1e941911324a3717bcf1, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1450,12 +1450,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 11
+  m_RootOrder: 12
   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: -626}
-  m_SizeDelta: {x: 110, y: 112}
+  m_SizeDelta: {x: 92, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1394063912138427145
 CanvasRenderer:
@@ -1541,11 +1541,11 @@ RectTransform:
   - {fileID: 8738273150448149134}
   - {fileID: 4318768423213172336}
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 10
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 137, y: -508}
+  m_AnchoredPosition: {x: 122, y: -508}
   m_SizeDelta: {x: 260, y: 78}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8627651650936142805
@@ -1619,12 +1619,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 3
+  m_RootOrder: 6
   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: 3, y: 478}
+  m_AnchoredPosition: {x: 3, y: 501.65}
-  m_SizeDelta: {x: 668, y: 76}
+  m_SizeDelta: {x: 630, y: 96}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2097148792110615354
 CanvasRenderer:
@@ -1699,8 +1699,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: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 34.5}
-  m_SizeDelta: {x: 260, y: 78}
+  m_SizeDelta: {x: 224, y: 147}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7679907253159616140
 CanvasRenderer:
@@ -1730,7 +1730,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: cc36a2865259e6a449af8d0bfe2b7165, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 58e2103287a3baf44aeb0b1dbcc3391f, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1770,25 +1770,26 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 411983773365797962}
+  - {fileID: 3498604241719235530}
+  - {fileID: 3424411108175688788}
+  - {fileID: 1594777999222045530}
   - {fileID: 1717350982681933471}
   - {fileID: 228257302066324538}
-  - {fileID: 3424411108175688788}
   - {fileID: 2188061556602828232}
   - {fileID: 7437306225081421888}
   - {fileID: 8305933779100199815}
   - {fileID: 1191732750637307813}
   - {fileID: 3685336090030426828}
   - {fileID: 7220446982031409581}
-  - {fileID: 411983773365797962}
-  - {fileID: 3498604241719235530}
   - {fileID: 1226788473560635264}
   m_Father: {fileID: 8461932745927490369}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -397}
+  m_AnchoredPosition: {x: 0, y: -410}
-  m_SizeDelta: {x: 650, y: 938}
+  m_SizeDelta: {x: 612, y: 962}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5192491331257177057
 CanvasRenderer:
@@ -1818,7 +1819,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d9bf4f9aeccbaef4db450cefbf2c0f2d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3e59dd84e2531004687f4aac9e94a88e, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1872,7 +1873,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 7
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1960,7 +1961,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 6
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2039,8 +2040,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: 0, y: 335}
+  m_AnchoredPosition: {x: 0, y: 330}
-  m_SizeDelta: {x: 642, y: 168}
+  m_SizeDelta: {x: 590, y: 182}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &861427605740465442
 CanvasRenderer:
@@ -2070,7 +2071,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: baac6818c7f9ee248a78358bd8adf2ed, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2113,11 +2114,11 @@ RectTransform:
   - {fileID: 4686210754337309200}
   - {fileID: 8150916024814307932}
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 9
+  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: -137, y: -508}
+  m_AnchoredPosition: {x: -122, y: -508}
   m_SizeDelta: {x: 260, y: 78}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8468099356221304698
@@ -2199,8 +2200,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: 0, y: 140}
+  m_AnchoredPosition: {x: 0, y: 150}
-  m_SizeDelta: {x: 610, y: 536}
+  m_SizeDelta: {x: 610, y: 545}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &8186829031135396793
 MonoBehaviour:
@@ -2252,7 +2253,7 @@ MonoBehaviour:
   direction: 0
   reverse: 0
   cellWidth: 560
-  cellHeight: 170
+  cellHeight: 176
   perLineNum: 1
 --- !u!222 &5325267443351488392
 CanvasRenderer:
@@ -2325,12 +2326,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 5
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -284, y: 474}
+  m_AnchoredPosition: {x: -280, y: 467}
-  m_SizeDelta: {x: 128, y: 118}
+  m_SizeDelta: {x: 83, y: 104}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4001867264631525538
 CanvasRenderer:
@@ -2440,7 +2441,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: -230, y: -27}
+  m_AnchoredPosition: {x: -216, y: -24}
   m_SizeDelta: {x: 70, y: 38}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9188642297531164419
@@ -2566,7 +2567,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: 0.8000002}
+  m_AnchoredPosition: {x: 0, y: -23}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4043801282443966034
@@ -2606,8 +2607,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294947198
+    rgba: 4289166725
-  m_fontColor: {r: 0.49411765, g: 0.69411767, b: 1, a: 1}
+  m_fontColor: {r: 0.52156866, g: 0.49019608, b: 0.654902, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -2731,7 +2732,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 89783d5ddc9ab034687ff93732ebdfe0, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 75eeb868e0670844e959094562d14ec7, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3024,7 +3025,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 
+  m_text: 1500/2000
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
@@ -3127,7 +3128,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: 0.8000002}
+  m_AnchoredPosition: {x: 0, y: -23}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2801242062060172198
@@ -3168,7 +3169,7 @@ MonoBehaviour:
   m_fontColor32:
     serializedVersion: 2
     rgba: 4294947198
-  m_fontColor: {r: 0.49411765, g: 0.69411767, b: 1, a: 1}
+  m_fontColor: {r: 0.52156866, g: 0.49019608, b: 0.654902, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -3318,7 +3319,7 @@ MonoBehaviour:
   direction: 0
   reverse: 0
   cellWidth: 560
-  cellHeight: 170
+  cellHeight: 176
   perLineNum: 1
 --- !u!222 &8750002508533147591
 CanvasRenderer:
@@ -3390,7 +3391,7 @@ RectTransform:
   m_Children:
   - {fileID: 5445415383550799454}
   m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 1
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -3506,8 +3507,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: -50, y: 18}
+  m_AnchoredPosition: {x: -50, y: 11}
-  m_SizeDelta: {x: 380, y: 52}
+  m_SizeDelta: {x: 380, y: 43}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2606637421907804983
 CanvasRenderer:
@@ -3567,9 +3568,9 @@ MonoBehaviour:
   m_fontSize: 22
   m_fontSizeBase: 22
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
-  m_fontSizeMin: 18
+  m_fontSizeMin: 16
-  m_fontSizeMax: 72
+  m_fontSizeMax: 22
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
@@ -3640,7 +3641,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: 6.3}
+  m_AnchoredPosition: {x: 0, y: -25}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4908844806183821195
@@ -3681,7 +3682,7 @@ MonoBehaviour:
   m_fontColor32:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 0.93333334, g: 0.8745098, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -3776,7 +3777,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: 196, y: -22}
+  m_AnchoredPosition: {x: 196, y: -19}
   m_SizeDelta: {x: 74, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8978335951548914598
@@ -3864,7 +3865,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: -15, y: -27}
+  m_AnchoredPosition: {x: -15, y: -24}
   m_SizeDelta: {x: 390, y: 32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7897972005766237007
@@ -3895,7 +3896,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 89783d5ddc9ab034687ff93732ebdfe0, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 75eeb868e0670844e959094562d14ec7, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3939,8 +3940,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: 0, y: 253}
+  m_AnchoredPosition: {x: 0, y: 237}
-  m_SizeDelta: {x: 642, y: 4}
+  m_SizeDelta: {x: 590, y: 4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8615987266993411141
 CanvasRenderer:
@@ -3970,7 +3971,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4016,6 +4017,81 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -0.0007019043}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8546462964792797845
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1594777999222045530}
+  - component: {fileID: 2602550201923722890}
+  - component: {fileID: 4548724399866026536}
+  m_Layer: 0
+  m_Name: bg_2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1594777999222045530
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8546462964792797845}
+  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: 6532261956592226185}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 330}
+  m_SizeDelta: {x: 590, y: 182}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2602550201923722890
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8546462964792797845}
+  m_CullTransparentMesh: 1
+--- !u!114 &4548724399866026536
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8546462964792797845}
+  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: 182116de280b5e64884b108d91b70b93, 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 &8597414052440258313
 GameObject:
   m_ObjectHideFlags: 0
@@ -4050,8 +4126,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: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 18}
-  m_SizeDelta: {x: 628, y: 917}
+  m_SizeDelta: {x: 612, y: 962}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &406661778615083129
 CanvasRenderer:
@@ -4081,7 +4157,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3}
+  m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4169,7 +4245,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 42393117828466665, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -233
+      value: -213
       objectReference: {fileID: 0}
     - target: {fileID: 42393117828466665, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -4177,19 +4253,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 70874779846013668, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -233
+      value: -213
       objectReference: {fileID: 0}
     - target: {fileID: 70874779846013668, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 33
       objectReference: {fileID: 0}
+    - target: {fileID: 719542838842613124, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 330
+      objectReference: {fileID: 0}
     - target: {fileID: 719542838842613124, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: -87
       objectReference: {fileID: 0}
     - target: {fileID: 931398045325876126, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -233
+      value: -213
       objectReference: {fileID: 0}
     - target: {fileID: 931398045325876126, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -4209,7 +4289,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1954401876872531239, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -233
+      value: -213
       objectReference: {fileID: 0}
     - target: {fileID: 1954401876872531239, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -4223,6 +4303,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3000390786544823014, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -216
+      objectReference: {fileID: 0}
     - target: {fileID: 3064469364167565866, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -4253,11 +4337,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3064469364167565866, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 590
+      value: 548
       objectReference: {fileID: 0}
     - target: {fileID: 3064469364167565866, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 163
+      value: 168
       objectReference: {fileID: 0}
     - target: {fileID: 3064469364167565866, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_LocalPosition.x
@@ -4309,7 +4393,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3916548395797807994, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
+      objectReference: {fileID: 0}
+    - target: {fileID: 5208734723623345542, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 288
+      objectReference: {fileID: 0}
+    - target: {fileID: 5208734723623345542, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -28
       objectReference: {fileID: 0}
     - target: {fileID: 5621918582213996822, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_Name
@@ -4317,11 +4409,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6210004106136377942, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
       objectReference: {fileID: 0}
+    - target: {fileID: 7164713012944202504, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7440014068188440130, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 75eeb868e0670844e959094562d14ec7, type: 3}
     - target: {fileID: 7466029472694480632, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
       objectReference: {fileID: 0}
     - target: {fileID: 7466029472694480632, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -4331,20 +4431,37 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, type: 3}
+    - target: {fileID: 8211814190925663385, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_text
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8211822586899589403, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 324
+      objectReference: {fileID: 0}
     - target: {fileID: 8262668739063961505, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
+      objectReference: {fileID: 0}
+    - target: {fileID: 8357730635094373705, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 254
       objectReference: {fileID: 0}
     - target: {fileID: 8357730635094373705, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -24
+      value: -32
       objectReference: {fileID: 0}
     - target: {fileID: 8634657496497671586, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+--- !u!224 &711818154494254312 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3064469364167565866, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+  m_PrefabInstance: {fileID: 2551232502166175426}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &9089388801250608965 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 6720552088960465287, guid: 4c57b04c440382a448735925c47dc404, type: 3}
@@ -4356,11 +4473,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &711818154494254312 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3064469364167565866, guid: 4c57b04c440382a448735925c47dc404, type: 3}
-  m_PrefabInstance: {fileID: 2551232502166175426}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4448816657265634055
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4370,7 +4482,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 42393117828466665, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -233
+      value: -213
       objectReference: {fileID: 0}
     - target: {fileID: 42393117828466665, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -4378,19 +4490,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 70874779846013668, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -233
+      value: -213
       objectReference: {fileID: 0}
     - target: {fileID: 70874779846013668, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 33
       objectReference: {fileID: 0}
+    - target: {fileID: 719542838842613124, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 330
+      objectReference: {fileID: 0}
     - target: {fileID: 719542838842613124, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: -87
       objectReference: {fileID: 0}
     - target: {fileID: 931398045325876126, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -233
+      value: -213
       objectReference: {fileID: 0}
     - target: {fileID: 931398045325876126, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -4406,7 +4522,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1954401876872531239, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -233
+      value: -213
       objectReference: {fileID: 0}
     - target: {fileID: 1954401876872531239, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -4442,11 +4558,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3064469364167565866, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 590
+      value: 548
       objectReference: {fileID: 0}
     - target: {fileID: 3064469364167565866, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 163
+      value: 168
       objectReference: {fileID: 0}
     - target: {fileID: 3064469364167565866, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_LocalPosition.x
@@ -4498,7 +4614,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3916548395797807994, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
       objectReference: {fileID: 0}
     - target: {fileID: 5621918582213996822, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_Name
@@ -4506,11 +4622,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6210004106136377942, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
       objectReference: {fileID: 0}
+    - target: {fileID: 7440014068188440130, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 75eeb868e0670844e959094562d14ec7, type: 3}
     - target: {fileID: 7466029472694480632, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
       objectReference: {fileID: 0}
     - target: {fileID: 7466029472694480632, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -4520,17 +4640,25 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, type: 3}
+    - target: {fileID: 8211822586899589403, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 324
+      objectReference: {fileID: 0}
     - target: {fileID: 8262668739063961505, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
+      objectReference: {fileID: 0}
+    - target: {fileID: 8357730635094373705, guid: 4c57b04c440382a448735925c47dc404, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 254
       objectReference: {fileID: 0}
     - target: {fileID: 8357730635094373705, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -24
+      value: -32
       objectReference: {fileID: 0}
     - target: {fileID: 8634657496497671586, guid: 4c57b04c440382a448735925c47dc404, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 189
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4c57b04c440382a448735925c47dc404, type: 3}

Assets/prefabs/ui/tips/desc_tips.prefab

@@ -216,8 +216,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 4}
+  m_AnchoredPosition: {x: 0, y: 6}
-  m_SizeDelta: {x: 30, y: 22}
+  m_SizeDelta: {x: 35, y: 23}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &569324968268049922
 CanvasRenderer:

Assets/prefabs/ui/tips/rewards_tips.prefab

@@ -311,8 +311,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 5}
+  m_AnchoredPosition: {x: 0, y: 6}
-  m_SizeDelta: {x: 30, y: 16}
+  m_SizeDelta: {x: 35, y: 23}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &563715109830167051
 CanvasRenderer:
@@ -982,8 +982,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: 0, y: -48.5}
+  m_AnchoredPosition: {x: 0, y: -47.5}
-  m_SizeDelta: {x: 294, y: 75}
+  m_SizeDelta: {x: 288, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1537634711252562137
 CanvasRenderer: