增加创建房间功能

Assets/Resource/Logo.unity

@@ -91,170 +91,6 @@ NavMeshSettings:
     cellSize: 0.16666666
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
---- !u!1001 &444715154
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1006258683}
-    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}
-    - target: {fileID: 224825428875403882, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 224485152812742680, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 224137798955719282, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 224310538375108382, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 224504713983873336, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1502802277113396, guid: 718ebdaed223e93409d6dc7e53a23167, type: 2}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224466429079514608, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: -26.274998
-      objectReference: {fileID: 0}
-    - target: {fileID: 224466429079514608, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 267.55
-      objectReference: {fileID: 0}
-    - target: {fileID: 224466429079514608, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114334793327927606, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_Spacing
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 114334793327927606, guid: 718ebdaed223e93409d6dc7e53a23167,
-        type: 2}
-      propertyPath: m_Padding.m_Top
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 718ebdaed223e93409d6dc7e53a23167, type: 2}
-  m_IsPrefabParent: 0
---- !u!224 &444715155 stripped
-RectTransform:
-  m_PrefabParentObject: {fileID: 224310538375108382, guid: 718ebdaed223e93409d6dc7e53a23167,
-    type: 2}
-  m_PrefabInternal: {fileID: 444715154}
---- !u!224 &444715156 stripped
-RectTransform:
-  m_PrefabParentObject: {fileID: 224466429079514608, guid: 718ebdaed223e93409d6dc7e53a23167,
-    type: 2}
-  m_PrefabInternal: {fileID: 444715154}
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -319,283 +155,206 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
---- !u!1001 &781778739
+--- !u!1001 &724200061
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 444715156}
+    m_TransformParent: {fileID: 1435971795}
     m_Modifications:
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_LocalRotation.x
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_RootOrder
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_SizeDelta.x
-      value: 664
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_SizeDelta.y
-      value: 60
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_Pivot.x
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 224643852233928252, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
         type: 2}
       propertyPath: m_Pivot.y
-      value: 0.00000024959445
+      value: 0.5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: ce45010746b70ca40a7e91ce5a0a5e10, type: 2}
+  m_ParentPrefab: {fileID: 100100000, guid: 718ebdaed223e93409d6dc7e53a23167, type: 2}
   m_IsPrefabParent: 0
---- !u!1001 &1006258682
+--- !u!1001 &1115265997
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 1435971795}
     m_Modifications:
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_RootOrder
-      value: 3
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_Pivot.x
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
         type: 2}
       propertyPath: m_Pivot.y
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_ParentPrefab: {fileID: 100100000, guid: 4b27b1fc0c9780a4492f68549d3e1f52, type: 2}
   m_IsPrefabParent: 0
---- !u!224 &1006258683 stripped
-RectTransform:
-  m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-    type: 2}
-  m_PrefabInternal: {fileID: 1006258682}
---- !u!1 &1060090079
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 1858250449022854, guid: ce45010746b70ca40a7e91ce5a0a5e10,
-    type: 2}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1060090080}
-  - component: {fileID: 1060090082}
-  - component: {fileID: 1060090081}
-  m_Layer: 5
-  m_Name: Z_Frame
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1060090080
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 224867655372228590, guid: ce45010746b70ca40a7e91ce5a0a5e10,
-    type: 2}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1060090079}
-  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: 444715155}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.5, y: 110}
-  m_SizeDelta: {x: 633.6, y: 5}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1060090081
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 114437086977747808, guid: ce45010746b70ca40a7e91ce5a0a5e10,
-    type: 2}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1060090079}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.9607844, g: 0.9607844, b: 0.9607844, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
---- !u!222 &1060090082
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 222006452645796714, guid: ce45010746b70ca40a7e91ce5a0a5e10,
-    type: 2}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1060090079}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -683,6 +442,115 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1435971794
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
+--- !u!224 &1435971795 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    type: 2}
+  m_PrefabInternal: {fileID: 1435971794}
 --- !u!1 &1511433816
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -896,23 +896,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1395063287836276
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224320881754689348}
-  - component: {fileID: 222068256448544528}
-  - component: {fileID: 114907659917974766}
-  m_Layer: 5
-  m_Name: C_EnterPlazaRoomLab
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1407925660705012
 GameObject:
   m_ObjectHideFlags: 1
@@ -1467,6 +1450,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1570923960737916
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224935969739704692}
+  m_Layer: 5
+  m_Name: C_ReturnArrow0
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1580878763643000
 GameObject:
   m_ObjectHideFlags: 1
@@ -1637,56 +1635,56 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1635430071254022
+--- !u!1 &1637078809604382
 GameObject:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224549513267331424}
-  - component: {fileID: 222688948345845310}
-  - component: {fileID: 114896854376280300}
-  - component: {fileID: 114041620894659974}
+  - component: {fileID: 224926703252677018}
+  - component: {fileID: 222661160499076868}
+  - component: {fileID: 114355527492961090}
   m_Layer: 5
-  m_Name: C_EnterPlazaRoom
+  m_Name: L_UserLab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1637078809604382
+--- !u!1 &1640770339538414
 GameObject:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224926703252677018}
-  - component: {fileID: 222661160499076868}
-  - component: {fileID: 114355527492961090}
+  - component: {fileID: 224444477690967882}
   m_Layer: 5
-  m_Name: L_UserLab
+  m_Name: L_Support
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1640770339538414
+--- !u!1 &1644715366427238
 GameObject:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224444477690967882}
+  - component: {fileID: 224374856948743708}
+  - component: {fileID: 222406070231563714}
+  - component: {fileID: 114404417392296154}
+  - component: {fileID: 114184684224898906}
   m_Layer: 5
-  m_Name: L_Support
+  m_Name: C_Return
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1655360849657856
 GameObject:
   m_ObjectHideFlags: 1
@@ -1826,6 +1824,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1693041650525940
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224248677696154670}
+  m_Layer: 5
+  m_Name: C_EnterPlazaRoom0
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1695317493946352
 GameObject:
   m_ObjectHideFlags: 1
@@ -2228,7 +2241,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224302023387299144}
   m_Layer: 5
-  m_Name: C_ReturnArrow0
+  m_Name: C_PlazaRoomArrow0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2316,7 +2329,7 @@ GameObject:
   - component: {fileID: 114141770829745770}
   - component: {fileID: 114140887608922052}
   m_Layer: 5
-  m_Name: C_Return
+  m_Name: C_EnterPlazaRoom
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2426,6 +2439,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1922296188138038
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224387604085137002}
+  - component: {fileID: 114187074351429188}
+  m_Layer: 5
+  m_Name: C_Group4
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1929099593255584
 GameObject:
   m_ObjectHideFlags: 1
@@ -2780,47 +2809,6 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
---- !u!114 &114041620894659974
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1635430071254022}
-  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: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    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: 114896854376280300}
-  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 &114057582522700640
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3228,7 +3216,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: af48058312dc15c429274dc84ed7f3a6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e7f632456c01c26469882025b47accfe, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3545,6 +3533,47 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114184684224898906
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1644715366427238}
+  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: 114404417392296154}
+  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 &114186914697850690
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3586,6 +3615,28 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114187074351429188
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1922296188138038}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 5
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
 --- !u!114 &114191314075909182
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4786,6 +4837,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E0B\u8F7D\u5B58\u6863"
+--- !u!114 &114404417392296154
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1644715366427238}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: af48058312dc15c429274dc84ed7f3a6, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114408800376138884
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7546,33 +7624,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114896854376280300
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1635430071254022}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &114900503690766950
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7639,39 +7690,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: OFF
---- !u!114 &114907659917974766
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1395063287836276}
-  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: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: EnterPlazaRoom
 --- !u!114 &114908265246923224
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8171,12 +8189,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1359555403264252}
---- !u!222 &222068256448544528
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1395063287836276}
 --- !u!222 &222070152269201450
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8447,6 +8459,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1318604786165176}
+--- !u!222 &222406070231563714
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1644715366427238}
 --- !u!222 &222423029238303552
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8681,12 +8699,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1673024710915826}
---- !u!222 &222688948345845310
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1635430071254022}
 --- !u!222 &222696312794164114
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8889,19 +8901,19 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1553270208429264}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224913700505005062}
   - {fileID: 224773436732538326}
   - {fileID: 224922565756526032}
-  m_Father: {fileID: 224577567281555198}
+  m_Father: {fileID: 224387604085137002}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -42.109985, y: 36.699997}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 284.888, y: -36.5}
   m_SizeDelta: {x: 84.224, y: 73}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224039116521958850
