Browse Source

增加多语言

LiuQilin 7 years ago
parent
commit
8d0686e04b

+ 3 - 3
Assets/AtlasUtility/SerializeObject.prefab

@@ -53,8 +53,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   PackAtlasFunction: 0
   SliceAtlasFunction: 0
-  SearchReferenceFunction: 0
-  PlatformControllFunction: 1
+  SearchReferenceFunction: 1
+  PlatformControllFunction: 0
   ScaleTextureFunction: 0
   DebugFunction: 0
   PackSize: 2048
@@ -87,7 +87,7 @@ MonoBehaviour:
   SlicePadding: 0
   SlicePath: Assets/ZTemp
   SliceAtlas: {fileID: 2800000, guid: a27b5521f1d8a6b40ae582a27ff88ca4, type: 3}
-  SearchTarget: {fileID: 0}
+  SearchTarget: {fileID: 2800000, guid: f6baf652ebcd8ed4093bcf36bbc8a007, type: 3}
   ScalePadding: 1
   ScaleFactor: 0.7
   ScalePath: Assets/Resource/Sprite/Mobile/UI

+ 2 - 312
Assets/Resource/Logo.unity

@@ -155,106 +155,6 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
---- !u!1001 &834019238
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1678569582}
-    m_Modifications:
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 4b27b1fc0c9780a4492f68549d3e1f52, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -518,115 +418,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &1678569581
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-  m_IsPrefabParent: 0
---- !u!224 &1678569582 stripped
-RectTransform:
-  m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-    type: 2}
-  m_PrefabInternal: {fileID: 1678569581}
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0
@@ -654,9 +445,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 1
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugMode: 0
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0
@@ -670,103 +460,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &2018665164
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1678569582}
-    m_Modifications:
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
-  m_IsPrefabParent: 0

+ 65 - 0
Assets/Resource/Prefab/Object/PlazaRoomChest.prefab

@@ -45,6 +45,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1987708437913928
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4668731993363040}
+  - component: {fileID: 212311611596219022}
+  m_Layer: 0
+  m_Name: ChestShadow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!4 &4157323462000244
 Transform:
   m_ObjectHideFlags: 1
@@ -56,9 +72,23 @@ Transform:
   m_LocalScale: {x: 0.6, y: 0.6, z: 1}
   m_Children:
   - {fileID: 4720750328529054}
+  - {fileID: 4668731993363040}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4668731993363040
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1987708437913928}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.09, y: -0.76, z: 5}
+  m_LocalScale: {x: 1.6666665, y: 1.6666665, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4157323462000244}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4720750328529054
 Transform:
   m_ObjectHideFlags: 1
@@ -136,6 +166,41 @@ SpriteRenderer:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!212 &212311611596219022
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1987708437913928}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: f6baf652ebcd8ed4093bcf36bbc8a007, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
 --- !u!212 &212796212424661236
 SpriteRenderer:
   m_ObjectHideFlags: 1

+ 44 - 34
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -132,21 +132,29 @@
     <T_Checking desc=""><![CDATA[检查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已经存在相同的昵称]]></T_RepeatName>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中宝箱总价值的个位数即可领奖]]></Y_GuessNumberDesc>
-    <Y_GuessColorDesc desc=""><![CDATA[猜中花的颜色即可领奖,答案不带色字]]></Y_GuessColorDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[猜中花的颜色即可领奖,答案不带字]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[猜错了]]></Y_GuessWrong>
     <Y_SoldOut desc=""><![CDATA[已经被抢光了]]></Y_SoldOut>
+    <Y_Unactive desc=""><![CDATA[暂时不能领取]]></Y_Unactive>
     <Y_Refund desc=""><![CDATA[你的宝箱没有被领取完,已返还剩余<(钻石)>]]></Y_Refund>
     <Yb_Minimum desc=""><![CDATA[最小20钻石]]></Yb_Minimum>
     <Yb_GuessNumber desc=""><![CDATA[猜数字]]></Yb_GuessNumber>
     <Yb_GuessColor desc=""><![CDATA[猜颜色]]></Yb_GuessColor>
     <Yb_Lucky desc=""><![CDATA[拼手气]]></Yb_Lucky>
     <Yb_GuessNumberDesc desc=""><![CDATA[每次领取的钻石平均分配,每人可领取一次]]></Yb_GuessNumberDesc>
-    <Yb_GuessColorDesc desc=""><![CDATA[每次领取的钻石平均分配,每人可领取一次]]></Yb_GuessColorDesc>
-    <Yb_LuckyDesc desc=""><![CDATA[每次领取的钻石数量随机,每人可领取一次]]></Yb_LuckyDesc>
+    <Yb_GuessColorDesc desc=""><![CDATA[猜中总价值的个位数即可领奖,每人可领取一次]]></Yb_GuessColorDesc>
+    <Yb_LuckyDesc desc=""><![CDATA[猜中花的颜色即可领奖,每人可领取一次]]></Yb_LuckyDesc>
     <Yb_SliderTit desc=""><![CDATA[可领]]></Yb_SliderTit>
     <Yb_SliderValueLab desc=""><![CDATA[次]]></Yb_SliderValueLab>
     <Yb_Tit desc=""><![CDATA[总价值]]></Yb_Tit>
+    <Z_InfoLab0 desc=""><![CDATA[房间号]]></Z_InfoLab0>
+    <Z_InfoLab1 desc=""><![CDATA[派对名称]]></Z_InfoLab1>
+    <Z_InfoLab2 desc=""><![CDATA[状态]]></Z_InfoLab2>
+    <Z_InfoLab3 desc=""><![CDATA[时长]]></Z_InfoLab3>
+    <Z_InfoLab4 desc=""><![CDATA[人员]]></Z_InfoLab4>
+    <Z_InfoLab5 desc=""><![CDATA[由我创建]]></Z_InfoLab5>
     <Z_Closing desc=""><![CDATA[即将结束]]></Z_Closing>
+    <Z_CreateLab desc=""><![CDATA[创建房间]]></Z_CreateLab>
     <Z_Running desc=""><![CDATA[进行中]]></Z_Running>
     <Z_Full desc=""><![CDATA[已满]]></Z_Full>
     <Z_Available desc=""><![CDATA[未满]]></Z_Available>
@@ -154,7 +162,8 @@
     <Z_RoomFull desc=""><![CDATA[派对人数已满,无法加入]]></Z_RoomFull>
     <Z_RoomExpire desc=""><![CDATA[派对已经结束,自己创建一个吧!]]></Z_RoomExpire>
     <Z_Unknown desc=""><![CDATA[派对人数已满]]></Z_Unknown>
-    <AA_AllWhiteSpace desc=""><![CDATA[房间名字不能为空]]></AA_AllWhiteSpace>
+    <AA_BtnLab desc=""><![CDATA[创建]]></AA_BtnLab>
+    <AA_AllWhiteSpace desc=""><![CDATA[派对名字不能为空]]></AA_AllWhiteSpace>
     <AA_TooLong desc=""><![CDATA[名字太长]]></AA_TooLong>
     <AA_SendRequest desc=""><![CDATA[发送请求]]></AA_SendRequest>
     <AA_CreateSucceed desc=""><![CDATA[创建成功]]></AA_CreateSucceed>
@@ -197,7 +206,7 @@
     <Flower16 desc=""><![CDATA[桔梗花]]></Flower16>
     <Flower17 desc=""><![CDATA[康乃馨(白)]]></Flower17>
     <Flower18 desc=""><![CDATA[铃兰(粉)]]></Flower18>
