Merge branch '第三期' of http://git.dashgame.com/gsgundam/garden_client into 第三期

# Conflicts:
#	Assets/Resource/Xlsx/language_config.xlsx

Assets/Resource/Logo.unity

@@ -445,10 +445,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 1
-  CatchException: 0
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugMode: 0
+  CatchException: 1
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -132,6 +132,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: e7f632456c01c26469882025b47accfe, type: 3}
   - {fileID: 21300000, guid: f9937d5d43f2ff447aeb985a91a7d690, type: 3}
   - {fileID: 2100000, guid: 91a83bc59ad093c499f353b165d031b8, type: 2}
+  - {fileID: 1496129780866346, guid: 03f5f694f13d5b44c924fb59c9bf7b8f, type: 2}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}

Assets/Resource/Prefab/Object/PlazaRoomChest.prefab

@@ -11,6 +11,21 @@ Prefab:
   m_ParentPrefab: {fileID: 0}
   m_RootGameObject: {fileID: 1584217464481202}
   m_IsPrefabParent: 1
+--- !u!1 &1519232368629222
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4082322224168392}
+  m_Layer: 0
+  m_Name: Hud
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1584217464481202
 GameObject:
   m_ObjectHideFlags: 0
@@ -64,6 +79,19 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!4 &4082322224168392
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1519232368629222}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.52, y: 1.37, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4157323462000244}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4157323462000244
 Transform:
   m_ObjectHideFlags: 1
@@ -76,6 +104,7 @@ Transform:
   m_Children:
   - {fileID: 4720750328529054}
   - {fileID: 4668731993363040}
+  - {fileID: 4082322224168392}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resource/Prefab/PrefabUI/ChestTimer.prefab

@@ -0,0 +1,168 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1496129780866346}
+  m_IsPrefabParent: 1
+--- !u!1 &1496129780866346
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224522666186978278}
+  - component: {fileID: 222816344628421844}
+  - component: {fileID: 114646187924371226}
+  - component: {fileID: 225216998148502360}
+  m_Layer: 5
+  m_Name: ChestTimer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &1617923124498704
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224899230004955472}
+  - component: {fileID: 222439144204930284}
+  - component: {fileID: 114149830383481238}
+  m_Layer: 5
+  m_Name: ChestTimerLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114149830383481238
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1617923124498704}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 1
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: 227
+--- !u!114 &114646187924371226
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1496129780866346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: d023127dc7f3b3d4b9721272bf9acf35, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222439144204930284
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1617923124498704}
+--- !u!222 &222816344628421844
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1496129780866346}
+--- !u!224 &224522666186978278
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1496129780866346}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 20.660934}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224899230004955472}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 36.6618, y: 164.57027}
+  m_SizeDelta: {x: 86.333336, y: 22.166666}
+  m_Pivot: {x: 0.0000000018626451, y: -0.0000002416607}
+--- !u!224 &224899230004955472
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1617923124498704}
+  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: 224522666186978278}
+  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: 5.4300003, y: 0.000091552734}
+  m_SizeDelta: {x: 153.6, y: 18.5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &225216998148502360
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1496129780866346}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 0
+  m_BlocksRaycasts: 0
+  m_IgnoreParentGroups: 0

Assets/Resource/Prefab/PrefabUI/ChestTimer.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 03f5f694f13d5b44c924fb59c9bf7b8f
+timeCreated: 1509339935
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -54,7 +54,7 @@ GameObject:
   - component: {fileID: 222500535914025724}
   - component: {fileID: 114980371129593458}
   m_Layer: 5
-  m_Name: Lb_InputLab
+  m_Name: Lb_InputLab0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -263,6 +263,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1093364116080968
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224502720891990886}
+  - component: {fileID: 222358894021531216}
+  - component: {fileID: 114583208499915428}
+  m_Layer: 5
+  m_Name: L_ChangeLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1104354879240086
 GameObject:
   m_ObjectHideFlags: 1
@@ -503,6 +520,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1245181809878324
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224699798554408818}
+  - component: {fileID: 222771297482540492}
+  - component: {fileID: 114451525433961800}
+  m_Layer: 5
+  m_Name: Lb_InputLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1262139506647948
 GameObject:
   m_ObjectHideFlags: 1
@@ -774,7 +808,7 @@ GameObject:
   - component: {fileID: 114254793671510034}
   - component: {fileID: 114821256285364464}
   m_Layer: 5
-  m_Name: Lb_InputField
+  m_Name: Lb_InputField0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -896,6 +930,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1393498069423136
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224802684059463312}
+  - component: {fileID: 222227792772277090}
+  - component: {fileID: 114977589336976278}
+  m_Layer: 5
+  m_Name: Lb_Placeholder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1394216354908500
 GameObject:
   m_ObjectHideFlags: 1
@@ -1260,6 +1311,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1501431047334436
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224177689867433354}
+  - component: {fileID: 222874642915044236}
+  - component: {fileID: 114622187653314412}
+  - component: {fileID: 114860239631781030}
+  m_Layer: 5
+  m_Name: L_ChangeBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1507184977330266
 GameObject:
   m_ObjectHideFlags: 0
@@ -1321,7 +1390,7 @@ GameObject:
   - component: {fileID: 222566081746202696}
   - component: {fileID: 114130115711539788}
   m_Layer: 5
-  m_Name: Lb_Placeholder
+  m_Name: Lb_Placeholder0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1509,7 +1578,7 @@ GameObject:
   - component: {fileID: 114723221964234680}
   - component: {fileID: 114243498400611158}
   m_Layer: 5
-  m_Name: L_ChangeBtn
+  m_Name: L_ResetBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1615,6 +1684,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1625003595693244
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224039232727891678}
+  - component: {fileID: 222073253771421052}
+  - component: {fileID: 114848655023028606}
+  - component: {fileID: 114263614451793396}
+  m_Layer: 5
+  m_Name: Lb_InputField
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1628625376529278
 GameObject:
   m_ObjectHideFlags: 1
@@ -2104,7 +2191,7 @@ GameObject:
   - component: {fileID: 222995306825798444}
   - component: {fileID: 114205496533796090}
   m_Layer: 5