@@ -9428,6 +9440,25 @@ RectTransform:
   m_AnchoredPosition: {x: -0.000009536743, y: -224.7311}
   m_SizeDelta: {x: 800, y: 24.19929}
   m_Pivot: {x: 0.5, y: 0.99999994}
+--- !u!224 &224248677696154670
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1693041650525940}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224312533541126630}
+  m_Father: {fileID: 224387604085137002}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 285, y: -36.5}
+  m_SizeDelta: {x: 84, y: 72.5}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224249425076514156
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9567,13 +9598,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224302023387299144}
-  m_Father: {fileID: 224577567281555198}
-  m_RootOrder: 4
+  m_Father: {fileID: 224248677696154670}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -126.32999, y: 36.699997}
-  m_SizeDelta: {x: 84.224, y: 73}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 42.112015, y: -36.5}
+  m_SizeDelta: {x: 77.9, y: 72.519}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224314673868948440
 RectTransform:
@@ -9612,24 +9643,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224320881754689348
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1395063287836276}
-  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: 224549513267331424}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224325760142200524
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9813,6 +9826,46 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224374856948743708
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1644715366427238}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224935969739704692}
+  m_Father: {fileID: 224387604085137002}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 200.664, y: -36.5}
+  m_SizeDelta: {x: 84.224, y: 73}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224387604085137002
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1922296188138038}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224248677696154670}
+  - {fileID: 224374856948743708}
+  - {fileID: 224027336406255088}
+  m_Father: {fileID: 224577567281555198}
+  m_RootOrder: 2
+  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: 237, y: -188.33}
+  m_SizeDelta: {x: 327, y: 73}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224402016592928158
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9975,7 +10028,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224476342221405536}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -10194,7 +10247,6 @@ RectTransform:
   - {fileID: 224517132005796266}
   - {fileID: 224270387276606410}
   - {fileID: 224327389779206034}
-  - {fileID: 224549513267331424}
   - {fileID: 224422329702985050}
   m_Father: {fileID: 224577567281555198}
   m_RootOrder: 1
@@ -10309,7 +10361,7 @@ RectTransform:
   m_Children:
   - {fileID: 224337229391098628}
   m_Father: {fileID: 224577567281555198}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -10430,25 +10482,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224549513267331424
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1635430071254022}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 224320881754689348}
-  m_Father: {fileID: 224476342221405536}
-  m_RootOrder: 5
-  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: -23.175, y: -162}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224565104257182798
 RectTransform:
   m_ObjectHideFlags: 1
@@ -10498,9 +10531,8 @@ RectTransform:
   m_Children:
   - {fileID: 224686880427899620}
   - {fileID: 224476342221405536}
-  - {fileID: 224027336406255088}
+  - {fileID: 224387604085137002}
   - {fileID: 224018473661974528}
-  - {fileID: 224312533541126630}
   - {fileID: 224516847669436528}
   - {fileID: 224813247372850516}
   m_Father: {fileID: 224177177658968832}
@@ -11099,7 +11131,7 @@ RectTransform:
   m_Children:
   - {fileID: 224208024033058762}
   m_Father: {fileID: 224577567281555198}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -11442,6 +11474,24 @@ RectTransform:
   m_AnchoredPosition: {x: -80.29999, y: 0}
   m_SizeDelta: {x: 109, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224935969739704692
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1570923960737916}
+  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: 224374856948743708}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -70.4, y: 65.4}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224938795508926460
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -162,6 +162,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1065679082536952
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224160025767768566}
+  - component: {fileID: 222726393440527414}
+  - component: {fileID: 114330656681268888}
+  m_Layer: 5
+  m_Name: Z_Frame
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1069871653602034
 GameObject:
   m_ObjectHideFlags: 1
@@ -407,7 +424,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1180387993136416
 GameObject:
   m_ObjectHideFlags: 1
@@ -512,7 +529,7 @@ GameObject:
   m_IsActive: 1
 --- !u!1 &1279836499527996
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
@@ -740,6 +757,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1364423028002870
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224083993399858464}
+  - component: {fileID: 225102066209533276}
+  m_Layer: 5
+  m_Name: R_Notify0
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1381108177404786
 GameObject:
   m_ObjectHideFlags: 1
@@ -940,7 +973,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1511813342589464
 GameObject:
   m_ObjectHideFlags: 0
@@ -1140,6 +1173,7 @@ GameObject:
   - component: {fileID: 224249553429857464}
   - component: {fileID: 222051074673691398}
   - component: {fileID: 114516486122715046}
+  - component: {fileID: 114839293511783106}
   m_Layer: 5
   m_Name: Z_InfoImg50
   m_TagString: Untagged
@@ -1808,7 +1842,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1914603065110894
 GameObject:
   m_ObjectHideFlags: 1
@@ -3247,6 +3281,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114330656681268888
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1065679082536952}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9607844, g: 0.9607844, b: 0.9607844, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114331472792975366
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3321,10 +3382,10 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 5
+    m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 1
-  m_Spacing: 20
+  m_Spacing: 0
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -4269,7 +4330,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1724352613594788}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -4281,8 +4342,8 @@ MonoBehaviour:
     m_Bottom: 0
   m_ChildAlignment: 1
   m_Spacing: 5
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
 --- !u!114 &114581774730213310
@@ -5323,6 +5384,47 @@ MonoBehaviour:
   m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &114839293511783106
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1560198517836700}
+  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: 114516486122715046}
+  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 &114850075890039366
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6669,6 +6771,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1655035403781822}
+--- !u!222 &222726393440527414
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1065679082536952}
 --- !u!222 &222742105261906608
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -6970,6 +7078,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0.0000037478, y: -202}
   m_SizeDelta: {x: 161.85, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224083993399858464
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1364423028002870}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224782530703948524}
+  m_Father: {fileID: 224814127152008004}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  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_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224107537259389318
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7098,6 +7225,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -0.5}
   m_SizeDelta: {x: -20, y: -13}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224160025767768566
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1065679082536952}
+  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: 224310538375108382}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.5, y: 110}
+  m_SizeDelta: {x: 633.6, y: 5}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224165838830111156
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7509,6 +7654,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 224160025767768566}
   - {fileID: 224466429079514608}
   m_Father: {fileID: 224246090464727552}
   m_RootOrder: 2
@@ -8001,12 +8147,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224310538375108382}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 664, y: 320}
+  m_AnchoredPosition: {x: 0, y: -26.274998}
+  m_SizeDelta: {x: 664, y: 267.55}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224485152812742680
 RectTransform:
@@ -8580,13 +8726,13 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1279836499527996}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224921106973203834}
-  m_Father: {fileID: 224814127152008004}
-  m_RootOrder: 1
+  m_Father: {fileID: 224083993399858464}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -8726,7 +8872,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224042092064329274}
-  - {fileID: 224782530703948524}
+  - {fileID: 224083993399858464}
   - {fileID: 224337869017959276}
   - {fileID: 224858652238544240}
   - {fileID: 224300270873615824}
@@ -8970,6 +9116,17 @@ CanvasGroup:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1909796038324812}
   m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
+--- !u!225 &225102066209533276
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1364423028002870}
+  m_Enabled: 1
   m_Alpha: 1
   m_Interactable: 1
   m_BlocksRaycasts: 1

Assets/Resource/Sprite/Editor/PlazaRoom/派对图标.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: e7f632456c01c26469882025b47accfe
+timeCreated: 1507858667
+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: 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="7" />
+  <Version value="8" />
 
   <ID value="Default" />
   <SerialNumber value="Default" />
@@ -9,11 +9,13 @@
   <TutorialC value="1" />
   <TutorialD value="1" />
   <TutorialE value="1" />
+  <TutorialPlazaRoom value="1" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />
   <TutorialIndexD value="1" />
   <TutorialIndexE value="1" />
+  <TutorialIndexPlazaRoom value="1" />
 
   <QuitFlag value="0" />
   <QuitTime value="4/23/2017 09:30:00 AM" />

Assets/Script/Manage/Initializer.cs

@@ -140,6 +140,9 @@ public class Initializer : MonoBehaviour
             gameObject.AddScript<GardenSmartFoxManager>();
 
             progress = "31";
+            gameObject.AddScript<PlazaRoomMge>();
+
+            progress = "32";
             StartCoroutine(IInitialize());
         }
         catch (Exception e)
@@ -202,6 +205,9 @@ public class Initializer : MonoBehaviour
         ManaTutorial.TutorialE_ = ManaData.GetPlayerBool("TutorialE");
         debugLab.text = "Error code : 1-5";
 
