修改一些细节

Assets/Resource/Logo.unity

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

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -196,7 +196,9 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb70c889ccbe321409013e054676a60c, type: 3}
   - {fileID: 21300000, guid: ef311f45a2bae694283ff8b6fe9188a9, type: 3}
   - {fileID: 21300000, guid: 7d6f22b630025984482ed1d75fef0fc4, type: 3}
-  EffectList: []
+  EffectList:
+  - {fileID: 1630066744600056, guid: 7393b86a2791bd24580de399f79a96cd, type: 2}
+  - {fileID: 1313425893881752, guid: 57a8b1695aa497442ae16329072ca484, type: 2}
   AudioList:
   - {fileID: 8300000, guid: 998dbbd7f5820394791cae7344e31426, type: 3}
   - {fileID: 8300000, guid: c0b4387ecfdd3374698e9e5a5ae4ff8b, type: 3}

Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -2414,6 +2414,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1770372047550402
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224794668605861602}
+  m_Layer: 5
+  m_Name: T_CloseParent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1778533189060636
 GameObject:
   m_ObjectHideFlags: 1
@@ -11781,7 +11796,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224674524660326142}
+  - {fileID: 224794668605861602}
   - {fileID: 224873190193445316}
   - {fileID: 224645346995192410}
   - {fileID: 224119601682187518}
@@ -12974,12 +12989,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224334310953292558}
+  m_Father: {fileID: 224794668605861602}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -58, y: -54.7}
+  m_AnchoredPosition: {x: -39.999973, y: -36.999992}
   m_SizeDelta: {x: 80.207, y: 73.152}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224675963718835172
@@ -13396,6 +13411,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224794668605861602
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1770372047550402}
+  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: 224674524660326142}
+  m_Father: {fileID: 224334310953292558}
+  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: 125.65, y: 99.149994}
+  m_SizeDelta: {x: 80, y: 74}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224796331429632620
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -8814,7 +8814,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -8.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224031962875580546
 RectTransform:
@@ -9021,7 +9021,7 @@ RectTransform:
   - {fileID: 224392580710825506}
   - {fileID: 224206509166005606}
   m_Father: {fileID: 224974788796122618}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -9774,7 +9774,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224974788796122618}
-  m_RootOrder: 1
+  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}
@@ -9997,7 +9997,7 @@ RectTransform:
   m_Children:
   - {fileID: 224090510489258460}
   m_Father: {fileID: 224974788796122618}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10133,7 +10133,7 @@ RectTransform:
   m_Children:
   - {fileID: 224030582993567684}
   m_Father: {fileID: 224974788796122618}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10300,7 +10300,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224974788796122618}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -10755,7 +10755,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224974788796122618}
-  m_RootOrder: 0
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10778,7 +10778,7 @@ RectTransform:
   - {fileID: 224953789343738198}
   - {fileID: 224331059165710072}
   m_Father: {fileID: 224974788796122618}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -11409,7 +11409,7 @@ RectTransform:
   m_Children:
   - {fileID: 224865101185584262}
   m_Father: {fileID: 224974788796122618}
-  m_RootOrder: 2
+  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}
@@ -11482,7 +11482,6 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224629864538501366}
   - {fileID: 224324769583027948}
   - {fileID: 224928645071453398}
   - {fileID: 224462427760207520}
@@ -11490,6 +11489,7 @@ RectTransform:
   - {fileID: 224421720116634072}
   - {fileID: 224655016452555360}
   - {fileID: 224104526059511814}
+  - {fileID: 224629864538501366}
   m_Father: {fileID: 224987275976052230}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resource/XML/Config/achieve_config.xml

@@ -85,42 +85,42 @@
   <item id="264" index="14" name="拥有的服装-4" desc="" type="14" value="60" parent="263" del="1" diamond_once="25" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="265" index="14" name="拥有的服装-5" desc="" type="14" value="90" parent="264" del="1" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="266" index="14" name="拥有的服装-6" desc="" type="14" value="120" parent="265" del="0" diamond_once="50" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="281" index="15" name="" desc="" type="15" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
-  <item id="282" index="15" name="" desc="" type="15" value="6" parent="281" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
-  <item id="283" index="15" name="" desc="" type="15" value="7" parent="282" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
-  <item id="284" index="15" name="" desc="" type="15" value="8" parent="283" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
-  <item id="285" index="15" name="" desc="" type="15" value="9" parent="284" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
-  <item id="286" index="15" name="" desc="" type="15" value="10" parent="285" del="0" diamond_once="10" coin_person="" person="" icon="派对图标" />
-  <item id="301" index="16" name="" desc="" type="16" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
-  <item id="302" index="16" name="" desc="" type="16" value="6" parent="301" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
-  <item id="303" index="16" name="" desc="" type="16" value="7" parent="302" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
-  <item id="304" index="16" name="" desc="" type="16" value="8" parent="303" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
-  <item id="305" index="16" name="" desc="" type="16" value="9" parent="304" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
-  <item id="306" index="16" name="" desc="" type="16" value="10" parent="305" del="0" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
-  <item id="321" index="17" name="" desc="" type="17" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
-  <item id="322" index="17" name="" desc="" type="17" value="6" parent="321" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
-  <item id="323" index="17" name="" desc="" type="17" value="7" parent="322" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
-  <item id="324" index="17" name="" desc="" type="17" value="8" parent="323" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
-  <item id="325" index="17" name="" desc="" type="17" value="9" parent="324" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
-  <item id="326" index="17" name="" desc="" type="17" value="10" parent="325" del="0" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
-  <item id="341" index="18" name="" desc="" type="18" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
-  <item id="342" index="18" name="" desc="" type="18" value="6" parent="341" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
-  <item id="343" index="18" name="" desc="" type="18" value="7" parent="342" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
-  <item id="344" index="18" name="" desc="" type="18" value="8" parent="343" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
-  <item id="345" index="18" name="" desc="" type="18" value="9" parent="344" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
-  <item id="346" index="18" name="" desc="" type="18" value="10" parent="345" del="0" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
-  <item id="361" index="19" name="" desc="" type="19" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
-  <item id="362" index="19" name="" desc="" type="19" value="6" parent="361" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
-  <item id="363" index="19" name="" desc="" type="19" value="7" parent="362" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
-  <item id="364" index="19" name="" desc="" type="19" value="8" parent="363" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
-  <item id="365" index="19" name="" desc="" type="19" value="9" parent="364" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
-  <item id="366" index="19" name="" desc="" type="19" value="10" parent="365" del="0" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
-  <item id="381" index="20" name="" desc="" type="20" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
-  <item id="382" index="20" name="" desc="" type="20" value="6" parent="381" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
-  <item id="383" index="20" name="" desc="" type="20" value="7" parent="382" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
-  <item id="384" index="20" name="" desc="" type="20" value="8" parent="383" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
-  <item id="385" index="20" name="" desc="" type="20" value="9" parent="384" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
-  <item id="386" index="20" name="" desc="" type="20" value="10" parent="385" del="0" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
+  <item id="281" index="15" name="派对狂人-1" desc="" type="15" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
+  <item id="282" index="15" name="派对狂人-2" desc="" type="15" value="10" parent="281" del="1" diamond_once="15" coin_person="" person="" icon="派对图标" />
+  <item id="283" index="15" name="派对狂人-3" desc="" type="15" value="100" parent="282" del="1" diamond_once="20" coin_person="" person="" icon="派对图标" />
+  <item id="284" index="15" name="派对狂人-4" desc="" type="15" value="5000" parent="283" del="1" diamond_once="25" coin_person="" person="" icon="派对图标" />
+  <item id="285" index="15" name="派对狂人-5" desc="" type="15" value="10000" parent="284" del="1" diamond_once="40" coin_person="" person="" icon="派对图标" />
+  <item id="286" index="15" name="派对狂人-6" desc="" type="15" value="500000" parent="285" del="0" diamond_once="50" coin_person="" person="" icon="派对图标" />
+  <item id="301" index="16" name="阔气老板-1" desc="" type="16" value="20" parent="" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
+  <item id="302" index="16" name="阔气老板-2" desc="" type="16" value="200" parent="301" del="1" diamond_once="15" coin_person="" person="" icon="系统宝箱" />
+  <item id="303" index="16" name="阔气老板-3" desc="" type="16" value="2000" parent="302" del="1" diamond_once="20" coin_person="" person="" icon="系统宝箱" />
+  <item id="304" index="16" name="阔气老板-4" desc="" type="16" value="50000" parent="303" del="1" diamond_once="25" coin_person="" person="" icon="系统宝箱" />
+  <item id="305" index="16" name="阔气老板-5" desc="" type="16" value="200000" parent="304" del="1" diamond_once="40" coin_person="" person="" icon="系统宝箱" />
+  <item id="306" index="16" name="阔气老板-6" desc="" type="16" value="5000000" parent="305" del="0" diamond_once="50" coin_person="" person="" icon="系统宝箱" />
+  <item id="321" index="17" name="快来抢-1" desc="" type="17" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
+  <item id="322" index="17" name="快来抢-2" desc="" type="17" value="50" parent="321" del="1" diamond_once="15" coin_person="" person="" icon="钻石宝箱" />
+  <item id="323" index="17" name="快来抢-3" desc="" type="17" value="500" parent="322" del="1" diamond_once="20" coin_person="" person="" icon="钻石宝箱" />
+  <item id="324" index="17" name="快来抢-4" desc="" type="17" value="10000" parent="323" del="1" diamond_once="25" coin_person="" person="" icon="钻石宝箱" />
+  <item id="325" index="17" name="快来抢-5" desc="" type="17" value="500000" parent="324" del="1" diamond_once="40" coin_person="" person="" icon="钻石宝箱" />
+  <item id="326" index="17" name="快来抢-6" desc="" type="17" value="1000000" parent="325" del="0" diamond_once="50" coin_person="" person="" icon="钻石宝箱" />
+  <item id="341" index="18" name="花秘人-1" desc="" type="18" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
+  <item id="342" index="18" name="花秘人-2" desc="" type="18" value="50" parent="341" del="1" diamond_once="15" coin_person="" person="" icon="花朵宝箱" />
+  <item id="343" index="18" name="花秘人-3" desc="" type="18" value="500" parent="342" del="1" diamond_once="20" coin_person="" person="" icon="花朵宝箱" />
+  <item id="344" index="18" name="花秘人-4" desc="" type="18" value="10000" parent="343" del="1" diamond_once="25" coin_person="" person="" icon="花朵宝箱" />
+  <item id="345" index="18" name="花秘人-5" desc="" type="18" value="500000" parent="344" del="1" diamond_once="40" coin_person="" person="" icon="花朵宝箱" />
+  <item id="346" index="18" name="花秘人-6" desc="" type="18" value="1000000" parent="345" del="0" diamond_once="50" coin_person="" person="" icon="花朵宝箱" />
+  <item id="361" index="19" name="经济学-1" desc="" type="19" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
+  <item id="362" index="19" name="经济学-2" desc="" type="19" value="50" parent="361" del="1" diamond_once="15" coin_person="" person="" icon="数字宝箱" />
+  <item id="363" index="19" name="经济学-3" desc="" type="19" value="500" parent="362" del="1" diamond_once="20" coin_person="" person="" icon="数字宝箱" />
+  <item id="364" index="19" name="经济学-4" desc="" type="19" value="10000" parent="363" del="1" diamond_once="25" coin_person="" person="" icon="数字宝箱" />
+  <item id="365" index="19" name="经济学-5" desc="" type="19" value="500000" parent="364" del="1" diamond_once="40" coin_person="" person="" icon="数字宝箱" />
+  <item id="366" index="19" name="经济学-6" desc="" type="19" value="1000000" parent="365" del="0" diamond_once="50" coin_person="" person="" icon="数字宝箱" />
+  <item id="381" index="20" name="红包达人-1" desc="" type="20" value="30" parent="" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
+  <item id="382" index="20" name="红包达人-2" desc="" type="20" value="500" parent="381" del="1" diamond_once="15" coin_person="" person="" icon="系统宝箱" />
+  <item id="383" index="20" name="红包达人-3" desc="" type="20" value="50000" parent="382" del="1" diamond_once="20" coin_person="" person="" icon="系统宝箱" />
+  <item id="384" index="20" name="红包达人-4" desc="" type="20" value="1000000" parent="383" del="1" diamond_once="25" coin_person="" person="" icon="系统宝箱" />
+  <item id="385" index="20" name="红包达人-5" desc="" type="20" value="500000000" parent="384" del="1" diamond_once="40" coin_person="" person="" icon="系统宝箱" />
+  <item id="386" index="20" name="红包达人-6" desc="" type="20" value="10000000000" parent="385" del="0" diamond_once="50" coin_person="" person="" icon="系统宝箱" />
   <comment>
     <id>
 

