Assets/Resource/Logo.unity

@@ -614,7 +614,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   AuditEdition: 0
   DebugMode: 0
-  CatchException: 0
+  CatchException: 1
   DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -169,6 +169,7 @@ MonoBehaviour:
   - {fileID: 1464068286795752, guid: 42200e1913f63a147a8bd9f0e1ff7c5f, type: 2}
   - {fileID: 1173200693923306, guid: 3cbac8864a3ca4a4fbee23187ed8b18d, type: 2}
   - {fileID: 1523257016453190, guid: 4267e2a622c30f343b2a61c510f2afbb, type: 2}
+  - {fileID: 1736686314392062, guid: d1a1d9de169ce7748bd63fdc38eb4f9b, type: 2}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}

Assets/Resource/Prefab/PrefabUI/FashionShowCloseItem.prefab

@@ -310,6 +310,7 @@ MonoBehaviour:
   Y: 0
   LineHeight: 0
   MaxLineHeight: Infinity
+  Scale: 1
   RemovePos: 
   ImageIndex: 
   RemoveIndex: 
@@ -449,7 +450,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.43137255, g: 0.43137255, b: 0.43137255, a: 1}
   m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:

Assets/Resource/Prefab/PrefabUI/FriendItem.prefab

@@ -96,6 +96,40 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1188117488562816
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224868494086587220}
+  - component: {fileID: 222850650044703208}
+  - component: {fileID: 114180935591379796}
+  m_Layer: 5
+  m_Name: NewMessageFlagText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1219559371557482
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224308682776634196}
+  - component: {fileID: 222099729623672412}
+  - component: {fileID: 114013336871970902}
+  m_Layer: 5
+  m_Name: NewMessageFlag
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1411948730818144
 GameObject:
   m_ObjectHideFlags: 1
@@ -263,6 +297,33 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!114 &114013336871970902
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1219559371557482}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114084414480707920
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -364,6 +425,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 123uyl
+--- !u!114 &114180935591379796
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1188117488562816}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 1
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u65B0\u6D88\u606F"
 --- !u!114 &114308872634755384
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -562,25 +656,26 @@ MonoBehaviour:
   Draw: 0
   SetY: 0
   Y: 0
-  LineHeight: 16.6998
+  LineHeight: 16.271185
   MaxLineHeight: Infinity
+  Scale: 1
   RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
   ImageIndex: 00000000
   RemoveIndex: 0100000002000000030000000400000005000000
   NewTextIndex: 0600000007000000
   NewTextPos:
-  - {x: -1.495573, y: 7.1570573, z: 0}
-  - {x: 8.842398, y: 7.1570573, z: 0}
-  - {x: 8.842398, y: -7.1570573, z: 0}
-  - {x: 8.842398, y: -7.1570573, z: 0}
-  - {x: -1.495573, y: -7.1570573, z: 0}
-  - {x: -1.495573, y: 7.1570573, z: 0}
-  - {x: 8.047171, y: 7.1570573, z: 0}
-  - {x: 18.385141, y: 7.1570573, z: 0}
-  - {x: 18.385141, y: -7.1570573, z: 0}
-  - {x: 18.385141, y: -7.1570573, z: 0}
-  - {x: 8.047171, y: -7.1570573, z: 0}
-  - {x: 8.047171, y: 7.1570573, z: 0}
+  - {x: -1.7154598, y: 7.231638, z: 0}
+  - {x: 9.131998, y: 7.231638, z: 0}
+  - {x: 9.131998, y: -7.231638, z: 0}
+  - {x: 9.131998, y: -7.231638, z: 0}
+  - {x: -1.7154598, y: -7.231638, z: 0}
+  - {x: -1.7154598, y: 7.231638, z: 0}
+  - {x: 7.324089, y: 7.231638, z: 0}
+  - {x: 18.171545, y: 7.231638, z: 0}
+  - {x: 18.171545, y: -7.231638, z: 0}
+  - {x: 18.171545, y: -7.231638, z: 0}
+  - {x: 7.324089, y: -7.231638, z: 0}
+  - {x: 7.324089, y: 7.231638, z: 0}
 --- !u!114 &114448456380351586
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -766,6 +861,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1626347861987158}
+--- !u!222 &222099729623672412
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1219559371557482}
 --- !u!222 &222107185164028080
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -820,6 +921,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1052832695094368}
+--- !u!222 &222850650044703208
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1188117488562816}
 --- !u!222 &222858963629077324
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -907,9 +1014,28 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -421, y: 156}
   m_SizeDelta: {x: 637.4, y: 71}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224308682776634196
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1219559371557482}
+  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: 224868494086587220}
+  m_Father: {fileID: 224926007496139162}
+  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: -58.14, y: -0.0000023842}
+  m_SizeDelta: {x: 40.5, y: 16.9}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224328247138092648
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1004,6 +1130,24 @@ RectTransform:
   m_AnchoredPosition: {x: -180.2, y: 60.8}
   m_SizeDelta: {x: 17.6, y: 17.6}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224868494086587220
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1188117488562816}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_Children: []
+  m_Father: {fileID: 224308682776634196}
+  m_RootOrder: 0
+  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.0000019073486, y: 0.00000023841858}
+  m_SizeDelta: {x: 100.152, y: 32.6}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224915711695323370
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1053,6 +1197,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224659196923624864}
+  - {fileID: 224308682776634196}
   m_Father: {fileID: 224598877154918140}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resource/Prefab/PrefabUI/NotifySplit.prefab

@@ -0,0 +1,115 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1736686314392062}
+  m_IsPrefabParent: 1
+--- !u!1 &1736686314392062
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224086497471316624}
+  m_Layer: 5
+  m_Name: NotifySplit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1880112224379508
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224987359690256902}
+  - component: {fileID: 222432353922925520}
+  - component: {fileID: 114977860056473140}
+  m_Layer: 5
+  m_Name: Frame
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114977860056473140
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1880112224379508}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9607844, g: 0.9607844, b: 0.9607844, 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
+--- !u!222 &222432353922925520
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1880112224379508}
+--- !u!224 &224086497471316624
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1736686314392062}
+  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: 224987359690256902}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 634, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224987359690256902
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1880112224379508}
+  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: 224086497471316624}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: -0.00000015475246, z: 4.5908e-41}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 634, y: 4}
+  m_Pivot: {x: 0.5, y: 0.5}

Assets/Resource/Prefab/PrefabUI/NotifySplit.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d1a1d9de169ce7748bd63fdc38eb4f9b
+timeCreated: 1523610487
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

Assets/Resource/XML/Config/dressRoom_config.xml

@@ -34,7 +34,7 @@
   <item id="33" jump_frequency="" type="1" index="31" bodypart="1" level="23" buy_currency="2" buy_amt="38" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9(白)" spriteAlpha="" armatureName="头发9(白)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
   <item id="34" jump_frequency="" type="1" index="32" bodypart="1" level="23" buy_currency="2" buy_amt="38" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-粉" spriteAlpha="" armatureName="头发9-粉" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
   <item id="35" jump_frequency="" type="1" index="33" bodypart="1" level="23" buy_currency="2" buy_amt="38" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-黄" spriteAlpha="" armatureName="头发9-黄" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="36" jump_frequency="" type="1" index="34" bodypart="1" level="30" buy_currency="2" buy_amt="80" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="15" icon1offset="-6.67,-77.62" icon2offset="" spriteName="头发15(咖啡),头发15(咖啡)+下" spriteAlpha="" armatureName="头发15(咖啡)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="36" jump_frequency="" type="1" index="34" bodypart="1" level="30" buy_currency="2" buy_amt="80" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="10" icon1offset="-6.67,-77.62" icon2offset="" spriteName="头发15(咖啡),头发15(咖啡)+下" spriteAlpha="" armatureName="头发15(咖啡)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
   <item id="37" jump_frequency="" type="1" index="35" bodypart="1" level="70" buy_currency="2" buy_amt="150" buy_advance_currency="" buy_advance_amt="" pixelSize="95" iconOffset="" icon1offset="" icon2offset="" spriteName="头发10(紫)" spriteAlpha="" armatureName="头发10(紫)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="38" jump_frequency="" type="1" index="36" bodypart="1" level="70" buy_currency="2" buy_amt="150" buy_advance_currency="" buy_advance_amt="" pixelSize="95" iconOffset="" icon1offset="" icon2offset="" spriteName="头发10(棕)" spriteAlpha="" armatureName="头发10(棕)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="39" jump_frequency="" type="1" index="37" bodypart="1" level="70" buy_currency="2" buy_amt="200" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="95.34,-151.30" icon2offset="" spriteName="头发11(蓝),头发11(蓝)后" spriteAlpha="" armatureName="头发11(蓝)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="-70,100" desc="" />

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="30" />
+  <Version value="33" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -188,9 +188,6 @@
     <T_RepeatName desc=""><![CDATA[已经存在相同的昵称]]></T_RepeatName>
     <U_Lab desc=""><![CDATA[加载中…]]></U_Lab>
     <U_WarningTitle desc=""><![CDATA[健康游戏忠告]]></U_WarningTitle>
