修改技能加成展示

Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -1,25 +0,0 @@
-fileFormatVersion: 2
-guid: 786969225a8dc4e0eb4e00a91e7e1501
-folderAsset: yes
-timeCreated: 1502698138
-licenseType: Pro
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-    iOS:
-      enabled: 1
-      settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -3278,6 +3278,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1181064714018534
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224008124608359800}
+  - component: {fileID: 222614317937623570}
+  - component: {fileID: 114025425118068952}
+  m_Layer: 0
+  m_Name: K_ImagePlus1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1181154061895988
 GameObject:
   m_ObjectHideFlags: 1
@@ -6811,7 +6828,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224872852296835126}
   - component: {fileID: 222676064432700284}
-  - component: {fileID: 114162901609558840}
+  - component: {fileID: 114766117895674090}
   m_Layer: 5
   m_Name: K_Lab
   m_TagString: Untagged
@@ -9496,6 +9513,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1521195139494050
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224815988563629826}
+  - component: {fileID: 222531076157587804}
+  - component: {fileID: 114889632126060326}
+  m_Layer: 5
+  m_Name: K_Lab1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1521274425437900
 GameObject:
   m_ObjectHideFlags: 1
@@ -14911,6 +14945,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1846359189825112
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224503840076283096}
+  - component: {fileID: 222780651229517556}
+  - component: {fileID: 114882972988494494}
+  m_Layer: 0
+  m_Name: K_ImagePlus
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1846469647853128
 GameObject:
   m_ObjectHideFlags: 1
@@ -18769,6 +18820,34 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
+--- !u!114 &114025425118068952
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1181064714018534}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f7e6e302f395b744be6ac65d53a2240, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  Draw: 0
 --- !u!114 &114027198384231342
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -24284,39 +24363,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114162901609558840
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1378070778157544}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.5803922, g: 0.09411766, b: 0.09411766, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 21
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 1
-    m_LineSpacing: 1
-  m_Text: "\u9000\u51FA\u6E38\u620F?"
 --- !u!114 &114164852050935930
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -37888,7 +37934,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 12.5
+  m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -46910,6 +46956,49 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114766117895674090
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1378070778157544}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.5803922, g: 0.09411766, b: 0.09411766, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 21
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 21
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9000\u51FA\u6E38\u620F"
+  Draw: 0
+  SetY: 0
+  Y: 0
+  LineHeight: 0
+  MaxLineHeight: Infinity
+  RemovePos: 
+  ImageIndex: 
+  RemoveIndex: 
+  NewTextIndex: 
+  NewTextPos: []
 --- !u!114 &114767975845501786
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -51657,6 +51746,34 @@ MonoBehaviour:
   m_EffectColor: {r: 0.9338235, g: 0.4671012, b: 0.32958475, a: 0.7058824}
   m_EffectDistance: {x: 3, y: -3}
   m_UseGraphicAlpha: 1
+--- !u!114 &114882972988494494
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1846359189825112}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f7e6e302f395b744be6ac65d53a2240, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  Draw: 0
 --- !u!114 &114884454212786056
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -51776,6 +51893,49 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114889632126060326
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1521195139494050}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.5803922, g: 0.09411766, b: 0.09411766, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 21
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 21
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9000\u51FA\u6E38\u620F"
+  Draw: 0
+  SetY: 0
+  Y: 0
+  LineHeight: 0
+  MaxLineHeight: Infinity
+  RemovePos: 
+  ImageIndex: 
+  RemoveIndex: 
+  NewTextIndex: 
+  NewTextPos: []
 --- !u!114 &114890316116842734
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -61316,6 +61476,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1123339122112270}
+--- !u!222 &222531076157587804
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1521195139494050}
 --- !u!222 &222531531333782504
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -61730,6 +61896,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1225641313190188}
+--- !u!222 &222614317937623570
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1181064714018534}
 --- !u!222 &222614513540355900
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -62630,6 +62802,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1438586026449174}
+--- !u!222 &222780651229517556
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1846359189825112}
 --- !u!222 &222781142385252240
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -63954,6 +64132,24 @@ RectTransform:
   m_AnchoredPosition: {x: 23.999992, y: -0.000032424927}
   m_SizeDelta: {x: 48, y: 36}
   m_Pivot: {x: 0.4999997, y: 0.49999994}
+--- !u!224 &224008124608359800
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1181064714018534}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224815988563629826}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224009253804691750
 RectTransform:
   m_ObjectHideFlags: 1
@@ -66382,12 +66578,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224986266947929816}
+  m_Father: {fileID: 224485043030982204}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -20}
+  m_AnchoredPosition: {x: 214.5, y: -56.999977}
   m_SizeDelta: {x: 384, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224118728296662504
@@ -71152,7 +71348,7 @@ RectTransform:
   - {fileID: 224244382282091746}
   - {fileID: 224055263249313396}
   m_Father: {fileID: 224485043030982204}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -73036,6 +73232,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
+  - {fileID: 224117554064153944}
   - {fileID: 224986266947929816}
   - {fileID: 224380752597365256}
   m_Father: {fileID: 224903490475154396}
@@ -73580,6 +73777,24 @@ RectTransform:
   m_AnchoredPosition: {x: -342, y: 269}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224503840076283096
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1846359189825112}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224872852296835126}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224504528003438442
 RectTransform:
   m_ObjectHideFlags: 1
@@ -75585,11 +75800,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224986266947929816}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -93}
+  m_AnchoredPosition: {x: 50, y: -40.931667}
   m_SizeDelta: {x: 80.563, y: 81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224593876219169764
@@ -79894,6 +80109,25 @@ RectTransform:
   m_AnchoredPosition: {x: -224.24, y: -45.6}
   m_SizeDelta: {x: 324.47, y: 416}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224815988563629826
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1521195139494050}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224008124608359800}
+  m_Father: {fileID: 224986266947929816}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -143.15833}
+  m_SizeDelta: {x: 384, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224817432261611738
 RectTransform:
   m_ObjectHideFlags: 1
@@ -80978,13 +81212,14 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 224503840076283096}
   m_Father: {fileID: 224986266947929816}
-  m_RootOrder: 2
+  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: 50, y: -165.99998}
+  m_AnchoredPosition: {x: 50, y: -102.295}
   m_SizeDelta: {x: 384, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224873532853391380
@@ -83217,17 +83452,17 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224117554064153944}
   - {fileID: 224593503811426000}
   - {fileID: 224872852296835126}
+  - {fileID: 224815988563629826}
   - {fileID: 224490149669999908}
   m_Father: {fileID: 224485043030982204}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 1}
-  m_SizeDelta: {x: 100, y: 186}
+  m_AnchoredPosition: {x: 0, y: -27.795002}
+  m_SizeDelta: {x: 100, y: 163.59}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224986504981623300
 RectTransform:

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -14,9 +14,10 @@
     <F_ElfLab desc=""><![CDATA[精灵]]></F_ElfLab>
     <F_GardenLab desc=""><![CDATA[花园]]></F_GardenLab>
     <F_PersonBtn0 desc=""><![CDATA[参观人次]]></F_PersonBtn0>
