Bladeren bron

增加创建房间功能

liuqilin 8 jaren geleden
bovenliggende
commit
3b01f361e3
31 gewijzigde bestanden met toevoegingen van 2926 en 439 verwijderingen
  1. 13 2
      Assets/AtlasUtility/Script/Editor/TestEditor.cs
  2. 4 1
      Assets/AtlasUtility/Script/Test.cs
  3. 355 0
      Assets/Resource/Logo.unity
  4. 56 55
      Assets/Resource/Prefab/PrefabUI/GroupC.prefab
  5. 655 47
      Assets/Resource/Prefab/PrefabUI/GroupD.prefab
  6. 569 112
      Assets/Resource/Prefab/PrefabUI/GroupE.prefab
  7. 36 43
      Assets/Resource/Prefab/PrefabUI/MessageBox.prefab
  8. 703 0
      Assets/Resource/Prefab/PrefabUI/PlazaRoomItem.prefab
  9. 8 0
      Assets/Resource/Prefab/PrefabUI/PlazaRoomItem.prefab.meta
  10. 24 10
      Assets/Resource/Prefab/PrefabUI/X_InfoItem.prefab
  11. BIN
      Assets/Resource/Sprite/Editor/PlazaRoom/减号.png
  12. 68 0
      Assets/Resource/Sprite/Editor/PlazaRoom/减号.png.meta
  13. BIN
      Assets/Resource/Sprite/Editor/PlazaRoom/加号.png
  14. 68 0
      Assets/Resource/Sprite/Editor/PlazaRoom/加号.png.meta
  15. BIN
      Assets/Resource/Sprite/Editor/PlazaRoom/表情框.png
  16. 100 0
      Assets/Resource/Sprite/Editor/PlazaRoom/表情框.png.meta
  17. 10 2
      Assets/Resource/Sprite/Editor/SpriteUI/Square.png.meta
  18. 36 36
      Assets/Resource/XML/Config/flower_config.xml
  19. 3 3
      Assets/Resource/XML/lan/ChineseSimplified.xml
  20. 22 22
      Assets/Resource/XML/lan/ChineseTraditional.xml
  21. 19 19
      Assets/Resource/XML/lan/English.xml
  22. 1 1
      Assets/Script/Manage/ManaGarden.cs
  23. 23 5
      Assets/Script/Manage/ManaInfoBox.cs
  24. 1 0
      Assets/Script/Manage/ManaPlayer.cs
  25. 2 4
      Assets/Script/Manage/ManaReso.cs
  26. 64 26
      Assets/Script/Manage/ManaUI.cs
  27. 0 1
      Assets/Script/Object/PlazaRoom.cs
  28. 74 46
      Assets/Script/SFS/Manager/PlazaRoomManager.cs
  29. 1 1
      Assets/Script/Tool/Auxiliary.cs
  30. 3 0
      Assets/Script/Tool/Lib.cs
  31. 8 3
      第三期.txt

+ 13 - 2
Assets/AtlasUtility/Script/Editor/TestEditor.cs

@@ -1,4 +1,6 @@
-namespace AtlasUtility
+using System.Text;
+
+namespace AtlasUtility
 {
     using UnityEditor;
     using UnityEngine;
@@ -23,7 +25,16 @@
 
             if (GUILayout.Button("Test"))
             {
-                
+                //char c = (char)0x48;
+
+                //Script.Text.text = $"123:\u3000456789abc";
+                //Script.Text.text = $"123:{c}456789abc ";
+                //Script.Text.text = "用这个吧 ,可以代替空格,占2个空格位";
+
+                //foreach (var b in Encoding.Unicode.GetBytes(Script.Text.text[0].ToString()))
+                //{
+                //    Debug.Log(b);
+                //}
             }
         }
     }

+ 4 - 1
Assets/AtlasUtility/Script/Test.cs

@@ -1,4 +1,6 @@
-namespace AtlasUtility
+using UnityEngine.UI;
+
+namespace AtlasUtility
 {
     using UnityEngine;
 
@@ -8,6 +10,7 @@
 
         public Sprite Sprite;
         public Texture2D Texture2D;
+        public Text Text;
         public SpriteRenderer SpriteRenderer;
 
         #endregion

+ 355 - 0
Assets/Resource/Logo.unity

@@ -91,6 +91,135 @@ 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: 0
+      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: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224485152812742680, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 224137798955719282, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224310538375108382, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 224504713983873336, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1502802277113396, guid: 718ebdaed223e93409d6dc7e53a23167, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 718ebdaed223e93409d6dc7e53a23167, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -155,6 +284,211 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1001 &1006258682
+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}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
+--- !u!224 &1006258683 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    type: 2}
+  m_PrefabInternal: {fileID: 1006258682}
+--- !u!1001 &1064658142
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1701710831}
+    m_Modifications:
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0.000030518
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: -15.499992
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 665
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224711052818110276, guid: ce45010746b70ca40a7e91ce5a0a5e10,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: ce45010746b70ca40a7e91ce5a0a5e10, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -418,6 +752,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!224 &1701710831 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 224246090464727552, guid: 718ebdaed223e93409d6dc7e53a23167,
+    type: 2}
+  m_PrefabInternal: {fileID: 444715154}
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0
@@ -427,6 +766,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1833966245}
   - component: {fileID: 1833966244}
+  - component: {fileID: 1833966246}
   m_Layer: 0
   m_Name: ManagerGame
   m_TagString: Untagged
@@ -461,3 +801,18 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1833966246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1833966243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef3c42f14ba649d4aaf2ea3afe194ba7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Sprite: {fileID: 0}
+  Texture2D: {fileID: 0}
+  Text: {fileID: 0}
+  SpriteRenderer: {fileID: 0}

+ 56 - 55
Assets/Resource/Prefab/PrefabUI/GroupC.prefab

@@ -236,7 +236,7 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 224632658604237256}
-  - component: {fileID: 114054225746362868}
+  - component: {fileID: 114543217054204102}
   m_Layer: 5
   m_Name: HGroup
   m_TagString: Untagged
@@ -367,7 +367,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1392157104044466
 GameObject:
   m_ObjectHideFlags: 1
@@ -1002,28 +1002,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6210\u5C31"
---- !u!114 &114054225746362868
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1279120123303556}
-  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: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
 --- !u!114 &114064049726762222
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1389,7 +1367,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 6a4df3dce104aed4caa0f4bdcea42c30, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1552,16 +1530,16 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 25
+    m_FontSize: 15
     m_FontStyle: 0
     m_BestFit: 1
-    m_MinSize: 2
+    m_MinSize: 1
     m_MaxSize: 25
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 0
     m_HorizontalOverflow: 0
-    m_VerticalOverflow: 1
+    m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u70B9\u51FB\u82B1\u6735\u79CD\u5230\u82B1\u56ED\u91CC"
 --- !u!114 &114320216275259612
@@ -1972,7 +1950,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: 1e0c425d384f8644282ea5d7104860e4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2044,6 +2022,29 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6536\u56DE\u6240\u6709\u82B1"
+--- !u!114 &114543217054204102
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1279120123303556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 176.16, y: 58}
+  m_Spacing: {x: 15, y: 0}
+  m_Constraint: 0
+  m_ConstraintCount: 2
 --- !u!114 &114546598425434916
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2148,7 +2149,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.3372549, g: 0.60784316, b: 0.60784316, a: 1}
   m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -2161,8 +2162,8 @@ MonoBehaviour:
     m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 15
-    m_Alignment: 8
+    m_MaxSize: 20
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 0
     m_HorizontalOverflow: 1
@@ -5666,10 +5667,10 @@ RectTransform:
   m_Father: {fileID: 224580893849471086}
   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.000022888, y: -0.000015259}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000030517578, y: 19.999987}
+  m_SizeDelta: {x: -110, y: 60}
   m_Pivot: {x: 0.50000024, y: -0.00000006146729}
 --- !u!224 &224111630911852040
 RectTransform:
@@ -5897,8 +5898,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -0.00012958399, y: 14.499887}
-  m_SizeDelta: {x: 171, y: 259}
+  m_AnchoredPosition: {x: -0.0001296997, y: 14.499887}
+  m_SizeDelta: {x: 130, y: 197}
   m_Pivot: {x: 0.50000006, y: 0.000000074505806}
 --- !u!224 &224311854973101772
 RectTransform:
@@ -5970,8 +5971,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -75, y: -71.7}
-  m_SizeDelta: {x: 120.44, y: 110}
+  m_AnchoredPosition: {x: -58, y: -54.7}
+  m_SizeDelta: {x: 80.207, y: 73.152}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224389617837171238
 RectTransform:
@@ -6007,7 +6008,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 88.915, y: -29}
+  m_AnchoredPosition: {x: 190.06999, y: -29}
   m_SizeDelta: {x: 176.16, y: 58}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224430002346188078
@@ -6117,12 +6118,12 @@ RectTransform:
   - {fileID: 224293496060027752}
   - {fileID: 224970525637999822}
   m_Father: {fileID: 224590564811158144}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 10, y: -117.06}
-  m_SizeDelta: {x: 210, y: 40}
+  m_AnchoredPosition: {x: 10, y: -71.6}
+  m_SizeDelta: {x: 184.4, y: 35.118}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224590564811158144
 RectTransform:
@@ -6136,8 +6137,8 @@ RectTransform:
   m_Children:
   - {fileID: 224779658539582892}
   - {fileID: 224843279890597442}
-  - {fileID: 224580893849471086}
   - {fileID: 224752065467151726}
+  - {fileID: 224580893849471086}
   - {fileID: 224387557482805238}
   - {fileID: 224632658604237256}
   m_Father: {fileID: 224846047146302080}
@@ -6145,8 +6146,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000015258789, y: 9}
-  m_SizeDelta: {x: 493, y: 413}
+  m_AnchoredPosition: {x: 0, y: 14.15}
+  m_SizeDelta: {x: 367.3, y: 307.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224632658604237256
 RectTransform:
@@ -6165,8 +6166,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 10.001, y: -199}
-  m_SizeDelta: {x: 355.66, y: 58}
+  m_AnchoredPosition: {x: 10.001, y: -153.3}
+  m_SizeDelta: {x: 571.3, y: 58}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224690239718957846
 RectTransform:
@@ -6277,12 +6278,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224590564811158144}
-  m_RootOrder: 3
+  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: -205.04999, y: 86.74}
-  m_SizeDelta: {x: 73.600006, y: 20.6}
+  m_AnchoredPosition: {x: -65.3, y: 82.25}
+  m_SizeDelta: {x: 64.4, y: 20.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224758475223130984
 RectTransform:
@@ -6336,7 +6337,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 266.745, y: -29}
+  m_AnchoredPosition: {x: 381.22998, y: -29}
   m_SizeDelta: {x: 176.16, y: 58}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224779658539582892
@@ -6391,8 +6392,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 20, y: -144.52}
-  m_SizeDelta: {x: 285, y: 36}
+  m_AnchoredPosition: {x: 20, y: -101.7}
+  m_SizeDelta: {x: 195, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224846047146302080
 RectTransform:

File diff suppressed because it is too large
+ 655 - 47
Assets/Resource/Prefab/PrefabUI/GroupD.prefab


File diff suppressed because it is too large
+ 569 - 112
Assets/Resource/Prefab/PrefabUI/GroupE.prefab


+ 36 - 43
Assets/Resource/Prefab/PrefabUI/MessageBox.prefab

@@ -38,7 +38,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224396237782273722}
   - component: {fileID: 222043793631706948}
-  - component: {fileID: 114049154407234384}
+  - component: {fileID: 114867552608925502}
   m_Layer: 5
   m_Name: MessageBoxLab
   m_TagString: Untagged
@@ -63,48 +63,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &114049154407234384
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1283005557691056}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 2
-    m_MaxSize: 20
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 
-  Draw: 0
-  SetY: 0
-  Y: 0
-  LineHeight: 0
-  RemovePos: 
-  ImageIndex: 
-  RemoveIndex: 
-  NewTextIndex: 
-  NewTextPos: []
 --- !u!114 &114441359897983664
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -160,6 +118,41 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   Draw: 0
+--- !u!114 &114867552608925502
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1283005557691056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ebaa46003e10d4c459afb999db97c153, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, 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: 29
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+  VerticalMinSize: 1
+  VerticalMaxSize: 29
 --- !u!222 &222043793631706948
 CanvasRenderer:
   m_ObjectHideFlags: 1

+ 703 - 0
Assets/Resource/Prefab/PrefabUI/PlazaRoomItem.prefab

@@ -0,0 +1,703 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1961232547500744}
+  m_IsPrefabParent: 1
+--- !u!1 &1057530636678082
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224648926747656188}
+  - component: {fileID: 222255447008704092}
+  - component: {fileID: 114333785036411492}
+  m_Layer: 5
+  m_Name: Img
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1153357562666560
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224401543678356662}
+  - component: {fileID: 222496204455521578}
+  - component: {fileID: 114123476559954176}
+  m_Layer: 5
+  m_Name: Z_InfoLab1 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1269938217948052
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224177638684000114}
+  - component: {fileID: 222281266365830492}
+  - component: {fileID: 114355183513616730}
+  m_Layer: 5
+  m_Name: Z_InfoLab4 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1317358328448424
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224291769336483440}
+  - component: {fileID: 222717663412179888}
+  - component: {fileID: 114279276892384510}
+  m_Layer: 5
+  m_Name: Z_InfoLab2 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1489086538009302
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224530414913803614}
+  - component: {fileID: 222204698228861134}
+  - component: {fileID: 114362629780102600}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1520227194548740
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224064680488947386}
+  - component: {fileID: 222467422629194382}
+  - component: {fileID: 114578712682396148}
+  m_Layer: 5
+  m_Name: Z_InfoLab3 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1694037134638642
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224830126307579766}
+  - component: {fileID: 222238521479664738}
+  - component: {fileID: 114192196744238828}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1800012577359488
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224119718105900110}
+  - component: {fileID: 222553014019370642}
+  - component: {fileID: 114851451074887986}
+  m_Layer: 5
+  m_Name: ID
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1858250449022854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224867655372228590}
+  - component: {fileID: 222006452645796714}
+  - component: {fileID: 114437086977747808}
+  m_Layer: 5
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1961232547500744
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224711052818110276}
+  m_Layer: 5
+  m_Name: PlazaRoomItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114123476559954176
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1153357562666560}
+  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, g: 0, b: 0, a: 0.78431374}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6D3E\u5BF9\u540D\u79F0"
+--- !u!114 &114192196744238828
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1694037134638642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.9411765}
+  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: 9bb7920cf00be4a41a9c6ce43b1b258f, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114279276892384510
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1317358328448424}
+  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, g: 0, b: 0, a: 0.78431374}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u72B6\u6001"
+--- !u!114 &114333785036411492
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1057530636678082}
+  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: 0.52205884, b: 0.52205884, 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 &114355183513616730
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1269938217948052}
+  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, g: 0, b: 0, a: 0.78431374}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4EBA\u5458"
+--- !u!114 &114362629780102600
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1489086538009302}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 80
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5DF2\u6EE1"
+--- !u!114 &114437086977747808
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1858250449022854}
+  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 &114578712682396148
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1520227194548740}
+  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, g: 0, b: 0, a: 0.78431374}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u65F6\u957F"
+--- !u!114 &114851451074887986
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1800012577359488}
+  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, g: 0, b: 0, a: 0.78431374}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u623F\u95F4\u53F7"
+--- !u!222 &222006452645796714
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1858250449022854}
+--- !u!222 &222204698228861134
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1489086538009302}
+--- !u!222 &222238521479664738
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1694037134638642}
+--- !u!222 &222255447008704092
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1057530636678082}
+--- !u!222 &222281266365830492
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1269938217948052}
+--- !u!222 &222467422629194382
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1520227194548740}
+--- !u!222 &222496204455521578
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1153357562666560}
+--- !u!222 &222553014019370642
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1800012577359488}
+--- !u!222 &222717663412179888
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1317358328448424}
+--- !u!224 &224064680488947386
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1520227194548740}
+  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: 224711052818110276}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 67.49999, y: 69.27}
+  m_SizeDelta: {x: 93.8, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224119718105900110
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1800012577359488}
+  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: 224711052818110276}
+  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: -282.5, y: 69.27}
+  m_SizeDelta: {x: 93.8, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224177638684000114
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1269938217948052}
+  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: 224711052818110276}
+  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: 164.16664, y: 69.27}
+  m_SizeDelta: {x: 93.8, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224291769336483440
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1317358328448424}
+  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: 224711052818110276}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -39.166714, y: 69.27}
+  m_SizeDelta: {x: 93.8, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224401543678356662
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1153357562666560}
+  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: 224711052818110276}
+  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: -165.83328, y: 69.27}
+  m_SizeDelta: {x: 127.2, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224530414913803614
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1489086538009302}
+  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: 224830126307579766}
+  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 &224648926747656188
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1057530636678082}
+  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: 224711052818110276}
+  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: -282.5, y: 69.270004}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224711052818110276
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1961232547500744}
+  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: 224648926747656188}
+  - {fileID: 224119718105900110}
+  - {fileID: 224401543678356662}
+  - {fileID: 224291769336483440}
+  - {fileID: 224064680488947386}
+  - {fileID: 224177638684000114}
+  - {fileID: 224830126307579766}
+  - {fileID: 224867655372228590}
+  m_Father: {fileID: 0}
+  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.000030518, y: -15.499992}
+  m_SizeDelta: {x: 665, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224830126307579766
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1694037134638642}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.3, y: 0.3, z: 1}
+  m_Children:
+  - {fileID: 224530414913803614}
+  m_Father: {fileID: 224711052818110276}
+  m_RootOrder: 6
+  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: 260.83337, y: 69.27}
+  m_SizeDelta: {x: 328.6, y: 162}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224867655372228590
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1858250449022854}
+  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: 224711052818110276}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -1.9, y: 33.5}
+  m_SizeDelta: {x: 633.6, y: 5}
+  m_Pivot: {x: 0.5, y: 0.5}

