Browse Source

修改代码可读性

liuqilin 7 years ago
parent
commit
90bbae2486
58 changed files with 1747 additions and 1093 deletions
  1. 509 0
      Assets/Resource/Logo.unity
  2. 1 1
      Assets/Resource/Prefab/PrefabUI/GardenInfoItem.prefab
  3. 0 0
      Assets/Resource/Prefab/PrefabUI/GardenInfoItem.prefab.meta
  4. 4 4
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  5. 4 4
      Assets/Resource/Prefab/PrefabUI/GroupB.prefab
  6. 1 1
      Assets/Resource/Prefab/PrefabUI/GroupD.prefab
  7. 1 1
      Assets/Resource/Prefab/PrefabUI/PlazaInfoItem.prefab
  8. 0 0
      Assets/Resource/Prefab/PrefabUI/PlazaInfoItem.prefab.meta
  9. 1 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  10. 1 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  11. 1 0
      Assets/Resource/XML/lan/English.xml
  12. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  13. 9 0
      Assets/Script/Label.meta
  14. 10 0
      Assets/Script/Label/ConfigLabel.cs
  15. 12 0
      Assets/Script/Label/ConfigLabel.cs.meta
  16. 66 0
      Assets/Script/Label/ResourceLabel.cs
  17. 12 0
      Assets/Script/Label/ResourceLabel.cs.meta
  18. 9 9
      Assets/Script/Manage/AchieveManager.cs
  19. 3 3
      Assets/Script/Manage/AnnounceManager.cs
  20. 211 198
      Assets/Script/Manage/ConfigManager.cs
  21. 1 1
      Assets/Script/Manage/DebugManager.cs
  22. 7 7
      Assets/Script/Manage/GardenManager.cs
  23. 40 25
      Assets/Script/Manage/HttpManager.cs
  24. 3 3
      Assets/Script/Manage/IAPManager.cs
  25. 4 26
      Assets/Script/Manage/InfoBoxManager.cs
  26. 28 21
      Assets/Script/Manage/Initializer.cs
  27. 11 11
      Assets/Script/Manage/LanguageManager.cs
  28. 51 51
      Assets/Script/Manage/Manager.cs
  29. 197 181
      Assets/Script/Manage/MiniGameManager.cs
  30. 6 6
      Assets/Script/Manage/NickNameManager.cs
  31. 10 43
      Assets/Script/Manage/PlayerManager.cs
  32. 11 11
      Assets/Script/Manage/PlazaRoomManager.cs
  33. 21 21
      Assets/Script/Manage/ResourceManager.cs
  34. 32 47
      Assets/Script/Manage/SignManager.cs
  35. 19 32
      Assets/Script/Manage/SocialManager.cs
  36. 145 144
      Assets/Script/Manage/TutorialManager.cs
  37. 137 135
      Assets/Script/Manage/UIManager.cs
  38. 6 6
      Assets/Script/Manage/VisitManager.cs
  39. 1 1
      Assets/Script/Object/Garden.cs
  40. 4 4
      Assets/Script/Object/Player.cs
  41. 4 4
      Assets/Script/Object/PlazaRoomChest.cs
  42. 8 8
      Assets/Script/Object/PlazaRoomItem.cs
  43. 2 2
      Assets/Script/Object/Skill/Ability.cs
  44. 4 4
      Assets/Script/Object/Skill/BigSkill.cs
  45. 4 4
      Assets/Script/Object/Skill/Pack.cs
  46. 5 5
      Assets/Script/Object/Skill/Skill.cs
  47. 2 2
      Assets/Script/Object/Skill/SkillRoot.cs
  48. 1 1
      Assets/Script/Object/Slot.cs
  49. 1 1
      Assets/Script/Object/Star.cs
  50. 2 2
      Assets/Script/Object/Tutorial.cs
  51. 10 10
      Assets/Script/SFS/Manager/ChestManager.cs
  52. 4 4
      Assets/Script/SFS/Manager/PlazaRoomController.cs
  53. 13 21
      Assets/Script/Tool/Auxiliary.cs
  54. 8 8
      Assets/Script/Tool/Bundle.cs
  55. 17 17
      Assets/Script/Tool/DashGame/Language.cs
  56. 13 0
      Assets/Script/Tool/Lib.cs
  57. 57 0
      Assets/Script/Tool/PlayerConfigLabel.cs
  58. 3 3
      ProjectSettings/GraphicsSettings.asset

+ 509 - 0
Assets/Resource/Logo.unity

@@ -155,6 +155,215 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1001 &910303257
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1141330700}
+    m_Modifications:
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0.0000076294
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.0000076294
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224718046424676624, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 78146b79fe2f18c4bab8b0c9a6a0a04a, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1001 &1141330699
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
+--- !u!224 &1141330700 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    type: 2}
+  m_PrefabInternal: {fileID: 1141330699}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -418,6 +627,106 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &1638149094
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1141330700}
+    m_Modifications:
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224428910334737216, guid: 45fe062bc3924e448abc465048b40915,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 45fe062bc3924e448abc465048b40915, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0
@@ -462,3 +771,203 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1901852920
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1141330700}
+    m_Modifications:
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1001 &2052506897
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1141330700}
+    m_Modifications:
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 4b27b1fc0c9780a4492f68549d3e1f52, type: 2}
+  m_IsPrefabParent: 0

+ 1 - 1
Assets/Resource/Prefab/PrefabUI/C_InfoItem.prefab → Assets/Resource/Prefab/PrefabUI/GardenInfoItem.prefab

@@ -39,7 +39,7 @@ GameObject:
   - component: {fileID: 222043448060915440}
   - component: {fileID: 114566208526649250}
   m_Layer: 5
-  m_Name: C_InfoItem
+  m_Name: GardenInfoItem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

+ 0 - 0
Assets/Resource/Prefab/PrefabUI/C_InfoItem.prefab.meta → Assets/Resource/Prefab/PrefabUI/GardenInfoItem.prefab.meta


+ 4 - 4
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -2623,7 +2623,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1973255530588194
 GameObject:
   m_ObjectHideFlags: 1
@@ -9939,9 +9939,9 @@ RectTransform:
   m_Father: {fileID: 224387604085137002}
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 285, y: -36.5}
   m_SizeDelta: {x: 84, y: 72.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224249425076514156

+ 4 - 4
Assets/Resource/Prefab/PrefabUI/GroupB.prefab

@@ -496,7 +496,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1152849205254242
 GameObject:
   m_ObjectHideFlags: 1
@@ -1941,7 +1941,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1639642605030720
 GameObject:
   m_ObjectHideFlags: 1
@@ -9340,7 +9340,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -12016,7 +12016,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0.07647705}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 10}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!224 &224483364205866096
 RectTransform:

+ 1 - 1
Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -3163,7 +3163,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!95 &95158083408686730
 Animator:
   serializedVersion: 3

+ 1 - 1
Assets/Resource/Prefab/PrefabUI/X_InfoItem.prefab → Assets/Resource/Prefab/PrefabUI/PlazaInfoItem.prefab

@@ -40,7 +40,7 @@ GameObject:
   - component: {fileID: 114800871698021790}
   - component: {fileID: 114643820615652672}
   m_Layer: 5
-  m_Name: X_InfoItem
+  m_Name: PlazaInfoItem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

+ 0 - 0
Assets/Resource/Prefab/PrefabUI/X_InfoItem.prefab.meta → Assets/Resource/Prefab/PrefabUI/PlazaInfoItem.prefab.meta


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

@@ -86,6 +86,7 @@
     <L_CreditsLab desc=""><![CDATA[制作团队]]></L_CreditsLab>
     <L_ResetLab0 desc=""><![CDATA[删档重玩]]></L_ResetLab0>
     <L_ResetLab1 desc=""><![CDATA[删除存档后不可恢复!确定要继续?]]></L_ResetLab1>
+    <L_Downloading desc=""><![CDATA[下载中]]></L_Downloading>
     <La_Tit desc=""><![CDATA[下载存档]]></La_Tit>
     <La_Lab0 desc=""><![CDATA[连接成功 请重新启动游戏]]></La_Lab0>
     <La_Lab1 desc=""><![CDATA[连接失败]]></La_Lab1>

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

@@ -86,6 +86,7 @@
     <L_CreditsLab desc=""><![CDATA[製作團隊]]></L_CreditsLab>
     <L_ResetLab0 desc=""><![CDATA[刪檔重玩]]></L_ResetLab0>
     <L_ResetLab1 desc=""><![CDATA[刪除存檔後不可恢復!確定要繼續?]]></L_ResetLab1>
+    <L_Downloading desc=""><![CDATA[下載中]]></L_Downloading>
     <La_Tit desc=""><![CDATA[下載存檔]]></La_Tit>
     <La_Lab0 desc=""><![CDATA[連接成功 請重新啓動遊戲]]></La_Lab0>
     <La_Lab1 desc=""><![CDATA[連接失敗]]></La_Lab1>

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

@@ -86,6 +86,7 @@
     <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>
+    <L_Downloading desc=""><![CDATA[Downloading]]></L_Downloading>
     <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>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 9 - 0
Assets/Script/Label.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bdcee2640aacf1847adcf4304a5a6b98
+folderAsset: yes
+timeCreated: 1510275970
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 10 - 0
Assets/Script/Label/ConfigLabel.cs

@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class ConfigLabel
+{
+    public static string RootNode = "data";
+    public static string ChildNode = "item";
+}

+ 12 - 0
Assets/Script/Label/ConfigLabel.cs.meta

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

+ 66 - 0
Assets/Script/Label/ResourceLabel.cs

@@ -0,0 +1,66 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class ResourceLabel
+{
+    public static string ObjPool = "ObjPool";
+
+    public static string GroupA = "GroupA";
+    public static string GroupB = "GroupB";
+    public static string GroupC = "GroupC";
+    public static string GroupE = "GroupE";
+    public static string GroupD = "GroupD";
+    public static string EventSystem = "EventSystem";
+    public static string MainCamera = "MainCamera";
+    public static string Canvas = "Canvas";
+    public static string UI = "UI";
+
+    public static string SignItem = "SignItem";
+    public static string LightwallUI = "LightwallUI";
+    public static string Firework = "Firework";
+    public static string AchieveItem = "AchieveItem";
+    public static string SkillItem = "SkillItem";
+    public static string CommentItem = "CommentItem";
+    public static string RankItem = "RankItem";
+    public static string HudText = "HudText";
+    public static string GardenInfoItem = "GardenInfoItem";
+    public static string PlazaInfoItem = "PlazaInfoItem";
+    public static string Flower = "Flower";
+    public static string DropGold = "DropGold";
+    public static string DropDiamond = "DropDiamond";
+    public static string PlazaRoomChest = "PlazaRoomChest";
+    public static string ADChest = "ADChest";
+    public static string Star = "Star";
+    public static string Page = "Page";
+    public static string Player = "Player";
+    public static string Garden = "Garden";
+    public static string Tutorial = "Tutorial";
+    public static string DressRoom = "DressRoom";
+
+    public static string Pack = "礼包";
+    public static string Gold = "金币";
+    public static string Diamond = "钻石";
+
+    public static string StandTex = "stand_tex";
+    public static string StandSke = "stand_ske";
+    public static string StandTexture = "stand_texture";
+
+    public static string DefaultNickName = "DefaultNickName";
+    public static string DressroomConfig = "dressRoom_config";
+    public static string AchieveConfig = "achieve_config";
+    public static string LotteryConfig = "lottery_config";
+    public static string FlowerConfig = "flower_config";
+    public static string SigninConfig = "signin_config";
+    public static string PackConfig = "pack_config";
+    public static string SkillConfig = "skill_config";
+    public static string AbilityConfig = "ability_config";
+    public static string VisitConfig = "visit_config";
+    public static string PlazaroomConfig = "plaza_room_config";
+    public static string AwardConfig = "award_config";
+    public static string IAPConfig = "iap_config";
+    public static string OfflineConfig = "offline_config";
+    public static string PlayerConfig= "PlayerConfig";
+    public static string PlayerConfigXml = "PlayerConfig.xml";
+}

+ 12 - 0
Assets/Script/Label/ResourceLabel.cs.meta

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

+ 9 - 9
Assets/Script/Manage/AchieveManager.cs

@@ -167,7 +167,7 @@ public class Achieve
         Button.onClick.RemoveAllListeners();
         Button.onClick.AddListener(GetAward);
 
-        LanguageManager.Add(Tit, new LanStr("AchieveName", FullID));
+        LanguageManager.Add(Tit, new MulLanStr("AchieveName", FullID));
 
 
         if (Lock)
@@ -320,7 +320,7 @@ public class Achieve
 
         Button.image.material = null;
 
-        LanguageManager.Add(BtnLab, new LanStr("Object", "AchieveItem_BtnLab2"));
+        LanguageManager.Add(BtnLab, new MulLanStr("Object", "AchieveItem_BtnLab2"));
     }
 
     public void ToProcess(double value)
@@ -336,7 +336,7 @@ public class Achieve
 
         List<object> objList = new List<object>();
         
-        objList.Add(new LanStr("Object", "AchieveItem_BtnLab0"));
+        objList.Add(new MulLanStr("Object", "AchieveItem_BtnLab0"));
         objList.Add("\n");
 
         if (!DiamondOnce.Equal(0))
@@ -346,14 +346,14 @@ public class Achieve
 
         if (!CoinPerson.Equal(0))
         {
-            objList.Add(new LanStr("Common", "CoinPerson"));
+            objList.Add(new MulLanStr("Common", "CoinPerson"));
             objList.Add("+");
             objList.Add(CoinPerson.ToString("0") + " ");
         }
 
         if (!Person.Equal(0))
         {
-            objList.Add(new LanStr("Common", "Person"));
+            objList.Add(new MulLanStr("Common", "Person"));
             objList.Add("+");
             objList.Add(Person.ToString("0") + " ");
         }
@@ -379,7 +379,7 @@ public class Achieve
 
         List<object> objList = new List<object>();
 
-        objList.Add(new LanStr("Object", "AchieveItem_BtnLab1"));
+        objList.Add(new MulLanStr("Object", "AchieveItem_BtnLab1"));
         objList.Add("\n");
 
         if (!DiamondOnce.Equal(0))
@@ -389,14 +389,14 @@ public class Achieve
 
         if (!CoinPerson.Equal(0))
         {
-            objList.Add(new LanStr("Common", "CoinPerson"));
+            objList.Add(new MulLanStr("Common", "CoinPerson"));
             objList.Add("+");
             objList.Add(CoinPerson.ToString("0") + " ");
         }
 
         if (!Person.Equal(0))
         {
-            objList.Add(new LanStr("Common", "Person"));
+            objList.Add(new MulLanStr("Common", "Person"));
             objList.Add("+");
             objList.Add(Person.ToString("0") + " ");
         }
@@ -560,7 +560,7 @@ public class AchieveManager : Regist
 
     public static void UpdateHint()
     {
-        if (TutorialManager.TutorialA)
+        if (TutorialManager.NewplayerTutorial)
         {
             return;
         }

+ 3 - 3
Assets/Script/Manage/AnnounceManager.cs

@@ -117,15 +117,15 @@ public class AnnounceManager
 
     public static string GetLanguage()
     {
-        if (LanguageManager.CurrentLan == Lan.ChineseSimplified)
+        if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
         {
             return Hants;
         }
-        else if (LanguageManager.CurrentLan == Lan.ChineseTraditional)
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
         {
             return Hant;
         }
-        else if (LanguageManager.CurrentLan == Lan.English)
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
         {
             return En;
         }

+ 211 - 198
Assets/Script/Manage/ConfigManager.cs

@@ -24,7 +24,7 @@ public class ConfigManager : Regist
         {
             if (PlayerNode_ == null)
             {
-                PlayerNode_ = PlayerDoc.SelectSingleNode("PlayerConfig");
+                PlayerNode_ = PlayerDoc.SelectSingleNode(PlayerConfigLabel.RootNode);
             }
 
             return PlayerNode_;
@@ -54,6 +54,21 @@ public class ConfigManager : Regist
     public static bool SerialNumberDownloadLock = true;
     public static XmlDocument DefaultDoc = new XmlDocument();
 
+    public static int PlayerConfigResetVersion = -1000;
+    public static string PlayerConfigPath
+    {
+        get
+        {
+            if (string.IsNullOrEmpty(playerConfigPath))
+            {
+                playerConfigPath = $"{Application.persistentDataPath}/{ResourceLabel.PlayerConfigXml}";
+            }
+
+            return playerConfigPath;
+        }
+    }
+    public static string playerConfigPath;
+
     #endregion
 
     private static void GetPlayerDoc()
@@ -64,13 +79,11 @@ public class ConfigManager : Regist
         XmlNode node;
         XmlDocument nativeDoc = new XmlDocument();
 
-        string configPath = Application.persistentDataPath + "/PlayerConfig.xml";
-
-        if (File.Exists(configPath))
+        if (File.Exists(PlayerConfigPath))
         {
             try
             {
-                StreamReader sr = new StreamReader(configPath);
+                StreamReader sr = new StreamReader(PlayerConfigPath);
 
                 nativeDoc.LoadXml(sr.ReadToEnd());
 
@@ -90,17 +103,17 @@ public class ConfigManager : Regist
             }
 
 
-            TextAsset textAsset = ResourceManager.Load<TextAsset>("PlayerConfig", Folder.Config);
+            TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config);
 
             DefaultDoc.LoadXml(textAsset.text);
 
-            defaultVersion = int.Parse(DefaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value);
+            defaultVersion = int.Parse(DefaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value);
 
-            node = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version");
+            node = nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version);
 
             if (node == null)
             {
-                StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
+                StreamWriter sw = new StreamWriter(PlayerConfigPath);
 
                 sw.Write(DefaultDoc.OuterXml);
 
@@ -112,11 +125,11 @@ public class ConfigManager : Regist
             {
                 nativeVersion = int.Parse(node.Attributes[0].Value);
 
-                if (nativeVersion == -1000)
+                if (nativeVersion == PlayerConfigResetVersion)
                 {
                     PlayerDoc_ = DefaultDoc;
-                    int currentReplayVersion = int.Parse(nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("ReplayVersion").Attributes[0].Value);
-                    SavePlayerInt("ReplayVersion", currentReplayVersion + 1);
+                    int currentReplayVersion = int.Parse(nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.ReplayVersion).Attributes[0].Value);
+                    SavePlayerInt(PlayerConfigLabel.ReplayVersion, currentReplayVersion + 1);
                     //Debug.Log(currentReplayVersion);
                 }
                 else if (nativeVersion < defaultVersion)
@@ -131,7 +144,7 @@ public class ConfigManager : Regist
                     }
                     else
                     {
-                        bytes = File.ReadAllBytes(configPath);
+                        bytes = File.ReadAllBytes(PlayerConfigPath);
                     }
 
                     if (PlayerPrefs.GetString(Lib.ConfigPrefs) != "" && PlayerPrefs.GetString(Lib.ConfigPrefs) != Auxiliary.ToString(md5.ComputeHash(bytes)))
@@ -157,7 +170,7 @@ public class ConfigManager : Regist
                 }
                 else
                 {
-                    byte[] bytes = File.ReadAllBytes(configPath);
+                    byte[] bytes = File.ReadAllBytes(PlayerConfigPath);
 
                     MD5 md5 = new MD5CryptoServiceProvider();
 
@@ -178,7 +191,7 @@ public class ConfigManager : Regist
         }
         else
         {
-            TextAsset textAsset = ResourceManager.Load<TextAsset>("PlayerConfig", Folder.Config);
+            TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config);
 
             DefaultDoc.LoadXml(textAsset.text);
 
@@ -203,7 +216,7 @@ public class ConfigManager : Regist
             {
                 DamageLock = false;
 
-                TextAsset textAsset = ResourceManager.Load<TextAsset>("PlayerConfig", Folder.Config);
+                TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config);
 
                 PlayerDoc_ = new XmlDocument();
 
@@ -247,13 +260,13 @@ public class ConfigManager : Regist
 
             Auxiliary.EncryptXml(doc);
             
-            StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
+            StreamWriter sw = new StreamWriter(PlayerConfigPath);
             
             sw.Write(doc.OuterXml);
 
             sw.Close();
 
-            byte[] bytes = File.ReadAllBytes(Application.persistentDataPath + "/PlayerConfig.xml");
+            byte[] bytes = File.ReadAllBytes(PlayerConfigPath);
             //byte[] bytes = Encoding.UTF8.GetBytes(PlayerDoc.OuterXml);
 
             MD5 md5 = new MD5CryptoServiceProvider();
@@ -269,7 +282,7 @@ public class ConfigManager : Regist
             return;
         }
 
-        TextAsset textAsset = ResourceManager.Load<TextAsset>("PlayerConfig", Folder.Config);
+        TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config);
 
         DefaultDoc.LoadXml(textAsset.text);
 
@@ -279,8 +292,8 @@ public class ConfigManager : Regist
 
             PlayerDoc_.LoadXml(jsonData["l"].ToString());
 
-            int nativeVersion = int.Parse(PlayerDoc_.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value);
-            int defaultVersion = int.Parse(DefaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value);
+            int nativeVersion = int.Parse(PlayerDoc_.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value);
+            int defaultVersion = int.Parse(DefaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value);
 
             if (nativeVersion < defaultVersion)
             {
@@ -325,7 +338,7 @@ public class ConfigManager : Regist
 
     public static void SaveSkillList()
     {
-        if (TutorialManager.TutorialA || !Manager.Complete)
+        if (TutorialManager.NewplayerTutorial || !Manager.Complete)
         {
             return;
         }
@@ -333,7 +346,7 @@ public class ConfigManager : Regist
         XmlNode xmlNode;
         XmlAttribute xmlAttribute;
 
-        xmlNode = PlayerNode.SelectSingleNode("SkillList");
+        xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.SkillList);
         xmlNode.RemoveAll();
 
         for (int i = 0; i < Manager.SkillList.Count; i++)
@@ -344,27 +357,27 @@ public class ConfigManager : Regist
 
                 Skill skill = (Skill)Manager.SkillList[i];
 
-                xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
+                xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, PlayerConfigLabel.Skill, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.ID));
                 xmlAttribute.Value = skill.ID;
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.SkillType));
                 xmlAttribute.Value = skill.SkillType.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.ItemStatus));
                 xmlAttribute.Value = skill.ItemStatus.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.Level));
                 xmlAttribute.Value = skill.Level.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CoolTimer"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.CoolTimer));
                 xmlAttribute.Value = skill.CoolTimer.ToString("0");
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("UseTimer"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.UseTimer));
                 xmlAttribute.Value = skill.UseTimer.ToString("0");
 
-                xmlNode = PlayerNode.SelectSingleNode("SkillList");
+                xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.SkillList);
 
                 #endregion
             }
@@ -374,21 +387,21 @@ public class ConfigManager : Regist
 
                 Pack pack = (Pack)Manager.SkillList[i];
 
-                xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
+                xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, PlayerConfigLabel.Skill, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.ID));
                 xmlAttribute.Value = pack.ID;
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.SkillType));
                 xmlAttribute.Value = pack.SkillType.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.ItemStatus));
                 xmlAttribute.Value = pack.ItemStatus.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.Level));
                 xmlAttribute.Value = pack.Level.ToString();
 
-                xmlNode = PlayerNode.SelectSingleNode("SkillList");
+                xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.SkillList);
 
                 #endregion
             }
@@ -398,21 +411,21 @@ public class ConfigManager : Regist
 
                 Ability ability = (Ability)Manager.SkillList[i];
 
-                xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
+                xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, PlayerConfigLabel.Skill, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.ID));
                 xmlAttribute.Value = ability.ID;
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.SkillType));
                 xmlAttribute.Value = ability.SkillType.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.ItemStatus));
                 xmlAttribute.Value = ability.ItemStatus.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.Level));
                 xmlAttribute.Value = ability.Level.ToString();
 
-                xmlNode = PlayerNode.SelectSingleNode("SkillList");
+                xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.SkillList);
 
                 #endregion
             }
@@ -422,30 +435,30 @@ public class ConfigManager : Regist
 
                 BigSkill bigSkill = (BigSkill)Manager.SkillList[i];
 
-                xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
+                xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, PlayerConfigLabel.Skill, ""));
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.ID));
                 xmlAttribute.Value = bigSkill.ID;
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.SkillType));
                 xmlAttribute.Value = bigSkill.SkillType.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ItemStatus"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.ItemStatus));
                 xmlAttribute.Value = bigSkill.ItemStatus.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("BarStatus"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.BarStatus));
                 xmlAttribute.Value = bigSkill.BarStatus.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.Level));
                 xmlAttribute.Value = bigSkill.Level.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CoolTimer"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.CoolTimer));
                 xmlAttribute.Value = bigSkill.CoolTimer.ToString("0");
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("UseTimer"));
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute(PlayerConfigLabel.UseTimer));
                 xmlAttribute.Value = bigSkill.UseTimer.ToString("0");
 
-                xmlNode = PlayerNode.SelectSingleNode("SkillList");
+                xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.SkillList);
 
                 #endregion
             }
@@ -454,7 +467,7 @@ public class ConfigManager : Regist
 
     public static void SaveDress()
     {
-        XmlNode xmlNode = PlayerNode.SelectSingleNode("DressList");
+        XmlNode xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.DressList);
         xmlNode.Attributes[0].Value = "";
 
         for (int i = 0; i < PlayerManager.BoughtCloseList.Count; i++)
@@ -465,7 +478,7 @@ public class ConfigManager : Regist
         xmlNode.Attributes[0].Value = xmlNode.Attributes[0].Value.TrimEnd(' ');
 
 
-        xmlNode = PlayerNode.SelectSingleNode("DressData");
+        xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.DressData);
 
         for (int i = 0; i < PlayerManager.DressData.Count; i++)
         {
@@ -475,7 +488,7 @@ public class ConfigManager : Regist
 
     public static void SaveAchieve()
     {
-        XmlNode xmlNode = PlayerNode.SelectSingleNode("AchieveList");
+        XmlNode xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveList);
         xmlNode.Attributes[0].Value = "";
 
         foreach (var kv in AchieveManager.AchieveDic)
@@ -489,31 +502,31 @@ public class ConfigManager : Regist
         xmlNode.Attributes[0].Value = xmlNode.Attributes[0].Value.TrimEnd(' ');
 
 
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[0].Value = Manager.AdAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[1].Value = Manager.SkillAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[2].Value = Manager.SignAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[3].Value = Manager.ShareAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[4].Value = Manager.ElfLevel.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[5].Value = Manager.MiniGameAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[6].Value = Manager.FlowerCoin.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[7].Value = Manager.TotalPerson.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[8].Value = Manager.CostDiamond.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[9].Value = Manager.CreateRoomAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[10].Value = Manager.CreateChestAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[11].Value = Manager.CreateLuckyChestAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[12].Value = Manager.CreateGuessColorChestAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[13].Value = Manager.CreateGuessNumberChestAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[14].Value = Manager.GetChestAwardAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[0].Value = Manager.AdAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[1].Value = Manager.SkillAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[2].Value = Manager.SignAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[3].Value = Manager.ShareAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[4].Value = Manager.ElfLevel.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[5].Value = Manager.MiniGameAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[6].Value = Manager.FlowerCoin.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[7].Value = Manager.TotalPerson.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[8].Value = Manager.CostDiamond.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[9].Value = Manager.CreateRoomAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[10].Value = Manager.CreateChestAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[11].Value = Manager.CreateLuckyChestAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[12].Value = Manager.CreateGuessColorChestAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[13].Value = Manager.CreateGuessNumberChestAmt.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[14].Value = Manager.GetChestAwardAmt.ToString("0");
     }
 
     public static void SavePlantList()
     {
-        if (VisitManager.InVisit || TutorialManager.TutorialA)
+        if (VisitManager.InVisit || TutorialManager.NewplayerTutorial)
         {
             return;
         }
         
-        XmlAttributeCollection attribute = PlayerNode.SelectSingleNode("PlantList").Attributes;
+        XmlAttributeCollection attribute = PlayerNode.SelectSingleNode(PlayerConfigLabel.PlantList).Attributes;
 
         attribute[0].Value = "";
 
@@ -529,44 +542,44 @@ public class ConfigManager : Regist
 
     public static void SaveCommon()
     {
-        PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = Manager.Coin.ToString("0");
-        PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value = Manager.Diamond.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.Coin).Attributes[0].Value = Manager.Coin.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.Diamond).Attributes[0].Value = Manager.Diamond.ToString("0");
         
-        PlayerNode.SelectSingleNode("SignTime").Attributes[0].Value = SignManager.SignTime.ToString();
-        PlayerNode.SelectSingleNode("SignIndex").Attributes[0].Value = SignManager.SignIndex.ToString();
-        PlayerNode.SelectSingleNode("SignRound").Attributes[0].Value = SignManager.SignRound.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.SignTime).Attributes[0].Value = SignManager.SignTime.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.SignIndex).Attributes[0].Value = SignManager.SignIndex.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.SignRound).Attributes[0].Value = SignManager.SignRound.ToString();
         