-    <F_PersonBtn1 desc=""><![CDATA[每分钟有这么多人来参观花园]]></F_PersonBtn1>
+    <F_PersonBtn1 desc=""><![CDATA[每分钟有这么多人来参观花园[&value&]]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[门票]]></F_CoinPersonBtn0>
-    <F_CoinPersonBtn1 desc=""><![CDATA[每位来访者参观花费]]></F_CoinPersonBtn1>
+    <F_CoinPersonBtn1 desc=""><![CDATA[每位来访者参观花费[&value&]]]></F_CoinPersonBtn1>
+    <F_IncreaseSource desc=""><![CDATA[加成来源[&value&]]]></F_IncreaseSource>
     <F_Tip desc=""><![CDATA[这是一款健康游戏，不在线也可以持续获得金币。如果觉得暂时没什么可做的，可以过一段时间再来玩]]></F_Tip>
     <Fe_BtnLab0 desc=""><![CDATA[提前解锁]]></Fe_BtnLab0>
     <Fe_BtnLab1 desc=""><![CDATA[解锁]]></Fe_BtnLab1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -17,6 +17,7 @@
     <F_PersonBtn1 desc=""><![CDATA[每分鐘有這麼多人來參觀花園]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[門票]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[每位來訪者參觀花費]]></F_CoinPersonBtn1>
+    <F_IncreaseSource desc=""><![CDATA[]]></F_IncreaseSource>
     <F_Tip desc=""><![CDATA[這是一款健康遊戲，不在線上也可以持續獲得金幣。如果覺得暫時沒什麼可做的，可以過一段時間再來玩。]]></F_Tip>
     <Fe_BtnLab0 desc=""><![CDATA[提前解鎖]]></Fe_BtnLab0>
     <Fe_BtnLab1 desc=""><![CDATA[解鎖]]></Fe_BtnLab1>

Assets/Resource/XML/lan/English.xml

@@ -17,6 +17,7 @@
     <F_PersonBtn1 desc=""><![CDATA[Visitors per minute]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[Ticket]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[Ticket per visitor]]></F_CoinPersonBtn1>
+    <F_IncreaseSource desc=""><![CDATA[]]></F_IncreaseSource>
     <F_Tip desc=""><![CDATA[This is a healthy game, that means you can get coins when you are offline. If you feel tired, come to play after a rest.]]></F_Tip>
     <Fe_BtnLab0 desc=""><![CDATA[Unlock Now]]></Fe_BtnLab0>
     <Fe_BtnLab1 desc=""><![CDATA[Unlock]]></Fe_BtnLab1>

Assets/Script/Label/CanvasLabel.cs

@@ -1023,10 +1023,13 @@ public class CanvasLabel
     public static string AB_FlowerAwardImage = "AB_FlowerAwardImage";
     public static string K_Bubble = "K_Bubble";
     public static string K_Bubble0 = "K_Bubble0";
-    public static string K_VGroup = "K_VGroup";
     public static string K_Tit = "K_Tit";
+    public static string K_VGroup = "K_VGroup";
     public static string K_Icon = "K_Icon";
     public static string K_Lab = "K_Lab";
+    public static string K_ImagePlus = "K_ImagePlus";
+    public static string K_Lab1 = "K_Lab1";
+    public static string K_ImagePlus1 = "K_ImagePlus1";
     public static string K_NotifyLab = "K_NotifyLab";
     public static string K_NotifyImagePlus = "K_NotifyImagePlus";
     public static string K_HGroup = "K_HGroup";

Assets/Script/Label/LanguageLabel.cs

@@ -35,6 +35,7 @@ public class LanguageLabel
     	public static string UI__F_PersonBtn1 = "UI__F_PersonBtn1";
     	public static string UI__F_CoinPersonBtn0 = "UI__F_CoinPersonBtn0";
     	public static string UI__F_CoinPersonBtn1 = "UI__F_CoinPersonBtn1";
+    	public static string UI__F_IncreaseSource = "UI__F_IncreaseSource";
     	public static string UI__F_Tip = "UI__F_Tip";
     	public static string UI__Fe_BtnLab0 = "UI__Fe_BtnLab0";
     	public static string UI__Fe_BtnLab1 = "UI__Fe_BtnLab1";
@@ -807,6 +808,7 @@ public class LanguageLabel
     	public static string DressRoom__Armature28 = "DressRoom__Armature28";
     	public static string DressRoom__Armature29 = "DressRoom__Armature29";
     	public static string DressRoom__Armature30 = "DressRoom__Armature30";
+    	public static string DressRoom__Armature31 = "DressRoom__Armature31";
     	public static string DressRoom__Armature201 = "DressRoom__Armature201";
     	public static string DressRoom__Armature202 = "DressRoom__Armature202";
     	public static string DressRoom__Armature203 = "DressRoom__Armature203";
@@ -824,6 +826,7 @@ public class LanguageLabel
     	public static string DressRoom__Armature215 = "DressRoom__Armature215";
     	public static string DressRoom__Armature216 = "DressRoom__Armature216";
     	public static string DressRoom__Armature217 = "DressRoom__Armature217";
+    	public static string DressRoom__Armature218 = "DressRoom__Armature218";
     	public static string DressRoom__Armature401 = "DressRoom__Armature401";
     	public static string DressRoom__Armature402 = "DressRoom__Armature402";
     	public static string DressRoom__Armature403 = "DressRoom__Armature403";
@@ -851,6 +854,7 @@ public class LanguageLabel
     	public static string DressRoom__Armature610 = "DressRoom__Armature610";
     	public static string DressRoom__Armature611 = "DressRoom__Armature611";
     	public static string DressRoom__Armature612 = "DressRoom__Armature612";
+    	public static string DressRoom__Armature613 = "DressRoom__Armature613";
     	public static string DressRoom__Armature801 = "DressRoom__Armature801";
     	public static string DressRoom__Armature802 = "DressRoom__Armature802";
     	public static string DressRoom__Armature803 = "DressRoom__Armature803";
@@ -868,6 +872,7 @@ public class LanguageLabel
     	public static string DressRoom__Armature815 = "DressRoom__Armature815";
     	public static string DressRoom__Armature816 = "DressRoom__Armature816";
     	public static string DressRoom__Armature817 = "DressRoom__Armature817";
+    	public static string DressRoom__Armature818 = "DressRoom__Armature818";
     	public static string DressRoom__Armature1001 = "DressRoom__Armature1001";
     	public static string DressRoom__Armature1002 = "DressRoom__Armature1002";
     	public static string DressRoom__Armature1003 = "DressRoom__Armature1003";

Assets/Script/Manage/AchieveManager.cs

@@ -518,7 +518,7 @@ public class AchieveItem
 
     public static string GetDescription(string desc, double value)
     {
-        return desc.Replace(TransferLabel.Value, Auxiliary.ShrinkNumberStr(value, 0));
+        return desc.Replace(TransferLabel.Value, Auxiliary.ShrinkBigNumberStr(value, 0));
     }
 }
 

Assets/Script/Manage/CDMinigamePanelManager.cs

@@ -124,7 +124,7 @@ public class CDMinigamePanelManager : Regist
     {
         double coinCost = Auxiliary.FmlParse(CoinCostFormula, "i", Manager.CircleIncome.ToString());
         CoinCost = Auxiliary.ShrinkNumber(coinCost);
-        CoinCostText.text = TransferLabel.CoinSprite + Auxiliary.ShrinkNumberStr(coinCost);
+        CoinCostText.text = TransferLabel.CoinSprite + Auxiliary.ShrinkBigNumberStr(coinCost);
 
         double diamondCost = Auxiliary.FmlParse(DiamondCostFormula, "s", Manager.MinigameCDTimer.ToString());
         DiamondCost = Mathf.CeilToInt((float) diamondCost);

Assets/Script/Manage/ConfigManager.cs

@@ -1235,6 +1235,24 @@ public class ConfigManager : Regist
         return int.Parse(xmlDocument.SelectSingleNode(PlayerConfigLabel.RootNode + "/" + PlayerConfigLabel.Version).Attributes[0].Value);
     }
 