+        ManaTutorial.TutorialPlazaRoom_ = ManaData.GetPlayerBool("TutorialPlazaRoom");
+        debugLab.text = "Error code : 1-5-1";
+
         ManaTutorial.TutorialIndexA = ManaData.GetPlayerInt("TutorialIndexA");
         debugLab.text = "Error code : 1-6";
 
@@ -217,6 +223,9 @@ public class Initializer : MonoBehaviour
         ManaTutorial.TutorialIndexE = ManaData.GetPlayerInt("TutorialIndexE");
         debugLab.text = "Error code : 1-10";
 
+        ManaTutorial.TutorialIndexPlazaRoom = ManaData.GetPlayerInt("TutorialIndexPlazaRoom");
+        debugLab.text = "Error code : 1-10-1";
+
         Bundle.LoadAtlasSprites();
         debugLab.text = "Error code : 1-11";
 

Assets/Script/Manage/ManaCenter.cs

@@ -175,11 +175,37 @@ public class ManaCenter : Regist
                 kv.Value.OnLevelChange();
             }
 
+            if (Level_ >= 18) //小游戏B
+            {
+                if (ManaTutorial.TutorialB_)
+                {
+                    ManaTutorial.TutorialB = true;
+                }
+            }
+
+            if (Level < 13)
+            {
+                ManaReso.Get<Image>("C_DressRoom").material = Lib.GrayMat;
+            }
+            else
+            {
+                ManaReso.Get<Image>("C_DressRoom").material = null;
+            }
+
+            if (ManaGarden.MyFlower >= 2 && Level_ >= 22) //小游戏C
+            {
+                if (ManaTutorial.TutorialE_)
+                {
+                    ManaTutorial.EnterE1();
+                }
+            }
+
             if (Level_ >= 8)
             {
                 if (ManaTutorial.TutorialC_)
                 {
                     ManaTutorial.EnterC1();
+                    return;
                 }
                 else
                 {
@@ -192,31 +218,20 @@ public class ManaCenter : Regist
                 if (ManaTutorial.TutorialD_)
                 {
                     ManaTutorial.EnterD1();
+                    return;
                 }
             }
 
-            if (Level_ >= 18)
+            if (Level_ >= 28)
             {
-                if (ManaTutorial.TutorialB_)
+                if (ManaTutorial.TutorialPlazaRoom_)
                 {
-                    ManaTutorial.TutorialB = true;
+                    ManaTutorial.EnterPlazaRoom();
+                    return;
                 }
-            }
-
-            if (Level < 13)
-            {
-                ManaReso.Get<Image>("C_DressRoom").material = Lib.GrayMat;
-            }
-            else
-            {
-                ManaReso.Get<Image>("C_DressRoom").material = null;
-            }
-
-            if (ManaGarden.MyFlower >= 2 && Level_ >= 22)
-            {
-                if (ManaTutorial.TutorialE_)
+                else
                 {
-                    ManaTutorial.EnterE1();
+                    ManaReso.SetActive("C_EnterPlazaRoom", true);
                 }
             }
         }

Assets/Script/Manage/ManaData.cs

@@ -514,12 +514,14 @@ public class ManaData : Regist
         PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = ManaTutorial.TutorialC_.ToInt().ToString();
         PlayerNode.SelectSingleNode("TutorialD").Attributes[0].Value = ManaTutorial.TutorialD_.ToInt().ToString();
         PlayerNode.SelectSingleNode("TutorialE").Attributes[0].Value = ManaTutorial.TutorialE_.ToInt().ToString();
+        PlayerNode.SelectSingleNode("TutorialPlazaRoom").Attributes[0].Value = ManaTutorial.TutorialPlazaRoom_.ToInt().ToString();
 
         PlayerNode.SelectSingleNode("TutorialIndexA").Attributes[0].Value = ManaTutorial.TutorialIndexA.ToString();
         PlayerNode.SelectSingleNode("TutorialIndexB").Attributes[0].Value = ManaTutorial.TutorialIndexB.ToString();
         PlayerNode.SelectSingleNode("TutorialIndexC").Attributes[0].Value = ManaTutorial.TutorialIndexC.ToString();
         PlayerNode.SelectSingleNode("TutorialIndexD").Attributes[0].Value = ManaTutorial.TutorialIndexD.ToString();
         PlayerNode.SelectSingleNode("TutorialIndexE").Attributes[0].Value = ManaTutorial.TutorialIndexE.ToString();
+        PlayerNode.SelectSingleNode("TutorialIndexPlazaRoom").Attributes[0].Value = ManaTutorial.TutorialIndexPlazaRoom.ToString();
     }
 
     public static void SaveFlowers()
@@ -1139,6 +1141,13 @@ public class ManaData : Regist
             To7(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 8)
+        {
+            Debug.LogWarning("UpdateArchive to 8");
+
+            To8(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1314,4 +1323,17 @@ public class ManaData : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument To8(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 8.ToString();
+
+        XmlNode xmlNode0 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialPlazaRoom");
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexPlazaRoom");
+
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode0, true));
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/ManaGarden.cs

@@ -187,7 +187,7 @@ public class ManaGarden : Regist
 
     public void Update()
     {
-        if (ManaTutorial.TutorialA || Player.InDressRoom || GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.InPlazaRoom)
+        if (ManaTutorial.TutorialA || Player.InDressRoom || GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.InPlazaRoom)
         {
             return;
         }
@@ -647,4 +647,21 @@ public class ManaGarden : Regist
             ManaAudio.PlayClip(Clip.FlowerClip);
         }
     }
+
+
+    public static void RetrieveAllElf()
+    {
+        for (int i = 0; i < PlantList.Count; i++)
+        {
+            PlantList[i].Flower.RetrieveElf();
+        }
+    }
+
+    public static void RetrieveAllStar()
+    {
+        for (int i = 0; i < StarList.Count; i++)
+        {
+            ManaReso.Save(StarList[i]);
+        }
+    }
 }

Assets/Script/Manage/ManaIAP.cs

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

Assets/Script/Manage/ManaInfoBox.cs

@@ -96,13 +96,16 @@ public class ManaInfoBox : Regist
             text.SetParent(Grid);
             text.rectTransform.SetAsFirstSibling();
 
-            Auxiliary.Instance.DelayCall
-            (() =>
-                {
-                    VerticalLayoutGroup.SetLayoutVertical();
-                },
-                1
-            );
+            if (VerticalLayoutGroup != null)
+            {
+                Auxiliary.Instance.DelayCall(
+                    () =>
+                    {
+                        VerticalLayoutGroup.SetLayoutVertical();
+                    },
+                    1
+                );
+            }
 
 
             InfoText infoText = new InfoText();

Assets/Script/Manage/ManaNickName.cs

@@ -33,7 +33,11 @@ public class ManaNickName : Regist
 	{
 	    ManaReso.SetText("T_Tit", Language.GetStr("UI", "T_Tit"));
 
-		ManaReso.Get ("C_Main").TweenBacCG ();
+	    if (!ManaTutorial.TutorialPlazaRoom && !ManaTutorial.TutorialC && !ManaTutorial.TutorialD)
+	    {
+            ManaReso.Get("C_Main").TweenBacCG();
+        }
+
         ManaReso.Get ("T_NickNameBK").TweenForCG ();
 	}
 

Assets/Script/Manage/ManaNotify.cs

@@ -58,6 +58,16 @@ public class ManaNotify
         ManaAudio.PlayClip(Clip.BubbleClip);
 
         ManaReso.Get("R_Notify").TweenForCG();
+
+        Auxiliary.Instance.DelayCall
+        (
+            () =>
+            {
+                ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();
+                ManaReso.Get<VerticalLayoutGroup>("R_Grid").SetLayoutVertical();
+            },
+            1
+        );
     }
 
     public static void Initialize(string language)
@@ -86,15 +96,6 @@ public class ManaNotify
 
             TextList.Add(transform.GetComponent<Text>());
         }
-
-        Auxiliary.Instance.DelayCall
-            (
-                () =>
-                {
-                    ManaReso.Get<VerticalLayoutGroup>("R_Grid").enabled = true;
-                },
-                1
-            );
     }
 
     public static void SwitchLanguage(string language)

Assets/Script/Manage/ManaSign.cs