-    <Flower19 desc=""><![CDATA[曼陀罗()]]></Flower19>
+    <Flower19 desc=""><![CDATA[曼陀罗()]]></Flower19>
     <Flower20 desc=""><![CDATA[曼陀罗(粉)]]></Flower20>
     <Flower21 desc=""><![CDATA[玫瑰花(红)]]></Flower21>
     <Flower22 desc=""><![CDATA[玫瑰花(黄)]]></Flower22>
@@ -217,42 +226,42 @@
     <Flower36 desc=""><![CDATA[鸡冠花(黄)]]></Flower36>
   </FlowerName>
   <FlowerColor>
-    <Flower1 desc=""><![CDATA[]]></Flower1>
-    <Flower2 desc=""><![CDATA[]]></Flower2>
-    <Flower3 desc=""><![CDATA[]]></Flower3>
-    <Flower4 desc=""><![CDATA[]]></Flower4>
+    <Flower1 desc=""><![CDATA[]]></Flower1>
+    <Flower2 desc=""><![CDATA[]]></Flower2>
+    <Flower3 desc=""><![CDATA[]]></Flower3>
+    <Flower4 desc=""><![CDATA[]]></Flower4>
     <Flower5 desc=""><![CDATA[白]]></Flower5>
     <Flower6 desc=""><![CDATA[白]]></Flower6>
     <Flower7 desc=""><![CDATA[白]]></Flower7>
-    <Flower8 desc=""><![CDATA[]]></Flower8>
-    <Flower9 desc=""><![CDATA[]]></Flower9>
-    <Flower10 desc=""><![CDATA[]]></Flower10>
-    <Flower11 desc=""><![CDATA[]]></Flower11>
-    <Flower12 desc=""><![CDATA[]]></Flower12>
+    <Flower8 desc=""><![CDATA[]]></Flower8>
+    <Flower9 desc=""><![CDATA[]]></Flower9>
+    <Flower10 desc=""><![CDATA[]]></Flower10>
+    <Flower11 desc=""><![CDATA[]]></Flower11>
+    <Flower12 desc=""><![CDATA[]]></Flower12>
     <Flower13 desc=""><![CDATA[白]]></Flower13>
-    <Flower14 desc=""><![CDATA[]]></Flower14>
-    <Flower15 desc=""><![CDATA[]]></Flower15>
-    <Flower16 desc=""><![CDATA[]]></Flower16>
+    <Flower14 desc=""><![CDATA[]]></Flower14>
+    <Flower15 desc=""><![CDATA[]]></Flower15>
+    <Flower16 desc=""><![CDATA[]]></Flower16>
     <Flower17 desc=""><![CDATA[白]]></Flower17>
-    <Flower18 desc=""><![CDATA[]]></Flower18>
-    <Flower19 desc=""><![CDATA[]]></Flower19>
-    <Flower20 desc=""><![CDATA[]]></Flower20>
-    <Flower21 desc=""><![CDATA[]]></Flower21>
-    <Flower22 desc=""><![CDATA[]]></Flower22>
-    <Flower23 desc=""><![CDATA[]]></Flower23>
-    <Flower24 desc=""><![CDATA[]]></Flower24>
-    <Flower25 desc=""><![CDATA[]]></Flower25>
-    <Flower26 desc=""><![CDATA[]]></Flower26>
-    <Flower27 desc=""><![CDATA[]]></Flower27>
-    <Flower28 desc=""><![CDATA[]]></Flower28>
-    <Flower29 desc=""><![CDATA[]]></Flower29>
+    <Flower18 desc=""><![CDATA[]]></Flower18>
+    <Flower19 desc=""><![CDATA[]]></Flower19>
+    <Flower20 desc=""><![CDATA[]]></Flower20>
+    <Flower21 desc=""><![CDATA[]]></Flower21>
+    <Flower22 desc=""><![CDATA[]]></Flower22>
+    <Flower23 desc=""><![CDATA[]]></Flower23>
+    <Flower24 desc=""><![CDATA[]]></Flower24>
+    <Flower25 desc=""><![CDATA[]]></Flower25>
+    <Flower26 desc=""><![CDATA[]]></Flower26>
+    <Flower27 desc=""><![CDATA[]]></Flower27>
+    <Flower28 desc=""><![CDATA[]]></Flower28>
+    <Flower29 desc=""><![CDATA[]]></Flower29>
     <Flower30 desc=""><![CDATA[白]]></Flower30>
-    <Flower31 desc=""><![CDATA[]]></Flower31>
+    <Flower31 desc=""><![CDATA[]]></Flower31>
     <Flower32 desc=""><![CDATA[白]]></Flower32>
-    <Flower33 desc=""><![CDATA[]]></Flower33>
-    <Flower34 desc=""><![CDATA[]]></Flower34>
-    <Flower35 desc=""><![CDATA[]]></Flower35>
-    <Flower36 desc=""><![CDATA[]]></Flower36>
+    <Flower33 desc=""><![CDATA[]]></Flower33>
+    <Flower34 desc=""><![CDATA[]]></Flower34>
+    <Flower35 desc=""><![CDATA[]]></Flower35>
+    <Flower36 desc=""><![CDATA[]]></Flower36>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金币大礼包]]></Pack1>
@@ -362,6 +371,7 @@
     <Diamond desc=""><![CDATA[钻石]]></Diamond>
     <Confirm desc=""><![CDATA[确定]]></Confirm>
     <Cancel desc=""><![CDATA[取消]]></Cancel>
+    <Close desc=""><![CDATA[关闭]]></Close>
     <AD desc=""><![CDATA[观看]]></AD>
     <Cash desc=""><![CDATA[¥]]></Cash>
     <Person desc=""><![CDATA[参观人次]]></Person>

