fix bug

Assets/arts/atlas/ui/common.asset

@@ -53,6 +53,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 864645145b73d4ab8a2444427acabf23, type: 3}
   - {fileID: 21300000, guid: 4adc98f87356148c59cef776847f9914, type: 3}
   - {fileID: 21300000, guid: 769955952967445c4880e9db82df6b7d, type: 3}
+  - {fileID: 21300000, guid: 2ea0b70e315bb48a49bac0278c8aaa02, type: 3}
   - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3}
   - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3}
   - {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, type: 3}
@@ -289,4 +290,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3}
   - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
   - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3}
-  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1ba07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220558aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158
+  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1ba07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220558aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158

Assets/arts/atlas/ui/common.spriteatlas

@@ -310,6 +310,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: d327a0cd3898fb243a58a59000a18360, type: 3}
   - {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3}
   - {fileID: 21300000, guid: 7e3bb9edf39be47648346917cf86578c, type: 3}
+  - {fileID: 21300000, guid: 2ea0b70e315bb48a49bac0278c8aaa02, type: 3}
   - {fileID: 21300000, guid: 87e1b70e6b948a948b9342e7e131f80a, type: 3}
   - {fileID: 21300000, guid: ce3ecf0e5cac5d4489328b0b8e3b5123, type: 3}
   - {fileID: 21300000, guid: ef885e1efc66548f9955be4765ea37ab, type: 3}
@@ -587,6 +588,7 @@ SpriteAtlas:
   - common_board_128
   - common_btn_green_3
   - common_arrow_5
+  - common_bg_36
   - common_dec_8
   - common_dec_9
   - common_dec_power

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

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 2ea0b70e315bb48a49bac0278c8aaa02
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 16, y: 16, z: 16, w: 16}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/prefabs/ui/hero/hero_detail_ui.prefab

@@ -5322,9 +5322,9 @@ RectTransform:
   m_Father: {fileID: 2584119948269024356}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 395}
+  m_AnchoredPosition: {x: 0, y: -83}
   m_SizeDelta: {x: 570, y: 250}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &2540933998899479575
@@ -5414,8 +5414,8 @@ MonoBehaviour:
   isDrag: 0
   contentTrans: {fileID: 4199406621349083570}
   bfCell: {fileID: 7947404490969342071}
-  topRecoveryOffset: 0
+  topRecoveryOffset: 5
-  downRecoveryOffset: 20
+  downRecoveryOffset: 5
   direction: 0
   reverse: 0
   cellWidth: 558
@@ -7498,7 +7498,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3121552964615492639
 RectTransform:
   m_ObjectHideFlags: 0
@@ -9901,7 +9901,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 123123123
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
@@ -9987,7 +9987,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1373839795370585509
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10003,9 +10003,9 @@ RectTransform:
   m_Father: {fileID: 2584119948269024356}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 395}
+  m_AnchoredPosition: {x: 0, y: -83}
   m_SizeDelta: {x: 574, y: 268}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &85684085377220066
@@ -11444,7 +11444,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2584119948269024356
 RectTransform:
   m_ObjectHideFlags: 0
@@ -11466,9 +11466,9 @@ 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: 40}
+  m_AnchoredPosition: {x: 0, y: 518}
   m_SizeDelta: {x: 620, y: 956}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &28261399708346414
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -11530,6 +11530,14 @@ MonoBehaviour:
     hashName: 3446674555
     objectType: 0
     gameObject: {fileID: 8901165019122810568}
+  - name: star_info.upgrade
+    hashName: 4088215977
+    objectType: 0
+    gameObject: {fileID: 4750645058923793338}
+  - name: star_info.bg
+    hashName: 2201954456
+    objectType: 0
+    gameObject: {fileID: 5544803703955761766}
 --- !u!1 &6431225084991062311
 GameObject:
   m_ObjectHideFlags: 0
@@ -12576,7 +12584,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3cf1784287669db4f91e9b56d1ebc7e1, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2ea0b70e315bb48a49bac0278c8aaa02, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -14393,7 +14401,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2ea0b70e315bb48a49bac0278c8aaa02, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -17666,7 +17674,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 110
+      value: 170
       objectReference: {fileID: 0}
     - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -17773,7 +17781,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 110
+      value: 170
       objectReference: {fileID: 0}
     - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3}
       propertyPath: m_SizeDelta.y