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

2023-06-02 20:36:26 +08:00 · 2023-06-02 20:36:26 +08:00 · 1c92f87fc3
commit 1c92f87fc3
parent d44d237be1 a698707102
18 changed files with 267 additions and 93 deletions
--- a/Assets/arts/atlas/ui/common.asset
+++ b/Assets/arts/atlas/ui/common.asset
@ -92,6 +92,7 @@ MonoBehaviour:
  - {fileID: 21300000, guid: 15a10479bd4a42c459af0778f0f3c004, type: 3}
  - {fileID: 21300000, guid: b580961da7927cb45b605286d0a73c48, type: 3}
  - {fileID: 21300000, guid: 15dba989362b02149bdcef5c42ca474c, type: 3}
+  - {fileID: 21300000, guid: 39479e4453f65544fac7cfe3ac9647cf, type: 3}
  - {fileID: 21300000, guid: 7e9c0788fba4a824f9213b892c30a542, type: 3}
  - {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3}
  - {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3}
@ -135,4 +136,4 @@ MonoBehaviour:
  - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3}
  - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
  - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3}
-  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782ee49916fef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19be2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a50349739513497395234973953349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158
+  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782ee49916fef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19be2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a5034973951349739523497395334973954349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158
--- a/Assets/arts/atlas/ui/main.asset
+++ b/Assets/arts/atlas/ui/main.asset
@ -14,10 +14,15 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  spriteList:
  - {fileID: 21300000, guid: 6a471cbadff649e429c3ca4a54c0fd4b, type: 3}
+  - {fileID: 21300000, guid: 8a9700718a817d044a55010e6b9bbebe, type: 3}
  - {fileID: 21300000, guid: ddc829b8adf444b43a57f7ddbd279aa9, type: 3}
+  - {fileID: 21300000, guid: 5962af8bc86575c459b454d2266f805a, type: 3}
  - {fileID: 21300000, guid: 71b8dea8a7194514fb8080ece6fc9754, type: 3}
  - {fileID: 21300000, guid: 2fb37763918aa214996639ea5bba0fd1, type: 3}
  - {fileID: 21300000, guid: 4680a6d0492bed44b921834aa9f289d4, type: 3}
+  - {fileID: 21300000, guid: a9400659f83a46f42a5c2e88c3d44dbf, type: 3}
+  - {fileID: 21300000, guid: 57c52a73daf4de746b0dda650dfc8ee4, type: 3}
+  - {fileID: 21300000, guid: 1b39231a2439e764c91127d5180e9960, type: 3}
  - {fileID: 21300000, guid: 42b38fed8c8d3464c925bb559928d444, type: 3}
  - {fileID: 21300000, guid: 9801a63125a239349aa621a6aaf6b164, type: 3}
  - {fileID: 21300000, guid: d5338fcb9468f5d4fb50f0b3cb68be90, type: 3}
@ -31,4 +36,4 @@ MonoBehaviour:
  - {fileID: 21300000, guid: 4acb7dd045b38d445adbf073200bd73a, type: 3}
  - {fileID: 21300000, guid: 64f989e8b40a3fc4ea138aa6d314d7be, type: 3}
  - {fileID: 21300000, guid: df3282ede5d4e6740b33cbb893059cb3, type: 3}