+    public static List<string> GetDefaultDressDatas()
+    {
+        List<string> defaultDressDatas = new List<string>();
+        defaultDressDatas.Add("脑壳1");
+        defaultDressDatas.Add("裙子1");
+        defaultDressDatas.Add("鞋子1");
+        defaultDressDatas.Add("头饰品1");
+        defaultDressDatas.Add("上衣1");
+        defaultDressDatas.Add("眼睛1");
+        defaultDressDatas.Add("嘴巴1");
+        defaultDressDatas.Add("Empty");
+        defaultDressDatas.Add("Empty");
+        defaultDressDatas.Add("短袖2左");
+        defaultDressDatas.Add("Empty");
+        defaultDressDatas.Add("短袖2右");
+        return defaultDressDatas;
+    }
+
 
     public static XmlDocument GetXmlDocument(string ConfigName)
     {

Assets/Script/Manage/EnterMinigamePanelManager.cs

@@ -144,7 +144,7 @@ public class EnterMinigamePanelManager : Regist
         MinigameTypeText0.text = Language.GetStr(languageLabel);
         MinigameTypeText1.text = Language.GetStr(languageLabel);
         ChangeGameTypeCost = Auxiliary.FmlParse(ChangeGameTypeCostFormula, "i", Manager.CircleIncome.ToString());
-        CostText.text = $"{TransferLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(ChangeGameTypeCost)}";
+        CostText.text = $"{TransferLabel.CoinSprite}{Auxiliary.ShrinkBigNumberStr(ChangeGameTypeCost)}";
         PanelMask.TweenForCG();
     }
 

Assets/Script/Manage/HttpManager.cs

@@ -171,7 +171,7 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        //GetConfigBySerialNumber("1712103823186989213", data => Debug.Log(data.ToJson()));
+        //GetConfigBySerialNumber("1801185524113894613", data => Debug.Log(data.ToJson()));
         //台式机 1709207727231988804
         //笔记本 1710065808151506837
         //阔达的网络 1709110751808885702 
@@ -791,9 +791,9 @@ public class HttpManager : Regist
             Icon1.sprite = ResourceManager.LoadSprite(ResourceLabel.Gold, Folder.UI);
             Icon1.Resize(true, newSpriteSize, newSpriteSize);
             Icon1.transform.localPosition = new Vector2(0, 0);
-            lab.text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
+            lab.text = Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CoinSprite}{Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
         }
         else if (mailReward.Key == "diamond")
         {
@@ -805,9 +805,9 @@ public class HttpManager : Regist
             Icon1.sprite = ResourceManager.LoadSprite(ResourceLabel.Diamond, Folder.UI);
             Icon1.Resize(true, newSpriteSize, newSpriteSize);
             Icon1.transform.localPosition = new Vector2(0, 0);
-            lab.text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
+            lab.text = Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.DiamondSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.DiamondSprite}{Auxiliary.ShrinkBigNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
         }
         else
         {
@@ -1257,7 +1257,7 @@ public class HttpManager : Regist
                     for (int i = 0; i < jData.Count; i++)
                     {
                         string serialNumber = (string)jData[i]["i"];
-                        string nickname = (string)jData[i]["n"];
+                        string nickname = jData[i]["n"] != null ? (string)jData[i]["n"] : Language.GetStr(LanguageLabel.UI__Unnamed);
                         string dateString = (string)jData[i]["t"];
                         accountDatas.Add(new AccountData(nickname, serialNumber, dateString));
                     }
@@ -1432,7 +1432,7 @@ public class HttpManager : Regist
                     for (int i = 0; i < jData.Count; i++)
                     {
                         string content = (string)jData[i]["c"];
-                        string nickname = (string)jData[i]["n"];
+                        string nickname = jData[i]["n"] != null ? (string)jData[i]["n"] : Language.GetStr(LanguageLabel.UI__Unnamed);
                         string dateString = (string)jData[i]["t"];
                         string serialNumber = (string)jData[i]["s"];
                         DateTime date = DateTime.Parse(dateString);
@@ -1509,7 +1509,7 @@ public class HttpManager : Regist
                     for (int i = 0; i < jData.Count; i++)
                     {
                         string serialNumber = (string)jData[i]["i"];
-                        string nickname = (string)jData[i]["n"];
+                        string nickname = jData[i]["n"] != null ? (string)jData[i]["n"] : Language.GetStr(LanguageLabel.UI__Unnamed);
                         string dateString = (string)jData[i]["t"];
                         accountDatas.Add(new AccountData(nickname, serialNumber, dateString));
                     }

Assets/Script/Manage/Manager.cs

@@ -343,11 +343,24 @@ public class Manager : Regist
         set
         {
             person = value;
-
-            ResourceManager.SetText(CanvasLabel.F_PersonLab, (IncomeDisplayTime*(person * (1 + skillPersonBuff) + skillPerson)).ToString("0"));
+            ResourceManager.SetText(CanvasLabel.F_PersonLab,  Auxiliary.ShrinkAllNumberStr(CurrentPerson*60));
         }
     }
     private static float person;
+    public static List<string> ExtraPersonSourceSpritesName = new List<string>();
+
+    public static float CoinPerson
+    {
+        get { return coinPerson; }
+        set
+        {
+            coinPerson = value;
+
+            ResourceManager.SetText(CanvasLabel.F_CoinPersonLab, Auxiliary.ShrinkAllNumberStr(CurrentCoinPerson));
+        }
+    }
+    private static float coinPerson;
+    public static List<string> ExtraCoinPersonSourceSpritesName = new List<string>();
 
     public static float SkillPerson
     {
@@ -356,9 +369,43 @@ public class Manager : Regist
         {
             skillPerson = value;
 
-            TweenOutline tween = ResourceManager.Get(CanvasLabel.F_PersonLab).GetTweenOutline();
+            //TweenOutline tween = ResourceManager.Get(CanvasLabel.F_PersonLab).GetTweenOutline();
+
+            //if (skillPerson.Equal(0))
+            //{
+            //    tween.Pause();
+
+            //    tween.Target.enabled = false;
+            //}
+            //else
+            //{
+            //    if (tween.InPause)
+            //    {
+            //        tween.Resume();
+
+            //        tween.Target.enabled = true;
+            //    }
+            //    else
+            //    {
+            //        tween.StartForward();
+            //    }
+            //}
+
+            Person = Person;
+        }
+    }
+    public static float skillPerson;
 
-            if (skillPerson.Equal(0))
+    public static float TempSkillPerson
+    {
+        get { return tempSkillPerson; }
+        set
+        {
+            tempSkillPerson = value;
+
+            TweenOutline tween = ResourceManager.Get(CanvasLabel.F_PersonLab).GetTweenOutline();
+            
+            if (tempSkillPerson.Equal(0) && tempSkillPersonBuff.Equal(0))
             {
                 tween.Pause();
 
@@ -378,34 +425,56 @@ public class Manager : Regist
                 }
             }
 
-            ResourceManager.SetText(CanvasLabel.F_PersonLab, (IncomeDisplayTime * (person * (1 + skillPersonBuff) + skillPerson)).ToString("0"));
+            Person = Person;
         }
     }
-    public static float skillPerson;
+    public static float tempSkillPerson;
 
-    public static float CoinPerson
+    public static float SkillPersonBuff
     {
-        get { return coinPerson; }
+        get { return skillPersonBuff; }
         set
         {
-            coinPerson = value;
+            skillPersonBuff = value;
 
-            ResourceManager.SetText(CanvasLabel.F_CoinPersonLab, (coinPerson + skillCoinPerson).ToString("0"));
+            Person = Person;
         }
     }
