Browse Source

修改一些细节

LiuQilin 7 years ago
parent
commit
b7878fccc8
43 changed files with 1231 additions and 367 deletions
  1. 5 5
      Assets/Resource/Prefab/Object/ADChest.prefab
  2. 3 1
      Assets/Resource/Prefab/Object/DebugMode.prefab
  3. 5 5
      Assets/Resource/Prefab/Object/Page.prefab
  4. 3 3
      Assets/Resource/Prefab/Object/Player.prefab
  5. 4 4
      Assets/Resource/Prefab/Object/PlazaRoomChest.prefab
  6. 270 199
      Assets/Resource/Prefab/PrefabUI/CommentItem.prefab
  7. 1 1
      Assets/Resource/Prefab/PrefabUI/CommentItem.prefab.meta
  8. 2 2
      Assets/Resource/Prefab/PrefabUI/FlowerItem.prefab
  9. 42 0
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  10. 292 25
      Assets/Resource/Prefab/PrefabUI/GroupE.prefab
  11. 1 1
      Assets/Resource/Sprite/Editor/SpriteUI/领取物品发光转动.png.meta
  12. 36 0
      Assets/Resource/XML/Config/achieve_config.xml
  13. 1 1
      Assets/Resource/XML/Config/plaza_room_config.xml
  14. 2 2
      Assets/Resource/XML/PlayerConfig.xml
  15. 72 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  16. 72 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  17. 72 0
      Assets/Resource/XML/lan/English.xml
  18. BIN
      Assets/Resource/Xlsx/achieve_config.xlsx
  19. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  20. 57 9
      Assets/Script/Manage/ManaAchieve.cs
  21. 73 1
      Assets/Script/Manage/ManaCenter.cs
  22. 38 0
      Assets/Script/Manage/ManaData.cs
  23. 1 1
      Assets/Script/Manage/ManaGarden.cs
  24. 10 1
      Assets/Script/Manage/ManaIAP.cs
  25. 6 6
      Assets/Script/Manage/ManaReso.cs
  26. 34 16
      Assets/Script/Manage/ManaServer.cs
  27. 27 10
      Assets/Script/Manage/ManaSocial.cs
  28. 31 1
      Assets/Script/Manage/ManaUI.cs
  29. 9 25
      Assets/Script/Manage/ManaVisit.cs
  30. 2 0
      Assets/Script/Manage/PlazaRoomMge.cs
  31. 6 25
      Assets/Script/Object/Chest.cs
  32. 1 2
      Assets/Script/Object/CommentItem.cs
  33. 1 1
      Assets/Script/Object/Flower.cs
  34. 6 2
      Assets/Script/Object/Player.cs
  35. 4 4
      Assets/Script/Object/PlazaRoomChest.cs
  36. 1 1
      Assets/Script/Object/PlazaRoomItem.cs
  37. 5 4
      Assets/Script/Object/Skill/Pack.cs
  38. 16 1
      Assets/Script/SFS/Manager/ChestMge.cs
  39. 1 0
      Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs
  40. 1 1
      Assets/Script/ThirdParty/DataEyeStatics/DataEyeGA.cs
  41. 1 0
      Assets/Script/Tool/Bundle.cs
  42. 17 4
      Assets/Script/Tool/DashGame/URLRequest.cs
  43. 0 3
      第三期.txt

+ 5 - 5
Assets/Resource/Prefab/Object/ADChest.prefab

@@ -36,6 +36,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4645995457566464}
   - component: {fileID: 212129287200087826}
+  - component: {fileID: 95475934321312016}
   m_Layer: 0
   m_Name: Chest
   m_TagString: Untagged
@@ -53,7 +54,6 @@ GameObject:
   - component: {fileID: 4117775634847816}
   - component: {fileID: 61756525462351364}
   - component: {fileID: 50883047937147878}
-  - component: {fileID: 95607773160342560}
   m_Layer: 0
   m_Name: ADChest
   m_TagString: Untagged
@@ -68,7 +68,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1658220073256390}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.95, z: -0.1825}
+  m_LocalPosition: {x: 0, y: -0.95, z: -0.18}
   m_LocalScale: {x: 0.6, y: 0.6, z: 1}
   m_Children:
   - {fileID: 4645995457566464}
@@ -83,7 +83,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1093005704050964}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.09, y: -0.76, z: 0.008249998}
+  m_LocalPosition: {x: 0.09, y: -0.76, z: 0.1}
   m_LocalScale: {x: 1.6666664, y: 1.6666664, z: 1}
   m_Children: []
   m_Father: {fileID: 4117775634847816}
@@ -136,13 +136,13 @@ BoxCollider2D:
   m_Offset: {x: 0.11, y: 0.33}
   serializedVersion: 2
   m_Size: {x: 3, y: 2.6}
---- !u!95 &95607773160342560
+--- !u!95 &95475934321312016
 Animator:
   serializedVersion: 3
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1658220073256390}
+  m_GameObject: {fileID: 1358063845640910}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
   m_Controller: {fileID: 9100000, guid: 40e1259af4314d74d86c9266e5c34184, type: 2}

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

@@ -121,7 +121,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 010b6bc279190154797bd671544cf53e, type: 3}
   - {fileID: 21300000, guid: fc16431462643704dad53ba82084d771, type: 3}
   - {fileID: 21300000, guid: e00067c91541fb545a16eef3d6da2bf6, type: 3}
-  - {fileID: 1073147265121344, guid: 100bc0b1747d64e4db7883a2f0d726c5, type: 2}
+  - {fileID: 1115339575636394, guid: 100bc0b1747d64e4db7883a2f0d726c5, type: 2}
   - {fileID: 1301950428336920, guid: 3251e6b903666f2488364daaf1f2cc88, type: 2}
   - {fileID: 1089668954114348, guid: 6dd9933035ffa7645bbd45c1ccd66774, type: 2}
   - {fileID: 1883440964438570, guid: 11e55fe29ace64347b31ab7593e7ea51, type: 2}
@@ -129,6 +129,8 @@ MonoBehaviour:
   - {fileID: 1494806348296548, guid: 0b51a43aa6ef9574382eb28adc6b0fa7, type: 2}
   - {fileID: 1792991775407706, guid: ce45010746b70ca40a7e91ce5a0a5e10, type: 2}
   - {fileID: 2100000, guid: dc722f3566cbcf440a23d8fe69deef8e, type: 2}
+  - {fileID: 21300000, guid: e7f632456c01c26469882025b47accfe, type: 3}
+  - {fileID: 21300000, guid: f9937d5d43f2ff447aeb985a91a7d690, type: 3}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}

+ 5 - 5
Assets/Resource/Prefab/Object/Page.prefab

@@ -675,7 +675,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1212623043079770}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 3.5, y: -2.1, z: -0.11}
+  m_LocalPosition: {x: 3.5, y: -2.1, z: -0.2}
   m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
   m_Children:
   - {fileID: 4924500101640946}
@@ -744,7 +744,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1232187855820768}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 7.1, y: -2.1, z: -0.11}
+  m_LocalPosition: {x: 7.1, y: -2.1, z: -0.2}
   m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
   m_Children:
   - {fileID: 4270161711280264}
@@ -795,7 +795,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1213102972776782}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -3.7, y: -2.1, z: -0.11}
+  m_LocalPosition: {x: -3.7, y: -2.1, z: -0.2}
   m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
   m_Children:
   - {fileID: 4906063488618624}
@@ -823,7 +823,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1209372422394468}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.1, y: -2.1, z: -0.11}
+  m_LocalPosition: {x: -0.1, y: -2.1, z: -0.2}
   m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
   m_Children:
   - {fileID: 4444309442525180}
@@ -891,7 +891,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1565542696011734}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -7.3, y: -2.1, z: -0.11}
+  m_LocalPosition: {x: -7.3, y: -2.1, z: -0.2}
   m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
   m_Children:
   - {fileID: 4685721866237570}

+ 3 - 3
Assets/Resource/Prefab/Object/Player.prefab

@@ -374,9 +374,9 @@ BoxCollider2D:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_UsedByEffector: 0
-  m_Offset: {x: 0.09379864, y: -1.1523747}
+  m_Offset: {x: 0.09379864, y: -0.752375}
   serializedVersion: 2
-  m_Size: {x: 2.4739687, y: 3.30475}
+  m_Size: {x: 2.4739687, y: 3}
 --- !u!61 &61739891942898918
 BoxCollider2D:
   m_ObjectHideFlags: 1
@@ -388,7 +388,7 @@ BoxCollider2D:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_UsedByEffector: 0
-  m_Offset: {x: 0.35000008, y: 2.674964}
+  m_Offset: {x: 0.35000008, y: 2.874964}
   serializedVersion: 2
   m_Size: {x: 5.5, y: 4.1500735}
 --- !u!212 &212266614054406428

+ 4 - 4
Assets/Resource/Prefab/Object/PlazaRoomChest.prefab

@@ -19,7 +19,6 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 4157323462000244}
-  - component: {fileID: 95864975103419620}
   - component: {fileID: 212796212424661236}
   m_Layer: 0
   m_Name: PlazaRoomChest
@@ -38,6 +37,7 @@ GameObject:
   - component: {fileID: 4720750328529054}
   - component: {fileID: 212123215735440116}
   - component: {fileID: 65569554269210656}
+  - component: {fileID: 95549217189957502}
   m_Layer: 0
   m_Name: Chest
   m_TagString: Untagged
@@ -83,7 +83,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1987708437913928}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.09, y: -0.76, z: 5}
+  m_LocalPosition: {x: 0.09, y: -0.76, z: 4}
   m_LocalScale: {x: 1.6666665, y: 1.6666665, z: 1}
   m_Children: []
   m_Father: {fileID: 4157323462000244}
@@ -114,13 +114,13 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 4.06, y: 3.8, z: 0.2}
   m_Center: {x: -0.000000014901161, y: 0, z: 0}