+ 8 - 0
Assets/Resource/Prefab/PrefabUI/PlazaRoomItem.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ce45010746b70ca40a7e91ce5a0a5e10
+timeCreated: 1507802677
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 24 - 10
Assets/Resource/Prefab/PrefabUI/X_InfoItem.prefab

@@ -38,6 +38,7 @@ GameObject:
   - component: {fileID: 224682630866636858}
   - component: {fileID: 222196611509190880}
   - component: {fileID: 114800871698021790}
+  - component: {fileID: 114643820615652672}
   m_Layer: 5
   m_Name: X_InfoItem
   m_TagString: Untagged
@@ -45,6 +46,19 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!114 &114643820615652672
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1494806348296548}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!114 &114800871698021790
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -57,7 +71,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
   m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -66,16 +80,16 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 10
+    m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
-    m_MaxSize: 20
+    m_MaxSize: 30
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u63D0\u793A\u5185\u5BB9"
   Draw: 0
@@ -118,7 +132,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -177,8 +191,8 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 254.09998, y: -24.784576}
+  m_SizeDelta: {x: 485, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}

BIN
Assets/Resource/Sprite/Editor/PlazaRoom/减号.png


+ 68 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/减号.png.meta

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

BIN
Assets/Resource/Sprite/Editor/PlazaRoom/加号.png


+ 68 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/加号.png.meta

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

BIN
Assets/Resource/Sprite/Editor/PlazaRoom/表情框.png


+ 100 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/表情框.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 6b957058a5db5ed4dbfd9c766ab54f9c
+timeCreated: 1507773583
+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: 42, y: 42, z: 42, w: 42}
+  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
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 10 - 2
Assets/Resource/Sprite/Editor/SpriteUI/Square.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e4b9c6a4105e96345a144d5439198512
-timeCreated: 1490620322
+timeCreated: 1507802434
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -39,7 +39,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 1, y: 1, z: 1, w: 1}
   spritePixelsToUnits: 4
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -82,6 +82,14 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: 4
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 36 - 36
Assets/Resource/XML/Config/flower_config.xml

@@ -1,40 +1,40 @@
 <data>