-        PlayerNode.SelectSingleNode("QuitFlag").Attributes[0].Value = HttpManager.Connect.ToInt().ToString();
-        PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value = HttpManager.Time.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.QuitFlag).Attributes[0].Value = HttpManager.Connect.ToInt().ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.QuitTime).Attributes[0].Value = HttpManager.Time.ToString();
 
-        PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = Manager.MiniTimer.ToString("0");
-        PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value = Manager.CircleTimer.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.MiniTimer).Attributes[0].Value = Manager.MiniTimer.ToString("0");
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.CircleTimer).Attributes[0].Value = Manager.CircleTimer.ToString("0");
 
-        PlayerNode.SelectSingleNode("ID").Attributes[0].Value = HttpManager.ID;
-        PlayerNode.SelectSingleNode("SerialNumber").Attributes[0].Value = HttpManager.SerialNumber;
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.ID).Attributes[0].Value = HttpManager.ID;
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.SerialNumber).Attributes[0].Value = HttpManager.SerialNumber;
 
-        PlayerNode.SelectSingleNode("Language").Attributes[0].Value = LanguageManager.CurrentLan.ToString();
-        PlayerNode.SelectSingleNode("MiniGameIndex").Attributes[0].Value = MiniGameManager.MiniGameIndex.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.Language).Attributes[0].Value = LanguageManager.CurrentLanguage.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.MiniGameIndex).Attributes[0].Value = MiniGameManager.MiniGameIndex.ToString();
 
-        PlayerNode.SelectSingleNode("TutorialA").Attributes[0].Value = TutorialManager.TutorialA.ToInt().ToString();
-        PlayerNode.SelectSingleNode("TutorialB").Attributes[0].Value = TutorialManager.TutorialB_.ToInt().ToString();
-        PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = TutorialManager.TutorialC_.ToInt().ToString();
-        PlayerNode.SelectSingleNode("TutorialD").Attributes[0].Value = TutorialManager.TutorialD_.ToInt().ToString();
-        PlayerNode.SelectSingleNode("TutorialE").Attributes[0].Value = TutorialManager.TutorialE_.ToInt().ToString();
-        PlayerNode.SelectSingleNode("TutorialPlazaRoom").Attributes[0].Value = TutorialManager.TutorialPlazaRoom_.ToInt().ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialA).Attributes[0].Value = TutorialManager.NewplayerTutorial.ToInt().ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialB).Attributes[0].Value = TutorialManager.memoryMinigameTutorial.ToInt().ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialC).Attributes[0].Value = TutorialManager.visitTutorial.ToInt().ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialD).Attributes[0].Value = TutorialManager.dressroomTutorial.ToInt().ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialE).Attributes[0].Value = TutorialManager.findMinigameTutorial.ToInt().ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialPlazaRoom).Attributes[0].Value = TutorialManager.plazaRoomTutorial.ToInt().ToString();
 
-        PlayerNode.SelectSingleNode("TutorialIndexA").Attributes[0].Value = TutorialManager.TutorialIndexA.ToString();
-        PlayerNode.SelectSingleNode("TutorialIndexB").Attributes[0].Value = TutorialManager.TutorialIndexB.ToString();
-        PlayerNode.SelectSingleNode("TutorialIndexC").Attributes[0].Value = TutorialManager.TutorialIndexC.ToString();
-        PlayerNode.SelectSingleNode("TutorialIndexD").Attributes[0].Value = TutorialManager.TutorialIndexD.ToString();
-        PlayerNode.SelectSingleNode("TutorialIndexE").Attributes[0].Value = TutorialManager.TutorialIndexE.ToString();
-        PlayerNode.SelectSingleNode("TutorialIndexPlazaRoom").Attributes[0].Value = TutorialManager.TutorialIndexPlazaRoom.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialIndexA).Attributes[0].Value = TutorialManager.NewplayerTutorialIndex.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialIndexB).Attributes[0].Value = TutorialManager.MemoryMinigameTutorialIndex.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialIndexC).Attributes[0].Value = TutorialManager.VisitTutorialIndex.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialIndexD).Attributes[0].Value = TutorialManager.DressroomTutorialIndex.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialIndexE).Attributes[0].Value = TutorialManager.FindMinigameTutorialIndex.ToString();
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.TutorialIndexPlazaRoom).Attributes[0].Value = TutorialManager.PlazaRoomTutorialIndex.ToString();
     }
 
     public static void SaveFlowers()
     {
-        XmlAttribute attribute = PlayerNode.SelectSingleNode("FlowerList").Attributes[0];
-        XmlAttribute attribute1 = PlayerNode.SelectSingleNode("FlowerAmtList").Attributes[0];
+        XmlAttribute attribute = PlayerNode.SelectSingleNode(PlayerConfigLabel.FlowerList).Attributes[0];
+        XmlAttribute attribute1 = PlayerNode.SelectSingleNode(PlayerConfigLabel.FlowerAmtList).Attributes[0];
 
         attribute.Value = "";
         attribute1.Value = "";
@@ -601,7 +614,7 @@ public class ConfigManager : Regist
 
     public static void ResetPlayerConfig()
     {
-        PlayerNode.SelectSingleNode("Version").Attributes[0].Value = "-1000";
+        PlayerNode.SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = PlayerConfigResetVersion.ToString();
 
         SavePlayerConfig();
 
@@ -680,7 +693,7 @@ public class ConfigManager : Regist
     {
         List<int> list = new List<int>();
 
-        XmlAttributeCollection attribute = PlayerNode.SelectSingleNode("DressList").Attributes;
+        XmlAttributeCollection attribute = PlayerNode.SelectSingleNode(PlayerConfigLabel.DressList).Attributes;
 
         return Auxiliary.StringToInts(' ', attribute[0].Value, list);
     }
@@ -755,11 +768,11 @@ public class ConfigManager : Regist
 
         if (node == null)
         {
-            xmlNode = PlayerNode.SelectSingleNode("DressData");
+            xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.DressData);
         }
         else
         {
-            xmlNode = node.SelectSingleNode("DressData");
+            xmlNode = node.SelectSingleNode(PlayerConfigLabel.DressData);
         }
 
 
@@ -855,25 +868,25 @@ public class ConfigManager : Regist
     {
         List<int> list = new List<int>();
 
-        XmlAttributeCollection attribute = PlayerNode.SelectSingleNode("FlowerList").Attributes;
+        XmlAttributeCollection attribute = PlayerNode.SelectSingleNode(PlayerConfigLabel.FlowerList).Attributes;
 
         return Auxiliary.StringToInts(' ', attribute[0].Value, list);
     }
 
     public static List<int> GetAchieveList()
     {
-        return Auxiliary.StringToInts(' ', GetPlayerString("AchieveList"), new List<int>());
+        return Auxiliary.StringToInts(' ', GetPlayerString(PlayerConfigLabel.AchieveList), new List<int>());
     }
 
     public static List<string> GetOfflineConfig()
     {
-        TextAsset textAsset = ResourceManager.Load<TextAsset>("offline_config", Folder.Config);
+        TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.OfflineConfig, Folder.Config);
 
         XmlDocument xmlDoc = new XmlDocument();
 
         xmlDoc.LoadXml(textAsset.text);
 
-        XmlNode xmlNode = xmlDoc.SelectSingleNode("data").SelectSingleNode("item");
+        XmlNode xmlNode = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectSingleNode(ConfigLabel.ChildNode);
 
         List<string> strList = new List<string>()
         {
@@ -889,21 +902,21 @@ public class ConfigManager : Regist
     {
         List<double> dataList = new List<double>();
 
-        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[0].Value));
-        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[1].Value));
-        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[2].Value));
-        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[3].Value));
-        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[4].Value));
-        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[5].Value));
-        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));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[0].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[1].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[2].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[3].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[4].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[5].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[6].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[7].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[8].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[9].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[10].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[11].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[12].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[13].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[14].Value));
 
         return dataList;
     }
@@ -916,11 +929,11 @@ public class ConfigManager : Regist
 
         if (node == null)
         {
-            xmlNode = PlayerNode.SelectSingleNode("PlantList");
+            xmlNode = PlayerNode.SelectSingleNode(PlayerConfigLabel.PlantList);
         }
         else
         {
-            xmlNode = node.SelectSingleNode("PlantList");
+            xmlNode = node.SelectSingleNode(PlayerConfigLabel.PlantList);
         }
 
         if (!string.IsNullOrEmpty(xmlNode.Attributes[0].Value))
@@ -944,11 +957,11 @@ public class ConfigManager : Regist
 
         if (node == null)
         {
-            xmlNodeList = PlayerNode.SelectSingleNode("SkillList").ChildNodes;
+            xmlNodeList = PlayerNode.SelectSingleNode(PlayerConfigLabel.SkillList).ChildNodes;
         }
         else
         {
-            xmlNodeList = node.SelectSingleNode("SkillList").ChildNodes;
+            xmlNodeList = node.SelectSingleNode(PlayerConfigLabel.SkillList).ChildNodes;
         }
 
         for (int i = 0; i < xmlNodeList.Count; i++)
@@ -962,39 +975,39 @@ public class ConfigManager : Regist
 
     public static XmlAttributeCollection GetVisitConfig()
     {
-        TextAsset textAsset = ResourceManager.Load<TextAsset>("visit_config", Folder.Config);
+        TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.VisitConfig, Folder.Config);
 
         XmlDocument xmlDoc = new XmlDocument();
 
         xmlDoc.LoadXml(textAsset.text);
 
-        XmlNode xmlNode = xmlDoc.SelectSingleNode("data").SelectSingleNode("item");
+        XmlNode xmlNode = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectSingleNode(ConfigLabel.ChildNode);
 
         return xmlNode.Attributes;
     }
 
     public static XmlAttributeCollection GetPlazaRoomConfig()
     {
-        TextAsset textAsset = ResourceManager.Load<TextAsset>("plaza_room_config", Folder.Config);
+        TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlazaroomConfig, Folder.Config);
 
         XmlDocument xmlDoc = new XmlDocument();
 
         xmlDoc.LoadXml(textAsset.text);
 
-        XmlNode xmlNode = xmlDoc.SelectSingleNode("data").SelectSingleNode("item");
+        XmlNode xmlNode = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectSingleNode(ConfigLabel.ChildNode);
 
         return xmlNode.Attributes;
     }
 
     public static XmlAttributeCollection GetAwardConfig()
     {
-        TextAsset textAsset = ResourceManager.Load<TextAsset>("award_config", Folder.Config);
+        TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.AwardConfig, Folder.Config);
 
         XmlDocument xmlDoc = new XmlDocument();
 
         xmlDoc.LoadXml(textAsset.text);
 
-        XmlNode xmlNode = xmlDoc.SelectSingleNode("data").SelectSingleNode("item");
+        XmlNode xmlNode = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectSingleNode(ConfigLabel.ChildNode);
 
         return xmlNode.Attributes;
     }
@@ -1008,11 +1021,11 @@ public class ConfigManager : Regist
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
 
 
-        textAsset = ResourceManager.Load<TextAsset>("iap_config", Folder.Config);
+        textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.IAPConfig, Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);
 
-        xmlNodeList = xmlDoc.SelectSingleNode("data").SelectNodes("item");
+        xmlNodeList = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectNodes(ConfigLabel.ChildNode);
 
         for (int i = 0; i < xmlNodeList.Count; i++)
         {
@@ -1029,17 +1042,17 @@ public class ConfigManager : Regist
         List<XmlNodeList> xmlNodeList = new List<XmlNodeList>();
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
         
-        textAsset = ResourceManager.Load<TextAsset>("pack_config", Folder.Config);
+        textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PackConfig, Folder.Config);
         xmlDoc.LoadXml(textAsset.text);
-        xmlNodeList.Add(xmlDoc.SelectSingleNode("data").SelectNodes("item"));
+        xmlNodeList.Add(xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectNodes(ConfigLabel.ChildNode));
         
-        textAsset = ResourceManager.Load<TextAsset>("skill_config", Folder.Config);
+        textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.SkillConfig, Folder.Config);
         xmlDoc.LoadXml(textAsset.text);
-        xmlNodeList.Add(xmlDoc.SelectSingleNode("data").SelectNodes("item"));
+        xmlNodeList.Add(xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectNodes(ConfigLabel.ChildNode));
         
-        textAsset = ResourceManager.Load<TextAsset>("ability_config", Folder.Config);
+        textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.AbilityConfig, Folder.Config);
         xmlDoc.LoadXml(textAsset.text);
-        xmlNodeList.Add(xmlDoc.SelectSingleNode("data").SelectNodes("item"));
+        xmlNodeList.Add(xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectNodes(ConfigLabel.ChildNode));
 
         for (int i = 0; i < xmlNodeList.Count; i++)
         {
@@ -1061,11 +1074,11 @@ public class ConfigManager : Regist
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
         
 
-        textAsset = ResourceManager.Load<TextAsset>("signin_config", Folder.Config);
+        textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.SigninConfig, Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);
 
-        xmlNodeList = xmlDoc.SelectSingleNode("data").SelectNodes("item");
+        xmlNodeList = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectNodes(ConfigLabel.ChildNode);
         
         for (int i = 0; i < xmlNodeList.Count; i++)
         {
@@ -1084,11 +1097,11 @@ public class ConfigManager : Regist
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
         
 
-        textAsset = ResourceManager.Load<TextAsset>("flower_config", Folder.Config);
+        textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.FlowerConfig, Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);
 
-        xmlNodeList = xmlDoc.SelectSingleNode("data").SelectNodes("item");
+        xmlNodeList = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectNodes(ConfigLabel.ChildNode);
 
         for (int i = 0; i < xmlNodeList.Count; i++)
         {
@@ -1107,11 +1120,11 @@ public class ConfigManager : Regist
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
 
 
-        textAsset = ResourceManager.Load<TextAsset>("lottery_config", Folder.Config);
+        textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.LotteryConfig, Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);
 
-        xmlNodeList = xmlDoc.SelectSingleNode("data").SelectNodes("item");
+        xmlNodeList = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectNodes(ConfigLabel.ChildNode);
 
         for (int i = 0; i < xmlNodeList.Count; i++)
         {
@@ -1130,11 +1143,11 @@ public class ConfigManager : Regist
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
 
 
-        textAsset = ResourceManager.Load<TextAsset>("achieve_config", Folder.Config);
+        textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.AchieveConfig, Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);
 
-        xmlNodeList = xmlDoc.SelectSingleNode("data").SelectNodes("item");
+        xmlNodeList = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectNodes(ConfigLabel.ChildNode);
 
         for (int i = 0; i < xmlNodeList.Count; i++)
         {
@@ -1153,11 +1166,11 @@ public class ConfigManager : Regist
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
 
 
-        textAsset = ResourceManager.Load<TextAsset>("dressRoom_config", Folder.Config);
+        textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.DressroomConfig, Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);
 
-        xmlNodeList = xmlDoc.SelectSingleNode("data").SelectNodes("item");
+        xmlNodeList = xmlDoc.SelectSingleNode(ConfigLabel.RootNode).SelectNodes(ConfigLabel.ChildNode);
 
         for (int i = 0; i < xmlNodeList.Count; i++)
         {
@@ -1179,7 +1192,7 @@ public class ConfigManager : Regist
 
     //玩家存档版本大于默认存档版本时需要清空
     //玩家存档版本小于默认存档版本时需要合并
-    //玩家存档版本等于-1000时需要标记为重玩
+    //玩家存档版本等于PlayerConfigResetVersion时需要标记为重玩
     public static XmlDocument MergeXML(int nativeVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
         if (nativeVersion < 0)
@@ -1278,64 +1291,64 @@ public class ConfigManager : Regist
 
     public static XmlDocument To0(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 0.ToString();
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 0.ToString();
 
-        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("ADPlayTime");
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.ADPlayTime);
 
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode1, true));
 
         return nativeDoc;
     }
 
     public static XmlDocument To1(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 1.ToString();
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 1.ToString();
 
-        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("SerialNumber");
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.SerialNumber);
 
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode1, true));
 
         return nativeDoc;
     }
 
     public static XmlDocument To2(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 2.ToString();
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 2.ToString();
 
-        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("NotificationIndex");
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.NotificationIndex);
 
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode1, true));
 
         return nativeDoc;
     }
 
     public static XmlDocument To3(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 3.ToString();
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 3.ToString();
 
-        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("NickName");
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.NickName);
 
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode1, true));
 
         return nativeDoc;
     }
 
 	public static XmlDocument To4(XmlDocument nativeDoc, XmlDocument defaultDoc)
 	{
-		nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 4.ToString();
+		nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 4.ToString();
 
-		XmlNode xmlNode = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");
+		XmlNode xmlNode = nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.DressData);
 
-		XmlAttribute attribute = xmlNode.Attributes.Append (nativeDoc.CreateAttribute ("LeftLongSleeveSlot"));
+		XmlAttribute attribute = xmlNode.Attributes.Append (nativeDoc.CreateAttribute (PlayerConfigLabel.LeftLongSleeveSlot));
 		attribute.Value="Empty";
 
-		attribute = xmlNode.Attributes.Append (nativeDoc.CreateAttribute ("LeftShortSleeveSlot"));
+		attribute = xmlNode.Attributes.Append (nativeDoc.CreateAttribute (PlayerConfigLabel.LeftShortSleeveSlot));
 		attribute.Value="Empty";
 
-		attribute = xmlNode.Attributes.Append (nativeDoc.CreateAttribute ("RightLongSleeveSlot"));
+		attribute = xmlNode.Attributes.Append (nativeDoc.CreateAttribute (PlayerConfigLabel.RightLongSleeveSlot));
 		attribute.Value="Empty";
 
-		attribute = xmlNode.Attributes.Append (nativeDoc.CreateAttribute ("RightShortSleeveSlot"));
+		attribute = xmlNode.Attributes.Append (nativeDoc.CreateAttribute (PlayerConfigLabel.RightShortSleeveSlot));
 		attribute.Value="Empty";
 
 		List<string> sleeveList = GetSleeveListByTop (xmlNode.Attributes [4].Value);
@@ -1413,30 +1426,30 @@ public class ConfigManager : Regist
 
     public static XmlDocument To5(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 5.ToString();
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 5.ToString();
 
         return nativeDoc;
     }
 
     public static XmlDocument To6(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 6.ToString();
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 6.ToString();
 
-        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("NewFlowerFlag");
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.NewFlowerFlag);
 
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode1, true));
 
         return nativeDoc;
     }
 
     public static XmlDocument To7(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 7.ToString();
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 7.ToString();
 
-        XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("FlowerList");
+        XmlNode xmlNode1 = nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.FlowerList);
         string[] flowerIDs= xmlNode1.Attributes[0].Value.Split(' ');
 
-        xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("FlowerAmtList");
+        xmlNode1 = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.FlowerAmtList);
         xmlNode1.Attributes[0].Value = "";
         foreach (var flowerID in flowerIDs)
         {
@@ -1444,34 +1457,34 @@ public class ConfigManager : Regist
         }
         xmlNode1.Attributes[0].Value = xmlNode1.Attributes[0].Value.TrimStart();
 
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode1, true));
 
         return nativeDoc;
     }
 
     public static XmlDocument To8(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 8.ToString();
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 8.ToString();
 
-        XmlNode xmlNode0 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialPlazaRoom");
-        XmlNode xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexPlazaRoom");
+        XmlNode xmlNode0 = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.TutorialPlazaRoom);
+        XmlNode xmlNode1 = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.TutorialIndexPlazaRoom);
 
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode0, true));
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode0, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode1, true));
 
         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"));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 9.ToString();
+        XmlNode xmlNode = nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.AchieveData);
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute(PlayerConfigLabel.CreateRoomAmt));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute(PlayerConfigLabel.CreateChestAmt));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute(PlayerConfigLabel.CreateLuckyChestAmt));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute(PlayerConfigLabel.CreateGuessColorChestAmt));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute(PlayerConfigLabel.CreateGuessNumberChestAmt));
+        xmlNode.Attributes.Append(nativeDoc.CreateAttribute(PlayerConfigLabel.GetChestAwardAmt));
         xmlNode.Attributes[9].Value = "0";
         xmlNode.Attributes[10].Value = "0";
         xmlNode.Attributes[11].Value = "0";
@@ -1483,27 +1496,27 @@ public class ConfigManager : Regist
 
     public static XmlDocument To10(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 10.ToString();
-        ChestManager.ClearRefundAndOperateData(nativeDoc.SelectSingleNode("PlayerConfig"));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 10.ToString();
+        ChestManager.ClearRefundAndOperateData(nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode));
         return nativeDoc;
     }
 
     public static XmlDocument To11(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 11.ToString();
-        XmlNode xmlNode = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("ReplayVersion");
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 11.ToString();
+        XmlNode xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.ReplayVersion);
 
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
 
         return nativeDoc;
     }
 
     public static XmlDocument To12(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 12.ToString();
-        XmlNode xmlNode = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode(PlayerConfigLabel.ExtraSlot);
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 12.ToString();
+        XmlNode xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.ExtraSlot);
 
-        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode, true));
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
 
         return nativeDoc;
     }

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