---- !u!95 &95864975103419620
+--- !u!95 &95549217189957502
 Animator:
   serializedVersion: 3
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1584217464481202}
+  m_GameObject: {fileID: 1647720897566604}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
   m_Controller: {fileID: 9100000, guid: 40e1259af4314d74d86c9266e5c34184, type: 2}

+ 270 - 199
Assets/Resource/Prefab/PrefabUI/CommentItem.prefab

@@ -9,68 +9,85 @@ Prefab:
     m_Modifications: []
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1073147265121344}
+  m_RootGameObject: {fileID: 1115339575636394}
   m_IsPrefabParent: 1
---- !u!1 &1073147265121344
+--- !u!1 &1047858920455296
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224375092351421506}
+  - component: {fileID: 224889834567627892}
+  - component: {fileID: 222406504289961844}
+  - component: {fileID: 114098198944178808}
   m_Layer: 5
-  m_Name: CommentItem
+  m_Name: VisitLab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1235374732147134
+--- !u!1 &1115339575636394
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224272859752220610}
-  - component: {fileID: 222463751610676358}
-  - component: {fileID: 114624175340223546}
+  - component: {fileID: 224042633406990250}
   m_Layer: 5
-  m_Name: ContentLab
+  m_Name: CommentItem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1315465680827384
+--- !u!1 &1143252165116650
 GameObject:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224250177737373466}
-  - component: {fileID: 222494234897168520}
-  - component: {fileID: 114750890958896708}
+  - component: {fileID: 224740833775021098}
+  - component: {fileID: 222960981559701824}
+  - component: {fileID: 114509740565883278}
+  m_Layer: 0
+  m_Name: VisitImagePlus
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1509332223137652
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224397078160467034}
+  - component: {fileID: 222846138815763298}
+  - component: {fileID: 114218369184391990}
   m_Layer: 5
-  m_Name: VisitLab
+  m_Name: ContentLab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1413984168578216
+--- !u!1 &1646116839508110
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224194809205400652}
-  - component: {fileID: 222842483776338390}
-  - component: {fileID: 114565490596394912}
-  - component: {fileID: 114620773026811712}
+  - component: {fileID: 224125420440601976}
+  - component: {fileID: 222621293481651208}
+  - component: {fileID: 114327637007703412}
+  - component: {fileID: 114803250711698834}
   m_Layer: 5
   m_Name: VisitBtn
   m_TagString: Untagged
@@ -78,16 +95,16 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1498954497838352
+--- !u!1 &1680512951879290
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224985055033363718}
-  - component: {fileID: 222049069938136978}
-  - component: {fileID: 114921447471586180}
+  - component: {fileID: 224735141033996776}
+  - component: {fileID: 222485822225150920}
+  - component: {fileID: 114366770783175640}
   m_Layer: 5
   m_Name: Tit
   m_TagString: Untagged
@@ -95,97 +112,83 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1971581468309438
+--- !u!1 &1974864418794842
 GameObject:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224862441668659220}
-  - component: {fileID: 222654799811553232}
-  - component: {fileID: 114871277902962284}
-  m_Layer: 0
-  m_Name: VisitImagePlus
+  - component: {fileID: 224043093304935004}
+  - component: {fileID: 222930173278085740}
+  - component: {fileID: 114970587178147124}
+  m_Layer: 5
+  m_Name: Frame
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &114565490596394912
+--- !u!114 &114098198944178808
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1413984168578216}
+  m_GameObject: {fileID: 1047858920455296}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
   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: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: e5dfd70a17554584ea2919cf341ad979, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
---- !u!114 &114620773026811712
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1413984168578216}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 114565490596394912}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
---- !u!114 &114624175340223546
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "<(\u91D1\u5E01)>22"
+  Draw: 0
+  SetY: 0
+  Y: 0
+  LineHeight: 19.591837
+  RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
+  ImageIndex: 00000000
+  RemoveIndex: 0100000002000000030000000400000005000000
+  NewTextIndex: 0600000007000000
+  NewTextPos:
+  - {x: -1.5213356, y: 8.163265, z: 0}
+  - {x: 10.72356, y: 8.163265, z: 0}
+  - {x: 10.72356, y: -8.163265, z: 0}
+  - {x: 10.72356, y: -8.163265, z: 0}
+  - {x: -1.5213356, y: -8.163265, z: 0}
+  - {x: -1.5213356, y: 8.163265, z: 0}
+  - {x: 9.090908, y: 8.163265, z: 0}
+  - {x: 21.335808, y: 8.163265, z: 0}
+  - {x: 21.335808, y: -8.163265, z: 0}
+  - {x: 21.335808, y: -8.163265, z: 0}
+  - {x: 9.090908, y: -8.163265, z: 0}
+  - {x: 9.090908, y: 8.163265, z: 0}
+--- !u!114 &114218369184391990
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1235374732147134}
+  m_GameObject: {fileID: 1509332223137652}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ebaa46003e10d4c459afb999db97c153, type: 3}
@@ -201,37 +204,60 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 18
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
-    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
-    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
-    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
-    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
-    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED
-    \u4E0D\u9519\u7684\u82B1\u56ED \u4E0D\u9519\u7684\u82B1\u56ED  "
---- !u!114 &114750890958896708
+  m_Text: "\u4F60\u597D1"
+  VerticalMinSize: 1
+  VerticalMaxSize: 20
+--- !u!114 &114327637007703412
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1315465680827384}
+  m_GameObject: {fileID: 1646116839508110}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: e5dfd70a17554584ea2919cf341ad979, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114366770783175640
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1680512951879290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -240,39 +266,24 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 20
+    m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 5
-  Draw: 0
-  SetY: 0
-  Y: 0
-  LineHeight: 19.896374
-  RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
-  ImageIndex: 00000000
-  RemoveIndex: 0100000002000000030000000400000005000000
-  NewTextIndex: 06000000
-  NewTextPos:
-  - {x: 3.8449154, y: 8.290155, z: 0}
-  - {x: 16.28015, y: 8.290155, z: 0}
-  - {x: 16.28015, y: -9.119171, z: 0}
-  - {x: 16.28015, y: -9.119171, z: 0}
-  - {x: 3.8449154, y: -9.119171, z: 0}
-  - {x: 3.8449154, y: 8.290155, z: 0}
---- !u!114 &114871277902962284
+  m_Text: 87257
+--- !u!114 &114509740565883278
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1971581468309438}
+  m_GameObject: {fileID: 1143252165116650}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3f7e6e302f395b744be6ac65d53a2240, type: 3}
@@ -294,158 +305,217 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
-  Draw: 0
---- !u!114 &114921447471586180
+  Draw: 1
+--- !u!114 &114803250711698834
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1498954497838352}
+  m_GameObject: {fileID: 1646116839508110}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114327637007703412}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &114970587178147124
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1974864418794842}
+  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.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  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_FontData:
-    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: '****1532 : '
---- !u!222 &222049069938136978
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222406504289961844
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1047858920455296}
+--- !u!222 &222485822225150920
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1498954497838352}
---- !u!222 &222463751610676358
+  m_GameObject: {fileID: 1680512951879290}
+--- !u!222 &222621293481651208
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1235374732147134}
---- !u!222 &222494234897168520
+  m_GameObject: {fileID: 1646116839508110}
+--- !u!222 &222846138815763298
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1315465680827384}
---- !u!222 &222654799811553232
+  m_GameObject: {fileID: 1509332223137652}
+--- !u!222 &222930173278085740
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1971581468309438}
---- !u!222 &222842483776338390
+  m_GameObject: {fileID: 1974864418794842}
+--- !u!222 &222960981559701824
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1413984168578216}
---- !u!224 &224194809205400652
+  m_GameObject: {fileID: 1143252165116650}
+--- !u!224 &224042633406990250
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1413984168578216}
+  m_GameObject: {fileID: 1115339575636394}
   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: 224250177737373466}
-  m_Father: {fileID: 224375092351421506}
-  m_RootOrder: 2
+  - {fileID: 224735141033996776}
+  - {fileID: 224397078160467034}
+  - {fileID: 224125420440601976}
+  - {fileID: 224043093304935004}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -53.09, y: 41}
-  m_SizeDelta: {x: 84.224, y: 73}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 332.5, y: -55.99997}
+  m_SizeDelta: {x: 637.4, y: 102}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224250177737373466
+--- !u!224 &224043093304935004
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1315465680827384}
+  m_GameObject: {fileID: 1974864418794842}
+  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: 224042633406990250}
+  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: -1.8999786, y: -49.49997}
+  m_SizeDelta: {x: 633.6, y: 3}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224125420440601976
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1646116839508110}
   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: 224862441668659220}
-  m_Father: {fileID: 224194809205400652}
-  m_RootOrder: 0
+  - {fileID: 224889834567627892}
+  m_Father: {fileID: 224042633406990250}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0.056026, y: 11.01}
-  m_SizeDelta: {x: 84.112, y: 18.6}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -43.799957, y: -8}
+  m_SizeDelta: {x: 84.224, y: 73}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224272859752220610
+--- !u!224 &224397078160467034
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1235374732147134}
+  m_GameObject: {fileID: 1509332223137652}
   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: 224375092351421506}
+  m_Father: {fileID: 224042633406990250}
   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: -7.6, y: -0.0000038146973}
-  m_SizeDelta: {x: 477.8, y: 100}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 320.29, y: 1.0000305}
+  m_SizeDelta: {x: 462.39, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224375092351421506
+--- !u!224 &224735141033996776
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1073147265121344}
+  m_GameObject: {fileID: 1680512951879290}
   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: 224985055033363718}
-  - {fileID: 224272859752220610}
-  - {fileID: 224194809205400652}
-  m_Father: {fileID: 0}
+  m_Children: []
+  m_Father: {fileID: 224042633406990250}
   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: 665, y: 100}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 39.40003, y: 1.0000305}
+  m_SizeDelta: {x: 75, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224862441668659220
+--- !u!224 &224740833775021098
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1971581468309438}
+  m_GameObject: {fileID: 1143252165116650}
   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: 0.82901555}
   m_Children: []