+ 79 - 69
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -131,46 +131,55 @@
     <T_AllWhiteSpace desc=""><![CDATA[昵稱不能為空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[檢查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已經存在相同的昵稱]]></T_RepeatName>
-    <Y_GuessNumberDesc desc=""><![CDATA[]]></Y_GuessNumberDesc>
-    <Y_GuessColorDesc desc=""><![CDATA[]]></Y_GuessColorDesc>
+    <Y_GuessNumberDesc desc=""><![CDATA[猜中寶箱總價值的個位數即可領獎]]></Y_GuessNumberDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[猜中花的顏色即可領獎,答案不帶“色”字]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[猜錯了]]></Y_GuessWrong>
-    <Y_SoldOut desc=""><![CDATA[]]></Y_SoldOut>
-    <Y_Refund desc=""><![CDATA[]]></Y_Refund>
-    <Yb_Minimum desc=""><![CDATA[]]></Yb_Minimum>
-    <Yb_GuessNumber desc=""><![CDATA[]]></Yb_GuessNumber>
-    <Yb_GuessColor desc=""><![CDATA[]]></Yb_GuessColor>
-    <Yb_Lucky desc=""><![CDATA[]]></Yb_Lucky>
-    <Yb_GuessNumberDesc desc=""><![CDATA[]]></Yb_GuessNumberDesc>
-    <Yb_GuessColorDesc desc=""><![CDATA[]]></Yb_GuessColorDesc>
-    <Yb_LuckyDesc desc=""><![CDATA[]]></Yb_LuckyDesc>
-    <Yb_SliderTit desc=""><![CDATA[]]></Yb_SliderTit>
-    <Yb_SliderValueLab desc=""><![CDATA[]]></Yb_SliderValueLab>
-    <Yb_Tit desc=""><![CDATA[]]></Yb_Tit>
-    <Z_Closing desc=""><![CDATA[]]></Z_Closing>
-    <Z_Running desc=""><![CDATA[]]></Z_Running>
-    <Z_Full desc=""><![CDATA[]]></Z_Full>
-    <Z_Available desc=""><![CDATA[]]></Z_Available>
-    <Z_Join desc=""><![CDATA[]]></Z_Join>
-    <Z_RoomFull desc=""><![CDATA[]]></Z_RoomFull>
-    <Z_RoomExpire desc=""><![CDATA[]]></Z_RoomExpire>
-    <Z_Unknown desc=""><![CDATA[]]></Z_Unknown>
-    <AA_AllWhiteSpace desc=""><![CDATA[]]></AA_AllWhiteSpace>
-    <AA_TooLong desc=""><![CDATA[]]></AA_TooLong>
-    <AA_SendRequest desc=""><![CDATA[]]></AA_SendRequest>
-    <AA_CreateSucceed desc=""><![CDATA[]]></AA_CreateSucceed>
-    <AA_CreateError desc=""><![CDATA[]]></AA_CreateError>
-    <AA_Cost desc=""><![CDATA[]]></AA_Cost>
-    <AA_Lab desc=""><![CDATA[]]></AA_Lab>
-    <AA_NoEnoughDiamond desc=""><![CDATA[]]></AA_NoEnoughDiamond>
-    <AA_Create desc=""><![CDATA[]]></AA_Create>
-    <AAa_Tit desc=""><![CDATA[]]></AAa_Tit>
-    <AAa_Value desc=""><![CDATA[]]></AAa_Value>
-    <AAb_Tit desc=""><![CDATA[]]></AAb_Tit>
-    <AAb_Value desc=""><![CDATA[]]></AAb_Value>
-    <Loading desc=""><![CDATA[]]></Loading>
-    <LoadFailed desc=""><![CDATA[]]></LoadFailed>
-    <LoadSucceed desc=""><![CDATA[]]></LoadSucceed>
-    <NoMore desc=""><![CDATA[]]></NoMore>
+    <Y_SoldOut desc=""><![CDATA[已經被搶光了]]></Y_SoldOut>
+    <Y_Unactive desc=""><![CDATA[]]></Y_Unactive>
+    <Y_Refund desc=""><![CDATA[你的寶箱沒有被領取完,已返還剩餘<(鑽石)>]]></Y_Refund>
+    <Yb_Minimum desc=""><![CDATA[最小20鑽石]]></Yb_Minimum>
+    <Yb_GuessNumber desc=""><![CDATA[猜數字]]></Yb_GuessNumber>
+    <Yb_GuessColor desc=""><![CDATA[猜顏色]]></Yb_GuessColor>
+    <Yb_Lucky desc=""><![CDATA[拼手氣]]></Yb_Lucky>
+    <Yb_GuessNumberDesc desc=""><![CDATA[每次領取的鑽石平均分配,每人可領取一次]]></Yb_GuessNumberDesc>
+    <Yb_GuessColorDesc desc=""><![CDATA[猜中總價值的個位數即可領獎,每人可領取一次]]></Yb_GuessColorDesc>
+    <Yb_LuckyDesc desc=""><![CDATA[猜中花的顏色即可領獎,每人可領取一次]]></Yb_LuckyDesc>
+    <Yb_SliderTit desc=""><![CDATA[可領]]></Yb_SliderTit>
+    <Yb_SliderValueLab desc=""><![CDATA[次]]></Yb_SliderValueLab>
+    <Yb_Tit desc=""><![CDATA[總價值]]></Yb_Tit>
+    <Z_InfoLab0 desc=""><![CDATA[]]></Z_InfoLab0>
+    <Z_InfoLab1 desc=""><![CDATA[]]></Z_InfoLab1>
+    <Z_InfoLab2 desc=""><![CDATA[]]></Z_InfoLab2>
+    <Z_InfoLab3 desc=""><![CDATA[]]></Z_InfoLab3>
+    <Z_InfoLab4 desc=""><![CDATA[]]></Z_InfoLab4>
+    <Z_InfoLab5 desc=""><![CDATA[]]></Z_InfoLab5>
+    <Z_Closing desc=""><![CDATA[即將結束]]></Z_Closing>
+    <Z_CreateLab desc=""><![CDATA[]]></Z_CreateLab>
+    <Z_Running desc=""><![CDATA[進行中]]></Z_Running>
+    <Z_Full desc=""><![CDATA[已滿]]></Z_Full>
+    <Z_Available desc=""><![CDATA[未滿]]></Z_Available>
+    <Z_Join desc=""><![CDATA[加入]]></Z_Join>
+    <Z_RoomFull desc=""><![CDATA[派對人數已滿,無法加入]]></Z_RoomFull>
+    <Z_RoomExpire desc=""><![CDATA[派對已經結束,自己創建一個吧!]]></Z_RoomExpire>
+    <Z_Unknown desc=""><![CDATA[派對人數已滿]]></Z_Unknown>
+    <AA_BtnLab desc=""><![CDATA[]]></AA_BtnLab>
+    <AA_AllWhiteSpace desc=""><![CDATA[派對名字不能為空]]></AA_AllWhiteSpace>
+    <AA_TooLong desc=""><![CDATA[名字太長]]></AA_TooLong>
+    <AA_SendRequest desc=""><![CDATA[發送請求]]></AA_SendRequest>
+    <AA_CreateSucceed desc=""><![CDATA[創建成功]]></AA_CreateSucceed>
+    <AA_CreateError desc=""><![CDATA[創建失敗]]></AA_CreateError>
+    <AA_Cost desc=""><![CDATA[花費]]></AA_Cost>
+    <AA_Lab desc=""><![CDATA[派對名稱]]></AA_Lab>
+    <AA_NoEnoughDiamond desc=""><![CDATA[鑽石不足]]></AA_NoEnoughDiamond>
+    <AA_Create desc=""><![CDATA[創建]]></AA_Create>
+    <AAa_Tit desc=""><![CDATA[時長]]></AAa_Tit>
+    <AAa_Value desc=""><![CDATA[小時]]></AAa_Value>
+    <AAb_Tit desc=""><![CDATA[人數]]></AAb_Tit>
+    <AAb_Value desc=""><![CDATA[人]]></AAb_Value>
+    <Loading desc=""><![CDATA[載入中]]></Loading>
+    <LoadFailed desc=""><![CDATA[載入失敗]]></LoadFailed>
+    <LoadSucceed desc=""><![CDATA[載入成功]]></LoadSucceed>
+    <NoMore desc=""><![CDATA[沒有更多內容了]]></NoMore>
     <热卖 desc=""><![CDATA[熱賣]]></热卖>
     <超值 desc=""><![CDATA[超值]]></超值>
     <加入房间失败 desc=""><![CDATA[無法連接到伺服器]]></加入房间失败>
@@ -197,7 +206,7 @@
     <Flower16 desc=""><![CDATA[桔梗花]]></Flower16>
     <Flower17 desc=""><![CDATA[康乃馨(白)]]></Flower17>
     <Flower18 desc=""><![CDATA[鈴蘭(粉)]]></Flower18>
-    <Flower19 desc=""><![CDATA[曼陀羅()]]></Flower19>
+    <Flower19 desc=""><![CDATA[曼陀羅()]]></Flower19>
     <Flower20 desc=""><![CDATA[曼陀羅(粉)]]></Flower20>
     <Flower21 desc=""><![CDATA[玫瑰花(紅)]]></Flower21>
     <Flower22 desc=""><![CDATA[玫瑰花(黃)]]></Flower22>