Assets/Resource/XML/PlayerConfig.xml

@@ -43,7 +43,7 @@
   <FlowerAmtList value="1" />
   <AchieveList value="" />
   <DressData Head="" Dress="" Shoe="" HeadWear="" Top="" Eye="" Mouse="" Wing="Empty" LeftLongSleeveSlot="Empty" LeftShortSleeveSlot="Empty" RightLongSleeveSlot="Empty" RightShortSleeveSlot="Empty"/>
-  <AchieveData AD="0" Skill="0" Sign="0" Share="0" ElfLevel="0" MiniGame="0" FlowerCoin="0" TotalPerson="0" CostDiamond="0" CreateRoomAmt="" CreateChestAmt="" CreateLuckyChestAmt="" CreateGuessColorChestAmt="" CreateGuessNumberChestAmt="" GetChestAwardAmt=""/>
+  <AchieveData AD="0" Skill="0" Sign="0" Share="0" ElfLevel="0" MiniGame="0" FlowerCoin="0" TotalPerson="0" CostDiamond="0" CreateRoomAmt="0" CreateChestAmt="0" CreateLuckyChestAmt="0" CreateGuessColorChestAmt="0" CreateGuessNumberChestAmt="0" GetChestAwardAmt="0"/>
 
   <SkillList>
     <Skill ID="Skill4" SkillType="Skill" ItemStatus="Lock" Level="0" CoolTimer="0" UseTimer="0" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -4,13 +4,13 @@
     <C_GardenLab desc=""><![CDATA[等级]]></C_GardenLab>
     <C_DressRoom desc=""><![CDATA[提升花园等级,开放试衣间]]></C_DressRoom>
     <C_VisitFail desc=""><![CDATA[无法访问花园]]></C_VisitFail>
-    <C_CannotComment desc=""><![CDATA[暂时不能向该玩家留言]]></C_CannotComment>
+    <C_CannotComment desc=""><![CDATA[不能留言，这家主人离开太久了]]></C_CannotComment>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[精灵]]></F_ElfLab>
     <F_GardenLab desc=""><![CDATA[花园]]></F_GardenLab>
     <F_PersonBtn0 desc=""><![CDATA[参观人次]]></F_PersonBtn0>
-    <F_PersonBtn1 desc=""><![CDATA[每分钟有多少人来参观花园]]></F_PersonBtn1>
+    <F_PersonBtn1 desc=""><![CDATA[每分钟有这么多人来参观花园]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[门票]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[每位来访者参观花费]]></F_CoinPersonBtn1>
     <Fe_BtnLab0 desc=""><![CDATA[提前解锁]]></Fe_BtnLab0>
@@ -24,7 +24,7 @@
     <Fe_BtnLab9 desc=""><![CDATA[已购买]]></Fe_BtnLab9>
     <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
     <Fg_BtnLab desc=""><![CDATA[连接服务器]]></Fg_BtnLab>
-    <Fg_Lab0 desc=""><![CDATA[该功能仅在联网时使用]]></Fg_Lab0>
+    <Fg_Lab0 desc=""><![CDATA[不联网可不行哦~]]></Fg_Lab0>
     <Fg_Lab1 desc=""><![CDATA[连接中]]></Fg_Lab1>
     <Fg_Lab2 desc=""><![CDATA[连接成功]]></Fg_Lab2>
     <Fg_Lab3 desc=""><![CDATA[连接失败 请检查你的网络设置]]></Fg_Lab3>
@@ -113,17 +113,17 @@
     <P_ShoeLab desc=""><![CDATA[鞋子]]></P_ShoeLab>
     <P_BtnLab1 desc=""><![CDATA[购买]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[已购<(已购)>]]></P_BtnLab2>
-    <P_Return desc=""><![CDATA[你的当前形象还有没购买的装扮，确定要退出吗？]]></P_Return>
+    <P_Return desc=""><![CDATA[当前形象还有没购买的装扮，确定要退出吗？]]></P_Return>
     <P_Unlock desc=""><![CDATA[未解锁]]></P_Unlock>
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
     <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
-    <Q_Placeholder desc=""><![CDATA[请输入留言内容]]></Q_Placeholder>
+    <Q_Placeholder desc=""><![CDATA[给这家主人说点什么吧]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
     <Q_CloseLab desc=""><![CDATA[关闭]]></Q_CloseLab>
-    <Q_CommentTip desc=""><![CDATA[留言发送间隔为30秒]]></Q_CommentTip>
-    <Q_CommentDone desc=""><![CDATA[发送成功]]></Q_CommentDone>
-    <Q_CommentFail desc=""><![CDATA[发送失败]]></Q_CommentFail>
+    <Q_CommentTip desc=""><![CDATA[30秒内只能留言一次哦！]]></Q_CommentTip>
+    <Q_CommentDone desc=""><![CDATA[留言成功]]></Q_CommentDone>
+    <Q_CommentFail desc=""><![CDATA[留言失败]]></Q_CommentFail>
     <R_Tit desc=""><![CDATA[公告]]></R_Tit>
     <N_Lab desc=""><![CDATA[去试衣间看看吧！]]></N_Lab>
     <I_Lab desc=""><![CDATA[加载中]]></I_Lab>
@@ -133,6 +133,7 @@
     <T_AllWhiteSpace desc=""><![CDATA[昵称不能为空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[检查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已经存在相同的昵称]]></T_RepeatName>
+    <X_Self desc=""><![CDATA[我]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中宝箱总价值的个位数即可领奖]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[猜中花的颜色即可领奖，答案不带“色”字]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[猜错了]]></Y_GuessWrong>
@@ -186,7 +187,7 @@
     <NoMore desc=""><![CDATA[没有更多内容了]]></NoMore>
     <热卖 desc=""><![CDATA[热卖]]></热卖>
     <超值 desc=""><![CDATA[超值]]></超值>
-    <加入房间失败 desc=""><![CDATA[无法连接到服务器]]></加入房间失败>
+    <加入房间失败 desc=""><![CDATA[哎呀，连接不上服务器呢！]]></加入房间失败>
     <内容不能为空 desc=""><![CDATA[内容不能为空]]></内容不能为空>
     <未命名 desc=""><![CDATA[未命名]]></未命名>
     <请勿重复发送 desc=""><![CDATA[请勿重复发送]]></请勿重复发送>
@@ -482,42 +483,42 @@
     <Achieve264 desc=""><![CDATA[衣橱满满-4]]></Achieve264>
     <Achieve265 desc=""><![CDATA[衣橱满满-5]]></Achieve265>
     <Achieve266 desc=""><![CDATA[衣橱满满-6]]></Achieve266>
-    <Achieve281 desc=""><![CDATA[开房间次数]]></Achieve281>
-    <Achieve282 desc=""><![CDATA[开房间次数]]></Achieve282>
-    <Achieve283 desc=""><![CDATA[开房间次数]]></Achieve283>
-    <Achieve284 desc=""><![CDATA[开房间次数]]></Achieve284>
-    <Achieve285 desc=""><![CDATA[开房间次数]]></Achieve285>
-    <Achieve286 desc=""><![CDATA[开房间次数]]></Achieve286>
-    <Achieve301 desc=""><![CDATA[放置宝箱总次数]]></Achieve301>
-    <Achieve302 desc=""><![CDATA[放置宝箱总次数]]></Achieve302>
-    <Achieve303 desc=""><![CDATA[放置宝箱总次数]]></Achieve303>
-    <Achieve304 desc=""><![CDATA[放置宝箱总次数]]></Achieve304>
-    <Achieve305 desc=""><![CDATA[放置宝箱总次数]]></Achieve305>
-    <Achieve306 desc=""><![CDATA[放置宝箱总次数]]></Achieve306>
-    <Achieve321 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve321>
-    <Achieve322 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve322>
-    <Achieve323 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve323>
-    <Achieve324 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve324>
-    <Achieve325 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve325>
-    <Achieve326 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve326>
-    <Achieve341 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve341>
-    <Achieve342 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve342>
-    <Achieve343 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve343>
-    <Achieve344 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve344>
-    <Achieve345 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve345>
-    <Achieve346 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve346>
-    <Achieve361 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve361>
-    <Achieve362 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve362>
-    <Achieve363 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve363>
-    <Achieve364 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve364>
-    <Achieve365 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve365>
-    <Achieve366 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve366>
-    <Achieve381 desc=""><![CDATA[房间宝箱领取次数]]></Achieve381>
-    <Achieve382 desc=""><![CDATA[房间宝箱领取次数]]></Achieve382>
-    <Achieve383 desc=""><![CDATA[房间宝箱领取次数]]></Achieve383>
-    <Achieve384 desc=""><![CDATA[房间宝箱领取次数]]></Achieve384>
-    <Achieve385 desc=""><![CDATA[房间宝箱领取次数]]></Achieve385>
-    <Achieve386 desc=""><![CDATA[房间宝箱领取次数]]></Achieve386>
+    <Achieve281 desc=""><![CDATA[派对狂人-1]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[派对狂人-2]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[派对狂人-3]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[派对狂人-4]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[派对狂人-5]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[派对狂人-6]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[阔气老板-1]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[阔气老板-2]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[阔气老板-3]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[阔气老板-4]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[阔气老板-5]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[阔气老板-6]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[快来抢-1]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[快来抢-2]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[快来抢-3]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[快来抢-4]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[快来抢-5]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[快来抢-6]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[花秘人-1]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[花秘人-2]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[花秘人-3]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[花秘人-4]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[花秘人-5]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[花秘人-6]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[经济学-1]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[经济学-2]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[经济学-3]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[经济学-4]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[经济学-5]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[经济学-6]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[红包达人-1]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[红包达人-2]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[红包达人-3]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[红包达人-4]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[红包达人-5]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[红包达人-6]]></Achieve386>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花园等级达到 [&value&]]]></Achieve1>
@@ -544,12 +545,12 @@
     <Achieve64 desc=""><![CDATA[所有精灵等级总和达到[&value&]级]]></Achieve64>
     <Achieve65 desc=""><![CDATA[所有精灵等级总和达到[&value&]级]]></Achieve65>
     <Achieve66 desc=""><![CDATA[所有精灵等级总和达到[&value&]级]]></Achieve66>
-    <Achieve81 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve81>
-    <Achieve82 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve82>
-    <Achieve83 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve83>
-    <Achieve84 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve84>
-    <Achieve85 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve85>
-    <Achieve86 desc=""><![CDATA[花朵数量达到[&value&]]]></Achieve86>
+    <Achieve81 desc=""><![CDATA[花朵种类达到[&value&]]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[花朵种类达到[&value&]]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[花朵种类达到[&value&]]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[花朵种类达到[&value&]]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[花朵种类达到[&value&]]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[花朵种类达到[&value&]]]></Achieve86>
     <Achieve101 desc=""><![CDATA[参观人次总数达到[&value&]]]></Achieve101>
     <Achieve102 desc=""><![CDATA[参观人次总数达到[&value&]]]></Achieve102>
     <Achieve103 desc=""><![CDATA[参观人次总数达到[&value&]]]></Achieve103>