-  m_Father: {fileID: 224250177737373466}
+  m_Father: {fileID: 224889834567627892}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -453,21 +523,22 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224985055033363718
+--- !u!224 &224889834567627892
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1498954497838352}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 1047858920455296}
+  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: 224375092351421506}
+  m_Children:
+  - {fileID: 224740833775021098}
+  m_Father: {fileID: 224125420440601976}
   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: -284.5, y: 0}
-  m_SizeDelta: {x: 75, y: 30}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0.056026, y: 11.01}
+  m_SizeDelta: {x: 84.112, y: 18.6}
   m_Pivot: {x: 0.5, y: 0.5}

+ 1 - 1
Assets/Resource/Prefab/PrefabUI/CommentItem.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 100bc0b1747d64e4db7883a2f0d726c5
-timeCreated: 1503889863
+timeCreated: 1508909706
 licenseType: Pro
 NativeFormatImporter:
   userData: 

+ 2 - 2
Assets/Resource/Prefab/PrefabUI/FlowerItem.prefab

@@ -279,7 +279,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -3166,7 +3166,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -11.250002, y: 7.75}
+  m_AnchoredPosition: {x: -17.8, y: 13.9}
   m_SizeDelta: {x: 22.5, y: 15.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224807438414421868

+ 42 - 0
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -2445,6 +2445,7 @@ GameObject:
   - component: {fileID: 224166385692002180}
   - component: {fileID: 222291972581527282}
   - component: {fileID: 114890480921197750}
+  - component: {fileID: 114095814332005448}
   m_Layer: 5
   m_Name: C_NickNameBK
   m_TagString: Untagged
@@ -3033,6 +3034,47 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 10000
+--- !u!114 &114095814332005448
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1894527734602330}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114890480921197750}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114105643185565740
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 292 - 25
Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -451,13 +451,14 @@ GameObject:
   - component: {fileID: 224544596059317450}
   - component: {fileID: 222955361620142790}
   - component: {fileID: 114555098223141448}
+  - component: {fileID: 225481213842122066}
   m_Layer: 5
-  m_Name: Q_Tit
+  m_Name: Q_Tip
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1151531914574136
 GameObject:
   m_ObjectHideFlags: 1
@@ -578,6 +579,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1233579801084216
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224539256885806826}
+  - component: {fileID: 222418739395497798}
+  - component: {fileID: 114841864863603680}
+  m_Layer: 5
+  m_Name: Q_Tit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1236675319047722
 GameObject:
   m_ObjectHideFlags: 1
@@ -891,6 +909,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1344269804651446
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224902459875341496}
+  - component: {fileID: 222717463545670458}
+  - component: {fileID: 114804093220552824}
+  - component: {fileID: 114156238384121908}
+  m_Layer: 5
+  m_Name: P_CancelShare
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1349505472027350
 GameObject:
   m_ObjectHideFlags: 1
@@ -1449,6 +1485,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1561814309705908
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224031962875580546}
+  - component: {fileID: 222621331705374498}
+  - component: {fileID: 114551959540214870}
+  m_Layer: 5
+  m_Name: Q_Frame
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1570613604283478
 GameObject:
   m_ObjectHideFlags: 1
@@ -3367,6 +3420,47 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114156238384121908
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1344269804651446}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114804093220552824}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114158424489082256
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3625,12 +3719,12 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 5
+    m_Top: 15
     m_Bottom: 0
   m_ChildAlignment: 1
   m_Spacing: 20
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
 --- !u!114 &114185070676951240
@@ -4348,11 +4442,11 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 20
+    m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 1
-    m_MinSize: 2
-    m_MaxSize: 20
+    m_MinSize: 1
+    m_MaxSize: 18
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -4545,11 +4639,11 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 30
+    m_FontSize: 25
     m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 30
+    m_MaxSize: 25
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 0
@@ -5266,6 +5360,33 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
+--- !u!114 &114551959540214870
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1561814309705908}
+  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 &114553252283310624
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5305,7 +5426,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: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -5322,8 +5443,8 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: "\u7559\u8A00\u677F"
 --- !u!114 &114562620415954596
@@ -6467,6 +6588,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114804093220552824
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1344269804651446}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114808703333410202
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6704,6 +6852,39 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114841864863603680
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1233579801084216}
+  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: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7559\u8A00\u677F"
 --- !u!114 &114850075890039366
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7479,11 +7660,11 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 30
+    m_FontSize: 25
     m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 30
+    m_MaxSize: 25
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 0
@@ -8149,6 +8330,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1131022232998578}
+--- !u!222 &222418739395497798
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1233579801084216}
 --- !u!222 &222425995427976826
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8299,6 +8486,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1444812444205710}
+--- !u!222 &222621331705374498
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1561814309705908}
 --- !u!222 &222639877291261962
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8341,6 +8534,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1151531914574136}
+--- !u!222 &222717463545670458
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1344269804651446}
 --- !u!222 &222723737800251838
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8617,6 +8816,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224031962875580546
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1561814309705908}
+  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: 224721906218477922}
+  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: -1.8999023, y: 150}
+  m_SizeDelta: {x: 633.6, y: 3}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224035531306328718
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8648,6 +8865,7 @@ RectTransform:
   - {fileID: 224231607117232022}
   - {fileID: 224316464020746548}
   - {fileID: 224549163792536180}
+  - {fileID: 224902459875341496}
   m_Father: {fileID: 224814127152008004}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8673,7 +8891,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: 593.3334, y: -30}
+  m_AnchoredPosition: {x: 603.3, y: -30}
   m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224061458002519324
@@ -8858,13 +9076,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224721906218477922}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000013761353, y: 160.43452}
-  m_SizeDelta: {x: 665, y: 5}
-  m_Pivot: {x: 0.5, y: 0.9999999}
+  m_AnchoredPosition: {x: -0.000008037, y: 154.56717}
+  m_SizeDelta: {x: 665, y: 15}
+  m_Pivot: {x: 0.5, y: 0.99999994}
 --- !u!224 &224123173145718798
 RectTransform:
   m_ObjectHideFlags: 1
@@ -10300,6 +10518,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -11.001038}
   m_SizeDelta: {x: 454.5, y: 306}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224539256885806826
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1233579801084216}
+  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: 224685061251222592}
+  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.9250488, y: 160.6}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224543818867996458
 RectTransform:
   m_ObjectHideFlags: 1
@@ -10329,11 +10565,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224685061251222592}
-  m_RootOrder: 0
+  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: 0.9250488, y: 160.6}
+  m_AnchoredPosition: {x: -0.925, y: -0.000015259}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224549163792536180
@@ -10595,10 +10831,11 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224544596059317450}
+  - {fileID: 224539256885806826}
   - {fileID: 224853605672449656}
   - {fileID: 224721906218477922}
   - {fileID: 224302110129383654}
+  - {fileID: 224544596059317450}
   m_Father: {fileID: 224224676194216816}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10725,14 +10962,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 224031962875580546}
   - {fileID: 224122819838006714}
   m_Father: {fileID: 224685061251222592}
   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: -0.000020503998, y: -15.500008}
-  m_SizeDelta: {x: 665, y: 321}
+  m_AnchoredPosition: {x: -0.000020503998, y: -21.499985}
+  m_SizeDelta: {x: 665, y: 309}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224744202695976684
 RectTransform:
@@ -11102,6 +11340,24 @@ RectTransform:
   m_AnchoredPosition: {x: 12.7499695, y: 0.08192444}
   m_SizeDelta: {x: -54, y: -306}
   m_Pivot: {x: 0.49999997, y: 0.99999994}
+--- !u!224 &224902459875341496
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1344269804651446}
+  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: 224042092064329274}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -172.99998, y: 0.00084701926}
+  m_SizeDelta: {x: 345, y: -0.20410156}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224905892849275844
 RectTransform:
   m_ObjectHideFlags: 1
@@ -11341,6 +11597,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225481213842122066
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1147826783697610}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 0
+  m_BlocksRaycasts: 0
+  m_IgnoreParentGroups: 0
 --- !u!225 &225543921084817026
 CanvasGroup:
   m_ObjectHideFlags: 1

+ 1 - 1
Assets/Resource/Sprite/Editor/SpriteUI/领取物品发光转动.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 36 - 0
Assets/Resource/XML/Config/achieve_config.xml

@@ -85,6 +85,42 @@
   <item id="264" index="14" name="拥有的服装-4" desc="" type="14" value="60" parent="263" del="1" diamond_once="25" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="265" index="14" name="拥有的服装-5" desc="" type="14" value="90" parent="264" del="1" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
   <item id="266" index="14" name="拥有的服装-6" desc="" type="14" value="120" parent="265" del="0" diamond_once="50" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="281" index="15" name="" desc="" type="15" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