-    <U_WarningText desc=""><![CDATA[抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。
-批准文号：  新广出审[2018]1713 号   ISBN：978-7-498-05050-2   沪网文（2016）1831-087号
-文网游备字文网游备字〔2018〕Ｍ-CSG 0675 号   新出网证(沪)字39号   著作权人：重庆极风游科技有限公司   出版单位：上海隐志网络科技有限公司]]></U_WarningText>
     <X_Self desc=""><![CDATA[[我]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中宝箱总价值的个位数即可领奖，3次机会]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[猜中花朵原来的颜色即可领奖，例如“红”“黄”“蓝”，3次机会]]></Y_GuessColorDesc>
@@ -285,6 +282,8 @@
     <AG_ConnectError desc=""><![CDATA[连接服务器失败]]></AG_ConnectError>
     <AG_ApplyButtonTitle desc=""><![CDATA[发送申请]]></AG_ApplyButtonTitle>
     <AG_SearchNameEmpty desc=""><![CDATA[昵称不能为空]]></AG_SearchNameEmpty>
+    <AH_NewApplicant desc=""><![CDATA[新申请]]></AH_NewApplicant>
+    <AH_NewMessage desc=""><![CDATA[新消息]]></AH_NewMessage>
     <AH_NicknameTitle desc=""><![CDATA[发送者]]></AH_NicknameTitle>
     <AH_ContentTitle desc=""><![CDATA[内容]]></AH_ContentTitle>
     <AH_TimeTitle desc=""><![CDATA[时间]]></AH_TimeTitle>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -188,9 +188,6 @@
     <T_RepeatName desc=""><![CDATA[已經存在相同的昵稱]]></T_RepeatName>
     <U_Lab desc=""><![CDATA[加載中…]]></U_Lab>
     <U_WarningTitle desc=""><![CDATA[我的甜蜜花園]]></U_WarningTitle>
-    <U_WarningText desc=""><![CDATA[抵制不良遊戲，拒絕盜版遊戲。註意自我保護，謹防受騙上當。適度遊戲益腦，沈迷遊戲傷身。合理安排時間，享受健康生活。
-批準文號：  新廣出審[2018]1713 號   ISBN：978-7-498-05050-2   滬網文（2016）1831-087號
-文網遊備字文網遊備字〔2018〕Ｍ-CSG 0675 號   新出網證(滬)字39號   著作權人：重慶極風遊科技有限公司   出版單位：上海隱誌網絡科技有限公司]]></U_WarningText>
     <X_Self desc=""><![CDATA[[我]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中寶箱總價值的個位數即可領獎，3次機會]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[猜中花朵原來的顏色即可領獎，例如“紅”“黃”“藍”，3次機會]]></Y_GuessColorDesc>
@@ -285,6 +282,8 @@
     <AG_ConnectError desc=""><![CDATA[連接伺服器失敗]]></AG_ConnectError>
     <AG_ApplyButtonTitle desc=""><![CDATA[發送申請]]></AG_ApplyButtonTitle>
     <AG_SearchNameEmpty desc=""><![CDATA[昵稱不能為空]]></AG_SearchNameEmpty>
+    <AH_NewApplicant desc=""><![CDATA[新申請]]></AH_NewApplicant>
+    <AH_NewMessage desc=""><![CDATA[新訊息]]></AH_NewMessage>
     <AH_NicknameTitle desc=""><![CDATA[發送者]]></AH_NicknameTitle>
     <AH_ContentTitle desc=""><![CDATA[內容]]></AH_ContentTitle>
     <AH_TimeTitle desc=""><![CDATA[時間]]></AH_TimeTitle>

Assets/Resource/XML/lan/English.xml

@@ -188,7 +188,6 @@ Program 水怪
     <T_RepeatName desc=""><![CDATA[Repeat]]></T_RepeatName>
     <U_Lab desc=""><![CDATA[Loading…]]></U_Lab>
     <U_WarningTitle desc=""><![CDATA[My Lovely Garden]]></U_WarningTitle>