@@ -606,42 +607,42 @@
     <Achieve264 desc=""><![CDATA[拥有[&value&]件装扮]]></Achieve264>
     <Achieve265 desc=""><![CDATA[拥有[&value&]件装扮]]></Achieve265>
     <Achieve266 desc=""><![CDATA[拥有[&value&]件装扮]]></Achieve266>
-    <Achieve281 desc=""><![CDATA[开房间次数]]></Achieve281>
-    <Achieve282 desc=""><![CDATA[开房间次数]]></Achieve282>
-    <Achieve283 desc=""><![CDATA[开房间次数]]></Achieve283>
-    <Achieve284 desc=""><![CDATA[开房间次数]]></Achieve284>
-    <Achieve285 desc=""><![CDATA[开房间次数]]></Achieve285>
-    <Achieve286 desc=""><![CDATA[开房间次数]]></Achieve286>
-    <Achieve301 desc=""><![CDATA[放置宝箱总次数]]></Achieve301>
-    <Achieve302 desc=""><![CDATA[放置宝箱总次数]]></Achieve302>
-    <Achieve303 desc=""><![CDATA[放置宝箱总次数]]></Achieve303>
-    <Achieve304 desc=""><![CDATA[放置宝箱总次数]]></Achieve304>
-    <Achieve305 desc=""><![CDATA[放置宝箱总次数]]></Achieve305>
-    <Achieve306 desc=""><![CDATA[放置宝箱总次数]]></Achieve306>
-    <Achieve321 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve321>
-    <Achieve322 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve322>
-    <Achieve323 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve323>
-    <Achieve324 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve324>
-    <Achieve325 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve325>
-    <Achieve326 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve326>
-    <Achieve341 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve341>
-    <Achieve342 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve342>
-    <Achieve343 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve343>
-    <Achieve344 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve344>
-    <Achieve345 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve345>
-    <Achieve346 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve346>
-    <Achieve361 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve361>
-    <Achieve362 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve362>
-    <Achieve363 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve363>
-    <Achieve364 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve364>
-    <Achieve365 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve365>
-    <Achieve366 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve366>
-    <Achieve381 desc=""><![CDATA[房间宝箱领取次数]]></Achieve381>
-    <Achieve382 desc=""><![CDATA[房间宝箱领取次数]]></Achieve382>
-    <Achieve383 desc=""><![CDATA[房间宝箱领取次数]]></Achieve383>
-    <Achieve384 desc=""><![CDATA[房间宝箱领取次数]]></Achieve384>
-    <Achieve385 desc=""><![CDATA[房间宝箱领取次数]]></Achieve385>
-    <Achieve386 desc=""><![CDATA[房间宝箱领取次数]]></Achieve386>
+    <Achieve281 desc=""><![CDATA[创建派对[&value&]次]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[创建派对[&value&]次]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[创建派对[&value&]次]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[创建派对[&value&]次]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[创建派对[&value&]次]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[创建派对[&value&]次]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[总共放置宝箱[&value&]次]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[总共放置宝箱[&value&]次]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[总共放置宝箱[&value&]次]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[总共放置宝箱[&value&]次]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[总共放置宝箱[&value&]次]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[总共放置宝箱[&value&]次]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[放置拼手气宝箱[&value&]次]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[放置拼手气宝箱[&value&]次]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[放置拼手气宝箱[&value&]次]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[放置拼手气宝箱[&value&]次]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[放置拼手气宝箱[&value&]次]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[放置拼手气宝箱[&value&]次]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[放置猜颜色宝箱[&value&]次]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[放置猜颜色宝箱[&value&]次]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[放置猜颜色宝箱[&value&]次]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[放置猜颜色宝箱[&value&]次]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[放置猜颜色宝箱[&value&]次]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[放置猜颜色宝箱[&value&]次]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[放置猜数字宝箱[&value&]次]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[放置猜数字宝箱[&value&]次]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[放置猜数字宝箱[&value&]次]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[放置猜数字宝箱[&value&]次]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[放置猜数字宝箱[&value&]次]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[放置猜数字宝箱[&value&]次]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[领取派对宝箱[&value&]次]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[领取派对宝箱[&value&]次]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[领取派对宝箱[&value&]次]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[领取派对宝箱[&value&]次]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[领取派对宝箱[&value&]次]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[领取派对宝箱[&value&]次]]></Achieve386>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[没有广告可播放啦，请稍后再试]]></LoadAd>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -4,13 +4,13 @@
     <C_GardenLab desc=""><![CDATA[等級]]></C_GardenLab>
     <C_DressRoom desc=""><![CDATA[提升花園等級,開放試衣間]]></C_DressRoom>
     <C_VisitFail desc=""><![CDATA[無法訪問花園]]></C_VisitFail>
-    <C_CannotComment desc=""><![CDATA[]]></C_CannotComment>
+    <C_CannotComment desc=""><![CDATA[不能留言，這家主人離開太久了]]></C_CannotComment>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[精靈]]></F_ElfLab>
     <F_GardenLab desc=""><![CDATA[花園]]></F_GardenLab>
     <F_PersonBtn0 desc=""><![CDATA[參觀人次]]></F_PersonBtn0>
-    <F_PersonBtn1 desc=""><![CDATA[每分鐘有多少人來參觀花園]]></F_PersonBtn1>
+    <F_PersonBtn1 desc=""><![CDATA[每分鐘有這麼多人來參觀花園]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[門票]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[每位來訪者參觀花費]]></F_CoinPersonBtn1>
     <Fe_BtnLab0 desc=""><![CDATA[提前解鎖]]></Fe_BtnLab0>
@@ -24,7 +24,7 @@
     <Fe_BtnLab9 desc=""><![CDATA[已購買]]></Fe_BtnLab9>
     <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
     <Fg_BtnLab desc=""><![CDATA[連接伺服器]]></Fg_BtnLab>
-    <Fg_Lab0 desc=""><![CDATA[該功能僅在聯網時使用]]></Fg_Lab0>
+    <Fg_Lab0 desc=""><![CDATA[不聯網可不行哦~]]></Fg_Lab0>
     <Fg_Lab1 desc=""><![CDATA[連接中]]></Fg_Lab1>
     <Fg_Lab2 desc=""><![CDATA[連接成功]]></Fg_Lab2>
     <Fg_Lab3 desc=""><![CDATA[連接失敗 請檢查你的網路設置]]></Fg_Lab3>
@@ -113,17 +113,17 @@
     <P_ShoeLab desc=""><![CDATA[鞋子]]></P_ShoeLab>
     <P_BtnLab1 desc=""><![CDATA[購買]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[已購<(已购)>]]></P_BtnLab2>
-    <P_Return desc=""><![CDATA[妳的當前形象還有沒購買的裝扮，確定要退出嗎？]]></P_Return>
+    <P_Return desc=""><![CDATA[當前形象還有沒購買的裝扮，確定要退出嗎？]]></P_Return>
     <P_Unlock desc=""><![CDATA[未解鎖]]></P_Unlock>
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
-    <Q_Tit desc=""><![CDATA[]]></Q_Tit>
-    <Q_Placeholder desc=""><![CDATA[請輸入留言內容]]></Q_Placeholder>
+    <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
+    <Q_Placeholder desc=""><![CDATA[給這家主人說點什麼吧]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
     <Q_CloseLab desc=""><![CDATA[關閉]]></Q_CloseLab>
-    <Q_CommentTip desc=""><![CDATA[留言發送間隔為30秒]]></Q_CommentTip>
-    <Q_CommentDone desc=""><![CDATA[發送成功]]></Q_CommentDone>
-    <Q_CommentFail desc=""><![CDATA[發送失敗]]></Q_CommentFail>
+    <Q_CommentTip desc=""><![CDATA[30秒內只能留言一次哦！]]></Q_CommentTip>
+    <Q_CommentDone desc=""><![CDATA[留言成功]]></Q_CommentDone>
+    <Q_CommentFail desc=""><![CDATA[留言失敗]]></Q_CommentFail>
     <R_Tit desc=""><![CDATA[公告]]></R_Tit>
     <N_Lab desc=""><![CDATA[去試衣間看看吧！]]></N_Lab>
     <I_Lab desc=""><![CDATA[加載中]]></I_Lab>
@@ -133,6 +133,7 @@
     <T_AllWhiteSpace desc=""><![CDATA[昵稱不能為空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[檢查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已經存在相同的昵稱]]></T_RepeatName>
+    <X_Self desc=""><![CDATA[]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中寶箱總價值的個位數即可領獎]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[猜中花的顏色即可領獎，答案不帶“色”字]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[猜錯了]]></Y_GuessWrong>
@@ -156,7 +157,7 @@
     <Z_InfoLab4 desc=""><![CDATA[人員]]></Z_InfoLab4>
     <Z_InfoLab5 desc=""><![CDATA[由我創建]]></Z_InfoLab5>
     <Z_Closing desc=""><![CDATA[即將結束]]></Z_Closing>
-    <Z_Permanent desc=""><![CDATA[]]></Z_Permanent>
+    <Z_Permanent desc=""><![CDATA[永久]]></Z_Permanent>
     <Z_CreateLab desc=""><![CDATA[創建房間]]></Z_CreateLab>
     <Z_Running desc=""><![CDATA[進行中]]></Z_Running>
     <Z_Full desc=""><![CDATA[已滿]]></Z_Full>
@@ -165,7 +166,7 @@
     <Z_RoomFull desc=""><![CDATA[派對人數已滿，無法加入]]></Z_RoomFull>
     <Z_RoomExpire desc=""><![CDATA[派對已經結束，自己創建一個吧!]]></Z_RoomExpire>
     <Z_Unknown desc=""><![CDATA[派對人數已滿]]></Z_Unknown>
-    <Z_SystemRoomName desc=""><![CDATA[]]></Z_SystemRoomName>
+    <Z_SystemRoomName desc=""><![CDATA[派對不停歇]]></Z_SystemRoomName>
     <AA_BtnLab desc=""><![CDATA[創建]]></AA_BtnLab>
     <AA_AllWhiteSpace desc=""><![CDATA[派對名字不能為空]]></AA_AllWhiteSpace>
     <AA_TooLong desc=""><![CDATA[名字太長]]></AA_TooLong>
@@ -186,7 +187,7 @@
     <NoMore desc=""><![CDATA[沒有更多內容了]]></NoMore>
     <热卖 desc=""><![CDATA[熱賣]]></热卖>
     <超值 desc=""><![CDATA[超值]]></超值>
-    <加入房间失败 desc=""><![CDATA[無法連接到伺服器]]></加入房间失败>
+    <加入房间失败 desc=""><![CDATA[哎呀，連接不上伺服器呢！]]></加入房间失败>
     <内容不能为空 desc=""><![CDATA[內容不能為空]]></内容不能为空>
     <未命名 desc=""><![CDATA[未命名]]></未命名>
     <请勿重复发送 desc=""><![CDATA[請勿重複發送]]></请勿重复发送>
@@ -375,7 +376,7 @@
     <Diamond desc=""><![CDATA[鉆石]]></Diamond>
     <Confirm desc=""><![CDATA[確定]]></Confirm>
     <Cancel desc=""><![CDATA[取消]]></Cancel>
-    <Close desc=""><![CDATA[]]></Close>
+    <Close desc=""><![CDATA[關閉]]></Close>
     <AD desc=""><![CDATA[觀看]]></AD>
     <Cash desc=""><![CDATA[CNY]]></Cash>
     <Person desc=""><![CDATA[參觀人次]]></Person>
@@ -482,42 +483,42 @@
     <Achieve264 desc=""><![CDATA[衣櫥滿滿-4]]></Achieve264>
     <Achieve265 desc=""><![CDATA[衣櫥滿滿-5]]></Achieve265>
     <Achieve266 desc=""><![CDATA[衣櫥滿滿-6]]></Achieve266>
-    <Achieve281 desc=""><![CDATA[]]></Achieve281>
-    <Achieve282 desc=""><![CDATA[]]></Achieve282>
-    <Achieve283 desc=""><![CDATA[]]></Achieve283>
-    <Achieve284 desc=""><![CDATA[]]></Achieve284>
-    <Achieve285 desc=""><![CDATA[]]></Achieve285>
-    <Achieve286 desc=""><![CDATA[]]></Achieve286>
-    <Achieve301 desc=""><![CDATA[]]></Achieve301>
-    <Achieve302 desc=""><![CDATA[]]></Achieve302>
-    <Achieve303 desc=""><![CDATA[]]></Achieve303>
-    <Achieve304 desc=""><![CDATA[]]></Achieve304>
-    <Achieve305 desc=""><![CDATA[]]></Achieve305>
-    <Achieve306 desc=""><![CDATA[]]></Achieve306>
-    <Achieve321 desc=""><![CDATA[]]></Achieve321>
-    <Achieve322 desc=""><![CDATA[]]></Achieve322>
-    <Achieve323 desc=""><![CDATA[]]></Achieve323>
-    <Achieve324 desc=""><![CDATA[]]></Achieve324>
-    <Achieve325 desc=""><![CDATA[]]></Achieve325>
-    <Achieve326 desc=""><![CDATA[]]></Achieve326>
-    <Achieve341 desc=""><![CDATA[]]></Achieve341>
-    <Achieve342 desc=""><![CDATA[]]></Achieve342>
-    <Achieve343 desc=""><![CDATA[]]></Achieve343>
-    <Achieve344 desc=""><![CDATA[]]></Achieve344>
-    <Achieve345 desc=""><![CDATA[]]></Achieve345>
-    <Achieve346 desc=""><![CDATA[]]></Achieve346>
-    <Achieve361 desc=""><![CDATA[]]></Achieve361>
-    <Achieve362 desc=""><![CDATA[]]></Achieve362>
-    <Achieve363 desc=""><![CDATA[]]></Achieve363>
-    <Achieve364 desc=""><![CDATA[]]></Achieve364>
-    <Achieve365 desc=""><![CDATA[]]></Achieve365>
-    <Achieve366 desc=""><![CDATA[]]></Achieve366>
-    <Achieve381 desc=""><![CDATA[]]></Achieve381>
-    <Achieve382 desc=""><![CDATA[]]></Achieve382>
-    <Achieve383 desc=""><![CDATA[]]></Achieve383>
-    <Achieve384 desc=""><![CDATA[]]></Achieve384>
-    <Achieve385 desc=""><![CDATA[]]></Achieve385>
-    <Achieve386 desc=""><![CDATA[]]></Achieve386>
+    <Achieve281 desc=""><![CDATA[派對狂人-1]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[派對狂人-2]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[派對狂人-3]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[派對狂人-4]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[派對狂人-5]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[派對狂人-6]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[闊氣老闆-1]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[闊氣老闆-2]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[闊氣老闆-3]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[闊氣老闆-4]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[闊氣老闆-5]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[闊氣老闆-6]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[快來搶-1]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[快來搶-2]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[快來搶-3]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[快來搶-4]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[快來搶-5]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[快來搶-6]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[花秘人-1]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[花秘人-2]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[花秘人-3]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[花秘人-4]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[花秘人-5]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[花秘人-6]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[經濟學-1]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[經濟學-2]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[經濟學-3]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[經濟學-4]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[經濟學-5]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[經濟學-6]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[紅包達人-1]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[紅包達人-2]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[紅包達人-3]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[紅包達人-4]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[紅包達人-5]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[紅包達人-6]]></Achieve386>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花園等級達到 [&value&]]]></Achieve1>
@@ -544,12 +545,12 @@
     <Achieve64 desc=""><![CDATA[所有精靈等級總和達到[&value&]級]]></Achieve64>
     <Achieve65 desc=""><![CDATA[所有精靈等級總和達到[&value&]級]]></Achieve65>
     <Achieve66 desc=""><![CDATA[所有精靈等級總和達到[&value&]級]]></Achieve66>