+  <item id="282" index="15" name="" desc="" type="15" value="6" parent="281" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
+  <item id="283" index="15" name="" desc="" type="15" value="7" parent="282" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
+  <item id="284" index="15" name="" desc="" type="15" value="8" parent="283" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
+  <item id="285" index="15" name="" desc="" type="15" value="9" parent="284" del="1" diamond_once="10" coin_person="" person="" icon="派对图标" />
+  <item id="286" index="15" name="" desc="" type="15" value="10" parent="285" del="0" diamond_once="10" coin_person="" person="" icon="派对图标" />
+  <item id="301" index="16" name="" desc="" type="16" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
+  <item id="302" index="16" name="" desc="" type="16" value="6" parent="301" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
+  <item id="303" index="16" name="" desc="" type="16" value="7" parent="302" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
+  <item id="304" index="16" name="" desc="" type="16" value="8" parent="303" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
+  <item id="305" index="16" name="" desc="" type="16" value="9" parent="304" del="1" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
+  <item id="306" index="16" name="" desc="" type="16" value="10" parent="305" del="0" diamond_once="10" coin_person="" person="" icon="系统宝箱" />
+  <item id="321" index="17" name="" desc="" type="17" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
+  <item id="322" index="17" name="" desc="" type="17" value="6" parent="321" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
+  <item id="323" index="17" name="" desc="" type="17" value="7" parent="322" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
+  <item id="324" index="17" name="" desc="" type="17" value="8" parent="323" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
+  <item id="325" index="17" name="" desc="" type="17" value="9" parent="324" del="1" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
+  <item id="326" index="17" name="" desc="" type="17" value="10" parent="325" del="0" diamond_once="10" coin_person="" person="" icon="钻石宝箱" />
+  <item id="341" index="18" name="" desc="" type="18" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
+  <item id="342" index="18" name="" desc="" type="18" value="6" parent="341" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
+  <item id="343" index="18" name="" desc="" type="18" value="7" parent="342" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
+  <item id="344" index="18" name="" desc="" type="18" value="8" parent="343" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
+  <item id="345" index="18" name="" desc="" type="18" value="9" parent="344" del="1" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
+  <item id="346" index="18" name="" desc="" type="18" value="10" parent="345" del="0" diamond_once="10" coin_person="" person="" icon="花朵宝箱" />
+  <item id="361" index="19" name="" desc="" type="19" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
+  <item id="362" index="19" name="" desc="" type="19" value="6" parent="361" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
+  <item id="363" index="19" name="" desc="" type="19" value="7" parent="362" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
+  <item id="364" index="19" name="" desc="" type="19" value="8" parent="363" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
+  <item id="365" index="19" name="" desc="" type="19" value="9" parent="364" del="1" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
+  <item id="366" index="19" name="" desc="" type="19" value="10" parent="365" del="0" diamond_once="10" coin_person="" person="" icon="数字宝箱" />
+  <item id="381" index="20" name="" desc="" type="20" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
+  <item id="382" index="20" name="" desc="" type="20" value="6" parent="381" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
+  <item id="383" index="20" name="" desc="" type="20" value="7" parent="382" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
+  <item id="384" index="20" name="" desc="" type="20" value="8" parent="383" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
+  <item id="385" index="20" name="" desc="" type="20" value="9" parent="384" del="1" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
+  <item id="386" index="20" name="" desc="" type="20" value="10" parent="385" del="0" diamond_once="10" coin_person="" person="" icon="领取物品发光转动" />
   <comment>
     <id>
 

+ 1 - 1
Assets/Resource/XML/Config/plaza_room_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" create_cost_fml="h*p" cost_value_fml="c*h*p" />
+  <item id="1" create_cost_fml="h*50+p*5" cost_value_fml="c*0.8" />
   <comment>
     <id>
 id

+ 2 - 2
Assets/Resource/XML/PlayerConfig.xml

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

+ 72 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -480,6 +480,42 @@
     <Achieve264 desc=""><![CDATA[衣橱满满-4]]></Achieve264>
     <Achieve265 desc=""><![CDATA[衣橱满满-5]]></Achieve265>
     <Achieve266 desc=""><![CDATA[衣橱满满-6]]></Achieve266>
+    <Achieve281 desc=""><![CDATA[开房间次数]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[开房间次数]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[开房间次数]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[开房间次数]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[开房间次数]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[开房间次数]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[放置宝箱总次数]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[放置宝箱总次数]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[放置宝箱总次数]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[放置宝箱总次数]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[放置宝箱总次数]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[放置宝箱总次数]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[房间宝箱领取次数]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[房间宝箱领取次数]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[房间宝箱领取次数]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[房间宝箱领取次数]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[房间宝箱领取次数]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[房间宝箱领取次数]]></Achieve386>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花园等级达到 [&value&]]]></Achieve1>
@@ -568,6 +604,42 @@
     <Achieve264 desc=""><![CDATA[拥有[&value&]件装扮]]></Achieve264>
     <Achieve265 desc=""><![CDATA[拥有[&value&]件装扮]]></Achieve265>
     <Achieve266 desc=""><![CDATA[拥有[&value&]件装扮]]></Achieve266>
+    <Achieve281 desc=""><![CDATA[开房间次数]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[开房间次数]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[开房间次数]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[开房间次数]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[开房间次数]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[开房间次数]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[放置宝箱总次数]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[放置宝箱总次数]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[放置宝箱总次数]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[放置宝箱总次数]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[放置宝箱总次数]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[放置宝箱总次数]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[放置拼手气宝箱次数]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[放置猜颜色宝箱次数]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[放置猜数字宝箱次数]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[房间宝箱领取次数]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[房间宝箱领取次数]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[房间宝箱领取次数]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[房间宝箱领取次数]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[房间宝箱领取次数]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[房间宝箱领取次数]]></Achieve386>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[没有广告可播放啦,请稍后再试]]></LoadAd>

+ 72 - 0
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -480,6 +480,42 @@
     <Achieve264 desc=""><![CDATA[衣櫥滿滿-4]]></Achieve264>
     <Achieve265 desc=""><![CDATA[衣櫥滿滿-5]]></Achieve265>
     <Achieve266 desc=""><![CDATA[衣櫥滿滿-6]]></Achieve266>
+    <Achieve281 desc=""><![CDATA[]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[]]></Achieve386>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花園等級達到 [&value&]]]></Achieve1>
@@ -568,6 +604,42 @@
     <Achieve264 desc=""><![CDATA[擁有[&value&]件裝扮]]></Achieve264>
     <Achieve265 desc=""><![CDATA[擁有[&value&]件裝扮]]></Achieve265>
     <Achieve266 desc=""><![CDATA[擁有[&value&]件裝扮]]></Achieve266>
+    <Achieve281 desc=""><![CDATA[]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[]]></Achieve386>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[沒有廣告可播放啦,請稍後再試]]></LoadAd>

+ 72 - 0
Assets/Resource/XML/lan/English.xml

@@ -481,6 +481,42 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Achieve264 desc=""><![CDATA[Full Closet 4]]></Achieve264>
     <Achieve265 desc=""><![CDATA[Full Closet 5]]></Achieve265>
     <Achieve266 desc=""><![CDATA[Full Closet 6]]></Achieve266>
+    <Achieve281 desc=""><![CDATA[]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[]]></Achieve386>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[Garden Level [&value&]]]></Achieve1>
@@ -569,6 +605,42 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Achieve264 desc=""><![CDATA[Collect [&value&] Dresses]]></Achieve264>
     <Achieve265 desc=""><![CDATA[Collect [&value&] Dresses]]></Achieve265>
     <Achieve266 desc=""><![CDATA[Collect [&value&] Dresses]]></Achieve266>
+    <Achieve281 desc=""><![CDATA[]]></Achieve281>
+    <Achieve282 desc=""><![CDATA[]]></Achieve282>
+    <Achieve283 desc=""><![CDATA[]]></Achieve283>
+    <Achieve284 desc=""><![CDATA[]]></Achieve284>
+    <Achieve285 desc=""><![CDATA[]]></Achieve285>
+    <Achieve286 desc=""><![CDATA[]]></Achieve286>
+    <Achieve301 desc=""><![CDATA[]]></Achieve301>
+    <Achieve302 desc=""><![CDATA[]]></Achieve302>
+    <Achieve303 desc=""><![CDATA[]]></Achieve303>
+    <Achieve304 desc=""><![CDATA[]]></Achieve304>
+    <Achieve305 desc=""><![CDATA[]]></Achieve305>
+    <Achieve306 desc=""><![CDATA[]]></Achieve306>
+    <Achieve321 desc=""><![CDATA[]]></Achieve321>
+    <Achieve322 desc=""><![CDATA[]]></Achieve322>
+    <Achieve323 desc=""><![CDATA[]]></Achieve323>
+    <Achieve324 desc=""><![CDATA[]]></Achieve324>
+    <Achieve325 desc=""><![CDATA[]]></Achieve325>
+    <Achieve326 desc=""><![CDATA[]]></Achieve326>
+    <Achieve341 desc=""><![CDATA[]]></Achieve341>
+    <Achieve342 desc=""><![CDATA[]]></Achieve342>
+    <Achieve343 desc=""><![CDATA[]]></Achieve343>
+    <Achieve344 desc=""><![CDATA[]]></Achieve344>
+    <Achieve345 desc=""><![CDATA[]]></Achieve345>
+    <Achieve346 desc=""><![CDATA[]]></Achieve346>
+    <Achieve361 desc=""><![CDATA[]]></Achieve361>
+    <Achieve362 desc=""><![CDATA[]]></Achieve362>
+    <Achieve363 desc=""><![CDATA[]]></Achieve363>
+    <Achieve364 desc=""><![CDATA[]]></Achieve364>
+    <Achieve365 desc=""><![CDATA[]]></Achieve365>
+    <Achieve366 desc=""><![CDATA[]]></Achieve366>
+    <Achieve381 desc=""><![CDATA[]]></Achieve381>
+    <Achieve382 desc=""><![CDATA[]]></Achieve382>
+    <Achieve383 desc=""><![CDATA[]]></Achieve383>
+    <Achieve384 desc=""><![CDATA[]]></Achieve384>
+    <Achieve385 desc=""><![CDATA[]]></Achieve385>
+    <Achieve386 desc=""><![CDATA[]]></Achieve386>
   </AchieveDesc>
   <IAP>
     <LoadAd desc=""><![CDATA[No ADs anymore, try again later]]></LoadAd>

BIN
Assets/Resource/Xlsx/achieve_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 57 - 9
Assets/Script/Manage/ManaAchieve.cs

@@ -30,6 +30,13 @@ public enum AchieveType
     CurrentCoin,
 
     CostDiamond,
+
+    CreateRoomAmt,
+    CreateChestAmt,
+    CreateLuckyChestAmt,
+    CreateGuessColorChestAmt,
+    CreateGuessNumberChestAmt,
+    GetChestAwardAmt,
 }
 
 public class Achieve
@@ -164,7 +171,7 @@ public class Achieve
         if (Lock)
         {
             UpdateStatus();
-            
+
             ManaAchieve.DeleDic.Add(AchieveType, UpdateStatus);
         }
         else