-    <U_WarningText desc=""><![CDATA[[%value%]]]></U_WarningText>
     <X_Self desc=""><![CDATA[[ME]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[Hit the last digit of total value of the chest. 3 chances]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[Hit the origin color of the flower shape. eg.'red''Blue''ORANGE'. 3 chances]]></Y_GuessColorDesc>
@@ -283,6 +282,8 @@ Program 水怪
     <AG_ConnectError desc=""><![CDATA[Failed]]></AG_ConnectError>
     <AG_ApplyButtonTitle desc=""><![CDATA[Send]]></AG_ApplyButtonTitle>
     <AG_SearchNameEmpty desc=""><![CDATA[Nickname can not be null]]></AG_SearchNameEmpty>
+    <AH_NewApplicant desc=""><![CDATA[New]]></AH_NewApplicant>
+    <AH_NewMessage desc=""><![CDATA[Message]]></AH_NewMessage>
     <AH_NicknameTitle desc=""><![CDATA[Sender]]></AH_NicknameTitle>
     <AH_ContentTitle desc=""><![CDATA[Content]]></AH_ContentTitle>
     <AH_TimeTitle desc=""><![CDATA[Time]]></AH_TimeTitle>

Assets/Resource/XML/lan/default_ChineseSimplified.xml

@@ -4,5 +4,8 @@
     <AJ_Content desc=""><![CDATA[共%NUM0%个文件需要更新, 已更新%NUM1%个文件]]></AJ_Content>
     <AJ_UpdateFailed desc=""><![CDATA[更新失败]]></AJ_UpdateFailed>
     <AJ_Progress desc=""><![CDATA[更新进度%NUM%%]]></AJ_Progress>
+    <U_WarningText desc=""><![CDATA[抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。
+批准文号：  新广出审[2018]1713 号   ISBN：978-7-498-05050-2   沪网文（2016）1831-087号
+文网游备字文网游备字〔2018〕Ｍ-CSG 0675 号   新出网证(沪)字39号   著作权人：重庆极风游科技有限公司   出版单位：上海隐志网络科技有限公司]]></U_WarningText>
   </UI>
 </lan>

Assets/Resource/XML/lan/default_ChineseTraditional.xml

@@ -1,8 +1,11 @@
 <lan>
   <UI>
-    <AJ_Title desc=""><![CDATA[更新游戏中]]></AJ_Title>
-    <AJ_Content desc=""><![CDATA[共%NUM0%个文件需要更新, 已更新%NUM1%个文件]]></AJ_Content>
-    <AJ_UpdateFailed desc=""><![CDATA[更新失败]]></AJ_UpdateFailed>
-    <AJ_Progress desc=""><![CDATA[更新进度%NUM%%]]></AJ_Progress>
+    <AJ_Title desc=""><![CDATA[更新遊戲中]]></AJ_Title>
+    <AJ_Content desc=""><![CDATA[共%NUM0%個檔需要更新, 已更新%NUM1%個檔]]></AJ_Content>
+    <AJ_UpdateFailed desc=""><![CDATA[更新失敗]]></AJ_UpdateFailed>
+    <AJ_Progress desc=""><![CDATA[更新進度%NUM%%]]></AJ_Progress>
+    <U_WarningText desc=""><![CDATA[抵制不良遊戲，拒絕盜版遊戲。註意自我保護，謹防受騙上當。適度遊戲益腦，沈迷遊戲傷身。合理安排時間，享受健康生活。
+批準文號：  新廣出審[2018]1713 號   ISBN：978-7-498-05050-2   滬網文（2016）1831-087號
+文網遊備字文網遊備字〔2018〕Ｍ-CSG 0675 號   新出網證(滬)字39號   著作權人：重慶極風遊科技有限公司   出版單位：上海隱誌網絡科技有限公司]]></U_WarningText>
   </UI>
 </lan>

Assets/Resource/XML/lan/default_English.xml

@@ -1,8 +1,9 @@
 <lan>
   <UI>
-    <AJ_Title desc=""><![CDATA[更新游戏中]]></AJ_Title>
-    <AJ_Content desc=""><![CDATA[共%NUM0%个文件需要更新, 已更新%NUM1%个文件]]></AJ_Content>
-    <AJ_UpdateFailed desc=""><![CDATA[更新失败]]></AJ_UpdateFailed>
-    <AJ_Progress desc=""><![CDATA[更新进度%NUM%%]]></AJ_Progress>
+    <AJ_Title desc=""><![CDATA[Updating]]></AJ_Title>
+    <AJ_Content desc=""><![CDATA[%NUM0% files need to be updated, %NUM1% files have been updated]]></AJ_Content>
+    <AJ_UpdateFailed desc=""><![CDATA[Update failed]]></AJ_UpdateFailed>
+    <AJ_Progress desc=""><![CDATA[Progress %NUM%%]]></AJ_Progress>
+    <U_WarningText desc=""><![CDATA[[%value%]]]></U_WarningText>
   </UI>
 </lan>

Assets/Script/AssetBundleUtility/AssetBundleGroup.cs

@@ -1,3 +1,5 @@
+using UnityEngine;
+
 namespace assetBundleUtility
 {
 
@@ -34,7 +36,7 @@ namespace assetBundleUtility
 	        {
 	            AssetBundleSet assetBundleSet = AssetBundleSets[i];
 	            if (assetBundleSet.Object == null) continue;
-	            assetBundleSet.Name = assetBundleSet.Object.name;
+	            assetBundleSet.Name = assetBundleSet.Object.name.Replace(Bundle.version, "");
 	            assetBundleSet.StreamingPath = AssetDatabase.GetAssetPath(assetBundleSet.Object);
 	            assetBundleSet.MD5 = MD5Utility.GetMD5StringFromPath(assetBundleSet.StreamingPath);
 	            assetBundleSets.Add(assetBundleSet);

Assets/Script/AssetBundleUtility/AssetBundleUtility.cs

@@ -76,7 +76,7 @@ namespace assetBundleUtility
             {
                 AssetBundleSet assetBundleSet = new AssetBundleSet();
                 string[] strings = items[i].Split('|');
-                assetBundleSet.Name = strings[0].Replace("1.3", "");
+                assetBundleSet.Name = strings[0].Replace(Bundle.version, "");
                 assetBundleSet.MD5 = strings[1];
                 //assetBundleSet.URL = strings[2];
                 assetBundleSets.Add(assetBundleSet);
@@ -355,7 +355,7 @@ namespace assetBundleUtility
             }
 	        assetBundleSet.URL = HttpManager.AssetbundleUrl + folder + Path.DirectorySeparatorChar + assetBundleSet.Name;
             //Debug.Log(assetBundleSet.URL);
-            WWW www = new WWW(assetBundleSet.URL + "1.3");
+            WWW www = new WWW(assetBundleSet.URL + Bundle.version);
 
 	        while (www.isDone == false)
 	        {

Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab

@@ -52,17 +52,17 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AssetBundleGroups:
-  - MD5FileName: AndroidMD51.3.txt
-    MD5DictionaryFileName: AndroidMD5Dictionary1.3.txt
+  - MD5FileName: AndroidMD51_3_1.txt
+    MD5DictionaryFileName: AndroidMD5Dictionary1_3_1.txt
     OutputPath: Assets\HotUpdate\Android
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 77fd64e7b3708484a9c744e105248200, type: 3}
+    - Object: {fileID: 102900000, guid: d40906ea5bb958244896cd19338ee6c5, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 8cdda597a784fa44098f091fab3fb829, type: 3}
+    - Object: {fileID: 102900000, guid: c16cb5c126353b04facb75b638746bcd, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: d205a191403fc2a4c9e9cbfd84e6a204, type: 3}
+    - Object: {fileID: 102900000, guid: 8e1c9c8a34bf0604cb7c118a07439af4, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 6d9c13d607d91c746877e21c80481636, type: 3}
+    - Object: {fileID: 102900000, guid: 24e4f8d41f741764e9c8d72a15dcbbae, type: 3}
       URL: null
   - MD5FileName: IOSMD5.txt
     MD5DictionaryFileName: IOSMD5Dictionary.txt
@@ -76,15 +76,15 @@ MonoBehaviour:
       URL: null
     - Object: {fileID: 102900000, guid: 2322ebf659ac53340bfdc21c831c6f31, type: 3}
       URL: null
-  - MD5FileName: WindowsMD51.3.txt
-    MD5DictionaryFileName: WindowsMD5Dictionary1.3.txt
+  - MD5FileName: WindowsMD51_3_1.txt
+    MD5DictionaryFileName: WindowsMD5Dictionary1_3_1.txt
     OutputPath: Assets\HotUpdate\Windows
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: b9d1f83b796cad440bb4ebed51087d9a, type: 3}
+    - Object: {fileID: 102900000, guid: 470d0de5897adeb489b0ce8fec6663f9, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: a5fd5eee70dcf7146819a50e531b4f27, type: 3}
+    - Object: {fileID: 102900000, guid: 2a0ee40efadc3a749a90bd2c2f33b40b, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 5ca364cd037134c429eeeacb5f2ff0cb, type: 3}
+    - Object: {fileID: 102900000, guid: 23c77a155c1c00949a30fbcc5dc5a92a, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 3b87727f8d4abf84f85a6a101cf2d12b, type: 3}
+    - Object: {fileID: 102900000, guid: ecb11dda1c1174e4bb6944fe130f31a4, type: 3}
       URL: null

Assets/Script/Editor/EditorBundle.cs

@@ -213,7 +213,7 @@ public class EditorBundle : Editor
             foreach (var name in names)
             {
                 byte[] bytes = File.ReadAllBytes($"{prefix}/HotUpdate/{name}");
-                File.WriteAllBytes(hotUpdateFolder + "/" + name, bytes);
+                File.WriteAllBytes(hotUpdateFolder + "/" + name + Bundle.version, bytes);
             }
         }
         AssetDatabase.Refresh();

Assets/Script/Label/CanvasLabel.cs

@@ -103,6 +103,8 @@ public class CanvasLabel
     public static string C_Notify = "C_Notify";
     public static string C_FriendButtonParent = "C_FriendButtonParent";
     public static string C_FriendButton = "C_FriendButton";
+    public static string C_NewMessageFlag = "C_NewMessageFlag";
+    public static string C_NewMessageFlagText = "C_NewMessageFlagText";
     public static string C_RankRarent = "C_RankRarent";
     public static string C_Rank = "C_Rank";
     public static string C_Info = "C_Info";
@@ -413,6 +415,8 @@ public class CanvasLabel
     public static string H_UIParticleSystem = "H_UIParticleSystem";
     public static string H_Icon2 = "H_Icon2";
     public static string H_ArrowPos = "H_ArrowPos";
+    public static string H_ArrowParent = "H_ArrowParent";
+    public static string H_Arrow = "H_Arrow";
     public static string H_Close = "H_Close";
     public static string H_HGroup = "H_HGroup";
     public static string H_Btn = "H_Btn";
@@ -576,6 +580,7 @@ public class CanvasLabel
     public static string Pg_FashionTitle = "Pg_FashionTitle";
     public static string Pg_FashionTitlePlaceHolder = "Pg_FashionTitlePlaceHolder";
     public static string Pg_FashionTitleEditButton = "Pg_FashionTitleEditButton";
+    public static string Pg_Content = "Pg_Content";
     public static string Pg_FashionContentBackground = "Pg_FashionContentBackground";
     public static string Pg_FashionContentParent = "Pg_FashionContentParent";
     public static string Pg_FashionContent = "Pg_FashionContent";
@@ -923,6 +928,8 @@ public class CanvasLabel
     public static string AF_Frame = "AF_Frame";
     public static string AF_NicknameTitle = "AF_NicknameTitle";
     public static string AF_ContentTitle = "AF_ContentTitle";
+    public static string AF_NewMessageFlag = "AF_NewMessageFlag";
+    public static string AF_NewMessageFlagText = "AF_NewMessageFlagText";
     public static string AF_ApplicantButton = "AF_ApplicantButton";
     public static string AF_NewApplicantFlagImage = "AF_NewApplicantFlagImage";
     public static string AF_ApplicantIcon = "AF_ApplicantIcon";

Assets/Script/Label/LanguageLabel.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 
 using UnityEngine;
@@ -20,8 +20,9 @@ public class LanguageLabel
     public static string UI__AJ_Content = "UI__AJ_Content";
     public static string UI__AJ_UpdateFailed = "UI__AJ_UpdateFailed";
     public static string UI__AJ_Progress = "UI__AJ_Progress";
+    public static string UI__U_WarningText = "UI__U_WarningText";
     //StartMark-Used by LabelUtility-Do not remove
-    public static string UI = "UI";
+    	public static string UI = "UI";
     	public static string UI__C_MiniGameLab = "UI__C_MiniGameLab";
     	public static string UI__C_GardenLab = "UI__C_GardenLab";
     	public static string UI__C_DressRoom = "UI__C_DressRoom";
@@ -201,7 +202,6 @@ public class LanguageLabel
     	public static string UI__T_RepeatName = "UI__T_RepeatName";
     	public static string UI__U_Lab = "UI__U_Lab";
     	public static string UI__U_WarningTitle = "UI__U_WarningTitle";
-    	public static string UI__U_WarningText = "UI__U_WarningText";
     	public static string UI__X_Self = "UI__X_Self";
     	public static string UI__Y_GuessNumberDesc = "UI__Y_GuessNumberDesc";
     	public static string UI__Y_GuessColorDesc = "UI__Y_GuessColorDesc";
@@ -296,6 +296,8 @@ public class LanguageLabel
     	public static string UI__AG_ConnectError = "UI__AG_ConnectError";
     	public static string UI__AG_ApplyButtonTitle = "UI__AG_ApplyButtonTitle";
     	public static string UI__AG_SearchNameEmpty = "UI__AG_SearchNameEmpty";
+    	public static string UI__AH_NewApplicant = "UI__AH_NewApplicant";
+    	public static string UI__AH_NewMessage = "UI__AH_NewMessage";
     	public static string UI__AH_NicknameTitle = "UI__AH_NicknameTitle";
     	public static string UI__AH_ContentTitle = "UI__AH_ContentTitle";
     	public static string UI__AH_TimeTitle = "UI__AH_TimeTitle";
@@ -336,6 +338,7 @@ public class LanguageLabel
     	public static string PlazaroomMemberItem__ConnectError = "PlazaroomMemberItem__ConnectError";
     	public static string PlazaroomMemberItem__SendMessageSucceed = "PlazaroomMemberItem__SendMessageSucceed";
     	public static string FlowerName = "FlowerName";
+    	public static string FlowerName__Flower0 = "FlowerName__Flower0";
     	public static string FlowerName__Flower1 = "FlowerName__Flower1";
     	public static string FlowerName__Flower2 = "FlowerName__Flower2";
     	public static string FlowerName__Flower3 = "FlowerName__Flower3";
@@ -372,7 +375,22 @@ public class LanguageLabel
     	public static string FlowerName__Flower34 = "FlowerName__Flower34";
     	public static string FlowerName__Flower35 = "FlowerName__Flower35";
     	public static string FlowerName__Flower36 = "FlowerName__Flower36";
+    	public static string FlowerName__Flower37 = "FlowerName__Flower37";
+    	public static string FlowerName__Flower38 = "FlowerName__Flower38";
+    	public static string FlowerName__Flower39 = "FlowerName__Flower39";
+    	public static string FlowerName__Flower40 = "FlowerName__Flower40";
+    	public static string FlowerName__Flower41 = "FlowerName__Flower41";
+    	public static string FlowerName__Flower42 = "FlowerName__Flower42";
+    	public static string FlowerName__Flower43 = "FlowerName__Flower43";
+    	public static string FlowerName__Flower44 = "FlowerName__Flower44";
+    	public static string FlowerName__Flower45 = "FlowerName__Flower45";
+    	public static string FlowerName__Flower46 = "FlowerName__Flower46";
+    	public static string FlowerName__Flower47 = "FlowerName__Flower47";
+    	public static string FlowerName__Flower48 = "FlowerName__Flower48";
+    	public static string FlowerName__Flower49 = "FlowerName__Flower49";
+    	public static string FlowerName__Flower50 = "FlowerName__Flower50";
     	public static string FlowerColor = "FlowerColor";
+    	public static string FlowerColor__Flower0 = "FlowerColor__Flower0";
     	public static string FlowerColor__Flower1 = "FlowerColor__Flower1";
     	public static string FlowerColor__Flower2 = "FlowerColor__Flower2";
     	public static string FlowerColor__Flower3 = "FlowerColor__Flower3";
@@ -409,6 +427,20 @@ public class LanguageLabel
     	public static string FlowerColor__Flower34 = "FlowerColor__Flower34";
     	public static string FlowerColor__Flower35 = "FlowerColor__Flower35";
     	public static string FlowerColor__Flower36 = "FlowerColor__Flower36";
+    	public static string FlowerColor__Flower37 = "FlowerColor__Flower37";
+    	public static string FlowerColor__Flower38 = "FlowerColor__Flower38";
+    	public static string FlowerColor__Flower39 = "FlowerColor__Flower39";
+    	public static string FlowerColor__Flower40 = "FlowerColor__Flower40";
+    	public static string FlowerColor__Flower41 = "FlowerColor__Flower41";
+    	public static string FlowerColor__Flower42 = "FlowerColor__Flower42";
+    	public static string FlowerColor__Flower43 = "FlowerColor__Flower43";
+    	public static string FlowerColor__Flower44 = "FlowerColor__Flower44";
+    	public static string FlowerColor__Flower45 = "FlowerColor__Flower45";
+    	public static string FlowerColor__Flower46 = "FlowerColor__Flower46";
+    	public static string FlowerColor__Flower47 = "FlowerColor__Flower47";
+    	public static string FlowerColor__Flower48 = "FlowerColor__Flower48";
+    	public static string FlowerColor__Flower49 = "FlowerColor__Flower49";
+    	public static string FlowerColor__Flower50 = "FlowerColor__Flower50";
     	public static string SkillName = "SkillName";
     	public static string SkillName__Pack1 = "SkillName__Pack1";
     	public static string SkillName__Pack2 = "SkillName__Pack2";
@@ -830,6 +862,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature38 = "DressRoom__Armature38";
     	public static string DressRoom__Armature39 = "DressRoom__Armature39";
     	public static string DressRoom__Armature40 = "DressRoom__Armature40";
+    	public static string DressRoom__Armature41 = "DressRoom__Armature41";
+    	public static string DressRoom__Armature42 = "DressRoom__Armature42";
     	public static string DressRoom__Armature201 = "DressRoom__Armature201";
     	public static string DressRoom__Armature202 = "DressRoom__Armature202";
     	public static string DressRoom__Armature203 = "DressRoom__Armature203";
@@ -852,6 +886,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature220 = "DressRoom__Armature220";
     	public static string DressRoom__Armature221 = "DressRoom__Armature221";
     	public static string DressRoom__Armature222 = "DressRoom__Armature222";
+    	public static string DressRoom__Armature223 = "DressRoom__Armature223";
+    	public static string DressRoom__Armature224 = "DressRoom__Armature224";
     	public static string DressRoom__Armature401 = "DressRoom__Armature401";
     	public static string DressRoom__Armature402 = "DressRoom__Armature402";
     	public static string DressRoom__Armature403 = "DressRoom__Armature403";
@@ -872,6 +908,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature418 = "DressRoom__Armature418";
     	public static string DressRoom__Armature419 = "DressRoom__Armature419";
     	public static string DressRoom__Armature420 = "DressRoom__Armature420";
+    	public static string DressRoom__Armature421 = "DressRoom__Armature421";
+    	public static string DressRoom__Armature422 = "DressRoom__Armature422";
     	public static string DressRoom__Armature601 = "DressRoom__Armature601";
     	public static string DressRoom__Armature602 = "DressRoom__Armature602";
     	public static string DressRoom__Armature603 = "DressRoom__Armature603";
@@ -888,6 +926,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature614 = "DressRoom__Armature614";
     	public static string DressRoom__Armature615 = "DressRoom__Armature615";
     	public static string DressRoom__Armature616 = "DressRoom__Armature616";
+    	public static string DressRoom__Armature617 = "DressRoom__Armature617";
+    	public static string DressRoom__Armature618 = "DressRoom__Armature618";
     	public static string DressRoom__Armature801 = "DressRoom__Armature801";
     	public static string DressRoom__Armature802 = "DressRoom__Armature802";
     	public static string DressRoom__Armature803 = "DressRoom__Armature803";
@@ -910,11 +950,15 @@ public class LanguageLabel
     	public static string DressRoom__Armature820 = "DressRoom__Armature820";
     	public static string DressRoom__Armature821 = "DressRoom__Armature821";
     	public static string DressRoom__Armature822 = "DressRoom__Armature822";
+    	public static string DressRoom__Armature823 = "DressRoom__Armature823";
+    	public static string DressRoom__Armature824 = "DressRoom__Armature824";
     	public static string DressRoom__Armature1001 = "DressRoom__Armature1001";
     	public static string DressRoom__Armature1002 = "DressRoom__Armature1002";
     	public static string DressRoom__Armature1003 = "DressRoom__Armature1003";
     	public static string DressRoom__Armature1004 = "DressRoom__Armature1004";
     	public static string DressRoom__Armature1005 = "DressRoom__Armature1005";
+    	public static string DressRoom__Armature1006 = "DressRoom__Armature1006";
+    	public static string DressRoom__Armature1007 = "DressRoom__Armature1007";
     	public static string DressRoom__DesignByKnife = "DressRoom__DesignByKnife";
     	public static string Tip = "Tip";
     	public static string Tip__Tip1 = "Tip__Tip1";
@@ -926,6 +970,7 @@ public class LanguageLabel
     	public static string Tip__Tip7 = "Tip__Tip7";
     	public static string Tip__Tip8 = "Tip__Tip8";
     	public static string Tip__Tip9 = "Tip__Tip9";
+    	public static string Tip__Tip10 = "Tip__Tip10";
     	public static string MinigameName = "MinigameName";
     	public static string MinigameName__Punch = "MinigameName__Punch";
     	public static string MinigameName__Memory = "MinigameName__Memory";

Assets/Script/Label/ResourceLabel.cs

@@ -28,6 +28,7 @@ public class ResourceLabel
     public static string PlazaroomMemberItem = "PlazaroomMemberItem";
     public static string MailItem = "MailItem";
     public static string NotifyTitle = "NotifyTitle";
+    public static string NotifySplit = "NotifySplit";
     public static string NotifyContent = "NotifyContent";
     public static string NotifyDate = "NotifyDate";
     public static string NotifyImage = "NotifyImage";

Assets/Script/Manage/AnnounceManager.cs

@@ -98,6 +98,17 @@ public class NotifyImage : NotifyItem
     }
 }
 