@@ -11,7 +11,7 @@ using Random = UnityEngine.Random;
 
 public class DebugManager : MonoBehaviour
 {
-    #region 变量
+    #region Config
 
     public static Text Lab
     {

+ 7 - 7
Assets/Script/Manage/GardenManager.cs

@@ -37,7 +37,7 @@ public enum ElfType
 
 public class GardenManager : Regist
 {
-    #region 变量
+    #region Config
 
     public static int Slot
     {
@@ -67,9 +67,9 @@ public class GardenManager : Regist
 
             if (MyFlower_ >= 2 && Manager.Level >= 22)
             {
-                if (TutorialManager.TutorialE_)
+                if (TutorialManager.findMinigameTutorial)
                 {
-                    TutorialManager.EnterE1();
+                    TutorialManager.ClickCorrectButton();
                 }
             }
         }
@@ -187,7 +187,7 @@ public class GardenManager : Regist
 
     public void Update()
     {
-        if (TutorialManager.TutorialA || Player.InDressRoom || SFSManager.GardenSmartFox.PlazaRoomController.JoinedPlazaRoom)
+        if (TutorialManager.NewplayerTutorial || Player.InDressRoom || SFSManager.GardenSmartFox.PlazaRoomController.JoinedPlazaRoom)
         {
             return;
         }
@@ -266,7 +266,7 @@ public class GardenManager : Regist
 
     public override void InstantiatePrefabs()
     {
-        ResourceManager.Get("Garden", Folder.Scene, true, transform, true, ObjType.Garden).AddScript<Garden>();
+        ResourceManager.Get(ResourceLabel.Garden, Folder.Scene, true, transform, true, ObjType.Garden).AddScript<Garden>();
         
         CreatePage();
         CreatePage();
@@ -317,7 +317,7 @@ public class GardenManager : Regist
         }
 
 
-        List<int> flowerAmountList = ConfigManager.GetIntList(' ', "FlowerAmtList", null);
+        List<int> flowerAmountList = ConfigManager.GetIntList(' ', PlayerConfigLabel.FlowerAmtList, null);
 
         for (int i = 0; i < flowerAmountList.Count; i++)
         {
@@ -371,7 +371,7 @@ public class GardenManager : Regist
 
     public static void CreatePage()
     {
-        Transform tra = ResourceManager.Get("Page", Folder.Scene, false, ResourceManager.Get("GardenPage"), false, ObjType.Page);
+        Transform tra = ResourceManager.Get(ResourceLabel.Page, Folder.Scene, false, ResourceManager.Get("GardenPage"), false, ObjType.Page);
         
         float offset = Page*18.9f;
 

+ 40 - 25
Assets/Script/Manage/HttpManager.cs

@@ -52,7 +52,7 @@ public class HttpManager : Regist
         }
     }
 
-    #region 变量
+    #region Config
 
     public static bool Connect
     {
@@ -118,6 +118,21 @@ public class HttpManager : Regist
 
     public static string BaseURL = "https://garden.dashgame.com/index.php/home";
     public static string NewBaseURL = "https://garden.dashgame.com/index.php/newhome";
+    public static string NicknameURL = NewBaseURL + "/user/nickname";
+    public static string RankURL = NewBaseURL + "/user/look";
+    public static string PraiseURL= NewBaseURL + "/praise/click";
+    public static string TargetURL= NewBaseURL + "/praise/target";
+    public static string AddCommentURL= NewBaseURL + "/comment/comment";
+    public static string GetCommentURL= NewBaseURL + "/comment/index";
+    public static string IndexURL= NewBaseURL + "/index/index";
+    public static string GetProductIDURL= NewBaseURL + "/pay/pay";
+    public static string LoginURL= NewBaseURL + "/user/login";
+    public static string SaveURL= NewBaseURL + "/user/save";
+    public static string OtherURL= NewBaseURL + "/user/other";
+    public static string DownloadURL= NewBaseURL + "/user/load";
+    public static string RandomURL= NewBaseURL + "/user/rand";
+    public static string ThanksGiftInfoURL= NewBaseURL + "/index/gift";
+    public static string ReportMailAddress= "bug@dashgame.com";
 
     #endregion
 
@@ -177,7 +192,7 @@ public class HttpManager : Regist
 
     public override void FirstInit()
     {
-        ReplayVersion = ConfigManager.GetPlayerInt("ReplayVersion");
+        ReplayVersion = ConfigManager.GetPlayerInt(PlayerConfigLabel.ReplayVersion);
     }
 
 
@@ -191,7 +206,7 @@ public class HttpManager : Regist
         URLRequest.CreateStrURLRequest
         (
             true,
-            NewBaseURL + "/user/nickname",
+            NicknameURL,
             urlData,
             data =>
             {
@@ -220,7 +235,7 @@ public class HttpManager : Regist
         URLRequest.CreateStrURLRequest
         (
             false,
-            NewBaseURL + "/user/look",
+            RankURL,
             urlData,
             data =>
             {
@@ -315,9 +330,9 @@ public class HttpManager : Regist
 
             rootNode = document.SelectSingleNode("announce");
 
-            NotificationIndex = int.Parse(rootNode.SelectSingleNode("version").InnerText);
+            NotificationIndex = int.Parse(rootNode.SelectSingleNode(PlayerConfigLabel.Version).InnerText);
 
-            XmlNodeList nodeList = rootNode.SelectNodes("item");
+            XmlNodeList nodeList = rootNode.SelectNodes(ConfigLabel.ChildNode);
 
             List<string> urlList = new List<string>();
 
@@ -446,7 +461,7 @@ public class HttpManager : Regist
         urlData.Add("u", sendID);
         urlData.Add("t", receiveID);
 
-        URLRequest.CreateStrURLRequest(true, NewBaseURL + "/praise/click", urlData, (data)=> {}, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest(true, PraiseURL, urlData, (data)=> {}, URLRequest.Method.POST);
     }
 
     public static void Target(string userID, string targetID, Action<JsonData> callback)
@@ -456,7 +471,7 @@ public class HttpManager : Regist
         urlData.Add("u", userID);
         urlData.Add("t", targetID);
 
-        URLRequest.CreateURLRequest(true, NewBaseURL + "/praise/target", urlData, data => callback(data), URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, TargetURL, urlData, data => callback(data), URLRequest.Method.POST);
     }
 
     public static void AddComment(string sendID, string receiveID, string content, CommentType type)
@@ -484,7 +499,7 @@ public class HttpManager : Regist
         URLRequest.CreateStrURLRequest
         (
             true,
-            NewBaseURL + "/comment/comment",
+            AddCommentURL,
             urlData,
             data =>
             {
@@ -527,7 +542,7 @@ public class HttpManager : Regist
         urlData.Add("p", page);
         urlData.Add("t", type.GetHashCode());
 
-        URLRequest.CreateURLRequest(true, NewBaseURL + "/comment/index", urlData, data => { callback(data);}, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, GetCommentURL, urlData, data => { callback(data);}, URLRequest.Method.POST);
     }
 
 
@@ -538,7 +553,7 @@ public class HttpManager : Regist
         URLRequest.CreateURLRequest
         (
             true,
-            NewBaseURL + "/index/index",
+            IndexURL,
             urlData,
             data =>
             {
@@ -649,7 +664,7 @@ public class HttpManager : Regist
 
                 mailItem.GetChild(2).GetComponent<Text>().text = pack.Name;
 
-                InfoBoxManager.Show(InfoCategory.Garden,  $"{Language.GetStr("Common", "Get")} {LanguageLabel.PackSprite}{pack.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {LanguageLabel.PackSprite}{pack.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
             }
             else
             {
@@ -697,7 +712,7 @@ public class HttpManager : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = closeItem.Name;
 
-                    InfoBoxManager.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} {LanguageLabel.CloseSprite}{closeItem.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {LanguageLabel.CloseSprite}{closeItem.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
                 }
                 else
                 {
@@ -730,7 +745,7 @@ public class HttpManager : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = flowerInfo.Name;
 
-                    InfoBoxManager.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} {LanguageLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {LanguageLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
                 }
                 else
                 {
@@ -756,7 +771,7 @@ public class HttpManager : Regist
 
             mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} {LanguageLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {LanguageLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
         else if (mailReward.Key == "diamond")
         {
@@ -776,7 +791,7 @@ public class HttpManager : Regist
 
             mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.Show(InfoCategory.Garden, $"{Language.GetStr("Common", "Get")} {LanguageLabel.DiamondSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {LanguageLabel.DiamondSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
         else
         {
@@ -888,7 +903,7 @@ public class HttpManager : Regist
         urlData.Add("i", id);
         urlData.Add("u", JsonData.Inst_Object["i"].ToJson().Trim('"'));
 
-        URLRequest.CreateStrURLRequest(true, NewBaseURL + "/pay/pay", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest(true, GetProductIDURL, urlData, callback, URLRequest.Method.POST);
     }
 
 
@@ -898,7 +913,7 @@ public class HttpManager : Regist
 
         urlData.Add("u", SystemInfo.deviceUniqueIdentifier);
 
-        URLRequest.CreateURLRequest(false, NewBaseURL + "/user/login", urlData, LoginCallback + callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(false, LoginURL, urlData, LoginCallback + callback, URLRequest.Method.POST);
     }
 
     private static void LoginCallback(JsonData jsonData)
@@ -969,7 +984,7 @@ public class HttpManager : Regist
 
         urlData.Add("l", ConfigManager.PlayerDoc.OuterXml);
 
-        URLRequest.CreateURLRequest(false, NewBaseURL + "/user/save", urlData, SaveCallback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(false, SaveURL, urlData, SaveCallback, URLRequest.Method.POST);
         //URLRequest.CreateStrURLRequest(false, NewBaseURL + "/user/save", urlData, Debug.Log, URLRequest.Method.POST);
     }
 
@@ -985,7 +1000,7 @@ public class HttpManager : Regist
 
         urlData.Add("u", id);
 
-        URLRequest.CreateURLRequest(true, NewBaseURL + "/user/other", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, OtherURL, urlData, callback, URLRequest.Method.POST);
     }
 
     public static void DownloadByID(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
@@ -994,7 +1009,7 @@ public class HttpManager : Regist
 
         urlData.Add("u", id);
 
-        URLRequest.CreateURLRequest(true, NewBaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, DownloadURL, urlData, callback, URLRequest.Method.POST);
     }
 
     public static void DownloadBySerialNumber(string serialNumber, URLRequest.URLRequestJsonCallBackDelegate callback)
@@ -1003,7 +1018,7 @@ public class HttpManager : Regist
 
         urlData.Add("u", serialNumber);
 
-        URLRequest.CreateURLRequest(true, NewBaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, DownloadURL, urlData, callback, URLRequest.Method.POST);
     }
 
     public static void RandomLoad(URLRequest.URLRequestJsonCallBackDelegate callback)
@@ -1012,7 +1027,7 @@ public class HttpManager : Regist
 
         urlData.Add("i", "");
 
-        URLRequest.CreateURLRequest(false, NewBaseURL + "/user/rand", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(false, RandomURL, urlData, callback, URLRequest.Method.POST);
     }
 
 
@@ -1023,7 +1038,7 @@ public class HttpManager : Regist
         URLRequest.CreateURLRequest
         (
             false,
-            NewBaseURL + "/index/gift",
+            ThanksGiftInfoURL,
             urlData,
             jData =>
             {
@@ -1109,7 +1124,7 @@ public class HttpManager : Regist
         {
             MailMessage mailMessage = new MailMessage();
 
-            mailMessage.To.Add(new MailAddress("bug@dashgame.com"));
+            mailMessage.To.Add(new MailAddress(ReportMailAddress));
 
             mailMessage.From = new MailAddress("dashgamegarden@163.com");
 

+ 3 - 3
Assets/Script/Manage/IAPManager.cs

@@ -23,7 +23,7 @@ public enum PayChannel
 
 public class IAPManager : MonoBehaviour, IStoreListener
 {
-    #region 变量
+    #region Config
 
     public static float Timer;
 
@@ -84,7 +84,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
                 if (HttpManager.Connect && (HttpManager.Time.Subtract((DateTime)ADPlayTime).TotalSeconds > 1200))
                 {
-                    if (GardenManager.MiniLock && !VisitManager.InVisit && !TutorialManager.TutorialA && !SFSManager.GardenSmartFox.PlazaRoomController.InPlazaRoom && !Player.InDressRoom)
+                    if (GardenManager.MiniLock && !VisitManager.InVisit && !TutorialManager.NewplayerTutorial && !SFSManager.PlazaRoomController.InPlazaRoom && !Player.InDressRoom)
                     {
                         ChestList.Add(ResourceManager.GetADChest());
                     }
@@ -251,7 +251,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
             Manager.AdAmt++;
 
             ADPlayTime = HttpManager.Time;
-            ConfigManager.SavePlayerString("ADPlayTime", ADPlayTime.ToString());
+            ConfigManager.SavePlayerString(PlayerConfigLabel.ADPlayTime, ADPlayTime.ToString());
         }
         else if (showResult == ShowResult.Skipped)
         {

+ 4 - 26
Assets/Script/Manage/InfoBoxManager.cs

@@ -6,12 +6,6 @@ using System.Text;
 using System.Collections;
 using System.Collections.Generic;
 
-public enum InfoCategory
-{
-    Garden,
-    PlazaRoom,
-}
-
 public class InfoBoxManager : Regist
 {
     public class InfoBox
@@ -146,15 +140,15 @@ public class InfoBoxManager : Regist
     private const int MaxGardenInfoCount = 4;
     private const int MaxPlazaRoomCount = 300;
 
-    private static InfoBox GardenInfoBox;
-    private static InfoBox PlazaRoomInfoBox;
+    public static InfoBox GardenInfoBox;
+    public static InfoBox PlazaRoomInfoBox;
 
     #endregion
 
     public override void FirstInit()
     {
-        GardenInfoBox = new InfoBox(MaxGardenInfoCount, 45f, "C_InfoItem", true, ObjType.C_InfoItem,  ResourceManager.Get("C_Info"));
-        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, Mathf.Infinity, "X_InfoItem", true, ObjType.X_InfoItem, ResourceManager.Get("X_Info"));
+        GardenInfoBox = new InfoBox(MaxGardenInfoCount, 45f, ResourceLabel.GardenInfoItem, true, ObjType.C_InfoItem,  ResourceManager.Get("C_Info"));
+        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, Mathf.Infinity, ResourceLabel.PlazaInfoItem, true, ObjType.X_InfoItem, ResourceManager.Get("X_Info"));
     }
 
     public void Update()
@@ -162,20 +156,4 @@ public class InfoBoxManager : Regist
         GardenInfoBox.Update();
         PlazaRoomInfoBox.Update();
     }
-
-    public static void Show(InfoCategory infoCategory, string str, float time, Color color, Sprite atlas = null)
-    {
-        if (infoCategory == InfoCategory.Garden)
-        {
-            GardenInfoBox.Show(str, time, color, atlas);
-        }
-        else if (infoCategory == InfoCategory.PlazaRoom)
-        {
-            PlazaRoomInfoBox.Show(str, time, color, atlas);
-        }
-        else
-        {
-            throw new Exception();
-        }
-    }
 }

+ 28 - 21
Assets/Script/Manage/Initializer.cs

@@ -11,7 +11,7 @@ using System.Collections.Generic;
 
 public class Initializer : MonoBehaviour
 {
-    #region 变量
+    #region Config
 
     public bool DebugMode;
     public bool CatchException;
@@ -181,14 +181,21 @@ public class Initializer : MonoBehaviour
 
     public static void InitializeEntrance()
     {
-        if (Instance.CatchException)
-        {
-            DebugManager.TryCatch(Initialize, EnableDebugLab);
-        }
-        else
-        {
-            Initialize();
-        }
+        //DelayCall.Call
+        //(
+        //    1,
+        //    () =>
+        //    {
+                if (Instance.CatchException)
+                {
+                    DebugManager.TryCatch(Initialize, EnableDebugLab);
+                }
+                else
+                {
+                    Initialize();
+                }
+        //    }
+        //);
     }
 
     public static Text DebugLab;
@@ -198,40 +205,40 @@ public class Initializer : MonoBehaviour
         
         DebugLab.text = "Error code : 1";
 
-        TutorialManager.TutorialA = ConfigManager.GetPlayerBool("TutorialA");
+        TutorialManager.NewplayerTutorial = ConfigManager.GetPlayerBool("TutorialA");
         DebugLab.text = "Error code : 1-1";
 
-        TutorialManager.TutorialB_ = ConfigManager.GetPlayerBool("TutorialB");
+        TutorialManager.memoryMinigameTutorial = ConfigManager.GetPlayerBool("TutorialB");
         DebugLab.text = "Error code : 1-2";
 
-        TutorialManager.TutorialC_ = ConfigManager.GetPlayerBool("TutorialC");
+        TutorialManager.visitTutorial = ConfigManager.GetPlayerBool("TutorialC");
         DebugLab.text = "Error code : 1-3";
 
-        TutorialManager.TutorialD_ = ConfigManager.GetPlayerBool("TutorialD");
+        TutorialManager.dressroomTutorial = ConfigManager.GetPlayerBool("TutorialD");
         DebugLab.text = "Error code : 1-4";
 
-        TutorialManager.TutorialE_ = ConfigManager.GetPlayerBool("TutorialE");
+        TutorialManager.findMinigameTutorial = ConfigManager.GetPlayerBool("TutorialE");
         DebugLab.text = "Error code : 1-5";
 
-        TutorialManager.TutorialPlazaRoom_ = ConfigManager.GetPlayerBool("TutorialPlazaRoom");
+        TutorialManager.plazaRoomTutorial = ConfigManager.GetPlayerBool("TutorialPlazaRoom");
         DebugLab.text = "Error code : 1-5-1";
 
-        TutorialManager.TutorialIndexA = ConfigManager.GetPlayerInt("TutorialIndexA");
+        TutorialManager.NewplayerTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexA");
         DebugLab.text = "Error code : 1-6";
 
-        TutorialManager.TutorialIndexB = ConfigManager.GetPlayerInt("TutorialIndexB");
+        TutorialManager.MemoryMinigameTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexB");
         DebugLab.text = "Error code : 1-7";
 
-        TutorialManager.TutorialIndexC = ConfigManager.GetPlayerInt("TutorialIndexC");
+        TutorialManager.VisitTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexC");
         DebugLab.text = "Error code : 1-8";
 
-        TutorialManager.TutorialIndexD = ConfigManager.GetPlayerInt("TutorialIndexD");
+        TutorialManager.DressroomTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexD");
         DebugLab.text = "Error code : 1-9";
 
-        TutorialManager.TutorialIndexE = ConfigManager.GetPlayerInt("TutorialIndexE");
+        TutorialManager.FindMinigameTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexE");
         DebugLab.text = "Error code : 1-10";
 
-        TutorialManager.TutorialIndexPlazaRoom = ConfigManager.GetPlayerInt("TutorialIndexPlazaRoom");
+        TutorialManager.PlazaRoomTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexPlazaRoom");
         DebugLab.text = "Error code : 1-10-1";
 
         Bundle.LoadAtlasSprites();

+ 11 - 11
Assets/Script/Manage/LanguageManager.cs

@@ -4,7 +4,7 @@ using UnityEngine.UI;
 using System.Collections;
 using System.Collections.Generic;
 
-public enum Lan
+public enum CurrentLanguage
 {
     Default,
 
@@ -14,12 +14,12 @@ public enum Lan
 }
 
 
-public class LanStr
+public class MulLanStr
 {
     public string ID;
     public string Page;
 
-    public LanStr(string id, string page)
+    public MulLanStr(string id, string page)
     {
         ID = id;
         Page = page;
@@ -33,9 +33,9 @@ public class LanStr
 
 public class LanguageManager : Regist 
 {
-    #region 变量
+    #region Config
 
-    public static Lan CurrentLan;
+    public static CurrentLanguage CurrentLanguage;
 
     public static Dictionary<Text, object[]> TextDic = new Dictionary<Text, object[]>();
     public static Dictionary<TextMesh, object[]> TextMeshDic = new Dictionary<TextMesh, object[]>();
@@ -76,11 +76,11 @@ public class LanguageManager : Regist
     }
 
 
-    public static void SwitchLanguage(Lan lan)
+    public static void SwitchLanguage(CurrentLanguage currentLanguage)
     {
-        CurrentLan = lan;
+        CurrentLanguage = currentLanguage;
 
-        Language.SwitchLanguage(lan);
+        Language.SwitchLanguage(currentLanguage);
 
         Manager.SwitchLanguage();
 
@@ -115,15 +115,15 @@ public class LanguageManager : Regist
 
         for (int i = 0; i < objs.Length; i++)
         {
-            LanStr lanStr = objs[i] as LanStr;
+            MulLanStr mulLanStr = objs[i] as MulLanStr;
 
-            if (lanStr == null)
+            if (mulLanStr == null)
             {
                 str += objs[i];
             }
             else
             {
-                str += lanStr.ToString();
+                str += mulLanStr.ToString();
             }
         }
 

+ 51 - 51
Assets/Script/Manage/Manager.cs

@@ -241,15 +241,15 @@ public class Manager : Regist
                 kv.Value.OnLevelChange();
             }
 
-            if (Level_ >= 18) //小游戏B
+            if (Level_ >= TutorialManager.MemoryMinigameTutorialLevel)
             {
-                if (TutorialManager.TutorialB_)
+                if (TutorialManager.memoryMinigameTutorial)
                 {
-                    TutorialManager.TutorialB = true;
+                    TutorialManager.MemoryMinigameTutorial = true;
                 }
             }
 
-            if (Level < 13)
+            if (Level < TutorialManager.DressroomTutorialLevel)
             {
                 ResourceManager.Get<Image>("C_DressRoom").material = Lib.GrayMat;
             }
@@ -258,19 +258,19 @@ public class Manager : Regist
                 ResourceManager.Get<Image>("C_DressRoom").material = null;
             }
 
-            if (GardenManager.MyFlower >= 2 && Level_ >= 22) //小游戏C
+            if (GardenManager.MyFlower >= TutorialManager.MinFlowerForFindGame && Level_ >= TutorialManager.FindMinigameTutorialLevel)
             {
-                if (TutorialManager.TutorialE_)
+                if (TutorialManager.findMinigameTutorial)
                 {
-                    TutorialManager.EnterE1();
+                    TutorialManager.ClickCorrectButton();
                 }
             }
 
-            if (Level_ >= 8)
+            if (Level_ >= TutorialManager.VisitTutorialLevel)
             {
-                if (TutorialManager.TutorialC_)
+                if (TutorialManager.visitTutorial)
                 {
-                    TutorialManager.EnterC1();
+                    TutorialManager.ClickVisitBtn();
                     return;
                 }
                 else
@@ -279,20 +279,20 @@ public class Manager : Regist
                 }
             }
 
-            if (Level_ >= 13)
+            if (Level_ >= TutorialManager.DressroomTutorialLevel)
             {
-                if (TutorialManager.TutorialD_)
+                if (TutorialManager.dressroomTutorial)
                 {
-                    TutorialManager.EnterD1();
+                    TutorialManager.ClickDressroomButton();
                     return;
                 }
             }
 
-            if (Level_ >= 28)
+            if (Level_ >= TutorialManager.PlazaRoomTutorialLevel)
             {
-                if (TutorialManager.TutorialPlazaRoom_)
+                if (TutorialManager.plazaRoomTutorial)
                 {
-                    TutorialManager.EnterPlazaRoom();
+                    TutorialManager.ClickPlazaRoomBtn();
                     return;
                 }
                 else
@@ -482,7 +482,7 @@ public class Manager : Regist
     {
         LoginThread();
 
-        if (TutorialManager.TutorialA)
+        if (TutorialManager.NewplayerTutorial)
         {
             return;
         }
@@ -747,10 +747,10 @@ public class Manager : Regist
     {
         Instance = this;
 
-        Coin = ConfigManager.GetPlayerDouble("Coin");
-        Diamond = ConfigManager.GetPlayerDouble("Diamond");
-        MiniTimer = ConfigManager.GetPlayerFloat("MiniTimer");
-        CircleTimer = ConfigManager.GetPlayerFloat("CircleTimer");
+        Coin = ConfigManager.GetPlayerDouble(PlayerConfigLabel.Coin);
+        Diamond = ConfigManager.GetPlayerDouble(PlayerConfigLabel.Diamond);
+        MiniTimer = ConfigManager.GetPlayerFloat(PlayerConfigLabel.MiniTimer);
+        CircleTimer = ConfigManager.GetPlayerFloat(PlayerConfigLabel.CircleTimer);
 
         if (MiniTimer > 0)
         {
@@ -762,8 +762,8 @@ public class Manager : Regist
         }
 
 
-        HttpManager.ID = ConfigManager.GetPlayerString("ID");
-        HttpManager.SerialNumber = ConfigManager.GetPlayerString("SerialNumber");
+        HttpManager.ID = ConfigManager.GetPlayerString(PlayerConfigLabel.ID);
+        HttpManager.SerialNumber = ConfigManager.GetPlayerString(PlayerConfigLabel.SerialNumber);
 
         List<string> offlineList = ConfigManager.GetOfflineConfig();
 
@@ -798,9 +798,9 @@ public class Manager : Regist
 
         ResourceManager.SetActive("Ba_Lab2", false);
 
-        if (HttpManager.Connect && ConfigManager.GetPlayerBool("QuitFlag"))
+        if (HttpManager.Connect && ConfigManager.GetPlayerBool(PlayerConfigLabel.QuitFlag))
         {
-            QuitTime = DateTime.Parse(ConfigManager.GetPlayerString("QuitTime"));
+            QuitTime = DateTime.Parse(ConfigManager.GetPlayerString(PlayerConfigLabel.QuitTime));
 
             Elapse = (float)HttpManager.Time.Subtract(QuitTime).TotalSeconds;
 
@@ -959,7 +959,7 @@ public class Manager : Regist
                         Language.GetStr("Common", "ShortCoin"),
                         Language.GetStr("Common", "NavigateCoin"),
                         null,
-                        ResourceManager.LoadSprite("金币", Folder.UI),
+                        Lib.GoldSprite,
                         () =>
                         {
                             navigateCall.SafeInvoke();
@@ -969,26 +969,26 @@ public class Manager : Regist
                                 TweenRoot tween = ResourceManager.Get("K_Bubble0").GetTweenScale();
 
                                 tween.AddEventOnetime
-                                    (
-                                        EventType.BackwardFinish,
-                                        () =>
-                                        {
-                                            UIManager.NavigateBuyCoin();
-                                        }
-                                    );
+                                (
+                                    EventType.BackwardFinish,
+                                    () =>
+                                    {
+                                        UIManager.NavigateBuyCoin();
+                                    }
+                                );
                             }
                             else
                             {
                                 TweenRoot tween = ResourceManager.Get("F_Manage0").GetTweenVec();
 
                                 tween.AddEventOnetime
-                                    (
-                                        EventType.ForwardFinish,
-                                        () =>
-                                        {
-                                            UIManager.NavigateBuyCoin();
-                                        }
-                                    );
+                                (
+                                    EventType.ForwardFinish,
+                                    () =>
+                                    {
+                                        UIManager.NavigateBuyCoin();
+                                    }
+                                );
                             }
                         }
                     );
@@ -1000,7 +1000,7 @@ public class Manager : Regist
                         Language.GetStr("Common", "ShortCoin"),
                         null,
                         null,
-                        ResourceManager.LoadSprite("金币", Folder.UI)
+                        Lib.GoldSprite
                     );
                 }
             }
@@ -1032,7 +1032,7 @@ public class Manager : Regist
                         Language.GetStr("Common", "ShortDiamond"),
                         Language.GetStr("Common", "NavigateDiamond"),
                         null,
-                        ResourceManager.LoadSprite("钻石", Folder.UI),
+                        Lib.DiamondSprite,
                         () =>
                         {
                             navigateCall.SafeInvoke();
@@ -1073,7 +1073,7 @@ public class Manager : Regist
                         Language.GetStr("Common", "ShortDiamond"),
                         null,
                         null,
-                        ResourceManager.LoadSprite("钻石", Folder.UI)
+                        Lib.DiamondSprite
                     );
                 }
             }
@@ -1098,14 +1098,14 @@ public class Manager : Regist
 
         if (HttpManager.Connect)
         {
-            if (ConfigManager.GetPlayerString("ID") == "Default")
+            if (ConfigManager.GetPlayerString(PlayerConfigLabel.ID) == "Default")
             {
                 HttpManager.ID = HttpManager.JsonData["o"].ToString();
 
                 ResourceManager.SetText("L_UserLab", HttpManager.ID);
             }
 
-            if (ConfigManager.GetPlayerString("SerialNumber") == "Default")
+            if (ConfigManager.GetPlayerString(PlayerConfigLabel.SerialNumber) == "Default")
             {
                 HttpManager.SerialNumber = HttpManager.JsonData["i"].ToString();
             }
@@ -1139,7 +1139,7 @@ public class Manager : Regist
 
     public static void Download(string id)
     {
-        ResourceManager.SetText("La_Lab", "连接中");
+        ResourceManager.SetText("La_Lab", Language.GetStr("UI", "L_Downloading"));
 
         ResourceManager.SetActive("La_Lab", true);
         ResourceManager.SetActive("La_Mask", true);
@@ -1159,13 +1159,13 @@ public class Manager : Regist
 
             ConfigManager.PlayerDoc.LoadXml(jsonData["l"].ToString());
 
-            ConfigManager.PlayerNode = ConfigManager.PlayerDoc.SelectSingleNode("PlayerConfig");
+            ConfigManager.PlayerNode = ConfigManager.PlayerDoc.SelectSingleNode(PlayerConfigLabel.RootNode);
 
 
-            ResourceManager.SetText("L_UserLab", ConfigManager.GetPlayerString("ID"));
+            ResourceManager.SetText("L_UserLab", ConfigManager.GetPlayerString(PlayerConfigLabel.ID));
 
-            HttpManager.ID = ConfigManager.GetPlayerString("ID");
-            HttpManager.SerialNumber = ConfigManager.GetPlayerString("SerialNumber");
+            HttpManager.ID = ConfigManager.GetPlayerString(PlayerConfigLabel.ID);
+            HttpManager.SerialNumber = ConfigManager.GetPlayerString(PlayerConfigLabel.SerialNumber);
 
 
             Bubble.Show(null, Language.GetStr("UI", "La_Lab0"), null, null, () => { Application.Quit(); }, null, false);
@@ -1226,7 +1226,7 @@ public class Manager : Regist
             }
             else
             {
-                if (TutorialManager.TutorialA)
+                if (TutorialManager.NewplayerTutorial)
                 {
                     return;
                 }

+ 197 - 181
Assets/Script/Manage/MiniGameManager.cs

@@ -12,7 +12,7 @@ using Random = UnityEngine.Random;
 
 public class Award
 {
-    #region 变量
+    #region Config
 
     public static int BonusCoin;
     public static int BonusDiamond;
@@ -149,7 +149,7 @@ public class Award
 
         #region Flower
 
-        if (TutorialManager.TutorialA)
+        if (TutorialManager.NewplayerTutorial)
         {
             FlowerFlag = true;
 
@@ -335,7 +335,7 @@ public class Award
             );
         }
 
-        if (TutorialManager.TutorialA)
+        if (TutorialManager.NewplayerTutorial)
         {
             tween = ResourceManager.Get("Da_GetAward").GetTweenCG();
 
@@ -595,7 +595,7 @@ public class Award
 
 public class MiniGameManager : Regist 
 {
-    #region 变量
+    #region Config
 
     public static int Score
     {
@@ -702,21 +702,22 @@ public class MiniGameManager : Regist
     public static Image TimerBk;
     public static Award Award;
 
-    public static Transform D_Grid;
-    public static Transform D_Timer;
-    public static Transform D_Begin;
-    public static Transform D_Status1;
-    public static Transform D_Status2;
-    public static Transform D_Status3;
-    public static Transform D_Operate1;
-    public static Transform D_Operate2;
-    public static Transform D_Operate3;
-    public static Transform CorrectBtnC;
-
+    public static Transform Grid;
+    public static Transform Timer;
+    public static Transform Begin;
+    public static Transform PunchGameStatus;
+    public static Transform MemoryGameStatus;
+    public static Transform FindGameStatus;
+    public static Transform PunchGameOperate;
+    public static Transform MemoryGameOperate;
+    public static Transform FindGameOperate;
+    public static Transform FindGameCorrectBtn;
+
+    public static int MaxFadeAmt = 6;
     public static List<int> IndexList = new List<int>();
-    public static List<int> FlowerIDListC = new List<int>();
+    public static List<int> FindGameFlowerIDs = new List<int>();
     public static List<Drop> DropList = new List<Drop>();
-    public static List<Flower> OpList = new List<Flower>();
+    public static List<Flower> OperateList = new List<Flower>();
     public static List<Flower> IdleList = new List<Flower>();
     public static List<Flower> FadeList = new List<Flower>();
     public static Dictionary<int, Flower> FlowerDic = new Dictionary<int, Flower>();
@@ -724,9 +725,9 @@ public class MiniGameManager : Regist
     public static int MiniGameIndex;
     public static string ScoreLab;
 
-    public static bool GameA;
-    public static bool GameB;
-    public static bool GameC;
+    public static bool PunchGame;
+    public static bool MemoryGame;
+    public static bool FindGame;
     public static bool Prepare;
     public static bool FlowerLock;
     public static bool TutorialLock = true;
@@ -739,10 +740,14 @@ public class MiniGameManager : Regist
     public static float PrepareTimer;
     public static float DiamondTimer;
 
+    public static float MinMinigameCD = 180;
+    public static float MaxMinigameCD = 300;
+
     public static float OpTime = 1.5f;
     public static float FadeTime = 2f;
     public static float GameTime = 45f;
     public static float PanaltyTime = 1f;
+    private static float PrepareTime = 3;
     public static float NewOpTime;
     public static float NewFadeTime;
 
@@ -757,11 +762,11 @@ public class MiniGameManager : Regist
 
         if (Game)
         {
-            GameThreadA();
+            PunchGameThread();
 
-            GameThreadB();
+            MemoryGameThread();
 
-            GameThreadC();
+            FindGameThread();
         }
 
         if (Prepare)
@@ -771,9 +776,10 @@ public class MiniGameManager : Regist
     }
 
 
-    private void GameThreadA()
+    private float OperateDecreaseRate = 0.03f;
+    private void PunchGameThread()
     {
-        if (!GameA)
+        if (!PunchGame)
         {
             return;
         }
@@ -803,7 +809,7 @@ public class MiniGameManager : Regist
 
             if (OpTimer <= 0)
             {
-                NewOpTime -= NewOpTime * 0.03f;
+                NewOpTime -= NewOpTime * OperateDecreaseRate;
 
                 OpTimer = NewOpTime;
 
@@ -814,9 +820,9 @@ public class MiniGameManager : Regist
         BonusThread();
     }
 
-    private void GameThreadB()
+    private void MemoryGameThread()
     {
-        if (!GameB)
+        if (!MemoryGame)
         {
             return;
         }
@@ -840,7 +846,7 @@ public class MiniGameManager : Regist
             }
         }
         
-        if (FadeList.Count < 6)
+        if (FadeList.Count < MaxFadeAmt)
         {
             FadeTimer -= Time.deltaTime;
             
@@ -855,9 +861,9 @@ public class MiniGameManager : Regist
         BonusThread();
     }
 
-    private void GameThreadC()
+    private void FindGameThread()
     {
-        if (!GameC)
+        if (!FindGame)
         {
             return;
         }
@@ -884,13 +890,15 @@ public class MiniGameManager : Regist
         BonusThread();
     }
 
+    private static int DropGoldMinTime = 3;
+    private static int DropGoldMaxTime = 6;
     private void BonusThread()
     {
         GoldTimer -= Time.deltaTime;
 
         if (GoldTimer < 0)
         {
-            GoldTimer = Random.Range(3f, 6f);
+            GoldTimer = Random.Range(DropGoldMinTime, DropGoldMaxTime);
 
             DropList.Add(ResourceManager.GetDrop(ObjType.DropGold));
         }
@@ -930,16 +938,16 @@ public class MiniGameManager : Regist
 
     public override void RegistReference()
     {
-        D_Grid = ResourceManager.Get("D_Grid");
-        D_Begin = ResourceManager.Get("D_Begin");
-        D_Timer = ResourceManager.Get("D_Timer");
+        Grid = ResourceManager.Get("D_Grid");
+        Begin = ResourceManager.Get("D_Begin");
+        Timer = ResourceManager.Get("D_Timer");
 
-        D_Status1 = ResourceManager.Get("D_Status1");
-        D_Status2 = ResourceManager.Get("D_Status2");
-        D_Status3 = ResourceManager.Get("D_Status3");
-        D_Operate1 = ResourceManager.Get("D_Operate1");
-        D_Operate2 = ResourceManager.Get("D_Operate2");
-        D_Operate3 = ResourceManager.Get("D_Operate3");
+        PunchGameStatus = ResourceManager.Get("D_Status1");
+        MemoryGameStatus = ResourceManager.Get("D_Status2");
+        FindGameStatus = ResourceManager.Get("D_Status3");
+        PunchGameOperate = ResourceManager.Get("D_Operate1");
+        MemoryGameOperate = ResourceManager.Get("D_Operate2");
+        FindGameOperate = ResourceManager.Get("D_Operate3");
 
         TimerLab = ResourceManager.Get<Text>("D_TimerLab");
         PrepareLab = ResourceManager.Get<Text>("D_PrepareLab");
@@ -948,7 +956,7 @@ public class MiniGameManager : Regist
     }
 
 
-    public static void OperateC(int id, int btnIndex)
+    public static void OperateFindGame(int id, int btnIndex)
     {
         if (!Game)
         {
@@ -960,7 +968,7 @@ public class MiniGameManager : Regist
             return;
         }
 
-        if (FlowerIDListC[0] == id)
+        if (FindGameFlowerIDs[0] == id)
         {
             Flower flower = IdleList.Find(tempFlower => { return tempFlower.ID == id; });
 
@@ -972,7 +980,7 @@ public class MiniGameManager : Regist
 
             AudioManager.PlayClip(Clip.BtnClip);
 
-            RoundEndC();
+            FindGameRoundEnd();
         }
         else
         {
@@ -987,7 +995,8 @@ public class MiniGameManager : Regist
         }
     }
 
-    public static void OperateB(int index, int slotIndex)
+    private static bool PlayingNewflowerEffect;
+    public static void OperateMemoryGame(int index, int slotIndex)
     {
         if (Panalty || !FadeList.Valid())
         {
@@ -1002,7 +1011,7 @@ public class MiniGameManager : Regist
 
         if (slotIndex == IndexList[0])
         {
-            int uiIndex = IndexMap(IndexList[0]);
+            int uiIndex = MemoryGameIndexMap(IndexList[0]);
 
             ResourceManager.Get<Image>("D_FlowerBtn" + uiIndex).material = Lib.GrayMat;
 
@@ -1024,9 +1033,10 @@ public class MiniGameManager : Regist
             flower.PlayFlashLight();
 
 
-            if (!Award.FlowerLock && Award.FlowerID == flower.ID)
+            if (!Award.FlowerLock && Award.FlowerID == flower.ID && !PlayingNewflowerEffect)
             {
                 flower.PlayNewFlowerEffec();
+                PlayingNewflowerEffect = true;
             }
 
 
@@ -1041,9 +1051,9 @@ public class MiniGameManager : Regist
                     EventType.BackwardFinish,
                     () =>
                     {
-                        RoundEndB();
-                        RoundResetB();
-                        RoundBeginB();
+                        MemoryGameRoundEnd();
+                        MemoryGameRoundReset();
+                        MemoryGameRoundBegin();
                     }
                 );
             }
@@ -1061,27 +1071,27 @@ public class MiniGameManager : Regist
         }
     }
 
-    public static void OperateA(OpType opType)
+    public static void OperatePunchGame(OpType opType)
     {
-        if (Panalty || !OpList.Valid())
+        if (Panalty || !OperateList.Valid())
         {
             return;
         }
 
-        if (OpList[0].Operate(opType))
+        if (OperateList[0].Operate(opType))
         {
-            IdleList.Add(OpList[0]);
+            IdleList.Add(OperateList[0]);
 
-            OpList.Remove(OpList[0]);
+            OperateList.Remove(OperateList[0]);
 
-            if (OpList.Count >= 2)
+            if (OperateList.Count >= 2)
             {
-                OpList[0].SetFirstOp();
-                OpList[1].SetSecondOp();
+                OperateList[0].SetFirstOp();
+                OperateList[1].SetSecondOp();
             }
-            else if (OpList.Count >= 1)
+            else if (OperateList.Count >= 1)
             {
-                OpList[0].SetFirstOp();
+                OperateList[0].SetFirstOp();
             }
         }
         else
@@ -1126,20 +1136,20 @@ public class MiniGameManager : Regist
     {
         AudioManager.PlayClip(Clip.BubbleClip);
 
-        if (TutorialManager.TutorialA && TutorialLock)
+        if (TutorialManager.NewplayerTutorial && TutorialLock)
         {
             Pause = true;
             TutorialLock = false;
 
             Flower flower = IdleList[4];
-            flower.CreateOp(OpList.Count, OpType.Water);
+            flower.CreateOp(OperateList.Count, OpType.Water);
 
-            OpList.Add(flower);
+            OperateList.Add(flower);
             IdleList.Remove(flower);
 
             Tutorial.HightScreen(ResourceManager.Get("D_WaterArrow0"), ResourceManager.Get("D_WaterArrow1"), ResourceManager.Get("D_Water1"));
 
-            Tutorial.SetArea(OpList[0].OperateIcon.transform, 0.1f, 0.125f);
+            Tutorial.SetArea(OperateList[0].OperateIcon.transform, 0.1f, 0.125f);
 
             ResourceManager.AddButtonEventOnetime
             (
@@ -1156,9 +1166,9 @@ public class MiniGameManager : Regist
         {
             Flower flower = IdleList[Random.Range(0, IdleList.Count)];
 
-            flower.CreateOp(OpList.Count);
+            flower.CreateOp(OperateList.Count);
 
-            OpList.Add(flower);
+            OperateList.Add(flower);
             IdleList.Remove(flower);
         }
     }
@@ -1177,12 +1187,13 @@ public class MiniGameManager : Regist
                 flower.PlayFlashLight();
 
                 flower.StopNewFlowerEffec();
+                PlayingNewflowerEffect = false;
 
                 flower.FlowerIcon.TweenForSr();
 
-                if (FadeList.Count == 6)
+                if (FadeList.Count == MaxFadeAmt)
                 {
-                    RoundBeginB();
+                    MemoryGameRoundBegin();
                 }
 
                 break;
@@ -1192,80 +1203,80 @@ public class MiniGameManager : Regist
 
     public static void InitializeMode()
     {
-        GameA = false;
-        GameB = false;
-        GameC = false;
+        PunchGame = false;
+        MemoryGame = false;
+        FindGame = false;
 
-        D_Operate1.SetActive(false);
-        D_Operate2.SetActive(false);
-        D_Operate3.SetActive(false);
+        PunchGameOperate.SetActive(false);
+        MemoryGameOperate.SetActive(false);
+        FindGameOperate.SetActive(false);
 
-        bool gameAvailibleB = Manager.Level >= 18;
-        bool gameAvailibleC = GardenManager.MyFlower >= 2 && Manager.Level >= 22;
+        bool memoryGameAvailable = Manager.Level >= TutorialManager.MemoryMinigameTutorialLevel;
+        bool findGameAvailable = GardenManager.MyFlower >= TutorialManager.MinFlowerForFindGame && Manager.Level >= TutorialManager.FindMinigameTutorialLevel;
 
-        float thresholdA;
-        float thresholdB;
-        float thresholdC;
+        float punchGameThreshold;
+        float memoryGameThreshold;
+        float findGameThreshold;
 
-        if (gameAvailibleB && gameAvailibleC)
+        if (memoryGameAvailable && findGameAvailable)
         {
-            thresholdA = 0.33f;
-            thresholdB = 0.66f;
-            thresholdC = 1f;
+            punchGameThreshold = 0.33f;
+            memoryGameThreshold = 0.66f;
+            findGameThreshold = 1f;
         }
-        else if (gameAvailibleB)
+        else if (memoryGameAvailable)
         {
-            thresholdA = 0.5f;
-            thresholdB = 1;
-            thresholdC = 0;
+            punchGameThreshold = 0.5f;
+            memoryGameThreshold = 1;
+            findGameThreshold = 0;
         }
-        else if (gameAvailibleC)
+        else if (findGameAvailable)
         {
-            thresholdA = 0.5f;
-            thresholdB = 0;
-            thresholdC = 1;
+            punchGameThreshold = 0.5f;
+            memoryGameThreshold = 0;
+            findGameThreshold = 1;
         }
         else
         {
-            thresholdA = 1;
-            thresholdB = 0;
-            thresholdC = 0;
+            punchGameThreshold = 1;
+            memoryGameThreshold = 0;
+            findGameThreshold = 0;
         }
 
         float posibility = Random.Range(0f, 1f);
 
-        if (posibility <= thresholdA)
+        if (posibility <= punchGameThreshold)
         {
-            GameA = true;
+            PunchGame = true;
         }
-        else if (posibility <= thresholdB)
+        else if (posibility <= memoryGameThreshold)
         {
-            GameB = true;
+            MemoryGame = true;
         }
-        else if (posibility <= thresholdC)
+        else if (posibility <= findGameThreshold)
         {
-            GameC = true;
+            FindGame = true;
         }
 
-        if (TutorialManager.TutorialB)
+        if (TutorialManager.MemoryMinigameTutorial)
         {
-            GameA = false;
-            GameB = true;
-            GameC = false;
+            PunchGame = false;
+            MemoryGame = true;
+            FindGame = false;
         }
 
-        if (TutorialManager.TutorialE)
+        if (TutorialManager.FindMinigameTutorial)
         {
-            GameA = false;
-            GameB = false;
-            GameC = true;
+            PunchGame = false;
+            MemoryGame = false;
+            FindGame = true;
         }
     }
 
 
     public static void SetNewFlowerStatus()
     {
-        bool newFlowerFlag = ConfigManager.GetPlayerBool("NewFlowerFlag");
+        bool newFlowerFlag = ConfigManager.GetPlayerBool(PlayerConfigLabel.NewFlowerFlag);
 
         if (newFlowerFlag)
         {
@@ -1289,11 +1300,11 @@ public class MiniGameManager : Regist
 
         if (Random.Range(0, 1f) <= flowerRate)
         {
-            ConfigManager.SavePlayerBool("NewFlowerFlag", true);
+            ConfigManager.SavePlayerBool(PlayerConfigLabel.NewFlowerFlag, true);
         }
         else
         {
-            ConfigManager.SavePlayerBool("NewFlowerFlag", false);
+            ConfigManager.SavePlayerBool(PlayerConfigLabel.NewFlowerFlag, false);
         }
     }
 
@@ -1306,7 +1317,7 @@ public class MiniGameManager : Regist
         {
             Manager.MiniLock = false;
 
-            Manager.MiniTimer = Mathf.Lerp(180, 300, Random.Range(0, 1f));
+            Manager.MiniTimer = Mathf.Lerp(MinMinigameCD, MaxMinigameCD, Random.Range(0, 1f));
 
             ResetNewFlowerStatus();
         }
@@ -1327,9 +1338,9 @@ public class MiniGameManager : Regist
         Prepare = false;
         GameTimer = GameTime;
 
-        for (int i = 0; i < OpList.Count; i++)
+        for (int i = 0; i < OperateList.Count; i++)
         {
-            OpList[i].GameOver();
+            OperateList[i].GameOver();
         }
 
         for (int i = 0; i < IdleList.Count; i++)
@@ -1360,7 +1371,7 @@ public class MiniGameManager : Regist
 
     public static void GameEnter()
     {
-        if (TutorialManager.TutorialA)
+        if (TutorialManager.NewplayerTutorial)
         {
             Award.FlowerID = 1;
             Award.FlowerLock = true;
@@ -1379,24 +1390,24 @@ public class MiniGameManager : Regist
 
         SetNewFlowerStatus();
 
-        if (TutorialManager.TutorialB)
+        if (TutorialManager.MemoryMinigameTutorial)
         {
             InitializeMode();
         }
 
-        if (GameA)
+        if (PunchGame)
         {
-            GameEnterA();
+            EnterPunchGame();
         }
 
-        if (GameB)
+        if (MemoryGame)
         {
-            GameEnterB();
+            EnterMemoryGame();
         }
 
-        if (GameC)
+        if (FindGame)
         {
-            GameEnterC();
+            EnterFindGame();
         }
 
         ScoreLab = Language.GetStr("UI", "D_ScoreLab");
@@ -1407,14 +1418,14 @@ public class MiniGameManager : Regist
         ResourceManager.Get("C_MiniGame").TweenBacCG();
     }
 
-    public static void GameEnterA()
+    public static void EnterPunchGame()
     {
-        D_Operate1.SetActive(true);
+        PunchGameOperate.SetActive(true);
 
-        D_Timer.SetParent(D_Status1);
+        Timer.SetParent(PunchGameStatus);
 
-        D_Grid.SetParent(D_Status1);
-        D_Begin.SetParent(D_Operate1);
+        Grid.SetParent(PunchGameStatus);
+        Begin.SetParent(PunchGameOperate);
 
         PrepareLab.SetParent(ResourceManager.Get("D_PrepareLayout1"));
 
@@ -1477,14 +1488,14 @@ public class MiniGameManager : Regist
         }
     }
 
-    public static void GameEnterB()
+    public static void EnterMemoryGame()
     {
-        D_Operate2.SetActive(true);
+        MemoryGameOperate.SetActive(true);
 
-        D_Timer.SetParent(D_Status2);
+        Timer.SetParent(MemoryGameStatus);
 
-        D_Grid.SetParent(D_Status2);
-        D_Begin.SetParent(D_Operate2);
+        Grid.SetParent(MemoryGameStatus);
+        Begin.SetParent(MemoryGameOperate);
 
         PrepareLab.SetParent(ResourceManager.Get("D_PrepareLayout2"));
 
@@ -1568,9 +1579,9 @@ public class MiniGameManager : Regist
         }
     }
 
-    public static void GameEnterC()
+    public static void EnterFindGame()
     {
-        D_Operate3.SetActive(true);
+        FindGameOperate.SetActive(true);
 
         ResourceManager.SetActive("D_Begin", true);
         ResourceManager.SetActive("D_DescC", true);
@@ -1579,15 +1590,19 @@ public class MiniGameManager : Regist
         ResourceManager.SetActive("D_FlowerBtn8", false);
         ResourceManager.SetActive("D_FlowerBtn9", false);
 
-        D_Begin.SetParent(D_Operate3);
-        D_Timer.SetParent(D_Status3);
-        D_Grid.SetParent(D_Status3);
+        Begin.SetParent(FindGameOperate);
+        Timer.SetParent(FindGameStatus);
+        Grid.SetParent(FindGameStatus);
 
         PrepareLab.SetParent(ResourceManager.Get("D_PrepareLayout3"));
 
-        RoundResetC(true);
+        FindGameRoundReset(true);
     }
 
+    private static int DropDiamondMinIndex = 5; 
+    private static int DropDiamondMaxIndex = 9; 
+    private static float DropDiamondRate = 0.01f;
+    private static float DropDiamondOffsetTime = 5;
     public static void GameBegin()
     {
         ConfigManager.SavePlayerBool("NewFlowerFlag", false);
@@ -1599,15 +1614,15 @@ public class MiniGameManager : Regist
 
         OpTimer = OpTime;
         FadeTimer = FadeTime;
-        GoldTimer = Random.Range(3f, 6f);
+        GoldTimer = Random.Range(DropGoldMinTime, DropGoldMaxTime);
         GameTimer = 0;
         NewOpTime = OpTime;
         NewFadeTime = FadeTime;
-        DiamondTimer = Random.Range(0f, GameTime - 5);
+        DiamondTimer = Random.Range(0f, GameTime - DropDiamondOffsetTime);
 
         StaticsManager.GetInstance().UseItem(StaticsManager.ItemID.开始小游戏, StaticsManager.ItemType.小游戏, "1", StaticsManager.ConsumeModule.None);
 
-        if (GameA)
+        if (PunchGame)
         {
             for (int i = 0; i < IdleList.Count; i++)
             {
@@ -1615,17 +1630,17 @@ public class MiniGameManager : Regist
             }
         }
 
-        if (GameB)
+        if (MemoryGame)
         {
-            RoundResetB();
+            MemoryGameRoundReset();
         }
 
-        if (GameC)
+        if (FindGame)
         {
-            RoundBeginC(true);
+            FindGameRoundBegin(true);
         }
 
-        if (Random.Range(5, 9) <= MiniGameIndex)
+        if (Random.Range(DropDiamondMinIndex, DropDiamondMaxIndex) <= MiniGameIndex)
         {
             MiniGameIndex = 0;
 
@@ -1633,7 +1648,7 @@ public class MiniGameManager : Regist
         }
         else
         {
-            if (Random.Range(0, 1f) <= 0.01f)
+            if (Random.Range(0, 1f) <= DropDiamondRate)
             {
                 DropDiamond = true;
             }
@@ -1647,21 +1662,21 @@ public class MiniGameManager : Regist
     public static void GamePrepare()
     {
         Prepare = true;
-        PrepareTimer = 3;
+        PrepareTimer = PrepareTime;
 
         ResourceManager.Get("D_Begin").SetActive(false);
         ResourceManager.Get("D_DescA").SetActive(false);
         ResourceManager.Get("D_DescB").SetActive(false);
         ResourceManager.Get("D_DescC").SetActive(false);
 
-        if (GameA)
+        if (PunchGame)
         {
             ResourceManager.Get("D_Rip1").SetActive(true);
             ResourceManager.Get("D_Water1").SetActive(true);
             ResourceManager.Get("D_Fertilize1").SetActive(true);
         }
 
-        if (GameB)
+        if (MemoryGame)
         {
             ResourceManager.Get("D_Mask").TweenForGra();
 
@@ -1684,12 +1699,13 @@ public class MiniGameManager : Regist
     }
 
 
-    public static void RoundEndB()
+    public static void MemoryGameRoundEnd()
     {
         ResourceManager.Get("D_Mask").TweenForGra();
     }
 
-    public static void RoundResetB()
+    private static float MemoryGameDecreaseRate = 0.3f;
+    public static void MemoryGameRoundReset()
     {
         for (int i = 0; i < FadeList.Count; i++)
         {
@@ -1697,7 +1713,7 @@ public class MiniGameManager : Regist
         }
 
 
-        NewFadeTime -= NewFadeTime * 0.3f;
+        NewFadeTime -= NewFadeTime * MemoryGameDecreaseRate;
 
         FadeTimer = NewFadeTime;
 
@@ -1718,18 +1734,18 @@ public class MiniGameManager : Regist
         ResetOprerate();
     }
 
-    public static void RoundBeginB()
+    public static void MemoryGameRoundBegin()
     {
         ResourceManager.Get("D_Mask").TweenBacGra();
 
-        if (TutorialManager.TutorialB)
+        if (TutorialManager.MemoryMinigameTutorial)
         {
-            TutorialManager.EnterB1();
+            TutorialManager.ShowFirstCorrectButton();
         }
     }
 
 
-    public static void RoundEndC()
+    public static void FindGameRoundEnd()
     {
         if (IdleList[0].ID == Award.FlowerID)
         {
@@ -1752,22 +1768,22 @@ public class MiniGameManager : Regist
             {
                 if (Game)
                 {
-                    RoundResetC();
+                    FindGameRoundReset();
 
-                    RoundBeginC();
+                    FindGameRoundBegin();
                 }
             },
             1.5f
         );
     }
 
-    public static void RoundResetC(bool firstRound = false)
+    public static void FindGameRoundReset(bool firstRound = false)
     {
         ExtList.ForEach(IdleList, flower => { flower.FlowerIcon.SetAlpha(1); flower.FlowerIcon.SetActive(true); flower.Retrieve();});
 
         IdleList = new List<Flower>();
 
-        FlowerIDListC = new List<int>();
+        FindGameFlowerIDs = new List<int>();
 
         List<int> slotList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
@@ -1783,24 +1799,24 @@ public class MiniGameManager : Regist
             flowerInfo = GardenManager.FlowerInfoDic.Random(false, flowerIndo => { return flowerIndo.Unlock; });
         }
 
-        FlowerIDListC.Add(flowerInfo.ID_);
+        FindGameFlowerIDs.Add(flowerInfo.ID_);
 
         IdleList.Add(ResourceManager.GetFlower(flowerInfo, ResourceManager.Get("SlotMini" + slotList.Random(1, true, true)[0])));
 
         while (slotList.Count > 0)
         {
-            flowerInfo = GardenManager.FlowerInfoDic.Random(false, info => { return info.Unlock && info.ID_ != FlowerIDListC[0]; });
+            flowerInfo = GardenManager.FlowerInfoDic.Random(false, info => { return info.Unlock && info.ID_ != FindGameFlowerIDs[0]; });
 
             if (slotList.Count == 1)
             {
-                if (!FlowerIDListC.Contains(flowerInfo.ID_))
+                if (!FindGameFlowerIDs.Contains(flowerInfo.ID_))
                 {
                     continue;
                 }
             }
             else
             {
-                FlowerIDListC.UniqueAdd(flowerInfo.ID_);
+                FindGameFlowerIDs.UniqueAdd(flowerInfo.ID_);
             }
 
             int amt = Mathf.Min(Random.Range(2, 9), slotList.Count);
@@ -1821,20 +1837,20 @@ public class MiniGameManager : Regist
 
         List<int> idList = new List<int>()
         {
-            FlowerIDListC[0],
+            FindGameFlowerIDs[0],
         };
 
-        if (FlowerIDListC.Count == 2)
+        if (FindGameFlowerIDs.Count == 2)
         {
-            idList.Add(FlowerIDListC[1]);
-            idList.Add(FlowerIDListC[1]);
+            idList.Add(FindGameFlowerIDs[1]);
+            idList.Add(FindGameFlowerIDs[1]);
 
             idList.RemoveAt(0);
-            idList.Insert(Random.Range(0, 3), FlowerIDListC[0]);
+            idList.Insert(Random.Range(0, 3), FindGameFlowerIDs[0]);
         }
-        else if (FlowerIDListC.Count > 2)
+        else if (FindGameFlowerIDs.Count > 2)
         {
-            idList.AddRange(FlowerIDListC.Random(2, true, false, id => { return id != idList[0]; }));
+            idList.AddRange(FindGameFlowerIDs.Random(2, true, false, id => { return id != idList[0]; }));
 
             idList = idList.Disturb();
         }
@@ -1853,20 +1869,20 @@ public class MiniGameManager : Regist
             int id = idList[i];
             int index = i;
 
-            if (firstRound && TutorialManager.TutorialE && id == FlowerIDListC[0])
+            if (firstRound && TutorialManager.FindMinigameTutorial && id == FindGameFlowerIDs[0])
             {
-                CorrectBtnC = ResourceManager.Get("D_FlowerBtn" + (7 + i));
+                FindGameCorrectBtn = ResourceManager.Get("D_FlowerBtn" + (7 + i));
 
-                ResourceManager.SetButtonEvent("D_FlowerBtn" + (7 + i), () => { OperateC(id, (7 + index)); TutorialManager.EndE(); });
+                ResourceManager.SetButtonEvent("D_FlowerBtn" + (7 + i), () => { OperateFindGame(id, (7 + index)); TutorialManager.EndClickCorrectButton(); });
             }
             else
             {
-                ResourceManager.SetButtonEvent("D_FlowerBtn" + (7 + i), () => { OperateC(id, (7 + index)); });
+                ResourceManager.SetButtonEvent("D_FlowerBtn" + (7 + i), () => { OperateFindGame(id, (7 + index)); });
             }
         }
     }
 
-    public static void RoundBeginC(bool firstRound = false)
+    public static void FindGameRoundBegin(bool firstRound = false)
     {
         if (firstRound && !Award.FlowerLock)
         {
@@ -1882,14 +1898,14 @@ public class MiniGameManager : Regist
             IdleList[i].FlowerIcon.TweenBacSr();
         }
 
-        if (firstRound && TutorialManager.TutorialE)
+        if (firstRound && TutorialManager.FindMinigameTutorial)
         {
-            TutorialManager.EnterE2(CorrectBtnC.GetChild(1), CorrectBtnC);
+            TutorialManager.ShowCorrectButton(FindGameCorrectBtn.GetChild(1), FindGameCorrectBtn);
         }
     }
 
 
-    public static int IndexMap(int slotIndex)
+    public static int MemoryGameIndexMap(int slotIndex)
     {
         if (slotIndex == 1)
         {
@@ -1926,7 +1942,7 @@ public class MiniGameManager : Regist
     {
         if (!pause)
         {
-            if (!TutorialManager.TutorialA)
+            if (!TutorialManager.NewplayerTutorial)
             {
                 if (Game || Prepare)
                 {

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

@@ -23,9 +23,9 @@ public class NickNameManager : Regist
 
     public override void FirstInit()
 	{
-		SetNickName (ConfigManager.GetPlayerString ("NickName"));
+		SetNickName (ConfigManager.GetPlayerString (PlayerConfigLabel.NickName));
 		inputField = ResourceManager.Get<InputField> ("T_InputField");
-	    string defaultNames = ResourceManager.Load<TextAsset>("DefaultNickName", Folder.Config).text;
+	    string defaultNames = ResourceManager.Load<TextAsset>(ResourceLabel.DefaultNickName, Folder.Config).text;
 	    string[] names = defaultNames.Split('\n');
         FirstNames = names[0].Split('|')[1].Split(',').ToList();
 	    LastNames = names[1].Split('|')[1].Split(',').ToList();
@@ -71,7 +71,7 @@ public class NickNameManager : Regist
 
 	    ResourceManager.SetText("T_Tit", Language.GetStr("UI", "T_Tit"));
 
-	    if (!TutorialManager.TutorialPlazaRoom && !TutorialManager.TutorialC && !TutorialManager.TutorialD)
+	    if (!TutorialManager.PlazaRoomTutorial && !TutorialManager.VisitTutorial && !TutorialManager.DressroomTutorial)
 	    {
             ResourceManager.Get("C_Main").TweenBacCG();
         }
@@ -136,7 +136,7 @@ public class NickNameManager : Regist
     public static void SetNickName(string nickName)
 	{
 		NickName = nickName;
-		ConfigManager.SavePlayerString ("NickName", nickName);
+		ConfigManager.SavePlayerString (PlayerConfigLabel.NickName, nickName);
 
 		ResourceManager.SetText ("C_NickNameLab", nickName);
 	}
@@ -149,11 +149,11 @@ public class NickNameManager : Regist
 
         for (int i = 0; i < inputField.text.Length; i++)
         {
-            if (inputField.text[i] <= 127)
+            if (inputField.text[i] <= 127)//英文字符
             {
                 charCnt++;
             }
-            else if (inputField.text[i] > 127)
+            else if (inputField.text[i] > 127)//中文字符
             {
                 charCnt += 2;
             }

+ 10 - 43
Assets/Script/Manage/PlayerManager.cs

@@ -20,7 +20,7 @@ using Transform = UnityEngine.Transform;
 
 public class PlayerManager : Regist 
 {
-    #region 变量
+    #region Config
 
     public static bool Complete;
     public static Transform SeleTra;
@@ -48,16 +48,16 @@ public class PlayerManager : Regist
         if (!Complete)
         {
             Initializer.DebugLab.text = "error : mp0-1";
-            UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>("stand_ske", Folder.Config));
+            UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(ResourceLabel.StandSke, Folder.Config));
 
             Initializer.DebugLab.text = "error : mp0-2";
-            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>("stand_tex", Folder.Config), "stand_texture");
+            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex, Folder.Config), ResourceLabel.StandTexture);
 
             Complete = true;
         }
 
         Initializer.DebugLab.text = "error : mp1";
-        if (!TutorialManager.TutorialA || TutorialManager.TutorialIndexA != 1)
+        if (!TutorialManager.NewplayerTutorial || TutorialManager.NewplayerTutorialIndex != 1)
         {
             GetPlayer();
 
@@ -65,9 +65,9 @@ public class PlayerManager : Regist
         }
         else
         {
-            PlayerPink = ResourceManager.Get("Player", Folder.Scene, false, ResourceManager.Get("PlayerPos3"), false, ObjType.Player);
-            PlayerBlond = ResourceManager.Get("Player", Folder.Scene, false, ResourceManager.Get("PlayerPos2"), false, ObjType.Player);
-            PlayerBrown = ResourceManager.Get("Player", Folder.Scene, false, ResourceManager.Get("PlayerPos1"), false, ObjType.Player);
+            PlayerPink = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get("PlayerPos3"), false, ObjType.Player);
+            PlayerBlond = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get("PlayerPos2"), false, ObjType.Player);
+            PlayerBrown = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get("PlayerPos1"), false, ObjType.Player);
 
             if (PlayerPink.GetComponent<Player>() == null)
             {
@@ -105,7 +105,7 @@ public class PlayerManager : Regist
 
 
         Initializer.DebugLab.text = "error : mp3";
-        DressRoom = ResourceManager.Get("DressRoom", Folder.Scene, true, null, true, ObjType.DressRoom);
+        DressRoom = ResourceManager.Get(ResourceLabel.DressRoom, Folder.Scene, true, null, true, ObjType.DressRoom);
         DressRoom.SetActive(false);
         DontDestroyOnLoad(DressRoom);
 
@@ -125,45 +125,12 @@ public class PlayerManager : Regist
     {
         Instance = this;
 
-        ResourceManager.Get("DressRoom").CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get(ResourceLabel.DressRoom).CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
     }
 
 
     public static void InitializeDressRoom()
     {
-//        if (Initializer.Instance.DebugMode)
-//        {
-//#if UNITY_EDITOR
-
-//            string assetPath = AssetDatabase.GetAssetPath(ManaReso.Load<Texture2D>("stand_texture", Folder.Scene));
-
-//            Object[] objects = AssetDatabase.LoadAllAssetsAtPath(assetPath);
-
-//            for (int i = 0; i < objects.Length; i++)
-//            {
-//                Sprite sprite = objects[i] as Sprite;
-
-//                if (sprite != null)
-//                {
-//                    CloseSpriteDic.Add(sprite.name, sprite);
-//                }
-//            }
-
-//#endif
-//        }
-//        else
-//        {
-//            Object[] objects = Bundle.Scene.LoadAssetWithSubAssets("stand_texture", typeof(Sprite));
-
-//            for (int i = 0; i < objects.Length; i++)
-//            {
-//                Sprite sprite = (Sprite)objects[i];
-
-//                CloseSpriteDic.Add(sprite.name, sprite);
-//            }
-//        }
-
-
         List<XmlAttributeCollection> attributeList = ConfigManager.GetDressRoomConfig();
 
         for (int i = 1; i < attributeList.Count; i++)
@@ -193,7 +160,7 @@ public class PlayerManager : Regist
         }
 
 
-        Transform tra = ResourceManager.Get("Player", Folder.Scene, false, transform, false, ObjType.Player);
+        Transform tra = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, transform, false, ObjType.Player);
         tra.SetParent(ResourceManager.Get("GardenNormal"));
 
         Player = tra.GetComponent<Player>();

+ 11 - 11
Assets/Script/Manage/PlazaRoomManager.cs

@@ -99,27 +99,27 @@ public class PlazaRoomManager : Regist
 
     public static void DownloadRoomData()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new LanStr("UI", "Loading"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new MulLanStr("UI", "Loading"));
         ResourceManager.Get("Z_Tip").TweenForCG();
         DownloadLock = true;
         SFSManager.GardenSmartFox.ExecuteAfterCheckConection
         (
             () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomData(LastIndex),
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get("Z_Tip").TweenBacCG(); }); } },
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get("Z_Tip").TweenBacCG(); }); } }
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new MulLanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get("Z_Tip").TweenBacCG(); }); } },
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new MulLanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get("Z_Tip").TweenBacCG(); }); } }
          );
     }
 
     public static void DownloadCustomRoomData()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new LanStr("UI", "Loading"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new MulLanStr("UI", "Loading"));
         ResourceManager.Get("Z_Tip").TweenForCG();
         DownloadLock = true;
         SFSManager.GardenSmartFox.ExecuteAfterCheckConection
         (
             () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetCustomRoomData(CustomLastIndex, long.Parse(HttpManager.SerialNumber)),
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get("Z_Tip").TweenBacCG(); }); } },
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new LanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get("Z_Tip").TweenBacCG(); }); } }
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new MulLanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get("Z_Tip").TweenBacCG(); }); } },
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new MulLanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get("Z_Tip").TweenBacCG(); }); } }
         );
     }
 
