Browse Source

增加派对宝箱功能

liuqilin 7 years ago
parent
commit
5b34729877
32 changed files with 1498 additions and 534 deletions
  1. 103 103
      Assets/Resource/Logo.unity
  2. 3 0
      Assets/Resource/Prefab/Object/DebugMode.prefab
  3. 58 0
      Assets/Resource/Prefab/Object/PlazaRoom.prefab
  4. 36 21
      Assets/Resource/Prefab/Object/PlazaRoomChest.prefab
  5. 296 149
      Assets/Resource/Prefab/PrefabUI/GroupD.prefab
  6. BIN
      Assets/Resource/Sprite/Editor/Garden/数字宝箱.png
  7. 68 0
      Assets/Resource/Sprite/Editor/Garden/数字宝箱.png.meta
  8. BIN
      Assets/Resource/Sprite/Editor/Garden/花朵宝箱.png
  9. 68 0
      Assets/Resource/Sprite/Editor/Garden/花朵宝箱.png.meta
  10. BIN
      Assets/Resource/Sprite/Editor/Garden/钻石宝箱.png
  11. 68 0
      Assets/Resource/Sprite/Editor/Garden/钻石宝箱.png.meta
  12. 51 5
      Assets/Resource/XML/lan/ChineseSimplified.xml
  13. 51 5
      Assets/Resource/XML/lan/ChineseTraditional.xml
  14. 51 5
      Assets/Resource/XML/lan/English.xml
  15. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  16. 0 7
      Assets/Script/Manage/ManaReso.cs
  17. 50 1
      Assets/Script/Manage/ManaUI.cs
  18. 2 2
      Assets/Script/Manage/PlazaRoomMge.cs
  19. 2 2
      Assets/Script/Object/Chest.cs
  20. 0 19
      Assets/Script/Object/PlazaRoom.cs
  21. 176 102
      Assets/Script/Object/PlazaRoomChest.cs
  22. 1 1
      Assets/Script/Object/PlazaRoomItem.cs
  23. 6 0
      Assets/Script/SFS/CSharpExtension/DataParse.cs
  24. 2 1
      Assets/Script/SFS/Data/PlazaRoomRep.cs
  25. 2 1
      Assets/Script/SFS/Data/PlazaRoomReq.cs
  26. 1 0
      Assets/Script/SFS/Data/gd_chest.cs
  27. 286 33
      Assets/Script/SFS/Manager/ChestMge.cs
  28. 7 1
      Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs
  29. 9 5
      Assets/Script/SFS/SFSEvent/EventDispatcher.cs
  30. 96 66
      Assets/Script/SFS/SFSEvent/PlazaRoomEvent.cs
  31. 1 1
      Assets/Script/Tool/Auxiliary.cs
  32. 4 4
      第三期.txt

+ 103 - 103
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 &490047252
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1591290320}
-    m_Modifications:
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 718ebdaed223e93409d6dc7e53a23167, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -518,7 +418,107 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &1591290319
+--- !u!1001 &1669305093
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1684546291}
+    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: 0
+      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
+--- !u!1001 &1684546290
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -622,11 +622,11 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
   m_IsPrefabParent: 0
---- !u!224 &1591290320 stripped
+--- !u!224 &1684546291 stripped
 RectTransform:
   m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
     type: 2}
-  m_PrefabInternal: {fileID: 1591290319}
+  m_PrefabInternal: {fileID: 1684546290}
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0

+ 3 - 0
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -193,6 +193,9 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb70c889ccbe321409013e054676a60c, type: 3}
   - {fileID: 21300000, guid: ef311f45a2bae694283ff8b6fe9188a9, type: 3}
   - {fileID: 21300000, guid: 7d6f22b630025984482ed1d75fef0fc4, type: 3}
+  - {fileID: 21300000, guid: 50dda24b31869184fb33cbbe8ee3dc8c, type: 3}
+  - {fileID: 21300000, guid: 5c607265603d08f449c36504a6d0b8ee, type: 3}
+  - {fileID: 21300000, guid: d4a3abd76b7b53f43888bcf173763461, type: 3}
   EffectList:
   - {fileID: 2100000, guid: d112dba8bb2f53941b3807271af7bc52, type: 2}
   - {fileID: 1630066744600056, guid: 7393b86a2791bd24580de399f79a96cd, type: 2}

+ 58 - 0
Assets/Resource/Prefab/Object/PlazaRoom.prefab

@@ -42,6 +42,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1032328734171814
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4085176534001040}
+  m_Layer: 0
+  m_Name: ChestLowerLeftBorder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1060421702656110
 GameObject:
   m_ObjectHideFlags: 0
@@ -89,6 +104,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1223144705792492
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4653417872032544}
+  m_Layer: 0
+  m_Name: ChestUpperRightBorder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1297209821153116
 GameObject:
   m_ObjectHideFlags: 0
@@ -269,6 +299,19 @@ Transform:
   m_Father: {fileID: 4518027564363394}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4085176534001040
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1032328734171814}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -17, y: -3.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4518027564363394}
+  m_RootOrder: 13
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4281131997099946
 Transform:
   m_ObjectHideFlags: 1
@@ -344,6 +387,8 @@ Transform:
   - {fileID: 4053414627786464}
   - {fileID: 4035421916023222}
   - {fileID: 4281131997099946}
+  - {fileID: 4085176534001040}
+  - {fileID: 4653417872032544}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -360,6 +405,19 @@ Transform:
   m_Father: {fileID: 4518027564363394}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4653417872032544
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1223144705792492}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 16, y: -1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4518027564363394}
+  m_RootOrder: 14
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4693788232285786
 Transform:
   m_ObjectHideFlags: 1

+ 36 - 21
Assets/Resource/Prefab/Object/PlazaRoomChest.prefab

@@ -19,8 +19,8 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 4157323462000244}
-  - component: {fileID: 50115136796814174}
   - component: {fileID: 95864975103419620}
+  - component: {fileID: 212796212424661236}
   m_Layer: 0
   m_Name: PlazaRoomChest
   m_TagString: Untagged
@@ -72,26 +72,6 @@ Transform:
   m_Father: {fileID: 4157323462000244}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!50 &50115136796814174
-Rigidbody2D:
-  serializedVersion: 4
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1584217464481202}
-  m_BodyType: 0
-  m_Simulated: 1
-  m_UseFullKinematicContacts: 0
-  m_UseAutoMass: 0
-  m_Mass: 1
-  m_LinearDrag: 0
-  m_AngularDrag: 0.05
-  m_GravityScale: 2
-  m_Material: {fileID: 0}
-  m_Interpolate: 0
-  m_SleepingMode: 1
-  m_CollisionDetection: 0
-  m_Constraints: 0
 --- !u!65 &65569554269210656
 BoxCollider:
   m_ObjectHideFlags: 1
@@ -156,3 +136,38 @@ SpriteRenderer:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!212 &212796212424661236
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1584217464481202}
+  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: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0

+ 296 - 149
Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -231,7 +231,7 @@ GameObject:
   - component: {fileID: 222376504964849040}
   - component: {fileID: 114910966744704348}
   m_Layer: 5
-  m_Name: YbFill
+  m_Name: Yb_Fill
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -418,7 +418,7 @@ GameObject:
   - component: {fileID: 222418594834868358}
   - component: {fileID: 114443767862285280}
   m_Layer: 5
-  m_Name: YbTit
+  m_Name: Yb_SliderTit
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -538,7 +538,7 @@ GameObject:
   - component: {fileID: 222901668788579850}
   - component: {fileID: 114380948201911706}
   m_Layer: 5
-  m_Name: YbHandle
+  m_Name: Yb_Handle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -744,7 +744,7 @@ GameObject:
   - component: {fileID: 224585036446480604}
   - component: {fileID: 222113553393180000}
   - component: {fileID: 114399461550988992}
-  - component: {fileID: 114979504402816878}
+  - component: {fileID: 114016006398894436}
   m_Layer: 5
   m_Name: Yb_Toggle2
   m_TagString: Untagged
@@ -986,7 +986,8 @@ GameObject:
   - component: {fileID: 224069897525301544}
   - component: {fileID: 222069872043980368}
   - component: {fileID: 114154248490057528}
-  - component: {fileID: 114124111078215336}
+  - component: {fileID: 114504276199502282}
+  - component: {fileID: 114499107301952986}
   m_Layer: 5
   m_Name: Yb_Toggle0
   m_TagString: Untagged
@@ -1599,6 +1600,8 @@ GameObject:
   m_Component:
   - component: {fileID: 224609806960925830}
   - component: {fileID: 225173707899277900}
+  - component: {fileID: 222620747648875524}
+  - component: {fileID: 114816137277922130}
   m_Layer: 5
   m_Name: Y_Chest
   m_TagString: Untagged