@@ -265,6 +272,30 @@ public class Achieve
         {
             UpdateStatus(ManaCenter.CloseAmt);
         }
+        else if (AchieveType == AchieveType.CreateRoomAmt)
+        {
+            UpdateStatus(ManaCenter.CreateRoomAmt);
+        }
+        else if (AchieveType == AchieveType.CreateChestAmt)
+        {
+            UpdateStatus(ManaCenter.CreateChestAmt);
+        }
+        else if (AchieveType == AchieveType.CreateLuckyChestAmt)
+        {
+            UpdateStatus(ManaCenter.CreateLuckyChestAmt);
+        }
+        else if (AchieveType == AchieveType.CreateGuessColorChestAmt)
+        {
+            UpdateStatus(ManaCenter.CreateGuessColorChestAmt);
+        }
+        else if (AchieveType == AchieveType.CreateGuessNumberChestAmt)
+        {
+            UpdateStatus(ManaCenter.CreateGuessNumberChestAmt);
+        }
+        else if (AchieveType == AchieveType.GetChestAwardAmt)
+        {
+            UpdateStatus(ManaCenter.GetChestAwardAmt);
+        }
         else
         {
             throw new Exception();
@@ -432,6 +463,30 @@ public class Achieve
         {
             return AchieveType.CloseAmt;
         }
+        else if (integer == 15)
+        {
+            return AchieveType.CreateRoomAmt;
+        }
+        else if (integer == 16)
+        {
+            return AchieveType.CreateChestAmt;
+        }
+        else if (integer == 17)
+        {
+            return AchieveType.CreateLuckyChestAmt;
+        }
+        else if (integer == 18)
+        {
+            return AchieveType.CreateGuessColorChestAmt;
+        }
+        else if (integer == 19)
+        {
+            return AchieveType.CreateGuessNumberChestAmt;
+        }
+        else if (integer == 20)
+        {
+            return AchieveType.GetChestAwardAmt;
+        }
         else
         {
             throw new Exception();
@@ -550,11 +605,4 @@ public class ManaAchieve : Regist
             DeleDic[type].SafeInvoke(value);
         }
     }
-}
-
-#region DebugList
-
-//状态的转换(进行中->待领取->已完成)
-//成就的存档(进行中 已完成)
-
-#endregion
+}

+ 73 - 1
Assets/Script/Manage/ManaCenter.cs

@@ -127,6 +127,66 @@ public class ManaCenter : Regist
             ManaAchieve.UpdateStatus(AchieveType.CostDiamond, CostDiamond_);
         }
     }
+    public static double CreateRoomAmt
+    {
+        get { return CreateRoomAmt_; }
+        set
+        {
+            CreateRoomAmt_ = value;
+
+            ManaAchieve.UpdateStatus(AchieveType.CreateRoomAmt, CreateRoomAmt_);
+        }
+    }
+    public static double CreateChestAmt
+    {
+        get { return CreateChestAmt_; }
+        set
+        {
+            CreateChestAmt_ = value;
+
+            ManaAchieve.UpdateStatus(AchieveType.CreateChestAmt, CreateChestAmt_);
+        }
+    }
+    public static double CreateLuckyChestAmt
+    {
+        get { return CreateLuckyChestAmt_; }
+        set
+        {
+            CreateLuckyChestAmt_ = value;
+
+            ManaAchieve.UpdateStatus(AchieveType.CreateLuckyChestAmt, CreateLuckyChestAmt_);
+        }
+    }
+    public static double CreateGuessColorChestAmt
+    {
+        get { return CreateGuessColorChestAmt_; }
+        set
+        {
+            CreateGuessColorChestAmt_ = value;
+
+            ManaAchieve.UpdateStatus(AchieveType.CreateGuessColorChestAmt, CreateGuessColorChestAmt_);
+        }
+    }
+    public static double CreateGuessNumberChestAmt
+    {
+        get { return CreateGuessNumberChestAmt_; }
+        set
+        {
+            CreateGuessNumberChestAmt_ = value;
+
+            ManaAchieve.UpdateStatus(AchieveType.CreateGuessNumberChestAmt, CreateGuessNumberChestAmt_);
+        }
+    }
+    public static double GetChestAwardAmt
+    {
+        get { return GetChestAwardAmt_; }
+        set
+        {
+            GetChestAwardAmt_ = value;
+
+            ManaAchieve.UpdateStatus(AchieveType.GetChestAwardAmt, GetChestAwardAmt_);
+        }
+    }
 
     private static double AdAmt_;
     private static double SkillAmt_;
@@ -139,6 +199,12 @@ public class ManaCenter : Regist
     private static double FlowerCoin_;
     private static double TotalPerson_;
     private static double CostDiamond_;
+    private static double CreateRoomAmt_;
+    private static double CreateChestAmt_;
+    private static double CreateLuckyChestAmt_;
+    private static double CreateGuessColorChestAmt_;
+    private static double CreateGuessNumberChestAmt_;
+    private static double GetChestAwardAmt_;
 
     #endregion
 
@@ -716,6 +782,12 @@ public class ManaCenter : Regist
         TotalPerson = dataList[7];
         CostDiamond = dataList[8];
         MiniGameAmt = dataList[5];
+        CreateRoomAmt = dataList[9];
+        CreateChestAmt = dataList[10];
+        CreateLuckyChestAmt = dataList[11];
+        CreateGuessColorChestAmt = dataList[12];
+        CreateGuessNumberChestAmt = dataList[13];
+        GetChestAwardAmt = dataList[14];
     }
 
 
@@ -1038,7 +1110,7 @@ public class ManaCenter : Regist
             }
         }
 
-        ManaSocial.UpdatePage(true);
+        //ManaSocial.UpdatePage(true);
 
 
         RegistSkill(true);

+ 38 - 0
Assets/Script/Manage/ManaData.cs

@@ -485,6 +485,12 @@ public class ManaData : Regist
         PlayerNode.SelectSingleNode("AchieveData").Attributes[6].Value = ManaCenter.FlowerCoin.ToString("0");
         PlayerNode.SelectSingleNode("AchieveData").Attributes[7].Value = ManaCenter.TotalPerson.ToString("0");
         PlayerNode.SelectSingleNode("AchieveData").Attributes[8].Value = ManaCenter.CostDiamond.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[9].Value = ManaCenter.CreateRoomAmt.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[10].Value = ManaCenter.CreateChestAmt.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[11].Value = ManaCenter.CreateLuckyChestAmt.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[12].Value = ManaCenter.CreateGuessColorChestAmt.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[13].Value = ManaCenter.CreateGuessNumberChestAmt.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[14].Value = ManaCenter.GetChestAwardAmt.ToString("0");
     }
 
     public static void SavePlantList()
@@ -853,6 +859,12 @@ public class ManaData : Regist
         dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[6].Value));
         dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[7].Value));
         dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[8].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[9].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[10].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[11].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[12].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[13].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[14].Value));
 
         return dataList;
     }
@@ -1182,6 +1194,13 @@ public class ManaData : Regist
             To8(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 9)
+        {
+            Debug.LogWarning("UpdateArchive to 9");
+
+            To9(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1370,4 +1389,23 @@ public class ManaData : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument To9(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 9.ToString();
+        XmlNode xmlNode = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("AchieveData");
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute("CreateRoomAmt"));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute("CreateChestAmt"));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute("CreateLuckyChestAmt"));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute("CreateGuessColorChestAmt"));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute("CreateGuessNumberChestAmt"));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute("GetChestAwardAmt"));
+        xmlNode.Attributes[9].Value = "0";
+        xmlNode.Attributes[10].Value = "0";
+        xmlNode.Attributes[11].Value = "0";
+        xmlNode.Attributes[12].Value = "0";
+        xmlNode.Attributes[13].Value = "0";
+        xmlNode.Attributes[14].Value = "0";
+        return nativeDoc;
+    }
 }

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

@@ -534,7 +534,7 @@ public class ManaGarden : Regist
             ManaReso.SetActive("H_Desc", true);
             ManaReso.Get<Button>("H_Icon2").interactable = true;
             ManaReso.SetActive("H_AmtLab", true);
-            ManaReso.SetText("H_AmtLab", "X" + flowerInfo.RemainAmount);
+            ManaReso.SetText("H_AmtLab", "x" + flowerInfo.RemainAmount);
         }
     }
 

+ 10 - 1
Assets/Script/Manage/ManaIAP.cs

@@ -84,7 +84,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 
                 if (ManaServer.Connect && (ManaServer.Time.Subtract((DateTime)ADPlayTime).TotalSeconds > 1200))
                 {
-                    if (ManaGarden.MiniLock && !ManaVisit.InVisit && !ManaTutorial.TutorialA && !SFSManager.GardenSmartFox.PlazaRoomManager.JoinedPlazaRoom)
+                    if (ManaGarden.MiniLock && !ManaVisit.InVisit && !ManaTutorial.TutorialA && !SFSManager.GardenSmartFox.PlazaRoomManager.JoinedPlazaRoom && !Player.InDressRoom)
                     {
                         ChestList.Add(ManaReso.GetADChest());
                     }
@@ -93,6 +93,15 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         }
     }
 