@@ -142,7 +142,7 @@ public class PlazaRoomManager : Regist
             return;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new LanStr("UI", "LoadSucceed"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new MulLanStr("UI", "LoadSucceed"));
         DelayCall.Call(0.5f, () => { ResourceManager.Get("Z_Tip").TweenBacCG(); });
 
         if (sfsArray.Count == 0)
@@ -181,7 +181,7 @@ public class PlazaRoomManager : Regist
             return;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new LanStr("UI", "LoadSucceed"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_Tip"), new MulLanStr("UI", "LoadSucceed"));
         DelayCall.Call(0.5f, () => { ResourceManager.Get("Z_Tip").TweenBacCG(); });
 
         if (sfsArray.Count == 0)
@@ -417,7 +417,7 @@ public class PlazaRoomManager : Regist
             return;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>("AA_Tip"), new LanStr("UI", "AA_SendRequest"));
+        LanguageManager.Add(ResourceManager.Get<Text>("AA_Tip"), new MulLanStr("UI", "AA_SendRequest"));
         ResourceManager.Get("AA_Tip").TweenForCG();
         ResourceManager.Get<CanvasGroup>("AA_CreatePlazaRoom").interactable = false;
 
@@ -427,7 +427,7 @@ public class PlazaRoomManager : Regist
 
     public static void OnCreateRoomError()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>("AA_Tip"), new LanStr("UI", "AA_CreateError"));