@@ -1617,7 +1620,7 @@ GameObject:
   - component: {fileID: 222826127329763042}
   - component: {fileID: 114261430079431676}
   m_Layer: 5
-  m_Name: YbBackground
+  m_Name: Yb_Background
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1805,7 +1808,7 @@ GameObject:
   - component: {fileID: 224446852064389250}
   - component: {fileID: 222529674732295776}
   - component: {fileID: 114386574436673794}
-  - component: {fileID: 114908869773274708}
+  - component: {fileID: 114499779645373438}
   m_Layer: 5
   m_Name: Yb_Toggle1
   m_TagString: Untagged
@@ -1892,7 +1895,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224655910518143312}
   m_Layer: 5
-  m_Name: YbHandle Slide Area
+  m_Name: Yb_Handle Slide Area
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1991,7 +1994,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224311663908552924}
   m_Layer: 5
-  m_Name: YbFill Area
+  m_Name: Yb_Fill Area
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2149,7 +2152,7 @@ GameObject:
   - component: {fileID: 222562263818518718}
   - component: {fileID: 114706542212480596}
   m_Layer: 5
-  m_Name: YbValueLab
+  m_Name: Yb_SliderValueLab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2771,6 +2774,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1904726146941650
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224721616496099498}
+  - component: {fileID: 222637344819618084}
+  - component: {fileID: 114632244409598518}
+  - component: {fileID: 225212195950671906}
+  m_Layer: 5
+  m_Name: Y_Tip
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1925049034036340
 GameObject:
   m_ObjectHideFlags: 1
@@ -2965,7 +2986,7 @@ GameObject:
   - component: {fileID: 224156372806000652}
   - component: {fileID: 114963028739613496}
   m_Layer: 5
-  m_Name: YbSlider
+  m_Name: Yb_Slider
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3258,6 +3279,51 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
+--- !u!114 &114016006398894436
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1228136314264136}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114399461550988992}
+  toggleTransition: 1
+  graphic: {fileID: 114266777974186570}
+  m_Group: {fileID: 114499107301952986}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  m_IsOn: 0
 --- !u!114 &114026226869846860
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3878,47 +3944,6 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
---- !u!114 &114124111078215336
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1298872151652212}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 114154248490057528}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114137738276816684
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6663,6 +6688,63 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114499107301952986
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1298872151652212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1184210157, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_AllowSwitchOff: 0
+--- !u!114 &114499779645373438
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1579224481354442}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114386574436673794}
+  toggleTransition: 1
+  graphic: {fileID: 114050219386345860}
+  m_Group: {fileID: 114499107301952986}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  m_IsOn: 0
 --- !u!114 &114501179322932504
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6737,6 +6819,51 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 10000
+--- !u!114 &114504276199502282
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1298872151652212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114154248490057528}
+  toggleTransition: 1
+  graphic: {fileID: 114663196262930028}
+  m_Group: {fileID: 114499107301952986}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  m_IsOn: 1
 --- !u!114 &114506616527193688
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7553,6 +7680,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u603B\u4EF7\u503C"
+--- !u!114 &114632244409598518
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1904726146941650}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
 --- !u!114 &114634198302882530
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8311,6 +8471,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114816137277922130
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1514363695183950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114817370555675622
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8525,18 +8712,18 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 20
+    m_FontSize: 80
     m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 20
+    m_MaxSize: 80
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 
+  m_Text: 20
 --- !u!114 &114878518611647148
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8615,7 +8802,7 @@ MonoBehaviour:
   m_LineType: 0
   m_HideMobileInput: 0
   m_CharacterValidation: 0
-  m_CharacterLimit: 0
+  m_CharacterLimit: 2
   m_OnEndEdit:
     m_PersistentCalls:
       m_Calls: []
@@ -8832,13 +9019,13 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 114216306701651448}
   m_TextComponent: {fileID: 114877415166627036}
   m_Placeholder: {fileID: 0}
-  m_ContentType: 0
+  m_ContentType: 2
   m_InputType: 0
   m_AsteriskChar: 42
-  m_KeyboardType: 0
+  m_KeyboardType: 4
   m_LineType: 0
   m_HideMobileInput: 0
-  m_CharacterValidation: 0
+  m_CharacterValidation: 1
   m_CharacterLimit: 0
   m_OnEndEdit:
     m_PersistentCalls:
@@ -8853,7 +9040,7 @@ MonoBehaviour:
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: 
+  m_Text: 20
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
@@ -8898,47 +9085,6 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
---- !u!114 &114908869773274708
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1579224481354442}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 114386574436673794}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114910966744704348
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -9238,47 +9384,6 @@ MonoBehaviour:
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
---- !u!114 &114979504402816878
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1228136314264136}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 114399461550988992}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114980711964968330
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -10188,12 +10293,24 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1937702627911144}
+--- !u!222 &222620747648875524
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1514363695183950}
 --- !u!222 &222635822024508072
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1521245552646122}
+--- !u!222 &222637344819618084
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1904726146941650}
 --- !u!222 &222642707210994566
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -10467,7 +10584,7 @@ RectTransform:
   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: 10.000061, y: 75.3}
+  m_AnchoredPosition: {x: 10.000061, y: 85.3}
   m_SizeDelta: {x: 93, y: 40.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224009703040264054
@@ -10831,7 +10948,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 193.65, y: -149.8}
+  m_AnchoredPosition: {x: 193.65, y: -139.8}
   m_SizeDelta: {x: 96.7, y: 96.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224075358979756754
@@ -11357,7 +11474,7 @@ RectTransform:
   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: 10, y: -69.1}
+  m_AnchoredPosition: {x: 10, y: -59.1}
   m_SizeDelta: {x: 223.7, y: 31.9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224230249802425966
@@ -12492,6 +12609,7 @@ RectTransform:
   - {fileID: 224442828565389778}
   - {fileID: 224061435503450026}
   - {fileID: 224957414690813452}
+  - {fileID: 224721616496099498}
   m_Father: {fileID: 224609806960925830}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -12681,8 +12799,8 @@ RectTransform:
   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: 10, y: -100.3}
-  m_SizeDelta: {x: 223.7, y: 24.1}
+  m_AnchoredPosition: {x: 10, y: -90.87501}
+  m_SizeDelta: {x: 223.7, y: 25.25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224638629657757286
 RectTransform:
@@ -13063,6 +13181,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 1}
   m_SizeDelta: {x: 101.1, y: 32.5}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224721616496099498
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1904726146941650}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224560046158499726}
+  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}
+  m_AnchoredPosition: {x: 10.001025, y: -0.0000038147}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224726757036842226
 RectTransform:
   m_ObjectHideFlags: 1
@@ -13163,7 +13299,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 10.001007, y: -47.65001}
-  m_SizeDelta: {x: 249, y: 28.7}
+  m_SizeDelta: {x: 310.6, y: 28.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224754680288089100
 RectTransform:
@@ -13413,7 +13549,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: -25, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224857794483390376
 RectTransform:
@@ -13926,6 +14062,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225212195950671906
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1904726146941650}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225213539798143798
 CanvasGroup:
   m_ObjectHideFlags: 1

BIN
Assets/Resource/Sprite/Editor/Garden/数字宝箱.png


+ 68 - 0
Assets/Resource/Sprite/Editor/Garden/数字宝箱.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 50dda24b31869184fb33cbbe8ee3dc8c
+timeCreated: 1508664819
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/Garden/花朵宝箱.png


+ 68 - 0
Assets/Resource/Sprite/Editor/Garden/花朵宝箱.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 5c607265603d08f449c36504a6d0b8ee
+timeCreated: 1508664820
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/Garden/钻石宝箱.png


+ 68 - 0
Assets/Resource/Sprite/Editor/Garden/钻石宝箱.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: d4a3abd76b7b53f43888bcf173763461
+timeCreated: 1508664820
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 51 - 5
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -131,12 +131,21 @@
     <T_AllWhiteSpace desc=""><![CDATA[昵称不能为空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[检查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已经存在相同的昵称]]></T_RepeatName>
-    <Y_GuessSingleNumber desc=""><![CDATA[猜个位数]]></Y_GuessSingleNumber>
-    <Y_GuessFlowerName desc=""><![CDATA[猜花的名字]]></Y_GuessFlowerName>
-    <Y_Guess desc=""><![CDATA[猜]]></Y_Guess>
-    <Y_Bingo desc=""><![CDATA[猜对了]]></Y_Bingo>
+    <Y_GuessNumberDesc desc=""><![CDATA[猜中宝箱总价值的个位数即可领奖]]></Y_GuessNumberDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[猜中花的颜色即可领奖,答案不带色字]]></Y_GuessColorDesc>
     <Y_WrongGusee desc=""><![CDATA[猜错了]]></Y_WrongGusee>
     <Y_SoldOut desc=""><![CDATA[已经被抢光了]]></Y_SoldOut>