-    <Achieve81 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve81>
-    <Achieve82 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve82>
-    <Achieve83 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve83>
-    <Achieve84 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve84>
-    <Achieve85 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve85>
-    <Achieve86 desc=""><![CDATA[花朵數量達到[&value&]]]></Achieve86>
+    <Achieve81 desc=""><![CDATA[花朵種類達到[&value&]]]></Achieve81>
+    <Achieve82 desc=""><![CDATA[花朵種類達到[&value&]]]></Achieve82>
+    <Achieve83 desc=""><![CDATA[花朵種類達到[&value&]]]></Achieve83>
+    <Achieve84 desc=""><![CDATA[花朵種類達到[&value&]]]></Achieve84>
+    <Achieve85 desc=""><![CDATA[花朵種類達到[&value&]]]></Achieve85>
+    <Achieve86 desc=""><![CDATA[花朵種類達到[&value&]]]></Achieve86>
     <Achieve101 desc=""><![CDATA[參觀人次總數達到[&value&]]]></Achieve101>
     <Achieve102 desc=""><![CDATA[參觀人次總數達到[&value&]]]></Achieve102>
     <Achieve103 desc=""><![CDATA[參觀人次總數達到[&value&]]]></Achieve103>
@@ -606,42 +607,42 @@
     <Achieve264 desc=""><![CDATA[擁有[&value&]件裝扮]]></Achieve264>
     <Achieve265 desc=""><![CDATA[擁有[&value&]件裝扮]]></Achieve265>
     <Achieve266 desc=""><![CDATA[擁有[&value&]件裝扮]]></Achieve266>
-    <Achieve281 desc=""><![CDATA[]]></Achieve281>
-    <Achieve282 desc=""><![CDATA[]]></Achieve282>
-    <Achieve283 desc=""><![CDATA[]]></Achieve283>
-    <Achieve284 desc=""><![CDATA[]]></Achieve284>
-    <Achieve285 desc=""><![CDATA[]]></Achieve285>
-    <Achieve286 desc=""><![CDATA[]]></Achieve286>
-    <Achieve301 desc=""><![CDATA[]]></Achieve301>
-    <Achieve302 desc=""><![CDATA[]]></Achieve302>
-    <Achieve303 desc=""><![CDATA[]]></Achieve303>
-    <Achieve304 desc=""><![CDATA[]]></Achieve304>
-    <Achieve305 desc=""><![CDATA[]]></Achieve305>
-    <Achieve306 desc=""><![CDATA[]]></Achieve306>
-    <Achieve321 desc=""><![CDATA[]]></Achieve321>
-    <Achieve322 desc=""><![CDATA[]]></Achieve322>
-    <Achieve323 desc=""><![CDATA[]]></Achieve323>
-    <Achieve324 desc=""><![CDATA[]]></Achieve324>
-    <Achieve325 desc=""><![CDATA[]]></Achieve325>
-    <Achieve326 desc=""><![CDATA[]]></Achieve326>
-    <Achieve341 desc=""><![CDATA[]]></Achieve341>
-    <Achieve342 desc=""><![CDATA[]]></Achieve342>
-    <Achieve343 desc=""><![CDATA[]]></Achieve343>
-    <Achieve344 desc=""><![CDATA[]]></Achieve344>
-    <Achieve345 desc=""><![CDATA[]]></Achieve345>
-    <Achieve346 desc=""><![CDATA[]]></Achieve346>
-    <Achieve361 desc=""><![CDATA[]]></Achieve361>
-    <Achieve362 desc=""><![CDATA[]]></Achieve362>
-    <Achieve363 desc=""><![CDATA[]]></Achieve363>
-    <Achieve364 desc=""><![CDATA[]]></Achieve364>
-    <Achieve365 desc=""><![CDATA[]]></Achieve365>
-    <Achieve366 desc=""><![CDATA[]]></Achieve366>
-    <Achieve381 desc=""><![CDATA[]]></Achieve381>
-    <Achieve382 desc=""><![CDATA[]]></Achieve382>
-    <Achieve383 desc=""><![CDATA[]]></Achieve383>
-    <Achieve384 desc=""><![CDATA[]]></Achieve384>
-    <Achieve385 desc=""><![CDATA[]]></Achieve385>
-    <Achieve386 desc=""><![CDATA[]]></Achieve386>
+    <Achieve281 desc=""><![CDATA[創建派對[&value&]次]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[創建派對[&value&]次]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[創建派對[&value&]次]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[創建派對[&value&]次]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[創建派對[&value&]次]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[創建派對[&value&]次]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[總共放置寶箱[&value&]次]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[總共放置寶箱[&value&]次]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[總共放置寶箱[&value&]次]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[總共放置寶箱[&value&]次]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[總共放置寶箱[&value&]次]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[總共放置寶箱[&value&]次]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[放置拼手氣寶箱[&value&]次]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[放置拼手氣寶箱[&value&]次]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[放置拼手氣寶箱[&value&]次]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[放置拼手氣寶箱[&value&]次]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[放置拼手氣寶箱[&value&]次]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[放置拼手氣寶箱[&value&]次]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[放置猜顏色寶箱[&value&]次]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[放置猜顏色寶箱[&value&]次]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[放置猜顏色寶箱[&value&]次]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[放置猜顏色寶箱[&value&]次]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[放置猜顏色寶箱[&value&]次]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[放置猜顏色寶箱[&value&]次]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[放置猜數字寶箱[&value&]次]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[放置猜數字寶箱[&value&]次]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[放置猜數字寶箱[&value&]次]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[放置猜數字寶箱[&value&]次]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[放置猜數字寶箱[&value&]次]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[放置猜數字寶箱[&value&]次]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[領取派對寶箱[&value&]次]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[領取派對寶箱[&value&]次]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[領取派對寶箱[&value&]次]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[領取派對寶箱[&value&]次]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[領取派對寶箱[&value&]次]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[領取派對寶箱[&value&]次]]></Achieve386>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[沒有廣告可播放啦，請稍後再試]]></LoadAd>

Assets/Resource/XML/lan/English.xml

@@ -4,7 +4,7 @@
     <C_GardenLab desc=""><![CDATA[Level ]]></C_GardenLab>
     <C_DressRoom desc=""><![CDATA[Upgrade garden to enter dressroom]]></C_DressRoom>
     <C_VisitFail desc=""><![CDATA[Visit failed]]></C_VisitFail>
-    <C_CannotComment desc=""><![CDATA[]]></C_CannotComment>
+    <C_CannotComment desc=""><![CDATA[Not available, host left away too long]]></C_CannotComment>
     <F_StoreLab desc=""><![CDATA[Shop]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[Mag]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[Elf]]></F_ElfLab>
@@ -113,12 +113,12 @@ Program 水怪
     <P_ShoeLab desc=""><![CDATA[Shoe]]></P_ShoeLab>
     <P_BtnLab1 desc=""><![CDATA[Buy]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[Bought<(已购)>]]></P_BtnLab2>