@@ -708,12 +708,12 @@ public class ManaSign : Regist
     {
         if (ManaCenter.OfflineLock)
         {
-                ManaReso.Get("C_Group").TweenBacCG();
+            ManaReso.Get("C_Group").TweenBacCG();
 
-                ManaReso.Get("B_SignIn").TweenForCG();
-                ManaReso.Get("Ba_Notice").TweenForCG();
+            ManaReso.Get("B_SignIn").TweenForCG();
+            ManaReso.Get("Ba_Notice").TweenForCG();
 
-                return true;
+            return true;
         }
 
         return false;
@@ -762,6 +762,8 @@ public class ManaSign : Regist
     {
         if (ManaServer.NotificationIndex > ManaData.GetPlayerInt("NotificationIndex") && ManaServer.NotificationReady)
         {
+            ManaReso.Get("B_SignIn").TweenBacCG();
+
             ManaData.SavePlayerInt("NotificationIndex", ManaServer.NotificationIndex);
 
             ManaNotify.Show();
@@ -809,10 +811,4 @@ public class ManaSign : Regist
 
         Lottery.Configure(ManaData.GetLotteryConfig());
     }
-}
-
-#region DebugList
-
-//签到的循环与存档
-
-#endregion
+}

Assets/Script/Manage/ManaTutorial.cs

@@ -71,16 +71,19 @@ public class ManaTutorial : Regist
     public static bool TutorialC;
     public static bool TutorialD;
     public static bool TutorialE;
+    public static bool TutorialPlazaRoom;
     public static bool TutorialB_;
     public static bool TutorialC_;
     public static bool TutorialD_;
     public static bool TutorialE_;
+    public static bool TutorialPlazaRoom_;
 
     public static int TutorialIndexA;
     public static int TutorialIndexB;
     public static int TutorialIndexC;
     public static int TutorialIndexD;
     public static int TutorialIndexE;
+    public static int TutorialIndexPlazaRoom;
 
     #endregion
 
@@ -770,17 +773,12 @@ public class ManaTutorial : Regist
     }
 
 
-    public static void EndC1()
-    {
-        StaticsManager.GetInstance().TutoComplete("C1");
-
-        Tutorial.HightDisable();
-    }
-
     public static void EndC()
     {
         StaticsManager.GetInstance().TutoComplete("C");
 
+        Tutorial.HightDisable();
+
         TutorialC = false;
 
         ManaReso.SetActive("N_Tutorial", false);
@@ -795,93 +793,95 @@ public class ManaTutorial : Regist
         TutorialC = true;
         TutorialC_ = false;
 
-        TweenRoot tween = ManaReso.Get("Fe_Info").TweenBacCG();
+        ManaUI.BlockOfflinePanel();
 
-        tween.AddEventOnetime
-        (
-            EventType.BackwardFinish, 
-            () =>
-            {
-                ManaReso.Get("F_Manage").TweenBacGra();
+        TweenRoot tweenRoot = ManaReso.Get("F_Manage0").GetTweenVec();
 
-                tween = ManaReso.Get("F_Manage0").GetTweenVec();
+        if (tweenRoot.InDestination)
+        {
+            TweenRoot tween = ManaReso.Get("Fe_Info").TweenBacCG();
 
-                tween.AddEventOnetime
-                (
-                    EventType.BackwardFinish,
-                    () =>
-                    {
-                        ManaReso.Get("C_Group").TweenReForCG();
-                        ManaReso.Get("C_Group0").TweenReForCG();
-                    }
-                );
+            tween.AddEventOnetime
+            (
+                EventType.BackwardFinish,
+                () =>
+                {
+                    ManaReso.Get("F_Manage").TweenBacGra();
 
+                    tween = ManaReso.Get("F_Manage0").GetTweenVec();
 
-                tween = ManaReso.Get("C_Group").GetTweenCG();
+                    tween.AddEventOnetime
+                    (
+                        EventType.BackwardFinish,
+                        () =>
+                        {
+                            ShowVisitBtn();
+                        }
+                    );
+                }
+            );
+        }
+        else
+        {
+            ShowVisitBtn();   
+        }
 
+        ManaReso.AddButtonEventOnetime
+        (
+            "C_Return",
+            () =>
+            {
+                TweenRoot tween = ManaReso.Get("I_BlackMask").GetTweenCG();
                 tween.AddEventOnetime
                 (
-                    EventType.ForwardFinish,
+                    EventType.BackwardFinish,
                     () =>
                     {
-                        ManaReso.SetActive("N_Tutorial", true);
-
-                        tween = ManaReso.Get("N_Mask").TweenForGra();
-
-                        tween.AddEventOnetime
-                        (
-                            EventType.ForwardFinish,
-                            () =>
-                            {
-                                PayExemptAmt = 1;
-
-                                ManaReso.SetActive("C_Visit", true);
-
-                                Tutorial.HightScreen(ManaReso.Get("C_VisitArrow0"), ManaReso.Get("C_Visit"));
-
-                                ManaReso.AddButtonEventOnetime
-                                (
-                                    "C_Visit",
-                                    () =>
-                                    {
-                                        EndC1();
-                                    }
-                                );
-                            }
-                        );
+                        ManaUI.UnblockOfflinePanel();
                     }
                 );
             }
         );
     }
 
-    public static void EnterC2()
+    public static void ShowVisitBtn()
     {
-        TweenRoot tween = ManaReso.Get("I_BlackMask").GetTweenCG();
+        ManaReso.Get("C_Main").TweenReForCG();
+        ManaReso.Get("C_Group").TweenReForCG();
+        ManaReso.Get("C_Group0").TweenReForCG();
+
+        TweenRoot tween = ManaReso.Get("C_Group").GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Auxiliary.Instance.DelayCall
+                ManaReso.SetActive("N_Tutorial", true);
+
+                tween = ManaReso.Get("N_Mask").TweenForGra();
+
+                tween.AddEventOnetime
                 (
+                    EventType.ForwardFinish,
                     () =>
                     {
-                        ManaReso.SetActive("C_Return", true);
+                        PayExemptAmt = 1;
+
+                        ManaReso.SetActive("C_Visit", true);
 
-                        Tutorial.HightScreen(ManaReso.Get("C_ReturnArrow0"), ManaReso.Get("C_Return"));
+                        ManaReso.Get<HorizontalLayoutGroup>("C_Group4").SetLayoutHorizontal();
+                        Tutorial.HightScreen(ManaReso.Get("C_VisitArrow0"), ManaReso.Get("C_Visit"));
 
                         ManaReso.AddButtonEventOnetime
                         (
-                            "C_Return",
+                            "C_Visit",
                             () =>
                             {
                                 EndC();
                             }
                         );
-                    },
-                    3f
+                    }
                 );
             }
         );
@@ -1054,12 +1054,12 @@ public class ManaTutorial : Regist
 
         ManaReso.Get("C_Main2").TweenForCG();
 
-        TweenRoot tweenRoot = ManaReso.Get("I_BlackMask").TweenBacCG();
-
         Tutorial.HightDisable();
 
         ManaReso.Get("N_LabBK").TweenBacCG();
 
+        TweenRoot tweenRoot = ManaReso.Get("I_BlackMask").TweenBacCG();
+
         tweenRoot.AddEventOnetime
         (
             EventType.BackwardFinish,
@@ -1071,6 +1071,24 @@ public class ManaTutorial : Regist
                 ManaReso.SetActive("N_Tutorial", false);
             }
         );
+
+        ManaReso.AddButtonEventOnetime
+        (
+            "P_Return",
+            () =>
+            {
+                tweenRoot = ManaReso.Get("I_BlackMask").TweenBacCG();
+
+                tweenRoot.AddEventOnetime
+                (
+                    EventType.ForwardFinish,
+                    () =>
+                    {
+                        ManaUI.UnblockOfflinePanel();
+                    }
+                );
+            }
+        );
     }
 
     public static void EnterD1()
@@ -1078,40 +1096,29 @@ public class ManaTutorial : Regist
         TutorialD = true;
         TutorialD_ = false;
 
+        ManaUI.BlockOfflinePanel();
+
         TweenRoot tweenRoot = ManaReso.Get("F_Manage0").GetTweenVec();
 
         if (tweenRoot.InDestination)
         {
-            tweenRoot = ManaReso.Get("Fe_Info").TweenBacCG();
-
             tweenRoot.AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
                 {
-                    ManaReso.Get("F_Manage").TweenBacGra();
-
-                    tweenRoot = ManaReso.Get("C_Main").GetTweenCG();
-
-                    tweenRoot.AddEventOnetime
-                    (
-                        EventType.ForwardStart,
-                        () =>
-                        {
-                            EnterD2();
-                        }
-                    );
+                    EnterD2();
+                }
+            );
 
-                    //tweenRoot = ManaReso.Get("F_Manage0").GetTweenVec();
+            tweenRoot = ManaReso.Get("Fe_Info").TweenBacCG();
 