+    <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_Closing desc=""><![CDATA[即将结束]]></Z_Closing>
     <Z_Running desc=""><![CDATA[进行中]]></Z_Running>
     <Z_Full desc=""><![CDATA[已满]]></Z_Full>
@@ -158,7 +167,6 @@
     <AAa_Value desc=""><![CDATA[小时]]></AAa_Value>
     <AAb_Tit desc=""><![CDATA[人数]]></AAb_Tit>
     <AAb_Value desc=""><![CDATA[人]]></AAb_Value>
-    <BB_Refund desc=""><![CDATA[你的宝箱没有被领取完,已返还剩余<(钻石)>]]></BB_Refund>
     <Loading desc=""><![CDATA[加载中]]></Loading>
     <LoadFailed desc=""><![CDATA[加载失败]]></LoadFailed>
     <LoadSucceed desc=""><![CDATA[加载成功]]></LoadSucceed>
@@ -208,6 +216,44 @@
     <Flower35 desc=""><![CDATA[鸡冠花(红)]]></Flower35>
     <Flower36 desc=""><![CDATA[鸡冠花(黄)]]></Flower36>
   </FlowerName>
+  <FlowerColor>
+    <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>
+    <Flower13 desc=""><![CDATA[白]]></Flower13>
+    <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>
+    <Flower30 desc=""><![CDATA[白]]></Flower30>
+    <Flower31 desc=""><![CDATA[白]]></Flower31>
+    <Flower32 desc=""><![CDATA[白]]></Flower32>
+    <Flower33 desc=""><![CDATA[白]]></Flower33>
+    <Flower34 desc=""><![CDATA[白]]></Flower34>
+    <Flower35 desc=""><![CDATA[白]]></Flower35>
+    <Flower36 desc=""><![CDATA[白]]></Flower36>
+  </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金币大礼包]]></Pack1>
     <Pack2 desc=""><![CDATA[天赐大礼包]]></Pack2>

+ 51 - 5
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -131,12 +131,21 @@
     <T_AllWhiteSpace desc=""><![CDATA[昵稱不能為空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[檢查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已經存在相同的昵稱]]></T_RepeatName>
-    <Y_GuessSingleNumber desc=""><![CDATA[猜個位數]]></Y_GuessSingleNumber>
-    <Y_GuessFlowerName desc=""><![CDATA[猜花的名字]]></Y_GuessFlowerName>
-    <Y_Guess desc=""><![CDATA[猜]]></Y_Guess>
-    <Y_Bingo desc=""><![CDATA[猜對了]]></Y_Bingo>
+    <Y_GuessNumberDesc desc=""><![CDATA[]]></Y_GuessNumberDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[]]></Y_GuessColorDesc>
     <Y_WrongGusee desc=""><![CDATA[猜錯了]]></Y_WrongGusee>
     <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>
@@ -158,7 +167,6 @@
     <AAa_Value desc=""><![CDATA[]]></AAa_Value>
     <AAb_Tit desc=""><![CDATA[]]></AAb_Tit>
     <AAb_Value desc=""><![CDATA[]]></AAb_Value>
-    <BB_Refund desc=""><![CDATA[]]></BB_Refund>
     <Loading desc=""><![CDATA[]]></Loading>
     <LoadFailed desc=""><![CDATA[]]></LoadFailed>
     <LoadSucceed desc=""><![CDATA[]]></LoadSucceed>
@@ -208,6 +216,44 @@
     <Flower35 desc=""><![CDATA[雞冠花(紅)]]></Flower35>
     <Flower36 desc=""><![CDATA[雞冠花(黃)]]></Flower36>
   </FlowerName>
+  <FlowerColor>
+    <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>
+    <Flower13 desc=""><![CDATA[白]]></Flower13>
+    <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>
+    <Flower30 desc=""><![CDATA[白]]></Flower30>
+    <Flower31 desc=""><![CDATA[白]]></Flower31>
+    <Flower32 desc=""><![CDATA[白]]></Flower32>
+    <Flower33 desc=""><![CDATA[白]]></Flower33>
+    <Flower34 desc=""><![CDATA[白]]></Flower34>
+    <Flower35 desc=""><![CDATA[白]]></Flower35>
+    <Flower36 desc=""><![CDATA[白]]></Flower36>
+  </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金幣大禮包]]></Pack1>
     <Pack2 desc=""><![CDATA[天賜大禮包]]></Pack2>

+ 51 - 5
Assets/Resource/XML/lan/English.xml

@@ -131,12 +131,21 @@ 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_GuessSingleNumber desc=""><![CDATA[Single Digit Guess]]></Y_GuessSingleNumber>
-    <Y_GuessFlowerName desc=""><![CDATA[Flower Name Guess]]></Y_GuessFlowerName>
-    <Y_Guess desc=""><![CDATA[Guess]]></Y_Guess>
-    <Y_Bingo desc=""><![CDATA[Right]]></Y_Bingo>
+    <Y_GuessNumberDesc desc=""><![CDATA[]]></Y_GuessNumberDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[]]></Y_GuessColorDesc>
     <Y_WrongGusee desc=""><![CDATA[Wrong]]></Y_WrongGusee>
     <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>
@@ -158,7 +167,6 @@ Program 水怪
     <AAa_Value desc=""><![CDATA[]]></AAa_Value>
     <AAb_Tit desc=""><![CDATA[]]></AAb_Tit>
     <AAb_Value desc=""><![CDATA[]]></AAb_Value>
-    <BB_Refund desc=""><![CDATA[]]></BB_Refund>
     <Loading desc=""><![CDATA[]]></Loading>
     <LoadFailed desc=""><![CDATA[]]></LoadFailed>
     <LoadSucceed desc=""><![CDATA[]]></LoadSucceed>
@@ -208,6 +216,44 @@ Program 水怪
     <Flower35 desc=""><![CDATA[Cockscomb(Red)]]></Flower35>
     <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>
+    <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>
+    <Flower13 desc=""><![CDATA[White]]></Flower13>
+    <Flower14 desc=""><![CDATA[White]]></Flower14>
+    <Flower15 desc=""><![CDATA[White]]></Flower15>
+    <Flower16 desc=""><![CDATA[White]]></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>
+    <Flower30 desc=""><![CDATA[White]]></Flower30>
+    <Flower31 desc=""><![CDATA[White]]></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>
+  </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[Gift of Coins]]></Pack1>
     <Pack2 desc=""><![CDATA[Gift of Heaven]]></Pack2>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 0 - 7
Assets/Script/Manage/ManaReso.cs

@@ -631,13 +631,6 @@ public class ManaReso : Regist
         if (chest == null)
         {
             chest = tra.AddComponent<PlazaRoomChest>();
-            chest.Initialize(false, tra.position.y, false, false);
-
-            //tra.SetY(tra.position.y + tra.GetComponentInChildren<SpriteRenderer>().sprite.rect.height / 100);
-        }
-        else
-        {
-            chest.Initialize(false, tra.position.y, false, false);
         }
 
         return chest;

+ 50 - 1
Assets/Script/Manage/ManaUI.cs

@@ -2838,6 +2838,21 @@ public class ManaUI : Regist
         ManaReso.Get<Image>("X_CreateChest").sprite = ManaReso.LoadSprite("宝箱", Folder.Scene);
         ManaReso.Get<ImagePlus>("X_CurrentInfoImagePlus").sprite = ManaReso.LoadSprite("Expression", Folder.Scene);
 
+        #region X_CreateChest
+
+        ManaReso.SetButtonEvent
+        (
+            "X_CreateChest",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ChestMge.OpenCreatePanel();
+            }
+        );
+
+        #endregion
+
         #region X_Quit
 
         ManaReso.SetButtonEvent
@@ -3021,8 +3036,19 @@ public class ManaUI : Regist
 
         #region Y
 
+        ManaLan.Add(ManaReso.Get<Text>("Y_Tit"), new LanStr("UI", "Yb_Tit"));
+        ManaLan.Add(ManaReso.Get<Text>("Yb_Desc"), new LanStr("UI", "Yb_LuckyDesc"));
+        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"));
+
+        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);
 
+        ManaReso.Get<Slider>("Yb_Slider").onValueChanged.AddListener(ChestMge.OnSliderValueChange);
+        ManaReso.Get<InputField>("Yb_InputField").onValueChanged.AddListener(ChestMge.OnInputValueChange);
+
         #region Y_Close
 
         ManaReso.SetButtonEvent