-  m_Name: L_ChangeLab
+  m_Name: L_ResetLab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3194,7 +3281,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u95EE\u9898\u63CF\u8FF0"
+  m_Text: "\u90AE\u4EF6\u5730\u5740"
 --- !u!114 &114133434086489292
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3929,7 +4016,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u2190\u8FD9\u4E0D\u662F\u6211"
+  m_Text: "\u5220\u6863\u91CD\u73A9"
 --- !u!114 &114206959696926328
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4280,7 +4367,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.654902, b: 0.15294118, a: 1}
+  m_Color: {r: 0.64705884, g: 0.7529412, b: 0.78431374, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -4322,6 +4409,69 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114263614451793396
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1625003595693244}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114848655023028606}
+  m_TextComponent: {fileID: 114451525433961800}
+  m_Placeholder: {fileID: 114977589336976278}
+  m_ContentType: 0
+  m_InputType: 0
+  m_AsteriskChar: 42
+  m_KeyboardType: 0
+  m_LineType: 0
+  m_HideMobileInput: 0
+  m_CharacterValidation: 0
+  m_CharacterLimit: 0
+  m_OnEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_CustomCaretColor: 0
+  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
+  m_Text: 
+  m_CaretBlinkRate: 0.85
+  m_CaretWidth: 1
+  m_ReadOnly: 0
 --- !u!114 &114268939215798218
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5157,6 +5307,39 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114451525433961800
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1245181809878324}
+  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: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114461068228389666
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6101,6 +6284,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114583208499915428
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1093364116080968}
+  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: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u2190\u8FD9\u4E0D\u662F\u6211"
 --- !u!114 &114584412046042308
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6328,6 +6544,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114622187653314412
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1501431047334436}
+  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, g: 0.8000001, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114625155093229508
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6986,7 +7229,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0.8000001, b: 1, a: 1}
+  m_Color: {r: 0.91372555, g: 0.24705884, b: 0.078431375, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -7522,6 +7765,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114848655023028606
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1625003595693244}
+  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.64705884, g: 0.7529412, b: 0.78431374, 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: 9581ccebf924e0d40bc15fdadc255351, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114852772298997554
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7549,6 +7819,47 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114860239631781030
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1501431047334436}
+  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: 114622187653314412}
+  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 &114881126665288032
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8075,6 +8386,39 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114977589336976278
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1393498069423136}
+  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: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u95EE\u9898\u63CF\u8FF0"
 --- !u!114 &114980371129593458
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8273,6 +8617,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1799621650928964}
+--- !u!222 &222073253771421052
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1625003595693244}
 --- !u!222 &222089779514960784
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8393,6 +8743,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1452024009093066}
+--- !u!222 &222227792772277090
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1393498069423136}
 --- !u!222 &222228578625470900
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8483,6 +8839,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1628625376529278}
+--- !u!222 &222358894021531216
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1093364116080968}
 --- !u!222 &222360445233811070
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8807,6 +9169,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1734473278610296}
+--- !u!222 &222771297482540492
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1245181809878324}
 --- !u!222 &222779797706138460
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8855,6 +9223,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1590982282071246}
+--- !u!222 &222874642915044236
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1501431047334436}
 --- !u!222 &222888720276921760
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -9025,6 +9399,26 @@ RectTransform:
   m_AnchoredPosition: {x: -90, y: -120}
   m_SizeDelta: {x: 132, y: 43.74}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224039232727891678
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1625003595693244}
+  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: 224699798554408818}
+  - {fileID: 224802684059463312}
+  m_Father: {fileID: 224938795508926460}
+  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.000019073, y: -28.9}
+  m_SizeDelta: {x: 312, y: 131.6}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224052273597364900
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9325,6 +9719,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224177689867433354
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1501431047334436}
+  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: 224502720891990886}
+  m_Father: {fileID: 224888167666931506}
+  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: 40.19998, y: -0.004257202}
+  m_SizeDelta: {x: 100, y: 40}
+  m_Pivot: {x: 0.5, y: 0.4999995}
 --- !u!224 &224178324556783568
 RectTransform:
   m_ObjectHideFlags: 1
@@ -10346,6 +10759,24 @@ RectTransform:
   m_AnchoredPosition: {x: 55.000015, y: -20.00003}
   m_SizeDelta: {x: 109, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224502720891990886
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1093364116080968}
+  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: 224177689867433354}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224502774355724910
 RectTransform:
   m_ObjectHideFlags: 1
@@ -10844,7 +11275,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 304.2, y: -0.09436798}
+  m_AnchoredPosition: {x: 304.2, y: -0.09435654}
   m_SizeDelta: {x: 100, y: 40}
   m_Pivot: {x: 0.5, y: 0.4999995}
 --- !u!224 &224667753801520886
@@ -10979,6 +11410,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 95.7}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224699798554408818
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1245181809878324}
+  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: 224039232727891678}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.5}
+  m_SizeDelta: {x: -20, y: -13}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224713315808876022
 RectTransform:
   m_ObjectHideFlags: 1
@@ -11202,13 +11651,31 @@ RectTransform:
   m_Children:
   - {fileID: 224717482688195798}
   m_Father: {fileID: 224888167666931506}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 40.19998, y: -0.004257202}
+  m_AnchoredPosition: {x: 160.20003, y: -0.004257202}
   m_SizeDelta: {x: 100, y: 40}
   m_Pivot: {x: 0.5, y: 0.4999995}
+--- !u!224 &224802684059463312
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1393498069423136}
+  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: 224039232727891678}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.5}
+  m_SizeDelta: {x: -20, y: -13}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224805457344542120
 RectTransform:
   m_ObjectHideFlags: 1
@@ -11425,6 +11892,7 @@ RectTransform:
   m_Children:
   - {fileID: 224084442942383694}
   - {fileID: 224926703252677018}
+  - {fileID: 224177689867433354}
   - {fileID: 224792849622567544}
   m_Father: {fileID: 224585585345200954}
   m_RootOrder: 1
@@ -11527,8 +11995,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.000019073, y: -8}
-  m_SizeDelta: {x: 312, y: 156}
+  m_AnchoredPosition: {x: -0.000061035156, y: 60}
+  m_SizeDelta: {x: 312, y: 37.15}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224913700505005062
 RectTransform:
@@ -11616,6 +12084,7 @@ RectTransform:
   - {fileID: 224540258981872496}
   - {fileID: 224634124383441938}
   - {fileID: 224904270059454120}
+  - {fileID: 224039232727891678}
   m_Father: {fileID: 224983814714287144}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -1485,23 +1485,6 @@ 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
@@ -3719,7 +3702,7 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 15
+    m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 1
   m_Spacing: 20
@@ -5360,33 +5343,6 @@ 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
@@ -8486,12 +8442,6 @@ 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
@@ -8816,24 +8766,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: -8.4}
   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
@@ -9076,12 +9008,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224721906218477922}
-  m_RootOrder: 1
+  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.000008037, y: 154.56717}
-  m_SizeDelta: {x: 665, y: 15}
+  m_AnchoredPosition: {x: -0.000008037, y: 152.29938}
+  m_SizeDelta: {x: 665, y: 0}
   m_Pivot: {x: 0.5, y: 0.99999994}
 --- !u!224 &224123173145718798
 RectTransform:
@@ -10962,7 +10894,6 @@ 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

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="9" />
+  <Version value="10" />
 
   <ID value="Default" />
   <SerialNumber value="Default" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -83,15 +83,19 @@
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
     <L_CreditsLab desc=""><![CDATA[制作团队]]></L_CreditsLab>
+    <L_ResetLab0 desc=""><![CDATA[删档重玩]]></L_ResetLab0>
+    <L_ResetLab1 desc=""><![CDATA[删除存档后不可恢复！确定要继续？]]></L_ResetLab1>
     <La_Tit desc=""><![CDATA[下载存档]]></La_Tit>
     <La_Lab0 desc=""><![CDATA[连接成功 请重新启动游戏]]></La_Lab0>
     <La_Lab1 desc=""><![CDATA[连接失败]]></La_Lab1>
     <La_Placeholder desc=""><![CDATA[输入您的ID]]></La_Placeholder>
     <Lb_Tit desc=""><![CDATA[提交问题]]></Lb_Tit>
     <Lb_Placeholder desc=""><![CDATA[问题描述]]></Lb_Placeholder>
+    <Lb_Placeholder0 desc=""><![CDATA[邮箱地址]]></Lb_Placeholder0>
     <Lb_Send0 desc=""><![CDATA[提交成功]]></Lb_Send0>
     <Lb_Send1 desc=""><![CDATA[请勿重复提交]]></Lb_Send1>
     <Lb_Send2 desc=""><![CDATA[内容不能为空]]></Lb_Send2>