-                    //tweenRoot.AddEventOnetime
-                    //(
-                    //    EventType.BackwardFinish,
-                    //    () =>
-                    //    {
-                    //        EnterD2();
-                    //    }
-                    //);
+            tweenRoot.AddEventOnetime
+            (
+                EventType.BackwardFinish,
+                () =>
+                {
+                    tweenRoot = ManaReso.Get("F_Manage").TweenBacGra();
                 }
             );
         }
@@ -1123,6 +1130,10 @@ public class ManaTutorial : Regist
 
     public static void EnterD2()
     {
+        ManaReso.Get("C_Main").TweenReForCG();
+        ManaReso.Get("C_Group").TweenReForCG();
+        ManaReso.Get("C_Group0").TweenReForCG();
+
         ManaReso.SetActive("N_Tutorial", true);
 
         ManaReso.Get("N_Mask").TweenForGra();
@@ -1130,51 +1141,17 @@ public class ManaTutorial : Regist
         Tutorial.HightScreen(ManaReso.Get("C_DressRoomArrow"), ManaReso.Get("C_DressRoom"));
 
         ManaReso.AddButtonEventOnetime
-            (
-                "C_DressRoom",
-                () =>
-                {
-                    EndD();
-                }
-            );
+        (
+            "C_DressRoom",
+            () =>
+            {
+                EndD();
+            }
+        );
 
         ManaReso.SetText("N_Lab", Language.GetStr("UI", "N_Lab"));
 
         Tutorial.ShowDescriptScreen(ManaReso.Get("C_DressRoomLabPos").position);
-
-
-        //ManaReso.Get("B_SignIn0").TweenBacCG();
-
-        //ManaReso.Get("C_Main2").TweenBacCG();
-
-        //ManaReso.SetActive("N_Tutorial", true);
-
-        //ManaReso.Get("N_Mask").TweenForGra();
-
-        //ManaReso.SetText("N_Lab", Language.GetStr("UI", "N_Lab"));
-
-        //Tutorial.MaskLock = true;
-
-        //Tutorial.SetArea(ManaPlayer.Player.ChildDic["HighLightPos"], 0.1f, 0.2f);
-
-        //Tutorial.SetUIButton(ManaPlayer.Player.ChildDic["HighLightPos"].position, 0.1f, 0.2f);
-
-        //Tutorial.ShowDescriptScene(ManaPlayer.Player.ChildDic["LabPos"].position);
-
-        //Tutorial.PointScene(ManaPlayer.Player.ChildDic["Arrow"].position, ManaPlayer.Player.transform);
-
-        //ManaReso.AddButtonEventOnetime
-        //(
-        //    "N_Button",
-        //    () =>
-        //    {
-        //        ManaAudio.PlayClip(Clip.BtnClip);
-
-        //        ManaPlayer.Player.EnterDressRoom();
-
-        //        EndD();
-        //    }
-        //);
     }
 
 
@@ -1205,4 +1182,118 @@ public class ManaTutorial : Regist
 
         Tutorial.HightScreen(arrowTra, targetTra);
     }
+
+
+    public static void EndPlazaRoom()
+    {
+        StaticsManager.GetInstance().TutoComplete("PlazaRoom1");
+
+        Tutorial.HightDisable();
+
+        TutorialPlazaRoom = false;
+
+        ManaReso.SetActive("N_Tutorial", false);
+
+        PayExemptAmt = 0;
+        ConnectExemptAmt = 0;
+
+
+        ManaReso.AddButtonEventOnetime
+        (
+            "X_Quit",
+            () =>
+            {
+                TweenRoot tweenRoot = ManaReso.Get("V_BlackMask").TweenForCG();
+
+                tweenRoot.AddEventOnetime
+                (
+                    EventType.ForwardFinish,
+                    () =>
+                    {
+                        ManaUI.UnblockOfflinePanel();
+                    }
+                );
+            }
+        );
+    }
+
+    public static void EnterPlazaRoom()
+    {
+        TutorialPlazaRoom = true;
+        TutorialPlazaRoom_ = false;
+
+        ManaUI.BlockOfflinePanel();
+
+        TweenRoot tweenRoot = ManaReso.Get("F_Manage0").GetTweenVec();
+
+        if (tweenRoot.InDestination)
+        {
+            TweenRoot tween = ManaReso.Get("Fe_Info").TweenBacCG();
+
+            tween.AddEventOnetime
+            (
+                EventType.BackwardFinish,
+                () =>
+                {
+                    ManaReso.Get("F_Manage").TweenBacGra();
+
+                    tween = ManaReso.Get("F_Manage0").GetTweenVec();
+
+                    tween.AddEventOnetime
+                    (
+                        EventType.BackwardFinish,
+                        () =>
+                        {
+                            ShowPlazaRoomBtn();
+                        }
+                    );
+                }
+            );
+        }
+        else
+        {
+            ShowPlazaRoomBtn();
+        }
+    }
+
+    public static void ShowPlazaRoomBtn()
+    {
+        ManaReso.Get("C_Main").TweenReForCG();
+        ManaReso.Get("C_Group").TweenReForCG();
+        ManaReso.Get("C_Group0").TweenReForCG();
+
+        TweenRoot tween = ManaReso.Get("C_Group").GetTweenCG();
+
+        tween.AddEventOnetime
+        (
+            EventType.ForwardFinish,
+            () =>
+            {
+                ManaReso.SetActive("N_Tutorial", true);
+
+                tween = ManaReso.Get("N_Mask").TweenForGra();
+
+                tween.AddEventOnetime
+                (
+                    EventType.ForwardFinish,
+                    () =>
+                    {
+                        ManaReso.SetActive("C_EnterPlazaRoom", true);
+                        ManaReso.Get<HorizontalLayoutGroup>("C_Group4").CalculateLayoutInputHorizontal();
+                        ManaReso.Get<HorizontalLayoutGroup>("C_Group4").SetLayoutHorizontal();
+                        Tutorial.HightScreen(ManaReso.Get("C_PlazaRoomArrow0"), ManaReso.Get("C_EnterPlazaRoom"));
+
+                        ManaReso.AddButtonEventOnetime
+                        (
+                            "C_EnterPlazaRoom",
+                            () =>
+                            {
+                                EndPlazaRoom();
+                            }
+                        );
+                    }
+                );
+            }
+        );
+    }
 }

Assets/Script/Manage/ManaUI.cs

@@ -461,6 +461,7 @@ public class ManaUI : Regist
             () =>
             {
                 ManaVisit.Visit(ArchiveSource.Random);
+                ManaReso.SetActive("C_EnterPlazaRoom0", false);
             }
         );
 
@@ -545,6 +546,7 @@ public class ManaUI : Regist
                     () =>
                     {
                         ManaVisit.ExitVisiteeGarden();
+                        ManaReso.SetActive("C_EnterPlazaRoom0", true);
                     }
                 );
 
@@ -563,7 +565,7 @@ public class ManaUI : Regist
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
 
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
+                PlazaRoomMge.OpenPanel();
             }
         );
 
@@ -766,10 +768,7 @@ public class ManaUI : Regist
 
             ManaReso.SetActive("GardenNormal", false);
 
-            for (int i = 0; i < ManaGarden.PlantList.Count; i++)
-            {
-                ManaGarden.PlantList[i].Flower.RetrieveElf();
-            }
+            ManaGarden.RetrieveAllElf();
         };
 
         tween.OnBackwardStart += () =>
@@ -2729,6 +2728,7 @@ public class ManaUI : Regist
         ManaLan.Add(ManaReso.Get<Text>("R_NotifyTit"), new LanStr("UI", "R_Tit"));
         ManaLan.Add(ManaReso.Get<Text>("R_CloseLab"), new LanStr("Common", "Confirm"));
 
+        tween = ManaReso.Get("R_Notify0").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         tween = ManaReso.Get("R_Notify").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         tween.OnForwardStart +=
@@ -2847,7 +2847,7 @@ public class ManaUI : Regist
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
 
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.ExitPlazaRoom();
+                GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.ExitPlazaRoom();
             }
         );
 
@@ -2862,7 +2862,7 @@ public class ManaUI : Regist
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
 
-                if (GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendPublicMessage(ManaReso.Get<InputField>("X_InputField").text))
+                if (GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendPublicMessage(ManaReso.Get<InputField>("X_InputField").text))
                 {
                     ManaReso.Get<InputField>("X_InputField").text = "";
                 }
@@ -2904,7 +2904,7 @@ public class ManaUI : Regist
             "X_BlueFace",
             () =>
             {
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
+                GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendExpression(ExpressionID.郁闷);
                 CloseExpressionGrid();
             }
         );
@@ -2915,7 +2915,7 @@ public class ManaUI : Regist
             "X_SweatFace",
             () =>
             {
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.汗颜);
+                GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendExpression(ExpressionID.汗颜);
                 CloseExpressionGrid();
             }
         );