@@ -3032,7 +3058,30 @@ public class ManaUI : Regist
             {
                 ManaAudio.PlayClip(Clip.CloseClip);
 
-                ManaReso.Get("Y_Chest").TweenBacCG();
+                ChestMge.CloseChestPanel();
+            }
+        );
+
+        #endregion
+
+        #region Yb_Toggle
+
+        ManaReso.Get<Toggle>("Yb_Toggle0").onValueChanged.AddListener(ChestMge.OnLuckyToggle);
+        ManaReso.Get<Toggle>("Yb_Toggle1").onValueChanged.AddListener(ChestMge.OnColorToggle);
+        ManaReso.Get<Toggle>("Yb_Toggle2").onValueChanged.AddListener(ChestMge.OnNumberToggle);
+
+        #endregion
+
+        #region Yb_CreateChest
+
+        ManaReso.SetButtonEvent
+        (
+            "Yb_Btn",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ChestMge.CreateChest();
             }
         );
 

+ 2 - 2
Assets/Script/Manage/PlazaRoomMge.cs

@@ -91,7 +91,7 @@ public class PlazaRoomMge : Regist
         {
             databaseRoomIDs.Add(plazaRoomItem.RoomData.ID);
         }
-        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomStatus(databaseRoomIDs);
+        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomFullStatus(databaseRoomIDs);
     }
 
     public static void DownloadRoomData()
@@ -196,7 +196,7 @@ public class PlazaRoomMge : Regist
         RefreshRoomStatus(CustomPlazaRoomItems);
     }
 
-    public static void OnReceiveRoomStatus(List<int> ids, List<bool> statuses)
+    public static void OnReceiveRoomFullStatus(List<int> ids, List<bool> statuses)
     {
         foreach (var plazaRoomItem in PlazaRoomItems)
         {

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

@@ -21,6 +21,8 @@ public class Chest : MonoBehaviour
         }
         set { Animator_ = value; }
     }
+    public Animator Animator_;
+
     public Rigidbody2D Rigidbody
     {
         get
@@ -86,7 +88,6 @@ public class Chest : MonoBehaviour
         set { SpriteRenderer_ = value; }
     }
 
-    public Animator Animator_;
     public Rigidbody2D Rigidbody_;
     public BoxCollider BoxCollider_;
     public BoxCollider2D BoxCollider2D_;
@@ -146,7 +147,6 @@ public class Chest : MonoBehaviour
             }
         }
 
-
         Rigidbody.velocity = new Vector2(speedX, SpeedY);
 
         Rigidbody.isKinematic = false;

+ 0 - 19
Assets/Script/Object/PlazaRoom.cs

@@ -61,8 +61,6 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         LoadScene();
 
         SetCloud();
-
-        LoadChest();
     }
 
     private static void LoadScene()
@@ -130,23 +128,6 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         #endregion
     }
 