+        LanguageManager.Add(ResourceManager.Get<Text>("AA_Tip"), new MulLanStr("UI", "AA_CreateError"));
         ResourceManager.Get("AA_Tip").TweenBacCG();
         ResourceManager.Get<CanvasGroup>("AA_CreatePlazaRoom").interactable = true;
 
@@ -457,7 +457,7 @@ public class PlazaRoomManager : Regist
 
         Manager.CreateRoomAmt++;
 
-        LanguageManager.Add(ResourceManager.Get<Text>("AA_Tip"), new LanStr("UI", "AA_CreateSucceed"));
+        LanguageManager.Add(ResourceManager.Get<Text>("AA_Tip"), new MulLanStr("UI", "AA_CreateSucceed"));
         ResourceManager.Get("AA_Tip").TweenBacCG();
         ResourceManager.Get<CanvasGroup>("AA_CreatePlazaRoom").interactable = true;
         DownloadRoomData();

+ 21 - 21
Assets/Script/Manage/ResourceManager.cs

@@ -89,7 +89,7 @@ public class AsyncRequest
 
 public class ResourceManager : Regist
 {
-    #region 变量
+    #region Config
 
     public static bool AsyncLoadLock;
     public static bool AsyncInstantiateLock;
@@ -124,7 +124,7 @@ public class ResourceManager : Regist
 
         Instance = this;
 
-        Transform objPool = new GameObject("ObjPool").transform;
+        Transform objPool = new GameObject(ResourceLabel.ObjPool).transform;
 
         objPool.parent = transform;
         objPool.SetActive(false);
@@ -261,7 +261,7 @@ public class ResourceManager : Regist
 
             traList.Add(go.transform);
 
-            go.transform.SetParent(Get("ObjPool"));
+            go.transform.SetParent(Get(ResourceLabel.ObjPool));
         }
         else
         {
@@ -593,7 +593,7 @@ public class ResourceManager : Regist
 
         //pos.z = -0.35f + Random.Range(-0.01f, 0.01f);
 
-        Transform tra = Get("Star", Folder.Scene, false, null, pos, ObjType.Star);
+        Transform tra = Get(ResourceLabel.Star, Folder.Scene, false, null, pos, ObjType.Star);
 
         Star star = tra.GetComponent<Star>();
 
@@ -616,7 +616,7 @@ public class ResourceManager : Regist
 
     public static ADChest GetADChest()
     {
-        Transform tra = Get("ADChest", Folder.Scene, false, Get("GardenPage"), true, ObjType.ADChest);
+        Transform tra = Get(ResourceLabel.ADChest, Folder.Scene, false, Get("GardenPage"), true, ObjType.ADChest);
 
         ADChest chest = tra.GetComponentInChildren<ADChest>(true);
 
@@ -636,7 +636,7 @@ public class ResourceManager : Regist
 
     public static PlazaRoomChest GetPlazaRoomChest(Vector3 position)
     {
-        Transform tra = Get("PlazaRoomChest", Folder.Scene, false, Get("PlazaRoom"), position, ObjType.PlazaRoomChest);
+        Transform tra = Get(ResourceLabel.PlazaRoomChest, Folder.Scene, false, Get("PlazaRoom"), position, ObjType.PlazaRoomChest);
 
         PlazaRoomChest chest = tra.GetComponentInChildren<PlazaRoomChest>(true);
 
@@ -655,7 +655,7 @@ public class ResourceManager : Regist
         Vector3 leftPos = Get("MiniLeft").position;
         Vector3 rightPos;
 
-        if (MiniGameManager.GameA || MiniGameManager.GameC)
+        if (MiniGameManager.PunchGame || MiniGameManager.FindGame)
         {
             rightPos = Get("MiniRight1").position;
         }
@@ -670,11 +670,11 @@ public class ResourceManager : Regist
 
         if (objType == ObjType.DropGold)
         {
-            tra = Get(objType.ToString(), Folder.Scene, false, null, pos, objType, typeof(DropGold));
+            tra = Get(ResourceLabel.DropGold, Folder.Scene, false, null, pos, objType, typeof(DropGold));
         }
         else if(objType == ObjType.DropDiamond)
         {
-            tra = Get(objType.ToString(), Folder.Scene, false, null, pos, objType, typeof(DropDiamond));
+            tra = Get(ResourceLabel.DropDiamond, Folder.Scene, false, null, pos, objType, typeof(DropDiamond));
         }
         else
         {
@@ -692,7 +692,7 @@ public class ResourceManager : Regist
 
     public static Flower GetFlower(FlowerInfo flowerInfo, Slot slot, bool collider)
     {
-        Transform tra = Get("Flower", Folder.Scene, false, slot.transform, false, ObjType.Flower, typeof(Flower));
+        Transform tra = Get(ResourceLabel.Flower, Folder.Scene, false, slot.transform, false, ObjType.Flower, typeof(Flower));
 
         tra.localScale = new Vector3(1, 1, 1);
 
@@ -714,7 +714,7 @@ public class ResourceManager : Regist
 
     public static Flower GetFlower(FlowerInfo flowerInfo, Transform par)
     {
-        Transform tra = Get("Flower", Folder.Scene, false, par, false, ObjType.Flower, typeof(Flower));
+        Transform tra = Get(ResourceLabel.Flower, Folder.Scene, false, par, false, ObjType.Flower, typeof(Flower));
 
         tra.localScale = new Vector3(1, 1, 1);
 
@@ -763,7 +763,7 @@ public class ResourceManager : Regist
             pos = posTra.position;
         }
 
-        Transform tra = Get("HudText", Folder.UI, false, parTra, pos, ObjType.HudText, typeof(HudText));
+        Transform tra = Get(ResourceLabel.HudText, Folder.UI, false, parTra, pos, ObjType.HudText, typeof(HudText));
 
         HudText hudText = tra.GetComponent<HudText>();
 
@@ -775,7 +775,7 @@ public class ResourceManager : Regist
 
     public static Ranktem GetRanktem(string rank, string praise, string serialNumber)
     {
-        Transform tra = Get("RankItem", Folder.UI, false, Get("S_Grid"), false, ObjType.RankItem, typeof(Ranktem));
+        Transform tra = Get(ResourceLabel.RankItem, Folder.UI, false, Get("S_Grid"), false, ObjType.RankItem, typeof(Ranktem));
 
         Ranktem ranktem = tra.GetComponent<Ranktem>();
 
@@ -788,7 +788,7 @@ public class ResourceManager : Regist
 
     public static CommentItem GetCommentItem(string nickname, string serialNumber, string content)
     {
-        Transform tra = Get("CommentItem", Folder.UI, false, Get("Q_Grid"), false, ObjType.CommentItem, typeof(CommentItem));
+        Transform tra = Get(ResourceLabel.CommentItem, Folder.UI, false, Get("Q_Grid"), false, ObjType.CommentItem, typeof(CommentItem));
 
         CommentItem commentItem = tra.GetComponent<CommentItem>();
 
@@ -852,19 +852,19 @@ public class ResourceManager : Regist
 
         if (skillRoot.SkillTab == SkillTab.Elf)
         {
-            tra = Get("SkillItem", Folder.UI, false, Get("Fd_Grid"), false, ObjType.SkillItem);
+            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get("Fd_Grid"), false, ObjType.SkillItem);
         }
         else if (skillRoot.SkillTab == SkillTab.Store)
         {
-            tra = Get("SkillItem", Folder.UI, false, Get("Fc_Grid"), false, ObjType.SkillItem);
+            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get("Fc_Grid"), false, ObjType.SkillItem);
         }
         else if (skillRoot.SkillTab == SkillTab.Magic)
         {
-            tra = Get("SkillItem", Folder.UI, false, Get("Fb_Grid"), false, ObjType.SkillItem);
+            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get("Fb_Grid"), false, ObjType.SkillItem);
         }
         else if (skillRoot.SkillTab == SkillTab.Garden)
         {
-            tra = Get("SkillItem", Folder.UI, false, Get("Fa_Grid"), false, ObjType.SkillItem);
+            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get("Fa_Grid"), false, ObjType.SkillItem);
         }
         else
         {
@@ -878,7 +878,7 @@ public class ResourceManager : Regist
 
     public static Transform GetAchieveItem()
     {
-        Transform tra = Get("AchieveItem", Folder.UI, false, ResourceManager.Get("M_Grid"), false, ObjType.AchieveItem);
+        Transform tra = Get(ResourceLabel.AchieveItem, Folder.UI, false, ResourceManager.Get("M_Grid"), false, ObjType.AchieveItem);
 
         return tra;
     }
@@ -886,7 +886,7 @@ public class ResourceManager : Regist
 
     public static ParticleSystem GetFirework(Vector3 pos)
     {
-        Transform tra = Get("Firework", Folder.Effect, false, null, pos, ObjType.Firework, typeof(Effect));
+        Transform tra = Get(ResourceLabel.Firework, Folder.Effect, false, null, pos, ObjType.Firework, typeof(Effect));
 
         ParticleSystem particle = tra.GetComponent<ParticleSystem>();
 
@@ -897,7 +897,7 @@ public class ResourceManager : Regist
 
     public static ParticleSystem GetLightwall()
     {
-        Transform tra = Get("LightwallUI", Folder.Effect, false, Get("Canvas"), false, ObjType.LightwallUI, typeof(Effect));
+        Transform tra = Get(ResourceLabel.LightwallUI, Folder.Effect, false, Get("Canvas"), false, ObjType.LightwallUI, typeof(Effect));
 
         ParticleSystem particle = tra.GetComponent<ParticleSystem>();
 

+ 32 - 47
Assets/Script/Manage/SignManager.cs

@@ -11,7 +11,7 @@ using Random = UnityEngine.Random;
 
 public class Sign
 {
-    #region 变量
+    #region Config
 
     public int Coin
     {
@@ -134,7 +134,7 @@ public class Sign
         {
             ResourceManager.SetText("Bb_InfoLabB", Diamond.ToString());
 
-            ResourceManager.SetSprite("Bb_IconB", ResourceManager.LoadSprite("钻石", Folder.UI));
+            ResourceManager.SetSprite("Bb_IconB", Lib.DiamondSprite);
 
             ResourceManager.SetActive("Bb_IconB", true);
 
@@ -144,7 +144,7 @@ public class Sign
         {
             ResourceManager.SetText("Bb_InfoLabB", Coin.ToString());
 
-            ResourceManager.SetSprite("Bb_IconB", ResourceManager.LoadSprite("金币", Folder.UI));
+            ResourceManager.SetSprite("Bb_IconB", Lib.GoldSprite);
 
             ResourceManager.SetActive("Bb_IconB", true);
 
@@ -160,7 +160,7 @@ public class Sign
     {
         if (IsLottery)
         {
-            Icon.sprite = ResourceManager.LoadSprite("礼包", Folder.Atlas);
+            Icon.sprite = Lib.PackSprite;
             Icon.Resize(true, 0.3f, 0.3f);
 
             return;
@@ -184,14 +184,14 @@ public class Sign
         
         if (Diamond > 0)
         {
-            Icon.sprite = ResourceManager.LoadSprite("钻石", Folder.UI);
+            Icon.sprite = Lib.DiamondSprite;
             Icon.Resize(false, OriginSize);
 
             Lab1.text = Diamond.ToString();
         }
         else if (Coin > 0)
         {
-            Icon.sprite = ResourceManager.LoadSprite("金币", Folder.UI);
+            Icon.sprite = Lib.GoldSprite;
             Icon.Resize(false, OriginSize);
 
             Lab1.text = Coin.ToString();
@@ -228,7 +228,15 @@ public class Sign
 
 public class Lottery
 {
-    #region Var
+    private enum LotteryType
+    {
+        Coin=1,
+        Diamond=2,
+        Flower=3,
+        Close=4,
+    }
+
+    #region Config
 
     public int PosIndex;
     public int Type;
@@ -291,7 +299,7 @@ public class Lottery
 
         lottery.Value = Random.Range(LeftBorderDList[0][0], RightBorderDList[0][0] + 1);
 
-        if (lottery.Type == 3)
+        if (lottery.Type == LotteryType.Flower.GetHashCode())
         {
             #region
 
@@ -314,7 +322,7 @@ public class Lottery
 
             #endregion
         }
-        else if (lottery.Type == 4)
+        else if (lottery.Type == LotteryType.Close.GetHashCode())
         {
             #region
 
@@ -346,11 +354,11 @@ public class Lottery
 
                 if (closeItem.BuyCurrent == Current.Coin)
                 {
-                    lottery.Type = 1;
+                    lottery.Type = LotteryType.Coin.GetHashCode();
                 }
                 else if (closeItem.BuyCurrent == Current.Diamond)
                 {
-                    lottery.Type = 2;
+                    lottery.Type = LotteryType.Diamond.GetHashCode();
                 }
             }
             else
@@ -392,12 +400,12 @@ public class Lottery
 
         lottery.BK.SetActive(false);
 
-        if (lottery.Type == 1)
+        if (lottery.Type == LotteryType.Coin.GetHashCode())
         {
             lottery.Icon1.SetActive(false);
             lottery.Icon3.SetActive(false);
 
-            lottery.Icon2.sprite = ResourceManager.LoadSprite("金币", Folder.UI);
+            lottery.Icon2.sprite = Lib.GoldSprite;
 
             lottery.Icon2.Resize(true, 1, 1);
 
@@ -407,12 +415,12 @@ public class Lottery
 
             lottery.Lab.text = lottery.Value.ToString();
         }
-        else if (lottery.Type == 2)
+        else if (lottery.Type == LotteryType.Diamond.GetHashCode())
         {
             lottery.Icon1.SetActive(false);
             lottery.Icon3.SetActive(false);
 
-            lottery.Icon2.sprite = ResourceManager.LoadSprite("钻石", Folder.UI);
+            lottery.Icon2.sprite = Lib.DiamondSprite;
 
             lottery.Icon2.Resize(true, 1, 1);
 
@@ -422,7 +430,7 @@ public class Lottery
 
             lottery.Lab.text = lottery.Value.ToString();
         }
-        else if (lottery.Type == 3)
+        else if (lottery.Type == LotteryType.Flower.GetHashCode())
         {
             lottery.Icon1.SetActive(false);
             lottery.Icon3.SetActive(false);
@@ -435,7 +443,7 @@ public class Lottery
 
             lottery.Lab.SetActive(false);
         }
-        else if (lottery.Type == 4)
+        else if (lottery.Type == LotteryType.Close.GetHashCode())
         {
             CloseItem closeItem = PlayerManager.CloseItemDic[lottery.Value];
 
@@ -444,29 +452,6 @@ public class Lottery
             closeItem.SetUpUI(newSize, new Vector2(), lottery.Icon1, lottery.Icon3, lottery.Icon2);
 
             lottery.Lab.SetActive(false);
-
-            //lottery.Icon2.sprite = closeUnit.Sprites[0];
-
-            //lottery.Icon2.Resize(true, newSize, newSize);
-
-            //lottery.Icon2.transform.localPosition = new Vector2(0, closeUnit.IconOffset);
-
-            //lottery.Lab.SetActive(false);
-
-            //if (closeUnit.Sprites.Length > 1)
-            //{
-            //    lottery.Icon1.SetActive(true);
-
-            //    lottery.Icon1.sprite = closeUnit.Sprites[1];
-
-            //    lottery.Icon1.Resize(true, newSize, newSize);
-
-            //    lottery.Icon1.transform.localPosition = new Vector2(0, closeUnit.IconOffset) + closeUnit.IconOffset1*newSize;
-            //}
-            //else
-            //{
-            //    lottery.Icon1.SetActive(false);
-            //}
         }
 
         lottery.Button.onClick = new Button.ButtonClickedEvent();
@@ -671,7 +656,7 @@ public class SignManager : Regist
 
     public static bool ShowOfflinePanel()
     {
-        if (TutorialManager.TutorialA)
+        if (TutorialManager.NewplayerTutorial)
         {
             return false;
         }
@@ -760,11 +745,11 @@ public class SignManager : Regist
 
     public static bool ShowNotification()
     {
-        if (HttpManager.NotificationIndex > ConfigManager.GetPlayerInt("NotificationIndex") && HttpManager.NotificationReady)
+        if (HttpManager.NotificationIndex > ConfigManager.GetPlayerInt(PlayerConfigLabel.NotificationIndex) && HttpManager.NotificationReady)
         {
             ResourceManager.Get("B_SignIn").TweenBacCG();
 
-            ConfigManager.SavePlayerInt("NotificationIndex", HttpManager.NotificationIndex);
+            ConfigManager.SavePlayerInt(PlayerConfigLabel.NotificationIndex, HttpManager.NotificationIndex);
 
             AnnounceManager.Show();
 
@@ -787,10 +772,10 @@ public class SignManager : Regist
 
     public override void SecondInit()
     {
-        SignTime = DateTime.Parse(ConfigManager.GetPlayerString("SignTime"));
+        SignTime = DateTime.Parse(ConfigManager.GetPlayerString(PlayerConfigLabel.SignTime));
 
-        SignIndex = ConfigManager.GetPlayerInt("SignIndex");
-        SignRound = ConfigManager.GetPlayerInt("SignRound");
+        SignIndex = ConfigManager.GetPlayerInt(PlayerConfigLabel.SignIndex);
+        SignRound = ConfigManager.GetPlayerInt(PlayerConfigLabel.SignRound);
 
         Transform par = ResourceManager.Get("Bb_Grid");
 
@@ -798,7 +783,7 @@ public class SignManager : Regist
 
         for (int i = 0; i < attributeList.Count; i++)
         {
-            Transform tra = ResourceManager.Get("SignItem", Folder.UI, false, par, false, ObjType.SignItem);
+            Transform tra = ResourceManager.Get(ResourceLabel.SignItem, Folder.UI, false, par, false, ObjType.SignItem);
 
             SignDic.Add(i + 1, new Sign(i + 1, tra, attributeList[i]));
         }

+ 19 - 32
Assets/Script/Manage/SocialManager.cs

@@ -13,7 +13,7 @@ using Debug = UnityEngine.Debug;
 
 public class SocialManager : Regist
 {
-    #region Variable
+    #region Config
 
     public static bool RankRecordFlag;
 
@@ -70,26 +70,10 @@ public class SocialManager : Regist
             return;
         }
 
-        //CommentTimer += Time.deltaTime;
-
-        //if (CommentTimer >= CommentTimespan)
-        //{
-        //    CommentTimer = 0;
-
-        //    if (!IsPanelOpen)
-        //    {
-        //        UpdatePage(true);
-        //    }
-        //}
-
         PraiseTimer += Time.deltaTime;
 
         if (PraiseTimer >= PraiseTime)
         {
-            //index += 1;
-            //Debug.Log(index);
-            //ManaServer.AddComment(ManaServer.SerialNumber, ManaServer.SerialNumber, index.ToString(), CommentType.Garden);
-
             PraiseTimer = 0;
 
             PraiseText.text = HttpManager.PraiseAmt.ToString();
@@ -178,6 +162,8 @@ public class SocialManager : Regist
     }
 
 
+    private static int MaxChildAmt = 20;
+    private static float ItemHeight = 120;
     public static void NextPage(bool isPlayer, bool isDownload)
     {
         //Debug.Log("NextPage");
@@ -188,7 +174,7 @@ public class SocialManager : Regist
 
             for (int i = 0; i < updateAmt; i++)
             {
-                if (ScrollRectPlus.content.childCount >= 20)
+                if (ScrollRectPlus.content.childCount >= MaxChildAmt)
                 {
                     saveAmt++;
                     ResourceManager.Save(ScrollRectPlus.content.GetChild(0).gameObject);
@@ -206,8 +192,8 @@ public class SocialManager : Regist
 
             if (saveAmt > 0)
             {
-                ScrollRectPlus.content.position += new Vector3(0, -(saveAmt - offset)*120*scaleFactor, 0);
-                ScrollRectPlus.AddContentOffset(new Vector3(0, -(saveAmt - offset)*120*scaleFactor, 0));
+                ScrollRectPlus.content.position += new Vector3(0, -(saveAmt - offset)*ItemHeight*scaleFactor, 0);
+                ScrollRectPlus.AddContentOffset(new Vector3(0, -(saveAmt - offset)* ItemHeight * scaleFactor, 0));
             }
         }
         else
@@ -217,7 +203,7 @@ public class SocialManager : Regist
 
             for (int i = 0; i < updateAmt; i++)
             {
-                if (ScrollRectPlus.content.childCount >= 20)
+                if (ScrollRectPlus.content.childCount >= MaxChildAmt)
                 {
                     saveAmt++;
                     ResourceManager.Save(ScrollRectPlus.content.GetChild(0).gameObject);
@@ -235,12 +221,13 @@ public class SocialManager : Regist
 
             if (saveAmt > 0)
             {
-                ScrollRectPlus.content.position += new Vector3(0, -(saveAmt - offset)*120*scaleFactor, 0);
-                ScrollRectPlus.AddContentOffset(new Vector3(0, -(saveAmt - offset)*120*scaleFactor, 0));
+                ScrollRectPlus.content.position += new Vector3(0, -(saveAmt - offset)* ItemHeight * scaleFactor, 0);
+                ScrollRectPlus.AddContentOffset(new Vector3(0, -(saveAmt - offset)* ItemHeight * scaleFactor, 0));
             }
         }
     }
 
+    private static int MaxRevertAmt = 15;
     public static void PreviousPage(bool isPlayer)
     {
         if (ScrollRectPlus.content.childCount == 0)
@@ -252,9 +239,9 @@ public class SocialManager : Regist
 
         if (isPlayer)
         {
-            if (PlayerCommentDatas.Count > 20 && PlayerFirstIndex > 0)
+            if (PlayerCommentDatas.Count > MaxChildAmt && PlayerFirstIndex > 0)
             {
-                int revertAmt = Mathf.Min(15, PlayerFirstIndex);
+                int revertAmt = Mathf.Min(MaxRevertAmt, PlayerFirstIndex);
 
                 for (int i = 0; i < revertAmt; i++)
                 {
@@ -270,16 +257,16 @@ public class SocialManager : Regist
 
                 if (revertAmt > 0)
                 {
-                    ScrollRectPlus.content.position += new Vector3(0, revertAmt*120, 0);
-                    ScrollRectPlus.AddContentOffset(new Vector3(0, revertAmt*120, 0));
+                    ScrollRectPlus.content.position += new Vector3(0, revertAmt* ItemHeight, 0);
+                    ScrollRectPlus.AddContentOffset(new Vector3(0, revertAmt* ItemHeight, 0));
                 }
             }
         }
         else
         {
-            if (VisiteeCommentDatas.Count > 20 && VisiteeFirstIndex > 0)
+            if (VisiteeCommentDatas.Count > MaxChildAmt && VisiteeFirstIndex > 0)
             {
-                int revertAmt = Mathf.Min(15, VisiteeFirstIndex);
+                int revertAmt = Mathf.Min(MaxRevertAmt, VisiteeFirstIndex);
 
                 for (int i = 0; i < revertAmt; i++)
                 {
@@ -295,8 +282,8 @@ public class SocialManager : Regist
 
                 if (revertAmt > 0)
                 {
-                    ScrollRectPlus.content.position += new Vector3(0, revertAmt*120, 0);
-                    ScrollRectPlus.AddContentOffset(new Vector3(0, revertAmt*120, 0));
+                    ScrollRectPlus.content.position += new Vector3(0, revertAmt* ItemHeight, 0);
+                    ScrollRectPlus.AddContentOffset(new Vector3(0, revertAmt* ItemHeight, 0));
                 }
             }
         }
@@ -612,7 +599,7 @@ public class SocialManager : Regist
                     throw new Exception("Crush");
                 }
 
-                if (ScrollRectPlus.content.childCount >= 20)
+                if (ScrollRectPlus.content.childCount >= MaxChildAmt)
                 {
                     ResourceManager.Save(ScrollRectPlus.content.GetChild(0).gameObject);
                     PlayerFirstIndex++;

+ 145 - 144
Assets/Script/Manage/TutorialManager.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 
 public class TutorialManager : Regist
 {
-    #region 变量
+    #region Config
 
     public static bool PayExempt
     {
@@ -64,39 +64,40 @@ public class TutorialManager : Regist
     public static int PayExemptAmt;
     public static int ConnectExemptAmt;
 
-    public static int A1_1Idx = 7;
-
-    public static bool TutorialA;
-    public static bool TutorialB;
-    public static bool TutorialC;
-    public static bool TutorialD;
-    public static bool TutorialE;
-    public static bool TutorialPlazaRoom;
-    public static bool TutorialB_;
-    public static bool TutorialC_;
-    public static bool TutorialD_;
-    public static bool TutorialE_;
-    public static bool TutorialPlazaRoom_;
-
-    public static int TutorialIndexA;
-    public static int TutorialIndexB;
-    public static int TutorialIndexC;
-    public static int TutorialIndexD;
-    public static int TutorialIndexE;
-    public static int TutorialIndexPlazaRoom;
+    public static int MemoryMinigameTutorialLevel = 18;
+    public static int VisitTutorialLevel = 8;
+    public static int DressroomTutorialLevel = 13;
+    public static int FindMinigameTutorialLevel = 22;
+    public static int PlazaRoomTutorialLevel = 28;
+    public static int SetNicknameTutorialIndex = 7;
+    public static int MinFlowerForFindGame = 2;
+
+    public static bool NewplayerTutorial;
+    public static bool MemoryMinigameTutorial;
+    public static bool VisitTutorial;
+    public static bool DressroomTutorial;
+    public static bool FindMinigameTutorial;
+    public static bool PlazaRoomTutorial;
+    public static bool memoryMinigameTutorial;
+    public static bool visitTutorial;
+    public static bool dressroomTutorial;
+    public static bool findMinigameTutorial;
+    public static bool plazaRoomTutorial;
+
+    public static int NewplayerTutorialIndex;
+    public static int MemoryMinigameTutorialIndex;
+    public static int VisitTutorialIndex;
+    public static int DressroomTutorialIndex;
+    public static int FindMinigameTutorialIndex;
+    public static int PlazaRoomTutorialIndex;
 
     #endregion
 
-    public void Update()
-    {
-
-    }
-
     public override void InstantiatePrefabs()
     {
-        if (TutorialA)
+        if (NewplayerTutorial)
         {
-            ResourceManager.Get("Tutorial", Folder.Scene, true, transform, false, ObjType.Tutorial).AddScript<Tutorial>();
+            ResourceManager.Get(ResourceLabel.Tutorial, Folder.Scene, true, transform, false, ObjType.Tutorial).AddScript<Tutorial>();
         }
     }
 
@@ -107,7 +108,7 @@ public class TutorialManager : Regist
         Tutorial.Arrow = ResourceManager.Get("N_Arrow");
         Tutorial.Material = ResourceManager.Get<Image>("N_Mask").material;
 
-        if (TutorialA)
+        if (NewplayerTutorial)
         {
             ResourceManager.Get("TutorialMask").AddScript<SceneMask>();
 
@@ -118,21 +119,21 @@ public class TutorialManager : Regist
             ResourceManager.Get("TutorialMask").CreateTweenSr(0, 180 / 255f, 0.25f, true, true, Curve.EaseOutQuad);
 
 
-            if (TutorialIndexA == 1)
+            if (NewplayerTutorialIndex == 1)
             {
                 ResourceManager.Get("C_MiniGame").TweenBacCG();
 
-                EnterA1();
+                ChoseCharacter();
             }
-            else if (TutorialIndexA == A1_1Idx)
+            else if (NewplayerTutorialIndex == SetNicknameTutorialIndex)
             {
-                EnterA1_1();
+                SetNickname();
             }
-            else if (TutorialIndexA == 2)
+            else if (NewplayerTutorialIndex == 2)
             {
-                EnterA2();
+                ClickEnterMinigame();
             }
-            else if (TutorialIndexA == 4)
+            else if (NewplayerTutorialIndex == 4)
             {
                 ResourceManager.Get("C_MiniGame").TweenBacCG();
 
@@ -149,20 +150,20 @@ public class TutorialManager : Regist
 
                 Tutorial.HightScene(0.1f, 0.075f, tra.FindChild("SlotArrow"), tra);
             }
-            else if (TutorialIndexA == 6)
+            else if (NewplayerTutorialIndex == 6)
             {
                 ResourceManager.Get("C_MiniGame").TweenBacCG();
 
                 Garden.Instance.TutorialToRegular();
                 UIManager.Instance.TutorialToRegular();
 
-                EnterA6();
+                ClickManagePanel();
             }
         }
     }
 
 
-    public static void EndA1()
+    public static void EndChoseCharacter()
     {
         StaticsManager.GetInstance().TutoComplete("A1");
 
@@ -170,10 +171,10 @@ public class TutorialManager : Regist
         Destroy(ResourceManager.Get("PlayerBk2").gameObject);
         Destroy(ResourceManager.Get("PlayerBk3").gameObject);
 
-        EnterA1_1();
+        SetNickname();
     }
 
-    public static void EndA1_1()
+    public static void EndSetNickname()
     {
         NickNameManager.CloseNickNameSettingPanel();
 
@@ -190,19 +191,19 @@ public class TutorialManager : Regist
         //    0.25f
         //);
 
-        EnterA2();
+        ClickEnterMinigame();
     }
 
-    public static void EndA2()
+    public static void EndClickEnterMinigame()
     {
         StaticsManager.GetInstance().TutoComplete("A2");
 
         Tutorial.HightDisable();
 
-        EnterA3();
+        PlayPunchMinigame();
     }
 
-    public static void EndA3()
+    public static void EndPlayPunchMinigame()
     {
         StaticsManager.GetInstance().TutoComplete("A3");
 
@@ -210,62 +211,62 @@ public class TutorialManager : Regist
 
         ResourceManager.SetActive("D_Quit", true);
 
-        EnterA4();
+        ClickSlot();
     }
 
-    public static void EndA4()
+    public static void EndClickSlot()
     {
         StaticsManager.GetInstance().TutoComplete("A4");
 
         Tutorial.HightDisable();
 
-        EnterA5();
+        PlantFlower();
     }
 
-    public static void EndA5()
+    public static void EndPlantFlower()
     {
         StaticsManager.GetInstance().TutoComplete("A5");
 
-        EnterA6();
+        ClickManagePanel();
     }
 
-    public static void EndA6()
+    public static void EndClickManagePanel()
     {
         StaticsManager.GetInstance().TutoComplete("A6");
 
         Tutorial.HightDisable();
 
-        EnterA7();
+        OpenUnlockPanel();
     }
 
-    public static void EndA7()
+    public static void EndOpenUnlockPanel()
     {
         StaticsManager.GetInstance().TutoComplete("A7");
 
         Tutorial.HightDisable(0, true);
 
-        EnterA8();
+        ClickConfirmButton();
     }
 
-    public static void EndA8()
+    public static void EndClickConfirmButton()
     {
         StaticsManager.GetInstance().TutoComplete("A8");
 
         Tutorial.HightDisable(0, true);
 
-        EnterA9();
+        UseBigSkill();
     }
 
-    public static void EndA9()
+    public static void EndUseBigSkill()
     {
         Tutorial.HightDisable(0, false);
     }
 
-    public static void EndA()
+    public static void EndShowTip()
     {
         StaticsManager.GetInstance().TutoComplete("A");
 
-        TutorialA = false;
+        NewplayerTutorial = false;
 
         AudioManager.PlayClip(Clip.CloseClip);
 
@@ -287,9 +288,9 @@ public class TutorialManager : Regist
     }
 
 
-    public static void EnterA1()
+    public static void ChoseCharacter()
     {
-        TutorialIndexA = 1;
+        NewplayerTutorialIndex = 1;
 
         PlayerManager.PlayerPink.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
         PlayerManager.PlayerBlond.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
@@ -422,27 +423,27 @@ public class TutorialManager : Regist
                     EventType.BackwardFinish,
                     () =>
                     {
-                        EndA1();
+                        EndChoseCharacter();
                     }
                 );
             }
         );
     }
 
-    public static void EnterA1_1()
+    public static void SetNickname()
     {
-        TutorialIndexA = A1_1Idx;
+        NewplayerTutorialIndex = SetNicknameTutorialIndex;
 
         //ManaReso.SetActive("T_Close", false);
 
         NickNameManager.ShowNickNameSettingPanelFirstTime();
 
-        NickNameManager.OnSetNickNameSucceed = EndA1_1;
+        NickNameManager.OnSetNickNameSucceed = EndSetNickname;
     }
 
-    public static void EnterA2()
+    public static void ClickEnterMinigame()
     {
-        TutorialIndexA = 2;
+        NewplayerTutorialIndex = 2;
 
         Garden.Instance.TutorialToRegular();
         UIManager.Instance.TutorialToRegular();
@@ -473,12 +474,12 @@ public class TutorialManager : Regist
             "C_MiniGame",
             () =>
             {
-                EndA2();
+                EndClickEnterMinigame();
             }
         );
     }
 
-    public static void EnterA3()
+    public static void PlayPunchMinigame()
     {
         ResourceManager.Get("Tutorial").SetCollider(false);
 
@@ -510,16 +511,16 @@ public class TutorialManager : Regist
             "Da_GetAward",
             () =>
             {
-                EndA3();
+                EndPlayPunchMinigame();
 
                 ResourceManager.Get("C_MiniGame").TweenBacCG();
             }
         );
     }
 
-    public static void EnterA4()
+    public static void ClickSlot()
     {
-        TutorialIndexA = 4;
+        NewplayerTutorialIndex = 4;
 
         TweenRoot tween = ResourceManager.Get("D_MiniGame").GetTweenCG();
 
@@ -542,7 +543,7 @@ public class TutorialManager : Regist
         );
     }
 
-    public static void EnterA5()
+    public static void PlantFlower()
     {
         TweenRoot tween = ResourceManager.Get("G_Flower").TweenForCG();
 
@@ -616,14 +617,14 @@ public class TutorialManager : Regist
             EventType.BackwardFinish,
             () =>
             {
-                EndA5();
+                EndPlantFlower();
             }
         );
     }
 
-    public static void EnterA6()
+    public static void ClickManagePanel()
     {
-        TutorialIndexA = 6;
+        NewplayerTutorialIndex = 6;
 
         ResourceManager.SetActive("C_Coin", true);
         ResourceManager.SetActive("C_Group1", true);
@@ -646,12 +647,12 @@ public class TutorialManager : Regist
             "C_Manage",
             () =>
             {
-                EndA6();
+                EndClickManagePanel();
             }
         );
     }
 
-    public static void EnterA7()
+    public static void OpenUnlockPanel()
     {
         TweenRoot tween = ResourceManager.Get("F_Manage0").GetTweenVec();
 
@@ -697,14 +698,14 @@ public class TutorialManager : Regist
                     {
                         ResourceManager.Get("Fe_Info").TweenBacCG();
 
-                        EndA7();
+                        EndOpenUnlockPanel();
                     }
                 );
             }
         );
     }
 
-    public static void EnterA8()
+    public static void ClickConfirmButton()
     {
         TweenRoot tween = ResourceManager.Get("Fe_Info").GetTweenCG();
 
@@ -748,14 +749,14 @@ public class TutorialManager : Regist
                     () =>
                     {
                         ResourceManager.Get("Fe_Info").TweenBacCG();
-                        EndA8();
+                        EndClickConfirmButton();
                     }
                 );
             }
         );
     }
 
-    public static void EnterA9()
+    public static void UseBigSkill()
     {
         TweenRoot tween = ResourceManager.Get("Fe_Info").GetTweenCG();
 
@@ -776,13 +777,13 @@ public class TutorialManager : Regist
             "F_SkillBk11",
             () =>
             {
-                EndA9();
-                EnterA10();
+                EndUseBigSkill();
+                ShowTip();
             }
         );
     }
 
-    public static void EnterA10()
+    public static void ShowTip()
     {
         ResourceManager.Get("N_Mask").TweenForGra();
 
@@ -790,7 +791,7 @@ public class TutorialManager : Regist
         ResourceManager.SetText("F_Tip", Language.GetStr("UI", "F_Tip"));
 
         ResourceManager.SetActive("F_TipBtn", true);
-        ResourceManager.AddButtonEventOnetime("F_TipBtn", () => EndA());
+        ResourceManager.AddButtonEventOnetime("F_TipBtn", () => EndShowTip());
 
         ResourceManager.Get<ContentSizeFitter>("F_TipBK").SetLayoutVertical();
         ResourceManager.Get<ContentSizeFitter>("F_TipBK").SetLayoutHorizontal();
@@ -803,13 +804,13 @@ public class TutorialManager : Regist
     }
 
 
-    public static void EndC()
+    public static void EndClickVisitBtn()
     {
         StaticsManager.GetInstance().TutoComplete("C");
 
         Tutorial.HightDisable();
 
-        TutorialC = false;
+        VisitTutorial = false;
 
         ResourceManager.SetActive("N_Tutorial", false);
 
@@ -818,10 +819,10 @@ public class TutorialManager : Regist
     }
 
 
-    public static void EnterC1()
+    public static void ClickVisitBtn()
     {
-        TutorialC = true;
-        TutorialC_ = false;
+        VisitTutorial = true;
+        visitTutorial = false;
 
         UIManager.BlockOfflinePanel();
 
@@ -908,7 +909,7 @@ public class TutorialManager : Regist
                             "C_Visit",
                             () =>
                             {
-                                EndC();
+                                EndClickVisitBtn();
                             }
                         );
                     }
@@ -918,56 +919,56 @@ public class TutorialManager : Regist
     }
 
 
-    public static void EndB1()
+    public static void EndShowFirstCorrectButton()
     {
         StaticsManager.GetInstance().TutoComplete("B1");
 
         Tutorial.HightDisable(0, false);
     }
 
-    public static void EndB2()
+    public static void EndShowSecondCorrectButton()
     {
         StaticsManager.GetInstance().TutoComplete("B2");
 
         Tutorial.HightDisable(0, false);
     }
 
-    public static void EndB3()
+    public static void EndShowThirdCorrectButton()
     {
         StaticsManager.GetInstance().TutoComplete("B3");
 
         Tutorial.HightDisable(0, false);
     }
 
-    public static void EndB4()
+    public static void EndShowFourthCorrectButton()
     {
         StaticsManager.GetInstance().TutoComplete("B4");
 
         Tutorial.HightDisable(0, false);
     }
 
-    public static void EndB5()
+    public static void EndShowFifthCorrectButton()
     {
         StaticsManager.GetInstance().TutoComplete("B5");
 
         Tutorial.HightDisable(0, false);
     }
 
-    public static void EndB()
+    public static void EndShowSixthCorrectButton()
     {
         StaticsManager.GetInstance().TutoComplete("B");
 
         Tutorial.HightDisable();
 
-        TutorialB = false;
+        MemoryMinigameTutorial = false;
 
         MiniGameManager.Pause = false;
     }
 
 
-    public static void EnterB1()
+    public static void ShowFirstCorrectButton()
     {
-        TutorialB_ = false;
+        memoryMinigameTutorial = false;
 
         ResourceManager.Get("N_Mask").TweenForGra();
 
@@ -976,7 +977,7 @@ public class TutorialManager : Regist
 
         MiniGameManager.Pause = true;
 
-        int index = MiniGameManager.IndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
 
         Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
 
@@ -985,15 +986,15 @@ public class TutorialManager : Regist
                 "D_FlowerBtn" + index,
                 () =>
                 {
-                    EndB1();
-                    EnterB2();
+                    EndShowFirstCorrectButton();
+                    ShowSecondCorrectButton();
                 }
             );
     }
 
-    public static void EnterB2()
+    public static void ShowSecondCorrectButton()
     {
-        int index = MiniGameManager.IndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
 
         Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
 
@@ -1002,15 +1003,15 @@ public class TutorialManager : Regist
                 "D_FlowerBtn" + index,
                 () =>
                 {
-                    EndB2();
-                    EnterB3();
+                    EndShowSecondCorrectButton();
+                    ShowThirdCorrectButton();
                 }
             );
     }
 
-    public static void EnterB3()
+    public static void ShowThirdCorrectButton()
     {
-        int index = MiniGameManager.IndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
 
         Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
 
@@ -1019,15 +1020,15 @@ public class TutorialManager : Regist
                 "D_FlowerBtn" + index,
                 () =>
                 {
-                    EndB3();
-                    EnterB4();
+                    EndShowThirdCorrectButton();
+                    ShowFourthCorrectButton();
                 }
             );
     }
 
-    public static void EnterB4()
+    public static void ShowFourthCorrectButton()
     {
-        int index = MiniGameManager.IndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
 
         Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
 
@@ -1036,15 +1037,15 @@ public class TutorialManager : Regist
                 "D_FlowerBtn" + index,
                 () =>
                 {
-                    EndB4();
-                    EnterB5();
+                    EndShowFourthCorrectButton();
+                    ShowFifthCorrectButton();
                 }
             );
     }
 
-    public static void EnterB5()
+    public static void ShowFifthCorrectButton()
     {
-        int index = MiniGameManager.IndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
 
         Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
 
@@ -1053,15 +1054,15 @@ public class TutorialManager : Regist
                 "D_FlowerBtn" + index,
                 () =>
                 {
-                    EndB5();
-                    EnterB6();
+                    EndShowFifthCorrectButton();
+                    ShowSixthCorrectButton();
                 }
             );
     }
 
-    public static void EnterB6()
+    public static void ShowSixthCorrectButton()
     {
-        int index = MiniGameManager.IndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
 
         Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
 
@@ -1070,17 +1071,17 @@ public class TutorialManager : Regist
                 "D_FlowerBtn" + index,
                 () =>
                 {
-                    EndB();
+                    EndShowSixthCorrectButton();
                 }
             );
     }
 
 
-    public static void EndD()
+    public static void EndClickDressroomButton()
     {
         StaticsManager.GetInstance().TutoComplete("D");
 
-        TutorialD = false;
+        DressroomTutorial = false;
 
         ResourceManager.Get("C_Main2").TweenForCG();
 
@@ -1121,10 +1122,10 @@ public class TutorialManager : Regist
         );
     }
 