+    <Lb_Send3 desc=""><![CDATA[邮箱地址格式错误]]></Lb_Send3>
     <Lc_CreditsContent desc=""><![CDATA[制作团队
 
 策划 十三叔
@@ -130,14 +134,14 @@
     <S_Tit desc=""><![CDATA[点赞榜]]></S_Tit>
     <T_Tit desc=""><![CDATA[请输入你的昵称]]></T_Tit>
     <T_TooLong desc=""><![CDATA[昵称太长了]]></T_TooLong>
-    <T_Random desc=""><![CDATA[随机]]></T_Random>
     <T_AllWhiteSpace desc=""><![CDATA[昵称不能为空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[检查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已经存在相同的昵称]]></T_RepeatName>
-    <X_Self desc=""><![CDATA[我]]></X_Self>
-    <Y_GuessNumberDesc desc=""><![CDATA[猜中宝箱总价值的个位数即可领奖]]></Y_GuessNumberDesc>
-    <Y_GuessColorDesc desc=""><![CDATA[猜中花的颜色即可领奖，答案不带“色”字]]></Y_GuessColorDesc>
-    <Y_GuessWrong desc=""><![CDATA[猜错了]]></Y_GuessWrong>
+    <X_Self desc=""><![CDATA[[我]]]></X_Self>
+    <Y_GuessNumberDesc desc=""><![CDATA[猜中宝箱总价值的个位数即可领奖，3次机会]]></Y_GuessNumberDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[猜中花的颜色即可领奖，答案不带“色”字，3次机会]]></Y_GuessColorDesc>
+    <Y_GuessWrong desc=""><![CDATA[猜错了，还剩[value]次机会]]></Y_GuessWrong>
+    <Y_OutOfChance desc=""><![CDATA[机会用完了]]></Y_OutOfChance>
     <Y_SoldOut desc=""><![CDATA[已经被抢光了]]></Y_SoldOut>
     <Y_Unactive desc=""><![CDATA[暂时不能领取]]></Y_Unactive>
     <Y_Refund desc=""><![CDATA[你的宝箱没有被领取完，已返还剩余<(钻石)>]]></Y_Refund>
@@ -145,9 +149,9 @@
     <Yb_GuessNumber desc=""><![CDATA[猜数字]]></Yb_GuessNumber>
     <Yb_GuessColor desc=""><![CDATA[猜颜色]]></Yb_GuessColor>
     <Yb_Lucky desc=""><![CDATA[拼手气]]></Yb_Lucky>
-    <Yb_GuessNumberDesc desc=""><![CDATA[每次领取的钻石平均分配，每人可领取一次]]></Yb_GuessNumberDesc>
-    <Yb_GuessColorDesc desc=""><![CDATA[猜中总价值的个位数即可领奖，每人可领取一次]]></Yb_GuessColorDesc>
-    <Yb_LuckyDesc desc=""><![CDATA[猜中花的颜色即可领奖，每人可领取一次]]></Yb_LuckyDesc>
+    <Yb_GuessNumberDesc desc=""><![CDATA[每次领取的钻石平均分配，每人可领取1次]]></Yb_GuessNumberDesc>
+    <Yb_GuessColorDesc desc=""><![CDATA[猜中总价值的个位数即可领奖，每人可猜3次，领取一次]]></Yb_GuessColorDesc>
+    <Yb_LuckyDesc desc=""><![CDATA[猜中花的颜色即可领奖，每人可猜3次，领取1次]]></Yb_LuckyDesc>
     <Yb_SliderTit desc=""><![CDATA[可领]]></Yb_SliderTit>
     <Yb_SliderValueLab desc=""><![CDATA[次]]></Yb_SliderValueLab>
     <Yb_Tit desc=""><![CDATA[总价值]]></Yb_Tit>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -83,15 +83,19 @@
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
     <L_CreditsLab desc=""><![CDATA[製作團隊]]></L_CreditsLab>
+    <L_ResetLab0 desc=""><![CDATA[刪檔重玩]]></L_ResetLab0>
+    <L_ResetLab1 desc=""><![CDATA[刪除存檔後不可恢復！確定要繼續？]]></L_ResetLab1>
     <La_Tit desc=""><![CDATA[下載存檔]]></La_Tit>
     <La_Lab0 desc=""><![CDATA[連接成功 請重新啓動遊戲]]></La_Lab0>
     <La_Lab1 desc=""><![CDATA[連接失敗]]></La_Lab1>
     <La_Placeholder desc=""><![CDATA[輸入您的ID]]></La_Placeholder>
     <Lb_Tit desc=""><![CDATA[提交問題]]></Lb_Tit>
     <Lb_Placeholder desc=""><![CDATA[問題描述]]></Lb_Placeholder>
+    <Lb_Placeholder0 desc=""><![CDATA[郵箱地址]]></Lb_Placeholder0>
     <Lb_Send0 desc=""><![CDATA[提交成功]]></Lb_Send0>
     <Lb_Send1 desc=""><![CDATA[請勿重複提交]]></Lb_Send1>
     <Lb_Send2 desc=""><![CDATA[內容不能為空]]></Lb_Send2>
+    <Lb_Send3 desc=""><![CDATA[郵箱地址格式錯誤]]></Lb_Send3>
     <Lc_CreditsContent desc=""><![CDATA[製作團隊
 
 策劃 十三叔
@@ -130,14 +134,14 @@
     <S_Tit desc=""><![CDATA[點贊榜]]></S_Tit>
     <T_Tit desc=""><![CDATA[請輸入你的昵稱]]></T_Tit>
     <T_TooLong desc=""><![CDATA[昵稱太長了]]></T_TooLong>
-    <T_Random desc=""><![CDATA[]]></T_Random>
     <T_AllWhiteSpace desc=""><![CDATA[昵稱不能為空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[檢查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已經存在相同的昵稱]]></T_RepeatName>
-    <X_Self desc=""><![CDATA[]]></X_Self>
-    <Y_GuessNumberDesc desc=""><![CDATA[猜中寶箱總價值的個位數即可領獎]]></Y_GuessNumberDesc>
-    <Y_GuessColorDesc desc=""><![CDATA[猜中花的顏色即可領獎，答案不帶“色”字]]></Y_GuessColorDesc>
-    <Y_GuessWrong desc=""><![CDATA[猜錯了]]></Y_GuessWrong>
+    <X_Self desc=""><![CDATA[[我]]]></X_Self>
+    <Y_GuessNumberDesc desc=""><![CDATA[猜中寶箱總價值的個位數即可領獎，3次機會]]></Y_GuessNumberDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[猜中花的顏色即可領獎，答案不帶“色”字，3次機會]]></Y_GuessColorDesc>
+    <Y_GuessWrong desc=""><![CDATA[猜錯了，還剩[value]次機會]]></Y_GuessWrong>
+    <Y_OutOfChance desc=""><![CDATA[機會用完了]]></Y_OutOfChance>
     <Y_SoldOut desc=""><![CDATA[已經被搶光了]]></Y_SoldOut>
     <Y_Unactive desc=""><![CDATA[暫時不能領取]]></Y_Unactive>
     <Y_Refund desc=""><![CDATA[你的寶箱沒有被領取完，已返還剩餘<(鑽石)>]]></Y_Refund>
@@ -145,9 +149,9 @@
     <Yb_GuessNumber desc=""><![CDATA[猜數字]]></Yb_GuessNumber>
     <Yb_GuessColor desc=""><![CDATA[猜顏色]]></Yb_GuessColor>
     <Yb_Lucky desc=""><![CDATA[拼手氣]]></Yb_Lucky>
-    <Yb_GuessNumberDesc desc=""><![CDATA[每次領取的鑽石平均分配，每人可領取一次]]></Yb_GuessNumberDesc>
-    <Yb_GuessColorDesc desc=""><![CDATA[猜中總價值的個位數即可領獎，每人可領取一次]]></Yb_GuessColorDesc>
-    <Yb_LuckyDesc desc=""><![CDATA[猜中花的顏色即可領獎，每人可領取一次]]></Yb_LuckyDesc>
+    <Yb_GuessNumberDesc desc=""><![CDATA[每次領取的鑽石平均分配，每人領取1次]]></Yb_GuessNumberDesc>
+    <Yb_GuessColorDesc desc=""><![CDATA[猜中總價值的個位數即可領獎，每人可猜3次，領取1次]]></Yb_GuessColorDesc>
+    <Yb_LuckyDesc desc=""><![CDATA[猜中花的顏色即可領獎，每人可猜3次，領取1次]]></Yb_LuckyDesc>
     <Yb_SliderTit desc=""><![CDATA[可領]]></Yb_SliderTit>
     <Yb_SliderValueLab desc=""><![CDATA[次]]></Yb_SliderValueLab>
     <Yb_Tit desc=""><![CDATA[總價值]]></Yb_Tit>

Assets/Resource/XML/lan/English.xml

@@ -83,15 +83,19 @@
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
     <L_CreditsLab desc=""><![CDATA[Credits]]></L_CreditsLab>
+    <L_ResetLab0 desc=""><![CDATA[Reset]]></L_ResetLab0>
+    <L_ResetLab1 desc=""><![CDATA[This action will delete your archive，and is non-recoverable! Are you sure to continue?]]></L_ResetLab1>
     <La_Tit desc=""><![CDATA[Restore]]></La_Tit>
     <La_Lab0 desc=""><![CDATA[Connect successful, please restart the game]]></La_Lab0>
     <La_Lab1 desc=""><![CDATA[Connect failed]]></La_Lab1>
     <La_Placeholder desc=""><![CDATA[Enter ID]]></La_Placeholder>
     <Lb_Tit desc=""><![CDATA[Report issue]]></Lb_Tit>
     <Lb_Placeholder desc=""><![CDATA[Issue detail]]></Lb_Placeholder>
+    <Lb_Placeholder0 desc=""><![CDATA[email]]></Lb_Placeholder0>
     <Lb_Send0 desc=""><![CDATA[Report successful]]></Lb_Send0>
     <Lb_Send1 desc=""><![CDATA[Please submit only once]]></Lb_Send1>
     <Lb_Send2 desc=""><![CDATA[Content must not be empty]]></Lb_Send2>
+    <Lb_Send3 desc=""><![CDATA[Incorrect email address]]></Lb_Send3>
     <Lc_CreditsContent desc=""><![CDATA[Credits
 
 Design 十三叔
@@ -130,14 +134,14 @@ Program 水怪
     <S_Tit desc=""><![CDATA[Like Ranking]]></S_Tit>
     <T_Tit desc=""><![CDATA[Enter your nickname]]></T_Tit>
     <T_TooLong desc=""><![CDATA[Nickname too long]]></T_TooLong>
-    <T_Random desc=""><![CDATA[]]></T_Random>
     <T_AllWhiteSpace desc=""><![CDATA[Nickname can not be null]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[Checking]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[Repeat]]></T_RepeatName>
-    <X_Self desc=""><![CDATA[]]></X_Self>
-    <Y_GuessNumberDesc desc=""><![CDATA[Hit the last digit of total value of the chest]]></Y_GuessNumberDesc>
-    <Y_GuessColorDesc desc=""><![CDATA[Hit the color of the flower shape. The answer can ignore case]]></Y_GuessColorDesc>
-    <Y_GuessWrong desc=""><![CDATA[Wrong]]></Y_GuessWrong>
+    <X_Self desc=""><![CDATA[[ME]]]></X_Self>
+    <Y_GuessNumberDesc desc=""><![CDATA[Hit the last digit of total value of the chest. 3 chances]]></Y_GuessNumberDesc>
+    <Y_GuessColorDesc desc=""><![CDATA[Hit the color of the flower shape. The answer can ignore case. 3 chances]]></Y_GuessColorDesc>
+    <Y_GuessWrong desc=""><![CDATA[Wrong! [value] chances left]]></Y_GuessWrong>
+    <Y_OutOfChance desc=""><![CDATA[No more chance]]></Y_OutOfChance>
     <Y_SoldOut desc=""><![CDATA[All the treasures seemed to be gone]]></Y_SoldOut>
     <Y_Unactive desc=""><![CDATA[Not ready yet]]></Y_Unactive>
     <Y_Refund desc=""><![CDATA[Your treasures still left, return the rest <(Diamond)> to you already]]></Y_Refund>
@@ -146,8 +150,8 @@ Program 水怪
     <Yb_GuessColor desc=""><![CDATA[Color]]></Yb_GuessColor>
     <Yb_Lucky desc=""><![CDATA[Lucky]]></Yb_Lucky>
     <Yb_GuessNumberDesc desc=""><![CDATA[The Diamonds divided equally, each one can get once]]></Yb_GuessNumberDesc>
-    <Yb_GuessColorDesc desc=""><![CDATA[Hit the last digit of total value of the chest, each one can get once]]></Yb_GuessColorDesc>
-    <Yb_LuckyDesc desc=""><![CDATA[Hit the color of the flower shape, each one can get once]]></Yb_LuckyDesc>
+    <Yb_GuessColorDesc desc=""><![CDATA[Hit the last digit of total value of the chest, each one can guess 3 times, and get once]]></Yb_GuessColorDesc>
+    <Yb_LuckyDesc desc=""><![CDATA[Hit the color of the flower shape, each one can guess 3 times, and get once]]></Yb_LuckyDesc>
     <Yb_SliderTit desc=""><![CDATA[Can get]]></Yb_SliderTit>
     <Yb_SliderValueLab desc=""><![CDATA[time(s)]]></Yb_SliderValueLab>
     <Yb_Tit desc=""><![CDATA[Total]]></Yb_Tit>

Assets/Script/Manage/ManaData.cs

@@ -593,6 +593,10 @@ public class ManaData : Regist
         SavePlayerConfig();
 
         ManaCenter.SaveLock = true;
+
+        SaveXml();
+
+        Application.Quit();
     }
 
 
@@ -1201,6 +1205,13 @@ public class ManaData : Regist
             To9(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 10)
+        {
+            Debug.LogWarning("UpdateArchive to 10");
+
+            To10(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1408,4 +1419,11 @@ public class ManaData : Regist
         xmlNode.Attributes[14].Value = "0";
         return nativeDoc;
     }
+
+    public static XmlDocument To10(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 10.ToString();
+        ChestMge.ClearRefundAndOperateData(nativeDoc.SelectSingleNode("PlayerConfig"));
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/ManaReso.cs

@@ -50,6 +50,7 @@ public enum ObjType
     EventSystem,
     MainCamera,
 
+    ChestTimer,
     NickName,
     MessageBox,
     HudText,

Assets/Script/Manage/ManaServer.cs

@@ -122,35 +122,13 @@ public class ManaServer : Regist
 
     public void Awake()
     {
-        //AddComment("1710224047970878041", "1710065808151506837", "测试", CommentType.Garden);
+        //"1710065808151506837" "a54unp"
 
         //URLRequestData urlData = new URLRequestData();
 
-        //urlData.Add("u", "jrjl84");
+        //urlData.Add("s", "1710065808151506837");
 
-        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/load", urlData, Debug.LogWarning, URLRequest.Method.POST);
-
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "1708014471457405866");
-
-        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
-
-
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "1710224047970878041");
-        //urlData.Add("u", "1710065808151506837");
-
-        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/other", urlData, Debug.Log, URLRequest.Method.POST);
-
-
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "1710224047970878041");
-        //urlData.Add("u", "1710065808151506837");
-
-        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
+        //URLRequest.CreateStrURLRequest(true, BaseURL + "/user/delete", urlData, Debug.Log, URLRequest.Method.POST);
     }
 
     public void Update()
@@ -1026,13 +1004,21 @@ public class ManaServer : Regist
     {
         ManaReso.Get("Lb_Info").TweenBacCG();
 
-        string str = ManaReso.Get<Text>("Lb_InputLab").text;
+        string emailAddress = ManaReso.Get<Text>("Lb_InputLab0").text;
+
+        if (string.IsNullOrEmpty(emailAddress) || !emailAddress.Contains("@"))
+        {
+            Bubble.Show(null, Language.GetStr("UI", "Lb_Send3"));
+            return;
+        }
+
+        string content = ManaReso.Get<Text>("Lb_InputLab").text;
 
-        if (string.IsNullOrEmpty(str))
+        if (string.IsNullOrEmpty(content))
         {
             Bubble.Show(null, Language.GetStr("UI", "Lb_Send2"));
         }
-        else if(ReportContent == str)
+        else if(ReportContent == content)
         {
             Bubble.Show(null, Language.GetStr("UI", "Lb_Send1"));
         }
@@ -1044,9 +1030,9 @@ public class ManaServer : Regist
 
             mailMessage.From = new MailAddress("dashgamegarden@163.com");
 
-            ReportContent = str;
+            ReportContent = content;
 
-            mailMessage.Body = ReportContent + '\n' + GetSystemInfo();
+            mailMessage.Body = emailAddress + '\n' + ReportContent + '\n' + GetSystemInfo();
 
             mailMessage.Subject = ID + " MyLovelyGargen Issue";
 

Assets/Script/Manage/ManaSocial.cs

@@ -318,7 +318,6 @@ public class ManaSocial : Regist
                 CommentType.Garden,
                 data =>
                 {
-                    Debug.LogWarning("callback");
                     if (!UpdateLock)
                     {
                         InputCommentData(IsPlayer, data);
@@ -340,7 +339,6 @@ public class ManaSocial : Regist
                 CommentType.Garden,
                 data =>
                 {
-                    Debug.LogWarning("callback");
                     if (!UpdateLock)
                     {
                         InputCommentData(IsPlayer, data);
@@ -392,7 +390,6 @@ public class ManaSocial : Regist
                 CommentType.Garden,
                 data =>
                 {
-                    Debug.LogWarning("callback");
                     if (!ManaVisit.InVisit)
                     {
                         DelayCall.Call(0.5f, () => ManaReso.Get("Q_Tip").TweenBacCG());

Assets/Script/Manage/ManaUI.cs

@@ -1183,9 +1183,6 @@ public class ManaUI : Regist
             () =>
             {
                 ManaData.ResetPlayerConfig();
-                ManaData.SaveXml();
-
-                Application.Quit();
             }
         );
 
@@ -1863,6 +1860,7 @@ public class ManaUI : Regist
         ManaLan.Add(ManaReso.Get<Text>("L_CreditsLab"), new LanStr("UI", "L_CreditsLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_ShareLab"), new LanStr("UI", "L_ShareLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_ConfirmLab"), new LanStr("UI", "L_ConfirmLab"));
+        ManaLan.Add(ManaReso.Get<Text>("L_ResetLab"), new LanStr("UI", "L_ResetLab0"));
 
         ManaLan.Add(ManaReso.Get<Text>("L_TraChiLab"), new LanStr("UI", "L_TraChiLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_SimChiLab"), new LanStr("UI", "L_SimChiLab"));
@@ -1877,6 +1875,7 @@ public class ManaUI : Regist
         ManaLan.Add(ManaReso.Get<Text>("Lb_CancelLab"), new LanStr("Common", "Cancel"));
         ManaLan.Add(ManaReso.Get<Text>("Lb_ConfirmLab"), new LanStr("Common", "Confirm"));
         ManaLan.Add(ManaReso.Get<Text>("Lb_Placeholder"), new LanStr("UI", "Lb_Placeholder"));
+        ManaLan.Add(ManaReso.Get<Text>("Lb_Placeholder0"), new LanStr("UI", "Lb_Placeholder0"));
 
         ManaLan.Add(ManaReso.Get<Text>("Lc_CreditsContent"), new LanStr("UI", "Lc_CreditsContent"));
 
@@ -2037,6 +2036,31 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region L_Reset
+
+        ManaReso.AddButtonEvent
+        (
+            "L_ResetBtn",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                Bubble.Show
+                (
+                    null,
+                    Language.GetStr("UI", "L_ResetLab1"),
+                    null,
+                    null,
+                    () =>
+                    {
+                        ManaData.ResetPlayerConfig();
+                    }
+                );
+            }
+        );
+
+        #endregion
+
 
         #region L_TraChi
 

Assets/Script/Manage/ManaVisit.cs

@@ -198,6 +198,8 @@ public class ManaVisit : Regist
         ManaReso.SetActive("C_Group1", true);
         ManaReso.SetActive("C_Group2", true);
 
+        ManaReso.Get<Button>("C_NickNameBK").interactable = true;
+
         ManaReso.SetActive("C_Return", false);
         ManaReso.SetActive("C_Garden", false);
 
@@ -337,6 +339,8 @@ public class ManaVisit : Regist
         ManaReso.SetActive("C_Group1", false);
         ManaReso.SetActive("C_Group2", false);
 
+        ManaReso.Get<Button>("C_NickNameBK").interactable = false;
+
         ManaReso.SetActive("C_Garden", true);
 
         if (!InVisit)

Assets/Script/Object/PlazaRoom.cs

@@ -154,18 +154,27 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         }
     }
 
+    public static Dictionary<Transform, List<Transform>> DepthDictionary = new Dictionary<Transform, List<Transform>>();
     public void ResetDepth()
     {
-        List<SFSPlazaRoomManager.PlazaRoomPlayer> plazaRoomPlayers = SFSManager.GardenSmartFox.PlazaRoomManager.UserInstanceDictionary.Values.ToList();
-
-        plazaRoomPlayers.MySort((player1, player2) => player1.Player.transform.position.z > player2.Player.transform.position.z);
-
-        foreach (var plazaRoomPlayer in plazaRoomPlayers)
+        Dictionary<Transform, List<Transform>> tempDictionary = new Dictionary<Transform, List<Transform>>();
+        foreach (var plazaRoomPlayer in SFSManager.GardenSmartFox.PlazaRoomManager.UserInstanceDictionary.Values)
+        {
+            tempDictionary.Add(plazaRoomPlayer.Player.transform, new List<Transform> {plazaRoomPlayer.MessageBox, plazaRoomPlayer.NickNameTransform});
+        }
+        foreach (var kv in DepthDictionary)
         {
-            plazaRoomPlayer.Player.transform.hasChanged = false;
+            tempDictionary.Add(kv.Key, kv.Value);
+        }
+        List<Transform> transforms = tempDictionary.Keys.ToList();
+        transforms.MySort((transform0, transform1) => transform0.position.z > transform1.position.z);
 
-            plazaRoomPlayer.NickNameTransform.SetAsLastSibling();
-            plazaRoomPlayer.MessageBox.SetAsLastSibling();
+        for (int i = 0; i < transforms.Count; i++)
+        {
+            for (int j = 0; j < tempDictionary[transforms[i]].Count; j++)
+            {
+                tempDictionary[transforms[i]][j].SetAsLastSibling();
+            }
         }
     }
 

Assets/Script/Object/PlazaRoomChest.cs

@@ -37,6 +37,14 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     private string AnswerColor;
     private FlowerInfo AnswerInfo;
 
+    public Text ChestTimerLab;
+    public Transform ChestTimerTransform;
+    public float ChestTime = 600;
+    public float ChestTimer;
+    public bool CheckLock;
+
+    public DateTime LastActivatedTime; //只有系统宝箱才用
+
     public bool Initialized;
     public MeshFilter ChestMF;
     public MeshFilter ShadowMF;
@@ -133,16 +141,30 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         if (!IsActive)
         {
-            return;
+            if (ChestData.ChestType == ChestType.System && !CheckLock)
+            {
+                if (ChestTimer <= 0)
+                {
+                    SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultChestStatus(ChestData.DatabaseRoomID);
+                    CheckLock = true;
+                }
+                else
+                {
+                    ChestTimer -= UnityEngine.Time.deltaTime;
+                    ChestTimerLab.text = ChestTimer.ToString("F0");
+                }
+            }
         }
-
-        Timer += UnityEngine.Time.deltaTime;
-
-        if (Timer >= Time)
+        else
         {
-            Timer = 0;
+            Timer += UnityEngine.Time.deltaTime;
+
+            if (Timer >= Time)
+            {
+                Timer = 0;
 
-            Animator.SetInteger("Count", 0);
+                Animator.SetInteger("Count", 0);
+            }
         }
     }
 
@@ -162,6 +184,8 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     private void Take()
     {
         Deactive();
+        TurnGray();
+
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetChestAward(ChestData.ID);
 
         if (ChestData.ChestType != ChestType.System)
@@ -215,24 +239,30 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         int remainGuessAmt;
         if (chestOperateData == null)
         {
+            chestOperateData = new ChestOperateData(false, CurrentChest.ChestData.ID, CurrentChest.ChestData.DatabaseRoomID);
+            ChestMge.OperateDataDictionary.UniqueAdd(chestOperateData.ChestID, chestOperateData);
+            remainGuessAmt = ChestMge.PlayerMaxGuessAmt - 1;
+        }
+        else if (chestOperateData.RemainGuessAmt == null)
+        {
             remainGuessAmt = ChestMge.PlayerMaxGuessAmt - 1;
         }
         else
         {
-            remainGuessAmt = (int) chestOperateData.GuessedAmt - 1;
-            chestOperateData.GuessedAmt -= 1;
+            remainGuessAmt = (int) chestOperateData.RemainGuessAmt - 1;
         }
+        ChestMge.OperateDataDictionary[CurrentChest.ChestData.ID].RemainGuessAmt = remainGuessAmt;
+
+        string hint = Language.GetStr("UI", "Y_GuessWrong");
+        hint = hint.Replace("[value]", remainGuessAmt.ToString());
+        Bubble.Show(null, hint);
 
         if (remainGuessAmt <= 0)
         {
-            Bubble.Show(null, Language.GetStr("UI", "Y_GuessWrong"));
+            ChestMge.CloseChestPanel();
             Deactive();
             TurnGray();
         }
-        else
-        {
-            Bubble.Show(null, Language.GetStr("UI", "Y_GuessWrong"));
-        }
     }
 
     private void GuessSucceed()
@@ -244,6 +274,11 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     public void RetriveChest()
     {
+        if (ChestData.ChestType == ChestType.System)
+        {
+            ManaReso.Save(ChestTimerTransform);    
+        }
+
         TweenRenderer.StartBackward();
     }
 
@@ -265,6 +300,19 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         Deactive();
         TurnGray();
 
+        ChestTimerTransform = ManaReso.Get("ChestTimer", Folder.UI, false, ManaReso.Get("W_HudParent"), false, ObjType.ChestTimer);
+        ChestTimerLab = ChestTimerTransform.GetComponentInChildren<Text>();
+        HudTarget hudTarget = ChestTimerTransform.GetComponent<HudTarget>();
+        if (hudTarget == null)
+        {
+            hudTarget = ChestTimerTransform.AddComponent<HudTarget>();
+            ChestTimerTransform.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+            PlazaRoom.DepthDictionary.Add(transform, new List<Transform> {ChestTimerTransform});
+        }
+        hudTarget.PosTra = transform.parent.FindChild("Hud");
+        ResetChestTimer();
+        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultChestStatus(chestData.DatabaseRoomID);
+
         SystemChest = this;
     }
 
@@ -337,6 +385,13 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         }
     }
 
+    public void ResetChestTimer()
+    {
+        CheckLock = false;
+        ChestTimerTransform.TweenForCG();
+        ChestTimer = ChestTime;
+    }
+
 
     public void OnFinish()
     {
@@ -395,6 +450,12 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         }
         else
         {
+            if (!IsActive)
+            {
+                Bubble.Show(null, Language.GetStr("UI", "Y_OutOfChance"));
+                return;
+            }
+
             ManaReso.Get("Y_Chest").TweenForCG();
             ManaReso.SetActive("Ya_GetAward", false);
             ManaReso.SetActive("Y_Guess", true);
@@ -425,4 +486,12 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
             }
         }
     }
+
+    public void OnApplicationPause(bool pause)
+    {
+        if (!pause)
+        {
+            SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultChestStatus(ChestData.DatabaseRoomID);
+        }
+    }
 }