-    <P_Return desc=""><![CDATA[You currently have some close not yet purchased,are you sure you want to leave?]]></P_Return>
+    <P_Return desc=""><![CDATA[Some closet has not been purchased yet,are you sure you want to leave?]]></P_Return>
     <P_Unlock desc=""><![CDATA[Locked]]></P_Unlock>
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
-    <Q_Tit desc=""><![CDATA[]]></Q_Tit>
-    <Q_Placeholder desc=""><![CDATA[Say something]]></Q_Placeholder>
+    <Q_Tit desc=""><![CDATA[Message board]]></Q_Tit>
+    <Q_Placeholder desc=""><![CDATA[Say something to the host]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[Comment]]></Q_CommentLab>
     <Q_CloseLab desc=""><![CDATA[Close]]></Q_CloseLab>
     <Q_CommentTip desc=""><![CDATA[Sending interval is 30 seconds]]></Q_CommentTip>
@@ -133,6 +133,7 @@ Program 水怪
     <T_AllWhiteSpace desc=""><![CDATA[Nickname can not be null]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[Checking]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[Repeat]]></T_RepeatName>
+    <X_Self desc=""><![CDATA[]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[Hit the last digit of total value of the chest]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[Hit the color of the flower shape. The answer can ignore case]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[Wrong]]></Y_GuessWrong>
@@ -140,7 +141,7 @@ Program 水怪
     <Y_Unactive desc=""><![CDATA[Not ready yet]]></Y_Unactive>
     <Y_Refund desc=""><![CDATA[Your treasures still left, return the rest <(Diamond)> to you already]]></Y_Refund>
     <Yb_Minimum desc=""><![CDATA[At least 20 Diamonds]]></Yb_Minimum>
-    <Yb_GuessNumber desc=""><![CDATA[Number]]></Yb_GuessNumber>
+    <Yb_GuessNumber desc=""><![CDATA[Digit]]></Yb_GuessNumber>
     <Yb_GuessColor desc=""><![CDATA[Color]]></Yb_GuessColor>
     <Yb_Lucky desc=""><![CDATA[Lucky]]></Yb_Lucky>
     <Yb_GuessNumberDesc desc=""><![CDATA[The Diamonds divided equally, each one can get once]]></Yb_GuessNumberDesc>
@@ -156,7 +157,7 @@ Program 水怪
     <Z_InfoLab4 desc=""><![CDATA[Headcount]]></Z_InfoLab4>
     <Z_InfoLab5 desc=""><![CDATA[By me]]></Z_InfoLab5>
     <Z_Closing desc=""><![CDATA[Almost close]]></Z_Closing>
-    <Z_Permanent desc=""><![CDATA[]]></Z_Permanent>
+    <Z_Permanent desc=""><![CDATA[Forever]]></Z_Permanent>
     <Z_CreateLab desc=""><![CDATA[Create Party]]></Z_CreateLab>
     <Z_Running desc=""><![CDATA[Ongoing]]></Z_Running>
     <Z_Full desc=""><![CDATA[Full]]></Z_Full>
@@ -165,7 +166,7 @@ Program 水怪
     <Z_RoomFull desc=""><![CDATA[Party room is full]]></Z_RoomFull>
     <Z_RoomExpire desc=""><![CDATA[Party is over, create one by your self!]]></Z_RoomExpire>
     <Z_Unknown desc=""><![CDATA[Party room is full]]></Z_Unknown>
-    <Z_SystemRoomName desc=""><![CDATA[]]></Z_SystemRoomName>
+    <Z_SystemRoomName desc=""><![CDATA[Party time]]></Z_SystemRoomName>
     <AA_BtnLab desc=""><![CDATA[Create]]></AA_BtnLab>
     <AA_AllWhiteSpace desc=""><![CDATA[Party name can not be null]]></AA_AllWhiteSpace>
     <AA_TooLong desc=""><![CDATA[Party name too long]]></AA_TooLong>
@@ -376,7 +377,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Diamond desc=""><![CDATA[Diamond]]></Diamond>
     <Confirm desc=""><![CDATA[Confirm]]></Confirm>
     <Cancel desc=""><![CDATA[Cancel]]></Cancel>
-    <Close desc=""><![CDATA[]]></Close>
+    <Close desc=""><![CDATA[Close]]></Close>
     <AD desc=""><![CDATA[Watch]]></AD>
     <Cash desc=""><![CDATA[CNY]]></Cash>
     <Person desc=""><![CDATA[Visitor]]></Person>
@@ -483,42 +484,42 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Achieve264 desc=""><![CDATA[Full Closet 4]]></Achieve264>
     <Achieve265 desc=""><![CDATA[Full Closet 5]]></Achieve265>
     <Achieve266 desc=""><![CDATA[Full Closet 6]]></Achieve266>
-    <Achieve281 desc=""><![CDATA[]]></Achieve281>
-    <Achieve282 desc=""><![CDATA[]]></Achieve282>
-    <Achieve283 desc=""><![CDATA[]]></Achieve283>
-    <Achieve284 desc=""><![CDATA[]]></Achieve284>
-    <Achieve285 desc=""><![CDATA[]]></Achieve285>
-    <Achieve286 desc=""><![CDATA[]]></Achieve286>
-    <Achieve301 desc=""><![CDATA[]]></Achieve301>
-    <Achieve302 desc=""><![CDATA[]]></Achieve302>
-    <Achieve303 desc=""><![CDATA[]]></Achieve303>
-    <Achieve304 desc=""><![CDATA[]]></Achieve304>
-    <Achieve305 desc=""><![CDATA[]]></Achieve305>
-    <Achieve306 desc=""><![CDATA[]]></Achieve306>
-    <Achieve321 desc=""><![CDATA[]]></Achieve321>
-    <Achieve322 desc=""><![CDATA[]]></Achieve322>
-    <Achieve323 desc=""><![CDATA[]]></Achieve323>
-    <Achieve324 desc=""><![CDATA[]]></Achieve324>
-    <Achieve325 desc=""><![CDATA[]]></Achieve325>
-    <Achieve326 desc=""><![CDATA[]]></Achieve326>
-    <Achieve341 desc=""><![CDATA[]]></Achieve341>
-    <Achieve342 desc=""><![CDATA[]]></Achieve342>
-    <Achieve343 desc=""><![CDATA[]]></Achieve343>
-    <Achieve344 desc=""><![CDATA[]]></Achieve344>
-    <Achieve345 desc=""><![CDATA[]]></Achieve345>
-    <Achieve346 desc=""><![CDATA[]]></Achieve346>
-    <Achieve361 desc=""><![CDATA[]]></Achieve361>
-    <Achieve362 desc=""><![CDATA[]]></Achieve362>
-    <Achieve363 desc=""><![CDATA[]]></Achieve363>
-    <Achieve364 desc=""><![CDATA[]]></Achieve364>
-    <Achieve365 desc=""><![CDATA[]]></Achieve365>
-    <Achieve366 desc=""><![CDATA[]]></Achieve366>
-    <Achieve381 desc=""><![CDATA[]]></Achieve381>
-    <Achieve382 desc=""><![CDATA[]]></Achieve382>
-    <Achieve383 desc=""><![CDATA[]]></Achieve383>
-    <Achieve384 desc=""><![CDATA[]]></Achieve384>
-    <Achieve385 desc=""><![CDATA[]]></Achieve385>
-    <Achieve386 desc=""><![CDATA[]]></Achieve386>
+    <Achieve281 desc=""><![CDATA[Party Man 1]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[Party Man 2]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[Party Man 3]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[Party Man 4]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[Party Man 5]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[Party Man 6]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[Big Boss 1]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[Big Boss 2]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[Big Boss 3]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[Big Boss 4]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[Big Boss 5]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[Big Boss 6]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[Treasure Man 1]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[Treasure Man 2]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[Treasure Man 3]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[Treasure Man 4]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[Treasure Man 5]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[Treasure Man 6]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[Flower Man 1]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[Flower Man 2]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[Flower Man 3]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[Flower Man 4]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[Flower Man 5]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[Flower Man 6]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[Maths Man 1]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[Maths Man 2]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[Maths Man 3]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[Maths Man 4]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[Maths Man 5]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[Maths Man 6]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[Gift Money 1]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[Gift Money 2]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[Gift Money 3]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[Gift Money 4]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[Gift Money 5]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[Gift Money 6]]></Achieve386>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[Garden Level [&value&]]]></Achieve1>
@@ -607,42 +608,42 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Achieve264 desc=""><![CDATA[Collect [&value&] Dresses]]></Achieve264>
     <Achieve265 desc=""><![CDATA[Collect [&value&] Dresses]]></Achieve265>
     <Achieve266 desc=""><![CDATA[Collect [&value&] Dresses]]></Achieve266>
-    <Achieve281 desc=""><![CDATA[]]></Achieve281>
-    <Achieve282 desc=""><![CDATA[]]></Achieve282>
-    <Achieve283 desc=""><![CDATA[]]></Achieve283>
-    <Achieve284 desc=""><![CDATA[]]></Achieve284>
-    <Achieve285 desc=""><![CDATA[]]></Achieve285>
-    <Achieve286 desc=""><![CDATA[]]></Achieve286>
-    <Achieve301 desc=""><![CDATA[]]></Achieve301>
-    <Achieve302 desc=""><![CDATA[]]></Achieve302>
-    <Achieve303 desc=""><![CDATA[]]></Achieve303>
-    <Achieve304 desc=""><![CDATA[]]></Achieve304>
-    <Achieve305 desc=""><![CDATA[]]></Achieve305>
-    <Achieve306 desc=""><![CDATA[]]></Achieve306>
-    <Achieve321 desc=""><![CDATA[]]></Achieve321>
-    <Achieve322 desc=""><![CDATA[]]></Achieve322>
-    <Achieve323 desc=""><![CDATA[]]></Achieve323>
-    <Achieve324 desc=""><![CDATA[]]></Achieve324>
-    <Achieve325 desc=""><![CDATA[]]></Achieve325>
-    <Achieve326 desc=""><![CDATA[]]></Achieve326>
-    <Achieve341 desc=""><![CDATA[]]></Achieve341>
-    <Achieve342 desc=""><![CDATA[]]></Achieve342>
-    <Achieve343 desc=""><![CDATA[]]></Achieve343>
-    <Achieve344 desc=""><![CDATA[]]></Achieve344>
-    <Achieve345 desc=""><![CDATA[]]></Achieve345>
-    <Achieve346 desc=""><![CDATA[]]></Achieve346>
-    <Achieve361 desc=""><![CDATA[]]></Achieve361>
-    <Achieve362 desc=""><![CDATA[]]></Achieve362>
-    <Achieve363 desc=""><![CDATA[]]></Achieve363>
-    <Achieve364 desc=""><![CDATA[]]></Achieve364>
-    <Achieve365 desc=""><![CDATA[]]></Achieve365>
-    <Achieve366 desc=""><![CDATA[]]></Achieve366>
-    <Achieve381 desc=""><![CDATA[]]></Achieve381>
-    <Achieve382 desc=""><![CDATA[]]></Achieve382>
-    <Achieve383 desc=""><![CDATA[]]></Achieve383>
-    <Achieve384 desc=""><![CDATA[]]></Achieve384>
-    <Achieve385 desc=""><![CDATA[]]></Achieve385>
-    <Achieve386 desc=""><![CDATA[]]></Achieve386>
+    <Achieve281 desc=""><![CDATA[Create party [&value&] times]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[Create party [&value&] times]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[Create party [&value&] times]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[Create party [&value&] times]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[Create party [&value&] times]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[Create party [&value&] times]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[Set chest [&value&] times totally]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[Set chest [&value&] times totally]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[Set chest [&value&] times totally]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[Set chest [&value&] times totally]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[Set chest [&value&] times totally]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[Set chest [&value&] times totally]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[Set Lucky Chest [&value&] times]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[Set Lucky Chest [&value&] times]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[Set Lucky Chest [&value&] times]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[Set Lucky Chest [&value&] times]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[Set Lucky Chest [&value&] times]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[Set Lucky Chest [&value&] times]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[Set Color Chest [&value&] times]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[Set Color Chest [&value&] times]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[Set Color Chest [&value&] times]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[Set Color Chest [&value&] times]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[Set Color Chest [&value&] times]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[Set Color Chest [&value&] times]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[Set Digit Chest [&value&] times]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[Set Digit Chest [&value&] times]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[Set Digit Chest [&value&] times]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[Set Digit Chest [&value&] times]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[Set Digit Chest [&value&] times]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[Set Digit Chest [&value&] times]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[Get party chest reward [&value&] times]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[Get party chest reward [&value&] times]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[Get party chest reward [&value&] times]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[Get party chest reward [&value&] times]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[Get party chest reward [&value&] times]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[Get party chest reward [&value&] times]]></Achieve386>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[No ADs anymore, try again later]]></LoadAd>