-  <item id="1" name="粉色小花" desc="粉色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower1" anim="" flower_coin_buff="0.9" />
-  <item id="2" name="紫色小花" desc="紫色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower2" anim="" flower_coin_buff="1" />
-  <item id="3" name="波斯菊(粉)" desc="波斯菊(粉)的描述" unlock_ahead_cur="1" unlock_ahead="100000" icon="Flower3" anim="" flower_coin_buff="1" />
-  <item id="4" name="康乃馨(红)" desc="康乃馨(红)的描述" unlock_ahead_cur="1" unlock_ahead="500000" icon="Flower4" anim="" flower_coin_buff="1" />
-  <item id="5" name="铃兰(白)" desc="铃兰(白)的描述" unlock_ahead_cur="1" unlock_ahead="1000000" icon="Flower5" anim="" flower_coin_buff="1" />
-  <item id="6" name="马蹄莲(白)" desc="马蹄莲(白)的描述" unlock_ahead_cur="1" unlock_ahead="5000000" icon="Flower6" anim="" flower_coin_buff="1" />
-  <item id="7" name="蒲公英" desc="蒲公英的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower7" anim="" flower_coin_buff="1" />
-  <item id="8" name="牵牛花(蓝)" desc="牵牛花(蓝)的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower8" anim="" flower_coin_buff="1" />
-  <item id="9" name="三色堇(紫)" desc="三色堇(紫)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower9" anim="" flower_coin_buff="1" />
-  <item id="10" name="三叶草(粉)" desc="三叶草(粉)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower10" anim="" flower_coin_buff="1" />
-  <item id="11" name="向日葵" desc="向日葵的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower11" anim="" flower_coin_buff="1" />
-  <item id="12" name="郁金香(粉)" desc="郁金香(粉)的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower12" anim="" flower_coin_buff="1" />
-  <item id="13" name="百合花(白)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower13" anim="" flower_coin_buff="1" />
-  <item id="14" name="非洲菊(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower14" anim="" flower_coin_buff="1" />
-  <item id="15" name="红掌" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower15" anim="" flower_coin_buff="1" />
-  <item id="16" name="桔梗花" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower16" anim="" flower_coin_buff="1" />
-  <item id="17" name="康乃馨(白)" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower17" anim="" flower_coin_buff="1" />
-  <item id="18" name="铃兰(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower18" anim="" flower_coin_buff="1" />
-  <item id="19" name="曼陀罗(橘)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower19" anim="" flower_coin_buff="1" />
-  <item id="20" name="曼陀罗(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower20" anim="" flower_coin_buff="1" />
-  <item id="21" name="玫瑰花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower21" anim="" flower_coin_buff="1" />
-  <item id="22" name="玫瑰花(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower22" anim="" flower_coin_buff="1" />
-  <item id="23" name="茑萝" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower23" anim="" flower_coin_buff="1" />
-  <item id="24" name="牵牛花(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower24" anim="" flower_coin_buff="1" />
-  <item id="25" name="虞美人(红)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower25" anim="" flower_coin_buff="1" />
-  <item id="26" name="郁金香(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower26" anim="" flower_coin_buff="1" />
-  <item id="27" name="鸢尾(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower27" anim="" flower_coin_buff="1" />
-  <item id="28" name="朱槿(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower28" anim="" flower_coin_buff="1" />
-  <item id="29" name="朱槿(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower29" anim="" flower_coin_buff="1" />
-  <item id="30" name="满天星(白)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower30" anim="" flower_coin_buff="1" />
-  <item id="31" name="满天星(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower31" anim="" flower_coin_buff="1" />
-  <item id="32" name="紫罗兰(白)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower32" anim="" flower_coin_buff="1" />
-  <item id="33" name="紫罗兰(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower33" anim="" flower_coin_buff="1" />
-  <item id="34" name="紫罗兰(蓝)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower34" anim="" flower_coin_buff="1" />
-  <item id="35" name="鸡冠花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower35" anim="" flower_coin_buff="1" />
-  <item id="36" name="鸡冠花(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="1" />
+  <item id="1" name="粉色小花" desc="粉色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower1" anim="" flower_coin_buff="0.5" />
+  <item id="2" name="紫色小花" desc="紫色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower2" anim="" flower_coin_buff="0.51" />
+  <item id="3" name="波斯菊(粉)" desc="波斯菊(粉)的描述" unlock_ahead_cur="1" unlock_ahead="100000" icon="Flower3" anim="" flower_coin_buff="0.52" />
+  <item id="4" name="康乃馨(红)" desc="康乃馨(红)的描述" unlock_ahead_cur="1" unlock_ahead="500000" icon="Flower4" anim="" flower_coin_buff="0.53" />
+  <item id="5" name="铃兰(白)" desc="铃兰(白)的描述" unlock_ahead_cur="1" unlock_ahead="1000000" icon="Flower5" anim="" flower_coin_buff="0.54" />
+  <item id="6" name="马蹄莲(白)" desc="马蹄莲(白)的描述" unlock_ahead_cur="1" unlock_ahead="5000000" icon="Flower6" anim="" flower_coin_buff="0.55" />
+  <item id="7" name="蒲公英" desc="蒲公英的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower7" anim="" flower_coin_buff="0.56" />
+  <item id="8" name="牵牛花(蓝)" desc="牵牛花(蓝)的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower8" anim="" flower_coin_buff="0.57" />
+  <item id="9" name="三色堇(紫)" desc="三色堇(紫)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower9" anim="" flower_coin_buff="0.58" />
+  <item id="10" name="三叶草(粉)" desc="三叶草(粉)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower10" anim="" flower_coin_buff="0.59" />
+  <item id="11" name="向日葵" desc="向日葵的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower11" anim="" flower_coin_buff="0.6" />
+  <item id="12" name="郁金香(粉)" desc="郁金香(粉)的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower12" anim="" flower_coin_buff="0.61" />
+  <item id="13" name="百合花(白)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower13" anim="" flower_coin_buff="0.62" />
+  <item id="14" name="非洲菊(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower14" anim="" flower_coin_buff="0.63" />
+  <item id="15" name="红掌" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower15" anim="" flower_coin_buff="0.64" />
+  <item id="16" name="桔梗花" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower16" anim="" flower_coin_buff="0.65" />
+  <item id="17" name="康乃馨(白)" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower17" anim="" flower_coin_buff="0.66" />
+  <item id="18" name="铃兰(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower18" anim="" flower_coin_buff="0.67" />
+  <item id="19" name="曼陀罗(橘)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower19" anim="" flower_coin_buff="0.68" />
+  <item id="20" name="曼陀罗(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower20" anim="" flower_coin_buff="0.69" />
+  <item id="21" name="玫瑰花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower21" anim="" flower_coin_buff="0.7" />
+  <item id="22" name="玫瑰花(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower22" anim="" flower_coin_buff="0.71" />
+  <item id="23" name="茑萝" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower23" anim="" flower_coin_buff="0.72" />
+  <item id="24" name="牵牛花(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower24" anim="" flower_coin_buff="0.73" />
+  <item id="25" name="虞美人(红)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower25" anim="" flower_coin_buff="0.74" />
+  <item id="26" name="郁金香(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower26" anim="" flower_coin_buff="0.75" />
+  <item id="27" name="鸢尾(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower27" anim="" flower_coin_buff="0.76" />
+  <item id="28" name="朱槿(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower28" anim="" flower_coin_buff="0.77" />
+  <item id="29" name="朱槿(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower29" anim="" flower_coin_buff="0.78" />
+  <item id="30" name="满天星(白)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower30" anim="" flower_coin_buff="0.79" />
+  <item id="31" name="满天星(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower31" anim="" flower_coin_buff="0.8" />
+  <item id="32" name="紫罗兰(白)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower32" anim="" flower_coin_buff="0.81" />
+  <item id="33" name="紫罗兰(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower33" anim="" flower_coin_buff="0.82" />
+  <item id="34" name="紫罗兰(蓝)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower34" anim="" flower_coin_buff="0.83" />
+  <item id="35" name="鸡冠花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower35" anim="" flower_coin_buff="0.84" />
+  <item id="36" name="鸡冠花(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="0.85" />
   <comment>
     <id>
 id

+ 3 - 3
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -3,7 +3,7 @@
     <C_MiniGameLab desc=""><![CDATA[快来打理花园吧!]]></C_MiniGameLab>
     <C_GardenLab desc=""><![CDATA[等级]]></C_GardenLab>
     <C_DressRoom desc=""><![CDATA[提升花园等级,开放试衣间]]></C_DressRoom>
-    <C_VisitFail desc=""><![CDATA[访问失败]]></C_VisitFail>
+    <C_VisitFail desc=""><![CDATA[无法访问花园]]></C_VisitFail>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[精灵]]></F_ElfLab>
@@ -119,7 +119,7 @@
     <Q_Placeholder desc=""><![CDATA[请输入留言内容]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
     <Q_CloseLab desc=""><![CDATA[关闭]]></Q_CloseLab>
-    <Q_CommentTip desc=""><![CDATA[每条留言发送时间间隔为30秒]]></Q_CommentTip>
+    <Q_CommentTip desc=""><![CDATA[留言发送间隔为30秒]]></Q_CommentTip>
     <Q_CommentDone desc=""><![CDATA[发送成功]]></Q_CommentDone>
     <Q_CommentFail desc=""><![CDATA[发送失败]]></Q_CommentFail>
     <R_Tit desc=""><![CDATA[公告]]></R_Tit>
@@ -130,7 +130,7 @@
     <T_TooLong desc=""><![CDATA[昵称太长了]]></T_TooLong>
     <T_AllWhiteSpace desc=""><![CDATA[昵称不能为空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[检查重名中…]]></T_Checking>
-    <T_RepeatName desc=""><![CDATA[已经存在一个相同的昵称]]></T_RepeatName>
+    <T_RepeatName desc=""><![CDATA[已经存在相同的昵称]]></T_RepeatName>
     <Y_GuessSingleNumber desc=""><![CDATA[猜个位数]]></Y_GuessSingleNumber>
     <Y_GuessFlowerName desc=""><![CDATA[猜花的名字]]></Y_GuessFlowerName>
     <Y_Guess desc=""><![CDATA[猜]]></Y_Guess>

+ 22 - 22
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -3,7 +3,7 @@
     <C_MiniGameLab desc=""><![CDATA[快來打理花園吧!]]></C_MiniGameLab>
     <C_GardenLab desc=""><![CDATA[等級]]></C_GardenLab>
     <C_DressRoom desc=""><![CDATA[提升花園等級,開放試衣間]]></C_DressRoom>
-    <C_VisitFail desc=""><![CDATA[]]></C_VisitFail>
+    <C_VisitFail desc=""><![CDATA[無法訪問花園]]></C_VisitFail>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[精靈]]></F_ElfLab>
@@ -51,7 +51,7 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
-    <H_PlantTip desc=""><![CDATA[]]></H_PlantTip>
+    <H_PlantTip desc=""><![CDATA[點擊花朵種到花園裡]]></H_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[未解鎖]]></H_BtnLab2>
     <H_BtnLab3 desc=""><![CDATA[完成小遊戲或購買禮包可以解鎖]]></H_BtnLab3>
