优化英文版

Assets/Content/Icons/ActivityImg/fortnighttask_cn_7.png.meta

@@ -1,121 +0,0 @@
-fileFormatVersion: 2
-guid: 2e75ebb89ca65b04fa80f8b75bdfd171
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 9
-  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
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    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
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 56
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 47
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 12
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: dda4613ff9a57ff4388bb7a6cd6ebc84
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Content/Prefabs/UI/UIBattle/BattleReplayControl.prefab

@@ -143,7 +143,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u5409\u82AC\u5730\u4E0B 18"
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
   m_sharedMaterial: {fileID: 2100000, guid: 8747a435bab3ea74dbbf0c1262e8979a, type: 2}

Assets/Content/Prefabs/UI/UIBattle/BattleStatistics.prefab

@@ -3566,7 +3566,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6230\u9B25\u7D71\u8A08"
+  m_Text: 
 --- !u!114 &8195646371946568982
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Content/Prefabs/UI/UIBattle/UIBattle.prefab

@@ -11295,7 +11295,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -11307,9 +11307,9 @@ MonoBehaviour:
   m_fontSizeMin: 20
   m_fontSizeMax: 56
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -12558,7 +12558,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -12570,9 +12570,9 @@ MonoBehaviour:
   m_fontSizeMin: 20
   m_fontSizeMax: 56
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -20578,7 +20578,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -20590,9 +20590,9 @@ MonoBehaviour:
   m_fontSizeMin: 20
   m_fontSizeMax: 56
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -34949,7 +34949,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -34961,9 +34961,9 @@ MonoBehaviour:
   m_fontSizeMin: 20
   m_fontSizeMax: 56
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0

Assets/Content/Prefabs/UI/UIHundredDojo/UIHundredDojo.prefab

@@ -183,7 +183,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 231, y: -64}
+  m_AnchoredPosition: {x: 25, y: -25}
   m_SizeDelta: {x: 48, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8054143828607519000
@@ -1643,7 +1643,6 @@ GameObject:
   - component: {fileID: 2207099316867349956}
   - component: {fileID: 5253446412829632808}
   - component: {fileID: 8315464657590709860}
-  - component: {fileID: 5024991511131425646}
   - component: {fileID: 2899782226727771988}
   m_Layer: 5
   m_Name: Text
@@ -1670,7 +1669,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 64, y: -20}
-  m_SizeDelta: {x: 0, y: 30}
+  m_SizeDelta: {x: 154, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2207099316867349956
 CanvasRenderer:
@@ -1704,9 +1703,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 24
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1734,20 +1733,6 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
---- !u!114 &5024991511131425646
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1130289086031931389}
-  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 &2899782226727771988
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2847,7 +2832,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: 45, y: 43.99997}
+  m_AnchoredPosition: {x: 35, y: 43.99997}
   m_SizeDelta: {x: 40, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3993601081886998920
@@ -4313,7 +4298,6 @@ GameObject:
   - component: {fileID: 2525158460098817432}
   - component: {fileID: 3955475689974089008}
   - component: {fileID: 2650754305885828428}
-  - component: {fileID: 1327283902326210677}
   - component: {fileID: 5828778689153617273}
   m_Layer: 5
   m_Name: Text
@@ -4340,7 +4324,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 64, y: -20}
-  m_SizeDelta: {x: 0, y: 30}
+  m_SizeDelta: {x: 154, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2525158460098817432
 CanvasRenderer:
@@ -4374,9 +4358,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 24
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -4404,20 +4388,6 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
---- !u!114 &1327283902326210677
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3056863965817710523}
-  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 &5828778689153617273
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10710,7 +10680,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 25, y: -34}
+  m_AnchoredPosition: {x: 15, y: -34}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8558411186548126928

Assets/Content/Prefabs/UI/UIMain/UIMain.prefab

@@ -4281,7 +4281,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u62DB\u52DF\u5B63"
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
   m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