-    private static float coinPerson;
+    public static float skillPersonBuff;
 
-    public static float SkillPersonBuff
+    public static float TempSkillPersonBuff
     {
-        get { return skillPersonBuff; }
+        get { return tempSkillPersonBuff; }
         set
         {
-            skillPersonBuff = value;
+            tempSkillPersonBuff = value;
+
+            TweenOutline tween = ResourceManager.Get(CanvasLabel.F_PersonLab).GetTweenOutline();
+
+            if (tempSkillPerson.Equal(0) && tempSkillPersonBuff.Equal(0))
+            {
+                tween.Pause();
+
+                tween.Target.enabled = false;
+            }
+            else
+            {
+                if (tween.InPause)
+                {
+                    tween.Resume();
 
-            ResourceManager.SetText(CanvasLabel.F_PersonLab, (IncomeDisplayTime * (person * (1 + skillPersonBuff) + skillPerson)).ToString("0"));
+                    tween.Target.enabled = true;
+                }
+                else
+                {
+                    tween.StartForward();
+                }
+            }
+
+            Person = Person;
         }
     }
-    public static float skillPersonBuff;
+    public static float tempSkillPersonBuff;
 
     public static float SkillCoinPerson
     {
@@ -414,9 +483,21 @@ public class Manager : Regist
         {
             skillCoinPerson = value;
 
+            CoinPerson = CoinPerson;
+        }
+    }
+    public static float skillCoinPerson;
+
+    public static float TempSkillCoinPerson
+    {
+        get { return tempSkillCoinPerson; }
+        set
+        {
+            tempSkillCoinPerson = value;
+
             TweenOutline tween = ResourceManager.Get(CanvasLabel.F_CoinPersonLab).GetTweenOutline();
 
-            if (skillCoinPerson.Equal(0))
+            if (tempSkillCoinPerson.Equal(0) && tempSkillCoinPersonBuff.Equal(0))
             {
                 tween.Pause();
 
@@ -436,10 +517,88 @@ public class Manager : Regist
                 }
             }
 
-            ResourceManager.SetText(CanvasLabel.F_CoinPersonLab, (coinPerson + skillCoinPerson).ToString("0"));
+            CoinPerson = CoinPerson;
+        }
+    }
+    public static float tempSkillCoinPerson;
+
+    public static float SkillCoinPersonBuff
+    {
+        get { return skillCoinPersonBuff; }
+        set
+        {
+            skillCoinPersonBuff = value;
+
+            CoinPerson = CoinPerson;
+        }
+    }
+    public static float skillCoinPersonBuff;
+
+    public static float TempSkillCoinPersonBuff
+    {
+        get { return tempSkillCoinPersonBuff; }
+        set
+        {
+            tempSkillCoinPersonBuff = value;
+
+            TweenOutline tween = ResourceManager.Get(CanvasLabel.F_CoinPersonLab).GetTweenOutline();
+
+            if (tempSkillCoinPersonBuff.Equal(0) && tempSkillCoinPerson.Equal(0))
+            {
+                tween.Pause();
+
+                tween.Target.enabled = false;
+            }
+            else
+            {
+                if (tween.InPause)
+                {
+                    tween.Resume();
+
+                    tween.Target.enabled = true;
+                }
+                else
+                {
+                    tween.StartForward();
+                }
+            }
+
+            CoinPerson = CoinPerson;
+        }
+    }
+    public static float tempSkillCoinPersonBuff;
+
+    public static float IncomeBuff
+    {
+        get { return SkillCoinPersonBuff + FlowerPlus; }
+    }
+
+    public static float FlowerPlus
+    {
+        get { return flowerPlus; }
+        set
+        {
+            flowerPlus = value;
+        }
+    }
+    public static float flowerPlus;
+
+    public static float CurrentPerson
+    {
+        get
+        {
+            //Debug.Log(Person * (1 + SkillPersonBuff + TempSkillPersonBuff) + SkillPerson + TempSkillPerson);
+            return Person*(1 + SkillPersonBuff + TempSkillPersonBuff) + SkillPerson + TempSkillPerson;
+        }
+    }
+    public static float CurrentCoinPerson
+    {
+        get
+        {
+            //Debug.Log(CoinPerson * (1 + SkillCoinPersonBuff + TempSkillCoinPersonBuff) + SkillCoinPerson + TempSkillCoinPerson);
+            return CoinPerson*(1 + SkillCoinPersonBuff + TempSkillCoinPersonBuff) + SkillCoinPerson + TempSkillCoinPerson;
         }
     }
-    public static float skillCoinPerson;
 
     public static double Coin
     {
@@ -448,9 +607,9 @@ public class Manager : Regist
         {
             coin = value;
             
-            ResourceManager.SetText(CanvasLabel.F_CoinLab, Auxiliary.ShrinkNumberStr(coin));
-            ResourceManager.SetText(CanvasLabel.C_CoinLab, Auxiliary.ShrinkNumberStr(coin));
-            ResourceManager.SetText(CanvasLabel.P_CoinLab, Auxiliary.ShrinkNumberStr(coin));
+            ResourceManager.SetText(CanvasLabel.F_CoinLab, Auxiliary.ShrinkBigNumberStr(coin));
+            ResourceManager.SetText(CanvasLabel.C_CoinLab, Auxiliary.ShrinkBigNumberStr(coin));
+            ResourceManager.SetText(CanvasLabel.P_CoinLab, Auxiliary.ShrinkBigNumberStr(coin));
 
             AchieveManager.UpdateStatus(AchieveType.CurrentCoin, coin);
 
@@ -466,18 +625,14 @@ public class Manager : Regist
         {
             diamond = value;
 
-            ResourceManager.SetText(CanvasLabel.F_DiamondLab, Auxiliary.ShrinkNumberStr(diamond));
-            ResourceManager.SetText(CanvasLabel.P_DiamondLab, Auxiliary.ShrinkNumberStr(diamond));
+            ResourceManager.SetText(CanvasLabel.F_DiamondLab, Auxiliary.ShrinkBigNumberStr(diamond));
+            ResourceManager.SetText(CanvasLabel.P_DiamondLab, Auxiliary.ShrinkBigNumberStr(diamond));
 
             OnDiamondChange.SafeInvoke(diamond);
         }
     }
     public static double diamond;
 
-    public static float SkillPlus;
-    public static float CurrentPerson;
-    public static float CurrentCoinPerson;
-
     public static bool MinigameFlag;
     public static bool UploadConfigFlag;
     public static bool LoginFlag;
@@ -495,7 +650,10 @@ public class Manager : Regist
     public static float IncomeCircleTimer;
     public static float CircleIncome
     {
-        get { return (CurrentPerson*CurrentCoinPerson*IncomeCircleTime)*(1 + SkillPlus); }
+        get
+        {
+            return CurrentPerson * IncomeCircleTime * CurrentCoinPerson * (1 + FlowerPlus);
+        }
     }
 
     public static float OfflineTime;
@@ -655,18 +813,15 @@ public class Manager : Regist
         {
             IncomeCircleTimer = IncomeCircleTime;
 
-            CurrentPerson = Person * (1 + SkillPersonBuff) + SkillPerson;
-            CurrentCoinPerson = CoinPerson + SkillCoinPerson;
-
             TotalVisitPerson += CurrentPerson * IncomeCircleTime;
-
+            
             float circleIncome = CircleIncome;
 
             AddCoin(circleIncome, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
 
             ResourceManager.Get(CanvasLabel.C_IncomeLab).TweenReForGra();
             ResourceManager.Get(CanvasLabel.C_IncomeLab).TweenReForVec();
-            ResourceManager.SetText(CanvasLabel.C_IncomeLab, "+" + Auxiliary.ShrinkNumberStr(circleIncome, 0));
+            ResourceManager.SetText(CanvasLabel.C_IncomeLab, "+" + Auxiliary.ShrinkBigNumberStr(circleIncome, 0));
         }
     }
 
@@ -848,6 +1003,7 @@ public class Manager : Regist
     public static void InitAllSkill(bool firstRegist)
     {
         OfflineFlag = false;
+        float realOfflineTime = 0;
 
         ResourceManager.SetActive(CanvasLabel.Ba_Lab2, false);
 
@@ -861,6 +1017,7 @@ public class Manager : Regist
 
             if (OfflineTime <= OfflineMinTime)
             {
+                realOfflineTime = OfflineTime;
                 OfflineTime = 0;
             }
             else
@@ -905,6 +1062,14 @@ public class Manager : Regist
                 skillRoot.Init(firstRegist, OfflineTime, OfflineUsingSkillList, attributeList[i]);
             }
         }