@@ -217,42 +226,42 @@
     <Flower36 desc=""><![CDATA[雞冠花(黃)]]></Flower36>
   </FlowerName>
   <FlowerColor>
-    <Flower1 desc=""><![CDATA[]]></Flower1>
-    <Flower2 desc=""><![CDATA[]]></Flower2>
-    <Flower3 desc=""><![CDATA[]]></Flower3>
-    <Flower4 desc=""><![CDATA[]]></Flower4>
+    <Flower1 desc=""><![CDATA[]]></Flower1>
+    <Flower2 desc=""><![CDATA[]]></Flower2>
+    <Flower3 desc=""><![CDATA[]]></Flower3>
+    <Flower4 desc=""><![CDATA[]]></Flower4>
     <Flower5 desc=""><![CDATA[白]]></Flower5>
     <Flower6 desc=""><![CDATA[白]]></Flower6>
     <Flower7 desc=""><![CDATA[白]]></Flower7>
-    <Flower8 desc=""><![CDATA[]]></Flower8>
-    <Flower9 desc=""><![CDATA[]]></Flower9>
-    <Flower10 desc=""><![CDATA[]]></Flower10>
-    <Flower11 desc=""><![CDATA[]]></Flower11>
-    <Flower12 desc=""><![CDATA[]]></Flower12>
+    <Flower8 desc=""><![CDATA[]]></Flower8>
+    <Flower9 desc=""><![CDATA[]]></Flower9>
+    <Flower10 desc=""><![CDATA[]]></Flower10>
+    <Flower11 desc=""><![CDATA[]]></Flower11>
+    <Flower12 desc=""><![CDATA[]]></Flower12>
     <Flower13 desc=""><![CDATA[白]]></Flower13>
-    <Flower14 desc=""><![CDATA[]]></Flower14>
-    <Flower15 desc=""><![CDATA[]]></Flower15>
-    <Flower16 desc=""><![CDATA[]]></Flower16>
+    <Flower14 desc=""><![CDATA[]]></Flower14>
+    <Flower15 desc=""><![CDATA[]]></Flower15>
+    <Flower16 desc=""><![CDATA[]]></Flower16>
     <Flower17 desc=""><![CDATA[白]]></Flower17>
-    <Flower18 desc=""><![CDATA[]]></Flower18>
-    <Flower19 desc=""><![CDATA[]]></Flower19>
-    <Flower20 desc=""><![CDATA[]]></Flower20>
-    <Flower21 desc=""><![CDATA[]]></Flower21>
-    <Flower22 desc=""><![CDATA[]]></Flower22>
-    <Flower23 desc=""><![CDATA[]]></Flower23>
-    <Flower24 desc=""><![CDATA[]]></Flower24>
-    <Flower25 desc=""><![CDATA[]]></Flower25>
-    <Flower26 desc=""><![CDATA[]]></Flower26>
-    <Flower27 desc=""><![CDATA[]]></Flower27>
-    <Flower28 desc=""><![CDATA[]]></Flower28>
-    <Flower29 desc=""><![CDATA[]]></Flower29>
+    <Flower18 desc=""><![CDATA[]]></Flower18>
+    <Flower19 desc=""><![CDATA[]]></Flower19>
+    <Flower20 desc=""><![CDATA[]]></Flower20>
+    <Flower21 desc=""><![CDATA[]]></Flower21>
+    <Flower22 desc=""><![CDATA[]]></Flower22>
+    <Flower23 desc=""><![CDATA[]]></Flower23>
+    <Flower24 desc=""><![CDATA[]]></Flower24>
+    <Flower25 desc=""><![CDATA[]]></Flower25>
+    <Flower26 desc=""><![CDATA[]]></Flower26>
+    <Flower27 desc=""><![CDATA[]]></Flower27>
+    <Flower28 desc=""><![CDATA[]]></Flower28>
+    <Flower29 desc=""><![CDATA[]]></Flower29>
     <Flower30 desc=""><![CDATA[白]]></Flower30>
-    <Flower31 desc=""><![CDATA[]]></Flower31>
+    <Flower31 desc=""><![CDATA[]]></Flower31>
     <Flower32 desc=""><![CDATA[白]]></Flower32>
-    <Flower33 desc=""><![CDATA[]]></Flower33>
-    <Flower34 desc=""><![CDATA[]]></Flower34>
-    <Flower35 desc=""><![CDATA[]]></Flower35>
-    <Flower36 desc=""><![CDATA[]]></Flower36>
+    <Flower33 desc=""><![CDATA[]]></Flower33>
+    <Flower34 desc=""><![CDATA[]]></Flower34>
+    <Flower35 desc=""><![CDATA[]]></Flower35>
+    <Flower36 desc=""><![CDATA[]]></Flower36>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金幣大禮包]]></Pack1>
@@ -362,6 +371,7 @@
     <Diamond desc=""><![CDATA[鉆石]]></Diamond>
     <Confirm desc=""><![CDATA[確定]]></Confirm>
     <Cancel desc=""><![CDATA[取消]]></Cancel>
+    <Close desc=""><![CDATA[]]></Close>
     <AD desc=""><![CDATA[觀看]]></AD>
     <Cash desc=""><![CDATA[CNY]]></Cash>
     <Person desc=""><![CDATA[參觀人次]]></Person>

+ 76 - 66
Assets/Resource/XML/lan/English.xml

