Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Excel2Json/Excel/skill.xlsx   resolved by origin/master(远端) version

Assets/Art/UIAssets/decorate/dec_lingdang_db.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DShM5y+oVXISjmgr1YJZRCv53AuIpmpDJiMVVfAtltq+hw8DL8tFXJIEuPiE
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_renw_db3.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CChKsHyrVXvrQhHke3OP0qSNFhV94wWRdpdSs0rwpmxU6XM48T7tj9L979OW
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.2050029
+    - _Alpha: 0.20279515
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20611608
+    - _MainTexOffsetU: 0.20877719
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -72,8 +72,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: -193.1, y: 21}
-  m_SizeDelta: {x: 222, y: 50}
+  m_AnchoredPosition: {x: -182.26573, y: 21}
+  m_SizeDelta: {x: 243.6685, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8974566408459148074
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/HeroAttributeWidget.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 127.7, y: 3.5639}
-  m_SizeDelta: {x: 111.28, y: 45.596}
+  m_SizeDelta: {x: 133.8, y: 45.596}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &192917626739261170
 CanvasRenderer:
@@ -79,7 +79,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 2370
+  m_Text: "2370.1\u4E07"
 --- !u!1 &2731470648553323167
 GameObject:
   m_ObjectHideFlags: 0
@@ -115,8 +115,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 419, y: -0.33512}
-  m_SizeDelta: {x: 81.3883, y: 37.798}
+  m_AnchoredPosition: {x: 406.4, y: -0.33512}
+  m_SizeDelta: {x: 143.7659, y: 37.798}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6075765814148249060
 CanvasRenderer:
@@ -159,7 +159,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: +90
+  m_Text: "+9010.1\u4E07"
 --- !u!1 &2963361265419753275
 GameObject:
   m_ObjectHideFlags: 0
@@ -413,7 +413,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: 19, y: 1.6}
+  m_AnchoredPosition: {x: 67.4, y: 1.6}
   m_SizeDelta: {x: 28, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6381163825326017891

Assets/Res/UI/HeroInformainPanel/HeroAttributeWidgetType2.prefab

@@ -164,7 +164,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 184.3, y: 4.1302}
-  m_SizeDelta: {x: 77.3688, y: 45.596}
+  m_SizeDelta: {x: 150.2247, y: 45.596}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3639138606694352301
 CanvasRenderer:
@@ -207,7 +207,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: +794
+  m_Text: "+7941.1\u4E07"
 --- !u!1 &4252063621790870621
 GameObject:
   m_ObjectHideFlags: 0
@@ -244,7 +244,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 377.5, y: 4.1302}
-  m_SizeDelta: {x: 77.3688, y: 45.596}
+  m_SizeDelta: {x: 155.7138, y: 45.596}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1780294559565883098
 CanvasRenderer:
@@ -287,7 +287,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: +794
+  m_Text: "+7944.1\u4E07"
 --- !u!1 &9028940008435226479
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8010219124151300276
 RectTransform:
   m_ObjectHideFlags: 0
@@ -201,12 +201,12 @@ RectTransform:
   - {fileID: 7242877048583604540}
   - {fileID: 8048570897024190138}
   - {fileID: 2175225039670005603}
-  m_Father: {fileID: 86604009502899239}
+  m_Father: {fileID: 9037135992368401232}
   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: -116.2, y: -12.5}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 52.299988, y: 384}
+  m_SizeDelta: {x: 89, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3771783693810167237
 CanvasRenderer:
@@ -223,7 +223,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 454805197462043420}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -246,7 +246,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_fengling
+  _icon_name: dec_lingdang_db
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
   packInfo:
@@ -351,7 +351,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: 1.3, y: 44.2733}
+  m_AnchoredPosition: {x: 4.6, y: 37.7}
   m_SizeDelta: {x: 203.3, y: 37.2295}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4807162858721399125
@@ -521,8 +521,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.921}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -7.299959, y: -51.500004}
-  m_SizeDelta: {x: 51, y: 68}
+  m_AnchoredPosition: {x: 0.0000121593475, y: 0}
+  m_SizeDelta: {x: 56.3365, y: 75.1154}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &778206244950053257
 CanvasRenderer:
@@ -1125,7 +1125,7 @@ RectTransform:
   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: 332}
+  m_AnchoredPosition: {x: 84.8, y: 322.1}
   m_SizeDelta: {x: 337, y: 129}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &76856068010717943
@@ -1233,7 +1233,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxDuration: 0.3
   isUpdate: 0
-  currTime: 0.3020946
+  currTime: 0.3024325
   GrpupInfos:
   - Foldout: 1
     isActive: 1
@@ -2641,7 +2641,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: 3.2, y: 46.6}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3840097278478969659
@@ -3644,13 +3644,12 @@ RectTransform:
   - {fileID: 7440752129834858667}
   - {fileID: 8258499293957039645}
   - {fileID: 8728580503868501898}
-  - {fileID: 1194356122697894574}
   m_Father: {fileID: 2950467415780753011}
   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_SizeDelta: {x: 337, y: 129}
+  m_SizeDelta: {x: 306, y: 118}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6917675478362225246
 CanvasRenderer:
@@ -3673,7 +3672,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3690,14 +3689,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_renw_db3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: 61bb4fbc9f673f9cd44c50cdfa76de0d
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -4201,7 +4200,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2394298463810824802
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4219,7 +4218,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 330, y: 130}
+  m_SizeDelta: {x: 306, y: 118}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5012491853445144891
 CanvasRenderer:
@@ -4259,7 +4258,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_renw_db2
+  _icon_name: dec_renw_db3
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
   packInfo:
@@ -4307,7 +4306,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -18.149994, y: -11.5}
+  m_AnchoredPosition: {x: -10.5, y: -2.8}
   m_SizeDelta: {x: 22, y: 20}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1035588383843407233
@@ -4397,8 +4396,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: 39.7, y: -30.400002}
-  m_SizeDelta: {x: 40, y: 40}
+  m_AnchoredPosition: {x: 24.3, y: -22.4}
+  m_SizeDelta: {x: 27.2028, y: 27.2028}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8077971288880520705
 CanvasRenderer:
@@ -4521,10 +4520,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2175225039670005603}
   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_SizeDelta: {x: 32, y: 32}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000011444092, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &443331176857040011
 CanvasRenderer:
@@ -4567,7 +4566,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 10
+  m_Text: 2
 --- !u!1 &8228207129280405871
 GameObject:
   m_ObjectHideFlags: 0
@@ -4603,7 +4602,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: 44.6, y: -11.5}
+  m_AnchoredPosition: {x: 6.9, y: -21.3}
   m_SizeDelta: {x: 211.5, y: 37.2295}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1696963883813292846
@@ -5339,6 +5338,7 @@ RectTransform:
   - {fileID: 1188243619286222832}
   - {fileID: 1798015912972164048}
   - {fileID: 6224376037976265680}
+  - {fileID: 1194356122697894574}
   - {fileID: 3695676087259227986}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/UI/ShopPanel/EnergyWidget.prefab

@@ -19,7 +19,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3010089067676543759
 RectTransform:
   m_ObjectHideFlags: 0
@@ -32,11 +32,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children: []
-  m_Father: {fileID: 6618987967785114178}
+  m_Father: {fileID: 6527561963321663096}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -15.3, y: 0.000024319}
+  m_AnchoredPosition: {x: -90.5258, y: 0.000024319}
   m_SizeDelta: {x: 17.3661, y: 20.8393}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5365322635743840051
@@ -145,6 +145,7 @@ GameObject:
   - component: {fileID: 6554596081216309278}
   - component: {fileID: 4830072340555722385}
   - component: {fileID: 6440966455622951679}
+  - component: {fileID: 7038271838070358200}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -165,12 +166,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6618987967785114178}
+  m_Father: {fileID: 6527561963321663096}
   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: 2.659, y: 0}
-  m_SizeDelta: {x: 79.382, y: 44.694}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 118.5112, y: -26}
+  m_SizeDelta: {x: 126, y: 44.694}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4830072340555722385
 CanvasRenderer:
@@ -213,7 +214,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 4200
+  m_Text: "4200.11\u4E07"
+--- !u!114 &7038271838070358200
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2235163630326853260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &2245206468840536257
 GameObject:
   m_ObjectHideFlags: 0
@@ -225,6 +240,9 @@ GameObject:
   - component: {fileID: 6527561963321663096}
   - component: {fileID: 5554054428056264509}
   - component: {fileID: 5160942985902929946}
+  - component: {fileID: 3088531684017576007}
+  - component: {fileID: 8108464645248095485}
+  - component: {fileID: 8736962646787040581}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: EnergyWidget
@@ -245,13 +263,15 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
-  - {fileID: 6618987967785114178}
+  - {fileID: 8519055793353954361}
+  - {fileID: 6554596081216309278}
+  - {fileID: 3010089067676543759}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 33.836975, y: 12.322754}
-  m_SizeDelta: {x: 150, y: 52}
+  m_SizeDelta: {x: 0, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5554054428056264509
 CanvasRenderer:
@@ -285,11 +305,95 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: Btn_Coin
-    gameObject: {fileID: 5991244219049863566}
+    gameObject: {fileID: 8736962646787040581}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &3088531684017576007
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2245206468840536257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &8108464645248095485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2245206468840536257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &8736962646787040581
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2245206468840536257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4311744359091135946
 GameObject:
   m_ObjectHideFlags: 0
@@ -323,11 +427,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6618987967785114178}
+  m_Father: {fileID: 6527561963321663096}
   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: -65.2, y: 1.2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 55.5112, y: 55.5112}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4099161695515857595
@@ -441,140 +545,3 @@ MonoBehaviour:
   ease: 5
   animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
   isEnabled: 1
---- !u!1 &9208053142604902796
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6618987967785114178}
-  - component: {fileID: 5984184458604740083}
-  - component: {fileID: 5991244219049863566}
-  - component: {fileID: 7036042581768901039}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Coin
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6618987967785114178
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9208053142604902796}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8519055793353954361}
-  - {fileID: 6554596081216309278}
-  - {fileID: 3010089067676543759}
-  m_Father: {fileID: 6527561963321663096}
-  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: 31.9, y: 0}
-  m_SizeDelta: {x: 147.9615, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5984184458604740083
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9208053142604902796}
-  m_CullTransparentMesh: 1
---- !u!114 &5991244219049863566
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9208053142604902796}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 7036042581768901039}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!114 &7036042581768901039
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9208053142604902796}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.1137255, g: 0.10980393, b: 0.10588236, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  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
-  _icon_name: dec_xiulianTiaoDi
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
-  packInfo:
-    packName: jingjie
-    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
-    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
-    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
-  imageH: 50
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0

Assets/Res/UIAtlas/mainUI.spriteatlasv2

@@ -25,6 +25,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: a12eb982dbdc0894586e7d39acac50e7, type: 3}
     - {fileID: 2800000, guid: 12d636aca73b99b4bb5e826f060d4b23, type: 3}
     - {fileID: 2800000, guid: 5473c79ffd6b84e4c9de2b607f6fbb01, type: 3}
+    - {fileID: 2800000, guid: 2bcb5569814ba904d98e9913f9cce4ee, type: 3}
     - {fileID: 2800000, guid: caf59be6b62f1ff40b2937ade714bf4d, type: 3}
     - {fileID: 2800000, guid: 7d4a7a803f84e1845966b3d57df9ebd1, type: 3}
     - {fileID: 2800000, guid: 94a1e98605bef084cac2665d137cd336, type: 3}
@@ -35,6 +36,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 57e52cb3eeb03a942a554f60db0db782, type: 3}
     - {fileID: 2800000, guid: e331aa9696aa95442afd1c99be6ebdf1, type: 3}
     - {fileID: 2800000, guid: 35e03d0aa90e64240913ca8c32f3e877, type: 3}
+    - {fileID: 2800000, guid: 7be5f660c36d392419b2828ca276042e, type: 3}
     - {fileID: 2800000, guid: f82d1b4984be31a4bbcd212e7d42374e, type: 3}
     - {fileID: 2800000, guid: 1db9d86baf4548f449f6aec203999ca0, type: 3}
     - {fileID: 2800000, guid: bfcfc5758571af94a87e12b34550e4d4, type: 3}