+
+        if (OfflineFlag == false)
+        {
+            foreach (var skill in CoolSkillList)
+            {
+                skill.CoolTimer -= realOfflineTime;
+            }
+        }
     }
 
     public static void GetOfflineIncome()
@@ -925,12 +1090,9 @@ public class Manager : Regist
                 OfflineCoolSkillList.Add(OfflineUsingSkillList[i][j]);
             }
 
-            CurrentPerson = Person*(1 + skillPersonBuff) + SkillPerson;
-            CurrentCoinPerson = CoinPerson + SkillCoinPerson;
-
             TotalVisitPerson += CurrentPerson*IncomeCircleTime;
 
-            coin += (CurrentPerson*CurrentCoinPerson*IncomeCircleTime)*(1 + SkillPlus);
+            coin += CircleIncome;
         }
 
         IncomeCircleTimer = (OfflineTime - IncomeCircleTimer)%IncomeCircleTime;
@@ -953,7 +1115,7 @@ public class Manager : Regist
 
         AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
 
-        ResourceManager.SetText(CanvasLabel.Ba_IconLab, Auxiliary.ShrinkNumberStr(coin));
+        ResourceManager.SetText(CanvasLabel.Ba_IconLab, Auxiliary.ShrinkBigNumberStr(coin));
     }
 
     public new static void SwitchLanguage()

Assets/Script/Manage/MiniGameManager.cs

@@ -86,7 +86,7 @@ public class MinigameAward
         #region Coin
 
         CoinAward = (int)Auxiliary.FmlParse(CoinAwardFml, "s", Score.ToString(), "l", Mathf.Clamp(Manager.GardenLevel, 1, 9999).ToString());
-        CoinAward = (int)(CoinAward * (1 + Manager.SkillPlus) + DropCoin);
+        CoinAward = (int)(CoinAward * (1 + Manager.IncomeBuff) + DropCoin);
         CoinAward = (int) Mathf.Clamp(CoinAward, 1, Mathf.Infinity);
 
         ResourceManager.Get<Text>(CanvasLabel.Da_CoinLab).text = CoinAward.ToString();

Assets/Script/Manage/PlayerManager.cs

@@ -151,7 +151,17 @@ public class PlayerManager : Regist
             Player.Build();
         }
 
-
+        for (int i = 0; i < 8; i++)
+        {
+            if (i == 7 && DressData[i] == "Empty")
+            {
+                continue;
+            }
+            if (!CloseSpriteDictionary.ContainsKey(DressData[i]))
+            {
+                DressData = ConfigManager.GetDefaultDressDatas();
+            }
+        }
         BuildPlayer(DressData);
 
 

Assets/Script/Manage/UIManager.cs

@@ -10,6 +10,7 @@ using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using repeatCallUtility;
 using Sfs2X.Entities.Data;
 using Random = UnityEngine.Random;
@@ -1661,6 +1662,22 @@ public class UIManager : Regist
 
         #region F_PersonBtn
 
+        List<Sprite> spriteList = new List<Sprite>();
+        foreach (var skill in Manager.SkillList)
+        {
+            if (spriteList.Contains(skill.Icon))
+            {
+                continue;
+            }
+            spriteList.Add(skill.Icon);
+        }
+        SpriteAsset.AddBundleSpriteInfo(spriteList.ToArray());
+
+        Texture2D texture = ResourceManager.LoadSprite("4大技能1", Folder.UI).texture;
+        Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
+        ResourceManager.Get<TextPlus>(CanvasLabel.K_Lab1).Scale = 1.8f;
+        ResourceManager.Get<Image>(CanvasLabel.K_ImagePlus1).sprite = sprite;
+
         ResourceManager.AddButtonEvent
         (
             CanvasLabel.F_PersonBtn,
@@ -1668,14 +1685,27 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                string suffix = "";
-
-                if (!Manager.SkillPerson.Equal(0))
+                Bubble.Show(Language.GetStr(LanguageLabel.UI__F_PersonBtn0), "missing topic", null, ResourceManager.LoadSprite("4大技能1", Folder.UI));
+                string content0 = Language.GetStr(LanguageLabel.UI__F_PersonBtn1);
+                string person = "";
+                float increasePerson = Manager.CurrentPerson - Manager.Person;
+                if (increasePerson > 0.001f)
                 {
-                    suffix = Language.GetStr(LanguageLabel.Common__Buff);
+                    person = Auxiliary.ShrinkAllNumberStr(Manager.Person*60) + "<color=#00ff00ff>+" + Auxiliary.ShrinkAllNumberStr(increasePerson*60) + "</color>";
                 }
-
-                Bubble.Show(Language.GetStr(LanguageLabel.UI__F_PersonBtn0) + suffix, Language.GetStr(LanguageLabel.UI__F_PersonBtn1), null, ResourceManager.LoadSprite("4大技能1", Folder.UI));
+                if (Manager.ExtraPersonSourceSpritesName.Count > 0)
+                {
+                    StringBuilder stringBuilder = new StringBuilder();
+                    foreach (var spriteName in Manager.ExtraPersonSourceSpritesName)
+                    {
+                        stringBuilder.Append($"<({spriteName})>");
+                    }
+                    string content1 = Language.GetStr(LanguageLabel.UI__F_IncreaseSource).Replace(TransferLabel.Value, stringBuilder.ToString());
+                    Bubble.Lab1.SetActive(true);
+                    Bubble.Lab1.text = content1;
+                }
+                content0 = content0.Replace(TransferLabel.Value, person);
+                Bubble.Lab.text = content0;
             }
         );
 
@@ -1698,14 +1728,28 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                string suffix = "";
 
-                if (!Manager.SkillCoinPerson.Equal(0))
+                Bubble.Show(Language.GetStr(LanguageLabel.UI__F_CoinPersonBtn0), "missing topic", null, ResourceManager.LoadSprite("绿-免费金币", Folder.UI));
+                string content0 = Language.GetStr(LanguageLabel.UI__F_CoinPersonBtn1);
+                string coinPerson = "";
+                float increaseCoinPerson = Manager.CurrentCoinPerson - Manager.CoinPerson;
+                if (increaseCoinPerson > 0.001f)
                 {
-                    suffix = Language.GetStr(LanguageLabel.Common__Buff);
+                    coinPerson = Auxiliary.ShrinkAllNumberStr(Manager.CoinPerson) + "<color=#00ff00ff>+" + Auxiliary.ShrinkAllNumberStr(increaseCoinPerson) + "</color>";
                 }