-    private static void LoadChest()
-    {
-        if (PlazaRoomChest.CurrentChest != null)
-            return;
-
-        PlazaRoomChest chest = ManaReso.GetPlazaRoomChest(ManaReso.Get("PlazaRoomChestPos").position);
-        PlazaRoomChest.CurrentChest = chest;
-        float random = Random.Range(0f, 1f);
-        if (random <= 0.3333f)
-            chest.SetReward(ChestRewardType.Coin, "100");
-        else if (random <= 0.6666f)
-            chest.SetReward(ChestRewardType.Diamond, "100");
-        else
-            chest.SetReward(ChestRewardType.Flower, "1");
-    }
-
-
     public void Update()
     {
         StarThread();

+ 176 - 102
Assets/Script/Object/PlazaRoomChest.cs

@@ -5,164 +5,238 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using Random = UnityEngine.Random;
 
-public enum ChestRewardType
+public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 {
-    Coin,
-    Diamond,
-    Flower,
-}
+    #region Config
 
-public class PlazaRoomChest : Chest, IPointerClickHandler
-{
-    public static PlazaRoomChest CurrentChest;
-
-    private int RewardAmt;
-    private FlowerInfo FlowerInfo;
-    private ChestRewardType RewardType;
+    public float Time = 5;
+    public float Timer;
 
-    public void Guess(string inputValue)
+    public Animator Animator
     {
-        if (RewardType == ChestRewardType.Coin)
+        get
         {
-            if (RewardAmt%10 == int.Parse(inputValue))
+            if (Animator_ == null)
             {
-                ManaCenter.AddCoin(RewardAmt, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.RoomChestAward);
-                ManaAudio.PlayClip(Clip.CurrentClip);
-                ManaReso.SetText("Y_Desc", $"{Language.GetStr("UI", "Y_Bingo")} {Language.GetStr("Common", "Get")}<(金币)>{RewardAmt}");
-                GuessSucceed();
-                return;
+                Animator_ = GetComponent<Animator>();
             }
+
+            return Animator_;
         }
-        else if (RewardType == ChestRewardType.Diamond)
+        set { Animator_ = value; }
+    }
+    public Animator Animator_;
+
+    private string AnswerColor;
+    private FlowerInfo AnswerInfo;
+    private ChestData ChestData;
+    private SpriteRenderer ParentSR;
+    private SpriteRenderer ChestSR;
+
+    public static ChestData CurrentChestData;
+    public static PlazaRoomChest SystemChest;
+
+    #endregion
+
+    public void Update()
+    {
+        Timer += UnityEngine.Time.deltaTime;
+
+        if (Timer >= Time)
         {
-            if (RewardAmt%10 == int.Parse(inputValue))
-            {
-                ManaCenter.AddDiamond(RewardAmt, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestAward);
-                ManaAudio.PlayClip(Clip.CurrentClip);
-                ManaReso.SetText("Y_Desc", $"{Language.GetStr("UI", "Y_Bingo")} {Language.GetStr("Common", "Get")}<(钻石)>{RewardAmt}");
-                GuessSucceed();
-                return;
-            }
+            Timer = 0;
+
+            Animator.SetInteger("Count", 0);
         }
-        else if (RewardType == ChestRewardType.Flower)
+    }
+
+
+    public void GetAward(string inputValue)
+    {
+        if (ChestData.ChestType == ChestType.System || ChestData.ChestType == ChestType.Lucky)
         {
-            if (FlowerInfo.Name == inputValue)
-            {
-                FlowerInfo.Add();
-                ManaAudio.PlayClip(Clip.CurrentClip);
-                ManaReso.SetText("Y_Desc", $"{Language.GetStr("UI", "Y_Bingo")} {Language.GetStr("Common", "Get")}<(花朵)>{FlowerInfo.Name}");
-                ManaReso.Get<Image>("Y_RewardIcon2").color = Color.white;
-                GuessSucceed();
-                return;
-            }
+            Take();
         }
         else
         {
-            throw new Exception();
+            Guess(inputValue);
         }
+    }
 
-        GuessFailed();
+    private void Take()
+    {
+        
     }
 
-    public void GuessFailed()
+    private void Guess(string inputValue)
     {
-        ManaReso.SetText("Y_Desc", Language.GetStr("UI", "Y_WrongGusee"));
-        SetButtonToClose();
+        if (string.IsNullOrEmpty(inputValue))
+        {
+            GuessFailed();
+        }
+        else
+        {
+            if (ChestData.ChestType == ChestType.GuessColor)
+            {
+                if (inputValue == AnswerColor)
+                {
+                    GuessSucceed();
+                }
+                else
+                {
+                    GuessFailed();
+                }
+            }
+            else
+            {
+                int digit = ChestData.Value % 10;
+                int guessNumber = int.Parse(inputValue);
+                if (guessNumber == digit)
+                {
+                    GuessSucceed();
+                }
+                else
+                {
+                    GuessFailed();
+                }
+            }
+        }
+    }
+
+    private void GuessFailed()
+    {
+        Debug.LogWarning("答对了");
     }
 
-    public void GuessSucceed()
+    private void GuessSucceed()
     {
-        SetButtonToClose();
+        Debug.LogWarning("答错了");
     }
 
 
-    public void SetReward(ChestRewardType rewardType, string rewardValue)
+    public void RetriveChest()
     {
-        RewardType = rewardType;
+        ParentSR.TweenBacSr();
+    }
+
+    public void Init(ChestData chestData)
+    {
+        BaseInit(chestData);
 
-        if (RewardType == ChestRewardType.Coin || RewardType == ChestRewardType.Diamond)
+        if (chestData.Owner == long.Parse(ManaServer.SerialNumber))
         {
-            RewardAmt = int.Parse(rewardValue);
+            foreach (var collider in GetComponentsInChildren<Collider>())
+            {
+                collider.enabled = false;
+            }
         }
-        else if (RewardType == ChestRewardType.Flower)
+        else
         {
-            int flowerID = int.Parse(rewardValue);
-            FlowerInfo = ManaGarden.FlowerInfoDic[flowerID];
+            foreach (var collider in GetComponentsInChildren<Collider>())
+            {
+                collider.enabled = true;
+            }
         }
-        else
+
+        if (chestData.ChestType == ChestType.GuessColor)
         {
-            throw new Exception();
+            AnswerInfo = ManaGarden.FlowerInfoDic.Random();
+            AnswerColor = Language.GetStr("FlowerColor", AnswerInfo.ID);
         }
     }
 
-    public override void OnPointerClick(PointerEventData eventData)
+    public void SystemChestInit(ChestData chestData)
     {
-        base.OnPointerClick(eventData);
-        
-        SetButtonToGuess();
+        BaseInit(chestData);
 
-        ManaReso.Get("Y_Chest").TweenForCG();
+        SystemChest = this;
 
-        if (RewardType == ChestRewardType.Coin)
+        foreach (var collider in GetComponentsInChildren<Collider>())
         {
-            ManaReso.SetActive("Y_RewardIcon1", true);
-            ManaReso.SetActive("Y_RewardIcon2", false);
-            ManaReso.Get<Image>("Y_RewardIcon1").sprite = ManaReso.LoadSprite("金币", Folder.Scene);
-            ManaReso.SetText("Y_Desc", Language.GetStr("UI", "Y_GuessSingleNumber"));
+            collider.enabled = false;
         }
-        else if (RewardType == ChestRewardType.Diamond)
+    }
+
+    private void BaseInit(ChestData chestData)
+    {
+        ChestSR = transform.GetChild(0).GetComponent<SpriteRenderer>();
+        if (chestData.ChestType == ChestType.System)
+        {
+            ChestSR.sprite = ManaReso.LoadSprite("宝箱", Folder.Atlas2);
+        }
+        else if (chestData.ChestType == ChestType.Lucky)
+        {
+            ChestSR.sprite = ManaReso.LoadSprite("钻石宝箱", Folder.Atlas2);
+        }
+        else if (chestData.ChestType == ChestType.GuessColor)
         {
-            ManaReso.SetActive("Y_RewardIcon1", true);
-            ManaReso.SetActive("Y_RewardIcon2", false);
-            ManaReso.Get<Image>("Y_RewardIcon1").sprite = ManaReso.LoadSprite("钻石", Folder.Scene);
-            ManaReso.SetText("Y_Desc", Language.GetStr("UI", "Y_GuessSingleNumber"));
+            ChestSR.sprite = ManaReso.LoadSprite("花朵宝箱", Folder.Atlas2);
         }
-        else if (RewardType == ChestRewardType.Flower)
+        else if (chestData.ChestType == ChestType.GuessNumber)
         {
-            ManaReso.SetActive("Y_RewardIcon1", false);
-            ManaReso.SetActive("Y_RewardIcon2", true);
-            ManaReso.Get<Image>("Y_RewardIcon2").sprite = FlowerInfo.Icon;
-            ManaReso.Get<Image>("Y_RewardIcon2").Resize(true, 0.3125f, 0.3125f);
-            ManaReso.Get<Image>("Y_RewardIcon2").color = Color.black;
-            ManaReso.SetText("Y_Desc", Language.GetStr("UI", "Y_GuessFlowerName"));
+            ChestSR.sprite = ManaReso.LoadSprite("数字宝箱", Folder.Atlas2);
+        }
+
+        ParentSR = GetComponent<SpriteRenderer>();
+        TweenRoot tweenRoot = ParentSR.GetTweenSr();
+        if (tweenRoot != null)
+        {
+            tweenRoot.InDestination = true;
+            tweenRoot.OnBackwardFinish = () => { ManaReso.Save(gameObject); };
         }
         else
         {
-            throw new Exception();
+            ParentSR.CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad, false, true);
         }
-    }
 
+        tweenRoot = transform.GetTweenScale();
+        if (tweenRoot != null)
+        {
+            tweenRoot.InOrigin = true;
+            tweenRoot.StartForward();
+        }
+        else
+        {
+            tweenRoot = transform.CreateTweenScale(0, 0.8f, 0.25f, false, true, Curve.EaseOutQuad);
+            tweenRoot.StartForward();
+        }
 
-    private void SetButtonToClose()
-    {
-        ManaReso.SetText("Y_BtnLab", Language.GetStr("Common", "Confirm"));
+        ChestData = chestData;
+    }
 
-        ManaReso.SetButtonEvent
-        (
-            "Y_Btn",
-            () =>
-            {
-                ManaAudio.PlayClip(Clip.BtnClip);
 
-                ManaReso.Get("Y_Chest").TweenBacCG();
-            }
-        );
+    public void OnFinish()
+    {
+        Animator.SetInteger("Count", Animator.GetInteger("Count") + 1);
     }
 
-    private void SetButtonToGuess()
+    public void OnPointerClick(PointerEventData eventData)
     {
-        ManaReso.SetText("Y_BtnLab", Language.GetStr("UI", "Y_Guess"));
+        CurrentChestData = ChestData;
 
-        ManaReso.SetButtonEvent
-        (
-            "Y_Btn",
-            () =>
-            {
-                ManaAudio.PlayClip(Clip.BtnClip);
+        ManaAudio.PlayClip(Clip.BtnClip);
 
-                CurrentChest.Guess(ManaReso.Get<InputField>("Y_InputField").text);
-            }
-        );
+        ManaReso.Get("Y_Chest").TweenForCG();
+        ManaReso.SetActive("Ya_GetAward", false);
+        ManaReso.SetActive("Y_Guess", true);
+        ManaReso.SetActive("Yb_CreateChest", false);
+
+        if (ChestData.ChestType == ChestType.GuessColor)
+        {
+            ManaReso.SetActive("Y_RewardLab", false);
+            ManaReso.SetActive("Y_RewardIcon", true);
+            ManaReso.Get<Image>("Y_RewardIcon").sprite = AnswerInfo.Icon;
+            ManaReso.Get<Image>("Y_RewardIcon").Resize(true, 0.3125f, 0.3125f);
+            ManaReso.Get<Image>("Y_RewardIcon").color = Color.white;
+            ManaReso.SetText("Y_Tit", Language.GetStr("UI", "Yb_GuessColor"));
+        }
+        else
+        {
+            ManaReso.SetActive("Y_RewardLab", true);
+            ManaReso.SetActive("Y_RewardIcon", false);
+            ManaReso.SetText("Y_Tit", Language.GetStr("UI", "Yb_GuessNumber"));
+        }
     }
 }

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

@@ -167,7 +167,7 @@ public class PlazaRoomItem : MonoBehaviour
             () =>
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
-                SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom();
+                SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom(roomData);
                 SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.JoinPlazaRoom(roomData.ID);
             }
         );

+ 6 - 0
Assets/Script/SFS/CSharpExtension/DataParse.cs

@@ -16,6 +16,12 @@ public static class DataParse
         return $"{vector.x} {vector.y} {vector.z}";
     }
 
+    public static string VectorToString(this Vector3 vector, int accuray)
+    {
+        string accurayStr = $"F{accuray}";
+        return $"{vector.x.ToString(accurayStr)} {vector.y.ToString(accurayStr)} {vector.z.ToString(accurayStr)}";
+    }
+
     public static Vector3 StringToVector(this string str)
     {
         string[] strings = str.Split(' ');

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

@@ -14,7 +14,8 @@
     ReceiveAllChestData=(11),
     ReceiveRoomData=(12),
     ReceiveCustomRoomData=(13),
-    ReceiveRoomStatus=(14),
+    ReceiveRoomFullStatus=(14),
     OtherEnterRoom=(15),
     OtherExitRoom=(16),
+    ReceiveRoomExpireStatus=(17),
 }

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

@@ -13,5 +13,6 @@
     GetAllChestData=(8),
     GetRoomData=(9),
     GetCustomRoomData=(10),
-    GetRoomStatus=(11),
+    GetRoomFullStatus=(11),
+    GetRoomExpireStatus=(12),
 }

+ 1 - 0
Assets/Script/SFS/Data/gd_chest.cs

@@ -15,4 +15,5 @@ public class gd_chest
     public static string RemainRound = "rr";
     public static string RemainValue = "rv";
     public static string Type = "t";
+    public static string Position = "p";
 }

+ 286 - 33
Assets/Script/SFS/Manager/ChestMge.cs

@@ -2,9 +2,12 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Xml;
 using Sfs2X.Entities.Data;
 using UnityEngine;