+public class NotifySplit : NotifyItem
+{
+    public override GameObject Create()
+    {
+        Transform parent = ResourceManager.Get(CanvasLabel.R_Grid);
+        Transform trans = ResourceManager.Get(ResourceLabel.NotifySplit, Folder.UI, false, parent, false);
+        //Debug.Log(0, trans.gameObject);
+        return trans.gameObject;
+    }
+}
+
 public class AnnounceManager
 {
     #region Config

Assets/Script/Manage/ConfigManager.cs

@@ -177,7 +177,7 @@ public class ConfigManager : Regist
                 }
                 else if (nativeVersion > defaultVersion)
                 {
-                    configDocument = DefaultConfigDocument;
+                    //configDocument = DefaultConfigDocument;
                 }
                 else
                 {
@@ -291,7 +291,7 @@ public class ConfigManager : Regist
             }
             else if (RecoverdVersion > DefaultVersion)
             {
-                configDocument = DefaultConfigDocument;
+                //configDocument = DefaultConfigDocument;
             }
         }
         else
@@ -1498,6 +1498,27 @@ public class ConfigManager : Regist
             ToVersion30(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 31)
+        {
+            Debug.LogWarning("UpdateArchive to 31");
+
+            ToVersion31(nativeDoc, defaultDoc);
+        }
+
+        if (nativeVersion < 32)
+        {
+            Debug.LogWarning("UpdateArchive to 32");
+
+            ToVersion32(nativeDoc, defaultDoc);
+        }
+
+        if (nativeVersion < 33)
+        {
+            Debug.LogWarning("UpdateArchive to 33");
+
+            ToVersion33(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1942,4 +1963,43 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion31(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 31.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
+
+    public static XmlDocument ToVersion32(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 32.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
+
+    public static XmlDocument ToVersion33(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 33.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/FashionShowHttp/ShowListHttp.cs

@@ -31,6 +31,7 @@ public class ShowListHttp
         {
             List<GetFashionShowData> showDatas = new List<GetFashionShowData>();
             JsonData listData = data["list"];
+            //Debug.Log(listData.ToJson());
             for (int i = 0; i < listData.Count; i++)
             {
                 //Debug.Log(listData[i].ToJson());
@@ -82,7 +83,7 @@ public class ShowListHttp
         requestData.Add("mu", playerId);
         requestData.Add("u", targetPlayerId);
         requestData.Add("p", page);
-
+        
         URLRequest.CreateURLRequest(true, HttpManager.GetUserShowListURL, requestData,
             http.Callback, URLRequest.Method.POST);
 

Assets/Script/Manage/GardenManager.cs

@@ -538,6 +538,7 @@ public class GardenManager : Regist
             ResourceManager.Get<Button>(CanvasLabel.H_Icon2).interactable = false;
             ResourceManager.SetActive(CanvasLabel.H_AmtLab, false);
             ResourceManager.SetActive(CanvasLabel.H_Rotate, false);
+            ResourceManager.SetActive(CanvasLabel.H_ArrowParent, false);
             ResourceManager.SetText(CanvasLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_AllPlanted));
         }
         else
@@ -546,6 +547,7 @@ public class GardenManager : Regist
             ResourceManager.SetActive(CanvasLabel.H_AmtLab, true);
             ResourceManager.SetText(CanvasLabel.H_AmtLab, FlowerInfo.AmountTextPrefix + flowerInfo.RemainAmount);
             ResourceManager.SetActive(CanvasLabel.H_Rotate, true);
+            ResourceManager.SetActive(CanvasLabel.H_ArrowParent, true);
             ResourceManager.SetText(CanvasLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_PlantTip));
         }
     }

Assets/Script/Manage/HttpManager.cs

@@ -187,8 +187,11 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        //ShowCommentsHttp.Test();
-        //DeleteShowHttp.Delete(1709207727231988804, 17, null, null);
+        //ShowListHttp.Test();
+        //DeleteShowHttp.Delete(1704251601802555535, 51, null, null);
+        //DeleteShowHttp.Delete(1704251601802555535, 48, null, null);
+        //DeleteShowHttp.Delete(1708014471457405866, 52, null, null);
+        //DeleteShowHttp.Delete(1803316187054037211, 54, null, null);
 
         //URLRequestData urlData = new URLRequestData();
         //urlData.Add("u", "Custom0");
@@ -549,7 +552,7 @@ public class HttpManager : Regist
 
             for (int i = 0; i < nodeList.Count; i++)
             {
-                DecodeAnnounceData(nodeList[i], urlList);
+                DecodeAnnounceData(i, nodeList[i], urlList);
             }
 
             Auxiliary.Instance.StartCoroutine(PullAnnounceSprite(urlList, PullAnnounceSpriteCallback));
@@ -560,10 +563,15 @@ public class HttpManager : Regist
         }
     }
 