@@ -113,35 +113,35 @@
     <P_BtnLab1 desc=""><![CDATA[購買]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[已購<(已购)>]]></P_BtnLab2>
     <P_Return desc=""><![CDATA[妳的當前形象還有沒購買的裝扮,確定要退出嗎?]]></P_Return>
-    <P_Unlock desc=""><![CDATA[]]></P_Unlock>
+    <P_Unlock desc=""><![CDATA[未解鎖]]></P_Unlock>
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
-    <Q_Placeholder desc=""><![CDATA[]]></Q_Placeholder>
-    <Q_CommentLab desc=""><![CDATA[]]></Q_CommentLab>
-    <Q_CloseLab desc=""><![CDATA[]]></Q_CloseLab>
-    <Q_CommentTip desc=""><![CDATA[]]></Q_CommentTip>
-    <Q_CommentDone desc=""><![CDATA[]]></Q_CommentDone>
-    <Q_CommentFail desc=""><![CDATA[]]></Q_CommentFail>
-    <R_Tit desc=""><![CDATA[]]></R_Tit>
+    <Q_Placeholder desc=""><![CDATA[請輸入留言內容]]></Q_Placeholder>
+    <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
+    <Q_CloseLab desc=""><![CDATA[關閉]]></Q_CloseLab>
+    <Q_CommentTip desc=""><![CDATA[留言發送間隔為30秒]]></Q_CommentTip>
+    <Q_CommentDone desc=""><![CDATA[發送成功]]></Q_CommentDone>
+    <Q_CommentFail desc=""><![CDATA[發送失敗]]></Q_CommentFail>
+    <R_Tit desc=""><![CDATA[公告]]></R_Tit>
     <N_Lab desc=""><![CDATA[去試衣間看看吧!]]></N_Lab>
     <I_Lab desc=""><![CDATA[加載中]]></I_Lab>
-    <S_Tit desc=""><![CDATA[]]></S_Tit>
+    <S_Tit desc=""><![CDATA[點贊榜]]></S_Tit>
     <T_Tit desc=""><![CDATA[請輸入你的昵稱]]></T_Tit>
     <T_TooLong desc=""><![CDATA[昵稱太長了]]></T_TooLong>
     <T_AllWhiteSpace desc=""><![CDATA[昵稱不能為空]]></T_AllWhiteSpace>
-    <T_Checking desc=""><![CDATA[]]></T_Checking>
-    <T_RepeatName desc=""><![CDATA[]]></T_RepeatName>
-    <Y_GuessSingleNumber desc=""><![CDATA[]]></Y_GuessSingleNumber>
-    <Y_GuessFlowerName desc=""><![CDATA[]]></Y_GuessFlowerName>
-    <Y_Guess desc=""><![CDATA[]]></Y_Guess>
-    <Y_Bingo desc=""><![CDATA[]]></Y_Bingo>
-    <Y_WrongGusee desc=""><![CDATA[]]></Y_WrongGusee>
+    <T_Checking desc=""><![CDATA[檢查重名中…]]></T_Checking>
+    <T_RepeatName desc=""><![CDATA[已經存在相同的昵稱]]></T_RepeatName>
+    <Y_GuessSingleNumber desc=""><![CDATA[猜個位數]]></Y_GuessSingleNumber>
+    <Y_GuessFlowerName desc=""><![CDATA[猜花的名字]]></Y_GuessFlowerName>
+    <Y_Guess desc=""><![CDATA[]]></Y_Guess>
+    <Y_Bingo desc=""><![CDATA[猜對了]]></Y_Bingo>
+    <Y_WrongGusee desc=""><![CDATA[猜錯了]]></Y_WrongGusee>
     <热卖 desc=""><![CDATA[熱賣]]></热卖>
     <超值 desc=""><![CDATA[超值]]></超值>
-    <加入房间失败 desc=""><![CDATA[]]></加入房间失败>
-    <内容不能为空 desc=""><![CDATA[]]></内容不能为空>
-    <未命名 desc=""><![CDATA[]]></未命名>
-    <请勿重复发送 desc=""><![CDATA[]]></请勿重复发送>
+    <加入房间失败 desc=""><![CDATA[無法連接到伺服器]]></加入房间失败>
+    <内容不能为空 desc=""><![CDATA[內容不能為空]]></内容不能为空>
+    <未命名 desc=""><![CDATA[未命名]]></未命名>
+    <请勿重复发送 desc=""><![CDATA[請勿重複發送]]></请勿重复发送>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

+ 19 - 19
Assets/Resource/XML/lan/English.xml

@@ -3,7 +3,7 @@
     <C_MiniGameLab desc=""><![CDATA[Come to play!]]></C_MiniGameLab>
     <C_GardenLab desc=""><![CDATA[Level ]]></C_GardenLab>
     <C_DressRoom desc=""><![CDATA[Upgrade garden to enter dressroom]]></C_DressRoom>
-    <C_VisitFail desc=""><![CDATA[]]></C_VisitFail>
+    <C_VisitFail desc=""><![CDATA[Visit failed]]></C_VisitFail>
     <F_StoreLab desc=""><![CDATA[Shop]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[Mag]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[Elf]]></F_ElfLab>
@@ -51,7 +51,7 @@
     <G_SpecialLab desc=""><![CDATA[Special]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[Normal]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[Take all back]]></G_RetrieveLab>
-    <H_PlantTip desc=""><![CDATA[]]></H_PlantTip>
+    <H_PlantTip desc=""><![CDATA[Tap to plant the flower]]></H_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[Take back]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[Locked]]></H_BtnLab2>
     <H_BtnLab3 desc=""><![CDATA[Play minigame or buy pack to unlock]]></H_BtnLab3>
@@ -113,35 +113,35 @@ Program 水怪
     <P_BtnLab1 desc=""><![CDATA[Buy]]></P_BtnLab1>
     <P_BtnLab2 desc=""><![CDATA[Bought<(已购)>]]></P_BtnLab2>
     <P_Return desc=""><![CDATA[You currently have some close not yet purchased,are you sure you want to leave?]]></P_Return>
-    <P_Unlock desc=""><![CDATA[]]></P_Unlock>
+    <P_Unlock desc=""><![CDATA[Locked]]></P_Unlock>
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
-    <Q_Placeholder desc=""><![CDATA[]]></Q_Placeholder>
-    <Q_CommentLab desc=""><![CDATA[]]></Q_CommentLab>
-    <Q_CloseLab desc=""><![CDATA[]]></Q_CloseLab>
-    <Q_CommentTip desc=""><![CDATA[]]></Q_CommentTip>
-    <Q_CommentDone desc=""><![CDATA[]]></Q_CommentDone>
-    <Q_CommentFail desc=""><![CDATA[]]></Q_CommentFail>
-    <R_Tit desc=""><![CDATA[]]></R_Tit>
+    <Q_Placeholder desc=""><![CDATA[Say something]]></Q_Placeholder>
+    <Q_CommentLab desc=""><![CDATA[Comment]]></Q_CommentLab>
+    <Q_CloseLab desc=""><![CDATA[Close]]></Q_CloseLab>
+    <Q_CommentTip desc=""><![CDATA[Sending interval is 30 seconds]]></Q_CommentTip>
+    <Q_CommentDone desc=""><![CDATA[Success]]></Q_CommentDone>
+    <Q_CommentFail desc=""><![CDATA[Failed]]></Q_CommentFail>
+    <R_Tit desc=""><![CDATA[Announce]]></R_Tit>
     <N_Lab desc=""><![CDATA[Go to your dress room!]]></N_Lab>
     <I_Lab desc=""><![CDATA[Loading]]></I_Lab>