+    public static void RetrieveADChest()
+    {
+        if (ChestList.Count > 0)
+        {
+            ManaReso.Save(ChestList[0].transform.parent);
+            ChestList.RemoveAt(0);
+        }
+    }
+
 
     public static void Initialize()
     {

+ 6 - 6
Assets/Script/Manage/ManaReso.cs

@@ -606,17 +606,17 @@ public class ManaReso : Regist
     {
         Transform tra = Get("ADChest", Folder.Scene, false, Get("GardenPage"), true, ObjType.ADChest);
 
-        ADChest chest = tra.GetComponent<ADChest>();
+        ADChest chest = tra.GetComponentInChildren<ADChest>(true);
 
         if (chest == null)
         {
-            chest = tra.AddComponent<ADChest>();
+            chest = tra.GetChild(0).AddComponent<ADChest>();
 
-            chest.Initialize(true, tra.position.y, false, false);
+            chest.Initialize(tra.position.y, false, false);
         }
         else
         {
-            chest.Initialize(true, tra.position.y, false, false);
+            chest.Initialize(tra.position.y, false, false);
         }
 
         return chest;
@@ -626,11 +626,11 @@ public class ManaReso : Regist
     {
         Transform tra = Get("PlazaRoomChest", Folder.Scene, false, Get("PlazaRoom"), position, ObjType.PlazaRoomChest);
 
-        PlazaRoomChest chest = tra.GetComponent<PlazaRoomChest>();
+        PlazaRoomChest chest = tra.GetComponentInChildren<PlazaRoomChest>(true);
 
         if (chest == null)
         {
-            chest = tra.AddComponent<PlazaRoomChest>();
+            chest = tra.GetChild(0).AddComponent<PlazaRoomChest>();
         }
 
         return chest;

+ 34 - 16
Assets/Script/Manage/ManaServer.cs

@@ -81,7 +81,7 @@ public class ManaServer : Regist
             {
                 if (kv.Value is Pack)
                 {
-                    ((Pack) kv.Value).SetActive(!PackLock_);
+                    ((Pack) kv.Value).SetActive();
                 }
             }
         }
@@ -122,7 +122,16 @@ public class ManaServer : Regist
 
     public void Awake()
     {
-        //AddComment("1706277644193291134", "1710065808151506837", "你好啊", CommentType.Garden);
+        //URLRequestData urlData = new URLRequestData();
+
+        //urlData.Add("u", "1709207727231988804");
+
+        //URLRequest.CreateStrURLRequest(NewBaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
+
+
+        //AddComment("1709207727231988804", "1709207727231988804", "你好4", CommentType.Garden);
+        //AddComment("1704251601802555535", "1709207727231988804", "你好1", CommentType.Garden);
+        //AddComment("1706142186026389627", "1709207727231988804", "你好2", CommentType.Garden);
 
         //URLRequestData urlData = new URLRequestData();
 
@@ -131,7 +140,7 @@ public class ManaServer : Regist
         //URLRequest.CreateURLRequest(BaseURL + "/user/load", urlData, (data)=> {Debug.Log(data.ToJson());}, URLRequest.Method.POST);
 
 
-        //urlData = new URLRequestData();
+        //URLRequestData urlData = new URLRequestData();
 
         //urlData.Add("u", "1709207727231988804");
 
@@ -268,6 +277,7 @@ public class ManaServer : Regist
 
         URLRequest.CreateStrURLRequest
         (
+            true,
             BaseURL + "/user/nickname",
             urlData,
             data =>
@@ -292,6 +302,7 @@ public class ManaServer : Regist
 
         URLRequest.CreateStrURLRequest
         (
+            false,
             NewBaseURL + "/user/look",
             urlData,
             data =>
@@ -362,6 +373,7 @@ public class ManaServer : Regist
                     URLRequestData urlData = new URLRequestData();
                     URLRequest.CreateStrURLRequest
                         (
+                            true,
                             data["l"][3]["val"].ToString(),
                             urlData,
                             notificationXml =>
@@ -517,7 +529,7 @@ public class ManaServer : Regist
         urlData.Add("u", sendID);
         urlData.Add("t", receiveID);
 
-        URLRequest.CreateStrURLRequest(BaseURL + "/praise/click", urlData, (data)=> {}, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest(true, BaseURL + "/praise/click", urlData, (data)=> {}, URLRequest.Method.POST);
     }
 
     public static void Target(string userID, string targetID, Action<JsonData> callback)
@@ -527,7 +539,7 @@ public class ManaServer : Regist
         urlData.Add("u", userID);
         urlData.Add("t", targetID);
 
-        URLRequest.CreateURLRequest(BaseURL + "/praise/target", urlData, data => callback(data), URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, BaseURL + "/praise/target", urlData, data => callback(data), URLRequest.Method.POST);
     }
 
     public static void AddComment(string sendID, string receiveID, string content, CommentType type)
@@ -538,9 +550,13 @@ public class ManaServer : Regist
         urlData.Add("u", receiveID);
         urlData.Add("i", content);
         urlData.Add("t", type.GetHashCode());
-
+        Debug.LogWarning(sendID);
+        Debug.LogWarning(receiveID);
+        Debug.LogWarning(content);
+        Debug.LogWarning(type.GetHashCode());
         URLRequest.CreateStrURLRequest
         (
+            true,
             BaseURL + "/comment/comment",
             urlData,
             data =>
@@ -579,7 +595,7 @@ public class ManaServer : Regist
         urlData.Add("p", page);
         urlData.Add("t", type.GetHashCode());
 
-        URLRequest.CreateURLRequest(BaseURL + "/comment/index", urlData, data => { callback(data);}, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, BaseURL + "/comment/index", urlData, data => { callback(data);}, URLRequest.Method.POST);
     }
 
 
@@ -589,6 +605,7 @@ public class ManaServer : Regist
 
         URLRequest.CreateURLRequest
         (
+            true,
             BaseURL + "/index/index",
             urlData,
             data =>
@@ -651,6 +668,7 @@ public class ManaServer : Regist
                     URLRequestData urlData = new URLRequestData();
                     URLRequest.CreateStrURLRequest
                         (
+                            true,
                             data["l"][1]["val"].ToJson().Trim('"'),
                             urlData,
                             mailXml =>
@@ -938,7 +956,7 @@ public class ManaServer : Regist
         urlData.Add("i", id);
         urlData.Add("u", JsonData.Inst_Object["i"].ToJson().Trim('"'));
 
-        URLRequest.CreateStrURLRequest(BaseURL + "/pay/pay", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest(true, BaseURL + "/pay/pay", urlData, callback, URLRequest.Method.POST);
     }
 
 
@@ -948,13 +966,13 @@ public class ManaServer : Regist
 
         urlData.Add("u", SystemInfo.deviceUniqueIdentifier);
 
-        URLRequest.CreateURLRequest(NewBaseURL + "/user/login", urlData, LoginCallback + callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(false, NewBaseURL + "/user/login", urlData, LoginCallback + callback, URLRequest.Method.POST);
     }
 
     private static void LoginCallback(JsonData jsonData)
     {
         Complete = true;
-        
+
         if (jsonData.Inst_Object.ContainsKey("c"))
         {
             Connect = true;
@@ -1018,7 +1036,7 @@ public class ManaServer : Regist
 
         urlData.Add("l", ManaData.PlayerDoc.OuterXml);
 
-        URLRequest.CreateURLRequest(NewBaseURL + "/user/save", urlData, SaveCallback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(false, NewBaseURL + "/user/save", urlData, SaveCallback, URLRequest.Method.POST);
         //URLRequest.CreateStrURLRequest(NewBaseURL + "/user/save", urlData, Debug.Log, URLRequest.Method.POST);
     }
 
@@ -1031,10 +1049,10 @@ public class ManaServer : Regist
     public static void Other(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();
-
+        //Debug.LogError(id);
         urlData.Add("u", id);
 
-        URLRequest.CreateURLRequest(BaseURL + "/user/other", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, NewBaseURL + "/user/other", urlData, callback, URLRequest.Method.POST);
     }
 
     public static void DownloadByID(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
@@ -1043,7 +1061,7 @@ public class ManaServer : Regist
 
         urlData.Add("u", id);
 
-        URLRequest.CreateURLRequest(BaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, BaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
     }
 
     public static void DownloadBySerialNumber(string serialNumber, URLRequest.URLRequestJsonCallBackDelegate callback)
@@ -1052,7 +1070,7 @@ public class ManaServer : Regist
 
         urlData.Add("u", serialNumber);
 
-        URLRequest.CreateURLRequest(NewBaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, NewBaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
     }
 
     public static void RandomLoad(URLRequest.URLRequestJsonCallBackDelegate callback)
@@ -1061,7 +1079,7 @@ public class ManaServer : Regist
 
         urlData.Add("i", "");
 
-        URLRequest.CreateURLRequest(BaseURL + "/user/rand", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(false, BaseURL + "/user/rand", urlData, callback, URLRequest.Method.POST);
     }
 
 

+ 27 - 10
Assets/Script/Manage/ManaSocial.cs

@@ -70,17 +70,17 @@ public class ManaSocial : Regist
             return;
         }
 
-        CommentTimer += Time.deltaTime;
+        //CommentTimer += Time.deltaTime;
 
-        if (CommentTimer >= CommentTimespan)
-        {
-            CommentTimer = 0;
+        //if (CommentTimer >= CommentTimespan)
+        //{
+        //    CommentTimer = 0;
 
-            if (!IsPanelOpen)
-            {
-                UpdatePage(true);
-            }
-        }
+        //    if (!IsPanelOpen)
+        //    {
+        //        UpdatePage(true);
+        //    }
+        //}
 
         PraiseTimer += Time.deltaTime;
 
@@ -366,6 +366,9 @@ public class ManaSocial : Regist
 
         ClearComment();
 
+        ManaReso.Get("Q_Tip").TweenForCG();
+        ManaLan.Add(ManaReso.Get<Text>("Q_Tip"), Language.GetStr("UI", "Loading"));
+
         if (isPlayer)
         {
             //Debug.Log("UpdatePlayer");
@@ -384,8 +387,14 @@ public class ManaSocial : Regist
                 {
                     if (!ManaVisit.InVisit)
                     {
+                        DelayCall.Call(0.5f, () => ManaReso.Get("Q_Tip").TweenBacCG());
+                        ManaLan.Add(ManaReso.Get<Text>("Q_Tip"), Language.GetStr("UI", "LoadSucceed"));
+
                         InputCommentData(true, data);
                         NextPage(true, true);
+
+                        ManaReso.Get<CanvasGroup>("Q_CommentBK").interactable = false;
+                        DelayCall.Call(1, () => ManaReso.Get<CanvasGroup>("Q_CommentBK").interactable = true);
                     }
                 }
             );
@@ -408,8 +417,14 @@ public class ManaSocial : Regist
                 {
                     if (ManaVisit.InVisit)
                     {
+                        DelayCall.Call(0.5f, () => ManaReso.Get("Q_Tip").TweenBacCG());
+                        ManaLan.Add(ManaReso.Get<Text>("Q_Tip"), Language.GetStr("UI", "LoadSucceed"));
+
                         InputCommentData(false, data);
                         NextPage(false, true);
+
+                        ManaReso.Get<CanvasGroup>("Q_CommentBK").interactable = false;
+                        DelayCall.Call(1, () => ManaReso.Get<CanvasGroup>("Q_CommentBK").interactable = true);
                     }
                 }
             );
@@ -517,7 +532,7 @@ public class ManaSocial : Regist
             CommentTime = DateTime.Now;
 
             string content = StringFilter.GetFilteredString(InputField.text); 
-
+            
             ManaServer.AddComment(ManaServer.SerialNumber, ManaVisit.VisiteeSerialNumber, content, CommentType.Garden);
         }
         else
@@ -534,6 +549,8 @@ public class ManaSocial : Regist
 
         IsPlayer = !ManaVisit.InVisit;
         IsPanelOpen = true;
+
+        UpdatePage(IsPlayer);
     }
 
     public static void CloseCommentPanel()

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

@@ -461,7 +461,6 @@ public class ManaUI : Regist
             () =>
             {
                 ManaVisit.Visit(ArchiveSource.Random);
-                ManaReso.SetActive("C_EnterPlazaRoom0", false);
             }
         );
 
@@ -571,6 +570,20 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region C_NickNameBK
+
+        ManaReso.SetButtonEvent
+        (
+            "C_NickNameBK",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+                ManaNickName.ShowNickNameSettingPanel();
+            }
+        );
+
+        #endregion
+
         #endregion
 
         #region D
@@ -769,6 +782,7 @@ public class ManaUI : Regist
             ManaReso.SetActive("GardenNormal", false);
 
             ManaGarden.RetrieveAllElf();
+            ManaIAP.RetrieveADChest();
         };
 
         tween.OnBackwardStart += () =>
@@ -2660,6 +2674,7 @@ public class ManaUI : Regist
             {
                 ManaReso.SetActive("P_Open", false);
                 ManaReso.SetActive("P_Share", false);
+                ManaReso.SetActive("P_CancelShare", true);
 
                 string filePath = Application.persistentDataPath + "/MyLovelyGarden.png";
 
@@ -2671,6 +2686,20 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region P_CancelShare
+
+        ManaReso.SetButtonEvent
+        (
+            "P_CancelShare",
+            () =>
+            {
+                ManaReso.SetActive("P_Open", true);
+                ManaReso.SetActive("P_CancelShare", false);
+            }
+        );
+
+        #endregion
+
 
         #region Pa_Info
 
@@ -2702,6 +2731,7 @@ public class ManaUI : Regist
         ManaLan.Add(ManaReso.Get<Text>("Q_CommentLab"), new LanStr("UI", "Q_CommentLab"));
         ManaLan.Add(ManaReso.Get<Text>("Q_CloseLab"), new LanStr("UI", "Q_CloseLab"));
 
+        ManaReso.Get("Q_Tip").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ManaReso.Get("Q_CommentBK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         ManaReso.AddButtonEvent

+ 9 - 25
Assets/Script/Manage/ManaVisit.cs

@@ -191,8 +191,6 @@ public class ManaVisit : Regist
     {
         ManaReso.Get("I_BlackMask").TweenForCG();
 
-        EnableChest();
-			
 		HideTip ();
 
         ManaReso.SetActive("C_Visit", true);
@@ -327,11 +325,9 @@ public class ManaVisit : Regist
         }
 
         ManaReso.Get("I_BlackMask").TweenForCG();
-
+        //Debug.Log(Document.OuterXml);
         SetVisiteePraise(Document);
 
-        DisableChest();
-
 		ShowTip ();
 
         Node = Document.SelectSingleNode("PlayerConfig");
@@ -345,6 +341,8 @@ public class ManaVisit : Regist
         if (!InVisit)
         {
             ManaGarden.RetrieveAllStar();
+            ManaGarden.RetrieveAllElf();
+            ManaIAP.RetrieveADChest();
 
             ManaGarden.StarList = new List<Star>();
         }
@@ -649,23 +647,6 @@ public class ManaVisit : Regist
     }
 
 
-    public static void EnableChest()
-    {
-        for (int i = 0; i < ManaIAP.ChestList.Count; i++)
-        {
-            ManaIAP.ChestList[i].SetActive(true);
-        }
-    }
-
-    public static void DisableChest()
-    {
-        for (int i = 0; i < ManaIAP.ChestList.Count; i++)
-        {
-            ManaIAP.ChestList[i].SetActive(false);
-        }
-    }
-
-
     public static void SetPlayerPraise()
     {
         ManaSocial.PraiseText.text = ManaServer.PraiseAmt.ToString();
@@ -687,7 +668,7 @@ public class ManaVisit : Regist
         else
         {
             VisiteeSerialNumber = document.SelectSingleNode("PlayerConfig").SelectSingleNode("SerialNumber").Attributes[0].Value;
-
+            //Debug.Log(VisiteeSerialNumber);
             ManaServer.Target
                 (
                     ManaServer.SerialNumber,
@@ -716,7 +697,7 @@ public class ManaVisit : Regist
         }
         else
         {
-            ManaSocial.UpdatePage(true);
+            //ManaSocial.UpdatePage(true);
         }
     }
 
@@ -724,7 +705,7 @@ public class ManaVisit : Regist
     {
         ManaSocial.ClearComment();
 
-        ManaSocial.UpdatePage(false);
+        //ManaSocial.UpdatePage(false);
     }
 
 
@@ -776,6 +757,8 @@ public class ManaVisit : Regist
             return;
         }
 
+        ManaReso.SetActive("C_EnterPlazaRoom0", false);
+
         ManaCenter.Pay
         (
             "", 
@@ -856,6 +839,7 @@ public class ManaVisit : Regist
                 info,
                 data =>
                 {
+                    //Debug.LogWarning(data.ToJson());
                     PullArchiveCallback(data, ShowFailPanel, EnterVisiteeGarden);
                 }
             );

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

@@ -424,6 +424,8 @@ public class PlazaRoomMge : Regist
 
     public static void OnCreateRoomSucceed(RoomData roomData)
     {
+        ManaCenter.CreateRoomAmt++;
+
         ManaLan.Add(ManaReso.Get<Text>("AA_Tip"), new LanStr("UI", "AA_CreateSucceed"));
         ManaReso.Get("AA_Tip").TweenBacCG();
         ManaReso.Get<CanvasGroup>("AA_CreatePlazaRoom").interactable = true;

+ 6 - 25
Assets/Script/Object/Chest.cs

@@ -29,33 +29,20 @@ public class Chest : MonoBehaviour
         {
             if (Rigidbody_ == null)
             {
-                Rigidbody_ = GetComponent<Rigidbody2D>();
+                Rigidbody_ = GetComponentInParent<Rigidbody2D>();
             }
 
             return Rigidbody_;
         }
         set { Rigidbody_ = value; }
     }
-    public BoxCollider BoxCollider
-    {
-        get
-        {
-            if (BoxCollider_ == null)
-            {
-                BoxCollider_ = GetComponentInChildren<BoxCollider>();
-            }
-
-            return BoxCollider_;
-        }
-        set { BoxCollider_ = value; }
-    }
     public BoxCollider2D BoxCollider2D
     {
         get
         {
             if (BoxCollider2D_ == null)
             {
-                BoxCollider2D_ = GetComponent<BoxCollider2D>();
+                BoxCollider2D_ = GetComponentInParent<BoxCollider2D>();
             }
 
             return BoxCollider2D_;
@@ -68,7 +55,7 @@ public class Chest : MonoBehaviour
         {
             if (SpriteRenderer_ == null)
             {
-                SpriteRenderer_ = GetComponentInChildren<SpriteRenderer>();
+                SpriteRenderer_ = GetComponent<SpriteRenderer>();
 
                 SpriteRenderer_.CreateTweenScale(0, 0.75f, 0.25f, false, true, Curve.EaseOutQuad);
 
@@ -79,7 +66,7 @@ public class Chest : MonoBehaviour
                 {
                     Animator.SetInteger("Count", 2);
 
-                    ManaReso.Save(gameObject, true);
+                    ManaReso.Save(transform.parent.gameObject, true);
                 };
             }
 
@@ -93,7 +80,6 @@ public class Chest : MonoBehaviour
     public BoxCollider2D BoxCollider2D_;
     public SpriteRenderer SpriteRenderer_;
 
-    public bool Is2D;
     public float Timer;
     public float SpeedY = 6f;
     public float FreezeY;
@@ -123,12 +109,10 @@ public class Chest : MonoBehaviour
     }
 
 
-    public void Initialize(bool is2D, float freezY, bool forceLeft, bool forceRight)
+    public void Initialize(float freezY, bool forceLeft, bool forceRight)
     {
         ManaAudio.PlayClip(Clip.BubbleClip);
 
-        Is2D = is2D;
-
         float speedX = Mathf.Lerp(1.5f, 3f, Random.Range(0f, 1f));
 
         if (forceLeft)
@@ -168,10 +152,7 @@ public class Chest : MonoBehaviour
 
     protected void SetCollider(bool status)
     {
-        if (Is2D)
-            BoxCollider2D.enabled = status;
-        else
-            BoxCollider.enabled = status;
+        BoxCollider2D.enabled = status;
     }
 
     public virtual void OnPointerClick(PointerEventData eventData)

+ 1 - 2
Assets/Script/Object/CommentItem.cs

@@ -36,7 +36,7 @@ public class CommentItem : Regist
         VisitLab.text = ManaReso.Get<Text>("C_CostLab").text;
 
         VisitBtn.onClick.AddListener(Visit);
-
+        
         ManaCenter.OnLevelChange += () =>
         {
             VisitLab.text = ManaReso.Get<Text>("C_CostLab").text;
@@ -49,7 +49,6 @@ public class CommentItem : Regist
     {
         ManaSocial.CloseCommentPanel();
         ManaSocial.RecordCommentPanel();
-
         ManaVisit.Visit(ArchiveSource.SerialNumber, SerialNumber);
     }
 

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

@@ -31,7 +31,7 @@ public class FlowerInfo
 
             AmountLab.SetActive(true);
 
-            AmountLab.text = "X" + amount;
+            AmountLab.text = "x" + amount;
         }
     }
     public int amount;

+ 6 - 2
Assets/Script/Object/Player.cs

@@ -751,8 +751,6 @@ public class Player : Regist , IPointerClickHandler
     {
         ManaAudio.PlayClip(Clip.CurrentClip);
 
-        ManaNickName.ShowNickNameSettingPanel();
-
         PlayAnim(JumpAnimationName);
     }
 
@@ -1058,6 +1056,7 @@ public class Player : Regist , IPointerClickHandler
                 () =>
                 {
                     ManaGarden.RetrieveAllElf();
+                    ManaIAP.RetrieveADChest();
 
                     ActiveShadow();
 
@@ -1118,6 +1117,11 @@ public class Player : Regist , IPointerClickHandler
         children[1].position += offset;
         transform.position += offset;
 
+        foreach (var collider in GetComponents<BoxCollider2D>())
+        {
+            collider.offset -= new Vector2(offset.x, offset.y);
+        }
+
         for (int i = 0; i < children.Count; i++)
         {
             children[i].parent = transform;

+ 4 - 4
Assets/Script/Object/PlazaRoomChest.cs

@@ -21,7 +21,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         {
             if (Animator_ == null)
             {
-                Animator_ = GetComponent<Animator>();
+                Animator_ = GetComponentInChildren<Animator>();
             }
 
             return Animator_;
@@ -193,8 +193,8 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
             InputField = ManaReso.Get<InputField>("Y_InputField");
         }
 
-        ChestSR = transform.GetChild(0).GetComponent<SpriteRenderer>();
-        ShadowSR = transform.GetChild(1).GetComponent<SpriteRenderer>();
+        ChestSR = transform.GetComponent<SpriteRenderer>();
+        ShadowSR = transform.parent.GetChild(1).GetComponent<SpriteRenderer>();
         ShadowSR.sprite = ManaReso.LoadSprite("花影子", Folder.Scene);
         if (chestData.ChestType == ChestType.System)
         {
@@ -222,7 +222,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         else
         {
             tweenRoot = ParentSR.CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad, false, true);
-            tweenRoot.OnBackwardFinish = () => { ManaReso.Save(gameObject); };
+            tweenRoot.OnBackwardFinish = () => { ManaReso.Save(transform.parent.gameObject); };
         }
 
         tweenRoot = transform.GetTweenScale();

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

@@ -160,7 +160,7 @@ public class PlazaRoomItem : MonoBehaviour
 
         if (RoomData.IsSystemRoom)
         {
-            Duration.text = Language.GetStr("UI", "Z_Permanent");
+            ManaLan.Add(Duration, new LanStr("UI", "Z_Permanent"));
         }
         else
         {

+ 5 - 4
Assets/Script/Object/Skill/Pack.cs

@@ -193,9 +193,8 @@ public class Pack : SkillRoot
         ManaIAP.ProductActionDic.UniqueAdd(ID, PurchaseResult);
 
         ItemStatus = ItemStatus;
-        
 
-        SetActive(!(Lock && ManaServer.PackLock));
+        SetActive();
     }
 
     public override void UpdateStatus()
@@ -254,8 +253,10 @@ public class Pack : SkillRoot
         }
     }
 
-    public void SetActive(bool active)
+    public void SetActive()
     {
+        bool active = !(Lock && ManaServer.PackLock);
+
         if (active)
         {
             ItemBtn.interactable = true;
@@ -398,7 +399,7 @@ public class Pack : SkillRoot
 
         UseA();
 
-        SetActive(!(Lock && ManaServer.PackLock));
+        SetActive();
     }
 
 

+ 16 - 1
Assets/Script/SFS/Manager/ChestMge.cs

@@ -246,6 +246,20 @@ public class ChestMge : Regist
 
     public static void OnCreateChestSucceed()
     {
+        ManaCenter.CreateChestAmt++;
+        if (ChestType == ChestType.Lucky)
+        {
+            ManaCenter.CreateLuckyChestAmt++;
+        }
+        else if (ChestType == ChestType.GuessColor)
+        {
+            ManaCenter.CreateGuessColorChestAmt++;
+        }
+        else if (ChestType == ChestType.GuessNumber)
+        {
+            ManaCenter.CreateGuessNumberChestAmt++;
+        }
+
         ManaLan.Add(ManaReso.Get<Text>("Y_Tip"), new LanStr("UI", "AA_CreateSucceed"));
         ManaReso.Get("Y_Tip").TweenBacCG();
 
@@ -406,7 +420,6 @@ public class ChestMge : Regist
 
     public static void ReceiveChestAward(int award, long chestID)
     {
-        //Debug.LogWarning(PlazaRoomChest.CurrentChest.ChestData.ID);
         ChestRoomDictionary.Add(PlazaRoomChest.CurrentChest.ChestData.ID, PlazaRoomChest.CurrentChest.ChestData.DatabaseRoomID);
 
         ManaReso.Get<CanvasGroup>("Y_Chest").interactable = true;
@@ -428,6 +441,8 @@ public class ChestMge : Regist
 
             ManaReso.SetText("Ya_Desc", $"x{award}");
             ManaCenter.AddDiamond(award, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestAward);
+
+            ManaCenter.GetChestAwardAmt++;
         }
 
         for (int i = 0; i < PlazaRoomChests.Count; i++)

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

@@ -268,6 +268,7 @@ public class SFSPlazaRoomManager
         PlazaRoomMge.ClosePanel();
 
         ManaGarden.RetrieveAllElf();
+        ManaIAP.RetrieveADChest();
 
         GardenSmartFox.PlazaRoomManager.PlazaRoomSky = ManaReso.Get("PlazaRoomSky");
         SkyOriginPosition = GardenSmartFox.PlazaRoomManager.PlazaRoomSky.position;

+ 1 - 1
Assets/Script/ThirdParty/DataEyeStatics/DataEyeGA.cs

@@ -374,7 +374,7 @@ public class DataEyeGA
         }
         //Debuger.LogError("[DataEye GA]" + url);
 
-        URLRequest.CreateStrURLRequest(url, null, null, URLRequest.Method.GET, true);
+        URLRequest.CreateStrURLRequest(false, url, null, null, URLRequest.Method.GET, true);
 
         return url;
     }

+ 1 - 0
Assets/Script/Tool/Bundle.cs

@@ -220,6 +220,7 @@ public class Bundle : MonoBehaviour
                 if (sprite != null)
                 {
                     ManaPlayer.CloseSpriteDic.Add(sprite.name, sprite);
+                    ManaReso.ObjDic.UniqueAdd(sprite.name, sprite);
                 }
             }
 

+ 17 - 4
Assets/Script/Tool/DashGame/URLRequest.cs

@@ -44,22 +44,34 @@ public class URLRequest : MonoBehaviour
 		if(jsonCallBack != null)
 			jsonCallBack(ParseRecieveJsonData(data));
 
+	    URLGOs.Remove(gameObject);
+
 		Destroy(this.gameObject);
 	}
 
 	public delegate void URLRequestCallBackDelegate(string data);
 	public delegate void URLRequestJsonCallBackDelegate(JsonData data);
 
-	public static URLRequest CreateStrURLRequest(string url, URLRequestData data = null, URLRequestCallBackDelegate callBack = null, Method method = Method.GET, bool dataEye = false)
+	public static URLRequest CreateStrURLRequest(bool important, string url, URLRequestData data = null, URLRequestCallBackDelegate callBack = null, Method method = Method.GET, bool dataEye = false)
 	{
+	    if (URLGOs.Count > MaxNotImportantURLAmt && !important)
+	    {
+	        return null;
+	    }
 		URLRequest urlRequest = CreateBaseURLRequest(url, data, method, dataEye);
 		urlRequest.callBack = callBack;
 		return urlRequest;
 	}
 
-	public static URLRequest CreateURLRequest(string url, URLRequestData data = null, URLRequestJsonCallBackDelegate callBack = null, Method method = Method.GET)
+    private static int MaxNotImportantURLAmt = 10;
+    private static List<GameObject> URLGOs = new List<GameObject>();
+	public static URLRequest CreateURLRequest(bool important, string url, URLRequestData data = null, URLRequestJsonCallBackDelegate callBack = null, Method method = Method.GET)
 	{
-		URLRequest urlRequest = CreateBaseURLRequest(url, data, method);
+        if (URLGOs.Count > MaxNotImportantURLAmt && !important)
+        {
+            return null;
+        }
+        URLRequest urlRequest = CreateBaseURLRequest(url, data, method);
 		urlRequest.jsonCallBack = callBack;
 		return urlRequest;
 	}
@@ -68,7 +80,8 @@ public class URLRequest : MonoBehaviour
 	{
 		GameObject gameObj = new GameObject("URLRequest");
         DontDestroyOnLoad(gameObj);
-		URLRequest urlRequest = gameObj.AddComponent<URLRequest>();
+        URLGOs.Add(gameObj);
+        URLRequest urlRequest = gameObj.AddComponent<URLRequest>();
 
 		Debuger.Log("Url request : "+url);
         

+ 0 - 3
第三期.txt

@@ -1,6 +1,3 @@
-系统房间系统宝箱的价值
-
-
 关闭ManaDebug 开启CatchException
 
 切换到远程服务器