-    public static void DecodeAnnounceData(XmlNode node, List<string> urlList)
+    public static void DecodeAnnounceData(int index, XmlNode node, List<string> urlList)
     {
         //Debug.Log(node.OuterXml);
 
+        if (index > 0)
+        {
+            AnnounceManager.AddItem("null", new NotifySplit());
+        }
+
         XmlNodeList nodeList = node.SelectNodes("title");
         
         for (int i = 0; i < nodeList.Count; i++)
@@ -1832,15 +1840,15 @@ public class HttpManager : Regist
         string fileName = "";
         if (Application.platform == RuntimePlatform.Android)
         {
-            fileName = "AndroidMD51.3";
+            fileName = "AndroidMD5" + Bundle.version;
         }
         else if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            fileName = "IOSMD51.3";
+            fileName = "IOSMD5" + Bundle.version;
         }
         else
         {
-            fileName = "WindowsMD51.3";
+            fileName = "WindowsMD5" + Bundle.version;
         }
         if (string.IsNullOrEmpty(fileName))
         {
@@ -1857,15 +1865,15 @@ public class HttpManager : Regist
         string fileName = "";
         if (Application.platform == RuntimePlatform.Android)
         {
-            fileName = "AndroidMD5Dictionary1.3";
+            fileName = "AndroidMD5Dictionary" + Bundle.version;
         }
         else if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            fileName = "IOSMD5Dictionary1.3";
+            fileName = "IOSMD5Dictionary" + Bundle.version;
         }
         else
         {
-            fileName = "WindowsMD5Dictionary1.3";
+            fileName = "WindowsMD5Dictionary" + Bundle.version;
         }
         if (string.IsNullOrEmpty(fileName))
         {

Assets/Script/Manage/Initializer.cs

@@ -451,7 +451,7 @@ public class Initializer : MonoBehaviour
         //}
 
         //DebugText.text = "W5-2";
-        SetWarningTitleAndText();
+        SetWarningTitle();
 
         //DebugText.text = "W6";
         while (ConfigManager.PlayerDocumentDamageFlag)
@@ -481,20 +481,34 @@ public class Initializer : MonoBehaviour
         ResourceManager.Get(CanvasLabel.U_Group).TweenForCG();
         ResourceManager.Get<CanvasGroup>(CanvasLabel.C_Main).alpha = 0;
 
-        ResourceManager.SetText(CanvasLabel.U_Lab, Language.GetStr(LanguageLabel.UI__U_Lab));
+        ResourceManager.SetText(CanvasLabel.U_Lab, Language.GetStr(LanguageLabel.UI__U_Lab, Application.systemLanguage));
+
+        //SetWarningTitleAndText();
 
         Auxiliary.Instance.DelayCall(ActivateGame, LoadingDelayTime);
     }
 