Assets/Script/Manage/ManaIAP.cs

@@ -84,7 +84,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 
                 if (ManaServer.Connect && (ManaServer.Time.Subtract((DateTime)ADPlayTime).TotalSeconds > 1200))
                 {
-                    if (ManaGarden.MiniLock && !ManaVisit.InVisit && !ManaTutorial.TutorialA && !SFSManager.GardenSmartFox.PlazaRoomManager.JoinedPlazaRoom && !Player.InDressRoom)
+                    if (ManaGarden.MiniLock && !ManaVisit.InVisit && !ManaTutorial.TutorialA && !SFSManager.GardenSmartFox.PlazaRoomManager.InPlazaRoom && !Player.InDressRoom)
                     {
                         ChestList.Add(ManaReso.GetADChest());
                     }

Assets/Script/Manage/ManaInfoBox.cs

@@ -84,7 +84,7 @@ public class ManaInfoBox : Regist
             }
         }
 
-        public void Show(string str, float time, Sprite atlas)
+        public void Show(string str, float time, Color color, Sprite atlas)
         {
             if (CanvasGroup != null)
                 CanvasGroup.TweenForCG();
@@ -125,8 +125,8 @@ public class ManaInfoBox : Regist
             InfoText infoText = new InfoText();
 
             text.text = str;
-
             text.SetAlpha(1);
+            text.color = color;
 
             infoText.Timer = DurationTime;
 
@@ -162,15 +162,15 @@ public class ManaInfoBox : Regist
         PlazaRoomInfoBox.Update();
     }
 
-    public static void Show(InfoCategory infoCategory, string str, float time, Sprite atlas = null)
+    public static void Show(InfoCategory infoCategory, string str, float time, Color color, Sprite atlas = null)
     {
         if (infoCategory == InfoCategory.Garden)
         {
-            GardenInfoBox.Show(str, time, atlas);
+            GardenInfoBox.Show(str, time, color, atlas);
         }
         else if (infoCategory == InfoCategory.PlazaRoom)
         {
-            PlazaRoomInfoBox.Show(str, time, atlas);
+            PlazaRoomInfoBox.Show(str, time, color, atlas);
         }
         else
         {

Assets/Script/Manage/ManaNickName.cs

@@ -8,7 +8,7 @@ using System.Collections.Generic;
 
 public class ManaNickName : Regist
 {
-	public static Action SetNickNameAction;
+	public static Action OnSetNickNameSucceed;
 
 	public static string NickName;
 	public static InputField inputField;
@@ -31,6 +31,16 @@ public class ManaNickName : Regist
 
 	public static void ShowNickNameSettingPanel()
 	{
+	    if (string.IsNullOrEmpty(NickName))
+	    {
+	        ManaReso.SetActive("T_Close", false);
+	    }
+	    else
+	    {
+            ManaReso.SetActive("T_Close", true);
+	        inputField.text = NickName;
+	    }
+
 	    ManaReso.SetText("T_Tit", Language.GetStr("UI", "T_Tit"));
 
 	    if (!ManaTutorial.TutorialPlazaRoom && !ManaTutorial.TutorialC && !ManaTutorial.TutorialD)
@@ -49,6 +59,12 @@ public class ManaNickName : Regist
 
 	public static void ResetNickName()
 	{
+	    if (inputField.text == NickName)
+	    {
+	        ResetSucceed();
+            return;
+	    }
+
 	    ManaReso.SetText("T_Tit", Language.GetStr("UI", "T_Checking"));
 	    ManaReso.Get<CanvasGroup>("T_NickNameBK").interactable = false;
 
@@ -57,7 +73,6 @@ public class ManaNickName : Regist
             ManaServer.SetNickName
                 (
                     inputField.text,
-                    SetNickNameAction,
                     ResetSucceed,
                     ResetFailed
                 );
@@ -71,14 +86,11 @@ public class ManaNickName : Regist
 
     public static void ResetFailed()
     {
-	    ManaReso.SetText("T_Tit", Language.GetStr("UI", "T_Tit"));
+        ManaReso.SetText("T_Tit", Language.GetStr("UI", "T_Tit"));
 
         ManaReso.Get<CanvasGroup>("T_NickNameBK").interactable = true;
 
-        if (!ManaTutorial.TutorialA)
-        {
-            Bubble.Show(null, Language.GetStr("UI", "T_RepeatName"));
-        }
+        Bubble.Show(null, Language.GetStr("UI", "T_RepeatName"));
     }
 
     public static void ResetSucceed()
@@ -89,6 +101,8 @@ public class ManaNickName : Regist
 
         ManaAudio.PlayClip(Clip.CloseClip);
         CloseNickNameSettingPanel();
+
+        OnSetNickNameSucceed.SafeInvoke();
     }
 
     public static void SetNickName(string nickName)

Assets/Script/Manage/ManaServer.cs

@@ -115,7 +115,7 @@ public class ManaServer : Regist
     public static string MailXml;
     public static List<MailReward> MailRewardList = new List<MailReward>();
 
-    public static string BaseURL = "https://garden.dashgame.com/index.php/home";
+    //public static string BaseURL = "https://garden.dashgame.com/index.php/home";
     public static string NewBaseURL = "https://garden.dashgame.com/index.php/newhome";
 
     #endregion
@@ -263,22 +263,17 @@ public class ManaServer : Regist
     }
 
 
-    public static void SetNickName(string nickname, Action action, Action succeedCallback, Action failCallback)
+    public static void SetNickName(string nickname, Action succeedCallback, Action failCallback)
     {
         URLRequestData urlData = new URLRequestData();
 
         urlData.Add("u", SerialNumber);
         urlData.Add("n", nickname);
 
-        if (action != null)
-        {
-            action.Invoke();
-        }
-
         URLRequest.CreateStrURLRequest
         (
             true,
-            BaseURL + "/user/nickname",
+            NewBaseURL + "/user/nickname",
             urlData,
             data =>
             {
@@ -529,7 +524,7 @@ public class ManaServer : Regist
         urlData.Add("u", sendID);
         urlData.Add("t", receiveID);
 
-        URLRequest.CreateStrURLRequest(true, BaseURL + "/praise/click", urlData, (data)=> {}, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest(true, NewBaseURL + "/praise/click", urlData, (data)=> {}, URLRequest.Method.POST);
     }
 
     public static void Target(string userID, string targetID, Action<JsonData> callback)
@@ -539,7 +534,7 @@ public class ManaServer : Regist
         urlData.Add("u", userID);
         urlData.Add("t", targetID);
 
-        URLRequest.CreateURLRequest(true, BaseURL + "/praise/target", urlData, data => callback(data), URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, NewBaseURL + "/praise/target", urlData, data => callback(data), URLRequest.Method.POST);
     }
 
     public static void AddComment(string sendID, string receiveID, string content, CommentType type)
@@ -567,7 +562,7 @@ public class ManaServer : Regist
         URLRequest.CreateStrURLRequest
         (
             true,
-            BaseURL + "/comment/comment",
+            NewBaseURL + "/comment/comment",
             urlData,
             data =>
             {
@@ -605,7 +600,7 @@ public class ManaServer : Regist
         urlData.Add("p", page);
         urlData.Add("t", type.GetHashCode());
 
-        URLRequest.CreateURLRequest(true, BaseURL + "/comment/index", urlData, data => { callback(data);}, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, NewBaseURL + "/comment/index", urlData, data => { callback(data);}, URLRequest.Method.POST);
     }
 
 
@@ -616,7 +611,7 @@ public class ManaServer : Regist
         URLRequest.CreateURLRequest
         (
             true,
-            BaseURL + "/index/index",
+            NewBaseURL + "/index/index",
             urlData,
             data =>
             {
@@ -727,7 +722,7 @@ public class ManaServer : Regist
 
                 mailItem.GetChild(2).GetComponent<Text>().text = pack.Name;
 
-                ManaInfoBox.Show(InfoCategory.Garden,  $"{Language.GetStr("Common", "Get")} <(礼包)>{pack.Name}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+                ManaInfoBox.Show(InfoCategory.Garden,  $"{Language.GetStr("Common", "Get")} <(礼包)>{pack.Name}", 10, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
             }
             else
             {
@@ -775,7 +770,7 @@ public class ManaServer : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = closeUnit.Name;
 
-                    ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(服装)>{closeUnit.Name}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+                    ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(服装)>{closeUnit.Name}", 10, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
                 }
                 else
                 {
@@ -808,7 +803,7 @@ public class ManaServer : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = flowerInfo.Name;
 
-                    ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(花朵)>{flowerInfo.Name}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+                    ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(花朵)>{flowerInfo.Name}", 10, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
                 }
                 else
                 {
@@ -834,7 +829,7 @@ public class ManaServer : Regist
 
             mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(金币)>{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+            ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(金币)>{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
         }
         else if (mailReward.Key == "diamond")
         {
@@ -854,7 +849,7 @@ public class ManaServer : Regist
 
             mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(钻石)>{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+            ManaInfoBox.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} <(钻石)>{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
         }
         else
         {
@@ -966,7 +961,7 @@ public class ManaServer : Regist
         urlData.Add("i", id);
         urlData.Add("u", JsonData.Inst_Object["i"].ToJson().Trim('"'));
 
-        URLRequest.CreateStrURLRequest(true, BaseURL + "/pay/pay", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest(true, NewBaseURL + "/pay/pay", urlData, callback, URLRequest.Method.POST);
     }
 
 
@@ -1071,7 +1066,7 @@ public class ManaServer : Regist
 
         urlData.Add("u", id);
 
-        URLRequest.CreateURLRequest(true, BaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, NewBaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
     }
 
     public static void DownloadBySerialNumber(string serialNumber, URLRequest.URLRequestJsonCallBackDelegate callback)
@@ -1089,7 +1084,7 @@ public class ManaServer : Regist
 
         urlData.Add("i", "");
 
-        URLRequest.CreateURLRequest(false, BaseURL + "/user/rand", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(false, NewBaseURL + "/user/rand", urlData, callback, URLRequest.Method.POST);
     }
 
 

Assets/Script/Manage/ManaTutorial.cs

@@ -177,18 +177,18 @@ public class ManaTutorial : Regist
     {
         ManaNickName.CloseNickNameSettingPanel();
 
-        ManaNickName.SetNickNameAction = null;
+        ManaNickName.OnSetNickNameSucceed = null;
 
         StaticsManager.GetInstance().TutoComplete("A1_1");
 
-        Auxiliary.Instance.DelayCall
-        (
-            () =>
-            {
-                ManaReso.SetActive("T_Close", true);
-            },
-            0.25f
-        );
+        //Auxiliary.Instance.DelayCall
+        //(
+        //    () =>
+        //    {
+        //        ManaReso.SetActive("T_Close", true);
+        //    },
+        //    0.25f
+        //);
 
         EnterA2();
     }
@@ -424,11 +424,11 @@ public class ManaTutorial : Regist
     {
         TutorialIndexA = A1_1Idx;
 
-        ManaReso.SetActive("T_Close", false);
+        //ManaReso.SetActive("T_Close", false);
 
         ManaNickName.ShowNickNameSettingPanelFirstTime();
 
-        ManaNickName.SetNickNameAction = EndA1_1;
+        ManaNickName.OnSetNickNameSucceed = EndA1_1;
     }
 
     public static void EnterA2()

Assets/Script/Manage/ManaUI.cs

@@ -966,7 +966,7 @@ public class ManaUI : Regist
                 ManaReso.Get("GardenMini").TweenBacVec();
                 ManaReso.Get("D_MiniGame").TweenBacCG();
 
-                ManaInfoBox.Show(InfoCategory.Garden, Award.Info, 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+                ManaInfoBox.Show(InfoCategory.Garden, Award.Info, 10f, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
             }
         );
 

Assets/Script/Manage/ManaVisit.cs

@@ -315,6 +315,7 @@ public class ManaVisit : Regist
         SetPlayerPraise();
         SetPlayerCommentPanel();
         SetPlayerRankPanel();
+        SetPlayerNickName();
     }
 
     public static void EnterVisiteeGarden()
@@ -637,6 +638,16 @@ public class ManaVisit : Regist
 
         #endregion
 
+        XmlNode nicknameNode = Document.SelectSingleNode("PlayerConfig").SelectSingleNode("NickName");
+        if (nicknameNode == null || string.IsNullOrEmpty(nicknameNode.Attributes[0].Value))
+        {
+            SetVisiteeNickName(Language.GetStr("UI", "未命名"));
+        }
+        else
+        {
+            SetVisiteeNickName(nicknameNode.Attributes[0].Value);
+        }
+
         InVisit = true;
     }
 
@@ -709,6 +720,17 @@ public class ManaVisit : Regist
     }
 
 
+    public static void SetPlayerNickName()
+    {
+        ManaReso.SetText("C_NickNameLab", ManaNickName.NickName);
+    }
+
+    public static void SetVisiteeNickName(string nickname)
+    {
+        ManaReso.SetText("C_NickNameLab", nickname);
+    }
+
+
     public static void UpdateCost()
     {
         if (Complete)

Assets/Script/Manage/PlazaRoomMge.cs

@@ -26,12 +26,14 @@ public class PlazaRoomMge : Regist
     }
     private static float itemHeight;
 
+    public static float DownLoadTimespan = 30;
+    public static bool DownloadLock;
+
     public static int LastIndex;
     public static int FirstIndex;
     public static int CustomLastIndex;
     public static int CustomFirstIndex;
     public static bool FilterEnabled;
-    public static bool DownloadLock;
     public static Transform Grid;
     public static VirtualScrollRect ScrollRect;
 
@@ -43,7 +45,7 @@ public class PlazaRoomMge : Regist
 
     #endregion
 
-    private float RefreshTime = 5;
+    private float RefreshTime = 10;
     private float RefreshTimer = 0;
     private void Update()
     {
@@ -100,59 +102,60 @@ public class PlazaRoomMge : Regist
         ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "Loading"));
         ManaReso.Get("Z_Tip").TweenForCG();
         DownloadLock = true;
-        if (FilterEnabled)
-        {
-            //SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetCustomRoomData(CustomLastIndex, long.Parse(ManaServer.SerialNumber));
-            SFSManager.GardenSmartFox.ExecuteAfterCheckConection
-            (
-                () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetCustomRoomData(CustomLastIndex, long.Parse(ManaServer.SerialNumber)),
-                (succeed, baseEvent) => { if (!succeed) { ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(5f, () => { DownloadLock = false; ManaReso.Get("Z_Tip").TweenBacCG(); }); } },
-                (succeed, baseEvent) => { if (!succeed) { ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(5f, () => { DownloadLock = false; ManaReso.Get("Z_Tip").TweenBacCG(); }); } }
-            );
-        }
-        else
-        {
-            //SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomData(LastIndex);
-            SFSManager.GardenSmartFox.ExecuteAfterCheckConection
-            (
-                () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomData(LastIndex),
-                (succeed, baseEvent) => { if (!succeed) { ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(5f, () => { DownloadLock = false; ManaReso.Get("Z_Tip").TweenBacCG(); }); } },
-                (succeed, baseEvent) => { if (!succeed) { ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(5f, () => { DownloadLock = false; ManaReso.Get("Z_Tip").TweenBacCG(); }); } }
-            );
-        }
+        SFSManager.GardenSmartFox.ExecuteAfterCheckConection
+        (
+            () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomData(LastIndex),
+            (succeed, baseEvent) => { if (!succeed) { ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ManaReso.Get("Z_Tip").TweenBacCG(); }); } },
+            (succeed, baseEvent) => { if (!succeed) { ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ManaReso.Get("Z_Tip").TweenBacCG(); }); } }
+         );
+    }
+
+    public static void DownloadCustomRoomData()
+    {
+        ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "Loading"));
+        ManaReso.Get("Z_Tip").TweenForCG();
+        DownloadLock = true;
+        SFSManager.GardenSmartFox.ExecuteAfterCheckConection
+        (
+            () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetCustomRoomData(CustomLastIndex, long.Parse(ManaServer.SerialNumber)),
+            (succeed, baseEvent) => { if (!succeed) { ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ManaReso.Get("Z_Tip").TweenBacCG(); }); } },
+            (succeed, baseEvent) => { if (!succeed) { ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ManaReso.Get("Z_Tip").TweenBacCG(); }); } }
+        );
     }
 
     public static void OnReceiveRoomData(ISFSArray sfsArray)
     {
         //Debug.LogWarning("receive " + sfsArray.Count);
 
-        if (FilterEnabled)
-        {
-            return;
-        }
-        
-        ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadSucceed"));
-        DelayCall.Call(0.5f, () => { ManaReso.Get("Z_Tip").TweenBacCG(); });
-
+        int count = RoomDatas.Count;
         for (int i = 0; i < sfsArray.Count; i++)
         {
             RoomData roomData = new RoomData(sfsArray.GetSFSObject(i));
             if (!RoomDatas.Values.Contains(roomData))
             {
-                RoomDatas.Add(RoomDatas.Count, roomData);
+                RoomDatas.Add(count + i, roomData);
             }
         }
 
+        if (FilterEnabled)
+        {
+            return;
+        }
+
+        ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadSucceed"));
+        DelayCall.Call(0.5f, () => { ManaReso.Get("Z_Tip").TweenBacCG(); });
+
         if (sfsArray.Count == 0)
         {
-            DelayCall.Call(5f, () => { DownloadLock = false; });
+            DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; });
         }
         else
         {
-            if (LastIndex == 0)
-            {
-                NextPage(ref FirstIndex, ref LastIndex, RoomDatas);
-            }
+            int availableItemAmt = MaxRoomItem - PlazaRoomItems.Count;
+            //if (LastIndex == 0)
+            //{
+                NextPage(availableItemAmt, ref FirstIndex, ref LastIndex, RoomDatas);
+            //}
             DownloadLock = false;
         }
 