Assets/Scripts/Core/UI/UTool/UtilTools.cs

@@ -565,60 +565,59 @@ namespace Utility
 
         public static string ToStringEx(this long number)
         {
-            // if (number > 1000000000000)
-            // {
-            //     float n = number / 1000000000000f;
-            //     string str = "";
-            //     str = GetTargetDecimalPlaceStr((int)n);
-            //     return str + "t";
-            // }
-            //
-            // if (number > 1000000000)
-            // {
-            //     float n = number / 1000000000f;
-            //     string str = "";
-            //     str = GetTargetDecimalPlaceStr((int)n);
-            //     return str + "b";
-            // }
-
-            if (number > 10000)
+            if (number < 10000)
+            {
+                // 小于1万，直接返回整数
+                return ((long)number).ToString();
+            }
+            else if (number < 100000000)
             {
-                float n = number / 10000f;
-                string str = "";
-                str = GetTargetDecimalPlaceStr((int)n);
-                return str + "万";
+                // 1万到1亿之间，使用万单位
+                float valueInWan = number / 10000f;
+                return FormatWithTwoDecimalPlaces(valueInWan) + "万";
             }
+            else
+            {
+                // 大于等于1亿，使用亿单位
+                float valueInYi = number / 100000000f;
+                return FormatWithTwoDecimalPlaces(valueInYi) + "亿";
+            }
+        }
 
-            if (number > 1000)
+        private static string FormatWithTwoDecimalPlaces(float value)
+        {
+            // 四舍五入到2位小数
+            double rounded = Math.Round(value, 2);
+
+            // 如果小数部分为0，只返回整数部分
+            if (rounded == Math.Floor(rounded))
             {
-                float n = number / 1000f;
-                string str = "";
-                str = GetTargetDecimalPlaceStr((int)n);
-                return str + "千";
+                return ((long)rounded).ToString();
             }
 
-            return number.ToString();
+            // 返回最多2位小数
+            return rounded.ToString("0.##");
         }
 
         public static string ToStringEx(this int number)
         {
-            if (number > 1000000)
+            if (number < 10000)
             {
-                float n = number / 10000f;
-                string str = "";
-                str = GetTargetDecimalPlaceStr((int)n);
-                return str + "万";
+                // 小于1万，直接返回整数
+                return ((long)number).ToString();
             }
-
-            if (number > 100000)
+            else if (number < 100000000)
             {
-                float n = number / 1000f;
-                string str = "";
-                str = GetTargetDecimalPlaceStr((int)n);
-                return str + "千";
+                // 1万到1亿之间，使用万单位
+                float valueInWan = number / 10000f;
+                return FormatWithTwoDecimalPlaces(valueInWan) + "万";
+            }
+            else
+            {
+                // 大于等于1亿，使用亿单位
+                float valueInYi = number / 100000000f;
+                return FormatWithTwoDecimalPlaces(valueInYi) + "亿";
             }
-
-            return number.ToString();
         }
 #endif
         /// <summary>

Assets/Scripts/GameUI/UI/AppBarPanel/TitlePanel.cs

@@ -80,6 +80,7 @@ namespace Fort23.Mono
 
 
             int bl = (int)((heroAllexp / allexp) * 100);
+            bl = bl > 100 ? 100 : bl;
 
             Text_JingJie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroHerlp.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Fort23.Core;
 using GameLogic.Hero;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -11,51 +12,62 @@ namespace Fort23.Mono
             List<HeroAttributeData> heroAttributeDataList = new List<HeroAttributeData>();
             if (currentHero.powerUpConfig.ShenshiMax != newHero.powerUpConfig.ShenshiMax)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), "" + newHero.powerUpConfig.ShenshiMax.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+                    "" + newHero.powerUpConfig.ShenshiMax.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
 
             if (currentHero.hp != newHero.hp)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToString(), "" + newHero.hp.Value.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToStringEx(),