@@ -131,46 +131,55 @@ 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>
-    <Y_GuessNumberDesc desc=""><![CDATA[]]></Y_GuessNumberDesc>
-    <Y_GuessColorDesc desc=""><![CDATA[]]></Y_GuessColorDesc>
+    <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>
-    <Y_SoldOut desc=""><![CDATA[]]></Y_SoldOut>
-    <Y_Refund desc=""><![CDATA[]]></Y_Refund>
-    <Yb_Minimum desc=""><![CDATA[]]></Yb_Minimum>
-    <Yb_GuessNumber desc=""><![CDATA[]]></Yb_GuessNumber>
-    <Yb_GuessColor desc=""><![CDATA[]]></Yb_GuessColor>
-    <Yb_Lucky desc=""><![CDATA[]]></Yb_Lucky>
-    <Yb_GuessNumberDesc desc=""><![CDATA[]]></Yb_GuessNumberDesc>
-    <Yb_GuessColorDesc desc=""><![CDATA[]]></Yb_GuessColorDesc>
-    <Yb_LuckyDesc desc=""><![CDATA[]]></Yb_LuckyDesc>
-    <Yb_SliderTit desc=""><![CDATA[]]></Yb_SliderTit>
-    <Yb_SliderValueLab desc=""><![CDATA[]]></Yb_SliderValueLab>
-    <Yb_Tit desc=""><![CDATA[]]></Yb_Tit>
-    <Z_Closing desc=""><![CDATA[]]></Z_Closing>
-    <Z_Running desc=""><![CDATA[]]></Z_Running>
-    <Z_Full desc=""><![CDATA[]]></Z_Full>
-    <Z_Available desc=""><![CDATA[]]></Z_Available>
-    <Z_Join desc=""><![CDATA[]]></Z_Join>
-    <Z_RoomFull desc=""><![CDATA[]]></Z_RoomFull>
-    <Z_RoomExpire desc=""><![CDATA[]]></Z_RoomExpire>
-    <Z_Unknown desc=""><![CDATA[]]></Z_Unknown>
-    <AA_AllWhiteSpace desc=""><![CDATA[]]></AA_AllWhiteSpace>
-    <AA_TooLong desc=""><![CDATA[]]></AA_TooLong>
-    <AA_SendRequest desc=""><![CDATA[]]></AA_SendRequest>
-    <AA_CreateSucceed desc=""><![CDATA[]]></AA_CreateSucceed>
-    <AA_CreateError desc=""><![CDATA[]]></AA_CreateError>
-    <AA_Cost desc=""><![CDATA[]]></AA_Cost>
-    <AA_Lab desc=""><![CDATA[]]></AA_Lab>
-    <AA_NoEnoughDiamond desc=""><![CDATA[]]></AA_NoEnoughDiamond>
-    <AA_Create desc=""><![CDATA[]]></AA_Create>
-    <AAa_Tit desc=""><![CDATA[]]></AAa_Tit>
+    <Y_SoldOut desc=""><![CDATA[All the treasures seemed to be gone]]></Y_SoldOut>
+    <Y_Unactive desc=""><![CDATA[]]></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_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>
+    <Yb_GuessColorDesc desc=""><![CDATA[Hit the last digit of total value of the chest, each one can get once]]></Yb_GuessColorDesc>
+    <Yb_LuckyDesc desc=""><![CDATA[Hit the color of the flower shape, each one can get once]]></Yb_LuckyDesc>
+    <Yb_SliderTit desc=""><![CDATA[Can get]]></Yb_SliderTit>
+    <Yb_SliderValueLab desc=""><![CDATA[time(s)]]></Yb_SliderValueLab>
+    <Yb_Tit desc=""><![CDATA[Total]]></Yb_Tit>
+    <Z_InfoLab0 desc=""><![CDATA[]]></Z_InfoLab0>
+    <Z_InfoLab1 desc=""><![CDATA[]]></Z_InfoLab1>
+    <Z_InfoLab2 desc=""><![CDATA[]]></Z_InfoLab2>
+    <Z_InfoLab3 desc=""><![CDATA[]]></Z_InfoLab3>
+    <Z_InfoLab4 desc=""><![CDATA[]]></Z_InfoLab4>
+    <Z_InfoLab5 desc=""><![CDATA[]]></Z_InfoLab5>
+    <Z_Closing desc=""><![CDATA[Almost close]]></Z_Closing>
+    <Z_CreateLab desc=""><![CDATA[]]></Z_CreateLab>
+    <Z_Running desc=""><![CDATA[Ongoing]]></Z_Running>
+    <Z_Full desc=""><![CDATA[Full]]></Z_Full>
+    <Z_Available desc=""><![CDATA[Available]]></Z_Available>
+    <Z_Join desc=""><![CDATA[Join]]></Z_Join>
+    <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>
+    <AA_BtnLab desc=""><![CDATA[]]></AA_BtnLab>
+    <AA_AllWhiteSpace desc=""><![CDATA[Party name can not be null]]></AA_AllWhiteSpace>
+    <AA_TooLong desc=""><![CDATA[Party name too long]]></AA_TooLong>
+    <AA_SendRequest desc=""><![CDATA[Send request]]></AA_SendRequest>
+    <AA_CreateSucceed desc=""><![CDATA[Success]]></AA_CreateSucceed>
+    <AA_CreateError desc=""><![CDATA[Error]]></AA_CreateError>
+    <AA_Cost desc=""><![CDATA[Cost]]></AA_Cost>
+    <AA_Lab desc=""><![CDATA[Party name]]></AA_Lab>
+    <AA_NoEnoughDiamond desc=""><![CDATA[Not enough Diamonds]]></AA_NoEnoughDiamond>
+    <AA_Create desc=""><![CDATA[Create]]></AA_Create>
+    <AAa_Tit desc=""><![CDATA[Hours]]></AAa_Tit>
     <AAa_Value desc=""><![CDATA[]]></AAa_Value>
-    <AAb_Tit desc=""><![CDATA[]]></AAb_Tit>
+    <AAb_Tit desc=""><![CDATA[Members]]></AAb_Tit>
     <AAb_Value desc=""><![CDATA[]]></AAb_Value>
-    <Loading desc=""><![CDATA[]]></Loading>
-    <LoadFailed desc=""><![CDATA[]]></LoadFailed>
-    <LoadSucceed desc=""><![CDATA[]]></LoadSucceed>
-    <NoMore desc=""><![CDATA[]]></NoMore>
+    <Loading desc=""><![CDATA[Loading]]></Loading>
+    <LoadFailed desc=""><![CDATA[Failed]]></LoadFailed>
+    <LoadSucceed desc=""><![CDATA[Success]]></LoadSucceed>
+    <NoMore desc=""><![CDATA[No More]]></NoMore>
     <热卖 desc=""><![CDATA[Most Popular]]></热卖>
     <超值 desc=""><![CDATA[Highest Value]]></超值>
     <加入房间失败 desc=""><![CDATA[Failed to connect]]></加入房间失败>
@@ -217,42 +226,42 @@ Program 水怪
     <Flower36 desc=""><![CDATA[Cockscomb(Yellow)]]></Flower36>
   </FlowerName>
   <FlowerColor>
-    <Flower1 desc=""><![CDATA[White]]></Flower1>
-    <Flower2 desc=""><![CDATA[White]]></Flower2>
-    <Flower3 desc=""><![CDATA[White]]></Flower3>
-    <Flower4 desc=""><![CDATA[White]]></Flower4>
+    <Flower1 desc=""><![CDATA[Pink]]></Flower1>
+    <Flower2 desc=""><![CDATA[Purple]]></Flower2>
+    <Flower3 desc=""><![CDATA[Pink]]></Flower3>
+    <Flower4 desc=""><![CDATA[Red]]></Flower4>
     <Flower5 desc=""><![CDATA[White]]></Flower5>
     <Flower6 desc=""><![CDATA[White]]></Flower6>
     <Flower7 desc=""><![CDATA[White]]></Flower7>
-    <Flower8 desc=""><![CDATA[White]]></Flower8>
-    <Flower9 desc=""><![CDATA[White]]></Flower9>
-    <Flower10 desc=""><![CDATA[White]]></Flower10>
-    <Flower11 desc=""><![CDATA[White]]></Flower11>
-    <Flower12 desc=""><![CDATA[White]]></Flower12>
+    <Flower8 desc=""><![CDATA[Blue]]></Flower8>
+    <Flower9 desc=""><![CDATA[Purple]]></Flower9>
+    <Flower10 desc=""><![CDATA[Pink]]></Flower10>
+    <Flower11 desc=""><![CDATA[Yellow]]></Flower11>
+    <Flower12 desc=""><![CDATA[Pink]]></Flower12>
     <Flower13 desc=""><![CDATA[White]]></Flower13>
-    <Flower14 desc=""><![CDATA[White]]></Flower14>
-    <Flower15 desc=""><![CDATA[White]]></Flower15>
-    <Flower16 desc=""><![CDATA[White]]></Flower16>
+    <Flower14 desc=""><![CDATA[Pink]]></Flower14>
+    <Flower15 desc=""><![CDATA[Red]]></Flower15>
+    <Flower16 desc=""><![CDATA[Purple]]></Flower16>
     <Flower17 desc=""><![CDATA[White]]></Flower17>