@@ -4309,7 +4309,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 40
+  m_fontSize: 36
   m_fontSizeBase: 36
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -8802,7 +8802,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5269\u4F596\u5929"
+  m_Text: 
 --- !u!114 &5170783171325784546
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -21365,7 +21365,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5269\u4F596\u5929"
+  m_Text: 
 --- !u!114 &8775385523969121216
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -23592,7 +23592,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u62DB\u52DF\u5B63"
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
   m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
@@ -30215,6 +30215,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Fx_UI_ChaoZhiShouChong_01
       objectReference: {fileID: 0}
+    - target: {fileID: 4163623270912643677, guid: fd28560b59edd1147a41574345fa4d13,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5671578939135138545, guid: fd28560b59edd1147a41574345fa4d13,
         type: 3}
       propertyPath: UIName
@@ -30350,6 +30355,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Fx_UI_ChaoZhiShouChong_01
       objectReference: {fileID: 0}
+    - target: {fileID: 4163623270912643677, guid: fd28560b59edd1147a41574345fa4d13,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5932439138898404071, guid: fd28560b59edd1147a41574345fa4d13,
         type: 3}
       propertyPath: m_Pivot.x
@@ -30535,11 +30545,31 @@ PrefabInstance:
       propertyPath: m_Name
       value: FX_UI_Jobexp_Glow
       objectReference: {fileID: 0}
+    - target: {fileID: 3601145705979560346, guid: a06dbe2b896be424281e8d6710461783,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3601145705979560346, guid: a06dbe2b896be424281e8d6710461783,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3601145705979560346, guid: a06dbe2b896be424281e8d6710461783,
         type: 3}
       propertyPath: m_Materials.Array.data[1]
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 7166970993380832827, guid: a06dbe2b896be424281e8d6710461783,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166970993380832827, guid: a06dbe2b896be424281e8d6710461783,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7166970993380832827, guid: a06dbe2b896be424281e8d6710461783,
         type: 3}
       propertyPath: m_Materials.Array.data[1]
@@ -30707,6 +30737,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4163623270912643677, guid: fd28560b59edd1147a41574345fa4d13,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5671578939135138545, guid: fd28560b59edd1147a41574345fa4d13,
         type: 3}
       propertyPath: UIName
@@ -30847,11 +30882,31 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 186287003922909271}
     m_Modifications:
+    - target: {fileID: 504425650210339002, guid: e167b5539259da24cba4b756d217cd9f,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 504425650210339002, guid: e167b5539259da24cba4b756d217cd9f,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 504425650210339002, guid: e167b5539259da24cba4b756d217cd9f,
         type: 3}
       propertyPath: m_Materials.Array.data[1]
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 504425650911082457, guid: e167b5539259da24cba4b756d217cd9f,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 504425650911082457, guid: e167b5539259da24cba4b756d217cd9f,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 504425650911082457, guid: e167b5539259da24cba4b756d217cd9f,
         type: 3}
       propertyPath: m_Materials.Array.data[1]

Assets/Content/Prefabs/UI/UIPet/UIPetBattle.prefab

@@ -4495,7 +4495,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7B5B\u9009"
+  m_Text: 
 --- !u!114 &1612161032002206876
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10579,7 +10579,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 585, y: -464.99997}
-  m_SizeDelta: {x: 304, y: 140}
+  m_SizeDelta: {x: 0, y: 140}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &843770841736046015
 CanvasRenderer:

Assets/Content/Prefabs/UI/UISkillExpBattle/UIEvil.prefab

@@ -2011,7 +2011,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 178, y: -39.8}
+  m_AnchoredPosition: {x: 200, y: -39.8}
   m_SizeDelta: {x: 100, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2098819704613567243
@@ -3245,7 +3245,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -178, y: -44}
+  m_AnchoredPosition: {x: -200, y: -44}
   m_SizeDelta: {x: 100, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6544701112676176484
@@ -4014,12 +4014,12 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 48
+  m_fontSize: 46.9
   m_fontSizeBase: 48
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_fontSizeMax: 48
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512

Assets/Content/Prefabs/UI/UITips/GiftListItem.prefab

@@ -706,7 +706,7 @@ MonoBehaviour:
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9053\u5177\u540D\u79F0\u9053\u5177\u540D\u79F0"

Assets/Content/Prefabs/UI/UITips/UITips.prefab

@@ -8047,7 +8047,6 @@ GameObject:
   - component: {fileID: 7254036686540377621}
   - component: {fileID: 3070242753766394712}
   - component: {fileID: 3529376573274651111}
-  - component: {fileID: 4034794124622042637}
   - component: {fileID: 7897205702815260459}
   m_Layer: 5
   m_Name: TextName
@@ -8073,8 +8072,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 10, y: -40}
-  m_SizeDelta: {x: 0, y: 50}
+  m_AnchoredPosition: {x: 10, y: -30}
+  m_SizeDelta: {x: 460, y: 50}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7254036686540377621
 CanvasRenderer:
@@ -8111,13 +8110,13 @@ MonoBehaviour:
     m_BestFit: 1
     m_MinSize: 20
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 6
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u88C5\u5907\u540D\u5B57\u6700\u591A\u516B\u4E2A"
+  m_Text: "\u88C5\u5907\u540D\u5B57\u6700\u591A\u516B\u4E2A00000000000000"
 --- !u!114 &3529376573274651111
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8136,25 +8135,10 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UnityEngine.UI.Text
   - UINode
-  - UnityEngine.UI.ContentSizeFitter
   - UnityEngine.UI.LayoutElement
-  values: 000001000000
+  values: 0000010000
   depObjs: []
   activeType: 0
---- !u!114 &4034794124622042637
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4301824773562554900}
-  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 &7897205702815260459
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -12669,6 +12653,7 @@ GameObject:
   - component: {fileID: 4836415700759500289}
   - component: {fileID: 8072091554707462679}
   - component: {fileID: 6942645984975007209}
+  - component: {fileID: 8161213400574329132}
   m_Layer: 5
   m_Name: Text2
   m_TagString: Untagged
@@ -12758,7 +12743,8 @@ MonoBehaviour:
   - UnityEngine.UI.Text
   - UINode
   - UnityEngine.UI.ContentSizeFitter
-  values: 0000010000
+  - UILocalizeScript
+  values: 000001000000
   depObjs:
   - {fileID: 1864908260596172886}
   activeType: 0
@@ -12776,6 +12762,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!114 &8161213400574329132
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6575499635677432353}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnTxtStamp
 --- !u!1 &6653352862773582259
 GameObject:
   m_ObjectHideFlags: 0
@@ -14837,9 +14836,9 @@ RectTransform:
   m_Father: {fileID: 3686361262211034309}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 210, y: -210}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 470, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &5455140399850298785
@@ -14895,7 +14894,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7841246719931242394}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 

Assets/Lua/Config/ActivitiesCfg.lua

@@ -18,7 +18,7 @@ local ActivitiesCfg = {
 ['Type']=5,
 ['Name']='ActCfg_Name2',
 ['Order']=2,
-['BG']='ActivityImg/fortnighttask_cn',
+['BG']='ActivityImg/img_fortnighttask_cn',
 ['ActivityBG']='ActivityImg/img_fortnighttask_cn',
 ['PageId']=305,
 ['Entrance']={159},

Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://165.154.202.27:81//',
-	SERVERLIST_URL = 'http://165.154.202.27:81//serverlist',
-	NOTIFY_URL = 'http://165.154.202.27:88/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://165.154.202.27:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.202.27:81//vipService',
+	URL_KEY = 'http://110.40.223.119:81//',
+	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
+	NOTIFY_URL = 'http://110.40.223.119:88/res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
 }
 
 return PlatformPack

Assets/Lua/Logic/TaskItemDataNew.lua

@@ -54,7 +54,7 @@ function TaskItemDataNew:RefreshTaskItem(_data)
             local _needChangeEnum = self:IsNeedChangeEnum(_keyCon);
             local _totalConStr = tostring(_totalCon);
             if _needChangeEnum and _w <= _totalCon then