-    public static void EnterD1()
+    public static void ClickDressroomButton()
     {
-        TutorialD = true;
-        TutorialD_ = false;
+        DressroomTutorial = true;
+        dressroomTutorial = false;
 
         UIManager.BlockOfflinePanel();
 
@@ -1137,7 +1138,7 @@ public class TutorialManager : Regist
                 EventType.BackwardFinish,
                 () =>
                 {
-                    EnterD2();
+                    ShowDressroomButton();
                 }
             );
 
@@ -1154,11 +1155,11 @@ public class TutorialManager : Regist
         }
         else
         {
-            EnterD2();
+            ShowDressroomButton();
         }
     }
 
-    public static void EnterD2()
+    public static void ShowDressroomButton()
     {
         ResourceManager.Get("C_Main").TweenReForCG();
         ResourceManager.Get("C_Group").TweenReForCG();
@@ -1175,7 +1176,7 @@ public class TutorialManager : Regist
             "C_DressRoom",
             () =>
             {
-                EndD();
+                EndClickDressroomButton();
             }
         );
 
@@ -1185,11 +1186,11 @@ public class TutorialManager : Regist
     }
 
 
-    public static void EndE()
+    public static void EndClickCorrectButton()
     {
         StaticsManager.GetInstance().TutoComplete("E");
 
-        TutorialE = false;
+        FindMinigameTutorial = false;
 
         Tutorial.HightDisable();
 
@@ -1198,13 +1199,13 @@ public class TutorialManager : Regist
         MiniGameManager.Pause = false;
     }
 
-    public static void EnterE1()
+    public static void ClickCorrectButton()
     {
-        TutorialE = true;
-        TutorialE_ = false;
+        FindMinigameTutorial = true;
+        findMinigameTutorial = false;
     }
 
-    public static void EnterE2(Transform arrowTra, Transform targetTra)
+    public static void ShowCorrectButton(Transform arrowTra, Transform targetTra)
     {
         MiniGameManager.Pause = true;
 
@@ -1214,13 +1215,13 @@ public class TutorialManager : Regist
     }
 
 
-    public static void EndPlazaRoom()
+    public static void EndClickPlazaRoomBtn()
     {
         StaticsManager.GetInstance().TutoComplete("PlazaRoom1");
 
         Tutorial.HightDisable();
 
-        TutorialPlazaRoom = false;
+        PlazaRoomTutorial = false;
 
         ResourceManager.SetActive("N_Tutorial", false);
 
@@ -1247,10 +1248,10 @@ public class TutorialManager : Regist
         );
     }
 
-    public static void EnterPlazaRoom()
+    public static void ClickPlazaRoomBtn()
     {
-        TutorialPlazaRoom = true;
-        TutorialPlazaRoom_ = false;
+        PlazaRoomTutorial = true;
+        plazaRoomTutorial = false;
 
         UIManager.BlockOfflinePanel();
 
@@ -1318,7 +1319,7 @@ public class TutorialManager : Regist
                             "C_EnterPlazaRoom",
                             () =>
                             {
-                                EndPlazaRoom();
+                                EndClickPlazaRoomBtn();
                             }
                         );
                     }

+ 137 - 135
Assets/Script/Manage/UIManager.cs

@@ -14,7 +14,7 @@ using Random = UnityEngine.Random;
 
 public class UIManager : Regist
 {
-    #region 变量
+    #region Config
 
     public static bool Complete;
 
@@ -40,30 +40,32 @@ public class UIManager : Regist
             return;
         }
 
-        Transform tra = new GameObject("UI").transform;
+        Transform tra = new GameObject(ResourceLabel.UI).transform;
 
         tra.parent = Transform;
 
-        Canvas = ResourceManager.Get("Canvas", Folder.UI, false, tra, false, ObjType.Canvas);
-        Camera = ResourceManager.Get("MainCamera", Folder.UI, true, tra, false, ObjType.MainCamera);
-        EventSystem = ResourceManager.Get("EventSystem", Folder.UI, false, tra, false, ObjType.EventSystem);
+        Canvas = ResourceManager.Get(ResourceLabel.Canvas, Folder.UI, false, tra, false, ObjType.Canvas);
+        Camera = ResourceManager.Get(ResourceLabel.MainCamera, Folder.UI, true, tra, false, ObjType.MainCamera);
+        EventSystem = ResourceManager.Get(ResourceLabel.EventSystem, Folder.UI, false, tra, false, ObjType.EventSystem);
 
-        tra = ResourceManager.Get("GroupA", Folder.UI, true, Canvas, false, ObjType.GroupA);
+        tra = ResourceManager.Get(ResourceLabel.GroupA, Folder.UI, true, Canvas, false, ObjType.GroupA);
         tra.SetActive(true);
 
-        tra = ResourceManager.Get("GroupB", Folder.UI, true, Canvas, false, ObjType.GroupB);
+        tra = ResourceManager.Get(ResourceLabel.GroupB, Folder.UI, true, Canvas, false, ObjType.GroupB);
         tra.SetActive(true);
 
-        tra = ResourceManager.Get("GroupC", Folder.UI, true, Canvas, false, ObjType.GroupC);
+        tra = ResourceManager.Get(ResourceLabel.GroupC, Folder.UI, true, Canvas, false, ObjType.GroupC);
         tra.SetActive(true);
 
-        tra = ResourceManager.Get("GroupE", Folder.UI, true, Canvas, false, ObjType.GroupE);
+        tra = ResourceManager.Get(ResourceLabel.GroupE, Folder.UI, true, Canvas, false, ObjType.GroupE);
         tra.SetActive(true);
 
-        tra = ResourceManager.Get("GroupD", Folder.UI, true, Canvas, false, ObjType.GroupD);
+        tra = ResourceManager.Get(ResourceLabel.GroupD, Folder.UI, true, Canvas, false, ObjType.GroupD);
         tra.SetActive(true);
 
         ResourceManager.TraDic.Add(Canvas.name, Canvas);
+        ResourceManager.SetActive("C_Main", true);
+        ResourceManager.SetActive("U_LoadingPanel", true);
 
         Complete = true;
     }
@@ -95,18 +97,18 @@ public class UIManager : Regist
         ResourceManager.SetSprite("Ba_Icon", ResourceManager.LoadSprite("大金币图标", Folder.Scene));
         ResourceManager.SetSprite("Bb_IconB", ResourceManager.LoadSprite("大金币图标", Folder.Scene));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Ba_Lab"), new LanStr("UI", "Ba_Lab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Ba_ConfirmLab"), new LanStr("UI", "Ba_ConfirmLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Ba_Lab"), new MulLanStr("UI", "Ba_Lab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Ba_ConfirmLab"), new MulLanStr("UI", "Ba_ConfirmLab"));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Bb_Title"), new LanStr("UI", "Bb_Title"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Bb_GetLab"), new LanStr("UI", "Bb_GetLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Bb_ConfirmLab"), new LanStr("UI", "Bb_ConfirmLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Bb_Title"), new MulLanStr("UI", "Bb_Title"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Bb_GetLab"), new MulLanStr("UI", "Bb_GetLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Bb_ConfirmLab"), new MulLanStr("UI", "Bb_ConfirmLab"));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Bc_Lab"), new LanStr("UI", "Bc_Lab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Bc_ConfirmLab"), new LanStr("UI", "Bc_ConfirmLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Bc_Lab"), new MulLanStr("UI", "Bc_Lab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Bc_ConfirmLab"), new MulLanStr("UI", "Bc_ConfirmLab"));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Bd_GetLab"), new LanStr("UI", "Bd_GetLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Bd_Title"), new LanStr("UI", "Bd_Title"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Bd_GetLab"), new MulLanStr("UI", "Bd_GetLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Bd_Title"), new MulLanStr("UI", "Bd_Title"));
 
         #region B_SignIn
 
@@ -279,7 +281,7 @@ public class UIManager : Regist
 
         ResourceManager.SetSprite("C_Coin", ResourceManager.LoadSprite("金币", Folder.Atlas));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("C_MiniGameLab"), new LanStr("UI", "C_MiniGameLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("C_MiniGameLab"), new MulLanStr("UI", "C_MiniGameLab"));
 
         #region C_Main
 
@@ -384,7 +386,7 @@ public class UIManager : Regist
             tweenOutline.PingPong = true;
             tweenOutline.Target.enabled = true;
 
-            LanguageManager.Add(ResourceManager.Get<Text>("C_MiniGameLab"), new LanStr("UI", "C_MiniGameLab"));
+            LanguageManager.Add(ResourceManager.Get<Text>("C_MiniGameLab"), new MulLanStr("UI", "C_MiniGameLab"));
 
             ResourceManager.Get<Button>("C_MiniGame").interactable = true;
         };
@@ -597,15 +599,15 @@ public class UIManager : Regist
         ResourceManager.SetSprite("Da_Star2", ResourceManager.LoadSprite("游戏等级评分", Folder.Scene));
         ResourceManager.SetSprite("Da_Star3", ResourceManager.LoadSprite("游戏等级评分", Folder.Scene));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("D_DescA"), new LanStr("UI", "D_DescA"));
-        LanguageManager.Add(ResourceManager.Get<Text>("D_DescB"), new LanStr("UI", "D_DescB"));
-        LanguageManager.Add(ResourceManager.Get<Text>("D_DescC"), new LanStr("UI", "D_DescC"));
+        LanguageManager.Add(ResourceManager.Get<Text>("D_DescA"), new MulLanStr("UI", "D_DescA"));
+        LanguageManager.Add(ResourceManager.Get<Text>("D_DescB"), new MulLanStr("UI", "D_DescB"));
+        LanguageManager.Add(ResourceManager.Get<Text>("D_DescC"), new MulLanStr("UI", "D_DescC"));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Da_Lab"), new LanStr("UI", "Da_Lab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Da_QuitLab"), new LanStr("UI", "Da_QuitLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Da_ScoreTit"), new LanStr("UI", "Da_ScoreTit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Da_CancelLab"), new LanStr("UI", "Da_CancelLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Da_GetAwardLab"), new LanStr("UI", "Da_GetAwardLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Da_Lab"), new MulLanStr("UI", "Da_Lab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Da_QuitLab"), new MulLanStr("UI", "Da_QuitLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Da_ScoreTit"), new MulLanStr("UI", "Da_ScoreTit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Da_CancelLab"), new MulLanStr("UI", "Da_CancelLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Da_GetAwardLab"), new MulLanStr("UI", "Da_GetAwardLab"));
 
         #region D_Rip
 
@@ -614,7 +616,7 @@ public class UIManager : Regist
             "D_Rip2",
             () =>
             {
-                MiniGameManager.OperateA(OpType.Rip);
+                MiniGameManager.OperatePunchGame(OpType.Rip);
             }
         );
 