+                    "" + newHero.hp.Value.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.attack != newHero.attack)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToString(), "" + newHero.attack.Value.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToStringEx(),
+                    "" + newHero.attack.Value.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.defense != newHero.defense)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御", currentHero.defense.Value.ToString(), "" + newHero.defense.Value.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御",
+                    currentHero.defense.Value.ToStringEx(), "" + newHero.defense.Value.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率", currentHero.powerUpConfig.MPFactor.ToString(), "" + currentHero.powerUpConfig.MPFactor.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率",
+                    currentHero.powerUpConfig.MPFactor.ToString(), "" + currentHero.powerUpConfig.MPFactor.ToString());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率", currentHero.powerUpConfig.HudunFactor.ToString(), "" + currentHero.powerUpConfig.HudunFactor.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率",
+                    currentHero.powerUpConfig.HudunFactor.ToString(),
+                    "" + currentHero.powerUpConfig.HudunFactor.ToString());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K", currentHero.powerUpConfig.defK.ToString(), "" + currentHero.powerUpConfig.defK.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K",
+                    currentHero.powerUpConfig.defK.ToStringEx(), "" + currentHero.powerUpConfig.defK.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), "" + currentHero.powerUpConfig.ShenshiMax.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+                    "" + currentHero.powerUpConfig.ShenshiMax.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
@@ -68,51 +80,65 @@ namespace Fort23.Mono
             List<HeroAttributeData> heroAttributeDataList = new List<HeroAttributeData>();
             if (currentHero.powerUpConfig.ShenshiMax != newHero.powerUpConfig.ShenshiMax)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), newHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+                    newHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
 
             if (currentHero.hp != newHero.hp)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToString(), newHero.hp.Value - currentHero.hp.Value + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToStringEx(),
+                    (newHero.hp.Value - currentHero.hp.Value).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.attack != newHero.attack)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToString(), newHero.attack.Value - currentHero.attack.Value + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToStringEx(),
+                    (newHero.attack.Value - currentHero.attack.Value).ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.defense != newHero.defense)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御", currentHero.defense.Value.ToString(), newHero.defense.Value - currentHero.defense.Value + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御",
+                    currentHero.defense.Value.ToStringEx(),
+                    (newHero.defense.Value - currentHero.defense.Value).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率", currentHero.powerUpConfig.MPFactor.ToString(), currentHero.powerUpConfig.MPFactor - currentHero.powerUpConfig.MPFactor + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率",
+                    currentHero.powerUpConfig.MPFactor.ToString(),
+                    currentHero.powerUpConfig.MPFactor - currentHero.powerUpConfig.MPFactor + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率", currentHero.powerUpConfig.HudunFactor.ToString(), currentHero.powerUpConfig.HudunFactor - currentHero.powerUpConfig.HudunFactor + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率",
+                    currentHero.powerUpConfig.HudunFactor.ToString(),
+                    currentHero.powerUpConfig.HudunFactor - currentHero.powerUpConfig.HudunFactor + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K", currentHero.powerUpConfig.defK.ToString(), currentHero.powerUpConfig.defK - currentHero.powerUpConfig.defK + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K",
+                    currentHero.powerUpConfig.defK.ToStringEx(),
+                    (currentHero.powerUpConfig.defK - currentHero.powerUpConfig.defK).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), currentHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+                    (currentHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -12,6 +12,7 @@ using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
 using UnityEngine;
 using UnityEngine.UI;
+using Utility;
 using Utility.CTween;
 
 
@@ -253,22 +254,22 @@ namespace Fort23.Mono
             HeroAttributeWidget heroAttributeWidget =
                 await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("生命",
-                PlayerManager.Instance.myHero.hp.Value.ToString(),
-                "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToString()));
+                PlayerManager.Instance.myHero.hp.Value.ToStringEx(),
+                "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("攻击",
-                PlayerManager.Instance.myHero.attack.Value.ToString(),
-                "+" + (heroInfo.attack.Value - PlayerManager.Instance.myHero.attack.Value).ToString()));
+                PlayerManager.Instance.myHero.attack.Value.ToStringEx(),
+                "+" + (heroInfo.attack.Value - PlayerManager.Instance.myHero.attack.Value).ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("防御",
-                PlayerManager.Instance.myHero.defense.Value.ToString(),
-                "+" + (heroInfo.defense.Value - PlayerManager.Instance.myHero.defense.Value).ToString()));
+                PlayerManager.Instance.myHero.defense.Value.ToStringEx(),
+                "+" + (heroInfo.defense.Value - PlayerManager.Instance.myHero.defense.Value).ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoAttributeWidget.cs