-    <S_Tit desc=""><![CDATA[]]></S_Tit>
+    <S_Tit desc=""><![CDATA[Like Ranking]]></S_Tit>
     <T_Tit desc=""><![CDATA[Enter your nickname]]></T_Tit>
     <T_TooLong desc=""><![CDATA[Nickname too long]]></T_TooLong>
     <T_AllWhiteSpace desc=""><![CDATA[Nickname can not be null]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[Checking]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[Repeat]]></T_RepeatName>
-    <Y_GuessSingleNumber desc=""><![CDATA[]]></Y_GuessSingleNumber>
-    <Y_GuessFlowerName desc=""><![CDATA[]]></Y_GuessFlowerName>
-    <Y_Guess desc=""><![CDATA[]]></Y_Guess>
-    <Y_Bingo desc=""><![CDATA[]]></Y_Bingo>
-    <Y_WrongGusee desc=""><![CDATA[]]></Y_WrongGusee>
+    <Y_GuessSingleNumber desc=""><![CDATA[Single Digit Guess]]></Y_GuessSingleNumber>
+    <Y_GuessFlowerName desc=""><![CDATA[Flower Name Guess]]></Y_GuessFlowerName>
+    <Y_Guess desc=""><![CDATA[Guess]]></Y_Guess>
+    <Y_Bingo desc=""><![CDATA[Right]]></Y_Bingo>
+    <Y_WrongGusee desc=""><![CDATA[Wrong]]></Y_WrongGusee>
     <热卖 desc=""><![CDATA[Most Popular]]></热卖>
     <超值 desc=""><![CDATA[Highest Value]]></超值>
-    <加入房间失败 desc=""><![CDATA[]]></加入房间失败>
-    <内容不能为空 desc=""><![CDATA[]]></内容不能为空>
+    <加入房间失败 desc=""><![CDATA[Failed to connect]]></加入房间失败>
+    <内容不能为空 desc=""><![CDATA[Null content]]></内容不能为空>
     <未命名 desc=""><![CDATA[Unnamed]]></未命名>
-    <请勿重复发送 desc=""><![CDATA[]]></请勿重复发送>
+    <请勿重复发送 desc=""><![CDATA[Do not send again]]></请勿重复发送>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>

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

@@ -436,7 +436,7 @@ public class ManaGarden : Regist
         Image image = ManaReso.Get<Image>("H_Icon2");
         image.material = material;
         image.sprite = flowerInfo.Icon;
-        image.Resize(true, 0.8125f, 0.8125f);
+        image.Resize(true, 0.6125f, 0.6125f);
     }
 
     private static void SetRetrieveBtn(Button button, Text buttonLab, Slot seleSlot = null)

+ 23 - 5
Assets/Script/Manage/ManaInfoBox.cs

@@ -32,6 +32,7 @@ public class ManaInfoBox : Regist
         public ObjType ObjType;
         public Transform Grid;
         public CanvasGroup CanvasGroup;
+        public VerticalLayoutGroup VerticalLayoutGroup;
 
         public InfoBox(int maxCount, float duration, string infoItemName, ObjType objType, Transform grid)
         {
@@ -40,7 +41,8 @@ public class ManaInfoBox : Regist
             DurationTime = duration;
             MaxCount = maxCount;
             InfoItemName = infoItemName;
-            CanvasGroup = Grid.GetComponent<CanvasGroup>(); 
+            CanvasGroup = Grid.GetComponent<CanvasGroup>();
+            VerticalLayoutGroup = Grid.GetComponent<VerticalLayoutGroup>();
         }
 
         public void Update()
@@ -51,7 +53,8 @@ public class ManaInfoBox : Regist
             {
                 Lock = false;
 
-                CanvasGroup.TweenBacCG();
+                if (CanvasGroup != null)
+                    CanvasGroup.TweenBacCG();
             }
 
 
@@ -59,6 +62,11 @@ public class ManaInfoBox : Regist
             {
                 InfoText infoText = TextList[i];
 
+                if (infoText.Timer == Mathf.Infinity)
+                {
+                    continue;
+                }
+
                 infoText.Timer -= Time.deltaTime;
 
                 if (infoText.Timer < 0)
@@ -72,7 +80,8 @@ public class ManaInfoBox : Regist
 
         public void Show(string str, float time, Sprite atlas)
         {
-            CanvasGroup.TweenForCG();
+            if (CanvasGroup != null)
+                CanvasGroup.TweenForCG();
 
             if (TextList.Count == MaxCount)
             {
@@ -82,11 +91,20 @@ public class ManaInfoBox : Regist
             }
 
 
-            TextPlus text = ManaReso.GetInfoItem(InfoItemName, ObjType);
+            TextPlus text = ManaReso.GetInfoItem(InfoItemName, Grid, ObjType);
             text.ImagePlus.sprite = atlas;
             text.SetParent(Grid);
             text.rectTransform.SetAsFirstSibling();
 
+            Auxiliary.Instance.DelayCall
+            (() =>
+                {
+                    VerticalLayoutGroup.SetLayoutVertical();
+                },
+                1
+            );
+
+
             InfoText infoText = new InfoText();
 
             text.text = str;
@@ -108,7 +126,7 @@ public class ManaInfoBox : Regist
     #region Config
 
     private const int MaxGardenInfoCount = 4;
-    private const int MaxPlazaRoomCount = 50;
+    private const int MaxPlazaRoomCount = 19;
 
     private static InfoBox GardenInfoBox;
     private static InfoBox PlazaRoomInfoBox;

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

@@ -101,6 +101,7 @@ public class ManaPlayer : Regist
 
         DressRoom = ManaReso.Get("DressRoom", Folder.Discard, true, null, true, ObjType.DressRoom);
         DressRoom.SetActive(false);
+        DontDestroyOnLoad(DressRoom);
 
         List<int> dressList = ManaData.GetDressList();
 

+ 2 - 4
Assets/Script/Manage/ManaReso.cs

@@ -728,11 +728,9 @@ public class ManaReso : Regist
     }
 
 
-    public static TextPlus GetInfoItem(string infoItemName, ObjType objType)
+    public static TextPlus GetInfoItem(string infoItemName, Transform parent, ObjType objType)
     {
-        Transform tra = Get(infoItemName, Folder.UI, false, Get("Canvas"), false, objType);
-
-        tra.SetAsFirstSibling();
+        Transform tra = Get(infoItemName, Folder.UI, false, parent, false, objType);
 
         TextPlus text = tra.GetComponent<TextPlus>();
 

+ 64 - 26
Assets/Script/Manage/ManaUI.cs

@@ -2791,6 +2791,7 @@ public class ManaUI : Regist
 
         ManaLan.Add(ManaReso.Get<Text>("T_ConfirmLab"), new LanStr("Common", "Confirm"));
 
+        ManaReso.Get("T_NickName").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
         ManaReso.Get("T_NickNameBK").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
 
         ManaReso.AddButtonEvent
@@ -2834,6 +2835,9 @@ public class ManaUI : Regist
 
         #region X
 
+        ManaReso.Get<Image>("X_CreateChest").sprite = ManaReso.LoadSprite("宝箱", Folder.Scene);
+        ManaReso.Get<ImagePlus>("X_CurrentInfoImagePlus").sprite = ManaReso.LoadSprite("Expression", Folder.Scene);
+
         #region X_Quit
 
         ManaReso.SetButtonEvent
@@ -2867,12 +2871,6 @@ public class ManaUI : Regist
 
         #endregion
 
-        #region X_Info
-
-        ManaReso.Get("X_Info").CreateTweenCG(0, 0.9f, 0.25f, false, true, Curve.EaseOutQuad);
-
-        #endregion
-
         #region X_Expression
 
         ManaReso.AddButtonEvent
@@ -2880,8 +2878,7 @@ public class ManaUI : Regist
             "X_Expression",
             () =>
             {
-                ManaReso.SetActive("X_Grid", true);
-                ManaReso.SetActive("X_Mask", true);
+                OpenExpressionGrid();
             }
         );
 
@@ -2894,8 +2891,7 @@ public class ManaUI : Regist
             "X_Mask",
             () =>
             {
-                ManaReso.SetActive("X_Grid", false);
-                ManaReso.SetActive("X_Mask", false);
+                CloseExpressionGrid();
             }
         );
 