@@ -714,7 +716,7 @@ public class UIManager : Regist
             "D_Water2",
             () =>
             {
-                MiniGameManager.OperateA(OpType.Water);
+                MiniGameManager.OperatePunchGame(OpType.Water);
             }
         );
 
@@ -735,7 +737,7 @@ public class UIManager : Regist
 
             () =>
             {
-                MiniGameManager.OperateA(OpType.Fertilize);
+                MiniGameManager.OperatePunchGame(OpType.Fertilize);
             }
         );
 
@@ -799,13 +801,13 @@ public class UIManager : Regist
 
             #region GameA
 
-            if (MiniGameManager.GameA)
+            if (MiniGameManager.PunchGame)
             {
-                for (int i = 0; i < MiniGameManager.OpList.Count; i++)
+                for (int i = 0; i < MiniGameManager.OperateList.Count; i++)
                 {
-                    MiniGameManager.OpList[i].Retrieve();
+                    MiniGameManager.OperateList[i].Retrieve();
 
-                    MiniGameManager.OpList.RemoveAt(i--);
+                    MiniGameManager.OperateList.RemoveAt(i--);
                 }
 
                 for (int i = 0; i < MiniGameManager.IdleList.Count; i++)
@@ -820,7 +822,7 @@ public class UIManager : Regist
 
             #region GameB
 
-            if (MiniGameManager.GameB)
+            if (MiniGameManager.MemoryGame)
             {
                 for (int i = 0; i < MiniGameManager.FadeList.Count; i++)
                 {
@@ -843,7 +845,7 @@ public class UIManager : Regist
 
             #region GameC
 
-            if (MiniGameManager.GameC)
+            if (MiniGameManager.FindGame)
             {
                 MiniGameManager.IdleList.ForEach
                 (
@@ -962,7 +964,7 @@ public class UIManager : Regist
                 ResourceManager.Get("GardenMini").TweenBacVec();
                 ResourceManager.Get("D_MiniGame").TweenBacCG();
 
-                InfoBoxManager.Show(InfoCategory.Garden, Award.Info, 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Show(Award.Info, 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
             }
         );
 
@@ -1046,12 +1048,12 @@ public class UIManager : Regist
         };
 
 
-        ResourceManager.AddButtonEvent("D_FlowerBtn1", () => { MiniGameManager.OperateB(1,1); });
-        ResourceManager.AddButtonEvent("D_FlowerBtn2", () => { MiniGameManager.OperateB(2,2); });
-        ResourceManager.AddButtonEvent("D_FlowerBtn3", () => { MiniGameManager.OperateB(3,4); });
-        ResourceManager.AddButtonEvent("D_FlowerBtn4", () => { MiniGameManager.OperateB(4,5); });
-        ResourceManager.AddButtonEvent("D_FlowerBtn5", () => { MiniGameManager.OperateB(5,7); });
-        ResourceManager.AddButtonEvent("D_FlowerBtn6", () => { MiniGameManager.OperateB(6,8); });
+        ResourceManager.AddButtonEvent("D_FlowerBtn1", () => { MiniGameManager.OperateMemoryGame(1,1); });
+        ResourceManager.AddButtonEvent("D_FlowerBtn2", () => { MiniGameManager.OperateMemoryGame(2,2); });
+        ResourceManager.AddButtonEvent("D_FlowerBtn3", () => { MiniGameManager.OperateMemoryGame(3,4); });
+        ResourceManager.AddButtonEvent("D_FlowerBtn4", () => { MiniGameManager.OperateMemoryGame(4,5); });
+        ResourceManager.AddButtonEvent("D_FlowerBtn5", () => { MiniGameManager.OperateMemoryGame(5,7); });
+        ResourceManager.AddButtonEvent("D_FlowerBtn6", () => { MiniGameManager.OperateMemoryGame(6,8); });
 
         #endregion
 
@@ -1287,14 +1289,14 @@ public class UIManager : Regist
 
         #region F
 
-        LanguageManager.Add(ResourceManager.Get<Text>("F_ElfLab"), new LanStr("UI", "F_ElfLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("F_StoreLab"), new LanStr("UI", "F_StoreLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("F_MagicLab"), new LanStr("UI", "F_MagicLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("F_GardenLab"), new LanStr("UI", "F_GardenLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("F_ElfLab"), new MulLanStr("UI", "F_ElfLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("F_StoreLab"), new MulLanStr("UI", "F_StoreLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("F_MagicLab"), new MulLanStr("UI", "F_MagicLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("F_GardenLab"), new MulLanStr("UI", "F_GardenLab"));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Fg_Tit"), new LanStr("UI", "Fg_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Fg_Lab"), new LanStr("UI", "Fg_Lab0"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Fg_BtnLab"), new LanStr("UI", "Fg_BtnLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Fg_Tit"), new MulLanStr("UI", "Fg_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Fg_Lab"), new MulLanStr("UI", "Fg_Lab0"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Fg_BtnLab"), new MulLanStr("UI", "Fg_BtnLab"));
 
         ResourceManager.Get("F_TipBK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
@@ -1655,10 +1657,10 @@ public class UIManager : Regist
 
         #region G
 
-        LanguageManager.Add(ResourceManager.Get<Text>("G_Tit"), new LanStr("UI", "G_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("G_SpecialLab"), new LanStr("UI", "G_SpecialLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("G_RegularLab"), new LanStr("UI", "G_RegularLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("G_RetrieveLab"), new LanStr("UI", "G_RetrieveLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("G_Tit"), new MulLanStr("UI", "G_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("G_SpecialLab"), new MulLanStr("UI", "G_SpecialLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("G_RegularLab"), new MulLanStr("UI", "G_RegularLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("G_RetrieveLab"), new MulLanStr("UI", "G_RetrieveLab"));
 
         #region G_Close
 
@@ -1768,7 +1770,7 @@ public class UIManager : Regist
 
         #region H
 
-        LanguageManager.Add(ResourceManager.Get<Text>("H_Desc"), new LanStr("UI", "H_PlantTip"));
+        LanguageManager.Add(ResourceManager.Get<Text>("H_Desc"), new MulLanStr("UI", "H_PlantTip"));
 
         #region H_Close
 
@@ -1838,44 +1840,44 @@ public class UIManager : Regist
 
         ResourceManager.Get("K_Bubble").AddScript<Bubble>();
 
-        LanguageManager.Add(ResourceManager.Get<Text>("K_CancelLab"), new LanStr("Common", "Cancel"));
-        LanguageManager.Add(ResourceManager.Get<Text>("K_ConfirmLab"), new LanStr("Common", "Confirm"));
+        LanguageManager.Add(ResourceManager.Get<Text>("K_CancelLab"), new MulLanStr("Common", "Cancel"));
+        LanguageManager.Add(ResourceManager.Get<Text>("K_ConfirmLab"), new MulLanStr("Common", "Confirm"));
 
         #endregion
 
         #region L
 
-        LanguageManager.Add(ResourceManager.Get<Text>("L_Tit"), new LanStr("UI", "L_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_UserTit"), new LanStr("UI", "L_UserTit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_AudioTit"), new LanStr("UI", "L_AudioTit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_SupportTit"), new LanStr("UI", "L_SupportTit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_LanguageTit"), new LanStr("UI", "L_LanguageTit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_Tit"), new MulLanStr("UI", "L_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_UserTit"), new MulLanStr("UI", "L_UserTit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_AudioTit"), new MulLanStr("UI", "L_AudioTit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_SupportTit"), new MulLanStr("UI", "L_SupportTit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_LanguageTit"), new MulLanStr("UI", "L_LanguageTit"));
         
-        LanguageManager.Add(ResourceManager.Get<Text>("L_AudioLab"), new LanStr("UI", "L_AudioLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_MusicLab"), new LanStr("UI", "L_MusicLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_ReportLab"), new LanStr("UI", "L_ReportLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_ChangeLab"), new LanStr("UI", "L_ChangeLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_CreditsLab"), new LanStr("UI", "L_CreditsLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_ShareLab"), new LanStr("UI", "L_ShareLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_ConfirmLab"), new LanStr("UI", "L_ConfirmLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_ResetLab"), new LanStr("UI", "L_ResetLab0"));
-
-        LanguageManager.Add(ResourceManager.Get<Text>("L_TraChiLab"), new LanStr("UI", "L_TraChiLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_SimChiLab"), new LanStr("UI", "L_SimChiLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("L_EnglishLab"), new LanStr("UI", "L_EnglishLab"));
-
-        LanguageManager.Add(ResourceManager.Get<Text>("La_Tit"), new LanStr("UI", "La_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("La_CancelLab"), new LanStr("Common", "Cancel"));
-        LanguageManager.Add(ResourceManager.Get<Text>("La_ConfirmLab"), new LanStr("Common", "Confirm"));
-        LanguageManager.Add(ResourceManager.Get<Text>("La_Placeholder"), new LanStr("UI", "La_Placeholder"));
-
-        LanguageManager.Add(ResourceManager.Get<Text>("Lb_Tit"), new LanStr("UI", "Lb_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Lb_CancelLab"), new LanStr("Common", "Cancel"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Lb_ConfirmLab"), new LanStr("Common", "Confirm"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Lb_Placeholder"), new LanStr("UI", "Lb_Placeholder"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Lb_Placeholder0"), new LanStr("UI", "Lb_Placeholder0"));
-
-        LanguageManager.Add(ResourceManager.Get<Text>("Lc_CreditsContent"), new LanStr("UI", "Lc_CreditsContent"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_AudioLab"), new MulLanStr("UI", "L_AudioLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_MusicLab"), new MulLanStr("UI", "L_MusicLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_ReportLab"), new MulLanStr("UI", "L_ReportLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_ChangeLab"), new MulLanStr("UI", "L_ChangeLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_CreditsLab"), new MulLanStr("UI", "L_CreditsLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_ShareLab"), new MulLanStr("UI", "L_ShareLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_ConfirmLab"), new MulLanStr("UI", "L_ConfirmLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_ResetLab"), new MulLanStr("UI", "L_ResetLab0"));
+
+        LanguageManager.Add(ResourceManager.Get<Text>("L_TraChiLab"), new MulLanStr("UI", "L_TraChiLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_SimChiLab"), new MulLanStr("UI", "L_SimChiLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("L_EnglishLab"), new MulLanStr("UI", "L_EnglishLab"));
+
+        LanguageManager.Add(ResourceManager.Get<Text>("La_Tit"), new MulLanStr("UI", "La_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("La_CancelLab"), new MulLanStr("Common", "Cancel"));
+        LanguageManager.Add(ResourceManager.Get<Text>("La_ConfirmLab"), new MulLanStr("Common", "Confirm"));
+        LanguageManager.Add(ResourceManager.Get<Text>("La_Placeholder"), new MulLanStr("UI", "La_Placeholder"));
+
+        LanguageManager.Add(ResourceManager.Get<Text>("Lb_Tit"), new MulLanStr("UI", "Lb_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Lb_CancelLab"), new MulLanStr("Common", "Cancel"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Lb_ConfirmLab"), new MulLanStr("Common", "Confirm"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Lb_Placeholder"), new MulLanStr("UI", "Lb_Placeholder"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Lb_Placeholder0"), new MulLanStr("UI", "Lb_Placeholder0"));
+
+        LanguageManager.Add(ResourceManager.Get<Text>("Lc_CreditsContent"), new MulLanStr("UI", "Lc_CreditsContent"));
 
         ResourceManager.SetText("L_UserLab", ConfigManager.GetPlayerString("ID"));
 
@@ -2077,7 +2079,7 @@ public class UIManager : Regist
                 ResourceManager.Get<Button>("L_SimChi").image.color = Lib.LightGray;
                 ResourceManager.Get<Button>("L_English").image.color = Lib.LightGray;
 
-                LanguageManager.SwitchLanguage(Lan.ChineseTraditional);
+                LanguageManager.SwitchLanguage(CurrentLanguage.ChineseTraditional);
             }
         );
 
@@ -2100,7 +2102,7 @@ public class UIManager : Regist
                 ResourceManager.Get<Button>("L_SimChi").image.color = Lib.Orange;
                 ResourceManager.Get<Button>("L_English").image.color = Lib.LightGray;
 
-                LanguageManager.SwitchLanguage(Lan.ChineseSimplified);
+                LanguageManager.SwitchLanguage(CurrentLanguage.ChineseSimplified);
             }
         );
 
@@ -2123,7 +2125,7 @@ public class UIManager : Regist
                 ResourceManager.Get<Button>("L_SimChi").image.color = Lib.LightGray;
                 ResourceManager.Get<Button>("L_English").image.color = Lib.Orange;
 
-                LanguageManager.SwitchLanguage(Lan.English);
+                LanguageManager.SwitchLanguage(CurrentLanguage.English);
             }
         );
 
@@ -2218,7 +2220,7 @@ public class UIManager : Regist
 
         #region M_Close
 
-        LanguageManager.Add(ResourceManager.Get<Text>("M_Tit"), new LanStr("UI", "M_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("M_Tit"), new MulLanStr("UI", "M_Tit"));
 
         ResourceManager.AddButtonEvent
         (
@@ -2287,7 +2289,7 @@ public class UIManager : Regist
 
         #region N
 
-        LanguageManager.Add(ResourceManager.Get<Text>("N_Lab"), new LanStr("UI", "N_Lab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("N_Lab"), new MulLanStr("UI", "N_Lab"));
 
         ResourceManager.Get("N_Mask").CreateTweenGra(0, 180 / 255f, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get("N_LabBK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -2299,14 +2301,14 @@ public class UIManager : Regist
 
         #region P
 
-        LanguageManager.Add(ResourceManager.Get<Text>("P_HairLab"), new LanStr("UI", "P_HairLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("P_TopLab"), new LanStr("UI", "P_TopLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("P_DressLab"), new LanStr("UI", "P_DressLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("P_DecaratorLab"), new LanStr("UI", "P_DecaratorLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("P_WingLab"), new LanStr("UI", "P_WingLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("P_ShoeLab"), new LanStr("UI", "P_ShoeLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("P_HairLab"), new MulLanStr("UI", "P_HairLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("P_TopLab"), new MulLanStr("UI", "P_TopLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("P_DressLab"), new MulLanStr("UI", "P_DressLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("P_DecaratorLab"), new MulLanStr("UI", "P_DecaratorLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("P_WingLab"), new MulLanStr("UI", "P_WingLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("P_ShoeLab"), new MulLanStr("UI", "P_ShoeLab"));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Pa_Tit"), new LanStr("UI", "Pa_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Pa_Tit"), new MulLanStr("UI", "Pa_Tit"));
 
 
         #region P_Group
@@ -2758,10 +2760,10 @@ public class UIManager : Regist
 
         #region Q
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Q_Tit"), new LanStr("UI", "Q_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Q_Placeholder"), new LanStr("UI", "Q_Placeholder"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Q_CommentLab"), new LanStr("UI", "Q_CommentLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Q_CloseLab"), new LanStr("UI", "Q_CloseLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Q_Tit"), new MulLanStr("UI", "Q_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Q_Placeholder"), new MulLanStr("UI", "Q_Placeholder"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Q_CommentLab"), new MulLanStr("UI", "Q_CommentLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Q_CloseLab"), new MulLanStr("UI", "Q_CloseLab"));
 
         ResourceManager.Get("Q_Tip").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get("Q_CommentBK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -2788,8 +2790,8 @@ public class UIManager : Regist
 
         #region R
 
-        LanguageManager.Add(ResourceManager.Get<Text>("R_NotifyTit"), new LanStr("UI", "R_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("R_CloseLab"), new LanStr("Common", "Confirm"));
+        LanguageManager.Add(ResourceManager.Get<Text>("R_NotifyTit"), new MulLanStr("UI", "R_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("R_CloseLab"), new MulLanStr("Common", "Confirm"));
 
         tween = ResourceManager.Get("R_Notify0").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         tween = ResourceManager.Get("R_Notify").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -2827,8 +2829,8 @@ public class UIManager : Regist
 
         #region S
 
-        LanguageManager.Add(ResourceManager.Get<Text>("S_Tit"), new LanStr("UI", "S_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("S_CloseLab"), new LanStr("Common", "Confirm"));
+        LanguageManager.Add(ResourceManager.Get<Text>("S_Tit"), new MulLanStr("UI", "S_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("S_CloseLab"), new MulLanStr("Common", "Confirm"));
 
         ResourceManager.Get("S_RankPanel").CreateTweenScale(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
@@ -2853,7 +2855,7 @@ public class UIManager : Regist
         #region T
 
         //ManaLan.Add(ManaReso.Get<Text>("T_RandomLab"), new LanStr("UI", "T_Random"));
-        LanguageManager.Add(ResourceManager.Get<Text>("T_ConfirmLab"), new LanStr("Common", "Confirm"));
+        LanguageManager.Add(ResourceManager.Get<Text>("T_ConfirmLab"), new MulLanStr("Common", "Confirm"));
 
         ResourceManager.Get("T_NickName").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get("T_NickNameBK").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
@@ -3113,18 +3115,18 @@ public class UIManager : Regist
 
         #region Y
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Y_Tit"), new LanStr("UI", "Yb_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Y_BtnLab"), new LanStr("Common", "Confirm"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Y_Tit"), new MulLanStr("UI", "Yb_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Y_BtnLab"), new MulLanStr("Common", "Confirm"));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Yb_Tit"), new LanStr("UI", "Yb_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Yb_Desc"), new LanStr("UI", "Yb_LuckyDesc"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Yb_BtnLab"), new LanStr("Common", "Confirm"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Yb_SliderTit"), new LanStr("UI", "Yb_SliderTit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Yb_ToggleLab0"), new LanStr("UI", "Yb_Lucky"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Yb_ToggleLab1"), new LanStr("UI", "Yb_GuessColor"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Yb_ToggleLab2"), new LanStr("UI", "Yb_GuessNumber"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Yb_Tit"), new MulLanStr("UI", "Yb_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Yb_Desc"), new MulLanStr("UI", "Yb_LuckyDesc"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Yb_BtnLab"), new MulLanStr("Common", "Confirm"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Yb_SliderTit"), new MulLanStr("UI", "Yb_SliderTit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Yb_ToggleLab0"), new MulLanStr("UI", "Yb_Lucky"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Yb_ToggleLab1"), new MulLanStr("UI", "Yb_GuessColor"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Yb_ToggleLab2"), new MulLanStr("UI", "Yb_GuessNumber"));
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Ya_BtnLab"), new LanStr("Common", "Confirm"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Ya_BtnLab"), new MulLanStr("Common", "Confirm"));
 
 
         ResourceManager.Get("Y_Tip").CreateTweenCG(0, 1, 0.5f, false, true, Curve.EaseOutQuad);
@@ -3205,14 +3207,14 @@ public class UIManager : Regist
 
         #region Z
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_CreateLab"), new LanStr("UI", "Z_CreateLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_CloseLab"), new LanStr("Common", "Close"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab0"), new LanStr("UI", "Z_InfoLab0"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab1"), new LanStr("UI", "Z_InfoLab1"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab2"), new LanStr("UI", "Z_InfoLab2"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab3"), new LanStr("UI", "Z_InfoLab3"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab4"), new LanStr("UI", "Z_InfoLab4"));
-        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab5"), new LanStr("UI", "Z_InfoLab5"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_CreateLab"), new MulLanStr("UI", "Z_CreateLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_CloseLab"), new MulLanStr("Common", "Close"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab0"), new MulLanStr("UI", "Z_InfoLab0"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab1"), new MulLanStr("UI", "Z_InfoLab1"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab2"), new MulLanStr("UI", "Z_InfoLab2"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab3"), new MulLanStr("UI", "Z_InfoLab3"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab4"), new MulLanStr("UI", "Z_InfoLab4"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Z_InfoLab5"), new MulLanStr("UI", "Z_InfoLab5"));
 
 
         ResourceManager.Get("Z_BK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -3270,10 +3272,10 @@ public class UIManager : Regist
 
         #region AA
 
-        LanguageManager.Add(ResourceManager.Get<Text>("AA_Lab"), new LanStr("UI", "AA_Lab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("AA_BtnLab"), new LanStr("UI", "AA_BtnLab"));
-        LanguageManager.Add(ResourceManager.Get<Text>("AAa_Tit"), new LanStr("UI", "AAa_Tit"));
-        LanguageManager.Add(ResourceManager.Get<Text>("AAb_Tit"), new LanStr("UI", "AAb_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("AA_Lab"), new MulLanStr("UI", "AA_Lab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("AA_BtnLab"), new MulLanStr("UI", "AA_BtnLab"));
+        LanguageManager.Add(ResourceManager.Get<Text>("AAa_Tit"), new MulLanStr("UI", "AAa_Tit"));
+        LanguageManager.Add(ResourceManager.Get<Text>("AAb_Tit"), new MulLanStr("UI", "AAb_Tit"));
 
         ResourceManager.Get("AA_Tip").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get("AA_CreatePlazaRoom").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -3318,7 +3320,7 @@ public class UIManager : Regist
 
         #endregion
 
-        if (!TutorialManager.TutorialA)
+        if (!TutorialManager.NewplayerTutorial)
         {
             SetEnterGameLabel();
         }
@@ -3386,7 +3388,7 @@ public class UIManager : Regist
 
     public static void UpdateHint()
     {
-        if (TutorialManager.TutorialA)
+        if (TutorialManager.NewplayerTutorial)
         {
             return;
         }
@@ -3427,7 +3429,7 @@ public class UIManager : Regist
 
         AudioManager.PlayClip(Clip.BtnClip);
 
-        if (TutorialManager.TutorialA)
+        if (TutorialManager.NewplayerTutorial)
         {
             return;
         }

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

@@ -341,7 +341,7 @@ public class VisitManager : Regist
 
 		ShowTip ();
 
-        Node = Document.SelectSingleNode("PlayerConfig");
+        Node = Document.SelectSingleNode(PlayerConfigLabel.RootNode);
 
         ResourceManager.SetActive("C_Coin", false);
         ResourceManager.SetActive("C_Group1", false);
@@ -650,7 +650,7 @@ public class VisitManager : Regist
 
         #endregion
 
-        XmlNode nicknameNode = Document.SelectSingleNode("PlayerConfig").SelectSingleNode("NickName");
+        XmlNode nicknameNode = Document.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode("NickName");
         if (nicknameNode == null || string.IsNullOrEmpty(nicknameNode.Attributes[0].Value))
         {
             SetVisiteeNickName(Language.GetStr("UI", "未命名"));
@@ -901,7 +901,7 @@ public class VisitManager : Regist
         //Debug.Log(jsonData.ToJson());
         XmlDocument document = new XmlDocument();
         document.LoadXml(jsonData["l"].ToString());
-        XmlNode xmlNode = document.SelectSingleNode("PlayerConfig").SelectSingleNode("SerialNumber");
+        XmlNode xmlNode = document.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode("SerialNumber");
         if (xmlNode != null && xmlNode.Attributes[0].Value != HttpManager.SerialNumber)
         {
             UnusedDataList.Add(new VisitData(jsonData, document));
@@ -956,7 +956,7 @@ public class VisitManager : Regist
 
         int slot = 1; //解锁土地数量
 
-        XmlNodeList nodeList = doc.SelectSingleNode("PlayerConfig").SelectSingleNode("SkillList").ChildNodes;
+        XmlNodeList nodeList = doc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.SkillList).ChildNodes;
 
         for (int i = 0; i < nodeList.Count; i++)
         {
@@ -1016,13 +1016,13 @@ public class VisitManager : Regist
 
         plantList = plantList.TrimEnd(' ');
 
-        doc.SelectSingleNode("PlayerConfig").SelectSingleNode("PlantList").Attributes[0].Value = plantList;
+        doc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode("PlantList").Attributes[0].Value = plantList;
 
         #endregion
 
         #region 随机一套服装 等级越高拥有的服装越多 再随机选几件穿上
 
-        XmlNode xmlNode = doc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");
+        XmlNode xmlNode = doc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode("DressData");
         xmlNode.Attributes[0].Value = "";
 
 

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

@@ -162,7 +162,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
         GardenPos4.Add(ResourceManager.Get("Pos41").position);
         GardenPos4.Add(ResourceManager.Get("Pos42").position);
 
-        if (!TutorialManager.TutorialA)
+        if (!TutorialManager.NewplayerTutorial)
         {
             Player = ResourceManager.Get("Player");
             PlayerPos.Add(PlayerManager.Player.ChildDic["Pos1"].position);

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

@@ -1105,7 +1105,7 @@ public class Player : Regist , IPointerClickHandler
                     transform.position = ResourceManager.Get("PlayerPosTra").position;
                     transform.localScale = ResourceManager.Get("PlayerPosTra").lossyScale;
 
-                    ResourceManager.Get("Garden").TweenForSr();
+                    ResourceManager.Get(ResourceLabel.Garden).TweenForSr();
                     ResourceManager.Get("DressRoom").TweenBacSr();
 
                     ResourceManager.Get("C_Main").TweenForCG();
@@ -1175,7 +1175,7 @@ public class Player : Regist , IPointerClickHandler
                     transform.position = ResourceManager.Get("DressRoomPos").position;
                     transform.localScale = ResourceManager.Get("DressRoomPos").lossyScale;
 
-                    ResourceManager.Get("Garden").TweenBacSr();
+                    ResourceManager.Get(ResourceLabel.Garden).TweenBacSr();
                     ResourceManager.Get("DressRoom").TweenForSr();
 
                     ResourceManager.Get("P_DressRoom").TweenForCG();
@@ -1242,9 +1242,9 @@ public class Player : Regist , IPointerClickHandler
     {
         if (!PlayerManager.Complete)
         {
-            UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>("stand_ske", Folder.Config));
+            UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(ResourceLabel.StandSke, Folder.Config));
 
-            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>("stand_tex", Folder.Config), "stand_texture");
+            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex, Folder.Config), ResourceLabel.StandTexture);
 
             PlayerManager.Complete = true;
         }

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

@@ -468,8 +468,8 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
                 ResourceManager.Get<Image>("Y_RewardIcon").sprite = AnswerInfo.Icon;
                 ResourceManager.Get<Image>("Y_RewardIcon").Resize(true, 0.3125f, 0.3125f);
                 ResourceManager.Get<Image>("Y_RewardIcon").color = Color.white;
-                LanguageManager.Add(ResourceManager.Get<Text>("Y_Tit"), new LanStr("UI", "Yb_GuessColor"));
-                LanguageManager.Add(ResourceManager.Get<Text>("Y_Desc"), new LanStr("UI", "Y_GuessColorDesc"));
+                LanguageManager.Add(ResourceManager.Get<Text>("Y_Tit"), new MulLanStr("UI", "Yb_GuessColor"));
+                LanguageManager.Add(ResourceManager.Get<Text>("Y_Desc"), new MulLanStr("UI", "Y_GuessColorDesc"));
 
                 InputField.text = "";
                 InputField.characterLimit = 30;
@@ -478,8 +478,8 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
             {
                 ResourceManager.SetActive("Y_RewardLab", true);
                 ResourceManager.SetActive("Y_RewardIcon", false);
-                LanguageManager.Add(ResourceManager.Get<Text>("Y_Tit"), new LanStr("UI", "Yb_GuessNumber"));
-                LanguageManager.Add(ResourceManager.Get<Text>("Y_Desc"), new LanStr("UI", "Y_GuessNumberDesc"));
+                LanguageManager.Add(ResourceManager.Get<Text>("Y_Tit"), new MulLanStr("UI", "Yb_GuessNumber"));
+                LanguageManager.Add(ResourceManager.Get<Text>("Y_Desc"), new MulLanStr("UI", "Y_GuessNumberDesc"));
 
                 InputField.text = "";
                 InputField.characterLimit = 1;

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

@@ -158,7 +158,7 @@ public class PlazaRoomItem : MonoBehaviour
 
         if (RoomData.IsSystemRoom)
         {
-            LanguageManager.Add(Name, new LanStr("UI", "Z_SystemRoomName"));
+            LanguageManager.Add(Name, new MulLanStr("UI", "Z_SystemRoomName"));
         }
         else
         {
@@ -167,7 +167,7 @@ public class PlazaRoomItem : MonoBehaviour
 
         if (RoomData.IsSystemRoom)
         {
-            LanguageManager.Add(Duration, new LanStr("UI", "Z_Permanent"));
+            LanguageManager.Add(Duration, new MulLanStr("UI", "Z_Permanent"));
         }
         else
         {
@@ -192,27 +192,27 @@ public class PlazaRoomItem : MonoBehaviour
     {
         if (available)
         {
-            LanguageManager.Add(People, new LanStr("UI", "Z_Available"));
+            LanguageManager.Add(People, new MulLanStr("UI", "Z_Available"));
             People.color = Lib.RoomRunning;
             Button.image.material = null;
-            LanguageManager.Add(ButtonLab, new LanStr("UI", "Z_Join"));
+            LanguageManager.Add(ButtonLab, new MulLanStr("UI", "Z_Join"));
         }
         else
         {
-            LanguageManager.Add(People, new LanStr("UI", "Z_Full"));
+            LanguageManager.Add(People, new MulLanStr("UI", "Z_Full"));
             People.color = Lib.RoomClosing;
             Button.image.material = Lib.GrayMat;
-            LanguageManager.Add(ButtonLab, new LanStr("UI", "Z_Full"));
+            LanguageManager.Add(ButtonLab, new MulLanStr("UI", "Z_Full"));
         }
 
         if (RoomData.RemainTime.TotalMinutes > 10)
         {
-            LanguageManager.Add(Status, new LanStr("UI", "Z_Running"));
+            LanguageManager.Add(Status, new MulLanStr("UI", "Z_Running"));
             Status.color = Lib.RoomRunning;
         }
         else
         {
-            LanguageManager.Add(Status, new LanStr("UI", "Z_Closing"));
+            LanguageManager.Add(Status, new MulLanStr("UI", "Z_Closing"));
             Status.color = Lib.RoomClosing;
         }
     }

+ 2 - 2
Assets/Script/Object/Skill/Ability.cs

@@ -79,13 +79,13 @@ public class Ability : SkillRoot
                 {
                     ItemBtn.interactable = false;
 
-                    LanguageManager.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab1"), "\n", new LanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab1"), "\n", new MulLanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
                 }
                 else
                 {
                     ItemBtn.interactable = true;
 
-                    LanguageManager.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab0"), "\n", new LanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab0"), "\n", new MulLanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
                 }
             }
             else if (ItemStatus_ == SkillStatus.UnLock)

+ 4 - 4
Assets/Script/Object/Skill/BigSkill.cs

@@ -58,15 +58,15 @@ public class BigSkill : Skill
 
             if (ItemStatus_ == SkillStatus.Lock)
             {
-                LanguageManager.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab0"), "\n", new LanStr("UI", "Fe_BtnLab4"), UnlockLv);
+                LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab0"), "\n", new MulLanStr("UI", "Fe_BtnLab4"), UnlockLv);
             }
             else if (ItemStatus_ == SkillStatus.UnLock)
             {
-                LanguageManager.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab1"), "\n", Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0"));
+                LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab1"), "\n", Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0"));
             }
             else if (ItemStatus_ == SkillStatus.Upgrade)
             {
-                LanguageManager.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab2"), "\n", Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt));
+                LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab2"), "\n", Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt));
             }
         }
     }
@@ -478,7 +478,7 @@ public class BigSkill : Skill
                 UseA();
                 UseB();
 
-                InfoBoxManager.Show(InfoCategory.Garden, string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Show(string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能,
             StaticsManager.ConsumeModule.Shop

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

@@ -72,11 +72,11 @@ public class Pack : SkillRoot
 
                 if (!string.IsNullOrEmpty(Label))
                 {
-                    LanguageManager.Add(ItemBtnLab, new LanStr("UI", Label), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", Label), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
                 else
                 {
-                    LanguageManager.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
             }
             else if (ItemStatus_ == SkillStatus.Lock)
@@ -187,7 +187,7 @@ public class Pack : SkillRoot
 
         ItemLab.text = GetDescription(0);
 
-        LanguageManager.Add(ItemTit, new LanStr("SkillName", ID));
+        LanguageManager.Add(ItemTit, new MulLanStr("SkillName", ID));
 
 
         IAPManager.ProductActionDic.UniqueAdd(ID, ()=>OnBuySucceed());
@@ -384,7 +384,7 @@ public class Pack : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            InfoBoxManager.Show(InfoCategory.Garden, str, 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Show(str, 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
 
 

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

@@ -94,11 +94,11 @@ public class Skill : SkillRoot
 
                 if (BuyCur == Current.AD)
                 {
-                    LanguageManager.Add(ItemBtnLab, new LanStr("Common", "AD"));
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr("Common", "AD"));
                 }
                 else
                 {
-                    LanguageManager.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
             }
             else if (ItemStatus_ == SkillStatus.Use)
@@ -109,7 +109,7 @@ public class Skill : SkillRoot
             {
                 ItemBtn.interactable = true;
 
-                LanguageManager.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab0"), "\n", new LanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
+                LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab0"), "\n", new MulLanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
             }
             else if (ItemStatus_ == SkillStatus.Cool)
             {
@@ -302,7 +302,7 @@ public class Skill : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            InfoBoxManager.Show(InfoCategory.Garden, sb.ToString(), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Show(sb.ToString(), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
     }
 
@@ -372,7 +372,7 @@ public class Skill : SkillRoot
                 UseA();
                 UseB();
 
-                InfoBoxManager.Show(InfoCategory.Garden, string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Show(string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能, 
             StaticsManager.ConsumeModule.Shop

+ 2 - 2
Assets/Script/Object/Skill/SkillRoot.cs

@@ -103,11 +103,11 @@ public abstract class SkillRoot
 
             if (Level == 0)
             {
-                LanguageManager.Add(ItemTit, new LanStr("SkillName", ID));
+                LanguageManager.Add(ItemTit, new MulLanStr("SkillName", ID));
             }
             else
             {
-                LanguageManager.Add(ItemTit, new LanStr("SkillName", ID), Level);
+                LanguageManager.Add(ItemTit, new MulLanStr("SkillName", ID), Level);
             }
         }
     }

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

@@ -74,7 +74,7 @@ public class Slot : Regist
 	    Collider = GetComponent<BoxCollider2D>();
         TextMesh = transform.GetChild(0).GetChild(0).GetComponent<TextMesh>();
 
-        LanguageManager.Add(TextMesh, new LanStr("Object", "SlotSign"));
+        LanguageManager.Add(TextMesh, new MulLanStr("Object", "SlotSign"));
 
         return false;
     }

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

@@ -150,7 +150,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
         BoxCollider.enabled = false;
 
 
-        InfoBoxManager.Show(InfoCategory.Garden, Language.GetStr("Object", "Star") + CD.ToString("0") + Auxiliary.GetUnit((int)CD, Unit.Second), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+        InfoBoxManager.GardenInfoBox.Show(Language.GetStr("Object", "Star") + CD.ToString("0") + Auxiliary.GetUnit((int)CD, Unit.Second), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
 
 
         Move2D move2D = new Move2D(transform);

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

@@ -266,9 +266,9 @@ public class Tutorial : Regist, IPointerClickHandler
         }
         else if (eventData.rawPointerPress.name == "TutorialCollider")
         {
-            if (TutorialManager.TutorialIndexA == 4)
+            if (TutorialManager.NewplayerTutorialIndex == 4)
             {
-                TutorialManager.EndA4();
+                TutorialManager.EndClickSlot();
             }
         }
     }

+ 10 - 10
Assets/Script/SFS/Manager/ChestManager.cs

@@ -221,7 +221,7 @@ public class ChestManager : Regist
         if (enable)
         {
             ChestType = ChestType.Lucky;
-            LanguageManager.Add(Desc, new LanStr("UI", "Yb_LuckyDesc"));
+            LanguageManager.Add(Desc, new MulLanStr("UI", "Yb_LuckyDesc"));
         }
     }
 
@@ -230,7 +230,7 @@ public class ChestManager : Regist
         if (enable)
         {
             ChestType = ChestType.GuessColor;
-            LanguageManager.Add(Desc, new LanStr("UI", "Yb_GuessColorDesc"));
+            LanguageManager.Add(Desc, new MulLanStr("UI", "Yb_GuessColorDesc"));
         }
     }
 
@@ -239,7 +239,7 @@ public class ChestManager : Regist
         if (enable)
         {
             ChestType = ChestType.GuessNumber;
-            LanguageManager.Add(Desc, new LanStr("UI", "Yb_GuessNumberDesc"));
+            LanguageManager.Add(Desc, new MulLanStr("UI", "Yb_GuessNumberDesc"));
         }
     }
 
@@ -249,7 +249,7 @@ public class ChestManager : Regist
         {
             Btn.interactable = false;
             Btn.image.material = Lib.GrayMat;
-            LanguageManager.Add(BtnLab, new LanStr("UI", "Yb_Minimum"));
+            LanguageManager.Add(BtnLab, new MulLanStr("UI", "Yb_Minimum"));
             return;
         }
 
@@ -259,13 +259,13 @@ public class ChestManager : Regist
         {
             Btn.interactable = false;
             Btn.image.material = Lib.GrayMat;
-            LanguageManager.Add(BtnLab, new LanStr("Common", "ShortDiamond"));
+            LanguageManager.Add(BtnLab, new MulLanStr("Common", "ShortDiamond"));
         }
         else
         {
             Btn.interactable = true;
             Btn.image.material = null;
-            LanguageManager.Add(BtnLab, new LanStr("Common", "Confirm"));
+            LanguageManager.Add(BtnLab, new MulLanStr("Common", "Confirm"));
         }
     }
 
@@ -283,7 +283,7 @@ public class ChestManager : Regist
     private static ChestType ChestType = ChestType.Lucky;
     public static void CreateChest()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>("Y_Tip"), new LanStr("UI", "AA_SendRequest"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Y_Tip"), new MulLanStr("UI", "AA_SendRequest"));
         ResourceManager.Get("Y_Tip").TweenForCG();
 
         int databaseRoomID = SFSManager.GardenSmartFox.PlazaRoomController.CurrentRoomData.ID;
@@ -301,7 +301,7 @@ public class ChestManager : Regist
 
     public static void OnCreateChestError()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>("Y_Tip"), new LanStr("UI", "AA_CreateError"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Y_Tip"), new MulLanStr("UI", "AA_CreateError"));
         ResourceManager.Get("Y_Tip").TweenBacCG();
 
         ResourceManager.Get<CanvasGroup>("Y_Chest").interactable = true;
@@ -323,7 +323,7 @@ public class ChestManager : Regist
             Manager.CreateGuessNumberChestAmt++;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>("Y_Tip"), new LanStr("UI", "AA_CreateSucceed"));
+        LanguageManager.Add(ResourceManager.Get<Text>("Y_Tip"), new MulLanStr("UI", "AA_CreateSucceed"));
         ResourceManager.Get("Y_Tip").TweenBacCG();
 
         ResourceManager.Get<CanvasGroup>("Y_Chest").interactable = true;
@@ -571,7 +571,7 @@ public class ChestManager : Regist
         if (refund > 0)
         {
             Manager.AddDiamond(refund, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestRefund);
-            InfoBoxManager.Show(InfoCategory.Garden, Language.GetStr("UI", "Y_Refund")+refund, 10, Color.white);
+            InfoBoxManager.GardenInfoBox.Show(Language.GetStr("UI", "Y_Refund")+refund, 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
     }
 

+ 4 - 4
Assets/Script/SFS/Manager/PlazaRoomController.cs

@@ -296,7 +296,7 @@ public class PlazaRoomController
         ResourceManager.Get("V_BlackMask").TweenForCG();
 
         ResourceManager.SetActive("C_Main2", false);
-        ResourceManager.SetActive("Garden", false);
+        ResourceManager.SetActive(ResourceLabel.Garden, false);
         ResourceManager.SetActive("PlazaRoom", true);
         ResourceManager.SetActive("W_HudParent", true);
         ResourceManager.SetActive("X_PlazaRoom", true);
@@ -323,7 +323,7 @@ public class PlazaRoomController
                 PlazaRoomCamera.transform.position = CameraOriginPosition;
 
                 ResourceManager.SetActive("C_Main2", true);
-                ResourceManager.SetActive("Garden", true);
+                ResourceManager.SetActive(ResourceLabel.Garden, true);
                 ResourceManager.SetActive("PlazaRoom", false);
                 ResourceManager.SetActive("W_HudParent", false);
                 ResourceManager.SetActive("X_PlazaRoom", false);
@@ -587,7 +587,7 @@ public class PlazaRoomController
         string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr("UI", "X_Self") : plazaRoomPlayer.NickName;
         string message = $"{senderName}:\u3000<({expressionName}按钮)>";
         Color textColor = senderID == SFSManager.GardenSmartFox.User.Id ? Lib.SelfMessage : Lib.OtherMessage;
-        InfoBoxManager.Show(InfoCategory.PlazaRoom, message, Mathf.Infinity, textColor, ResourceManager.LoadSprite("Expression", Folder.Scene));
+        InfoBoxManager.PlazaRoomInfoBox.Show(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite("Expression", Folder.Scene));
         Text text = ResourceManager.Get<Text>("X_CurrentInfoLab");
         text.color = textColor;
         text.text = message;
@@ -603,7 +603,7 @@ public class PlazaRoomController
         string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr("UI", "X_Self") : plazaRoomPlayer.NickName;
 
         message = $"{senderName}:\u3000{message}";
-        InfoBoxManager.Show(InfoCategory.PlazaRoom, message, Mathf.Infinity, textColor, ResourceManager.LoadSprite("Expression", Folder.Scene));
+        InfoBoxManager.PlazaRoomInfoBox.Show(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite("Expression", Folder.Scene));
 
         ResourceManager.SetText("X_CurrentInfoLab", message);
         Text text = ResourceManager.Get<Text>("X_CurrentInfoLab");

+ 13 - 21
Assets/Script/Tool/Auxiliary.cs

@@ -176,18 +176,10 @@ public class Auxiliary : Regist
         //    SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom();
         //}
 
-        //if (Input.GetKeyDown(KeyCode.Z))
-        //{
-        //    byte[] bytes = Encoding.UTF8.GetBytes(ManaData.PlayerDoc.OuterXml);
-
-        //    MD5 md5 = new MD5CryptoServiceProvider();
-
-        //    PlayerPrefs.SetString("config", ToString(md5.ComputeHash(bytes)));
-
-        //    ManaCenter.MiniTimer = 0;
-
-        //    GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
-        //}
+        if (Input.GetKeyDown(KeyCode.Z))
+        {
+            Manager.MiniTimer = 0;
+        }
 
         //if (Input.GetKeyDown(KeyCode.X))
         //{
@@ -235,7 +227,7 @@ public class Auxiliary : Regist
 
         //if (Input.GetKeyDown(KeyCode.V))
         //{
-        //    ManaData.PlayerDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 6.ToString();
+        //    ManaData.PlayerDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 6.ToString();
         //    ManaData.PlayerNode.RemoveChild(ManaData.PlayerNode.SelectSingleNode("FlowerAmtList"));
 
         //    Debug.Log(ManaData.GetPlayerString("FlowerList"));
@@ -507,7 +499,7 @@ public class Auxiliary : Regist
     {
         if (unit == Unit.Second)
         {
-            if (LanguageManager.CurrentLan == Lan.English)
+            if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
             {
                 if (value == 0 || value == 1)
                 {
@@ -518,11 +510,11 @@ public class Auxiliary : Regist
                     return " Seconds";
                 }
             }
-            else if (LanguageManager.CurrentLan == Lan.ChineseSimplified)
+            else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
             {
                 return "秒";
             }
-            else if (LanguageManager.CurrentLan == Lan.ChineseTraditional)
+            else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
             {
                 return "秒";
             }
@@ -758,7 +750,7 @@ public class Auxiliary : Regist
 
     public static double ShrinkNumber(double value, int accuracy = 1)
     {
-        if (LanguageManager.CurrentLan == Lan.English)
+        if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
         {
             if (value < Amount.千)
             {
@@ -795,7 +787,7 @@ public class Auxiliary : Regist
                 return double.Parse(OmitNumberStr(accuracy, str)) * Amount.千兆;
             }
         }
-        else if (LanguageManager.CurrentLan == Lan.ChineseSimplified || LanguageManager.CurrentLan == Lan.ChineseTraditional)
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified || LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
         {
             if (value < Amount.万)
             {
@@ -870,7 +862,7 @@ public class Auxiliary : Regist
 
     public static string ShrinkNumberStr(double value, int accuracy = 1)
     {
-        if (LanguageManager.CurrentLan == Lan.English)
+        if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
         {
             if (value < Amount.千)
             {
@@ -907,7 +899,7 @@ public class Auxiliary : Regist
                 return OmitNumberStr(accuracy, str) + "T";
             }
         }
-        else if (LanguageManager.CurrentLan == Lan.ChineseSimplified)
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
         {
             if (value < Amount.万)
             {
@@ -974,7 +966,7 @@ public class Auxiliary : Regist
                 return OmitNumberStr(0, str) + "千垓";
             }
         }
-        else if (LanguageManager.CurrentLan == Lan.ChineseTraditional)
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
         {
             if (value < Amount.万)
             {

+ 8 - 8
Assets/Script/Tool/Bundle.cs

@@ -348,7 +348,7 @@ public class Bundle : MonoBehaviour
 
         if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
-            ResourceManager.AddAsyncLoad<TextAsset>("PlayerConfig", Folder.Config, () => { ConfigManager.PlayerDoc = ConfigManager.PlayerDoc; HttpManager.PackTypeRequest(); });
+            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config, () => { ConfigManager.PlayerDoc = ConfigManager.PlayerDoc; HttpManager.PackTypeRequest(); });
         }
         else
         {
@@ -364,11 +364,11 @@ public class Bundle : MonoBehaviour
         {
             ResourceManager.AddAsyncLoad("Canvas", 1, Folder.UI, ObjType.Canvas);
 
-            ResourceManager.AddAsyncLoad("GroupA", 1, Folder.UI, ObjType.GroupA, true);
-            ResourceManager.AddAsyncLoad("GroupB", 1, Folder.UI, ObjType.GroupB, true);
-            ResourceManager.AddAsyncLoad("GroupC", 1, Folder.UI, ObjType.GroupC, true);
-            ResourceManager.AddAsyncLoad("GroupE", 1, Folder.UI, ObjType.GroupE, true);
-            ResourceManager.AddAsyncLoad("GroupD", 1, Folder.UI, ObjType.GroupD, true);
+            ResourceManager.AddAsyncLoad(ResourceLabel.GroupA, 1, Folder.UI, ObjType.GroupA, true);
+            ResourceManager.AddAsyncLoad(ResourceLabel.GroupB, 1, Folder.UI, ObjType.GroupB, true);
+            ResourceManager.AddAsyncLoad(ResourceLabel.GroupC, 1, Folder.UI, ObjType.GroupC, true);
+            ResourceManager.AddAsyncLoad(ResourceLabel.GroupE, 1, Folder.UI, ObjType.GroupE, true);
+            ResourceManager.AddAsyncLoad(ResourceLabel.GroupD, 1, Folder.UI, ObjType.GroupD, true);
 
             ResourceManager.AddAsyncLoad("EventSystem", 1, Folder.UI, ObjType.EventSystem);
             ResourceManager.AddAsyncLoad("MainCamera", 1, Folder.UI, ObjType.MainCamera);
@@ -386,7 +386,7 @@ public class Bundle : MonoBehaviour
             ResourceManager.AddAsyncLoad("Flower", 9, Folder.Scene, ObjType.Flower);
 
             ResourceManager.AddAsyncLoad("Page", 2, Folder.Scene, ObjType.Page);
-            ResourceManager.AddAsyncLoad("Garden", 1, Folder.Scene, ObjType.Garden);
+            ResourceManager.AddAsyncLoad(ResourceLabel.Garden, 1, Folder.Scene, ObjType.Garden);
             ResourceManager.AddAsyncLoad("DressRoom", 1, Folder.Scene, ObjType.DressRoom);
         }
 
@@ -409,7 +409,7 @@ public class Bundle : MonoBehaviour
             ResourceManager.AddAsyncLoad<TextAsset>("visit_config", Folder.Config);
             ResourceManager.AddAsyncLoad<TextAsset>("award_config", Folder.Config);
             ResourceManager.AddAsyncLoad<TextAsset>("flower_config", Folder.Config);
-            ResourceManager.AddAsyncLoad<TextAsset>("offline_config", Folder.Config);
+            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.OfflineConfig, Folder.Config);
             ResourceManager.AddAsyncLoad<TextAsset>("signin_config", Folder.Config);
             ResourceManager.AddAsyncLoad<TextAsset>("dressRoom_config", Folder.Config);
 

+ 17 - 17
Assets/Script/Tool/DashGame/Language.cs

@@ -27,39 +27,39 @@ public class Language
 	public static string lan = SystemLanguage.English.ToString();
     public static string lanForUI = SystemLanguage.English.ToString();
 
-    public static Dictionary<Lan, TextAsset> LanguageDic = new Dictionary<Lan, TextAsset>();
+    public static Dictionary<CurrentLanguage, TextAsset> LanguageDic = new Dictionary<CurrentLanguage, TextAsset>();
 
     public static void Initialize()
     {
-        LanguageManager.CurrentLan = ConfigManager.GetPlayerString("Language").ToEnum<Lan>();
+        LanguageManager.CurrentLanguage = ConfigManager.GetPlayerString("Language").ToEnum<CurrentLanguage>();
 
-        LanguageDic.Add(Lan.English, ResourceManager.Load<TextAsset>("English", Folder.Config));
-        LanguageDic.Add(Lan.ChineseSimplified, ResourceManager.Load<TextAsset>("ChineseSimplified", Folder.Config));
-        LanguageDic.Add(Lan.ChineseTraditional, ResourceManager.Load<TextAsset>("ChineseTraditional", Folder.Config));
+        LanguageDic.Add(CurrentLanguage.English, ResourceManager.Load<TextAsset>("English", Folder.Config));
+        LanguageDic.Add(CurrentLanguage.ChineseSimplified, ResourceManager.Load<TextAsset>("ChineseSimplified", Folder.Config));
+        LanguageDic.Add(CurrentLanguage.ChineseTraditional, ResourceManager.Load<TextAsset>("ChineseTraditional", Folder.Config));
 
-        if (LanguageManager.CurrentLan == Lan.Default)
+        if (LanguageManager.CurrentLanguage == CurrentLanguage.Default)
         {
             if (Application.systemLanguage == SystemLanguage.ChineseSimplified)
             {
-                LanguageManager.CurrentLan = Lan.ChineseSimplified;
+                LanguageManager.CurrentLanguage = CurrentLanguage.ChineseSimplified;
             }
             else if (Application.systemLanguage == SystemLanguage.ChineseTraditional)
             {
-                LanguageManager.CurrentLan = Lan.ChineseTraditional;
+                LanguageManager.CurrentLanguage = CurrentLanguage.ChineseTraditional;
             }
             else
             {
-                LanguageManager.CurrentLan = Lan.English;
+                LanguageManager.CurrentLanguage = CurrentLanguage.English;
             }
         }
 
 
-        TextAsset textAsset = LanguageDic[LanguageManager.CurrentLan];
+        TextAsset textAsset = LanguageDic[LanguageManager.CurrentLanguage];
 
         xml = new XmlDocument();
         xml.LoadXml(textAsset.text);
 
-        if (LanguageManager.CurrentLan == Lan.English)
+        if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
         {
             ResourceManager.Get<Button>("L_TraChi").interactable = true;
             ResourceManager.Get<Button>("L_SimChi").interactable = true;
@@ -69,7 +69,7 @@ public class Language
             ResourceManager.Get<Button>("L_SimChi").image.color = Lib.LightGray;
             ResourceManager.Get<Button>("L_English").image.color = Lib.Orange;
         }
-        else if (LanguageManager.CurrentLan == Lan.ChineseSimplified)
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
         {
             ResourceManager.Get<Button>("L_TraChi").interactable = true;
             ResourceManager.Get<Button>("L_SimChi").interactable = false;
@@ -79,7 +79,7 @@ public class Language
             ResourceManager.Get<Button>("L_SimChi").image.color = Lib.Orange;
             ResourceManager.Get<Button>("L_English").image.color = Lib.LightGray;
         }
-        else if (LanguageManager.CurrentLan == Lan.ChineseTraditional)
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
         {
             ResourceManager.Get<Button>("L_TraChi").interactable = false;
             ResourceManager.Get<Button>("L_SimChi").interactable = true;
@@ -91,11 +91,11 @@ public class Language
         }
     }
 
-    public static void SwitchLanguage(Lan lan)
+    public static void SwitchLanguage(CurrentLanguage currentLanguage)
     {
-        LanguageManager.CurrentLan = lan;
+        LanguageManager.CurrentLanguage = currentLanguage;
 
-        TextAsset textAsset = LanguageDic[lan];
+        TextAsset textAsset = LanguageDic[currentLanguage];
 
         xml = new XmlDocument();
         xml.LoadXml(textAsset.text);
@@ -215,7 +215,7 @@ public class Language
     {
         XmlDocument tempXML = new XmlDocument();
 
-        tempXML.LoadXml(LanguageDic[Lan.ChineseSimplified].text);
+        tempXML.LoadXml(LanguageDic[CurrentLanguage.ChineseSimplified].text);
 
 
         string page;

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

@@ -24,6 +24,19 @@ public class Lib
     public static Color RoomClosing = new Color(240/255f, 103/255f, 101/255f, 1);
     public static Color RoomRunning = new Color(90/255f, 170/255f, 39/255f, 1);
 
+    public static Sprite PackSprite
+    {
+        get { return ResourceManager.LoadSprite(ResourceLabel.Pack, Folder.UI); }
+    }
+    public static Sprite GoldSprite
+    {
+        get { return ResourceManager.LoadSprite(ResourceLabel.Gold, Folder.UI); }
+    }
+    public static Sprite DiamondSprite
+    {
+        get { return ResourceManager.LoadSprite(ResourceLabel.Diamond, Folder.UI); }
+    }
+
     public static Material GrayMat
     {
         get { return ResourceManager.Load<Material>("GrayMat", Folder.UI); }

+ 57 - 0
Assets/Script/Tool/PlayerConfigLabel.cs

@@ -5,5 +5,62 @@ using UnityEngine;
 
 public class PlayerConfigLabel
 {
+    public static string RootNode = "PlayerConfig";
     public static string ExtraSlot = "ExtraSlot";
+    public static string Version = "Version";
+    public static string ReplayVersion = "ReplayVersion";
+    public static string SkillList = "SkillList";
+    public static string Skill = "Skill";
+    public static string ID = "ID";
+    public static string SkillType = "SkillType";
+    public static string ItemStatus = "ItemStatus";
+    public static string Level = "Level";
+    public static string CoolTimer = "CoolTimer";
+    public static string UseTimer = "UseTimer";
+    public static string BarStatus = "BarStatus";
+    public static string DressList = "DressList";
+    public static string DressData = "DressData";
+    public static string AchieveList = "AchieveList";
+    public static string AchieveData = "AchieveData";
+    public static string PlantList = "PlantList";
+    public static string Coin = "Coin";
+    public static string Diamond = "Diamond";
+    public static string SignTime = "SignTime";
+    public static string SignIndex = "SignIndex";
+    public static string SignRound = "SignRound";
+    public static string QuitFlag = "QuitFlag";
+    public static string QuitTime = "QuitTime";
+    public static string MiniTimer = "MiniTimer";
+    public static string CircleTimer = "CircleTimer";
+    public static string SerialNumber = "SerialNumber";
+    public static string Language = "Language";
+    public static string MiniGameIndex = "MiniGameIndex";
+    public static string TutorialA = "TutorialA";
+    public static string TutorialB = "TutorialB";
+    public static string TutorialC = "TutorialC";
+    public static string TutorialD = "TutorialD";
+    public static string TutorialE = "TutorialE";
+    public static string TutorialPlazaRoom = "TutorialPlazaRoom";
+    public static string TutorialIndexA = "TutorialIndexA";
+    public static string TutorialIndexB = "TutorialIndexB";
+    public static string TutorialIndexC = "TutorialIndexC";
+    public static string TutorialIndexD = "TutorialIndexD";
+    public static string TutorialIndexE = "TutorialIndexE";
+    public static string TutorialIndexPlazaRoom = "TutorialIndexPlazaRoom";
+    public static string FlowerList = "FlowerList";
+    public static string FlowerAmtList = "FlowerAmtList";
+    public static string ADPlayTime = "ADPlayTime";
+    public static string NotificationIndex = "NotificationIndex";
+    public static string NickName = "NickName";
+    public static string LeftLongSleeveSlot = "LeftLongSleeveSlot";
+    public static string LeftShortSleeveSlot = "LeftShortSleeveSlot";
+    public static string RightLongSleeveSlot = "RightLongSleeveSlot";
+    public static string RightShortSleeveSlot = "RightShortSleeveSlot";
+    public static string NewFlowerFlag = "NewFlowerFlag";
+    public static string CreateRoomAmt = "CreateRoomAmt";
+    public static string CreateChestAmt = "CreateChestAmt";
+    public static string CreateLuckyChestAmt = "CreateLuckyChestAmt";
+    public static string CreateGuessColorChestAmt = "CreateGuessColorChestAmt";
+    public static string CreateGuessNumberChestAmt = "CreateGuessNumberChestAmt";
+    public static string GetChestAwardAmt = "GetChestAwardAmt";
 }

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

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