-                _totalConStr = CommonUtil.GetPreciseDecimalFloor(_totalCon/10000, 1) .. CommonUtil.Get_Wan_string()--"萬";--w
+                _totalConStr = CommonUtil.GetPreciseDecimalFloor(_totalCon/1000, 1) .. CommonUtil.Get_Wan_string()--"萬";--w
             end
             local _progress = {
                 _key = _keyCon,
@@ -67,7 +67,7 @@ function TaskItemDataNew:RefreshTaskItem(_data)
             local _value, _state = self:GetProgressByKey(_progress._key, _data.progress);
             _progress._value = _value or 0;
             if _needChangeEnum and _w <= _progress._value then
-                _progress._valueStr = CommonUtil.GetPreciseDecimalFloor(_progress._value/10000, 1) .. CommonUtil.Get_Wan_string()--"萬";--w
+                _progress._valueStr = CommonUtil.GetPreciseDecimalFloor(_progress._value/1000, 1) .. CommonUtil.Get_Wan_string()--"萬";--w
             else
                 _progress._valueStr = tostring(_progress._value)
             end

Assets/Lua/Managers/CfgMgr.lua

@@ -1017,6 +1017,15 @@ function CfgMgr:GetLeveNameById(id)
     return I18N.T(mapdata.Name).. " "..lcfg.LevelId
 end
 
+function CfgMgr:GetCurLevelName()
+    --  self.curMapId = data.map_id
+    --self.curLevelId = data.map_level
+    local mapid = ManagerContainer.LuaBattleMgr.curMapId
+    local levelid =  ManagerContainer.LuaBattleMgr.curLevelId
+    local mapdata =self:GetMapData(mapid)
+    return I18N.T(mapdata.Name).. " "..levelid
+end
+
 function CfgMgr:GetLevelDataByMapAndLevel(mapId, levelId)
   local id = mapId * 10000 + levelId
   return self.LevelCfg[id]

Assets/Lua/UI/Common/ChatTextItemCtr.lua

@@ -92,9 +92,9 @@ function ChatTextItemCtr:SetData(wnd, item, logicData, enterType, onClickOwner,
             if itemData.ResType == Enum.ItemType.Card then
                 local cardData = ManagerContainer.CfgMgr:GetCardDataById(itemCfgId)
                 local lv  = cardData.CardLevel
-                item.text.symbolText.text = I18N.SetLanguageValue("ChangeTakeNotice1", CommonUtil.GetVaildNickName(logicData.nickname),activityName,lv,itemName)
+                item.text.symbolText.text = I18N.SetLanguageValue("ChangeTakeNotice1", CommonUtil.GetVaildNickName(logicData.nickname),I18N.T(activityName),lv,I18N.T(itemName))
             else
-                item.text.symbolText.text = I18N.SetLanguageValue("ChangeTakeNotice", CommonUtil.GetVaildNickName(logicData.nickname),activityName,itemName)
+                item.text.symbolText.text = I18N.SetLanguageValue("ChangeTakeNotice", CommonUtil.GetVaildNickName(logicData.nickname),I18N.T(activityName),I18N.T(itemName))
             end
         elseif logicData.type == Enum.ChatSystemType.StarDivine then
             local data = ManagerContainer.CfgMgr:GetCompetitionDevineCfgById(logicData.paramIds[1] + 1)

Assets/Lua/UI/Common/FruitHeroItemCtr.lua

@@ -13,7 +13,7 @@ function FruitHeroItemCtr:SetData(fruitView,item,herodata,configData,ItemCfgData
             item["fruit"..i.."Slider"].image.fillAmount = 0/configData[i][3]
         end
         if ItemCfgData then
-            item["fruit"..i.."Name"].text.text = ItemCfgData[i]['Name']
+            item["fruit"..i.."Name"].text.text = I18N.T(ItemCfgData[i]['Name'])
         end
     end
     local isshow = herodata.owned == nil or  herodata.owned == true

Assets/Lua/UI/Common/IconItemCtr.lua

@@ -254,7 +254,7 @@ function IconItemCtr:RefreshIcon(wnd, itemlua, logicData, enterType, onClickOwne
             if iconType < 100 then
                 itemlua.num.text.text = CommonUtil.FormatNumber(num)
             else
-                itemlua.num.text.text = CommonUtil.GetPreciseDecimalFloor(num/10000, 1) .. CommonUtil.Get_Wan_string()--"萬"--w
+                itemlua.num.text.text = CommonUtil.GetPreciseDecimalFloor(num/1000, 1) .. CommonUtil.Get_Wan_string()--"萬"--w
             end
         else
             itemlua.num.text.text = tostring(num)

Assets/Lua/UI/Common/RuneShopRewardsItemCtr.lua

@@ -331,7 +331,7 @@ function RuneShopRewardsItemCtr:SetIconDatatt(wnd, itemlua, logicData, enterType
             if iconType < 100 then
                 itemlua.num.text.text = CommonUtil.FormatNumber(num)
             else
-                itemlua.num.text.text = CommonUtil.GetPreciseDecimalFloor(num/10000, 1) ..CommonUtil.Get_Wan_string()-- "萬"--w
+                itemlua.num.text.text = CommonUtil.GetPreciseDecimalFloor(num/1000, 1) ..CommonUtil.Get_Wan_string()-- "萬"--w
             end
         else
             itemlua.num.text.text = tostring(num)

Assets/Lua/UI/UIActivity/UIActivityFortnightTaskView.lua

@@ -381,7 +381,7 @@ function UIActivityFortnightTaskView:RefreshLeftTime(leftTime)
 end
 
 function UIActivityFortnightTaskView:SetTaskItem(taskLua,idx,taskData)
-	taskLua.taskName.text.text = taskData.name
+	taskLua.taskName.text.text = I18N.T(taskData.name)
 	taskLua.progress.scrollbar.size = taskData.doNum / taskData.finishedNum
 	taskLua.doNumTxt.text.text = taskData.doNum  .. "/" .. taskData.finishedNum
 	self:ShowTaskReward(taskLua,taskData:ShowRewards())

Assets/Lua/UI/UIBattle/UIBattleView.lua

@@ -988,7 +988,8 @@ function UIBattleView:OnBossSpawned(bossActor,bossName,life,maxLife,skillParam,i
 	self.StatisticsPart:Show(BattleMode.Normal,BattleSubMode.None)
 	if isPlayRecord then
 		self.battleReplayPart:SetCanvasOrder(self.uiBase.SortingOrder-1)
-		self.battleReplayPart:Show(ManagerContainer.LuaBattleMgr:GetCurrentLevelData().Name)
+		local name = ManagerContainer.CfgMgr:GetCurLevelName()--ManagerContainer.LuaBattleMgr:GetCurrentLevelData().Name--GetLeveNameById
+		self.battleReplayPart:Show(name)
 		self.battleRootNew:SetActive(false)
 	end
 	self.dragBg:SetActive(false)

Assets/Lua/UI/UIDojo/UIDojoRankView.lua

@@ -207,7 +207,7 @@ function UIDojoRankView:OnUpdateRankData(rankItemLua,idx,rankData)
 
 	rankItemLua.headItem.levelText.text.text = tostring(rankData.playerLevel)
 ]]--
-	rankItemLua.danName.text.text = rankData.danName
+	rankItemLua.danName.text.text = I18N.T(rankData.danName)
 
 	if rankData.danIcon ~= nil and rankData.danIcon ~= "" then
 		CommonUtil.LoadIcon(self, rankData.danIcon, function (sprite)
@@ -259,7 +259,7 @@ function UIDojoRankView:UpdateSelfRankData(rankType)
 	end
 	--LogError("------UpdateSelfRankData--" )
 	local danIcon,danName = arenaData:GetCurDanInfoByRank(rankType)
-	self.danName.text.text = danName
+	self.danName.text.text = I18N.T(danName)
 
 	
 	if danIcon ~= nil and danIcon ~= "" then

Assets/Lua/UI/UIDojo/UIDojoRewardView.lua

@@ -122,7 +122,7 @@ function UIDojoRewardView:ShowDanReward()
 		self.nextNode:SetActive(false)
 	else
 		self.nextNode:SetActive(true)
-		self.nextDanName.text.text = arenaData.nextDanName
+		self.nextDanName.text.text =  I18N.T(arenaData.nextDanName)
 		CommonUtil.LoadIcon(self, arenaData.nextDanIcon, function (sprite)
 				self.nextDanIcon.image.sprite = sprite
 			end)
@@ -172,7 +172,7 @@ function UIDojoRewardView:OnUpdateRankRewardData(rankItemLua,idx)
 	end
 
 	rankItemLua.bg:SetActive(rewardItem.minLevel<=3)
-	rankItemLua.danName.text.text = "至尊王者"
+	rankItemLua.danName.text.text = I18N.T('ZhzWz')
 	CommonUtil.LoopGridViewEleCreateNew(self,
 										rankItemLua.itemScroll.loopHorizontalScrollRect,
 										rankItemLua.itemContent.gridLayoutGroup,rewardItem.itemList,0,self,self.OnUpdateItemData)

Assets/Lua/UI/UIHundredDojo/UIHundredDojoLogView.lua

@@ -139,41 +139,41 @@ function UIHundredDojoLogView:GetItemByIndex(loopListView, idx, dataIdx)
 		end
 		itemLua.timeTxt.text.text = ManagerContainer.LuaTimerMgr:ParseTimeStamp2Format(time, '%Y-%m-%d     %H:%M:%S')
 		if logType == 1 then
-			itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_1', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+			itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_1', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 		elseif logType == 2 then
 			if itemData.state then
-				itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_2', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+				itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_2', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 			else
-				itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_3', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+				itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_3', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 			end
 		elseif logType == 3 then
 			if itemData.state then
 				if itemData.guildName and itemData.guildName ~= '' then
-					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_4', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_4', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 				else
-					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_5', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_5', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 				end
 			else
 				if itemData.guildName and itemData.guildName ~= '' then
-					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_6', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_6', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 				else
-					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_7', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_7', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 				end
 			end
 		elseif logType == 4 then
 			if itemData.state then
 				if itemData.guildName and itemData.guildName ~= '' then
-					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_8', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_8', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 				else
-					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_9', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_9', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 				end
 				self.uiBase:AddButtonUniqueEventListener(itemLua.fightBtn.button, self, self.OnClickFightBtn, itemData)
 				itemLua.fightBtn:SetActive(true)
 			else
 				if itemData.guildName and itemData.guildName ~= '' then
-					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_10', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_10', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 				else
-					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_11', tostring(areaCfgData and areaCfgData.Name or ''), itemData.playerName, itemData.guildName)
+					itemLua.contentTxt.text.text = string.formatbykey('HundredDojoLog_11', tostring(areaCfgData and I18N.T(areaCfgData.Name) or ''), itemData.playerName, itemData.guildName)
 				end
 			end
 		elseif logType == 5 then

Assets/Lua/UI/UIMain/UIMainView.lua

@@ -325,9 +325,9 @@ function UIMainView:RefreshSeasonInfo()
 	if not competitionCfgDatas or #competitionCfgDatas == 0 then
 		return
 	end
-
-	self.SeasonName.text.text = I18N.T(competitionCfgDatas[1].CompetitionName)
-	self.SeasonName1.text.text = I18N.T(competitionCfgDatas[1].CompetitionName)
+	local sname =  I18N.T(competitionCfgDatas[1].CompetitionName)
+	self.SeasonName.text.text = sname
+	self.SeasonName1.text.text = sname
 	if stage == 1 then
 		self.remainDay.text.text = I18N.T("DscSeasonResult13")
 		self.remainDay1.text.text = I18N.T("DscSeasonResult13")

Assets/Lua/UI/UIPet/UIPetExchangeMatsView.lua

@@ -316,7 +316,7 @@ function UIPetExchangeMatsView:Init()
 			end
 		else
 			local CfgData = ManagerContainer.CfgMgr:GetItemById(conditions[1])
-			title = CfgData.Name
+			title = I18N.T(CfgData.Name)
 		end
 		self.tips.text.text = string.formatbykey('PetExChangeConditionTips',title,tostring(conditions[2]),tostring(conditions[3]))
 	elseif enterType == 1 then
@@ -330,7 +330,7 @@ function UIPetExchangeMatsView:Init()
 			self.tips.text.text = string.formatbykey('CardExChangeConditionTips',title,tostring(conditions[2] or ""))
 		else
 			local CfgData = ManagerContainer.CfgMgr:GetItemById(conditions[2])
-			title = CfgData.Name
+			title = I18N.T(CfgData.Name)
 			self.tips.text.text = string.formatbykey('CardExChangeConditionTips1',title,tostring(conditions[4]))
 		end
 		self.number.text.text = I18N.SetLanguageValue(count.."/"..conditions[4])

Assets/Lua/UI/UIRuneShop/UIWalletShopGoldBuyTipsView.lua

@@ -66,7 +66,7 @@ function UIWalletShopGoldBuyTipsView:Init()
 		local extraGoldNum = 0
 		local isFirstBuy = goodsData.first_buy
 		if cfgData.FirstBuyReward and #cfgData.FirstBuyReward > 0 and isFirstBuy then
-			self.textTitle.text.text = tostring(cfgData.Name) .. string.formatbykey('RuneShopGoldTitle1')
+			self.textTitle.text.text = I18N.T(tostring(cfgData.Name)) .. string.formatbykey('RuneShopGoldTitle1')
 			rewards = cfgData.FirstBuyReward
 			for i = 1, #rewards do
 				reward = rewards[i]
@@ -77,7 +77,7 @@ function UIWalletShopGoldBuyTipsView:Init()
 				end
 			end
 		elseif cfgData.ExtraBuyReward and #cfgData.ExtraBuyReward > 0 then
-			self.textTitle.text.text = tostring(cfgData.Name) .. string.formatbykey('RuneShopGoldTitle2')
+			self.textTitle.text.text = I18N.T(tostring(cfgData.Name)) .. string.formatbykey('RuneShopGoldTitle2')
 			rewards = cfgData.ExtraBuyReward
 			for i = 1, #rewards do
 				reward = rewards[i]
@@ -88,7 +88,7 @@ function UIWalletShopGoldBuyTipsView:Init()
 				end
 			end
 		else
-			self.textTitle.text.text = tostring(cfgData.Name)
+			self.textTitle.text.text = I18N.T(tostring(cfgData.Name))
 		end
 		local contentStr = '+' .. tostring((goldNum + extraGoldNum))
 		local itemCfgData = ManagerContainer.CfgMgr:GetItemById(Enum.ItemType.Diamond)

Assets/Lua/UI/UITips/UITipsExchangeView.lua

@@ -56,7 +56,7 @@ function UITipsExchangeView:Init()
 	if itemCfgData.ResType < 100 then
 		count = CommonUtil.FormatNumber(count)
 	else
-		count = CommonUtil.GetPreciseDecimalFloor(count/10000, 1) .. CommonUtil.Get_Wan_string()--"萬"--w
+		count = CommonUtil.GetPreciseDecimalFloor(count/1000, 1) .. CommonUtil.Get_Wan_string()--"萬"--w
 	end
 	self.owned.text2.text.text = count
 

Assets/Lua/Util/CommonUtil.lua

@@ -752,9 +752,9 @@ function FormatNumber(number,isReturnW)
         if num_length < 5 then
            return num_str
         elseif num_length >= 5 and num_length < 9 or isReturnW then--万
-           return handler_dot(number, 10^4) .. Get_Wan_string()--"萬"   
+           return handler_dot(number, 10^3) .. Get_Wan_string()--handler_dot(number, 10^4) .. Get_Wan_string()--"萬"   
         elseif num_length >= 9 and not isReturnW then--亿
-           return handler_dot(number, 10^8) .. Get_Yi_string()--"億"
+           return handler_dot(number, 10^9) .. Get_Yi_string()--"億"
         end
     end
 end
@@ -3073,9 +3073,9 @@ end
 
 
 function Get_Wan_string()
-    return "W"
+    return 'K'--"W"
 end
 
 function Get_Yi_string()
-    return "E"
+    return 'B'--"E"
 end