@@ -1,5 +1,6 @@
 using GameLogic.Hero;
 using UnityEngine;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -30,13 +31,13 @@ namespace Fort23.Mono
             this.faBaoInfo = faBaoInfo;
             this.key = key;
             Text_AttributeName.text = GetAttributeName(key);
-            Text_AttributeValue.text = faBaoInfo.attriButedIC[key].ToString();
+            Text_AttributeValue.text = faBaoInfo.attriButedIC[key].ToStringEx();
             Text_NextAttributeValue.gameObject.SetActive(false);
         }
 
         public void StartUpGrad(FaBaoInfo nextFabaoInfo)
         {
-            Text_NextAttributeValue.text = $"+{nextFabaoInfo.attriButedIC[key] - faBaoInfo.attriButedIC[key]}";
+            Text_NextAttributeValue.text = $"+{(nextFabaoInfo.attriButedIC[key] - faBaoInfo.attriButedIC[key]).ToStringEx()}";
             Text_NextAttributeValue.gameObject.SetActive(true);
             Text_NextAttributeValue.color = new Color32(15,241,150,255);
         }
@@ -53,7 +54,7 @@ namespace Fort23.Mono
                 
                 long nextValue = nextFabaoInfo.attriButedIC.ContainsKey(key) ? nextFabaoInfo.attriButedIC[key] : 0;
                 
-                Text_NextAttributeValue.text = $"+{ faBaoInfo.attriButedIC[key] - nextValue}";
+                Text_NextAttributeValue.text = $"+{(faBaoInfo.attriButedIC[key] - nextValue).ToStringEx()}";
                 Text_NextAttributeValue.gameObject.SetActive(true);
                 Text_NextAttributeValue.color = new Color32(15,241,150,255);
                 // Icon_Bj.gameObject.SetActive(true);
@@ -64,11 +65,11 @@ namespace Fort23.Mono
                 long nextValue = nextFabaoInfo.attriButedIC.ContainsKey(key) ? nextFabaoInfo.attriButedIC[key] : 0;
                 if (nextValue == 0)
                 {
-                    Text_NextAttributeValue.text = $"{nextValue - faBaoInfo.attriButedIC[key]}";
+                    Text_NextAttributeValue.text = $"{(nextValue - faBaoInfo.attriButedIC[key]).ToStringEx()}";
                 }
                 else
                 {
-                    Text_NextAttributeValue.text = $"-{nextValue - faBaoInfo.attriButedIC[key]}";
+                    Text_NextAttributeValue.text = $"-{(nextValue - faBaoInfo.attriButedIC[key]).ToStringEx()}";
                 }
                
                 Text_NextAttributeValue.gameObject.SetActive(true);

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1.cs

@@ -51,11 +51,11 @@ namespace Fort23.Mono
             if (count > PlayerManager.Instance.BagController.GetItemCount(id))
             {
                 Text_Count.text =
-                    $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}</color>/{count}";
+                    $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}</color>/{count.ToStringEx()}";
             }
             else
             {
-                Text_Count.text = $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/{count}";
+                Text_Count.text = $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/{count.ToStringEx()}";
             }
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -223,7 +223,7 @@ namespace Fort23.Mono
                 }
 
                 Text_NextLv.text = "+1";
-                Text_NextPower.text = "+" + (nextFabaoInfo.qiangDu - selectedFaBaoInfo.qiangDu);
+                Text_NextPower.text = "+" + (nextFabaoInfo.qiangDu - selectedFaBaoInfo.qiangDu).ToStringEx();
                 Text_NextLv.color = new Color32(15, 241, 150, 255);
                 Text_NextPower.color = new Color32(15, 241, 150, 255);
                 Text_NextLv.gameObject.SetActive(true);