-    public static void SetWarningTitleAndText()
+    public static void SetWarningTitle()
     {
         SystemLanguage language = Application.systemLanguage;
+
         if (Instance.AuditEdition)
         {
             language = SystemLanguage.ChineseSimplified;
         }
 
         ResourceManager.SetText(CanvasLabel.U_WarningTitle, Language.GetStr(LanguageLabel.UI__U_WarningTitle, language));
+    }
+
+    public static void SetWarningText()
+    {
+        SystemLanguage language = Application.systemLanguage;
+
+        if (Instance.AuditEdition)
+        {
+            language = SystemLanguage.ChineseSimplified;
+        }
+
         if (language == SystemLanguage.ChineseSimplified)
         {
             ResourceManager.SetActive(CanvasLabel.U_WarningTitle, false);

Assets/Script/Manage/NickNameManager.cs

@@ -114,6 +114,7 @@ public class NickNameManager : Regist
 	{
 	    if (NicknameInputField.text == NickName && !string.IsNullOrEmpty(NickName))
 	    {
+	        cost = 0;
 	        ResetSucceed();
             return;
 	    }

Assets/Script/Manage/UIManager.cs

@@ -60,6 +60,30 @@ public class UIManager : Regist
         ResourceManager.SetActive(CanvasLabel.C_Main, true);
         ResourceManager.SetActive(CanvasLabel.U_LoadingPanel, true);
 
+        #region WarningText
+
+        if (Initializer.Instance.DebugMode == false)
+        {
+            XmlDocument document = new XmlDocument();
+            TextAsset textAsset = Bundle.Defaul.LoadAsset<TextAsset>(ResourceLabel.DefaultEnglish);
+            document.LoadXml(textAsset.text);
+            Language.AddLanguageDocument(CurrentLanguage.English, document);
+
+            document = new XmlDocument();
+            textAsset = Bundle.Defaul.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseSimplified);
+            document.LoadXml(textAsset.text);
+            Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
+
+            document = new XmlDocument();
+            textAsset = Bundle.Defaul.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseTraditional);
+            document.LoadXml(textAsset.text);
+            Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
+
+            Initializer.SetWarningText();
+        }
+
+        #endregion
+
         #region 
 
         ResourceManager.Get(CanvasLabel.K_Bubble).AddScript<Bubble>();

Assets/Script/Object/Player.cs

@@ -590,10 +590,13 @@ public class CloseItem
         );
     }
 
-    public void OnBuySucceed()
+    public void OnBuySucceed(bool playAudio = true)
     {
         Unlock();
-        AudioManager.PlayClip(AudioLabel.GetCurrent);
+        if (playAudio)
+        {
+            AudioManager.PlayClip(AudioLabel.GetCurrent);
+        }
         PlayerManager.BoughtCloseIDs.UniqueAdd(ID);
     }
 
@@ -960,10 +963,10 @@ public class Player : Regist , IPointerClickHandler
             }
         }
 
-        //if (GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.InPlazaRoom)
-        //{
-        //    MoveThread();
-        //}
+        if (SFSManager.GardenSmartFox.PlazaRoomController.InPlazaRoom)
+        {
+            SetSlotLocalZ(WingSlot, 0.00003f);
+        }
     }
 
 
@@ -1054,7 +1057,11 @@ public class Player : Regist , IPointerClickHandler
     {
         ExpressionName = expressionName;
 
-        ExpressionMeshFilter.sharedMesh = SpriteUtility.CreateMesh(ResourceManager.LoadSprite(expressionName, Folder.Scene));
+        Sprite sprite = ResourceManager.LoadSprite(expressionName, Folder.Scene);
+        Texture2D texture = sprite.texture;
+
+        ExpressionMeshFilter.GetComponent<MeshRenderer>().material.SetTexture("_MainTex", texture);
+        ExpressionMeshFilter.sharedMesh = SpriteUtility.CreateMesh(sprite);
         ExpressionMeshFilter.mesh.SetUVs(1, Enumerable.Repeat(new Vector2(0, 1), ExpressionMeshFilter.mesh.vertices.Length).ToList());
         ExpressionMeshFilter.transform.parent = EyeSlot.UnityTransform;
 
@@ -1098,6 +1105,7 @@ public class Player : Regist , IPointerClickHandler
             throw new Exception();
         }
 
+        ResetDepth();
         DelayCall.Call(1, () => Shadow.SetX(Pivot.position.x));
     }
 
@@ -1689,10 +1697,13 @@ public class Player : Regist , IPointerClickHandler
     {
         UAC.transform.SetLZ(0.7f);
         SetSlotLocalZ(WingSlot, 0.00003f);
-        SetSlotLocalZ(EyeSlot, -0.00001f);
+        SetSlotLocalZ(EyeSlot, -0.00007f);
+        //SetSlotLocalZ(EyeSlot, -0.00001f);
         SetSlotLocalZ(TopSlot, -0.00003f);
-        SetSlotLocalZ(MouseSlot, -0.00001f);
-        SetSlotLocalZ(HeadWearSlot, -0.00001f);
+        SetSlotLocalZ(MouseSlot, -0.00007f);
+        //SetSlotLocalZ(MouseSlot, -0.00001f);
+        SetSlotLocalZ(HeadWearSlot, -0.00008f);
+        //SetSlotLocalZ(HeadWearSlot, -0.00001f);
         SetSlotLocalZ(LeftShoeSlot, -0.00001f);
         SetSlotLocalZ(RightShoeSlot, -0.00001f);
         SetSlotLocalZ(LeftLegSlot, 0);
@@ -1707,14 +1718,14 @@ public class Player : Regist , IPointerClickHandler
         if (HeadSlot.UnityTransform != null && HeadSlot.UnityTransform.childCount > 1)
         {
             HeadSlot.UnityTransform.GetChild(0).SetLZ(0.00002f);
-            HeadSlot.UnityTransform.GetChild(1).SetLZ(0f);
+            HeadSlot.UnityTransform.GetChild(1).SetLZ(-0.00006f);
         }
 
         SetSlotLocalZ(DressSlot, -0.00002f);
         if (DressSlot.UnityTransform != null && DressSlot.UnityTransform.childCount > 1)
         {
             DressSlot.UnityTransform.GetChild(0).SetLZ(0.00002f);
-            DressSlot.UnityTransform.GetChild(1).SetLZ(0f);
+            DressSlot.UnityTransform.GetChild(1).SetLZ(0);
         }
 
         LeftLongSleeveUAC.transform.SetLZ(-0.000015f);

Assets/Script/Social/FashionShowCloseBox.cs

@@ -79,21 +79,24 @@ public class FashionShowCloseCell
         PraiseShowHttp.Praise(HttpManager.GetPlayerId(), FashionShowData.showId, null, null);
     }
 