@@ -2925,7 +2925,7 @@ public class ManaUI : Regist
             "X_SurpriseFace",
             () =>
             {
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.惊讶);
+                GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendExpression(ExpressionID.惊讶);
                 CloseExpressionGrid();
             }
         );
@@ -2935,7 +2935,7 @@ public class ManaUI : Regist
             "X_HappyFace",
             () =>
             {
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.开心);
+                GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendExpression(ExpressionID.开心);
                 CloseExpressionGrid();
             }
         );
@@ -2945,7 +2945,7 @@ public class ManaUI : Regist
             "X_CryFace",
             () =>
             {
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.哭);
+                GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendExpression(ExpressionID.哭);
                 CloseExpressionGrid();
             }
         );
@@ -2955,7 +2955,7 @@ public class ManaUI : Regist
             "X_HopeFace",
             () =>
             {
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.期待);
+                GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendExpression(ExpressionID.期待);
                 CloseExpressionGrid();
             }
         );
@@ -2965,7 +2965,7 @@ public class ManaUI : Regist
             "X_OgleFace",
             () =>
             {
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.色咪咪);
+                GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendExpression(ExpressionID.色咪咪);
                 CloseExpressionGrid();
             }
         );
@@ -2975,7 +2975,7 @@ public class ManaUI : Regist
             "X_ChagrinFace",
             () =>
             {
-                GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.委屈);
+                GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendExpression(ExpressionID.委屈);
                 CloseExpressionGrid();
             }
         );
@@ -3040,6 +3040,58 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region Z
+
+        ManaReso.Get("Z_BK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        #region Z_Create
+
+        ManaReso.SetButtonEvent
+        (
+            "Z_Create",
+            () =>
+            {
+                
+            }
+        );
+
+        #endregion
+
+        #region Z_Close
+
+        ManaReso.SetButtonEvent
+        (
+            "Z_Close",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                PlazaRoomMge.ClosePanel();
+            }
+        );
+
+        #endregion
+
+        #region Z_InfoImg50
+
+        ManaReso.SetButtonEvent
+        (
+            "Z_InfoImg50",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                if (PlazaRoomMge.FilterEnabled)
+                    PlazaRoomMge.DisableFilter();
+                else
+                    PlazaRoomMge.EnableFilter();
+            }
+        );
+
+        #endregion
+
+        #endregion
+
         if (!ManaTutorial.TutorialA)
         {
             HudTarget hudTarget = ManaReso.Get("C_MiniGame").AddComponent<HudTarget>();
@@ -3187,4 +3239,19 @@ public class ManaUI : Regist
         ManaReso.SetActive("X_Mask", false);
         ManaReso.SetActive("X_CurrentInfo", true);
     }
+
+
+    public static void BlockOfflinePanel()
+    {
+        ManaReso.Get("B_SignIn0").TweenBacCG();
+        ManaReso.Get("T_NickName").TweenBacCG();
+        ManaReso.Get("R_Notify0").TweenBacCG();
+    }
+
+    public static void UnblockOfflinePanel()
+    {
+        ManaReso.Get("B_SignIn0").TweenForCG();
+        ManaReso.Get("T_NickName").TweenForCG();
+        ManaReso.Get("R_Notify0").TweenForCG();
+    }
 }

Assets/Script/Manage/ManaVisit.cs

@@ -344,10 +344,7 @@ public class ManaVisit : Regist
 
         if (!InVisit)
         {
-            for (int i = 0; i < ManaGarden.StarList.Count; i++)
-            {
-                ManaReso.Save(ManaGarden.StarList[i]);
-            }
+            ManaGarden.RetrieveAllStar();
 
             ManaGarden.StarList = new List<Star>();
         }
@@ -632,13 +629,8 @@ public class ManaVisit : Regist
 
         #region Award
         