-
-                Bubble.Show(Language.GetStr(LanguageLabel.UI__F_CoinPersonBtn0) + suffix, Language.GetStr(LanguageLabel.UI__F_CoinPersonBtn1), null, ResourceManager.LoadSprite("绿-免费金币", Folder.UI));
+                if (Manager.ExtraCoinPersonSourceSpritesName.Count > 0)
+                {
+                    StringBuilder stringBuilder = new StringBuilder();
+                    foreach (var spriteName in Manager.ExtraCoinPersonSourceSpritesName)
+                    {
+                        stringBuilder.Append($"<({spriteName})>");
+                    }
+                    string content1 = Language.GetStr(LanguageLabel.UI__F_IncreaseSource).Replace(TransferLabel.Value, stringBuilder.ToString());
+                    Bubble.Lab1.SetActive(true);
+                    Bubble.Lab1.text = content1;
+                }
+                content0 = content0.Replace(TransferLabel.Value, coinPerson);
+                Bubble.Lab.text = content0;
             }
         );
 

Assets/Script/Manage/VisitManager.cs

@@ -229,8 +229,6 @@ public class VisitManager : Regist
         EnterVisiteeGarden();
 
         OnEnterVisteeGarden.SafeInvoke();
-        //Debug.Log(VisiteeSerialNumber);
-        //Debug.Log(ConfigManager.GetGardenLevel(VisiteeDocument));
     }
 
     public static void StartExitVisiteeGarden()

Assets/Script/Object/Flower.cs

@@ -95,7 +95,7 @@ public class FlowerInfo
                 }
 
                 Amount = 1;
-                Manager.SkillPlus += SkillPlus;
+                Manager.FlowerPlus += SkillPlus;
             }
         }
     }

Assets/Script/Object/Player.cs

@@ -453,7 +453,7 @@ public class CloseItem
         SetupUI(newSize, new Vector2(), icon1, icon2, icon3);
         if (BuyCurrent != Current.Free)
         {
-            buyButtonText.text = Auxiliary.ImageParse(BuyCurrent) + Auxiliary.ShrinkNumberStr(BuyCost);
+            buyButtonText.text = Auxiliary.ImageParse(BuyCurrent) + Auxiliary.ShrinkBigNumberStr(BuyCost);
             buyButton.interactable = true;
         }
         if (BuyLevel > Manager.GardenLevel)

Assets/Script/Object/Skill/Ability.cs

@@ -96,13 +96,13 @@ public class Ability : SkillRoot
             {
                 button.interactable = true;
 
-                ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab1) + "\n" + Auxiliary.ImageParse(UnlockCur) + Auxiliary.ShrinkNumberStr(UnlockAmt);
+                ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab1) + "\n" + Auxiliary.ImageParse(UnlockCur) + Auxiliary.ShrinkBigNumberStr(UnlockAmt);
             }
             else if (itemStatus == SkillStatus.Upgrade)
             {
                 button.interactable = true;
 
-                ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkBigNumberStr(NewUpgradeAmt);
             }
         }
     }
@@ -253,7 +253,7 @@ public class Ability : SkillRoot
         ItemStatus = ItemStatus;
     }
 
-
+    
     protected void GetAward()
     {
         if (ElfFlag)
@@ -290,9 +290,18 @@ public class Ability : SkillRoot
         Manager.Person += NewPerson;
         Manager.CoinPerson += NewCoinPerson;
 
-        Manager.SkillPlus += NewPlus;
+        Manager.SkillCoinPersonBuff += NewPlus;
         Manager.SkillPersonBuff += NewPersonBuff;
-        
+
+        if (Math.Abs(NewPerson) > 0.001f || Math.Abs(NewPersonBuff) > 0.001f)
+        {
+            Manager.ExtraPersonSourceSpritesName.UniqueAdd(icon);
+        }
+        if (Math.Abs(NewPlus) > 0.001f || Math.Abs(NewCoinPerson) > 0.001f)
+        {
+            Manager.ExtraCoinPersonSourceSpritesName.UniqueAdd(icon);
+        }
+
         if (!NewSkillCD.Equal(0))
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
@@ -495,7 +504,7 @@ public class Ability : SkillRoot
             ResourceManager.SetText(CanvasLabel.Fe_Lab0, GetDescription(0));
             ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(1));
 
-            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkBigNumberStr(NewUpgradeAmt)));
 
             ResourceManager.SetButtonEvent
             (
@@ -506,13 +515,13 @@ public class Ability : SkillRoot
 
                     DescriptionText.text = GetDescription(0);
 
-                    ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                    ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkBigNumberStr(NewUpgradeAmt);
 
                     ResourceManager.SetText(CanvasLabel.Fe_Tit, Name);
                     ResourceManager.SetText(CanvasLabel.Fe_Lab0, GetDescription(0));
                     ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(1));
 
-                    ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+                    ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkBigNumberStr(NewUpgradeAmt)));
                 }
             );
         }
@@ -599,9 +608,12 @@ public class Ability : SkillRoot
         Manager.Person -= NewPerson;
         Manager.CoinPerson -= NewCoinPerson;
 
-        Manager.SkillPlus -= NewPlus;
+        Manager.SkillCoinPersonBuff -= NewPlus;
         Manager.SkillPersonBuff -= NewPersonBuff;
 
+        Manager.ExtraPersonSourceSpritesName.Remove(icon);
+        Manager.ExtraCoinPersonSourceSpritesName.Remove(icon);
+
         if (Math.Abs(NewSkillCD) > 0.0005f)
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)

Assets/Script/Object/Skill/BigSkill.cs

@@ -67,7 +67,7 @@ public class BigSkill : Skill
             }
             else if (itemStatus == SkillStatus.Upgrade)
             {
-                LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab2), "\n", Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt));
+                LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab2), "\n", Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkBigNumberStr(NewUpgradeAmt));
             }
         }
     }
@@ -100,10 +100,12 @@ public class BigSkill : Skill
 
     public override void AnnulBuff()
     {
-        Manager.SkillPlus -= NewPlus;
-        Manager.SkillPerson -= NewPerson;
-        Manager.SkillPersonBuff -= NewPersonBuff;
-        Manager.SkillCoinPerson -= NewCoinPerson;
+        Manager.TempSkillCoinPersonBuff -= NewPlus;
+        Manager.TempSkillPerson -= NewPerson;
+        Manager.TempSkillPersonBuff -= NewPersonBuff;
+        Manager.TempSkillCoinPerson -= NewCoinPerson;
+        Manager.ExtraPersonSourceSpritesName.Remove(icon);
+        Manager.ExtraCoinPersonSourceSpritesName.Remove(icon);
     }
 
 
@@ -522,10 +524,18 @@ public class BigSkill : Skill
             Manager.UsingSkillList.Add(this);
         }
 
-        Manager.SkillPlus += NewPlus;
-        Manager.SkillPerson += NewPerson;
-        Manager.SkillPersonBuff += NewPersonBuff;
-        Manager.SkillCoinPerson += NewCoinPerson;
+        Manager.TempSkillCoinPersonBuff += NewPlus;
+        Manager.TempSkillPerson += NewPerson;
+        Manager.TempSkillPersonBuff += NewPersonBuff;
+        Manager.TempSkillCoinPerson += NewCoinPerson;
+        if (Math.Abs(NewPerson) > 0.001f || Math.Abs(NewPersonBuff) > 0.001f)
+        {
+            Manager.ExtraPersonSourceSpritesName.UniqueAdd(icon);
+        }
+        if (Math.Abs(NewPlus) > 0.001f || Math.Abs(NewCoinPerson) > 0.001f)
+        {
+            Manager.ExtraCoinPersonSourceSpritesName.UniqueAdd(icon);
+        }
 
         if (!NewSkillCD.Equal(0))
         {
@@ -595,7 +605,7 @@ public class BigSkill : Skill
             ResourceManager.SetText(CanvasLabel.Fe_Lab0, GetDescription(0));
             ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(1));
 