-    <Flower18 desc=""><![CDATA[White]]></Flower18>
-    <Flower19 desc=""><![CDATA[White]]></Flower19>
-    <Flower20 desc=""><![CDATA[White]]></Flower20>
-    <Flower21 desc=""><![CDATA[White]]></Flower21>
-    <Flower22 desc=""><![CDATA[White]]></Flower22>
-    <Flower23 desc=""><![CDATA[White]]></Flower23>
-    <Flower24 desc=""><![CDATA[White]]></Flower24>
-    <Flower25 desc=""><![CDATA[White]]></Flower25>
-    <Flower26 desc=""><![CDATA[White]]></Flower26>
-    <Flower27 desc=""><![CDATA[White]]></Flower27>
-    <Flower28 desc=""><![CDATA[White]]></Flower28>
-    <Flower29 desc=""><![CDATA[White]]></Flower29>
+    <Flower18 desc=""><![CDATA[Pink]]></Flower18>
+    <Flower19 desc=""><![CDATA[Orange]]></Flower19>
+    <Flower20 desc=""><![CDATA[Pink]]></Flower20>
+    <Flower21 desc=""><![CDATA[Red]]></Flower21>
+    <Flower22 desc=""><![CDATA[Yellow]]></Flower22>
+    <Flower23 desc=""><![CDATA[Red]]></Flower23>
+    <Flower24 desc=""><![CDATA[Purple]]></Flower24>
+    <Flower25 desc=""><![CDATA[Red]]></Flower25>
+    <Flower26 desc=""><![CDATA[Yellow]]></Flower26>
+    <Flower27 desc=""><![CDATA[Purple]]></Flower27>
+    <Flower28 desc=""><![CDATA[Pink]]></Flower28>
+    <Flower29 desc=""><![CDATA[Yellow]]></Flower29>
     <Flower30 desc=""><![CDATA[White]]></Flower30>
-    <Flower31 desc=""><![CDATA[White]]></Flower31>
+    <Flower31 desc=""><![CDATA[Pink]]></Flower31>
     <Flower32 desc=""><![CDATA[White]]></Flower32>
-    <Flower33 desc=""><![CDATA[White]]></Flower33>
-    <Flower34 desc=""><![CDATA[White]]></Flower34>
-    <Flower35 desc=""><![CDATA[White]]></Flower35>
-    <Flower36 desc=""><![CDATA[White]]></Flower36>
+    <Flower33 desc=""><![CDATA[Purple]]></Flower33>
+    <Flower34 desc=""><![CDATA[Blue]]></Flower34>
+    <Flower35 desc=""><![CDATA[Red]]></Flower35>
+    <Flower36 desc=""><![CDATA[Yellow]]></Flower36>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[Gift of Coins]]></Pack1>
@@ -363,6 +372,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>
     <AD desc=""><![CDATA[Watch]]></AD>
     <Cash desc=""><![CDATA[CNY]]></Cash>
     <Person desc=""><![CDATA[Visitor]]></Person>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 1 - 1
Assets/Script/Manage/ManaPlayer.cs

@@ -202,7 +202,7 @@ public class ManaPlayer : Regist
 
 
         Player.SetAllCollider(true);
-        Player.UAC.armature.flipX = false;
+        Player.Flip(PlayerDirection.Left);
         Player.transform.position = ManaReso.Get("PlayerPosTra").position;
 
         tra.localScale = new Vector3(0.5f, 0.5f, 0.5f);

+ 18 - 0
Assets/Script/Manage/ManaUI.cs

@@ -3037,12 +3037,19 @@ public class ManaUI : Regist
         #region Y
 
         ManaLan.Add(ManaReso.Get<Text>("Y_Tit"), new LanStr("UI", "Yb_Tit"));
+        ManaLan.Add(ManaReso.Get<Text>("Y_BtnLab"), new LanStr("Common", "Confirm"));
+
+        ManaLan.Add(ManaReso.Get<Text>("Yb_Tit"), new LanStr("UI", "Yb_Tit"));
         ManaLan.Add(ManaReso.Get<Text>("Yb_Desc"), new LanStr("UI", "Yb_LuckyDesc"));
+        ManaLan.Add(ManaReso.Get<Text>("Yb_BtnLab"), new LanStr("Common", "Confirm"));
         ManaLan.Add(ManaReso.Get<Text>("Yb_SliderTit"), new LanStr("UI", "Yb_SliderTit"));
         ManaLan.Add(ManaReso.Get<Text>("Yb_ToggleLab0"), new LanStr("UI", "Yb_Lucky"));
         ManaLan.Add(ManaReso.Get<Text>("Yb_ToggleLab1"), new LanStr("UI", "Yb_GuessColor"));
         ManaLan.Add(ManaReso.Get<Text>("Yb_ToggleLab2"), new LanStr("UI", "Yb_GuessNumber"));
 
+        ManaLan.Add(ManaReso.Get<Text>("Ya_BtnLab"), new LanStr("Common", "Confirm"));
+
+
         ManaReso.Get("Y_Tip").CreateTweenCG(0, 1, 0.5f, false, true, Curve.EaseOutQuad);
         ManaReso.Get("Y_Chest").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
@@ -3121,6 +3128,16 @@ public class ManaUI : Regist
 
         #region Z
 