Assets/Script/SFS/Manager/ChestMge.cs

@@ -89,7 +89,7 @@ public class ChestOperateData
     public long ChestID;
     public bool Received;
     public int DatabaseRoomID;
-    public int? GuessedAmt;
+    public int? RemainGuessAmt;
     public DateTime? LastActivatedTime; //只有系统宝箱才用
 
     public ChestOperateData(string str)
@@ -100,11 +100,11 @@ public class ChestOperateData
         Received = int.Parse(strings[2]).ToBool();
         if (strings.Length > 3)
         {
-            GuessedAmt = int.Parse(strings[3]);
+            RemainGuessAmt = int.Parse(strings[3]);
         }
         if (strings.Length > 4)
         {
-            LastActivatedTime = DateUtil.GetTimeFromSecends(strings[4]);
+            LastActivatedTime = DateTime.Parse(strings[4]);
         }
     }
 
@@ -119,14 +119,15 @@ public class ChestOperateData
     {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.Append(ChestID);
-        stringBuilder.Append('|' + DatabaseRoomID);
-        if (GuessedAmt != null)
+        stringBuilder.Append("|" + DatabaseRoomID);
+        stringBuilder.Append("|" + Received.ToInt());
+        if (RemainGuessAmt != null)
         {
-            stringBuilder.Append('|' + GuessedAmt);
+            stringBuilder.Append("|" + RemainGuessAmt);
         }
         if (LastActivatedTime != null)
         {
-            stringBuilder.Append('|' + LastActivatedTime.ToString());
+            stringBuilder.Append("|" + LastActivatedTime);
         }
         return stringBuilder.ToString();
     }