-            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkBigNumberStr(NewUpgradeAmt)));
             
             ResourceManager.SetButtonEvent
             (
@@ -606,13 +616,13 @@ public class BigSkill : Skill
 
                     DescriptionText.text = GetDescription(0);
 
-                    ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                    ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkBigNumberStr(NewUpgradeAmt);
 
                     ResourceManager.SetText(CanvasLabel.Fe_Tit, Name);
                     ResourceManager.SetText(CanvasLabel.Fe_Lab0, GetDescription(0));
                     ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(1));
 
-                    ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+                    ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkBigNumberStr(NewUpgradeAmt)));
                 }
             );
         }

Assets/Script/Object/Skill/Pack.cs

@@ -129,11 +129,14 @@ public class Pack : SkillRoot
 
     public override void AnnulEffect()
     {
-        Manager.SkillPlus -= Plus;
+        Manager.SkillCoinPersonBuff -= Plus;
         Manager.SkillPerson -= Person;
         Manager.SkillPersonBuff -= PersonBuff;
         Manager.SkillCoinPerson -= CoinPerson;
 
+        Manager.ExtraPersonSourceSpritesName.Remove(icon);
+        Manager.ExtraCoinPersonSourceSpritesName.Remove(icon);
+
         if (!SkillCD.Equal(0))
         {
             for (int j = 0; j < Manager.SkillList.Count; j++)
@@ -232,11 +235,20 @@ public class Pack : SkillRoot
 
     protected void GetBuff()
     {
-        Manager.SkillPlus += Plus;
+        Manager.SkillCoinPersonBuff += Plus;
         Manager.SkillPerson += Person;
         Manager.SkillPersonBuff += PersonBuff;
         Manager.SkillCoinPerson += CoinPerson;
 
+        if (Math.Abs(Person) > 0.001f || Math.Abs(PersonBuff) > 0.001f)
+        {
+            Manager.ExtraPersonSourceSpritesName.UniqueAdd(icon);
+        }
+        if (Math.Abs(Plus) > 0.001f || Math.Abs(CoinPerson) > 0.001f)
+        {
+            Manager.ExtraCoinPersonSourceSpritesName.UniqueAdd(icon);
+        }
+
         if (!SkillCD.Equal(0))
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
@@ -346,12 +358,12 @@ public class Pack : SkillRoot
 
         if (!tempCoin.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.CoinSprite, Auxiliary.ShrinkNumberStr(tempCoin));
+            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.CoinSprite, Auxiliary.ShrinkBigNumberStr(tempCoin));
         }
 
         if (!tempDiamond.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.DiamondSprite, Auxiliary.ShrinkNumberStr(tempDiamond));
+            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.DiamondSprite, Auxiliary.ShrinkBigNumberStr(tempDiamond));
         }
 
         if (!string.IsNullOrEmpty(tempFlower))

Assets/Script/Object/Skill/Skill.cs

@@ -167,10 +167,12 @@ public class Skill : SkillRoot
 
     public virtual void AnnulBuff()
     {
-        Manager.SkillPlus -= NewPlus;
-        Manager.SkillPerson -= NewPerson;
-        Manager.SkillPersonBuff -= NewPersonBuff;
-        Manager.SkillCoinPerson -= NewCoinPerson;
+        Manager.TempSkillCoinPersonBuff -= NewPlus;
+        Manager.TempSkillPerson -= NewPerson;
+        Manager.TempSkillPersonBuff -= NewPersonBuff;
+        Manager.TempSkillCoinPerson -= NewCoinPerson;
+        Manager.ExtraPersonSourceSpritesName.Remove(icon);
+        Manager.ExtraCoinPersonSourceSpritesName.Remove(icon);
 
         if (!NewSkillCD.Equal(0))
         {
@@ -316,10 +318,18 @@ public class Skill : SkillRoot
             Manager.UsingSkillList.Add(this);
         }
 
-        Manager.SkillPlus += NewPlus;
-        Manager.SkillPerson += NewPerson;
-        Manager.SkillPersonBuff += NewPersonBuff;
-        Manager.SkillCoinPerson += NewCoinPerson;
+        Manager.TempSkillCoinPersonBuff += NewPlus;
+        Manager.TempSkillPerson += NewPerson;
+        Manager.TempSkillPersonBuff += NewPersonBuff;
+        Manager.TempSkillCoinPerson += NewCoinPerson;
+        if (Math.Abs(NewPerson) > 0.001f || Math.Abs(NewPersonBuff) > 0.001f)
+        {
+            Manager.ExtraPersonSourceSpritesName.UniqueAdd(icon);
+        }
+        if (Math.Abs(NewPlus) > 0.001f || Math.Abs(NewCoinPerson) > 0.001f)
+        {
+            Manager.ExtraCoinPersonSourceSpritesName.UniqueAdd(icon);
+        }
 
         if (!NewSkillCD.Equal(0))
         {

Assets/Script/Social/FashionShowEditPage.cs

@@ -397,8 +397,8 @@ public class FashionShowEditPage : Regist
             if (costKv.Key == Current.Coin) TotalCoin = costKv.Value;
             if (costKv.Key == Current.Diamond) TotalDiamond = costKv.Value;
         }
-        CloseTotalCoinText.text = Auxiliary.ShrinkNumberStr(TotalCoin.Value);
-        CloseTotalDiamondText.text = Auxiliary.ShrinkNumberStr(TotalDiamond.Value);
+        CloseTotalCoinText.text = Auxiliary.ShrinkBigNumberStr(TotalCoin.Value);
+        CloseTotalDiamondText.text = Auxiliary.ShrinkBigNumberStr(TotalDiamond.Value);
     }
 
 

Assets/Script/Tool/Auxiliary.cs

@@ -146,38 +146,35 @@ public class Auxiliary : Regist
         //}
 
 
-        //if (Input.GetKeyDown(KeyCode.Space))
-        //{
-        //    HttpManager.GetTargetConfig
-        //    (
-        //        "1801210030252368362",
-        //        data =>
-        //        {
-        //            VisitManager.VisiteeSerialNumber = "1801210030252368362";
-        //            VisitManager.PullConfigCallback
-        //            (
-        //                data,
-        //                VisitManager.ShowVisitFailPanel,
-        //                (jData) =>
-        //                {
-        //                    Debug.Log(jData.ToJson());
-        //                    XmlDocument document = new XmlDocument();
-        //                    document.LoadXml(data["l"].ToString());
-        //                    VisitManager.EnterVisiteeGarden(new VisitData(jData, document));
-        //                }
-        //            );
-        //        }
-        //    );
-        //    PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
-        //    Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
-        //    RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
-        //    Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
-        //    Debug.Log(screenPosition);
-        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-        //    DebugManager.ResetGardenLevel(22);
-        //    DebugManager.ResetVisitTutorial();
-        //    HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        //}
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            foreach (var skill in Manager.UsingSkillList)
+            {
+                skill.UseTimer = 0;
+            }
+            foreach (var skill in Manager.CoolSkillList)
+            {
+                skill.CoolTimer = 0;
+            }
+            //HttpManager.GetTargetConfig
+            //(
+            //    "1801203341708362776",
+            //    data =>
+            //    {
+            //        VisitManager.VisiteeSerialNumber = "1801169491424370642";
+            //        VisitManager.SavePulledConfig(data);
+            //    }
+            //);
+            //PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
+            //Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
+            //RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
+            //Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
+            //Debug.Log(screenPosition);
+            //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+            //DebugManager.ResetGardenLevel(22);
+            //DebugManager.ResetVisitTutorial();
+            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        }
 
         //if (Input.GetKeyDown(KeyCode.A))
         //{