@@ -2909,8 +2905,7 @@ public class ManaUI : Regist
             () =>
             {
                 GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
-                ManaReso.SetActive("X_Grid", false);
-                ManaReso.SetActive("X_Mask", false);
+                CloseExpressionGrid();
             }
         );
 
@@ -2921,8 +2916,7 @@ public class ManaUI : Regist
             () =>
             {
                 GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.汗颜);
-                ManaReso.SetActive("X_Grid", false);
-                ManaReso.SetActive("X_Mask", false);
+                CloseExpressionGrid();
             }
         );
 
@@ -2932,8 +2926,7 @@ public class ManaUI : Regist
             () =>
             {
                 GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.惊讶);
-                ManaReso.SetActive("X_Grid", false);
-                ManaReso.SetActive("X_Mask", false);
+                CloseExpressionGrid();
             }
         );
 
@@ -2943,8 +2936,7 @@ public class ManaUI : Regist
             () =>
             {
                 GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.开心);
-                ManaReso.SetActive("X_Grid", false);
-                ManaReso.SetActive("X_Mask", false);
+                CloseExpressionGrid();
             }
         );
 
@@ -2954,8 +2946,7 @@ public class ManaUI : Regist
             () =>
             {
                 GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.哭);
-                ManaReso.SetActive("X_Grid", false);
-                ManaReso.SetActive("X_Mask", false);
+                CloseExpressionGrid();
             }
         );
 
@@ -2965,8 +2956,7 @@ public class ManaUI : Regist
             () =>
             {
                 GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.期待);
-                ManaReso.SetActive("X_Grid", false);
-                ManaReso.SetActive("X_Mask", false);
+                CloseExpressionGrid();
             }
         );
 
@@ -2976,8 +2966,7 @@ public class ManaUI : Regist
             () =>
             {
                 GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.色咪咪);
-                ManaReso.SetActive("X_Grid", false);
-                ManaReso.SetActive("X_Mask", false);
+                CloseExpressionGrid();
             }
         );
 
@@ -2987,8 +2976,42 @@ public class ManaUI : Regist
             () =>
             {
                 GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.委屈);
-                ManaReso.SetActive("X_Grid", false);
-                ManaReso.SetActive("X_Mask", false);
+                CloseExpressionGrid();
+            }
+        );
+
+        #endregion
+
+        #region X_OpenInfo
+
+        ManaReso.SetButtonEvent
+        (
+            "X_OpenInfo", () =>
+            {
+                ManaReso.SetActive("X_CurrentInfo", false);
+                ManaReso.SetActive("X_InfoBK", true);
+
+                Auxiliary.Instance.DelayCall
+                (
+                    () =>
+                    {
+                        ManaReso.Get<VerticalLayoutGroup>("X_Info").SetLayoutVertical();
+                    },
+                    1
+                );
+            }
+        );
+
+        #endregion
+
+        #region X_CloseInfo
+
+        ManaReso.SetButtonEvent
+        (
+            "X_CloseInfo", () =>
+            {
+                ManaReso.SetActive("X_CurrentInfo", true);
+                ManaReso.SetActive("X_InfoBK", false);
             }
         );
 
@@ -3149,4 +3172,19 @@ public class ManaUI : Regist
             1
         );
     }
+
+
+    private static void OpenExpressionGrid()
+    {
+        ManaReso.SetActive("X_GridBK", true);
+        ManaReso.SetActive("X_Mask", true);
+        ManaReso.SetActive("X_CurrentInfo", false);
+    }
+
+    private static void CloseExpressionGrid()
+    {
+        ManaReso.SetActive("X_GridBK", false);
+        ManaReso.SetActive("X_Mask", false);
+        ManaReso.SetActive("X_CurrentInfo", true);
+    }
 }

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

@@ -73,7 +73,6 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
         Transform tra = ManaReso.Get("PlazaRoom", Folder.Scene, true, null, true);
         tra.AddComponent<PlazaRoom>();
-        
 
         UnityFactory.factory.LoadDragonBonesData(ManaReso.Load<TextAsset>("PhonoGraph_ske", Folder.Config));
 

+ 74 - 46
Assets/Script/SFS/Manager/PlazaRoomManager.cs

@@ -49,6 +49,8 @@ public class PlazaRoomManager
 
 
             MessageBox = ManaReso.Get("MessageBox", Folder.UI, false, ManaReso.Get("W_HudParent"), false, ObjType.MessageBox);
+            MessageBox.GetComponentInChildren<BestfitText>().VerticalMinSize = 12;
+            MessageBox.GetComponentInChildren<BestfitText>().VerticalMaxSize = 20;
 
             hudTarget = MessageBox.GetComponent<HudTarget>();
 
@@ -159,36 +161,46 @@ public class PlazaRoomManager
         IsBlackMaskFinish = false;
         EnteringPlazaRoom = true;
 
+        ManaReso.Get("B_SignIn0").TweenBacCG();
+        ManaReso.Get("T_NickName").TweenBacCG();
+
         ManaCenter.SceneSwitchLock = true;
 
         TweenRoot tweenRoot = ManaReso.Get("V_BlackMask").TweenBacCG();
 
-        tweenRoot.AddEventOnetime(EventType.BackwardFinish,() =>{IsBlackMaskFinish = true;TryEnterPlazaRoom();});
+        tweenRoot.AddEventOnetime
+        (
+            EventType.BackwardFinish, () =>
+            {
+                IsBlackMaskFinish = true;
+                TryEnterPlazaRoom();
+            }
+        );
 
         GardenSmartFox.ExecuteAfterCheckConection
-            (
-                () =>
-                {
-                    GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Pending;
-                    GardenSmartFox.ExtensionManager.PlazaRoomExtension.JoinPlazaRoom();
-                },
-                (succeed, baseEvent) =>
+        (
+            () =>
+            {
+                GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Pending;
+                GardenSmartFox.ExtensionManager.PlazaRoomExtension.JoinPlazaRoom();
+            },
+            (succeed, baseEvent) =>
+            {
+                if (!succeed)
                 {
-                    if (!succeed)
-                    {
-                        GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
-                        TryEnterPlazaRoom();
-                    }
-                },
-                (succeed, baseEvent) =>
+                    GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
+                    TryEnterPlazaRoom();
+                }
+            },
+            (succeed, baseEvent) =>
+            {
+                if (!succeed)
                 {
-                    if (!succeed)
-                    {
-                        GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
-                        TryEnterPlazaRoom();
-                    }
+                    GardenSmartFox.PlazaRoomManager.JoinRoomStatus = RequestStatus.Failed;
+                    TryEnterPlazaRoom();
                 }
-            );
+            }
+        );
     }
 
     public void TryEnterPlazaRoom()