+using UnityEngine.UI;
+using Random = UnityEngine.Random;
 
 public class ChestData
 {
@@ -19,11 +22,27 @@ public class ChestData
     public long Owner;
     public DateTime ActivatedTime;
     public ChestType ChestType;
+    public Vector3 Position;
+
+    public static int SystemRoomDatabaseID = 1;
+
+    private static bool Initialized;
+    //private static float XMin;
+    //private static float XMax;
+    //private static float YMin;
+    //private static float YMax;
+    private static Vector3 DefaultPosition;
+    private static Vector3 ChestDepthOffset = new Vector3(0, 0, 0.98f);
 
     #endregion
 
     public ChestData(ISFSObject arg)
     {
+        if (!Initialized)
+        {
+            Initialize();
+        }
+
         ID = arg.GetLong(gd_chest.ID);
         Value = arg.GetInt(gd_chest.Value);
         Round = arg.GetInt(gd_chest.Round);
@@ -33,6 +52,33 @@ public class ChestData
         Owner = arg.GetLong(gd_chest.Owner);
         ActivatedTime = DateUtil.GetJavaTime(arg.GetLong(gd_chest.ActivatedTime).ToString());
         ChestType = (ChestType) arg.GetInt(gd_chest.Type);
+
+        if (arg.ContainsKey(gd_chest.Position))
+        {
+            string vectorStr = arg.GetUtfString(gd_chest.Position);
+            if (vectorStr == "null")
+            {
+                Position = DefaultPosition;
+            }
+            else
+            {
+                Position = arg.GetUtfString(gd_chest.Position).StringToVector() + ChestDepthOffset;
+            }
+        }
+        else
+        {
+            Position = DefaultPosition;
+        }
+    }
+
+    private static void Initialize()
+    {
+        Initialized = true;
+        DefaultPosition = ManaReso.Get("PlazaRoomChestPos").position;
+        //XMin = ManaReso.Get("ChestLowerLeft").position.x;
+        //YMin = ManaReso.Get("ChestLowerLeft").position.y;
+        //XMax = ManaReso.Get("ChestUpperRight").position.x;
+        //YMax = ManaReso.Get("ChestUpperRight").position.y;
     }
 }
 
@@ -40,11 +86,20 @@ public class ChestMge : Regist
 {
     #region Config
 
+    private static Text Desc;
+    private static Text BtnLab;
+    private static Text SliderValueLab;
+    private static Slider Slider;
+    private static Button Btn;
+    private static InputField InputField;
+
     private static string RefundNodeName = "Refund";
     private static string ReceivedNodeName = "Received";
 
+    public static List<PlazaRoomChest> PlazaRoomChests = new List<PlazaRoomChest>();
+
     private static List<int> RefundRoomIDs = new List<int>();
-    private static List<long> ReceivedChestIDs = new List<long>();
+    private static Dictionary<long, int> ChestRoomDictionary = new Dictionary<long, int>();
 
     #endregion
 
@@ -58,33 +113,159 @@ public class ChestMge : Regist
         }
         for (int i = 0; i < ReceivedNodes.Count; i++)
         {
-            ReceivedChestIDs.Add(long.Parse(ReceivedNodes[i].InnerText));
+            string[] strings = ReceivedNodes[i].InnerText.Split('|');
+            long chestID = long.Parse(strings[0]);
+            ChestRoomDictionary.Add(chestID, int.Parse(strings[1]));
         }
         CheckRefund();
-        //RefundRoomIDs.Add(1);
-        //RefundRoomIDs.Add(98);
-        //RefundRoomIDs.Add(99);
-        //foreach (var VARIABLE in RefundRoomIDs)
-        //{
-        //    Debug.Log(VARIABLE);
-        //}
-
-        //foreach (var VARIABLE in ReceivedChestIDs)
-        //{
-        //    Debug.Log(VARIABLE);
-        //}
-        //RefundRoomIDs.Add(1);
-        //RefundRoomIDs.Add(2);
-        //ReceivedChestIDs.Add(100);
-        //ReceivedChestIDs.Add(200);
-        //RefundRoomIDs.Remove(1);
-        //RefundRoomIDs.Remove(2);
-        //ReceivedChestIDs.Remove(100);
-        //ReceivedChestIDs.Remove(200);
-    }
-
-
-    private void CheckRefund()
+    }
+
+    public override void RegistReference()
+    {
+        Btn = ManaReso.Get<Button>("Yb_Btn");
+        Desc = ManaReso.Get<Text>("Yb_Desc");
+        Slider = ManaReso.Get<Slider>("Yb_Slider");
+        BtnLab = ManaReso.Get<Text>("Yb_BtnLab");
+        InputField = ManaReso.Get<InputField>("Yb_InputField");
+        SliderValueLab = ManaReso.Get<Text>("Yb_SliderValueLab");
+    }
+
+
+    public static void OpenCreatePanel()
+    {
+        ManaReso.Get("Y_Chest").TweenForCG();
+        ManaReso.SetActive("Ya_GetAward", false);
+        ManaReso.SetActive("Y_Guess", false);
+        ManaReso.SetActive("Yb_CreateChest", true);
+        OnSliderValueChange(Slider.value);
+        OnInputValueChange(InputField.text);
+        Slider.value = 1;
+        Slider.maxValue = SFSManager.GardenSmartFox.PlazaRoomManager.CurrentRoomData.MaxPlayer;
+    }
+
+    public static void CloseChestPanel()
+    {
+        ManaReso.Get("Y_Chest").TweenBacCG();
+    }
+
+    public static void OnLuckyToggle(bool enable)
+    {
+        if (enable)
+        {
+            ChestType = ChestType.Lucky;
+            ManaLan.Add(Desc, new LanStr("UI", "Yb_LuckyDesc"));
+        }
+    }
+
+    public static void OnColorToggle(bool enable)
+    {
+        if (enable)
+        {
+            ChestType = ChestType.GuessColor;
+            ManaLan.Add(Desc, new LanStr("UI", "Yb_GuessColorDesc"));
+        }
+    }
+
+    public static void OnNumberToggle(bool enable)
+    {
+        if (enable)
+        {
+            ChestType = ChestType.GuessNumber;
+            ManaLan.Add(Desc, new LanStr("UI", "Yb_GuessNumberDesc"));
+        }
+    }
+
+    public static void OnInputValueChange(string value)
+    {
+        if (string.IsNullOrEmpty(value) || int.Parse(value) < 20)
+        {
+            Btn.interactable = false;
+            Btn.image.material = Lib.GrayMat;
+            ManaLan.Add(BtnLab, new LanStr("UI", "Yb_Minimum"));
+            return;
+        }
+
+        Cost = int.Parse(value);
+        ManaReso.SetText("Yb_CostLab", Language.GetStr("UI", "AA_Cost") + "<(钻石)>" + Cost);
+        if (ManaCenter.Diamond < Cost)
+        {
+            Btn.interactable = false;
+            Btn.image.material = Lib.GrayMat;
+            ManaLan.Add(BtnLab, new LanStr("Common", "ShortDiamond"));
+        }
+        else
+        {
+            Btn.interactable = true;
+            Btn.image.material = null;
+            ManaLan.Add(BtnLab, new LanStr("Common", "Confirm"));
+        }
+    }
+
+    public static void OnSliderValueChange(float value)
+    {
+        Round = (int) value;
+        SliderValueLab.text = Round + Language.GetStr("UI", "Yb_SliderValueLab");
+    }
+
+
+    private static int Cost;
+    private static int Round;
+    private static float ChestXMinOffset = 1;
+    private static float ChestXMaxOffset = 2;
+    private static ChestType ChestType = ChestType.Lucky;
+    public static void CreateChest()
+    {
+        ManaLan.Add(ManaReso.Get<Text>("Y_Tip"), new LanStr("UI", "AA_SendRequest"));
+        ManaReso.Get("Y_Tip").TweenForCG();
+
+        int databaseRoomID = SFSManager.GardenSmartFox.PlazaRoomManager.CurrentRoomData.ID;
+        long serialNumber = long.Parse(ManaServer.SerialNumber);
+        Vector3 position = SFSManager.GardenSmartFox.PlazaRoomManager.SelfInstance.Player.transform.position + Mathf.Sign(Random.Range(-1f, 1f))*new Vector3(Random.Range(ChestXMinOffset, ChestXMaxOffset), 0, 0);
+        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CreateChest(Round, Cost, ChestType, databaseRoomID, serialNumber, position);
+
+        ManaReso.Get<CanvasGroup>("Y_Chest").interactable = false;
+    }
+
+    public static void OnCreateChestError()
+    {
+        ManaLan.Add(ManaReso.Get<Text>("Y_Tip"), new LanStr("UI", "AA_CreateError"));
+        ManaReso.Get("Y_Tip").TweenBacCG();
+
+        ManaReso.Get<CanvasGroup>("Y_Chest").interactable = true;
+    }
+
+    public static void OnCreateChestSucceed()
+    {
+        ManaLan.Add(ManaReso.Get<Text>("Y_Tip"), new LanStr("UI", "AA_CreateSucceed"));
+        ManaReso.Get("Y_Tip").TweenBacCG();
+
+        ManaReso.Get<CanvasGroup>("Y_Chest").interactable = true;
+
+        ManaCenter.AddDiamond(-Cost, StaticsManager.ItemID.创建宝箱, StaticsManager.ConsumeModule.Charge);
+        CloseChestPanel();
+    }
+
+    public static void OnReceiveNewChest(ChestData chestData)
+    {
+        if (!SFSManager.GardenSmartFox.PlazaRoomManager.JoinedPlazaRoom)
+        {
+            return;
+        }
+
+        ManaAudio.PlayClip(Clip.BubbleClip);
+
+        InstantiateChest(chestData);
+
+        if (chestData.Owner == long.Parse(ManaServer.SerialNumber))
+        {
+            if (SFSManager.GardenSmartFox.PlazaRoomManager.CurrentRoomData.ID != ChestData.SystemRoomDatabaseID)
+            {
+                RefundRoomIDs.UniqueAdd(SFSManager.GardenSmartFox.PlazaRoomManager.CurrentRoomData.ID);
+            }
+        }
+    }
+
+    private static void CheckRefund()
     {
         if (RefundRoomIDs.Count == 0)
         {
@@ -96,15 +277,61 @@ public class ChestMge : Regist
         }
     }
 