-    private void RefreshPraiseButton()
+    public void RefreshPraiseButton()
     {
         if (FashionShowData.praised)
         {
             PraiseButton.image.color = Lib.Pink;
+            PraiseText.color = Color.white;
         }
         else
         {
             PraiseButton.image.color = Color.white;
+            PraiseText.color = Lib.PraiseTextBlue;
         }
         PraiseText.text = FashionShowData.praiseCnt.ToString();
     }
 
     private void OnDisplayButtonClick()
     {
+        FashionShowEditPage.closeCell = this;
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         TweenRoot tween = FashionShowHomePage.HideSidePanel();
         bool belongSelf = FashionShowData.playerId == long.Parse(HttpManager.SerialNumber);

Assets/Script/Social/FashionShowEditPage.cs

@@ -77,6 +77,7 @@ public class FashionShowEditPage : Regist
     private static Transform SimpleSliderBg;
     private static Transform GlorySliderBg;
 
+    public static FashionShowCloseCell closeCell;
     //private static bool Praised;
     private static bool BelongSelf;
     private static bool LeaveToRateMode;
@@ -279,6 +280,7 @@ public class FashionShowEditPage : Regist
         CloseItems = new List<FashionShowCloseItem>();
         foreach (var closeID in CloseIDs)
         {
+            if (PlayerManager.CloseItemDictionary[closeID].Unavailable) continue;
             if (PlayerManager.CloseItemDictionary[closeID].Sprites == null) continue;
             if (PlayerManager.CloseItemDictionary[closeID].ArmatureName == "Empty") continue;
             Transform itemTrans = ResourceManager.Get(ResourceLabel.FashionShowCloseItem, Folder.UI, false, FashionShowCloseGrid, false, ObjType.FashionShowCloseItem);
@@ -370,7 +372,7 @@ public class FashionShowEditPage : Regist
         FashionTitleInputField.SetActive(false);
         FashionContentInputField.SetActive(false);
 
-        if (FashionShowData.rated == false)
+        if (FashionShowData.rated == false && FashionShowData.playerId != HttpManager.GetPlayerId())
         {
             ShowRateButton();
         }
@@ -461,6 +463,7 @@ public class FashionShowEditPage : Regist
             FashionShowData.praiseCnt--;
         }
         RefreshPraiseButton();
+        closeCell.RefreshPraiseButton();
         PraiseShowHttp.Praise(HttpManager.GetPlayerId(), FashionShowData.showId, null, null);
     }
 
@@ -469,10 +472,12 @@ public class FashionShowEditPage : Regist
         if (FashionShowData.praised)
         {
             PraiseButton.image.color = Lib.Pink;
+            PraiseText.color = Color.white;
         }
         else
         {
             PraiseButton.image.color = Color.white;
+            PraiseText.color = Lib.PraiseTextBlue;
         }
         PraiseText.text = FashionShowData.praiseCnt.ToString();
     }
@@ -632,11 +637,13 @@ public class FashionShowEditPage : Regist
 
     private static void OnBuyAllSucceedCallback()
     {
+        bool playAudio = true;
         foreach (var closeItem in CloseItems)
         {
             if (!closeItem.CloseItem.IsBought)
             {
-                closeItem.CloseItem.OnBuySucceed();
+                closeItem.CloseItem.OnBuySucceed(playAudio);
+                playAudio = false;
                 closeItem.Text.SetActive(true);
             }
         }

Assets/Script/Social/FashionShowHomePage.cs

@@ -46,7 +46,7 @@ public class FashionShowHomePage : Regist
     private static bool requesting;
     private static ShowListHttp http;
     private static FashionShowType currentType;
-    private static Button CurrentTabButton;
+    //private static Button CurrentTabButton;
     private static VirtualScrollRectPlus CurrentScrollRect;
     private static List<GetFashionShowData> CurrentDatas = new List<GetFashionShowData>();
 
@@ -109,7 +109,7 @@ public class FashionShowHomePage : Regist
         SidePanel = ResourceManager.Get(CanvasLabel.Pi_FashionShowHomeSidePanel);
         OpenHomePageButton = ResourceManager.Get<Button>(CanvasLabel.C_FashionShowButton);
 
-        CurrentTabButton = HomeTabButton;
+        //CurrentTabButton = HomeTabButton;
         TabButtons.Add(HomeTabButton);
         TabButtons.Add(CuteTabButton);
         TabButtons.Add(GraceTabButton);
@@ -221,7 +221,7 @@ public class FashionShowHomePage : Regist
         {
             tabButton.GetTweenScale().InOrigin = true;
         }
-        OnTabButtonClick(CurrentTabButton);
+        OnTabButtonClick(HomeTabButton);
     }
 
     public static void HidePanel()
@@ -288,7 +288,7 @@ public class FashionShowHomePage : Regist
         currentDataIndex = 0;
         currentPage = 0;
         currentType = (FashionShowType) index;
-        CurrentTabButton = button;
+        //CurrentTabButton = button;
         CurrentScrollRect = ScrollRects[index];
         CurrentDatas = TabDatasList[index];
         if (http != null)

Assets/Script/Social/FriendItem.cs

@@ -22,6 +22,8 @@ public class FriendItemLabel
 	public static string DeleteButtonParent = "DeleteButtonParent";
 	public static string DeleteButton = "DeleteButton";
 	public static string DeleteButtonText = "DeleteButtonText";
+	public static string NewMessageText = "NewMessageFlagText";
+	public static string NewMessageImage = "NewMessageFlag";
 }
 
 public class FriendItem : VirtualScrollRectItem
@@ -33,6 +35,8 @@ public class FriendItem : VirtualScrollRectItem
     public Text VisitButtonTitle;
     public Text SendMessageButtonText;
     public Text DeleteButtonText;
+    public Text NewMessageText;
+    public Image NewMessageImage;
     public Image NewMessageFlagImage;
     public Button VisitButton;
     public Button SendMessageButton;
@@ -57,6 +61,8 @@ public class FriendItem : VirtualScrollRectItem
         VisitButtonTitle = childDictionary[FriendItemLabel.VisitButtonTitle].GetComponent<Text>();
         SendMessageButtonText = childDictionary[FriendItemLabel.SendMessageButtonText].GetComponent<Text>();
         DeleteButtonText = childDictionary[FriendItemLabel.DeleteButtonText].GetComponent<Text>();
+        NewMessageText = childDictionary[FriendItemLabel.NewMessageText].GetComponent<Text>();
+        NewMessageImage = childDictionary[FriendItemLabel.NewMessageImage].GetComponent<Image>();
         NewMessageFlagImage = childDictionary[FriendItemLabel.NewMessageFlagImage].GetComponent<Image>();
         VisitButton = childDictionary[FriendItemLabel.VisitButton].GetComponent<Button>();
         SendMessageButton = childDictionary[FriendItemLabel.SendMessageButton].GetComponent<Button>();
@@ -127,6 +133,10 @@ public class FriendItem : VirtualScrollRectItem
                 HttpManager.DeleteBuddy(AccountData.SerialNumber, DeleteFriendSucceed, DeleteFriendFailed);
             }
         );
+        if (FriendPanel.ApplicantItems.Count == 0)
+        {
+            ConfigManager.SaveStringToConfig(PlayerConfigLabel.LastApplicantSerialNumber, "");
+        }
     }
 
     public void DeleteFriendFailed()