@@ -228,6 +240,12 @@ public class PlazaRoomManager
     public void EnterPlazaRoom()
     {
         PlazaRoom.Initialize();
+        foreach (var kv in UserInstanceDictionary)
+        {
+            if (kv.Value.Player.transform.parent == null)
+                kv.Value.Player.transform.parent = ManaReso.Get("PlazaRoom");
+        }
+        
 
         GardenSmartFox.PlazaRoomManager.PlazaRoomSky = ManaReso.Get("PlazaRoomSky");
         SkyOriginPosition = GardenSmartFox.PlazaRoomManager.PlazaRoomSky.position;
@@ -235,6 +253,7 @@ public class PlazaRoomManager
         GardenSmartFox.PlazaRoomManager.PlazaRoomCamera = ManaReso.Get<Camera>("MainCamera");
         GardenSmartFox.PlazaRoomManager.CameraOriginPosition = GardenSmartFox.PlazaRoomManager.PlazaRoomCamera.transform.position;
 
+        //Debug.Log(GardenSmartFox.User.Id);
         SelfUser = GardenSmartFox.User;
         PlayerDefaultPosition = ManaReso.Get("PlazaRoomDefaultPosition").position;
         SelfInstance = InstantiatePlayer(SelfUser, ManaNickName.NickName, PlayerDefaultPosition, PlayerDirection.Left, ManaData.GetDressDataIDs(ManaPlayer.Player));
@@ -266,29 +285,31 @@ public class PlazaRoomManager
         TweenRoot tweenRoot = ManaReso.Get("V_BlackMask").TweenBacCG();
 
         tweenRoot.AddEventOnetime
-            (
-                EventType.BackwardFinish,
-                () =>
-                {
-                    PlazaRoomSky.position = SkyOriginPosition;
-                    PlazaRoomCamera.transform.position = CameraOriginPosition;
-
-                    ManaReso.SetActive("C_Main2", true);
-                    ManaReso.SetActive("Garden", true);
-                    ManaReso.SetActive("PlazaRoom", false);
-                    ManaReso.SetActive("W_HudParent", false);
-                    ManaReso.SetActive("X_PlazaRoom", false);
+        (
+            EventType.BackwardFinish,
+            () =>
+            {
+                PlazaRoomSky.position = SkyOriginPosition;
+                PlazaRoomCamera.transform.position = CameraOriginPosition;
 
-                    ManaReso.Get("V_BlackMask").TweenForCG();
+                ManaReso.SetActive("C_Main2", true);
+                ManaReso.SetActive("Garden", true);
+                ManaReso.SetActive("PlazaRoom", false);
+                ManaReso.SetActive("W_HudParent", false);
+                ManaReso.SetActive("X_PlazaRoom", false);
 
-                    foreach (var kv in UserInstanceDictionary)
-                    {
-                        kv.Value.Save();
-                    }
+                ManaReso.Get("V_BlackMask").TweenForCG();
+                ManaReso.Get("B_SignIn0").TweenForCG();
+                ManaReso.Get("T_NickName").TweenForCG();
 
-                    UserInstanceDictionary = new Dictionary<User, PlazaRoomPlayer>();
+                foreach (var kv in UserInstanceDictionary)
+                {
+                    kv.Value.Save();
                 }
-            );
+
+                UserInstanceDictionary = new Dictionary<User, PlazaRoomPlayer>();
+            }
+        );
     }
 
     public void QuitPlazaRoom()
@@ -312,7 +333,7 @@ public class PlazaRoomManager
         GardenSmartFox.ExtensionManager.PlazaRoomExtension.onSynchronize += Synchronize;
         GardenSmartFox.ExtensionManager.PlazaRoomExtension.onReceiveExpression += ReceiveExpression;
         GardenSmartFox.ExtensionManager.PlazaRoomExtension.onReceivePublicMessage += ReceivePublicMessage;
-        GardenSmartFox.ExtensionManager.PlazaRoomExtension.onInstantiate += Instantiate;
+        GardenSmartFox.ExtensionManager.PlazaRoomExtension.onInstantiate += OnInstantiate;
 
         gardenSmartFox.Connector.onConnectionLost += OnConectionLost;
     }
@@ -482,26 +503,32 @@ public class PlazaRoomManager
         UserInstanceDictionary[sender].MoveTo(destination);
     }
 
+    private float ExpressionDuration = 1;
     public void ReceiveExpression(int expressionID, User sender)
     {
         PlazaRoomPlayer plazaRoomPlayer = UserInstanceDictionary[sender];
 
         string expressionName = Enum.GetName(typeof(ExpressionID), expressionID);
-        plazaRoomPlayer.Player.ChangeExpression(expressionName, 3);
+        plazaRoomPlayer.Player.ChangeExpression(expressionName, ExpressionDuration);
 
-        ManaInfoBox.Show(InfoCategory.PlazaRoom, $"{plazaRoomPlayer.NickName} : <({expressionName}按钮)>", 10, ManaReso.LoadSprite("Expression", Folder.Scene));
+        string message = $"{plazaRoomPlayer.NickName}:\u3000<({expressionName}按钮)>";
+        ManaInfoBox.Show(InfoCategory.PlazaRoom, message, Mathf.Infinity, ManaReso.LoadSprite("Expression", Folder.Scene));
+        ManaReso.SetText("X_CurrentInfoLab", message);
     }
 
     public void ReceivePublicMessage(string message, User sender)
     {
+        //Debug.Log(sender.Id);
         PlazaRoomPlayer plazaRoomPlayer = UserInstanceDictionary[sender];
 
         plazaRoomPlayer.ShowMessage(message);
 
-        ManaInfoBox.Show(InfoCategory.PlazaRoom, $"{plazaRoomPlayer.NickName} : {message}", 10, ManaReso.LoadSprite("Expression", Folder.Scene));
+        message = $"{plazaRoomPlayer.NickName}:\u3000{message}";
+        ManaInfoBox.Show(InfoCategory.PlazaRoom, message, Mathf.Infinity, ManaReso.LoadSprite("Expression", Folder.Scene));
+        ManaReso.SetText("X_CurrentInfoLab", message);
     }
 
-    public void Instantiate(User user, SFSObject parameter)
+    public void OnInstantiate(User user, SFSObject parameter)
     {
         if (user.IsItMe)
             return;
@@ -575,7 +602,8 @@ public class PlazaRoomManager
 
     public PlazaRoomPlayer InstantiatePlayer(User user, string nickName, Vector3 position, PlayerDirection direction, List<int> dressDataIDs)
     {
-        Transform tra = ManaReso.Get("Player", Folder.Scene, false, ManaReso.Get("PlazaRoom"), false, ObjType.Player);
+        Transform parent = ManaReso.Get("PlazaRoom", false);
+        Transform tra = ManaReso.Get("Player", Folder.Scene, false, parent, false, ObjType.Player);
 
         Player player = tra.GetComponent<Player>();
 

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

@@ -142,7 +142,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            GardenSmartFoxManager.GardenSmartFox.SmartFox.Disconnect();
+            //GardenSmartFoxManager.GardenSmartFox.SmartFox.Disconnect();
         }
 
         if (Input.GetKeyDown(KeyCode.Z))

+ 3 - 0
Assets/Script/Tool/Lib.cs

@@ -14,6 +14,9 @@ public class Lib
 	public static Color Orange = new Color(233/255f, 63/255f, 20/255f, 1);
 	public static Color LightGray = new Color(165/255f, 192/255f, 200/255f, 1);
 
+    public static Color RoomClosing = new Color(240/255f, 103/255f, 101/255f, 1);
+    public static Color RoomRunning = new Color(90/255f, 170/255f, 39/255f, 1);
+
     public static Material GrayMat
     {
         get { return ManaReso.Load<Material>("GrayMat", Folder.UI); }

+ 8 - 3
第三期.txt

@@ -1,4 +1,9 @@
-DressRoom被Destroy掉的Bug
+Z界面的语言
+
+
+离线收益接着弹公告有Bug
+
+手机上 没有设置昵称时 关闭自动弹出的昵称界面后屏幕有遮罩?
 
 
 服务器新旧版存取档是否兼容
@@ -16,6 +21,6 @@ DressRoom
 IOS设置Team
 
 
-Drawcall优化(表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 上衣按钮需要打入图集)
+Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 上衣按钮需要打入图集)
 
-图片尺寸优化(人物 广场背景 Loding 表情)
+图片尺寸优化(广场背景 Loding)

Some files were not shown because too many files changed in this diff