@@ -252,7 +252,7 @@ namespace Fort23.Mono
                     {
                         Text_NextLv.gameObject.SetActive(true);
                         Text_NextLv.text =
-                            $"+{selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID}";
+                            $"+{(selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID).ToStringEx()}";
                         Text_NextLv.color = new Color32(15, 241, 150, 255);
 
                         // Icon_LvBj.icon_name = "dec_fbjia";
@@ -260,7 +260,7 @@ namespace Fort23.Mono
                     else if (selectedFaBaoInfo.FabaoPowerupConfig.ID < currentFaBaoInfo.FabaoPowerupConfig.ID)
                     {
                         Text_NextLv.text =
-                            $"{selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID}";
+                            $"{(selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID).ToStringEx()}";
                         Text_NextLv.color = new Color32(235, 110, 109, 255);
                         Text_NextLv.gameObject.SetActive(true);
                         // Icon_LvBj.icon_name = "dec_fbjian";
@@ -272,14 +272,14 @@ namespace Fort23.Mono
 
                     if (currentFaBaoInfo == null || selectedFaBaoInfo.qiangDu > currentFaBaoInfo.qiangDu)
                     {
-                        Text_NextPower.text = $"+{selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu}";
+                        Text_NextPower.text = $"+{(selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu).ToStringEx()}";
                         Text_NextPower.color = new Color32(15, 241, 150, 255);
                         Text_NextPower.gameObject.SetActive(true);
                         // Icon_PowrBj.icon_name = "dec_bjia";
                     }
                     else if (selectedFaBaoInfo.qiangDu < currentFaBaoInfo.qiangDu)
                     {
-                        Text_NextPower.text = $"{selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu}";
+                        Text_NextPower.text = $"{(selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu).ToStringEx()}";
                         Text_NextPower.color = new Color32(235, 110, 109, 255);
                         Text_NextPower.gameObject.SetActive(true);
                         // Icon_PowrBj.icon_name = "dec_fbjian";
@@ -474,7 +474,7 @@ namespace Fort23.Mono
             {
                 Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name) + " Lv." +
                                       faBaoInfo.FabaoPowerupConfig.ID;
-                Text_Power.text = $"{LanguageManager.Instance.Text(10197)}：{faBaoInfo.qiangDu}";
+                Text_Power.text = $"{LanguageManager.Instance.Text(10197)}：{faBaoInfo.qiangDu.ToStringEx()}";
                 Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
                     faBaoInfo.effectValue);
 

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -158,7 +158,7 @@ namespace Fort23.Mono
 
         private void ChagneShenshiBtnActive()
         {
-            // Btn_Event.gameObject.SetActive(event > 0);
+            Btn_StartEvent.gameObject.SetActive(AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e => !e.isCompleted &&  !e.isCompleted1)!= null);
         }
 
         protected override void DelEvent()
@@ -319,6 +319,7 @@ namespace Fort23.Mono
 
 
             int bl = (int)((heroAllexp / allexp) * 100);
+            bl = bl > 100 ? 100 : bl;
 
             Text_jingjie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +

Assets/Scripts/GameUI/UI/ShopPanel/EnergyWidget.cs

@@ -6,6 +6,7 @@ using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
 using UnityEngine;
+using UnityEngine.UI;
 using Utility;
 
 namespace Fort23.Mono
@@ -67,6 +68,8 @@ namespace Fort23.Mono
             _itemConfig = ConfigComponent.Instance.Get<ItemConfig>(id);
             Icon_Energy.icon_name = _itemConfig.icon;
             Text_Count.text = PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx();
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(transform.GetComponent<RectTransform>());
         }
     }
 }

XiuXianGame.sln.DotSettings.user

@@ -20,6 +20,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F23_003Fdf7b38e0_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACrasheyeLib_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5d871a7d0a7c4e15870b62fc01af92731a00_003F61_003Fdc27fc5d_003FCrasheyeLib_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACultureInfo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F69_003F81b4a42b_003FCultureInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACustomRenderTexture_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F8f_003F8149d2e1_003FCustomRenderTexture_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003Fc9_003Fe80e9cbf_003FDictionary_00602_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fad_003Fcb4b4f1f_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>