@@ -208,7 +205,8 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.S))
         {
-            DebugManager.ResetGardenLevel(49);
+            Manager.CoinPerson = 10000050000;
+            //DebugManager.ResetGardenLevel(49);
             //PlayerManager.Player.ChangeClose(BodyPart.Top, "上衣14");
             //PlayerManager.Player.DisplayInScene();
             //Manager.Coin = 0;
@@ -854,7 +852,7 @@ public class Auxiliary : Regist
         }
     }
 
-    public static string ShrinkNumberStr(double value, int accuracy = 1)
+    public static string ShrinkBigNumberStr(double value, int accuracy = 1)
     {
         if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
         {
@@ -1033,6 +1031,185 @@ public class Auxiliary : Regist
         }
     }
 
+    public static string ShrinkAllNumberStr(double value, int accuracy = 1)
+    {
+        if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
+        {
+            if (value < Amount.千)
+            {
+                return value.ToString("F" + accuracy);
+            }
+            else if (value < Amount.百万)
+            {
+                string str = (value / Amount.千).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "K";
+            }
+            else if (value < Amount.十亿)
+            {
+                string str = (value / Amount.百万).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "M";
+            }
+            else if (value < Amount.兆)
+            {
+                string str = (value / Amount.十亿).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "B";
+            }
+            else if (value < Amount.千兆)
+            {
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "T";
+            }
+            else
+            {
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "T";
+            }
+        }
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
+        {
+            if (value < Amount.万)
+            {
+                return value.ToString("F" + accuracy);
+            }
+            else if (value < Amount.千万)
+            {
+                string str = (value / Amount.万).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "万";
+            }
+            else if (value < Amount.亿)
+            {
+                string str = (value / Amount.千万).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千万";
+            }
+            else if (value < Amount.千亿)
+            {
+                string str = (value / Amount.亿).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "亿";
+            }
+            else if (value < Amount.兆)
+            {
+                string str = (value / Amount.千亿).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千亿";
+            }
+            else if (value < Amount.千兆)
+            {
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "兆";
+            }
+            else if (value < Amount.京)
+            {
+                string str = (value / Amount.千兆).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千兆";
+            }
+            else if (value < Amount.千京)
+            {
+                string str = (value / Amount.京).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "京";
+            }
+            else if (new BigInteger(value.ToString("0")) < Amount.垓)
+            {
+                string str = (value / Amount.千京).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千京";
+            }
+            else if (new BigInteger(value.ToString("0")) < Amount.千垓)
+            {
+                string str = (new BigInteger(value.ToString("0")) / Amount.垓).ToString();
+
+                return OmitNumberStr(0, str) + "垓";
+            }
+            else
+            {
+                string str = (new BigInteger(value.ToString("0")) / Amount.千垓).ToString();
+
+                return OmitNumberStr(0, str) + "千垓";
+            }
+        }
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
+        {
+            if (value < Amount.万)
+            {
+                return value.ToString("F" + accuracy);
+            }
+            else if (value < Amount.千万)
+            {
+                string str = (value / Amount.万).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "萬";
+            }
+            else if (value < Amount.亿)
+            {
+                string str = (value / Amount.千万).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千萬";
+            }
+            else if (value < Amount.千亿)
+            {
+                string str = (value / Amount.亿).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "億";
+            }
+            else if (value < Amount.兆)
+            {
+                string str = (value / Amount.千亿).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千億";
+            }
+            else if (value < Amount.千兆)
+            {
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "兆";
+            }
+            else if (value < Amount.京)
+            {
+                string str = (value / Amount.千兆).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千兆";
+            }
+            else if (value < Amount.千京)
+            {
+                string str = (value / Amount.京).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "京";
+            }
+            else if (new BigInteger(value.ToString("0")) < Amount.垓)
+            {
+                string str = (value / Amount.千京).ToString("F" + (accuracy + 1));
+
+                return OmitNumberStr(accuracy, str) + "千京";
+            }
+            else if (new BigInteger(value.ToString("0")) < Amount.千垓)
+            {
+                string str = (new BigInteger(value.ToString("0")) / Amount.垓).ToString();
+
+                return OmitNumberStr(0, str) + "垓";
+            }
+            else
+            {
+                string str = (new BigInteger(value.ToString("0")) / Amount.千垓).ToString();
+
+                return OmitNumberStr(0, str) + "千垓";
+            }
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
 
     public static string ImageParse(Current current)
     {

Assets/Script/Tool/UI/Bubble.cs

@@ -10,6 +10,7 @@ public class Bubble : Regist
 
     public static Text Tit;
     public static Text Lab;
+    public static Text Lab1;
     public static Text NotifyLab;
     public static Image Icon;
     public static Button Cancel;
@@ -31,6 +32,7 @@ public class Bubble : Regist
 
         Tit = ResourceManager.Get<Text>(CanvasLabel.K_Tit);
         Lab = ResourceManager.Get<Text>(CanvasLabel.K_Lab);
+        Lab1 = ResourceManager.Get<Text>(CanvasLabel.K_Lab1);
         NotifyLab = ResourceManager.Get<Text>(CanvasLabel.K_NotifyLab);
         Icon = ResourceManager.Get<Image>(CanvasLabel.K_Icon);
 
@@ -52,6 +54,8 @@ public class Bubble : Regist
 
     public static void Show(string tit = null, string lab = null, string notifyLab = null, Sprite sprite = null, UnityAction confirmAction = null, UnityAction cancelAction = null, bool enableCancle = true)
     {
+        Lab1.SetActive(false);
+
         AudioManager.PlayClip(AudioLabel.Bubble);
 
         Box.TweenForScale();

Assets/Script/Tool/UI/SpriteAsset.cs

@@ -93,7 +93,6 @@ public class SpriteAsset : MonoBehaviour
             spriteInfo.UvList.Add(urUv);
             spriteInfo.UvList.Add(lrUv);
             spriteInfo.UvList.Add(llUv);
-
             SpriteInfoDic.Add(spriteInfo.Name, spriteInfo);
         }
     }

Assets/Script/Tool/UI/TextPlus.cs

@@ -47,6 +47,7 @@ public class TextPlus : Text
     public float Y = 0;
     public float LineHeight;
     public float MaxLineHeight = Mathf.Infinity;
+    public float Scale = 1;
     public VertexHelper ToFill;
 
     public List<int> RemovePos = new List<int>();
@@ -189,6 +190,7 @@ public class TextPlus : Text
     protected void Initialize()
     {
         LineHeight = preferredHeight/cachedTextGenerator.lineCount;
+        LineHeight *= Scale;
         LineHeight = Mathf.Min(LineHeight, MaxLineHeight);
         //Debug.Log(transform.name + " " + LineHeight);
 

第五期.txt

@@ -1,12 +1,6 @@
 微信支付
 
-服务器端返回的昵称可能为null
-
-访问闪屏的问题
-
-玉树樱花升了级要能看到效果
-
-每分钟访问人数和每次访问收益也要Shrink
+重置我的存档 其他玩家访问会闪屏
 
 
 //关闭DebugMode 开启CatchException