+    //private static void CheckChestRoomStatus()
+    //{
+        
+    //}
+
+
+    public static void RetrieveAllChest()
+    {
+        foreach (var plazaRoomChest in PlazaRoomChests)
+        {
+            plazaRoomChest.RetriveChest();
+        }
+        PlazaRoomChests = new List<PlazaRoomChest>();
+    }
+
+    private static void InstantiateChest(ChestData chestData)
+    {
+        if (ChestRoomDictionary.Keys.Contains(chestData.ID))
+        {
+            return;
+        }
+
+        if (chestData.ChestType != ChestType.System)
+        {
+            if (chestData.RemainRound <= 0 || chestData.RemainValue <= 0)
+            {
+                return;
+            }
+
+            PlazaRoomChest chest = ManaReso.GetPlazaRoomChest(chestData.Position);
+            chest.Init(chestData);
+            PlazaRoomChests.Add(chest);
+        }
+        else
+        {
+            PlazaRoomChest chest = ManaReso.GetPlazaRoomChest(chestData.Position);
+            chest.SystemChestInit(chestData);
+            PlazaRoomChests.Add(chest);
+        }
+    }
+
 
     public static void ReceiveAllChestData(List<ChestData> chestDatas)
     {
-        
+        ManaAudio.PlayClip(Clip.BubbleClip);
+
+        foreach (var chestData in chestDatas)
+        {
+            InstantiateChest(chestData);
+        }
     }
 
     public static bool HasReceived(long chestID)
     {
-        if (ReceivedChestIDs.Contains(chestID))
+        if (ChestRoomDictionary.Keys.Contains(chestID))
         {
             return true;
         }
@@ -116,12 +343,17 @@ public class ChestMge : Regist
 
     public static void ActivateSystemChest(long chestID)
     {
-        ReceivedChestIDs.Remove(chestID);
+        if (!SFSManager.GardenSmartFox.PlazaRoomManager.JoinedPlazaRoom)
+        {
+            return;
+        }
+
+        //ReceivedChestIDs.Remove(chestID);
     }
 
     public static void ReceiveChestAward(int award)
     {
-        //ReceivedChestIDs.Add(chestID);
+        ChestRoomDictionary.Add(PlazaRoomChest.CurrentChestData.ID, PlazaRoomChest.CurrentChestData.DatabaseRoomID);
 
         if (award == 0)
         {
@@ -143,7 +375,28 @@ public class ChestMge : Regist
         if (refund > 0)
         {
             ManaCenter.AddDiamond(refund, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestRefund);
-            ManaInfoBox.Show(InfoCategory.Garden, Language.GetStr("UI", "BB_Refund")+refund, 30);
+            ManaInfoBox.Show(InfoCategory.Garden, Language.GetStr("UI", "Y_Refund")+refund, 30);
+        }
+    }
+
+    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]);
         }
     }
 
@@ -169,10 +422,10 @@ public class ChestMge : Regist
             node.InnerText = id.ToString();
             ManaData.PlayerNode.AppendChild(node);
         }
-        foreach (var id in ReceivedChestIDs)
+        foreach (var kv in ChestRoomDictionary)
         {
             node = ManaData.PlayerDoc.CreateNode(XmlNodeType.Element, ReceivedNodeName, null);
-            node.InnerText = id.ToString();
+            node.InnerText = $"{kv.Value}|{kv.Key}";
             ManaData.PlayerNode.AppendChild(node);
         }
     }

+ 7 - 1
Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -149,6 +149,7 @@ public class SFSPlazaRoomManager
 
     public PlazaRoomPlayer SelfInstance;
     public Room CurrentPlazaRoom;