+        ManaLan.Add(ManaReso.Get<Text>("Z_CreateLab"), new LanStr("UI", "Z_CreateLab"));
+        ManaLan.Add(ManaReso.Get<Text>("Z_CloseLab"), new LanStr("Common", "Close"));
+        ManaLan.Add(ManaReso.Get<Text>("Z_InfoLab0"), new LanStr("UI", "Z_InfoLab0"));
+        ManaLan.Add(ManaReso.Get<Text>("Z_InfoLab1"), new LanStr("UI", "Z_InfoLab1"));
+        ManaLan.Add(ManaReso.Get<Text>("Z_InfoLab2"), new LanStr("UI", "Z_InfoLab2"));
+        ManaLan.Add(ManaReso.Get<Text>("Z_InfoLab3"), new LanStr("UI", "Z_InfoLab3"));
+        ManaLan.Add(ManaReso.Get<Text>("Z_InfoLab4"), new LanStr("UI", "Z_InfoLab4"));
+        ManaLan.Add(ManaReso.Get<Text>("Z_InfoLab5"), new LanStr("UI", "Z_InfoLab5"));
+
+
         ManaReso.Get("Z_BK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ManaReso.Get("Z_Tip").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
@@ -3177,6 +3194,7 @@ public class ManaUI : Regist
         #region AA
 
         ManaLan.Add(ManaReso.Get<Text>("AA_Lab"), new LanStr("UI", "AA_Lab"));
+        ManaLan.Add(ManaReso.Get<Text>("AA_BtnLab"), new LanStr("UI", "AA_BtnLab"));
         ManaLan.Add(ManaReso.Get<Text>("AAa_Tit"), new LanStr("UI", "AAa_Tit"));
         ManaLan.Add(ManaReso.Get<Text>("AAb_Tit"), new LanStr("UI", "AAb_Tit"));
 

+ 38 - 9
Assets/Script/Object/Player.cs

@@ -562,6 +562,22 @@ public class Player : Regist , IPointerClickHandler
 
     #region 换装
 
+    public Transform Shadow;
+
+    private Transform Pivot
+    {
+        get
+        {
+            if (pivot == null)
+            {
+                pivot = UAC.transform.FindChild("Pivot");
+            }
+
+            return pivot;
+        }
+    }
+    private Transform pivot;
+
     public string Eye;
     public string Top;
     public string Shoe;
@@ -616,7 +632,8 @@ public class Player : Regist , IPointerClickHandler
         Vector3 bigShadowScale = new Vector3(1.820952f, 2.418199f, 1.820952f);
         Vector3 smallShadowScale = new Vector3(1.081191f, 1.435807f, 1.081191f);
 
-        ChildDic["Shadow"].CreateStreamScale
+        Shadow = ChildDic["Shadow"];
+        Shadow.CreateStreamScale
         (
             new List<float>() {0, 0, 0},
             new List<float>() {0.33f, 0.33f, 0.33f, 0.33f},
@@ -667,7 +684,7 @@ public class Player : Regist , IPointerClickHandler
     {
         if (eventObject.animationState.name == JumpAnimationName)
         {
-            ChildDic["Shadow"].StreamReForScale();
+            Shadow.StreamReForScale();
 
             AnimLock1 = true;
 
@@ -777,7 +794,6 @@ public class Player : Regist , IPointerClickHandler
     public void Flip(PlayerDirection direction)
     {
         FlipExpression(ExpressionName, direction);
-
         if (direction == PlayerDirection.Left)
         {
             UAC.armature.flipX = false;
@@ -794,6 +810,8 @@ public class Player : Regist , IPointerClickHandler
         {
             throw new Exception();
         }
+
+        DelayCall.Call(1, () => Shadow.SetX(Pivot.position.x));
     }
 
     public void FlipExpression(string expressionName, PlayerDirection direction)
@@ -1001,9 +1019,7 @@ public class Player : Regist , IPointerClickHandler
 
                     PlayAnim(IdleAnimationName);
 
-                    ChildDic["Shadow"].GetStreamScale().Pause();
-                    ChildDic["Shadow"].GetStreamScale().InOrigin = true;
-                    ChildDic["ShadowParent"].SetActive(false);
+                    DeactiveShadow();
 
                     ManaReso.Get("B_SignIn0").TweenForCG();
                     ManaReso.Get("I_BlackMask").TweenForCG();
@@ -1041,8 +1057,7 @@ public class Player : Regist , IPointerClickHandler
                 {
                     ManaGarden.RetrieveAllElf();
 
-                    ChildDic["ShadowParent"].SetActive(true);
-                    ChildDic["ShadowParent"].SetLZ(3);
+                    ActiveShadow();
 
                     transform.SetParent(ManaReso.Get("DressRoom"));
 
@@ -1069,6 +1084,20 @@ public class Player : Regist , IPointerClickHandler
             );
     }
 
+
+    public void ActiveShadow()
+    {
+        ChildDic["ShadowParent"].SetActive(true);
+        ChildDic["ShadowParent"].SetLZ(3);
+    }
+
+    public void DeactiveShadow()
+    {
+        Shadow.GetStreamScale().Pause();
+        Shadow.GetStreamScale().InOrigin = true;
+        ChildDic["ShadowParent"].SetActive(false);
+    }
+
     #region 换装
 
     public void CorrectPivot()
@@ -1082,7 +1111,7 @@ public class Player : Regist , IPointerClickHandler
             children.Back(0).parent = null;
         }
 
-        Vector3 offset = UAC.transform.FindChild("Pivot").position - transform.position;
+        Vector3 offset = Pivot.position - transform.position;
         children[0].position += offset;
         children[1].position += offset;
         transform.position += offset;

+ 23 - 13
Assets/Script/Object/PlazaRoomChest.cs

@@ -13,7 +13,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     public float Time = 5;
     public float Timer;
-    public bool PlayAnim = true;
+    public bool IsActive = true;
 
     public Animator Animator
     {
@@ -45,7 +45,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     public void Update()
     {
-        if (!PlayAnim)
+        if (!IsActive)
         {
             return;
         }
@@ -75,9 +75,13 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     private void Take()
     {
-        SetColliders(false);
-        StopAnim();
+        Deactive();
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetChestAward(ChestData.ID);
+
+        if (ChestData.ChestType != ChestType.System)
+        {
+            SetColliders(false);
+        }
     }
 
     private void Guess(string inputValue)
@@ -154,7 +158,6 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         {
             AnswerInfo = ManaGarden.FlowerInfoDic.Random();
             AnswerColor = Language.GetStr("FlowerColor", AnswerInfo.ID).ToLower();
-            Debug.Log(AnswerColor);
         }
     }
 
@@ -162,11 +165,11 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         BaseInit(chestData);
 
-        StopAnim();
+        Deactive();
 
         SystemChest = this;
 
-        SetColliders(false);
+        //SetColliders(false);
     }
 
     private void BaseInit(ChestData chestData)
@@ -203,7 +206,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         else
         {
             tweenRoot = ParentSR.CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad, false, true);
-            tweenRoot.OnBackwardFinish = () => { Debug.Log("1"); ManaReso.Save(gameObject); };
+            tweenRoot.OnBackwardFinish = () => { ManaReso.Save(gameObject); };
         }
 
         tweenRoot = transform.GetTweenScale();
@@ -227,14 +230,14 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         Animator.SetInteger("Count", Animator.GetInteger("Count") + 1);
     }
 
-    public void StopAnim()
+    public void Deactive()
     {
-        PlayAnim = false;
+        IsActive = false;
     }
 
-    public void ResumeAnim()
+    public void Active()
     {
-        PlayAnim = true;
+        IsActive = true;
     }
 
     public void SetColliders(bool enable)
@@ -253,7 +256,14 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
         if (ChestData.ChestType == ChestType.Lucky || ChestData.ChestType == ChestType.System)
         {
-            GetAward(null);
+            if (IsActive)
+            {
+                GetAward(null);
+            }
+            else
+            {
+                Bubble.Show(null, Language.GetStr("UI", "Y_Unactive"));
+            }
         }
         else
         {

+ 2 - 2
Assets/Script/Object/PlazaRoomItem.cs

@@ -52,8 +52,8 @@ public class RoomData
         Duration = arg.GetInt(DurationLabel);
         MaxPlayer = arg.GetInt(MaxPlayerLabel);
         Name = arg.GetUtfString(NameLabel);
-        StartTime = DateUtil.GetJavaTime(arg.GetLong(StartTimeLabel).ToString());
-        EndTime = DateUtil.GetJavaTime(arg.GetLong(EndTimeLabel).ToString());
+        StartTime = DateUtil.GetTimeFromSecends(arg.GetLong(StartTimeLabel).ToString());
+        EndTime = DateUtil.GetTimeFromSecends(arg.GetLong(EndTimeLabel).ToString());
 
         if (ID == 1)
             IsSystemRoom = true;

+ 1 - 1
Assets/Script/SFS/Data/PlazaRoomRep.cs

@@ -17,7 +17,7 @@
     ReceiveRoomFullStatus=(14),
     OtherEnterRoom=(15),
     OtherExitRoom=(16),
-    ReceiveRoomExpireStatus=(17),
+    ReceiveChestExpireStatus=(17),
     ReactivateDefaultChest=(18),
     DeactivateDefaultChest=(19),
 }

+ 1 - 1
Assets/Script/SFS/Data/PlazaRoomReq.cs

@@ -14,5 +14,5 @@
     GetRoomData=(9),
     GetCustomRoomData=(10),
     GetRoomFullStatus=(11),
-    GetRoomExpireStatus=(12),
+    GetChestExpireStatus=(12),
 }

+ 28 - 38
Assets/Script/SFS/Manager/ChestMge.cs

@@ -50,7 +50,7 @@ public class ChestData
         RemainRound = arg.GetInt(gd_chest.RemainRound);
         DatabaseRoomID = arg.GetInt(gd_chest.DatabaseRoomID);
         Owner = arg.GetLong(gd_chest.Owner);