@@ -166,6 +167,7 @@ public class ChestMge : Regist
         }
         for (int i = 0; i < ReceivedNodes.Count; i++)
         {
+            //Debug.Log(ReceivedNodes[i].InnerText);
             ChestOperateData chestOperateData = new ChestOperateData(ReceivedNodes[i].InnerText);
             OperateDataDictionary.Add(chestOperateData.ChestID, chestOperateData);
         }
@@ -377,7 +379,7 @@ public class ChestMge : Regist
     {
         foreach (var plazaRoomChest in PlazaRoomChests)
         {
-            ManaReso.Save(plazaRoomChest.transform.parent);
+            plazaRoomChest.RetriveChest();
         }
         PlazaRoomChests = new List<PlazaRoomChest>();
     }
@@ -400,7 +402,7 @@ public class ChestMge : Regist
                 chest.Init(chestData);
                 PlazaRoomChests.Add(chest);
 
-                if (chestOperateData.GuessedAmt == null || chestOperateData.GuessedAmt < PlayerMaxGuessAmt)
+                if (chestOperateData == null || chestOperateData.RemainGuessAmt == null || chestOperateData.RemainGuessAmt > 0)
                 {
                     chest.Active();
                     chest.TurnNormalColor();
@@ -420,7 +422,7 @@ public class ChestMge : Regist
         }
     }
 