@@ -156,6 +166,7 @@ public class FriendItem : VirtualScrollRectItem
         if (serialNumber == AccountData.SerialNumber)
         {
             NewMessageFlagImage.SetActive(true);
+            NewMessageImage.SetActive(true);
         }
         FriendPanel.UpdateFriendButtonOutlineStatus();
     }
@@ -165,6 +176,7 @@ public class FriendItem : VirtualScrollRectItem
         if (serialNumber == AccountData.SerialNumber)
         {
             NewMessageFlagImage.SetActive(false);
+            NewMessageImage.SetActive(false);
         }
         FriendPanel.UpdateFriendButtonOutlineStatus();
     }

Assets/Script/Social/FriendPanel.cs

@@ -18,6 +18,12 @@ public class FriendPanel : Regist
 	public static Text AcceptAllButtonTitle;
 	public static Text AddFriendTitle;
 	public static Text FriendAmountText;
+
+    public static Text GardenNewMessageText;
+    public static Image GardenNewMessageImage;
+    public static Text PanelNewApplicantText;
+    public static Image PanelNewApplicantImage;
+
     public static Image NewApplicantFlagImage;
     public static Button OpenPanelButton;
     public static Button AcceptAllButton;
@@ -35,7 +41,7 @@ public class FriendPanel : Regist
 
     private static float RefreshApplicantTime = 15f;
     private static float RefreshApplicantTimer = RefreshApplicantTime;
-    private static List<ApplicantItem> ApplicantItems = new List<ApplicantItem>();
+    public static List<ApplicantItem> ApplicantItems = new List<ApplicantItem>();
     public static List<AccountData> ApplicantAccountDatas = new List<AccountData>();
 
     public static int MaxFriend
@@ -94,6 +100,12 @@ public class FriendPanel : Regist
         AcceptAllButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AF_AcceptAllButtonTitle);
         AddFriendTitle = ResourceManager.Get<Text>(CanvasLabel.AF_AddFriendTitle);
         FriendAmountText = ResourceManager.Get<Text>(CanvasLabel.AF_FriendAmountText);
+
+        GardenNewMessageText = ResourceManager.Get<Text>(CanvasLabel.C_NewMessageFlagText);
+        GardenNewMessageImage = ResourceManager.Get<Image>(CanvasLabel.C_NewMessageFlag);
+        PanelNewApplicantText = ResourceManager.Get<Text>(CanvasLabel.AF_NewMessageFlagText);
+        PanelNewApplicantImage = ResourceManager.Get<Image>(CanvasLabel.AF_NewMessageFlag);
+
         NewApplicantFlagImage = ResourceManager.Get<Image>(CanvasLabel.AF_NewApplicantFlagImage);
         AcceptAllButton = ResourceManager.Get<Button>(CanvasLabel.AF_AcceptAllButton);
         AddFriendButton = ResourceManager.Get<Button>(CanvasLabel.AF_AddFriendButton);
@@ -116,6 +128,8 @@ public class FriendPanel : Regist
         LanguageManager.Add(PanelTitle, new MulLanStr(LanguageLabel.UI__AF_PanelTitle));
         LanguageManager.Add(AcceptAllButtonTitle, new MulLanStr(LanguageLabel.UI__AF_AcceptAllButtonTitle));
         LanguageManager.Add(AddFriendTitle, new MulLanStr(LanguageLabel.UI__AF_AddFriendTitle));
+        LanguageManager.Add(PanelNewApplicantText, new MulLanStr(LanguageLabel.UI__AH_NewApplicant));
+        LanguageManager.Add(GardenNewMessageText, new MulLanStr(LanguageLabel.UI__AH_NewMessage));
 
         OpenPanelButton.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         FriendPanelParentMask.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -191,6 +205,24 @@ public class FriendPanel : Regist
 
     public static void UpdateFriendButtonOutlineStatus()
     {
+        if (HaveNewPrivateMessage)
+        {
+            GardenNewMessageImage.SetActive(true);
+        }
+        else
+        {
+            GardenNewMessageImage.SetActive(false);
+        }
+
+        if (HaveNewApplicant)
+        {
+            PanelNewApplicantImage.SetActive(true);
+        }
+        else
+        {
+            PanelNewApplicantImage.SetActive(false);
+        }
+
         if (HaveNewApplicant || HaveNewPrivateMessage)
         {
             PlayFriendButtonOutline();
@@ -365,7 +397,7 @@ public class FriendPanel : Regist
         UpdateFriendButtonOutlineStatus();
     }
 
-    private static void SaveLastApplicantSerialNumber()
+    public static void SaveLastApplicantSerialNumber()
     {
         if (ApplicantItems.Count > 0)
         {
@@ -385,8 +417,10 @@ public class FriendPanel : Regist
 
     public static void OpenRootFriendPanel()
     {
-        AudioManager.PlayClip(ResourceLabel.BtnClip);
         FriendPanelParentMask.TweenForCG();
+
+        ApplicantButton.isOn = false;
+        AfterApplicantToggleClick(false);
     }
 
     public static void CloseRootFriendPanel()
@@ -410,8 +444,15 @@ public class FriendPanel : Regist
     private static void OnApplicantToggleClick(bool value)
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
+        AfterApplicantToggleClick(value);
+    }
+
+    private static void AfterApplicantToggleClick(bool value)
+    {
         if (value)
         {
+            ResourceManager.Get(CanvasLabel.AF_ApplicantIcon).SetActive(true);
+
             SaveLastApplicantSerialNumber();
             SetNewApplicantStatus();
 
@@ -423,6 +464,8 @@ public class FriendPanel : Regist
         }
         else
         {
+            ResourceManager.Get(CanvasLabel.AF_ApplicantIcon).SetActive(false);
+
             AcceptAllButton.SetActive(false);
             AddFriendButton.SetActive(true);
             ApplicantScrollRect.SetActive(false);

Assets/Script/Tool/Bundle.cs

@@ -20,6 +20,8 @@ public class Bundle : MonoBehaviour
 {
     #region
 
+    public static string version = "1_3_1";
+
     public static bool CopyComplete
     {
         get { return CopyCount == 0; }
@@ -827,7 +829,7 @@ public class Bundle : MonoBehaviour
                 needUpdate = localMD5 != HttpManager.Md5;
                 Debug.LogWarning($"NeedUpdate : {needUpdate}");
             }
-            //if (Application.isEditor)
+            //if (Application.isEditor || Application.isMobilePlatform)
             //{
             //    needUpdate = false;
             //}

Assets/Script/UI/UpdatePanel.cs

@@ -29,21 +29,6 @@ public class UpdatePanel : MonoBehaviour
 
         alphaAnim = transform.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         scaleAnim = bg.CreateTweenScale(Vector3.zero, Vector3.one, 0.25f, false, true, Curve.EaseOutQuad);
-
-        XmlDocument document = new XmlDocument();
-        TextAsset textAsset = Bundle.Defaul.LoadAsset<TextAsset>(ResourceLabel.DefaultEnglish);
-        document.LoadXml(textAsset.text);
-        Language.AddLanguageDocument(CurrentLanguage.English, document);
-
-        document = new XmlDocument();
-        textAsset = Bundle.Defaul.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseSimplified);
-        document.LoadXml(textAsset.text);
-        Language.AddLanguageDocument(CurrentLanguage.ChineseSimplified, document);
-
-        document = new XmlDocument();
-        textAsset = Bundle.Defaul.LoadAsset<TextAsset>(ResourceLabel.DefaultChineseTraditional);
-        document.LoadXml(textAsset.text);
-        Language.AddLanguageDocument(CurrentLanguage.ChineseTraditional, document);
     }
 
     public static void Show()

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.3.0
+  bundleVersion: 1.3.1
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 24
+  AndroidBundleVersionCode: 25
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 16
+  iPhoneBuildNumber: 17
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

第五期.txt

@@ -1,11 +1,9 @@
-存档要升级 重新复制AssetBundle
-
-
-
 增加服装流程 骨骼位置 UI上的位置 语言文档 存档
 
 
 
+存档要升级 重新复制AssetBundle
+
 开启热更新
 
 关闭DebugMode 开启CatchException
@@ -16,10 +14,12 @@
 
 开启Service再打包
 
+更新版本号
+
+更新热更新版本
+
 更新Bundle
 
 更新服务器MD5
 
-更新版本号
-
 IOS设置Team