-        ActivatedTime = DateUtil.GetJavaTime(arg.GetLong(gd_chest.ActivatedTime).ToString());
+        ActivatedTime = DateUtil.GetTimeFromSecends(arg.GetLong(gd_chest.ActivatedTime).ToString());
         ChestType = (ChestType) arg.GetInt(gd_chest.Type);
 
         Vector3 defaultPosition = DefaultPosition + ChestDepthOffset;
@@ -118,15 +118,16 @@ public class ChestMge : Regist
             long chestID = long.Parse(strings[0]);
             ChestRoomDictionary.Add(chestID, int.Parse(strings[1]));
         }
-        foreach (var VARIABLE in RefundRoomIDs)
-        {
-            Debug.LogWarning("refund " + VARIABLE);
-        }
-        foreach (var VARIABLE in ChestRoomDictionary)
-        {
-            Debug.LogWarning("received " + VARIABLE.Key);
-        }
+        //foreach (var VARIABLE in RefundRoomIDs)
+        //{
+        //    Debug.LogWarning("refund " + VARIABLE);
+        //}
+        //foreach (var VARIABLE in ChestRoomDictionary)
+        //{
+        //    Debug.LogWarning("received " + VARIABLE.Key);
+        //}
         CheckRefund();
+        GetChestExpireStatus();
     }
 
     public override void RegistReference()
@@ -286,10 +287,20 @@ public class ChestMge : Regist
         }
     }
 
-    //private static void CheckChestRoomStatus()
-    //{
-        
-    //}
+
+    private static void GetChestExpireStatus()
+    {
+        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetChestExpireStatus(ChestRoomDictionary.Keys.ToList());
+    }
+
+    public static void OnReceiveChestExpireStatus(List<long> chestIDs)
+    {
+        foreach (var chestID in chestIDs)
+        {
+            Debug.LogWarning(chestID);
+            ChestRoomDictionary.Remove(chestID);
+        }
+    }
 
 
     public static void RetrieveAllChest()
@@ -357,7 +368,7 @@ public class ChestMge : Regist
         }
 
         PlazaRoomChest.SystemChest.SetColliders(true);
-        PlazaRoomChest.SystemChest.ResumeAnim();
+        PlazaRoomChest.SystemChest.Active();
     }
 
     public static void ReactivateSystemChest()
@@ -374,7 +385,7 @@ public class ChestMge : Regist
 
         ChestRoomDictionary.Remove(PlazaRoomChest.SystemChest.ChestData.ID);
         PlazaRoomChest.SystemChest.SetColliders(true);
-        PlazaRoomChest.SystemChest.ResumeAnim();
+        PlazaRoomChest.SystemChest.Active();
     }
 
     public static void DeactivateSystemChest()
@@ -389,8 +400,8 @@ public class ChestMge : Regist
             return;
         }
 
-        PlazaRoomChest.SystemChest.SetColliders(false);
-        PlazaRoomChest.SystemChest.StopAnim();
+        //PlazaRoomChest.SystemChest.SetColliders(false);
+        PlazaRoomChest.SystemChest.Deactive();
     }
 
     public static void ReceiveChestAward(int award, long chestID)
@@ -441,27 +452,6 @@ public class ChestMge : Regist
         }
     }
 
-    public static void ReceiveRoomExpireStatus(List<int> databaseRoomIDs)
-    {
-        List<long> keys = new List<long>();
-        List<int> values = new List<int>();
-
-        foreach (var kv in ChestRoomDictionary)
-        {
-            if (!databaseRoomIDs.Contains(kv.Value))
-            {
-                keys.Add(kv.Key);
-                values.Add(kv.Value);
-            }
-        }
-
-        ChestRoomDictionary=new Dictionary<long, int>();
-        for (int i = 0; i < keys.Count; i++)
-        {
-            ChestRoomDictionary.Add(keys[i], values[i]);
-        }
-    }
-
     public static void Save()
     {
         XmlNode node = ManaData.PlayerNode.SelectSingleNode(RefundNodeName);

+ 4 - 0
Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -84,6 +84,8 @@ public class SFSPlazaRoomManager
             ManaReso.Save(MessageBox);
 
             Player.PlayAnim(Player.IdleAnimationName);
+            Player.DeactiveShadow();
+            Player.Shadow.SetLZ(0);
         }
 
         public bool IsMoving;
@@ -635,6 +637,8 @@ public class SFSPlazaRoomManager
         player.SetAllCollider(false);
         player.transform.position = position;
         player.Flip(direction);
+        player.ActiveShadow();
+        player.Shadow.SetLZ(3);
 
         tra.localScale = new Vector3(0.525f, 0.525f, 0.525f);
 

+ 2 - 2
Assets/Script/SFS/SFSEvent/EventDispatcher.cs

@@ -91,9 +91,9 @@ public class EventDispatcher
         {
             SFSEventManager.PlazaRoomEvent.OnOtherExitRoom(baseEvent);
         }
-        else if (cmd == PlazaRoomRep.ReceiveRoomExpireStatus.GetHashString())
+        else if (cmd == PlazaRoomRep.ReceiveChestExpireStatus.GetHashString())
         {
-            
+            SFSEventManager.PlazaRoomEvent.OnReceiveChestExpireStatus(baseEvent);
         }
         else if (cmd == PlazaRoomRep.ReactivateDefaultChest.GetHashString())
         {

+ 22 - 0
Assets/Script/SFS/SFSEvent/PlazaRoomEvent.cs

@@ -234,6 +234,28 @@ public class PlazaRoomEvent
     }
 
 
+    public void GetChestExpireStatus(List<long> chestIDs)
+    {
+        SFSManager.GardenSmartFox.ExecuteAfterCheckConection
+        (
+            () =>
+            {
+                SFSObject parameter = new SFSObject();
+                parameter.PutInt(Label.CommandID, PlazaRoomReq.GetChestExpireStatus.GetHashCode());
+                parameter.PutLongArray(Label.DataArray, chestIDs.ToArray());
+                SFSEventManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
+            }
+        );
+    }
+
+    public void OnReceiveChestExpireStatus(BaseEvent baseEvent)
+    {
+        ISFSObject obj = baseEvent.Params["params"] as ISFSObject;
+        long[] chestIDs = obj.GetLongArray(Label.DataArray);
+        ChestMge.OnReceiveChestExpireStatus(chestIDs.ToList());
+    }
+
+
     public void GetChestAward(long chestID)
     {
         SFSObject parameter = new SFSObject();

+ 1 - 1
Assets/Script/Tool/DashGame/DateUtil.cs

@@ -148,7 +148,7 @@ public class DateUtil
         return dtStart.Add(toNow);
     }
 
-    public static DateTime GetJavaTime(string timeStamp)
+    public static DateTime GetTimeFromSecends(string timeStamp)
     {
         DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
         long lTime = long.Parse(timeStamp + "0000");

+ 2 - 11
第三期.txt

@@ -1,11 +1,4 @@
-箱子和角色的影子
-
-系统房间不能领取时提示
-
-
-新界面的语言
-
-从存档中移除宝箱ID(普通房间 系统房间)
+Unix上的时间戳
 
 
 服务器新旧版存取档是否兼容(如果不兼容 可能无法从第二期切换到第三期)
@@ -25,6 +18,4 @@
 IOS设置Team
 
 
-Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 上衣按钮需要打入图集)
-
-图片尺寸优化(广场背景 Loding)
+Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 上衣按钮需要打入图集)