-
+    private static int SystemChestActivateTimespan = 600;
     public static void ReceiveAllChestData(List<ChestData> chestDatas)
     {
         ManaAudio.PlayClip(Clip.BubbleClip);
@@ -431,7 +433,7 @@ public class ChestMge : Regist
         }
     }
 
-    public static void ActivateSystemChest()
+    public static void ActivateSystemChest(DateTime activatedTime)
     {
         if (!SFSManager.GardenSmartFox.PlazaRoomManager.JoinedPlazaRoom)
         {
@@ -445,14 +447,19 @@ public class ChestMge : Regist
 
         if (OperateDataDictionary.Keys.Contains(PlazaRoomChest.SystemChest.ChestData.ID))
         {
+            if (activatedTime.Subtract(OperateDataDictionary[PlazaRoomChest.SystemChest.ChestData.ID].LastActivatedTime.Value).TotalSeconds >= SystemChestActivateTimespan)
+            {
+                ReactivateSystemChest(activatedTime);
+            }
             return;
         }
 
         PlazaRoomChest.SystemChest.Active();
         PlazaRoomChest.SystemChest.TurnNormalColor();
+        PlazaRoomChest.SystemChest.ChestTimerTransform.TweenBacCG();
     }
 
-    public static void ReactivateSystemChest()
+    public static void ReactivateSystemChest(DateTime activatedTime)
     {
         if (!SFSManager.GardenSmartFox.PlazaRoomManager.JoinedPlazaRoom)
         {
@@ -467,9 +474,11 @@ public class ChestMge : Regist
         OperateDataDictionary.Remove(PlazaRoomChest.SystemChest.ChestData.ID);
         PlazaRoomChest.SystemChest.Active();
         PlazaRoomChest.SystemChest.TurnNormalColor();
+        PlazaRoomChest.SystemChest.ChestTimerTransform.TweenBacCG();
+        PlazaRoomChest.SystemChest.LastActivatedTime = activatedTime;
     }
 
-    public static void DeactivateSystemChest()
+    public static void DeactivateSystemChest(long pasttime)
     {
         if (!SFSManager.GardenSmartFox.PlazaRoomManager.JoinedPlazaRoom)
         {
@@ -483,12 +492,21 @@ public class ChestMge : Regist
 
         PlazaRoomChest.SystemChest.Deactive();
         PlazaRoomChest.SystemChest.TurnGray();
+        PlazaRoomChest.SystemChest.ChestTimer = PlazaRoomChest.SystemChest.ChestTime - pasttime + 1;
     }
 
     public static void ReceiveChestAward(int award, long chestID)
     {
-        ChestOperateData chestOperateData = new ChestOperateData(true, PlazaRoomChest.CurrentChest.ChestData.ID, PlazaRoomChest.CurrentChest.ChestData.DatabaseRoomID);
-        OperateDataDictionary.Add(chestOperateData.ChestID, chestOperateData);
+        ChestOperateData chestOperateData;
+        if (OperateDataDictionary.TryGetValue(chestID, out chestOperateData))
+        {
+            chestOperateData.Received = true;
+        }
+        else
+        {
+            chestOperateData = new ChestOperateData(true, PlazaRoomChest.CurrentChest.ChestData.ID, PlazaRoomChest.CurrentChest.ChestData.DatabaseRoomID);
+            OperateDataDictionary.Add(chestOperateData.ChestID, chestOperateData);
+        }
 
         ManaReso.Get<CanvasGroup>("Y_Chest").interactable = true;
 
@@ -515,10 +533,19 @@ public class ChestMge : Regist
 
         for (int i = 0; i < PlazaRoomChests.Count; i++)
         {
-            if (PlazaRoomChests[i].ChestData.ID == chestID && PlazaRoomChests[i].ChestData.ChestType != ChestType.System)
+            if (PlazaRoomChests[i].ChestData.ID == chestID)
             {
-                PlazaRoomChests[i].RetriveChest();
-                PlazaRoomChests.RemoveAt(i--);
+                if (PlazaRoomChests[i].ChestData.ChestType == ChestType.System)
+                {
+                    PlazaRoomChests[i].ResetChestTimer();
+                    OperateDataDictionary[chestID].RemainGuessAmt = 0;
+                    OperateDataDictionary[chestID].LastActivatedTime = PlazaRoomChests[i].LastActivatedTime;
+                }
+                else
+                {
+                    PlazaRoomChests[i].RetriveChest();
+                    PlazaRoomChests.RemoveAt(i--);
+                }
             }
         }
     }
@@ -539,32 +566,36 @@ public class ChestMge : Regist
 
     public static void Save()
     {
-        XmlNode node = ManaData.PlayerNode.SelectSingleNode(RefundNodeName);
-        while (node != null)
-        {
-            ManaData.PlayerNode.RemoveChild(node);
-            node = ManaData.PlayerNode.SelectSingleNode(RefundNodeName);
-        }
-        node = ManaData.PlayerNode.SelectSingleNode(ReceivedNodeName);
-        while (node != null)
-        {
-            ManaData.PlayerNode.RemoveChild(node);
-            node = ManaData.PlayerNode.SelectSingleNode(ReceivedNodeName);
-        }
-
+        ClearRefundAndOperateData(ManaData.PlayerNode);
 
         foreach (var id in RefundRoomIDs)
         {
-            node = ManaData.PlayerDoc.CreateNode(XmlNodeType.Element, RefundNodeName, null);
+            XmlNode node = ManaData.PlayerDoc.CreateNode(XmlNodeType.Element, RefundNodeName, null);
             node.InnerText = id.ToString();
             ManaData.PlayerNode.AppendChild(node);
         }
         foreach (var kv in OperateDataDictionary)
         {
-            node = ManaData.PlayerDoc.CreateNode(XmlNodeType.Element, ReceivedNodeName, null);
-            node.InnerText = $"{kv.Key}|{kv.Value}";
+            XmlNode node = ManaData.PlayerDoc.CreateNode(XmlNodeType.Element, ReceivedNodeName, null);
+            node.InnerText = kv.Value.ToString();
             ManaData.PlayerNode.AppendChild(node);
             //Debug.LogWarning($"{kv.Key}|{kv.Value}");
         }
     }
+
+    public static void ClearRefundAndOperateData(XmlNode playerConfigNode)
+    {
+        XmlNode node = playerConfigNode.SelectSingleNode(RefundNodeName);
+        while (node != null)
+        {
+            playerConfigNode.RemoveChild(node);
+            node = playerConfigNode.SelectSingleNode(RefundNodeName);
+        }
+        node = playerConfigNode.SelectSingleNode(ReceivedNodeName);
+        while (node != null)
+        {
+            playerConfigNode.RemoveChild(node);
+            node = playerConfigNode.SelectSingleNode(ReceivedNodeName);
+        }
+    }
 }

Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -261,7 +261,6 @@ public class SFSPlazaRoomManager
     {
         PlazaRoom.Initialize();
         GardenSmartFox.EventManager.PlazaRoomEvent.GetAllChestData(CurrentRoomData.ID);
-        GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(CurrentRoomData.ID);
         foreach (var kv in UserInstanceDictionary)
         {
             if (kv.Value.Player.transform.parent == null)
@@ -373,7 +372,7 @@ public class SFSPlazaRoomManager
             return;
 
         //KeepAliveThread();
-        CheckDefautChestThread();
+        //CheckDefautChestThread();
 
         CameraControllThread();
     }
@@ -442,7 +441,7 @@ public class SFSPlazaRoomManager
         if (CheckTimer >= CheckTime)
         {
             CheckTimer = 0;
-            GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(CurrentRoomData.ID);
+            GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultChestStatus(CurrentRoomData.ID);
         }
     }
 

Assets/Script/SFS/SFSEvent/EventDispatcher.cs

@@ -45,7 +45,7 @@ public class EventDispatcher
         }
         else if (cmd == PlazaRoomRep.ActivateDefaultChest.GetHashString())
         {
-            SFSEventManager.PlazaRoomEvent.OnActivateDefaultRoom(baseEvent);
+            SFSEventManager.PlazaRoomEvent.OnActivateDefaultChest(baseEvent);
         }
         else if (cmd == PlazaRoomRep.CreateChestError.GetHashString())
         {
@@ -97,11 +97,11 @@ public class EventDispatcher
         }
         else if (cmd == PlazaRoomRep.ReactivateDefaultChest.GetHashString())
         {
-            SFSEventManager.PlazaRoomEvent.OnReactivateDefaultRoom(baseEvent);
+            SFSEventManager.PlazaRoomEvent.OnReactivateDefaultChest(baseEvent);
         }
         else if (cmd == PlazaRoomRep.DeactivateDefaultChest.GetHashString())
         {
-            SFSEventManager.PlazaRoomEvent.OnDeactivateDefaultRoom(baseEvent);
+            SFSEventManager.PlazaRoomEvent.OnDeactivateDefaultChest(baseEvent);
         }
         else
         {

Assets/Script/SFS/SFSEvent/PlazaRoomEvent.cs

@@ -316,7 +316,7 @@ public class PlazaRoomEvent
     }
 
 
-    public void CheckDefaultRoomStatus(int databaseRoomID)
+    public void CheckDefaultChestStatus(int databaseRoomID)
     {
         SFSObject parameter = new SFSObject();
         parameter.PutInt(Label.CommandID, PlazaRoomReq.CheckDefaultChest.GetHashCode());
@@ -324,22 +324,28 @@ public class PlazaRoomEvent
         SFSEventManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
     }
 
-    public void OnActivateDefaultRoom(BaseEvent baseEvent)
+    public void OnActivateDefaultChest(BaseEvent baseEvent)
     {
-        //ISFSObject arg = baseEvent.Params["params"]as ISFSObject;
-        ChestMge.ActivateSystemChest();
+        ISFSObject arg = baseEvent.Params["params"]as ISFSObject;
+        DateTime dateTime = DateUtil.GetTimeFromSecends(arg.GetLong(Label.Data).ToString());
+        //Debug.Log(dateTime);
+        ChestMge.ActivateSystemChest(dateTime);
     }
 
-    public void OnReactivateDefaultRoom(BaseEvent baseEvent)
+    public void OnReactivateDefaultChest(BaseEvent baseEvent)
     {
-        //ISFSObject arg = baseEvent.Params["params"]as ISFSObject;
-        ChestMge.ReactivateSystemChest();
+        ISFSObject arg = baseEvent.Params["params"]as ISFSObject;
+        DateTime dateTime = DateUtil.GetTimeFromSecends(arg.GetLong(Label.Data).ToString());
+        //Debug.Log(dateTime);
+        ChestMge.ReactivateSystemChest(dateTime);
     }
 
-    public void OnDeactivateDefaultRoom(BaseEvent baseEvent)
+    public void OnDeactivateDefaultChest(BaseEvent baseEvent)
     {
-        //ISFSObject arg = baseEvent.Params["params"] as ISFSObject;
-        ChestMge.DeactivateSystemChest();
+        ISFSObject arg = baseEvent.Params["params"] as ISFSObject;
+        long pasttime = arg.GetLong(Label.Data);
+        //Debug.LogWarning(pasttime);
+        ChestMge.DeactivateSystemChest(pasttime);
     }
 
     public void OnReceiveRoomData(BaseEvent baseEvent)
@@ -411,7 +417,7 @@ public class PlazaRoomEvent
 
         if (userID != SFSManager.GardenSmartFox.User.Id)
         {
-            Debug.LogWarning($"User : {userID} left room");
+            //Debug.LogWarning($"User : {userID} left room");
 
             SFSEventManager.GardenSmartFox.PlazaRoomManager.OnUserExitPlazaRoom(userID);
         }

Assets/Script/Tool/Auxiliary.cs

@@ -142,13 +142,16 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
+            ChestMge.ClearRefundAndOperateData(ManaData.PlayerNode);
+            ChestMge.RefundRoomIDs = new List<int>();
+            ChestMge.OperateDataDictionary = new Dictionary<long, ChestOperateData>();
             //foreach (var VARIABLE in ChestMge.PlazaRoomChests)
             //{
             //    VARIABLE.ShadowSR.material = UnityFactory.Materials[0];
             //    VARIABLE.ChestSR.material = UnityFactory.Materials[0];
             //}
 
-            ManaSocial.CloseCommentPanel();
+            //ManaSocial.CloseCommentPanel();
             //Debug.LogWarning(ManaServer.SerialNumber);
             //SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
             //ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

ProjectSettings/ProjectSettings.asset

@@ -68,7 +68,7 @@ PlayerSettings:
   disableDepthAndStencilBuffers: 0
   defaultIsFullScreen: 1
   defaultIsNativeResolution: 1
-  runInBackground: 1
+  runInBackground: 0
   captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0

第三期.txt

@@ -1,6 +1,4 @@
-激活宝箱逻辑是否需要修改
-
-利用shader控制深度
+宝箱 宝箱Timer深度细调(利用shader控制深度)
 
 
 关闭ManaDebug 开启CatchException
@@ -22,7 +20,7 @@ IOS
 
 Dragonbones 使用tight
 
-内存优化(释放掉loading界面)
+内存优化(释放掉loading界面 教程中的选任务边框)
 
 Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 派对图标 上衣按钮需要打入图集)