@@ -163,14 +166,6 @@ public class PlazaRoomMge : Regist
     {
         //Debug.LogWarning("receive custom " + sfsArray.Count);
 
-        if (!FilterEnabled)
-        {
-            return;
-        }
-
-        ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadSucceed"));
-        DelayCall.Call(0.5f, () => { ManaReso.Get("Z_Tip").TweenBacCG(); });
-
         int count = CustomRoomDatas.Count;
         for (int i = 0; i < sfsArray.Count; i++)
         {
@@ -181,16 +176,25 @@ public class PlazaRoomMge : Regist
             }
         }
 
+        if (!FilterEnabled)
+        {
+            return;
+        }
+
+        ManaLan.Add(ManaReso.Get<Text>("Z_Tip"), new LanStr("UI", "LoadSucceed"));
+        DelayCall.Call(0.5f, () => { ManaReso.Get("Z_Tip").TweenBacCG(); });
+
         if (sfsArray.Count == 0)
         {
-            DelayCall.Call(5f, () => { DownloadLock = false; });
+            DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; });
         }
         else
         {
-            if (LastIndex == 0)
-            {
-                NextPage(ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
-            }
+            int availableItemAmt = MaxRoomItem - PlazaRoomItems.Count;
+            //if (LastIndex == 0)
+            //{
+                NextPage(availableItemAmt, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
+            //}
             DownloadLock = false;
         }
 
@@ -215,11 +219,11 @@ public class PlazaRoomMge : Regist
     {
         if (FilterEnabled)
         {
-            NextPage(ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
+            NextPage(PageVolume, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
         }
         else
         {
-            NextPage(ref FirstIndex, ref LastIndex, RoomDatas);
+            NextPage(PageVolume, ref FirstIndex, ref LastIndex, RoomDatas);
         }
     }
 
@@ -227,28 +231,35 @@ public class PlazaRoomMge : Regist
     {
         if (FilterEnabled)
         {
-            PreviousPage(ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
+            PreviousPage(PageVolume, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
         }
         else
         {
-            PreviousPage(ref FirstIndex, ref LastIndex, RoomDatas);
+            PreviousPage(PageVolume, ref FirstIndex, ref LastIndex, RoomDatas);
         }
     }
 
-    public static void NextPage(ref int firstIndex, ref int lastIndex, Dictionary<int, RoomData> dictionary)
+    public static void NextPage(int nextAmt, ref int firstIndex, ref int lastIndex, Dictionary<int, RoomData> dictionary)
     {
         if (lastIndex >= dictionary.Count)
         {
             if (!DownloadLock)
             {
                 //Debug.LogWarning("Download Page");
-                DownloadRoomData();
+                if (FilterEnabled)
+                {
+                    DownloadCustomRoomData();   
+                }
+                else
+                {
+                    DownloadRoomData();
+                }
             }
         }
         else
         {
             //Debug.LogWarning("Next Page");
-            for (int i = 0; i < PageVolume; i++)
+            for (int i = 0; i < nextAmt; i++)
             {
                 RoomData roomData;
                 if (dictionary.TryGetValue(lastIndex, out roomData))
@@ -263,7 +274,7 @@ public class PlazaRoomMge : Regist
         }
     }
 
-    public static void PreviousPage(ref int firstIndex, ref int lastIndex, Dictionary<int, RoomData> dictionary)
+    public static void PreviousPage(int nextAmt, ref int firstIndex, ref int lastIndex, Dictionary<int, RoomData> dictionary)
     {
         if (firstIndex == 0)
         {
@@ -271,7 +282,7 @@ public class PlazaRoomMge : Regist
         }
 
         //Debug.LogWarning("Prev Page");
-        for (int i = 0; i < PageVolume; i++)
+        for (int i = 0; i < nextAmt; i++)
         {
             RoomData roomData;
             if (dictionary.TryGetValue(firstIndex - 1, out roomData))
@@ -325,9 +336,10 @@ public class PlazaRoomMge : Regist
 
     public static void OpenPanel()
     {
-        if (RoomDatas.Count == 0)
+        if (!DownloadLock)
         {
             DownloadRoomData();
+            DownloadCustomRoomData();
         }
         OnSliderValueChange(0);
         ManaReso.Get("Z_BK").TweenForCG();
@@ -343,7 +355,7 @@ public class PlazaRoomMge : Regist
         FilterEnabled = true;
         ManaReso.SetActive("Z_InfoImg51", true);
         ClearGrid();
-        NextPage(ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
+        NextPage(PageVolume, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
     }
 
     public static void DisableFilter()
@@ -351,7 +363,7 @@ public class PlazaRoomMge : Regist
         FilterEnabled = false;
         ManaReso.SetActive("Z_InfoImg51", false);
         ClearGrid();
-        NextPage(ref FirstIndex, ref LastIndex, RoomDatas);
+        NextPage(PageVolume, ref FirstIndex, ref LastIndex, RoomDatas);
     }
 
     private static void ClearGrid()
@@ -424,6 +436,25 @@ public class PlazaRoomMge : Regist
 
     public static void OnCreateRoomSucceed(RoomData roomData)
     {
+        if (!RoomDatas.Values.Contains(roomData))
+        {
+            RoomDatas.Add(RoomDatas.Count, roomData);
+        }
+        if (!CustomRoomDatas.Values.Contains(roomData))
+        {
+            CustomRoomDatas.Add(CustomRoomDatas.Count, roomData);
+        }
+        int availableItemAmt = MaxRoomItem - PlazaRoomItems.Count;
+        if (FilterEnabled)
+        {
+            NextPage(availableItemAmt, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
+        }
+        else
+        {
+            NextPage(availableItemAmt, ref FirstIndex, ref LastIndex, RoomDatas);
+        }
+
+
         ManaCenter.CreateRoomAmt++;
 
         ManaLan.Add(ManaReso.Get<Text>("AA_Tip"), new LanStr("UI", "AA_CreateSucceed"));

Assets/Script/Object/CommentItem.cs

@@ -93,7 +93,6 @@ public class CommentItem : Regist
 
     public void Visit()
     {
-        Debug.Log(SerialNumber);
         ManaSocial.CloseCommentPanel();
         ManaSocial.RecordCommentPanel();
         ManaVisit.Visit(ArchiveSource.SerialNumber, SerialNumber);

Assets/Script/Object/PlazaRoomChest.cs

@@ -148,6 +148,8 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         BaseInit(chestData);
 
+        ChestSR.material = ShadowSR.material;
+        
         //if (chestData.Owner == long.Parse(ManaServer.SerialNumber))
         //{
         //    SetColliders(false);

Assets/Script/Object/Skill/BigSkill.cs

@@ -478,7 +478,7 @@ public class BigSkill : Skill
                 UseA();
                 UseB();
 
-                ManaInfoBox.Show(InfoCategory.Garden, string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+                ManaInfoBox.Show(InfoCategory.Garden, string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能,
             StaticsManager.ConsumeModule.Shop

Assets/Script/Object/Skill/Pack.cs

@@ -384,7 +384,7 @@ public class Pack : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            ManaInfoBox.Show(InfoCategory.Garden, str, 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+            ManaInfoBox.Show(InfoCategory.Garden, str, 10f, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
         }
 
 

Assets/Script/Object/Skill/Skill.cs

@@ -302,7 +302,7 @@ public class Skill : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            ManaInfoBox.Show(InfoCategory.Garden, sb.ToString(), 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+            ManaInfoBox.Show(InfoCategory.Garden, sb.ToString(), 10f, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
         }
     }
 
@@ -372,7 +372,7 @@ public class Skill : SkillRoot
                 UseA();
                 UseB();
 
-                ManaInfoBox.Show(InfoCategory.Garden, string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+                ManaInfoBox.Show(InfoCategory.Garden, string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能, 
             StaticsManager.ConsumeModule.Shop

Assets/Script/Object/Star.cs

@@ -150,7 +150,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
         BoxCollider.enabled = false;
 
 
-        ManaInfoBox.Show(InfoCategory.Garden, Language.GetStr("Object", "Star") + CD.ToString("0") + Auxiliary.GetUnit((int)CD, Unit.Second), 10f, ManaReso.LoadSprite("Atlas", Folder.Atlas));
+        ManaInfoBox.Show(InfoCategory.Garden, Language.GetStr("Object", "Star") + CD.ToString("0") + Auxiliary.GetUnit((int)CD, Unit.Second), 10f, Color.white, ManaReso.LoadSprite("Atlas", Folder.Atlas));
 
         ManaCenter.MiniTimer -= CD;
 

Assets/Script/SFS/Manager/ChestMge.cs

@@ -311,7 +311,6 @@ public class ChestMge : Regist
     {
         foreach (var chestID in chestIDs)
         {
-            Debug.LogWarning(chestID);
             ChestRoomDictionary.Remove(chestID);
         }
     }
@@ -465,7 +464,7 @@ public class ChestMge : Regist
         if (refund > 0)
         {
             ManaCenter.AddDiamond(refund, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestRefund);
-            ManaInfoBox.Show(InfoCategory.Garden, Language.GetStr("UI", "Y_Refund")+refund, 10);
+            ManaInfoBox.Show(InfoCategory.Garden, Language.GetStr("UI", "Y_Refund")+refund, 10, Color.white);
         }
     }
 

Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -30,9 +30,11 @@ public class SFSPlazaRoomManager
 
         public Player Player;
         public Transform NickNameTransform;
-        public Transform MessageBox;
         public List<TweenRoot> TweenRoots;
 
+        public BestfitText MessageLab;
+        public Transform MessageBox;
+
         #endregion
 
         public PlazaRoomPlayer(Player player, string nickname)
@@ -58,8 +60,9 @@ public class SFSPlazaRoomManager
 
 
             MessageBox = ManaReso.Get("MessageBox", Folder.UI, false, ManaReso.Get("W_HudParent"), false, ObjType.MessageBox);
-            MessageBox.GetComponentInChildren<BestfitText>().VerticalMinSize = 12;
-            MessageBox.GetComponentInChildren<BestfitText>().VerticalMaxSize = 20;
+            MessageLab = MessageBox.GetComponentInChildren<BestfitText>();
+            MessageLab.VerticalMinSize = 12;
+            MessageLab.VerticalMaxSize = 20;
 
             hudTarget = MessageBox.GetComponent<HudTarget>();
 
@@ -87,6 +90,7 @@ public class SFSPlazaRoomManager
             Player.PlayAnim(Player.IdleAnimationName);
             Player.DeactiveShadow();
             Player.Shadow.SetLZ(0);
+            Player.ExpressionSr.transform.parent = Player.transform;
         }
 
         public bool IsMoving;
@@ -132,14 +136,16 @@ public class SFSPlazaRoomManager
 
         public float MessgeTime = 3f;
         public Coroutine MessgeCoroutine;
-        public void ShowMessage(string message)
+        public void ShowMessage(Color color, string message)
         {
             if (MessgeCoroutine != null)
             {
                 Auxiliary.Instance.StopCoroutine(MessgeCoroutine);
             }
 
-            MessageBox.GetChild(0).GetComponent<Text>().text = message;
+            MessageLab.text = message;
+            MessageLab.color = color;
+
             MessageBox.TweenForCG();
 
             MessgeCoroutine = Auxiliary.Instance.DelayCall(() => { MessageBox.TweenBacCG(); }, MessgeTime);
@@ -312,6 +318,8 @@ public class SFSPlazaRoomManager
             {
                 ChestMge.RetrieveAllChest();
 
+                InPlazaRoom = false;
+
                 ManaAudio.MusicTheme.TweenForAudio();
 
                 PlazaRoomSky.position = SkyOriginPosition;
@@ -342,7 +350,6 @@ public class SFSPlazaRoomManager
         PlazaRoomChest.SystemChest = null;
 
         ManaCenter.SceneSwitchLock = false;
-        InPlazaRoom = false;
 
         GardenSmartFox.SmartFox.Send(new LeaveRoomRequest(CurrentPlazaRoom));
 
@@ -555,20 +562,31 @@ public class SFSPlazaRoomManager
         string expressionName = Enum.GetName(typeof(ExpressionID), expressionID);
         plazaRoomPlayer.Player.ChangeExpression(expressionName, ExpressionDuration);
 
-        string message = $"{plazaRoomPlayer.NickName}:\u3000<({expressionName}按钮)>";
-        ManaInfoBox.Show(InfoCategory.PlazaRoom, message, Mathf.Infinity, ManaReso.LoadSprite("Expression", Folder.Scene));
-        ManaReso.SetText("X_CurrentInfoLab", message);
+        string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr("UI", "X_Self") : plazaRoomPlayer.NickName;
+        string message = $"{senderName}:\u3000<({expressionName}按钮)>";
+        Color textColor = senderID == SFSManager.GardenSmartFox.User.Id ? Lib.SelfMessage : Lib.OtherMessage;
+        ManaInfoBox.Show(InfoCategory.PlazaRoom, message, Mathf.Infinity, textColor, ManaReso.LoadSprite("Expression", Folder.Scene));
+        Text text = ManaReso.Get<Text>("X_CurrentInfoLab");
+        text.color = textColor;
+        text.text = message;
     }
 
     public void ReceivePublicMessage(string message, int senderID)
     {
+        Color textColor = senderID == SFSManager.GardenSmartFox.User.Id ? Lib.SelfMessage : Lib.OtherMessage;
+
         PlazaRoomPlayer plazaRoomPlayer = UserInstanceDictionary[senderID];
+        plazaRoomPlayer.ShowMessage(textColor, message);
+
+        string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr("UI", "X_Self") : plazaRoomPlayer.NickName;
 
-        plazaRoomPlayer.ShowMessage(message);
+        message = $"{senderName}:\u3000{message}";
+        ManaInfoBox.Show(InfoCategory.PlazaRoom, message, Mathf.Infinity, textColor, ManaReso.LoadSprite("Expression", Folder.Scene));
 
-        message = $"{plazaRoomPlayer.NickName}:\u3000{message}";
-        ManaInfoBox.Show(InfoCategory.PlazaRoom, message, Mathf.Infinity, ManaReso.LoadSprite("Expression", Folder.Scene));
         ManaReso.SetText("X_CurrentInfoLab", message);
+        Text text = ManaReso.Get<Text>("X_CurrentInfoLab");
+        text.color = textColor;
+        text.text = message;
     }
 
     public void OnInstantiate(int senderID, ISFSObject parameter)

Assets/Script/SFS/SFSEvent/PlazaRoomEvent.cs

@@ -424,7 +424,7 @@ public class PlazaRoomEvent
 
         if (userID != SFSManager.GardenSmartFox.User.Id)
         {
-            Debug.LogWarning($"User : {userID} joined room");
+            //Debug.LogWarning($"User : {userID} joined room");
 
             SFSEventManager.GardenSmartFox.PlazaRoomManager.OnUserEnterPlazaRoom(userID);
         }

Assets/Script/Tool/Auxiliary.cs

@@ -142,13 +142,13 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            foreach (var VARIABLE in ChestMge.PlazaRoomChests)
-            {
-                VARIABLE.ShadowSR.material = UnityFactory.Materials[0];
-                VARIABLE.ChestSR.material = UnityFactory.Materials[0];
-            }
+            //foreach (var VARIABLE in ChestMge.PlazaRoomChests)
+            //{
+            //    VARIABLE.ShadowSR.material = UnityFactory.Materials[0];
+            //    VARIABLE.ChestSR.material = UnityFactory.Materials[0];
+            //}
 
-            //ManaSocial.CloseCommentPanel();
+            ManaSocial.CloseCommentPanel();
             //Debug.LogWarning(ManaServer.SerialNumber);
             //SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
             //ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();

Assets/Script/Tool/Lib.cs

@@ -5,6 +5,9 @@ using System.Collections.Generic;
 
 public class Lib
 {
+    public static Color SelfMessage = new Color(21/255f, 96/255f, 96/255f, 1);
+    public static Color OtherMessage = new Color(0, 0, 0, 180/255f);
+
     public static Color FirstRank = new Color(1, 128/255f, 171/255f, 1);
     public static Color SecondRank = new Color(95/255f, 214/255f, 1, 1);
     public static Color ThirdRank = new Color(54/255f, 205/255f, 124/255f, 1);

第三期.txt

@@ -1,6 +1,3 @@
-标签移动了
-
-
 关闭ManaDebug 开启CatchException
 
 切换到远程服务器