-  spriteNameList: 7d7901f1348a45df6b7a72e76c7a72e76d7a72e73b208104d5cfde8b80658304a5b4b1319b75338ce7ad997bb87f34fa4e9586042e11492f2f11492f3011492f3111492f61a4d796
+  spriteNameList: 7d7901f17e7901f1348a45df8e8280046b7a72e76c7a72e76d7a72e7ea9fa59e992f0ec35a7dbed43b208104d5cfde8b80658304a5b4b1319b75338ce7ad997bb87f34fa4e9586042e11492f2f11492f3011492f3111492f61a4d796
--- a/Assets/arts/textures/background/battle_common/chessboard_3.png
+++ b/Assets/arts/textures/background/battle_common/chessboard_3.png
--- a/Assets/arts/textures/background/battle_common/chessboard_3.png.meta
+++ b/Assets/arts/textures/background/battle_common/chessboard_3.png.meta
@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 557fb3b255aca8148b5b9da0556a9e10
+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: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/textures/background/battle_common/chessboard_3_1.png
+++ b/Assets/arts/textures/background/battle_common/chessboard_3_1.png
--- a/Assets/arts/textures/background/battle_common/chessboard_3_1.png.meta
+++ b/Assets/arts/textures/background/battle_common/chessboard_3_1.png.meta
@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 07cfec0e0d5469d4ea7b4cabfc779f1d
+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: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/textures/ui/common/common_title_5.png.meta
+++ b/Assets/arts/textures/ui/common/common_title_5.png.meta
@ -47,7 +47,7 @@ TextureImporter:
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
-  spriteBorder: {x: 72, y: 0, z: 72, w: 0}
+  spriteBorder: {x: 94, y: 0, z: 94, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
--- a/Assets/arts/textures/ui/main/main_dec_3.png
+++ b/Assets/arts/textures/ui/main/main_dec_3.png
--- a/Assets/arts/textures/ui/main/main_dec_4.png
+++ b/Assets/arts/textures/ui/main/main_dec_4.png
--- a/Assets/lua/app/config/chapter.lua.bytes
+++ b/Assets/lua/app/config/chapter.lua.bytes
--- a/Assets/lua/app/config/grid_type.lua.bytes
+++ b/Assets/lua/app/config/grid_type.lua.bytes
--- a/Assets/lua/app/config/skill.lua.bytes
+++ b/Assets/lua/app/config/skill.lua.bytes
--- a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
+++ b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_helper.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_helper.lua.bytes
--- a/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes
+++ b/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes
--- a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
+++ b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
--- a/Assets/prefabs/ui/main_city/main_comp.prefab
+++ b/Assets/prefabs/ui/main_city/main_comp.prefab
@ -171,9 +171,9 @@ RectTransform:
  m_Father: {fileID: 4165930251451731960}
  m_RootOrder: 6
  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: 244}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -396}
  m_SizeDelta: {x: 334, y: 122}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1733368072151716140
@ -623,9 +623,9 @@ RectTransform:
  m_Father: {fileID: 4165930251451731960}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 244}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -396}
  m_SizeDelta: {x: 158, y: 94}
  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &2741045534911002026
@ -1057,9 +1057,9 @@ RectTransform:
  m_Father: {fileID: 4165930251451731960}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 244}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -396}
  m_SizeDelta: {x: 158, y: 94}
  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6370390820492705620
@ -1447,6 +1447,10 @@ MonoBehaviour:
    hashName: 1059715127
    objectType: 0
    gameObject: {fileID: 2833670430972826898}
+  - name: main_comp.hero_bg
+    hashName: 2154258321
+    objectType: 0
+    gameObject: {fileID: 3995920760742853779}
 --- !u!114 &6214590949040345325
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab
+++ b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab
@ -35,7 +35,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: -85, y: 4}
-  m_SizeDelta: {x: 56, y: 55}
+  m_SizeDelta: {x: 55, y: 40}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &313892473971810460
 CanvasRenderer:
@ -110,7 +110,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: -85, y: 4}
-  m_SizeDelta: {x: 56, y: 55}
+  m_SizeDelta: {x: 51, y: 53}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8209206685049566069
 CanvasRenderer:
@ -183,7 +183,7 @@ RectTransform:
  - {fileID: 7478773028872524474}
  - {fileID: 1451918511630981069}
  m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
@ -274,7 +274,7 @@ RectTransform:
  - {fileID: 6334354001788662849}
  - {fileID: 5392157314889844364}
  m_Father: {fileID: 6532261956592226185}
-  m_RootOrder: 1
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
@ -585,7 +585,6 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 7077758373212730012}
  - {fileID: 2198481086097669730}
  - {fileID: 3251564394244787417}
  m_Father: {fileID: 8461932745927490369}
@ -624,7 +623,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
@ -922,78 +921,3 @@ MonoBehaviour:
  NotchScreenNodeList:
  - gameObject: {fileID: 4117970956418931131}
    adjustHeight: 0
--- !u!1 &6633300487883976769
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7077758373212730012}
-  - component: {fileID: 322732028285703719}
-  - component: {fileID: 8391154702939284094}
-  m_Layer: 5
-  m_Name: image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &7077758373212730012
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6633300487883976769}
-  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: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -28, y: -28}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &322732028285703719
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6633300487883976769}
-  m_CullTransparentMesh: 1
--- !u!114 &8391154702939284094
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6633300487883976769}
-  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: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1