-        if (ManaTutorial.TutorialC || Random.Range(0f,1f) <= AwardRate)
+        if (Random.Range(0f,1f) <= AwardRate)
         {
-            if (ManaTutorial.TutorialC)
-            {
-                ManaTutorial.EndC();
-            }
-
             if (ManaGarden.PlantList.Count > 0)
             {
                 ManaGarden.PlantList.Random()[0].Flower.Award = true;

Assets/Script/Manage/PlazaRoomMge.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Sfs2X.Entities.Data;
+using UnityEngine;
+
+public class PlazaRoomMge : Regist
+{
+    private class RoomData
+    {
+        #region Config
+
+        private static string IDLabel = "i";
+        private static string OwnerLabel = "o";
+        private static string DurationLabel = "d";
+        private static string MaxPlayerLabel = "m";
+        private static string NameLabel = "n";
+        private static string StartTimeLabel = "s";
+
+        public int ID;
+        public long Owner;
+        public int Duration;
+        public int MaxPlayer;
+        public string Name;
+        public DateTime StartTime;
+
+        public bool IsSystemRoom;
+
+        #endregion
+
+        public RoomData(ISFSObject arg)
+        {
+            ID = arg.GetInt(IDLabel);
+            Owner = arg.GetLong(OwnerLabel);
+            Duration = arg.GetInt(DurationLabel);
+            MaxPlayer = arg.GetInt(MaxPlayerLabel);
+            Name = arg.GetUtfString(NameLabel);
+            Debug.Log(arg.GetClass(StartTimeLabel).ToString());
+            Debug.Log(arg.GetData(StartTimeLabel).ToString());
+            //StartTime = DateTime.Parse();
+
+            if (ID == 0)
+                IsSystemRoom = true;
+
+            Debug.Log(ID);
+            Debug.Log(Owner);
+            Debug.Log(Duration);
+            Debug.Log(MaxPlayer);
+            Debug.Log(Name);
+            Debug.Log(StartTime);
+            Debug.Log(IsSystemRoom);
+        }
+    }
+
+    #region Config
+
+    public static bool FilterEnabled;
+    
+    #endregion
+
+    public override void RegistValueA()
+    {
+        DatabaseManager.OnReceiveRoomData += OnReceiveRoomData;
+        DatabaseManager.GetRoomList(0);
+    }
+
+    public static void OnReceiveRoomData(ISFSArray sfsArray)
+    {
+        for (int i = 0; i < sfsArray.Count; i++)
+        {
+            new RoomData(sfsArray.GetSFSObject(i));
+        }
+    }
+
+
+    public static void OpenPanel()
+    {
+        ManaReso.Get("Z_BK").TweenForCG();
+    }
+
+    public static void ClosePanel()
+    {
+        ManaReso.Get("Z_BK").TweenBacCG();
+    }
+
+    public static void EnableFilter()
+    {
+        FilterEnabled = true;
+        ManaReso.SetActive("Z_InfoImg51", true);
+    }
+
+    public static void DisableFilter()
+    {
+        FilterEnabled = false;
+        ManaReso.SetActive("Z_InfoImg51", false);
+    }
+}

Assets/Script/Manage/PlazaRoomMge.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: a1a597d6cd43ee241a05c8da478c2230
+timeCreated: 1507858461
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Object/Player.cs

@@ -699,7 +699,7 @@ public class Player : Regist , IPointerClickHandler
             return;
         }
 
-        if (GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.InPlazaRoom)
+        if (GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.InPlazaRoom)
         {
             CurrentAnimationName = animName;
         }
@@ -1039,10 +1039,7 @@ public class Player : Regist , IPointerClickHandler
                 EventType.BackwardFinish,
                 () =>
                 {
-                    for (int i = 0; i < ManaGarden.PlantList.Count; i++)
-                    {
-                        ManaGarden.PlantList[i].Flower.RetrieveElf();
-                    }
+                    ManaGarden.RetrieveAllElf();
 
                     ChildDic["ShadowParent"].SetActive(true);
                     ChildDic["ShadowParent"].SetLZ(3);

Assets/Script/Object/PlazaRoom.cs

@@ -162,7 +162,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
     public void DepthThread()
     {
-        foreach (var v in GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.UserInstanceDictionary.Values)
+        foreach (var v in GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.UserInstanceDictionary.Values)
         {
             if (v.Player.transform.hasChanged)
             {
@@ -175,7 +175,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
     public void ResetDepth()
     {
-        List<PlazaRoomManager.PlazaRoomPlayer> plazaRoomPlayers = GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.UserInstanceDictionary.Values.ToList();
+        List<SFSPlazaRoomManager.PlazaRoomPlayer> plazaRoomPlayers = GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.UserInstanceDictionary.Values.ToList();
 
         plazaRoomPlayers.MySort((player1, player2) => player1.Player.transform.position.z > player2.Player.transform.position.z);
 
@@ -191,6 +191,6 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
     public void OnPointerClick(PointerEventData eventData)
     {
-        GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.MoveTo(eventData.pointerCurrentRaycast.worldPosition + new Vector3(0, 0, -3));
+        GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.MoveTo(eventData.pointerCurrentRaycast.worldPosition + new Vector3(0, 0, -3));
     }
 }

Assets/Script/SFS/ID/DatabaseID.cs

@@ -0,0 +1,4 @@
+public enum DatabaseID
+{
+    RoomData = 0,
+}

Assets/Script/SFS/ID/DatabaseID.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: df9cdc0115dc04247b3a8729768c0a7a
+timeCreated: 1507884670
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/SFS/ID/RequestID.cs

@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public enum RequestID
+{
+    Command = 0,
+    Database = 1,
+}

Assets/Script/SFS/ID/RequestID.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 41e735b3499fb1c4aacc32cc9e97319c
+timeCreated: 1507883492
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/SFS/Manager/BaseConnector.cs

@@ -9,8 +9,8 @@ public abstract class BaseConnector
     public GardenSmartFox GardenSmartFox;
 
     public int TcpPort = 9933;
-    public string Host = "121.199.20.79";
-    //public string Host = "127.0.0.1";
+    //public string Host = "121.199.20.79";
+    public string Host = "127.0.0.1";
 
     public Action<BaseEvent> onConnectSucceed;
     public Action<BaseEvent> onConnectFailed;

Assets/Script/SFS/Manager/DatabaseManager.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Sfs2X.Core;
+using Sfs2X.Entities.Data;
+using Sfs2X.Requests;
+using UnityEngine;
+
+public class DatabaseManager
+{
+    private static string DatabaseIDLabel = "D";
+    private static string StartIDLabel = "S";
+    private static string ResultLabel = "R";
+    private static GardenSmartFox GardenSmartFox;
+
+    public static Action<ISFSArray> OnReceiveRoomData;
+
+    public DatabaseManager(GardenSmartFox smartFox)
+    {
+        GardenSmartFox = smartFox;
+        smartFox.ExtensionManager.BaseSFSExtension.Instances.Add(this);
+    }
+
+    public static void GetRoomList(int startID)
+    {
+        SFSObject parameter = new SFSObject();
+        parameter.PutInt(DatabaseIDLabel, DatabaseID.RoomData.GetHashCode());
+        parameter.PutInt(StartIDLabel, startID);
+        GardenSmartFox.SmartFox.Send(new ExtensionRequest(RequestID.Database.GetHashString(), parameter));
+    }
+
+    public void RoomData(BaseEvent baseEvent)
+    {
+        //DebugManager.PrintKeysAndValuesOfBaseEvent("RoomData", baseEvent);
+
+        SFSObject sfsObject = (SFSObject) baseEvent.Params["params"];
+        OnReceiveRoomData.Invoke(sfsObject.GetSFSArray(ResultLabel));
+    }
+}

Assets/Script/SFS/Manager/DatabaseManager.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 35829a5e72727944fa4db306dd7399cc
+timeCreated: 1507883754
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/SFS/Manager/GardenSmartFox.cs

@@ -32,7 +32,6 @@ public class GardenSmartFox
 {
     #region Variable
 
-    public const string CommandRequestLabel = "0";
     public const string CommandArrayLabel = "A";
 	public const string CommandLabel = "C";
 	public const string ParameterLabel = "P";
@@ -43,8 +42,9 @@ public class GardenSmartFox
 
     public BaseLoggor Loggor;
     public BaseConnector Connector;
+    public DatabaseManager DatabaseManager;
     public SFSExtensionManager ExtensionManager;
-    public PlazaRoomManager PlazaRoomManager;
+    public SFSPlazaRoomManager SFSPlazaRoomManager;
 
     public float RequestTime = 3f;
     public float RequestTimer = 0f;
@@ -62,7 +62,8 @@ public class GardenSmartFox
         Loggor = baseLoggor.Init(this);
         Connector = baseConnector.Init(this);
         ExtensionManager = new SFSExtensionManager(this);
-        PlazaRoomManager = new PlazaRoomManager(this);
+        DatabaseManager = new DatabaseManager(this);
+        SFSPlazaRoomManager = new SFSPlazaRoomManager(this);
     }
 
     public void ExecuteAfterCheckConection(Action execute, Action<bool, BaseEvent> onConnectResult = null, Action<bool, BaseEvent> onLoginResult = null)
@@ -220,14 +221,14 @@ public class GardenSmartFox
     {
         parameter = ConstructRequestParameter(new List<SFSObject>() { parameter });
 
-        SmartFox.Send(new ExtensionRequest(CommandRequestLabel, parameter));
+        SmartFox.Send(new ExtensionRequest(RequestID.Command.GetHashCode().ToString(), parameter));
     }
 
     public void SendRequest(List<SFSObject> parameters)
     {
         SFSObject parameter = ConstructRequestParameter(parameters);
 
-        SmartFox.Send(new ExtensionRequest(CommandRequestLabel, parameter));
+        SmartFox.Send(new ExtensionRequest(RequestID.Command.GetHashCode().ToString(), parameter));
     }
 
     public static SFSObject ConstructRequestParameter(List<SFSObject> sfsObjects)

Assets/Script/SFS/Manager/GardenSmartFoxManager.cs

@@ -114,7 +114,7 @@ public class GardenSmartFoxManager : Regist
     public void Update()
     {
         GardenSmartFox.SmartFox.ProcessEvents();
-        GardenSmartFox.PlazaRoomManager.Update();
+        GardenSmartFox.SFSPlazaRoomManager.Update();
         
         GardenSmartFox.ProcessRequest();
     }

Assets/Script/SFS/Manager/PlazaRoomManager.cs → Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -11,7 +11,7 @@ using Sfs2X.Requests;
 using Sfs2X.Entities.Variables;
 using UnityEngine.UI;
 
-public class PlazaRoomManager 
+public class SFSPlazaRoomManager 
 {
     public class PlazaRoomPlayer
     {
@@ -181,14 +181,14 @@ public class PlazaRoomManager
         (
             () =>
             {
-                GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Pending;
+                GardenSmartFox.SFSPlazaRoomManager.JoinRoomStatus = RequestStatus.Pending;
                 GardenSmartFox.ExtensionManager.PlazaRoomExtension.JoinPlazaRoom();
             },
             (succeed, baseEvent) =>
             {
                 if (!succeed)
                 {
-                    GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
+                    GardenSmartFox.SFSPlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
                     TryEnterPlazaRoom();
                 }
             },
@@ -196,7 +196,7 @@ public class PlazaRoomManager
             {
                 if (!succeed)
                 {
-                    GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
+                    GardenSmartFox.SFSPlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
                     TryEnterPlazaRoom();
                 }
             }
@@ -205,22 +205,22 @@ public class PlazaRoomManager
 
     public void TryEnterPlazaRoom()
     {
-        if (!GardenSmartFox.PlazaRoomManager.IsBlackMaskFinish)
+        if (!GardenSmartFox.SFSPlazaRoomManager.IsBlackMaskFinish)
         {
             return;
         }
 
-        if (!GardenSmartFox.PlazaRoomManager.EnteringPlazaRoom)
+        if (!GardenSmartFox.SFSPlazaRoomManager.EnteringPlazaRoom)
         {
             return;
         }
 
-        if (GardenSmartFox.PlazaRoomManager.JoinRoomStatus == RequestStatus.Pending)
+        if (GardenSmartFox.SFSPlazaRoomManager.JoinRoomStatus == RequestStatus.Pending)
         {
             return;
         }
 
-        if (GardenSmartFox.PlazaRoomManager.JoinRoomStatus == RequestStatus.Failed)
+        if (GardenSmartFox.SFSPlazaRoomManager.JoinRoomStatus == RequestStatus.Failed)
         {
             QuitPlazaRoom();
 
@@ -228,7 +228,7 @@ public class PlazaRoomManager
 
             EnteringPlazaRoom = false;
         }
-        else if (GardenSmartFox.PlazaRoomManager.JoinRoomStatus == RequestStatus.Succeed)
+        else if (GardenSmartFox.SFSPlazaRoomManager.JoinRoomStatus == RequestStatus.Succeed)
         {
             EnterPlazaRoom();
 
@@ -247,11 +247,13 @@ public class PlazaRoomManager
         }
         
 
-        GardenSmartFox.PlazaRoomManager.PlazaRoomSky = ManaReso.Get("PlazaRoomSky");
-        SkyOriginPosition = GardenSmartFox.PlazaRoomManager.PlazaRoomSky.position;
+        ManaGarden.RetrieveAllElf();
 
-        GardenSmartFox.PlazaRoomManager.PlazaRoomCamera = ManaReso.Get<Camera>("MainCamera");
-        GardenSmartFox.PlazaRoomManager.CameraOriginPosition = GardenSmartFox.PlazaRoomManager.PlazaRoomCamera.transform.position;
+        GardenSmartFox.SFSPlazaRoomManager.PlazaRoomSky = ManaReso.Get("PlazaRoomSky");
+        SkyOriginPosition = GardenSmartFox.SFSPlazaRoomManager.PlazaRoomSky.position;
+
+        GardenSmartFox.SFSPlazaRoomManager.PlazaRoomCamera = ManaReso.Get<Camera>("MainCamera");
+        GardenSmartFox.SFSPlazaRoomManager.CameraOriginPosition = GardenSmartFox.SFSPlazaRoomManager.PlazaRoomCamera.transform.position;
 
         //Debug.Log(GardenSmartFox.User.Id);
         SelfUser = GardenSmartFox.User;
@@ -264,10 +266,10 @@ public class PlazaRoomManager
         SendInstantiateRequset(-1);
 
 
-        GardenSmartFox.PlazaRoomManager.CameraLeftBorder = ManaReso.Get("PlazaRoomCameraLeftBorder").position.x;
-        GardenSmartFox.PlazaRoomManager.CameraRightBorder = ManaReso.Get("PlazaRoomCameraRightBorder").position.x;
+        GardenSmartFox.SFSPlazaRoomManager.CameraLeftBorder = ManaReso.Get("PlazaRoomCameraLeftBorder").position.x;
+        GardenSmartFox.SFSPlazaRoomManager.CameraRightBorder = ManaReso.Get("PlazaRoomCameraRightBorder").position.x;
 
-        GardenSmartFox.PlazaRoomManager.PlazaRoomCamera.transform.SetX(GardenSmartFox.PlazaRoomManager.CameraLeftBorder);
+        GardenSmartFox.SFSPlazaRoomManager.PlazaRoomCamera.transform.SetX(GardenSmartFox.SFSPlazaRoomManager.CameraLeftBorder);
 
         ManaReso.Get("V_BlackMask").TweenForCG();
 
@@ -318,11 +320,11 @@ public class PlazaRoomManager
 
         GardenSmartFox.SmartFox.Send(new LeaveRoomRequest(CurrentPlazaRoom));
 
-        GardenSmartFox.PlazaRoomManager.CurrentPlazaRoom = null;
+        GardenSmartFox.SFSPlazaRoomManager.CurrentPlazaRoom = null;
     }
 
 
-    public PlazaRoomManager(GardenSmartFox gardenSmartFox)
+    public SFSPlazaRoomManager(GardenSmartFox gardenSmartFox)
     {
         GardenSmartFox = gardenSmartFox;
 
@@ -346,7 +348,7 @@ public class PlazaRoomManager
         if (EnteringPlazaRoom)
             return;
 
-        KeepAliveThread();
+        //KeepAliveThread();
 
         CameraControllThread();
     }
@@ -403,9 +405,9 @@ public class PlazaRoomManager
 
     public void MoveTo(Vector3 destination)
     {
-        GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SelfInstance.MoveTo(destination);
+        GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SelfInstance.MoveTo(destination);
 
-        GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendSynchronizeDestination(destination);
+        GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.SendSynchronizeDestination(destination);
 
         MoveSky(SelfInstance.MoveTween.Duration, SelfInstance.MoveTween.Delta);
     }
@@ -442,7 +444,7 @@ public class PlazaRoomManager
 
     public void OnJoinPlazaRoom(Room room)
     {
-        GardenSmartFox.PlazaRoomManager.CurrentPlazaRoom = room;
+        GardenSmartFox.SFSPlazaRoomManager.CurrentPlazaRoom = room;
 
         JoinRoomStatus = RequestStatus.Succeed;
         TryEnterPlazaRoom();

Assets/Script/SFS/SFSExtension/BaseSFSExtension.cs

@@ -13,7 +13,8 @@ public class BaseSFSExtension
     public GardenSmartFox GardenSmartFox;
     public List<object> Instances = new List<object>();
 
-    public Dictionary<int, Action<BaseEvent>> ResponseDictionary = new Dictionary<int, Action<BaseEvent>>();
+    public Dictionary<int, Action<BaseEvent>> DatabaseDictionary = new Dictionary<int, Action<BaseEvent>>();
+    public Dictionary<int, Action<BaseEvent>> CommandDictionary = new Dictionary<int, Action<BaseEvent>>();
 
     public BaseSFSExtension Init(GardenSmartFox smartFox)
     {
@@ -34,33 +35,44 @@ public class BaseSFSExtension
     {
         //DebugManager.PrintKeysAndValuesOfBaseEvent("OnExtensionResponse", baseEvent);
 
-        int requestID = int.Parse((string)baseEvent.Params["cmd"]);
+        string[] strings = baseEvent.Params["cmd"].ToString().Split('|');
 
-        if (ResponseDictionary.ContainsKey(requestID))
+        int requestID = int.Parse(strings[0]);
+        int id = int.Parse(strings[1]);
+
+        if (requestID == RequestID.Command.GetHashCode())
+            HandleExtensionResponse(baseEvent, CommandDictionary, typeof(CommandID), id);
+        else if (requestID == RequestID.Database.GetHashCode())
+            HandleExtensionResponse(baseEvent, DatabaseDictionary, typeof(DatabaseID), id);
+    }
+
+    private void HandleExtensionResponse(BaseEvent baseEvent, Dictionary<int, Action<BaseEvent>> dictionary, Type type, int id)
+    {
+        if (dictionary.ContainsKey(id))
         {
-            ResponseDictionary[requestID].Invoke(baseEvent);
+            dictionary[id].Invoke(baseEvent);
         }
         else
         {
-            Action<BaseEvent> callback = GetExtensionResponseMethod(requestID);
+            Action<BaseEvent> callback = GetExtensionResponseMethod(type, id);
 
-            ResponseDictionary.Add(requestID, callback);
+            dictionary.Add(id, callback);
 
             callback.Invoke(baseEvent);
         }
     }
 
-    private Action<BaseEvent> GetExtensionResponseMethod(int requestID)
+    private Action<BaseEvent> GetExtensionResponseMethod(Type type, int id)
     {
         for (int i = 0; i < Instances.Count; i++)
         {
-            Action<BaseEvent> method = (Action<BaseEvent>)Delegate.CreateDelegate(typeof(Action<BaseEvent>), Instances[i], Enum.GetName(typeof(CommandID), requestID), false, false);
+            Action<BaseEvent> method = (Action<BaseEvent>)Delegate.CreateDelegate(typeof(Action<BaseEvent>), Instances[i], Enum.GetName(type, id), false, false);
 
             if (method != null)
                 return method;
         }
 
-        throw new Exception("没有找到方法 : " + requestID);
+        throw new Exception("没有找到方法 : " + id);
     }
 
 

Assets/Script/Tool/Auxiliary.cs

@@ -142,7 +142,30 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            //GardenSmartFoxManager.GardenSmartFox.SmartFox.Disconnect();
+            GardenSmartFoxManager.GardenSmartFox.SFSPlazaRoomManager.OnEnterPlazaRoomButton();
+            //ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();
+            //ManaReso.Get<VerticalLayoutGroup>("R_Grid").SetLayoutVertical();
+        }
+
+        if (Input.GetKeyDown(KeyCode.A))
+        {
+            DatabaseManager.GetRoomList(0);
+
+            //ManaServer.NotificationIndex = ManaData.GetPlayerInt("NotificationIndex") + 1;
+            //ManaCenter.OfflineLock = true;
+            //ManaSign.ShowOfflinePanel();
+
+            //ManaTutorial.EnterC1();
+        }
+
+        if (Input.GetKeyDown(KeyCode.S))
+        {
+            ManaTutorial.EnterD1();
+        }
+
+        if (Input.GetKeyDown(KeyCode.D))
+        {
+            ManaTutorial.EnterPlazaRoom();
         }
 
         if (Input.GetKeyDown(KeyCode.Z))

第三期.txt

@@ -1,12 +1,9 @@
 Z界面的语言
 
+房间名字长度测试
 
-离线收益接着弹公告有Bug
 
-手机上 没有设置昵称时 关闭自动弹出的昵称界面后屏幕有遮罩?
-
-
-服务器新旧版存取档是否兼容
+服务器新旧版存取档是否兼容(如果不兼容 可能无法从第二期切换到第三期)
 
 切换到远程服务器