backup

Assets/Resource/Logo.unity

@@ -613,9 +613,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AuditEdition: 0
-  DebugMode: 0
+  DebugMode: 1
   CatchException: 0
-  DebugModeGo: {fileID: 0}
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

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/Canvas.prefab

@@ -1028,7 +1028,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1053465316034782
 GameObject:
   m_ObjectHideFlags: 1
@@ -68688,11 +68688,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 224085414907957848}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 6.309471, z: 1e-45}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -110.7, y: -0.0000073163}
-  m_SizeDelta: {x: 40, y: 20}
+  m_AnchoredPosition: {x: -117.9, y: -0.0000073163}
+  m_SizeDelta: {x: 54.3, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224053763258463120
 RectTransform:
@@ -79183,11 +79183,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 224647797067915046}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 6.309471, z: 1e-45}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -110.7, y: -0.0000073163}
-  m_SizeDelta: {x: 40, y: 20}
+  m_AnchoredPosition: {x: -117.9, y: -0.0000073163}
+  m_SizeDelta: {x: 54.3, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224569771961855250
 RectTransform:
@@ -82307,11 +82307,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 224017257619151634}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 6.309471, z: 1e-45}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -110.7, y: -0.0000073163}
-  m_SizeDelta: {x: 40, y: 20}
+  m_AnchoredPosition: {x: -117.9, y: -0.0000073163}
+  m_SizeDelta: {x: 54.3, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224710828233586620
 RectTransform:
@@ -83231,11 +83231,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 224336931507979612}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 6.309471, z: 1e-45}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -110.7, y: -0.0000073163}
-  m_SizeDelta: {x: 40, y: 20}
+  m_AnchoredPosition: {x: -117.9, y: -0.0000073163}
+  m_SizeDelta: {x: 54.3, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224754223672217316
 RectTransform:
@@ -85641,11 +85641,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 224018782967614802}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 6.309471, z: 1e-45}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -110.7, y: -0.0000073163}
-  m_SizeDelta: {x: 40, y: 20}
+  m_AnchoredPosition: {x: -117.9, y: -0.0000073163}
+  m_SizeDelta: {x: 54.3, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224879961203895100
 RectTransform:

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="32" />
   <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>

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>

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>

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/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,20 @@ 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);
+        }
+
         return nativeDoc;
     }
 
@@ -1942,4 +1956,30 @@ 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;
+    }
 }

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/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++)

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/FashionShowEditPage.cs

@@ -279,6 +279,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);
@@ -632,11 +633,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/Tool/Bundle.cs

@@ -827,7 +827,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/UnityConnectSettings.asset

@@ -21,7 +21,7 @@ UnityConnectSettings:
     m_TestEventUrl: 
     m_TestConfigUrl: 
   UnityAdsSettings:
-    m_Enabled: 0
+    m_Enabled: 1
     m_InitializeOnStartup: 0
     m_TestMode: 0
     m_EnabledPlatforms: 4294964991

第五期.txt

@@ -1,11 +1,15 @@
-存档要升级 重新复制AssetBundle
+增加服装流程 骨骼位置 UI上的位置 语言文档 存档
 
 
 
-增加服装流程 骨骼位置 UI上的位置 语言文档 存档
+搭配秀排序不对?
 
+搭配秀在编辑界面点赞后回到主界面 点赞数没有更新
 
 
+
+存档要升级 重新复制AssetBundle
+
 开启热更新
 
 关闭DebugMode 开启CatchException