+    public RoomData CurrentRoomData;
 
     public bool JoinedPlazaRoom
     {
@@ -164,8 +165,10 @@ public class SFSPlazaRoomManager
 
     #endregion
 
-    public void BeginEnterPlazaRoom()
+    public void BeginEnterPlazaRoom(RoomData roomData)
     {
+        CurrentRoomData = roomData;
+
         IsBlackMaskFinish = false;
         JoinRoomResult = JoinRoomResult.Unknown;
 
@@ -243,6 +246,7 @@ public class SFSPlazaRoomManager
     public void EnterPlazaRoom()
     {
         PlazaRoom.Initialize();
+        GardenSmartFox.EventManager.PlazaRoomEvent.GetAllChestData(CurrentRoomData.ID);
         foreach (var kv in UserInstanceDictionary)
         {
             if (kv.Value.Player.transform.parent == null)
@@ -294,6 +298,8 @@ public class SFSPlazaRoomManager
             EventType.BackwardFinish,
             () =>
             {
+                ChestMge.RetrieveAllChest();
+
                 PlazaRoomSky.position = SkyOriginPosition;
                 PlazaRoomCamera.transform.position = CameraOriginPosition;
 

+ 9 - 5
Assets/Script/SFS/SFSEvent/EventDispatcher.cs

@@ -49,15 +49,15 @@ public class EventDispatcher
         }
         else if (cmd == PlazaRoomRep.CreateChestError.GetHashString())
         {
-
+            SFSEventManager.PlazaRoomEvent.OnCreateChestError(baseEvent);
         }
         else if (cmd == PlazaRoomRep.CreateChestSucceed.GetHashString())
         {
-
+            SFSEventManager.PlazaRoomEvent.OnCreateChestSucceed(baseEvent);
         }
         else if (cmd == PlazaRoomRep.ReceiveNewChest.GetHashString())
         {
-
+            SFSEventManager.PlazaRoomEvent.OnReceiveNewChest(baseEvent);
         }
         else if (cmd == PlazaRoomRep.ReceiveChestRefund.GetHashString())
         {
@@ -79,9 +79,9 @@ public class EventDispatcher
         {
             SFSEventManager.PlazaRoomEvent.OnReceiveCustomRoomData(baseEvent);
         }
-        else if (cmd == PlazaRoomRep.ReceiveRoomStatus.GetHashString())
+        else if (cmd == PlazaRoomRep.ReceiveRoomFullStatus.GetHashString())
         {
-            SFSEventManager.PlazaRoomEvent.OnReceiveRoomStatus(baseEvent);
+            SFSEventManager.PlazaRoomEvent.OnReceiveRoomFullStatus(baseEvent);
         }
         else if (cmd == PlazaRoomRep.OtherEnterRoom.GetHashString())
         {
@@ -91,6 +91,10 @@ public class EventDispatcher
         {
             SFSEventManager.PlazaRoomEvent.OnOtherExitRoom(baseEvent);
         }
+        else if (cmd == PlazaRoomRep.ReceiveRoomExpireStatus.GetHashString())
+        {
+            
+        }
         else
         {
             throw new Exception();

+ 96 - 66
Assets/Script/SFS/SFSEvent/PlazaRoomEvent.cs

@@ -45,11 +45,11 @@ public class PlazaRoomEvent
         SFSEventManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
     }
 
-    public void GetRoomStatus(List<int> databaseRoomIDs)
+    public void GetRoomFullStatus(List<int> databaseRoomIDs)
     {
         SFSObject parameter = new SFSObject();
         parameter.PutIntArray(Label.DataArray, databaseRoomIDs.ToArray());
-        parameter.PutInt(Label.CommandID, PlazaRoomReq.GetRoomStatus.GetHashCode());
+        parameter.PutInt(Label.CommandID, PlazaRoomReq.GetRoomFullStatus.GetHashCode());
         SFSEventManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
     }
 
@@ -141,6 +141,98 @@ public class PlazaRoomEvent
         SFSEventManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
     }
 
+    public void OnReceiveInfo(BaseEvent baseEvent)
+    {
+        int infoID = (baseEvent.Params["params"] as ISFSObject).GetInt(Label.InfoID);
+
+        if (infoID == InfoID.Instantiate.GetHashCode())
+        {
+            OnInstantiate(baseEvent);
+        }
+        else if (infoID == InfoID.Synchronize.GetHashCode())
+        {
+            OnSynchronize(baseEvent);
+        }
+        else if (infoID == InfoID.ReceiveExpression.GetHashCode())
+        {
+            OnReceiveExpression(baseEvent);
+        }
+        else if (infoID == InfoID.ReceivePublicMessage.GetHashCode())
+        {
+            OnReceivePublicMessage(baseEvent);
+        }
+    }
+
+    public void OnInstantiate(BaseEvent baseEvent)
+    {
+        ISFSObject parameter = (ISFSObject)baseEvent.Params["params"];
+
+        int senderID = parameter.GetInt(InfoLabel.SenderID.GetHashString());
+
+        SFSEventManager.GardenSmartFox.PlazaRoomManager.OnInstantiate(senderID, parameter.GetSFSObject(Label.Data));
+    }
+
+    public void OnSynchronize(BaseEvent baseEvent)
+    {
+        ISFSObject parameter = (ISFSObject)baseEvent.Params["params"];
+
+        int senderID = parameter.GetInt(InfoLabel.SenderID.GetHashString());
+
+        SFSEventManager.GardenSmartFox.PlazaRoomManager.Synchronize(senderID, parameter.GetSFSObject(Label.Data));
+    }
+
+    public void OnReceiveExpression(BaseEvent baseEvent)
+    {
+        ISFSObject parameter = (ISFSObject)baseEvent.Params["params"];
+        int senderID = parameter.GetInt(InfoLabel.SenderID.GetHashString());
+
+        parameter = parameter.GetSFSObject(Label.Data);
+        int expressionID = parameter.GetInt(InfoLabel.Expression.GetHashString());
+
+        SFSEventManager.GardenSmartFox.PlazaRoomManager.ReceiveExpression(expressionID, senderID);
+    }
+
+    public void OnReceivePublicMessage(BaseEvent baseEvent)
+    {
+        ISFSObject parameter = (ISFSObject)baseEvent.Params["params"];
+        int senderID = parameter.GetInt(InfoLabel.SenderID.GetHashString());
+        parameter = parameter.GetSFSObject(Label.Data);
+        string message = parameter.GetUtfString(InfoLabel.Message.GetHashString());
+
+        SFSEventManager.GardenSmartFox.PlazaRoomManager.ReceivePublicMessage(message, senderID);
+    }
+
+
+    public void CreateChest(int round, int value, ChestType type, int databaseRoomID, long serialNumber, Vector3 position)
+    {
+        SFSObject parameter = new SFSObject();
+        parameter.PutInt(Label.CommandID, PlazaRoomReq.CreateChest.GetHashCode());
+        parameter.PutInt(gd_chest.Round, round);
+        parameter.PutInt(gd_chest.Value, value);
+        parameter.PutInt(gd_chest.Type, type.GetHashCode());
+        parameter.PutInt(Label.DatabaseRoomID, databaseRoomID);
+        parameter.PutLong(Label.UserID, serialNumber);
+        parameter.PutUtfString(gd_chest.Position, position.VectorToString(2));
+        SFSEventManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
+    }
+
+    public void OnCreateChestError(BaseEvent baseEvent)
+    {
+        ChestMge.OnCreateChestError();
+    }
+
+    public void OnCreateChestSucceed(BaseEvent baseEvent)
+    {
+        ChestMge.OnCreateChestSucceed();
+    }
+
+    public void OnReceiveNewChest(BaseEvent baseEvent)
+    {
+        ISFSObject parameter = (ISFSObject)baseEvent.Params["params"];
+        ChestData chestData = new ChestData(parameter.GetSFSObject(Label.Data));
+        ChestMge.OnReceiveNewChest(chestData);
+    }
+
 
     public void GetChestAward(long chestID)
     {
@@ -224,13 +316,13 @@ public class PlazaRoomEvent
         PlazaRoomMge.OnReceiveCustomRoomData(array);
     }
 
-    public void OnReceiveRoomStatus(BaseEvent baseEvent)
+    public void OnReceiveRoomFullStatus(BaseEvent baseEvent)
     {
         ISFSObject obj = baseEvent.Params["params"] as ISFSObject;
         int[] idArray = obj.GetIntArray(Label.Data);
         bool[] statusArray = obj.GetBoolArray(Label.DataArray);
 
-        PlazaRoomMge.OnReceiveRoomStatus(idArray.ToList(), statusArray.ToList());
+        PlazaRoomMge.OnReceiveRoomFullStatus(idArray.ToList(), statusArray.ToList());
     }
 
     public void OnCreateRoomError(BaseEvent baseEvent)
@@ -244,68 +336,6 @@ public class PlazaRoomEvent
     }
 
 
-    public void OnReceiveInfo(BaseEvent baseEvent)
-    {
-        int infoID = (baseEvent.Params["params"] as ISFSObject).GetInt(Label.InfoID);
-
-        if (infoID == InfoID.Instantiate.GetHashCode())
-        {
-            OnInstantiate(baseEvent);
-        }
-        else if (infoID == InfoID.Synchronize.GetHashCode())
-        {
-            OnSynchronize(baseEvent);
-        }
-        else if (infoID == InfoID.ReceiveExpression.GetHashCode())
-        {
-            OnReceiveExpression(baseEvent);
-        }
-        else if (infoID == InfoID.ReceivePublicMessage.GetHashCode())
-        {
-            OnReceivePublicMessage(baseEvent);
-        }
-    }
-
-    public void OnInstantiate(BaseEvent baseEvent)
-    {
-        ISFSObject parameter = (ISFSObject)baseEvent.Params["params"];
-
-        int senderID = parameter.GetInt(InfoLabel.SenderID.GetHashString());
-
-        SFSEventManager.GardenSmartFox.PlazaRoomManager.OnInstantiate(senderID, parameter.GetSFSObject(Label.Data));
-    }
-
-    public void OnSynchronize(BaseEvent baseEvent)
-    {
-        ISFSObject parameter = (ISFSObject)baseEvent.Params["params"];
-        
-        int senderID = parameter.GetInt(InfoLabel.SenderID.GetHashString());
-
-        SFSEventManager.GardenSmartFox.PlazaRoomManager.Synchronize(senderID, parameter.GetSFSObject(Label.Data));
-    }
-
-    public void OnReceiveExpression(BaseEvent baseEvent)
-    {
-        ISFSObject parameter = (ISFSObject)baseEvent.Params["params"];
-        int senderID = parameter.GetInt(InfoLabel.SenderID.GetHashString());
-
-        parameter = parameter.GetSFSObject(Label.Data);
-        int expressionID = parameter.GetInt(InfoLabel.Expression.GetHashString());
-
-        SFSEventManager.GardenSmartFox.PlazaRoomManager.ReceiveExpression(expressionID, senderID);
-    }
-
-    public void OnReceivePublicMessage(BaseEvent baseEvent)
-    {
-        ISFSObject parameter = (ISFSObject)baseEvent.Params["params"];
-        int senderID = parameter.GetInt(InfoLabel.SenderID.GetHashString());
-        parameter = parameter.GetSFSObject(Label.Data);
-        string message = parameter.GetUtfString(InfoLabel.Message.GetHashString());
-
-        SFSEventManager.GardenSmartFox.PlazaRoomManager.ReceivePublicMessage(message, senderID);
-    }
-
-
     public void OnJoinPlazaRoomSucceed(BaseEvent baseEvent)
     {
         int roomID = (baseEvent.Params["params"] as ISFSObject).GetInt(Label.RoomID);

+ 1 - 1
Assets/Script/Tool/Auxiliary.cs

@@ -167,7 +167,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.D))
         {
-            SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom();
+            //SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom();
         }
 
         if (Input.GetKeyDown(KeyCode.Z))

+ 4 - 4
第三期.txt

@@ -1,12 +1,12 @@
-创建宝箱记得扣费
-
-创建了宝箱后要在refund里记录
-
 新界面的语言
 
+从存档中移除宝箱ID(普通房间 系统房间)
+
 
 公式在新的excel里面
 
+花的颜色在语言文档里
+
 
 服务器新旧版存取档是否兼容(如果不兼容 可能无法从第二期切换到第三期)