Browse Source

提高代码可读性

liuqilin 7 years ago
parent
commit
faa92fcbe0
65 changed files with 1854 additions and 1659 deletions
  1. 75 6
      Assets/Resource/Prefab/PrefabUI/MailItem.prefab
  2. 2 2
      Assets/Resource/XML/Config/ability_config.xml
  3. BIN
      Assets/Resource/Xlsx/ability_config.xlsx
  4. 3 3
      Assets/Script/Function/ThanksGift.cs
  5. 10 0
      Assets/Script/Label/DeltaSize.cs
  6. 12 0
      Assets/Script/Label/DeltaSize.cs.meta
  7. 11 0
      Assets/Script/Label/DressroomLabel.cs
  8. 12 0
      Assets/Script/Label/DressroomLabel.cs.meta
  9. 12 0
      Assets/Script/Label/MaterialLabel.cs
  10. 12 0
      Assets/Script/Label/MaterialLabel.cs.meta
  11. 13 11
      Assets/Script/Label/PlayerConfigLabel.cs
  12. 10 0
      Assets/Script/Label/ResourceLabel.cs
  13. 173 159
      Assets/Script/Manage/AchieveManager.cs
  14. 51 50
      Assets/Script/Manage/AnnounceManager.cs
  15. 73 108
      Assets/Script/Manage/AudioManager.cs
  16. 268 274
      Assets/Script/Manage/ConfigManager.cs
  17. 16 17
      Assets/Script/Manage/DebugManager.cs
  18. 54 10
      Assets/Script/Manage/GardenManager.cs
  19. 84 215
      Assets/Script/Manage/HttpManager.cs
  20. 8 28
      Assets/Script/Manage/IAPManager.cs
  21. 5 3
      Assets/Script/Manage/InfoBoxManager.cs
  22. 31 31
      Assets/Script/Manage/Initializer.cs
  23. 4 4
      Assets/Script/Manage/LanguageManager.cs
  24. 51 56
      Assets/Script/Manage/Manager.cs
  25. 135 72
      Assets/Script/Manage/MiniGameManager.cs
  26. 4 4
      Assets/Script/Manage/NickNameManager.cs
  27. 10 12
      Assets/Script/Manage/PlayerManager.cs
  28. 7 12
      Assets/Script/Manage/PlazaRoomManager.cs
  29. 25 27
      Assets/Script/Manage/ResourceManager.cs
  30. 33 24
      Assets/Script/Manage/SignManager.cs
  31. 4 3
      Assets/Script/Manage/SocialManager.cs
  32. 121 142
      Assets/Script/Manage/TutorialManager.cs
  33. 101 115
      Assets/Script/Manage/UIManager.cs
  34. 36 36
      Assets/Script/Manage/VisitManager.cs
  35. 2 2
      Assets/Script/Object/Chest.cs
  36. 12 4
      Assets/Script/Object/CommentItem.cs
  37. 1 1
      Assets/Script/Object/Drop.cs
  38. 1 1
      Assets/Script/Object/DropDiamond.cs
  39. 53 40
      Assets/Script/Object/Flower.cs
  40. 12 1
      Assets/Script/Object/FlowerItem.cs
  41. 27 27
      Assets/Script/Object/Garden.cs
  42. 52 27
      Assets/Script/Object/Player.cs
  43. 23 7
      Assets/Script/Object/PlazaRoom.cs
  44. 9 4
      Assets/Script/Object/PlazaRoomChest.cs
  45. 21 9
      Assets/Script/Object/PlazaRoomItem.cs
  46. 16 6
      Assets/Script/Object/RankItem.cs
  47. 6 6
      Assets/Script/Object/Skill/Ability.cs
  48. 31 9
      Assets/Script/Object/Skill/BigSkill.cs
  49. 3 3
      Assets/Script/Object/Skill/Pack.cs
  50. 4 4
      Assets/Script/Object/Skill/Skill.cs
  51. 8 1
      Assets/Script/Object/Skill/SkillRoot.cs
  52. 6 0
      Assets/Script/Object/Slot.cs
  53. 4 4
      Assets/Script/Object/Star.cs
  54. 39 26
      Assets/Script/Object/Tutorial.cs
  55. 12 12
      Assets/Script/SFS/Manager/ChestManager.cs
  56. 20 20
      Assets/Script/SFS/Manager/PlazaRoomController.cs
  57. 3 3
      Assets/Script/SFS/Object/Robot.cs
  58. 2 1
      Assets/Script/Tool/Auxiliary.cs
  59. 2 2
      Assets/Script/Tool/Bundle.cs
  60. 2 2
      Assets/Script/Tool/DashGame/Language.cs
  61. 2 2
      Assets/Script/Tool/DashGame/Logo.cs
  62. 3 3
      Assets/Script/Tool/LabelUtility/LabelUtility.cs
  63. 7 3
      Assets/Script/Tool/Lib.cs
  64. 4 4
      Assets/Script/Tool/UI/Bubble.cs
  65. 1 1
      Assets/Script/Tool/UI/Toast.cs

+ 75 - 6
Assets/Resource/Prefab/PrefabUI/MailItem.prefab

@@ -28,6 +28,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1563589509645894
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224661950286460220}
+  - component: {fileID: 222454500784272074}
+  - component: {fileID: 114055021105193472}
+  m_Layer: 5
+  m_Name: Icon1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1648846713598210
 GameObject:
   m_ObjectHideFlags: 0
@@ -56,7 +73,7 @@ GameObject:
   - component: {fileID: 222001930416087314}
   - component: {fileID: 114363837422987082}
   m_Layer: 5
-  m_Name: Icon1
+  m_Name: Icon3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -79,6 +96,33 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!114 &114055021105193472
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1563589509645894}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114363837422987082
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -211,6 +255,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1687362140960934}
+--- !u!222 &222454500784272074
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1563589509645894}
 --- !u!222 &222684545360919032
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -228,13 +278,31 @@ RectTransform:
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
   m_Children: []
   m_Father: {fileID: 224875051585414402}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.000030517578, y: 0.000015258789}
   m_SizeDelta: {x: 52, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224661950286460220
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1563589509645894}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224875051585414402}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0.00000095367}
+  m_SizeDelta: {x: 52, y: 52}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224706107359982646
 RectTransform:
   m_ObjectHideFlags: 1
@@ -263,9 +331,10 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 224661950286460220}
   - {fileID: 224571280630113088}
-  - {fileID: 224923826774362444}
   - {fileID: 224706107359982646}
+  - {fileID: 224923826774362444}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -280,15 +349,15 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1650592643924820}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224875051585414402}
-  m_RootOrder: 1
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0.00000095367}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 52, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}

+ 2 - 2
Assets/Resource/XML/Config/ability_config.xml

@@ -1,8 +1,8 @@
 <data>
   <item id="1" name="花园" class="1" class_id="1" coin_person="5" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="5" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="0.5%" upgrade_person="1.7%" upgrade_cd="" desc="每人次收入 金币[&amp;coin_person&amp;][lv],每分钟来访[&amp;person&amp;*60][lv]人" icon="红-公园" anim="" label="" />
   <item id="2" name="缤纷彩虹" class="1" class_id="5" coin_person="" person="5%" skill_cd="" unlock_lv="5" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="" upgrade_person="5%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观,永久有效" icon="红-彩虹" anim="Item,Rainbow" label="" />
-  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv],永久有效" icon="红-樱花树" anim="Item,Tree1,Tree2" label="" />
-  <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="110" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv],永久有效" icon="红-黄鹂鸟" anim="Item,Bird0" label="" />
+  <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv],永久有效" icon="红-樱花树" anim="Item,GardenLeftTree,GardenRightTree" label="" />
+  <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="110" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv],永久有效" icon="红-黄鹂鸟" anim="Item,BirdPivot" label="" />
   <item id="5" name="黄色小蜜蜂" class="2" class_id="1" coin_person="2.07" person="" skill_cd="" unlock_lv="2" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄色蜜蜂" anim="Elf,Bee_Yellow" label="" />
   <item id="6" name="紫色小蜜蜂" class="2" class_id="2" coin_person="2.96" person="" skill_cd="" unlock_lv="10" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="1600" unlock_pos="1" upgrade_cur="1" upgrade_amnt="3200" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-紫色蜜蜂" anim="Elf,Bee_Purple" label="" />
   <item id="7" name="蓝色小蜜蜂" class="2" class_id="3" coin_person="5.34" person="" skill_cd="" unlock_lv="30" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="3200" unlock_pos="1" upgrade_cur="1" upgrade_amnt="6400" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-蓝色蜜蜂" anim="Elf,Bee_Blue" label="" />

BIN
Assets/Resource/Xlsx/ability_config.xlsx


+ 3 - 3
Assets/Script/Function/ThanksGift.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using LitJson;
@@ -145,8 +145,8 @@ public class Gift
             for (int i = 0; i < value; i++)
             {
                 GardenManager.UnlockSlot();
-                int extraSlot = ConfigManager.GetPlayerInt(PlayerConfigLabel.ExtraSlot);
-                ConfigManager.SavePlayerInt(PlayerConfigLabel.ExtraSlot, extraSlot + 1);
+                int extraSlot = ConfigManager.GetIntFormConfig(PlayerConfigLabel.ExtraSlot);
+                ConfigManager.SaveIntToConfig(PlayerConfigLabel.ExtraSlot, extraSlot + 1);
                 //Debug.LogWarning($"{type}");
             }
         }

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

@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class DeltaSize
+{
+    public static float FlowerCardSpriteX = 0.6125f;
+    public static float FlowerCardSpriteY = 0.6125f;
+}

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

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

+ 11 - 0
Assets/Script/Label/DressroomLabel.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class DressroomLabel
+{
+    
+    public static string DressRoom = "DressRoom";
+    public static string DressRoomPos = "DressRoomPos";
+}

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

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

+ 12 - 0
Assets/Script/Label/MaterialLabel.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class MaterialLabel
+{
+    public static string DefaultMatColor = "_Color";
+
+    public static string GrayMatGrayLerp = "_GrayLerp";
+    public static string TimerMatFill = "_Fill";
+}

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

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

+ 13 - 11
Assets/Script/Label/PlayerConfigLabel.cs

@@ -7,7 +7,9 @@ public class PlayerConfigLabel
 {
     public static string DefaultID = "Default";
     public static string DefaultSerialNumber = "Default";
-
+    
+    public static string OneTimeReward = "OneTimeReward";
+    public static string PackLock = "PackLock";
     public static string RefundNode = "Refund";
     public static string ReceivedNode = "Received";
     public static string RootNode = "PlayerConfig";
@@ -40,17 +42,17 @@ public class PlayerConfigLabel
     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 NewplayerTutorial = "TutorialA";
+    public static string MemoryMinigameTutorial = "TutorialB";
+    public static string VisitTutorial = "TutorialC";
+    public static string DressroomTutorial = "TutorialD";
+    public static string FindMinigameTutorial = "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 NewplayerTutorialIndex = "TutorialIndexA";
+    public static string MemoryMinigameTutorialIndex = "TutorialIndexB";
+    public static string VisitTutorialIndex = "TutorialIndexC";
+    public static string DressroomIndex = "TutorialIndexD";
+    public static string FindMinigameTutorialIndex = "TutorialIndexE";
     public static string TutorialIndexPlazaRoom = "TutorialIndexPlazaRoom";
     public static string FlowerList = "FlowerList";
     public static string FlowerAmtList = "FlowerAmtList";

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

@@ -5,6 +5,9 @@ using UnityEngine;
 
 public class ResourceLabel
 {
+    
+    public static string ChestTimer = "ChestTimer";
+    public static string PlazaRoom = "PlazaRoom";
     public static string ObjPool = "ObjPool";
 
     public static string Atlas = "Atlas";
@@ -15,6 +18,7 @@ public class ResourceLabel
     public static string UI = "UI";
 
     public static string LOGO0005 = "LOGO0005";
+    public static string MailItem = "MailItem";
     public static string NotifyItem = "NotifyItem";
     public static string Music = "Music";
     public static string MessageBox = "MessageBox";
@@ -70,6 +74,7 @@ public class ResourceLabel
     public static string PhonoGraphSke = "PhonoGraph_ske";
     public static string PhonoGraphTexture = "PhonoGraph_texture";
 
+    public static string Setting = "Setting";
     public static string English = "English";
     public static string ChineseSimplified = "ChineseSimplified";
     public static string ChineseTraditional = "ChineseTraditional";
@@ -99,4 +104,9 @@ public class ResourceLabel
     public static string BubbleClip = "BubbleClip";
     public static string CurrentClip = "CurrentClip";
     public static string MiniEndClip = "MiniEndClip";
+
+    public static string GrayMat = "GrayMat";
+    public static string UIMaskMat = "UIMaskMat";
+    public static string GraySpriteMat = "GraySpriteMat";
+    public static string GrayMeshMat = "GrayMeshMat";
 }

+ 173 - 159
Assets/Script/Manage/AchieveManager.cs

@@ -12,24 +12,24 @@ using Object = UnityEngine.Object;
 
 public enum AchieveType
 {
-    TotalPerson,
+    TotalVisitPerson,
 
-    ElfLevel,
+    AllElfLevel,
     GardenLevel,
 
-    AdAmt,
-    SkillAmt,
+    PlayADsAmt,
+    UseSkillAmt,
     SignAmt,
     CloseAmt,
     ShareAmt,
     FlowerAmt,
-    MiniGameAmt,
+    PlayMinigameAmt,
 
     TotalCoin,
-    FlowerCoin,
+    TotalFlowerAwardCoin,
     CurrentCoin,
 
-    CostDiamond,
+    SpendDiamond,
 
     CreateRoomAmt,
     CreateChestAmt,
@@ -39,45 +39,61 @@ public enum AchieveType
     GetChestAwardAmt,
 }
 
-public class Achieve
+public class AchieveItemLabel
+{
+    public static string Tit = "Tit";
+    public static string Lab = "Lab";
+    public static string Slider = "Slider";
+    public static string Icon = "Icon";
+    public static string Btn = "Btn";
+    public static string BtnLab = "BtnLab";
+}
+
+public class AchieveItem
 {
     #region Config
 
     private static string IDPrefix = "Achieve";
 
-    private string NameLanLabel
+    public string Name
     {
-        get { return LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveName,FullID); }
+        get
+        {
+            return Language.GetStr(NameLanguageLabel);
+        }
     }
-    private string DescLanLabel
+    private string NameLanguageLabel
     {
-        get { return LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveDesc, FullID); }
+        get { return LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveName,FullID); }
     }
-    public string FullID
+
+    public string Description
     {
         get
         {
-            return IDPrefix + ID;
+            return Language.GetStr(DescriptionLanguageLabel);
         }
     }
-    public string Desc
+    private string DescriptionLanguageLabel
     {
-        get
-        {
-            return Language.GetStr(DescLanLabel);
-        }
+        get { return LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveDesc, FullID); }
     }
-    public string Name
+
+    public string FullID
     {
         get
         {
-            return Language.GetStr(NameLanLabel);
+            return IDPrefix + ID;
         }
     }
+    public int ID;
+
     public Sprite Sprite
     {
         get { return ResourceManager.LoadSprite(SpriteName, Folder.UI); }
     }
+    public string SpriteName;
+
     public double CurrentValue
     {
         get { return currentValue; }
@@ -89,148 +105,113 @@ public class Achieve
 
             if (currentValue >= TargetValue)
             {
-                ToComplete();
+                Complete();
             }
             else
             {
-                ToProcess(currentValue);
+                UpdateDisplay(currentValue);
             }
         }
     }
     public double currentValue;
-
-    public int ID;
-    public string SpriteName;
+    public double TargetValue;
 
     public int Index;
-    public int Parent;
-    public float Person;
-    public float CoinPerson;
-    public float DiamondOnce;
-
+    public int ParentID;
     public bool Lock = true;
     public bool Delete;
-    public bool Complete;
-    public double TargetValue;
+    public bool complete;
+
+    public float Award_Person;
+    public float Award_CoinPerson;
+    public float Award_DiamondOnce;
 
-    public Achieve PostAchieve;
+    public AchieveItem PostAchieveItem;
     public AchieveType AchieveType;
 
-    public Text Tit;
-    public Text Lab;
-    public Text BtnLab;
+    public Text Title;
+    public Text DescriptionText;
+    public Text ButtonText;
     public Slider Slider;
     public Image Image;
     public Button Button;
-    public Transform AchieveItem;
+    public Transform Item;
 
     #endregion
 
-    public Achieve(XmlAttributeCollection attribute)
+    public AchieveItem(XmlAttributeCollection attribute)
     {
         SpriteName = attribute[11].Value;
         Delete = Auxiliary.StringToBool(attribute[7].Value, false);
-        Parent = Auxiliary.StringToInt(attribute[6].Value, -1);
+        ParentID = Auxiliary.StringToInt(attribute[6].Value, -1);
         AchieveType = TypeParse(attribute[4].Value);
 
         ID = int.Parse(attribute[0].Value);
         Index = int.Parse(attribute[1].Value) - 1;
         TargetValue = double.Parse(attribute[5].Value);
 
-        Person = Auxiliary.StringToFloat(attribute[10].Value, 0);
-        CoinPerson = Auxiliary.StringToFloat(attribute[9].Value, 0);
-        DiamondOnce = Auxiliary.StringToFloat(attribute[8].Value, 0);
+        Award_Person = Auxiliary.StringToFloat(attribute[10].Value, 0);
+        Award_CoinPerson = Auxiliary.StringToFloat(attribute[9].Value, 0);
+        Award_DiamondOnce = Auxiliary.StringToFloat(attribute[8].Value, 0);
 
-        AchieveManager.AchieveDic.Add(ID, this);
+        AchieveManager.AchieveItemDictionary.Add(ID, this);
         
-        if (Parent != -1)
+        if (ParentID != -1)
         {
-            AchieveManager.AchieveDic[Parent].PostAchieve = this;
+            AchieveManager.AchieveItemDictionary[ParentID].PostAchieveItem = this;
         }
     }
 
 
     public void Init()
     {
-        AchieveItem = ResourceManager.GetAchieveItem();
+        Item = ResourceManager.GetAchieveItem();
 
         Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
 
-        Auxiliary.CompileDic(AchieveItem, dic);
+        Auxiliary.CompileDic(Item, dic);
 
-        Tit = dic["Tit"].GetComponent<Text>();
-        Lab = dic["Lab"].GetComponent<Text>();
-        Slider = dic["Slider"].GetComponent<Slider>();
-        Image = dic["Icon"].GetComponent<Image>();
-        Button = dic["Btn"].GetComponent<Button>();
-        BtnLab = dic["BtnLab"].GetComponent<Text>();
+        Title = dic[AchieveItemLabel.Tit].GetComponent<Text>();
+        DescriptionText = dic[AchieveItemLabel.Lab].GetComponent<Text>();
+        Slider = dic[AchieveItemLabel.Slider].GetComponent<Slider>();
+        Image = dic[AchieveItemLabel.Icon].GetComponent<Image>();
+        Button = dic[AchieveItemLabel.Btn].GetComponent<Button>();
+        ButtonText = dic[AchieveItemLabel.BtnLab].GetComponent<Text>();
 
 
-        Lab.text = GetDescription(Desc, TargetValue);
+        DescriptionText.text = GetDescription(Description, TargetValue);
 
         Image.sprite = Sprite;
 
-        AchieveItem.SetSiblingIndex(Index);
+        Item.SetSiblingIndex(Index);
 
         Button.onClick.RemoveAllListeners();
         Button.onClick.AddListener(GetAward);
 
-        LanguageManager.Add(Tit, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveName, FullID)));
+        LanguageManager.Add(Title, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveName, FullID)));
 
 
         if (Lock)
         {
             UpdateStatus();
 
-            AchieveManager.DeleDic.Add(AchieveType, UpdateStatus);
+            AchieveManager.CallbackDictionary.Add(AchieveType, UpdateStatus);
         }
         else
         {
-            ToFinish();
+            AllChildAchieveFinish();
         }
     }
 
-    public void GetAward()
-    {
-        Lock = false;
-        Complete = false;
-
-        AchieveManager.UpdateHint();
-
-
-        Manager.AddDiamond(DiamondOnce, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Achieve);
-        Manager.SkillPerson += Person;
-        Manager.SkillCoinPerson += CoinPerson;
-
-        AudioManager.PlayClip(Clip.CurrentClip);
-
-        AchieveManager.DeleDic.Remove(AchieveType);
-
-        if (Delete)
-        {
-            ResourceManager.Save(AchieveItem);
-
-            AchieveItem = null;
-
-            if (PostAchieve != null)
-            {
-                PostAchieve.Init();
-            }
-        }
-        else
-        {
-            ToFinish();
-        }
-    }
 
 
     public void UpdateStatus()
     {
-        if (AchieveType == AchieveType.TotalPerson)
+        if (AchieveType == AchieveType.TotalVisitPerson)
         {
             UpdateStatus(Manager.TotalPerson);
         }
-        else if (AchieveType == AchieveType.ElfLevel)
+        else if (AchieveType == AchieveType.AllElfLevel)
         {
             UpdateStatus(Manager.ElfLevel);
         }
@@ -238,11 +219,11 @@ public class Achieve
         {
             UpdateStatus(Manager.Level);
         }
-        else if (AchieveType == AchieveType.AdAmt)
+        else if (AchieveType == AchieveType.PlayADsAmt)
         {
             UpdateStatus(Manager.AdAmt);
         }
-        else if (AchieveType == AchieveType.SkillAmt)
+        else if (AchieveType == AchieveType.UseSkillAmt)
         {
             UpdateStatus(Manager.SkillAmt);
         }
@@ -258,7 +239,7 @@ public class Achieve
         {
             UpdateStatus(GardenManager.MyFlower);
         }
-        else if (AchieveType == AchieveType.MiniGameAmt)
+        else if (AchieveType == AchieveType.PlayMinigameAmt)
         {
             UpdateStatus(Manager.MiniGameAmt);
         }
@@ -266,7 +247,7 @@ public class Achieve
         {
             UpdateStatus(Manager.TotalCoin);
         }
-        else if (AchieveType == AchieveType.FlowerCoin)
+        else if (AchieveType == AchieveType.TotalFlowerAwardCoin)
         {
             UpdateStatus(Manager.FlowerCoin);
         }
@@ -274,7 +255,7 @@ public class Achieve
         {
             UpdateStatus(Manager.Coin);
         }
-        else if (AchieveType == AchieveType.CostDiamond)
+        else if (AchieveType == AchieveType.SpendDiamond)
         {
             UpdateStatus(Manager.CostDiamond);
         }
@@ -317,23 +298,9 @@ public class Achieve
         CurrentValue = value;
     }
 
-
-    public void ToFinish()
+    public void UpdateDisplay(double value)
     {
-        Slider.value = 1;
-
-        Complete = false;
-
-        Button.interactable = false;
-
-        Button.image.material = null;
-
-        LanguageManager.Add(BtnLab, new MulLanStr(LanguageLabel.Object__AchieveItem_BtnLab2));
-    }
-
-    public void ToProcess(double value)
-    {
-        Complete = false;
+        complete = false;
 
         Button.interactable = false;
 
@@ -343,40 +310,54 @@ public class Achieve
 
 
         List<object> objList = new List<object>();
-        
+
         objList.Add(new MulLanStr(LanguageLabel.Object__AchieveItem_BtnLab0));
         objList.Add("\n");
 
-        if (!DiamondOnce.Equal(0))
+        if (!Award_DiamondOnce.Equal(0))
         {
-            objList.Add(TransferLabel.DiamondSprite + DiamondOnce.ToString("0") + " ");
+            objList.Add(TransferLabel.DiamondSprite + Award_DiamondOnce.ToString("0") + " ");
         }
 
-        if (!CoinPerson.Equal(0))
+        if (!Award_CoinPerson.Equal(0))
         {
             objList.Add(new MulLanStr(LanguageLabel.Common__CoinPerson));
             objList.Add("+");
-            objList.Add(CoinPerson.ToString("0") + " ");
+            objList.Add(Award_CoinPerson.ToString("0") + " ");
         }
 
-        if (!Person.Equal(0))
+        if (!Award_Person.Equal(0))
         {
             objList.Add(new MulLanStr(LanguageLabel.Common__Person));
             objList.Add("+");
-            objList.Add(Person.ToString("0") + " ");
+            objList.Add(Award_Person.ToString("0") + " ");
         }
 
-        LanguageManager.Add(BtnLab, objList.ToArray());
+        LanguageManager.Add(ButtonText, objList.ToArray());
+    }
+
+
+    public void AllChildAchieveFinish()
+    {
+        Slider.value = 1;
+
+        complete = false;
+
+        Button.interactable = false;
+
+        Button.image.material = null;
+
+        LanguageManager.Add(ButtonText, new MulLanStr(LanguageLabel.Object__AchieveItem_BtnLab2));
     }
 
-    public void ToComplete()
+    public void Complete()
     {
-        if (Complete)
+        if (complete)
         {
             return;
         }
 
-        Complete = true;
+        complete = true;
 
         Button.interactable = true;
 
@@ -390,26 +371,59 @@ public class Achieve
         objList.Add(new MulLanStr(LanguageLabel.Object__AchieveItem_BtnLab1));
         objList.Add("\n");
 
-        if (!DiamondOnce.Equal(0))
+        if (!Award_DiamondOnce.Equal(0))
         {
-            objList.Add(TransferLabel.DiamondSprite + DiamondOnce.ToString("0") + " ");
+            objList.Add(TransferLabel.DiamondSprite + Award_DiamondOnce.ToString("0") + " ");
         }
 
-        if (!CoinPerson.Equal(0))
+        if (!Award_CoinPerson.Equal(0))
         {
             objList.Add(new MulLanStr(LanguageLabel.Common__CoinPerson));
             objList.Add("+");
-            objList.Add(CoinPerson.ToString("0") + " ");
+            objList.Add(Award_CoinPerson.ToString("0") + " ");
         }
 
-        if (!Person.Equal(0))
+        if (!Award_Person.Equal(0))
         {
             objList.Add(new MulLanStr(LanguageLabel.Common__Person));
             objList.Add("+");
-            objList.Add(Person.ToString("0") + " ");
+            objList.Add(Award_Person.ToString("0") + " ");
         }
 
-        LanguageManager.Add(BtnLab, objList.ToArray());
+        LanguageManager.Add(ButtonText, objList.ToArray());
+    }
+
+    public void GetAward()
+    {
+        Lock = false;
+        complete = false;
+
+        AchieveManager.UpdateHint();
+
+
+        Manager.AddDiamond(Award_DiamondOnce, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Achieve);
+        Manager.SkillPerson += Award_Person;
+        Manager.SkillCoinPerson += Award_CoinPerson;
+
+        AudioManager.PlayClip(AudioLabel.GetCurrent);
+
+        AchieveManager.CallbackDictionary.Remove(AchieveType);
+
+        if (Delete)
+        {
+            ResourceManager.Save(Item);
+
+            Item = null;
+
+            if (PostAchieveItem != null)
+            {
+                PostAchieveItem.Init();
+            }
+        }
+        else
+        {
+            AllChildAchieveFinish();
+        }
     }
 
 
@@ -431,7 +445,7 @@ public class Achieve
         }
         else if (integer == 4)
         {
-            return AchieveType.ElfLevel;
+            return AchieveType.AllElfLevel;
         }
         else if (integer == 5)
         {
@@ -439,15 +453,15 @@ public class Achieve
         }
         else if (integer == 6)
         {
-            return AchieveType.TotalPerson;
+            return AchieveType.TotalVisitPerson;
         }
         else if (integer == 7)
         {
-            return AchieveType.SkillAmt;
+            return AchieveType.UseSkillAmt;
         }
         else if (integer == 8)
         {
-            return AchieveType.AdAmt;
+            return AchieveType.PlayADsAmt;
         }
         else if (integer == 9)
         {
@@ -459,15 +473,15 @@ public class Achieve
         }
         else if (integer == 11)
         {
-            return AchieveType.MiniGameAmt;
+            return AchieveType.PlayMinigameAmt;
         }
         else if (integer == 12)
         {
-            return AchieveType.FlowerCoin;
+            return AchieveType.TotalFlowerAwardCoin;
         }
         else if (integer == 13)
         {
-            return AchieveType.CostDiamond;
+            return AchieveType.SpendDiamond;
         }
         else if (integer == 14)
         {
@@ -511,10 +525,10 @@ public class Achieve
 
 public class AchieveManager : Regist 
 {
-    #region 变量
+    #region Config
 
-    public static Dictionary<int, Achieve> AchieveDic = new Dictionary<int, Achieve>();
-    public static Dictionary<AchieveType, UnityAction<double>> DeleDic = new Dictionary<AchieveType, UnityAction<double>>();
+    public static Dictionary<int, AchieveItem> AchieveItemDictionary = new Dictionary<int, AchieveItem>();
+    public static Dictionary<AchieveType, UnityAction<double>> CallbackDictionary = new Dictionary<AchieveType, UnityAction<double>>();
 
     public static AchieveManager Instance;
 
@@ -529,23 +543,23 @@ public class AchieveManager : Regist
 
         for (int i = 0; i < attributeList.Count; i++)
         {
-            new Achieve(attributeList[i]);
+            new AchieveItem(attributeList[i]);
         }
 
 
-        List<int> achieveList = ConfigManager.GetAchieveList();
+        List<int> achieveList = ConfigManager.GetLockAchieveIDs();
 
         for (int i = 0; i < achieveList.Count; i++)
         {
-            AchieveDic[achieveList[i]].Lock = false;
+            AchieveItemDictionary[achieveList[i]].Lock = false;
         }
 
 
-        foreach (var kv in AchieveDic)
+        foreach (var kv in AchieveItemDictionary)
         {
             if (kv.Value.Lock)
             {
-                if (kv.Value.Parent == -1 || !AchieveDic[kv.Value.Parent].Lock)
+                if (kv.Value.ParentID == -1 || !AchieveItemDictionary[kv.Value.ParentID].Lock)
                 {
                     kv.Value.Init();
                 }
@@ -566,7 +580,7 @@ public class AchieveManager : Regist
     }
 
 
-    public static void UpdateHint()
+    public static void UpdateHint() //控制侧边栏红色描边
     {
         if (TutorialManager.NewplayerTutorial)
         {
@@ -581,9 +595,9 @@ public class AchieveManager : Regist
             return;
         }
 
-        foreach (var kv in AchieveDic)
+        foreach (var kv in AchieveItemDictionary)
         {
-            if (kv.Value.Complete)
+            if (kv.Value.complete)
             {
                 if (tween.InPause)
                 {
@@ -610,9 +624,9 @@ public class AchieveManager : Regist
     {
         UnityAction<double> action;
 
-        if (DeleDic.TryGetValue(type, out action))
+        if (CallbackDictionary.TryGetValue(type, out action))
         {
-            DeleDic[type].SafeInvoke(value);
+            CallbackDictionary[type].SafeInvoke(value);
         }
     }
 
@@ -621,19 +635,19 @@ public class AchieveManager : Regist
     {
         TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.M_Achieve0).TweenForVec();
 
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
-        Achieve completedAchieve = null;
-        foreach (var achieve in AchieveDic.Values)
+        AchieveItem completedAchieveItem = null;
+        foreach (var achieve in AchieveItemDictionary.Values)
         {
-            if (achieve.Complete)
+            if (achieve.complete)
             {
-                completedAchieve = achieve;
+                completedAchieveItem = achieve;
                 break;
             }
         }
 
-        if (completedAchieve != null)
+        if (completedAchieveItem != null)
         {
             tweenRoot.AddEventOnetime
             (
@@ -641,7 +655,7 @@ public class AchieveManager : Regist
                 () =>
                 {
                     ScrollRect scrollRect = ResourceManager.Get<ScrollRect>(ObjectLabel.M_Scrr);
-                    int index = completedAchieve.AchieveItem.GetSiblingIndex();
+                    int index = completedAchieveItem.Item.GetSiblingIndex();
                     if (index < scrollRect.content.childCount - MaxDisplayAmt)
                     {
                         scrollRect.Locate(index, 0.25f, Curve.EaseOutQuad, LocatePos.Up);

+ 51 - 50
Assets/Script/Manage/AnnounceManager.cs

@@ -9,15 +9,15 @@ public class AnnounceManager
 {
     private class Content
     {
-        public bool IsImage;
-        public string text;
+        public bool IsSprite;
+        public string content;
         public TextAnchor Alignment;
 
-        public Content(bool isImage, string text, TextAnchor alignment)
+        public Content(bool isSprite, string content, TextAnchor alignment)
         {
-            this.text = text;
-            this.IsImage = isImage;
-            this.Alignment = alignment;
+            this.content = content;
+            IsSprite = isSprite;
+            Alignment = alignment;
         }
     }
 
@@ -28,43 +28,55 @@ public class AnnounceManager
     public static string Hant = "ChineseTraditional";
     public static string En = "English";
 
-    #endregion
+    public static bool Inited;
 
-    public static bool Initialized;
+    private static List<Text> Textes = new List<Text>();
+    private static Dictionary<string, List<Content>> ContentDictionary = new Dictionary<string, List<Content>>();
 
-    private static List<Text> TextList = new List<Text>();
-    private static Dictionary<string, List<Content>> ContentsDic = new Dictionary<string, List<Content>>();
+    #endregion
 
-    public static void AddLine(bool isImage, string language, string content, TextAnchor alignment)
+    private static int SpriteSize = 300;
+    public static void Init(string language)
     {
-        if (language == DefaultLanguage)
-        {
-            AddLine(isImage, En, content, alignment);
-            AddLine(isImage, Hants, content, alignment);
-            AddLine(isImage, Hant, content, alignment);
-        }
+        Inited = true;
+
+        List<Content> contents = ContentDictionary[language];
 
-        if (!ContentsDic.ContainsKey(language))
+        for (int i = 0; i < contents.Count; i++)
         {
-            ContentsDic.Add(language, new List<Content>());
-        }
+            Transform transform = ResourceManager.Get(ResourceLabel.NotifyItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.R_Grid), false);
 
-        ContentsDic[language].Add(new Content(isImage, content, alignment));
+            if (contents[i].IsSprite)
+            {
+                transform.GetComponent<Text>().fontSize = SpriteSize;
+                transform.GetComponent<Text>().verticalOverflow = VerticalWrapMode.Overflow;
+                transform.GetComponent<Text>().horizontalOverflow = HorizontalWrapMode.Overflow;
+                transform.GetComponent<Text>().resizeTextForBestFit = false;
+                transform.GetComponent<ContentSizeFitter>().enabled = true;
+
+                transform.GetChild(0).GetComponent<Image>().sprite = HttpManager.NotificationSprite;
+            }
+
+            transform.GetComponent<Text>().text = contents[i].content;
+            transform.GetComponent<Text>().alignment = contents[i].Alignment;
+
+            Textes.Add(transform.GetComponent<Text>());
+        }
     }
 
 
-    public static void Show()
+    public static void ShowAnnouncePanel()
     {
-        if (!Initialized)
+        if (!Inited)
         {
-            Initialize(GetLanguage());
+            Init(GetLanguage());
         }
         else
         {
             SwitchLanguage(GetLanguage());
         }
 
-        AudioManager.PlayClip(Clip.BubbleClip);
+        AudioManager.PlayClip(AudioLabel.Bubble);
 
         ResourceManager.Get(ObjectLabel.R_Notify).TweenForCG();
 
@@ -79,40 +91,29 @@ public class AnnounceManager
         );
     }
 
-    private static int AnnounceImageSize = 300;
-    public static void Initialize(string language)
-    {
-        Initialized = true;
-
-        List<Content> contents = ContentsDic[language];
 
-        for (int i = 0; i < contents.Count; i++)
+    public static void AddContent(bool isImage, string language, string content, TextAnchor alignment)
+    {
+        if (language == DefaultLanguage)
         {
-            Transform transform = ResourceManager.Get(ResourceLabel.NotifyItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.R_Grid), false);
-
-            if (contents[i].IsImage)
-            {
-                transform.GetComponent<Text>().fontSize = AnnounceImageSize;
-                transform.GetComponent<Text>().verticalOverflow = VerticalWrapMode.Overflow;
-                transform.GetComponent<Text>().horizontalOverflow = HorizontalWrapMode.Overflow;
-                transform.GetComponent<Text>().resizeTextForBestFit = false;
-                transform.GetComponent<ContentSizeFitter>().enabled = true;
-
-                transform.GetChild(0).GetComponent<Image>().sprite = HttpManager.NotificationSprite;
-            }
-
-            transform.GetComponent<Text>().text = contents[i].text;
-            transform.GetComponent<Text>().alignment = contents[i].Alignment;
+            AddContent(isImage, En, content, alignment);
+            AddContent(isImage, Hants, content, alignment);
+            AddContent(isImage, Hant, content, alignment);
+        }
 
-            TextList.Add(transform.GetComponent<Text>());
+        if (!ContentDictionary.ContainsKey(language))
+        {
+            ContentDictionary.Add(language, new List<Content>());
         }
+
+        ContentDictionary[language].Add(new Content(isImage, content, alignment));
     }
 
     public static void SwitchLanguage(string language)
     {
-        for (int i = 0; i < TextList.Count; i++)
+        for (int i = 0; i < Textes.Count; i++)
         {
-            TextList[i].text = ContentsDic[language][i].text;
+            Textes[i].text = ContentDictionary[language][i].content;
         }
     }
 

+ 73 - 108
Assets/Script/Manage/AudioManager.cs

@@ -3,100 +3,66 @@
 using System.Collections;
 using System.Collections.Generic;
 
-public enum Clip
+public class AudioLabel
 {
-    BtnClip,
-    SkillClip,
-    ErrorClip,
-    DropClip,
-    CloseClip,
-    FlowerClip,
-    BubbleClip,
-    CurrentClip,
-    MiniEndClip,
+    public static string ClickButton = "BtnClip";
+    public static string UseSkill = "SkillClip";
+    public static string Error = "ErrorClip";
+    public static string Minigame_DropAward = "DropClip";
+    public static string Close = "CloseClip";
+    public static string PlantFlower = "FlowerClip";
+    public static string Bubble = "BubbleClip";
+    public static string GetCurrent = "CurrentClip";
+    public static string MinigameEnd = "MiniEndClip";
 }
 
 public class AudioManager : Regist
 {
     #region Config
 
-    public static bool Audio = true;
-    public static bool Music = true;
-    public static Coroutine CoroTheme;
-    public static Coroutine CoroMiniGame;
-    public static Coroutine CoroPartyTheme;
     public static AudioManager Instance;
 
-    public static AudioClip BtnClip;
-    public static AudioClip SkillClip;
-    public static AudioClip ErrorClip;
-    public static AudioClip DropClip;
-    public static AudioClip CloseClip;
-    public static AudioClip FlowerClip;
-    public static AudioClip BubbleClip;
-    public static AudioClip CurrentClip;
-    public static AudioClip MiniEndClip;
-    public static AudioSource MusicClip;
-    public static AudioSource MusicMini;
-    public static AudioSource MusicTheme;
-    public static AudioSource MusicPartyTheme;
-
-    public static Dictionary<Clip, AudioClip> ClipDic = new Dictionary<Clip, AudioClip>();
+    public static bool AudioOn = true;
+    public static bool MusicOn = true;
+    public static Coroutine CoroThemeMusic;
+    public static Coroutine CoroMiniGameMusic;
+    public static Coroutine CoroPartyThemeMusic;
+
+    public static AudioSource ClipAudioSource;
+    public static AudioSource MinigameAudio;
+    public static AudioSource GardenThemeAudio;
+    public static AudioSource PartyThemeAudio;
 
     #endregion
 
     public override void InstantiatePrefabs()
     {
-        BtnClip = ResourceManager.Load<AudioClip>(ResourceLabel.BtnClip, Folder.Audio);
-        SkillClip = ResourceManager.Load<AudioClip>(ResourceLabel.SkillClip, Folder.Audio);
-        ErrorClip = ResourceManager.Load<AudioClip>(ResourceLabel.ErrorClip, Folder.Audio);
-        DropClip = ResourceManager.Load<AudioClip>(ResourceLabel.DropClip, Folder.Audio);
-        CloseClip = ResourceManager.Load<AudioClip>(ResourceLabel.CloseClip, Folder.Audio);
-        FlowerClip = ResourceManager.Load<AudioClip>(ResourceLabel.FlowerClip, Folder.Audio);
-        BubbleClip = ResourceManager.Load<AudioClip>(ResourceLabel.BubbleClip, Folder.Audio);
-        CurrentClip = ResourceManager.Load<AudioClip>(ResourceLabel.CurrentClip, Folder.Audio);
-        MiniEndClip = ResourceManager.Load<AudioClip>(ResourceLabel.MiniEndClip, Folder.Audio);
-
         ResourceManager.Get(ResourceLabel.Music, Folder.Audio, true, transform, true, ObjType.Music);
     }
 
     public override void FirstInit()
     {
         Instance = this;
-        
-        #region ClipDic
-
-        ClipDic.Add(Clip.BtnClip, BtnClip);
-        ClipDic.Add(Clip.SkillClip, SkillClip);
-        ClipDic.Add(Clip.ErrorClip, ErrorClip);
-        ClipDic.Add(Clip.DropClip, DropClip);
-        ClipDic.Add(Clip.CloseClip, CloseClip);
-        ClipDic.Add(Clip.FlowerClip, FlowerClip);
-        ClipDic.Add(Clip.BubbleClip, BubbleClip);
-        ClipDic.Add(Clip.CurrentClip, CurrentClip);
-        ClipDic.Add(Clip.MiniEndClip, MiniEndClip);
-
-        #endregion
 
         #region MusicMini
 
-        TweenAudio tween = MusicMini.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
+        TweenAudio tween = MinigameAudio.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
 
         tween.OnForwardStart += () =>
         {
-            if (Music)
+            if (MusicOn)
             {
-                MusicMini.Play();
+                MinigameAudio.Play();
 
-                CoroMiniGame = StartCoroutine(Loop(MusicMini));
+                CoroMiniGameMusic = StartCoroutine(LoopPlayback(MinigameAudio));
             }
         };
 
         tween.OnBackwardStart += () =>
         {
-            if (Music)
+            if (MusicOn)
             {
-                StopCoroutine(CoroTheme);
+                StopCoroutine(CoroThemeMusic);
             }
         };
 
@@ -104,23 +70,23 @@ public class AudioManager : Regist
 
         #region MusicTheme
 
-        tween = MusicTheme.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
+        tween = GardenThemeAudio.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
 
         tween.OnForwardStart += () =>
         {
-            if (Music)
+            if (MusicOn)
             {
-                MusicTheme.Play();
+                GardenThemeAudio.Play();
 
-                CoroTheme = StartCoroutine(Loop(MusicTheme));
+                CoroThemeMusic = StartCoroutine(LoopPlayback(GardenThemeAudio));
             }
         };
 
         tween.OnBackwardStart += () =>
         {
-            if (Music)
+            if (MusicOn)
             {
-                StopCoroutine(CoroTheme);
+                StopCoroutine(CoroThemeMusic);
             }
         };
 
@@ -128,35 +94,35 @@ public class AudioManager : Regist
 
         #region MusicPartyTheme
 
-        tween = MusicPartyTheme.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
+        tween = PartyThemeAudio.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
 
         tween.OnForwardStart += () =>
         {
-            if (Music)
+            if (MusicOn)
             {
-                MusicPartyTheme.Play();
+                PartyThemeAudio.Play();
 
-                CoroPartyTheme = StartCoroutine(Loop(MusicPartyTheme));
+                CoroPartyThemeMusic = StartCoroutine(LoopPlayback(PartyThemeAudio));
             }
         };
 
         tween.OnBackwardStart += () =>
         {
-            if (Music)
+            if (MusicOn)
             {
-                StopCoroutine(CoroPartyTheme);
+                StopCoroutine(CoroPartyThemeMusic);
             }
         };
 
         #endregion
 
-        if (!Music)
+        if (!MusicOn)
         {
             ResourceManager.SetActive(ObjectLabel.L_MusicOn, false);
             ResourceManager.SetActive(ObjectLabel.L_MusicOff, true);
         }
 
-        if (!Audio)
+        if (!AudioOn)
         {
             ResourceManager.SetActive(ObjectLabel.L_AudioOn, false);
             ResourceManager.SetActive(ObjectLabel.L_AudioOff, true);
@@ -167,71 +133,70 @@ public class AudioManager : Regist
     {
         AudioSource[] audioSources = ResourceManager.Gets<AudioSource>(ResourceLabel.Music);
 
-        MusicClip = audioSources[2];
-        MusicMini = audioSources[1];
-        MusicTheme = audioSources[0];
-        MusicPartyTheme = audioSources[3];
+        ClipAudioSource = audioSources[2];
+        MinigameAudio = audioSources[1];
+        GardenThemeAudio = audioSources[0];
+        PartyThemeAudio = audioSources[3];
     }
 
+    public static void LoadPrefs()
+    {
+        AudioOn = PlayerPrefs.GetInt(Lib.AudioPrefs, 1).ToBool();
+        MusicOn = PlayerPrefs.GetInt(Lib.MusicPrefs, 1).ToBool();
+    }
 
-    public static void PlayClip(Clip clip)
+    public static void SetLogoVolume()
     {
-        if (Audio)
+        if (!AudioOn || !MusicOn)
         {
-            AudioClip audioClip = ClipDic[clip];
-
-            MusicClip.PlayOneShot(audioClip);
+            GameObject.Find(ResourceLabel.LOGO0005).GetComponent<AudioSource>().volume = 0;
         }
     }
 
 
-    public static void InitAudioSettingFromPlayerPrefs()
+    public static void PlayClip(string clipName)
     {
-        Audio = PlayerPrefs.GetInt(Lib.AudioPrefs, 1).ToBool();
-        Music = PlayerPrefs.GetInt(Lib.MusicPrefs, 1).ToBool();
-    }
-
-    public static void SetLogoVolume()
-    {
-        if (!Audio || !Music)
+        if (AudioOn)
         {
-            GameObject.Find(ResourceLabel.LOGO0005).GetComponent<AudioSource>().volume = 0;
+            AudioClip audioClip = ResourceManager.Load<AudioClip>(clipName, Folder.Audio);
+
+            ClipAudioSource.PlayOneShot(audioClip);
         }
     }
 
 
     public void MusicSwitch()
     {
-        if (Music)
+        if (MusicOn)
         {
-            Music = false;
+            MusicOn = false;
 
             ResourceManager.SetActive(ObjectLabel.L_MusicOn, false);
             ResourceManager.SetActive(ObjectLabel.L_MusicOff, true);
             
-            MusicMini.Pause();
-            MusicTheme.Pause();
-            MusicPartyTheme.Pause();
+            MinigameAudio.Pause();
+            GardenThemeAudio.Pause();
+            PartyThemeAudio.Pause();
 
             PlayerPrefs.SetInt(Lib.MusicPrefs, 0);
         }
         else
         {
-            Music = true;
+            MusicOn = true;
 
             ResourceManager.SetActive(ObjectLabel.L_MusicOn, true);
             ResourceManager.SetActive(ObjectLabel.L_MusicOff, false);
 
-            MusicMini.UnPause();
-            MusicPartyTheme.UnPause();
+            MinigameAudio.UnPause();
+            PartyThemeAudio.UnPause();
 
-            if (MusicTheme.isPlaying)
+            if (GardenThemeAudio.isPlaying)
             {
-                MusicTheme.UnPause();
+                GardenThemeAudio.UnPause();
             }
             else
             {
-                MusicTheme.TweenReForAudio();
+                GardenThemeAudio.TweenReForAudio();
             }
 
             PlayerPrefs.SetInt(Lib.MusicPrefs, 1);
@@ -240,9 +205,9 @@ public class AudioManager : Regist
 
     public void AudioSwitch()
     {
-        if (Audio)
+        if (AudioOn)
         {
-            Audio = false;
+            AudioOn = false;
 
             ResourceManager.SetActive(ObjectLabel.L_AudioOn, false);
             ResourceManager.SetActive(ObjectLabel.L_AudioOff, true);
@@ -251,7 +216,7 @@ public class AudioManager : Regist
         }
         else
         {
-            Audio = true;
+            AudioOn = true;
 
             ResourceManager.SetActive(ObjectLabel.L_AudioOn, true);
             ResourceManager.SetActive(ObjectLabel.L_AudioOff, false);
@@ -262,7 +227,7 @@ public class AudioManager : Regist
 
 
     private float LoopDelay = 1.5f;
-    public IEnumerator Loop(AudioSource audioSource)
+    public IEnumerator LoopPlayback(AudioSource audioSource)
     {
         while (true)
         {
@@ -283,7 +248,7 @@ public class AudioManager : Regist
                 goto Mark;
             }
 
-            while (!Music)
+            while (!MusicOn)
             {
                 goto Mark;
             }

File diff suppressed because it is too large
+ 268 - 274
Assets/Script/Manage/ConfigManager.cs


+ 16 - 17
Assets/Script/Manage/DebugManager.cs

@@ -13,53 +13,52 @@ public class DebugManager : MonoBehaviour
 {
     #region Config
 
-    public static Text Lab
+    public static Text DebugBugText
     {
         get
         {
-            if (Lab_ == null)
+            if (debugBugText == null)
             {
-                Lab = ResourceManager.Get<Text>(ObjectLabel.E_ScrrLab, false);
+                DebugBugText = ResourceManager.Get<Text>(ObjectLabel.E_ScrrLab, false);
             }
 
-            return Lab_;
+            return debugBugText;
         }
-        set { Lab_ = value; }
+        set { debugBugText = value; }
     }
+    private static Text debugBugText;
 
-    private static Text Lab_;
-
-
-    public int Counter;
-    public float Timer;
+    public int TextCounter;
+    public float FrameRateTimer;
 
     #endregion
 
     public void Update()
     {
-        Timer += Time.deltaTime;
-        Counter++;
+        FrameRateTimer += Time.deltaTime;
+        TextCounter++;
 
-        if (Timer >= 1)
+        if (FrameRateTimer >= 1)
         {
             //Log($"当前帧率  {Counter}    目标帧率 {Application.targetFrameRate}");
 
-            Timer = 0;
-            Counter = 0;
+            FrameRateTimer = 0;
+            TextCounter = 0;
         }
     }
 
 
     public static void Log(string message)
     {
-        if (Lab == null)
+        if (DebugBugText == null)
         {
             return;
         }
 
-        Lab.text += '\n' + message;
+        DebugBugText.text += '\n' + message;
     }
 
+
     public static void TryCatch(Action tryAction, Action catchAction)
     {
         try

+ 54 - 10
Assets/Script/Manage/GardenManager.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
@@ -11,6 +11,46 @@ using System.Collections.Generic;
 
 using Random = UnityEngine.Random;
 
+public class GardenLabel
+{
+    public static string GardenBK2 = "GardenBK2";
+    public static string GardenBK3 = "GardenBK3";
+    public static string GardenBK4 = "GardenBK4";
+    public static string BK2RightPos = "BK2RightPos";
+    public static string BK2LeftPos = "BK2LeftPos";
+    public static string BK3RightPos = "BK3RightPos";
+    public static string BK3LeftPos = "BK3LeftPos";
+    public static string BK4RightPos = "BK4RightPos";
+    public static string BK4LeftPos = "BK4LeftPos";
+    public static string MinigameLeftPos = "MinigameLeftPos";
+    public static string GardenCloud1 = "GardenCloud1";
+    public static string GardenCloud2 = "GardenCloud2";
+    public static string GardenCloud3 = "GardenCloud3";
+    public static string BirdPivot = "BirdPivot";
+    public static string GardenLeftTree = "GardenLeftTree";
+    public static string GardenRightTree = "GardenRightTree";
+    public static string GardenRainbow = "GardenRainbow";
+
+    public static string GardenMini = "GardenMini";
+    public static string SlotPage = "GardenPage";
+    public static string GardenNormal = "GardenNormal";
+    public static string PlayerPosTra = "PlayerPosTra";
+
+    public static string MiniLeft = "MiniLeft";
+    public static string MiniRight1 = "MiniRight1";
+    public static string MiniRight2 = "MiniRight2";
+
+    public static string SlotMini1 = "SlotMini1";
+    public static string SlotMini2 = "SlotMini2";
+    public static string SlotMini3 = "SlotMini3";
+    public static string SlotMini4 = "SlotMini4";
+    public static string SlotMini5 = "SlotMini5";
+    public static string SlotMini6 = "SlotMini6";
+    public static string SlotMini7 = "SlotMini7";
+    public static string SlotMini8 = "SlotMini8";
+    public static string SlotMini9 = "SlotMini9";
+}
+
 public enum ElfType
 {
     Bee_Red,
@@ -308,7 +348,7 @@ public class GardenManager : Regist
         AwardTimer = Random.Range(MinAwardTime, MaxAwardTime);
 
         UnlockSlot();
-        for (int i = 0; i < ConfigManager.GetPlayerInt(PlayerConfigLabel.ExtraSlot); i++)
+        for (int i = 0; i < ConfigManager.GetIntFormConfig(PlayerConfigLabel.ExtraSlot); i++)
         {
             UnlockSlot();
         }
@@ -353,6 +393,10 @@ public class GardenManager : Regist
     public static int DefaultPage = 2;
     public static int CriticalSlotAmt = 7;
     public static int TotalSlotAmtInOnePage = 9;
+    public static int LeftTopSlotIndex = 0;
+    public static int RightTopSlotIndex = 3;
+    public static int RightDownSlotIndex = 8;
+    public static int LeftDownSlotIndex = 4;
     public static void UnlockSlot()
     {
         for (int i = 0; i < SlotList.Count; i++)
@@ -381,13 +425,13 @@ public class GardenManager : Regist
     private static float PageXOffset = 18.9f;
     public static void CreatePage()
     {
-        Transform tra = ResourceManager.Get(ResourceLabel.Page, Folder.Scene, false, ResourceManager.Get("GardenPage"), false, ObjType.Page);
+        Transform tra = ResourceManager.Get(ResourceLabel.Page, Folder.Scene, false, ResourceManager.Get(GardenLabel.SlotPage), false, ObjType.Page);
 
         float offset = Page*PageXOffset;
 
         tra.SetLX(offset);
 
-        Vector3 pos = ResourceManager.Get("GardenPage").position;
+        Vector3 pos = ResourceManager.Get(GardenLabel.SlotPage).position;
 
         pos.x = -offset;
         
@@ -450,7 +494,7 @@ public class GardenManager : Regist
         Image image = ResourceManager.Get<Image>(ObjectLabel.H_Icon2);
         image.material = material;
         image.sprite = flowerInfo.Icon;
-        image.Resize(true, 0.6125f, 0.6125f);
+        image.Resize(true, DeltaSize.FlowerCardSpriteX, DeltaSize.FlowerCardSpriteY);
     }
 
     private static void SetRetrieveBtn(Button button, Text buttonLab, Slot seleSlot = null)
@@ -463,7 +507,7 @@ public class GardenManager : Regist
         (
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 RetriveFlower(seleSlot);
             }
@@ -507,7 +551,7 @@ public class GardenManager : Regist
 
                             PlayFlowerCardMatTween();
 
-                            AudioManager.PlayClip(Clip.CurrentClip);
+                            AudioManager.PlayClip(AudioLabel.GetCurrent);
 
                             ResourceManager.Get(ObjectLabel.H_Icon1).FindChild($"{ObjectLabel.H_UIFlashLight}/{ObjectLabel.H_UIParticleSystem}").GetComponent<UIPartical>().Begin();
                         },
@@ -549,7 +593,7 @@ public class GardenManager : Regist
             ResourceManager.SetActive(ObjectLabel.H_Desc, true);
             ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = true;
             ResourceManager.SetActive(ObjectLabel.H_AmtLab, true);
-            ResourceManager.SetText(ObjectLabel.H_AmtLab, "x" + flowerInfo.RemainAmount);
+            ResourceManager.SetText(ObjectLabel.H_AmtLab, FlowerInfo.AmountTextPrefix + flowerInfo.RemainAmount);
             ResourceManager.SetActive(ObjectLabel.H_Rotate, true);
         }
     }
@@ -577,7 +621,7 @@ public class GardenManager : Regist
             ResourceManager.Get(ObjectLabel.H_Icon2),
             new List<string>()
             {
-                "_GrayLerp",
+                MaterialLabel.GrayMatGrayLerp,
             }
         );
 
@@ -660,7 +704,7 @@ public class GardenManager : Regist
             slot.Plant(flowerInfo, true);
             SetPlantStatus(flowerInfo);
             SetRetrieveStatus(flowerInfo, RetrieveButton);
-            AudioManager.PlayClip(Clip.FlowerClip);
+            AudioManager.PlayClip(AudioLabel.PlantFlower);
         }
     }
 

+ 84 - 215
Assets/Script/Manage/HttpManager.cs

@@ -16,6 +16,14 @@ using System.Collections.Generic;
 
 using Random = UnityEngine.Random;
 
+public class MailItemLabel
+{
+    public static string Lab = "Lab";
+    public static string Icon1 = "Icon1";
+    public static string Icon2 = "Icon2";
+    public static string Icon3 = "Icon3";
+}
+
 public class MyCredentials : ICredentialsByHost
 {
     public NetworkCredential NetworkCredential;
@@ -106,8 +114,8 @@ public class HttpManager : Regist
     public static bool FirstConnect = true;
 
     public static int ReplayVersion;
-    public static string ID = "Default";
-    public static string SerialNumber = "Default";
+    public static string ID = PlayerConfigLabel.DefaultID;
+    public static string SerialNumber = PlayerConfigLabel.DefaultSerialNumber;
     public static string ReportContent;
 
     public static JsonData JsonData;
@@ -138,32 +146,23 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "1710065808151506837");
-        //urlData.Add("t", "1710066204207012789");
-
-        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/praise/target", urlData, Debug.Log, URLRequest.Method.POST);
-
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "1709207727231988804");
-
-        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/other", urlData, Debug.Log, URLRequest.Method.POST);
+        
     }
 
+    private int MaxReconnectAmt = 4;
+    private float ReconnectTime = 2f;
     public void Update()
     {
         if (!Manager.Complete && !Complete)
         {
             Timer += UnityEngine.Time.deltaTime;
 
-            if (Timer >= 2f)
+            if (Timer >= ReconnectTime)
             {
                 Timer = 0;
                 Counter++;
 
-                if (Counter > 4)
+                if (Counter > MaxReconnectAmt)
                 {
                     Complete = true;
 
@@ -192,7 +191,7 @@ public class HttpManager : Regist
 
     public override void FirstInit()
     {
-        ReplayVersion = ConfigManager.GetPlayerInt(PlayerConfigLabel.ReplayVersion);
+        ReplayVersion = ConfigManager.GetIntFormConfig(PlayerConfigLabel.ReplayVersion);
     }
 
 
@@ -239,8 +238,6 @@ public class HttpManager : Regist
             urlData,
             data =>
             {
-                //Debug.Log(data);
-
                 string str = "{\"l\":" + data.Substring(1) + "}";
 
                 JsonData jsondata;
@@ -256,24 +253,8 @@ public class HttpManager : Regist
                 }
                 
                 RankRequestCallback(jsondata);
-
-                //Debug.Log(data[0]);
-
-                //StreamWriter streamWriter = new StreamWriter("Assets/123.txt");
-
-                //streamWriter.Write(data);
-
-                //streamWriter.Close();
             }
         );
-
-        //URLRequest.CreateURLRequest
-        //(
-        //    NewBaseURL + "/user/look",
-        //    urlData,
-        //    RankRequestCallback,
-        //    URLRequest.Method.POST
-        //);
     }
 
     public static void RankRequestCallback(JsonData jsonData)
@@ -296,12 +277,10 @@ public class HttpManager : Regist
 
     public static void NotificationRequest()
     {
-        //Debug.Log("A");
         IndexRequest
         (
             data =>
             {
-                //Debug.Log("B");
                 URLRequestData urlData = new URLRequestData();
                 URLRequest.CreateStrURLRequest
                 (
@@ -310,7 +289,6 @@ public class HttpManager : Regist
                     urlData,
                     notificationXml =>
                     {
-                        //Debug.Log("C");
                         NotificationCallback(notificationXml);
                     }
                 );
@@ -320,7 +298,6 @@ public class HttpManager : Regist
 
     public static void NotificationCallback(string xml)
     {
-        //Debug.Log("D");
         XmlNode rootNode;
         XmlDocument document = new XmlDocument();
 
@@ -345,10 +322,6 @@ public class HttpManager : Regist
         }
         catch (Exception)
         {
-
-        }
-        finally
-        {
             
         }
     }
@@ -359,10 +332,10 @@ public class HttpManager : Regist
 
         for (int i = 0; i < nodeList.Count; i++)
         {
-            AnnounceManager.AddLine(false, nodeList[i].Attributes[0].Value, nodeList[i].InnerText, TextAnchor.MiddleLeft);
+            AnnounceManager.AddContent(false, nodeList[i].Attributes[0].Value, nodeList[i].InnerText, TextAnchor.MiddleLeft);
         }
 
-        AnnounceManager.AddLine(false, "null", node.SelectSingleNode("date").InnerText, TextAnchor.MiddleLeft);
+        AnnounceManager.AddContent(false, "null", node.SelectSingleNode("date").InnerText, TextAnchor.MiddleLeft);
 
         nodeList = node.SelectSingleNode("content").ChildNodes;
 
@@ -370,17 +343,17 @@ public class HttpManager : Regist
         {
             if (nodeList[i].Name == "text")
             {
-                AnnounceManager.AddLine(false, nodeList[i].Attributes[0].Value, nodeList[i].InnerText, TextAnchor.MiddleLeft);
+                AnnounceManager.AddContent(false, nodeList[i].Attributes[0].Value, nodeList[i].InnerText, TextAnchor.MiddleLeft);
             }
             else if (nodeList[i].Name == "image")
             {
                 urlList.UniqueAdd(nodeList[i].InnerText);
 
-                AnnounceManager.AddLine(true, "null", $"<({Path.GetFileNameWithoutExtension(nodeList[i].InnerText)})>", TextAnchor.MiddleCenter);
+                AnnounceManager.AddContent(true, "null", $"<({Path.GetFileNameWithoutExtension(nodeList[i].InnerText)})>", TextAnchor.MiddleCenter);
             }
         }
 
-        AnnounceManager.AddLine(false, "null", "", TextAnchor.MiddleLeft);
+        AnnounceManager.AddContent(false, "null", "", TextAnchor.MiddleLeft);
     }
 
     public static void PullNotifyTexsCallback(List<WWW> wwwList)
@@ -427,8 +400,6 @@ public class HttpManager : Regist
         {
             ResourceManager.Get(ObjectLabel.C_Notify).TweenForCG();
         }
-
-        //Debug.Log("Done");
     }
 
     public static IEnumerator PullNotifyTexs(List<string> urlList, Action<List<WWW>> callback)
@@ -481,7 +452,7 @@ public class HttpManager : Regist
             return;
         }
 
-        if (sendID.ToLower() == "default" || receiveID.ToLower() == "default")
+        if (sendID.ToLower() == PlayerConfigLabel.DefaultID.ToLower() || receiveID.ToLower() == PlayerConfigLabel.DefaultID.ToLower())
         {
             return;
         }
@@ -492,10 +463,7 @@ public class HttpManager : Regist
         urlData.Add("u", receiveID);
         urlData.Add("i", content);
         urlData.Add("t", type.GetHashCode());
-        //Debug.LogWarning(sendID);
-        //Debug.LogWarning(receiveID);
-        //Debug.LogWarning(content);
-        //Debug.LogWarning(type.GetHashCode());
+
         URLRequest.CreateStrURLRequest
         (
             true,
@@ -528,16 +496,13 @@ public class HttpManager : Regist
             return;
         }
 
-        if (id.ToLower() == "default")
+        if (id.ToLower() == PlayerConfigLabel.DefaultID.ToLower())
         {
             callback.Invoke(defaultData);
             return;
         }
 
         URLRequestData urlData = new URLRequestData();
-        //Debug.LogWarning(id);
-        //Debug.LogWarning(page);
-        //Debug.LogWarning(type.GetHashCode());
         urlData.Add("u", id);
         urlData.Add("p", page);
         urlData.Add("t", type.GetHashCode());
@@ -559,7 +524,7 @@ public class HttpManager : Regist
             {
                 if (data.Inst_Object.ContainsKey("error"))
                 {
-                    if (ConfigManager.PlayerDoc_ != null)
+                    if (ConfigManager.configDocument != null)
                     {
                         if (Application.platform == RuntimePlatform.Android)
                         {
@@ -567,7 +532,7 @@ public class HttpManager : Regist
                         }
                         else if (Application.platform == RuntimePlatform.IPhonePlayer)
                         {
-                            PackLock = ConfigManager.GetPlayerBool("PackLock");
+                            PackLock = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.PackLock);
                         }
                     }
                 }
@@ -637,34 +602,36 @@ public class HttpManager : Regist
 
     public static void GetMailReward(MailReward mailReward)
     {
-        //Debug.Log(mailReward.Id);
-        ConfigManager.SavePlayerString("OneTimeReward", $"{ConfigManager.GetPlayerString("OneTimeReward")} {mailReward.Id}".Trim(' '));
+        ConfigManager.SaveStringToConfig(PlayerConfigLabel.OneTimeReward, $"{ConfigManager.GetStringFormConfig(PlayerConfigLabel.OneTimeReward)} {mailReward.Id}".Trim(' '));
+
+        Transform mailItem = ResourceManager.Get(ResourceLabel.MailItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
+        Dictionary<string, Transform> childDictionary = new Dictionary<string, Transform>();
+        Auxiliary.CompileDic(mailItem, childDictionary);
+        Text lab = childDictionary[MailItemLabel.Lab].GetComponent<Text>();
+        Image Icon1 = childDictionary[MailItemLabel.Icon1].GetComponent<Image>();
+        Image Icon2 = childDictionary[MailItemLabel.Icon2].GetComponent<Image>();
+        Image Icon3 = childDictionary[MailItemLabel.Icon3].GetComponent<Image>();
 
         if (mailReward.Key == "pack")
         {
             SkillRoot skillRoot;
 
-            if (Manager.SkillDic.TryGetValue($"Pack{mailReward.Value}", out skillRoot))
+            if (Manager.SkillDic.TryGetValue($"{SkillConfigLabel.Pack}{mailReward.Value}", out skillRoot))
             {
                 Pack pack = (Pack) skillRoot;
 
                 pack.OnBuySucceed();
 
-                Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
-
                 float newSpriteSize = 0.35f;
 
-                mailItem.GetChild(1).SetActive(false);
-
-                mailItem.GetChild(0).GetComponent<Image>().sprite = pack.Icon;
+                Icon2.SetActive(false);
+                Icon3.SetActive(false);
+                Icon1.sprite = pack.Icon;
+                Icon1.Resize(true, newSpriteSize, newSpriteSize);
+                Icon1.transform.localPosition = new Vector2(0, 0);
+                lab.GetComponent<Text>().text = pack.Name;
 
-                mailItem.GetChild(0).GetComponent<Image>().Resize(true, newSpriteSize, newSpriteSize);
-
-                mailItem.GetChild(0).transform.localPosition = new Vector2(0, 0);
-
-                mailItem.GetChild(2).GetComponent<Text>().text = pack.Name;
-
-                InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.PackSprite}{pack.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.PackSprite}{pack.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
             }
             else
             {
@@ -687,32 +654,12 @@ public class HttpManager : Regist
                         PlayerManager.BoughtCloseList.UniqueAdd(idList[i]);
                     }
 
-                    Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
-
                     float newSize = 0.6f;
                     float newSpriteSize = closeItem.PixelSize*newSize/closeItem.Sprites[0].rect.width;
+                    closeItem.SetUpUI(newSpriteSize, new Vector2(), Icon1, Icon3, Icon2);
+                    lab.text = closeItem.Name;
 
-                    mailItem.GetChild(1).GetComponent<Image>().sprite = closeItem.Sprites[0];
-
-                    mailItem.GetChild(1).GetComponent<Image>().Resize(true, newSpriteSize, newSpriteSize);
-
-                    mailItem.GetChild(1).transform.localPosition = new Vector2(0, closeItem.IconOffset*newSize);
-
-                    if (closeItem.Sprites.Length > 1)
-                    {
-                        mailItem.GetChild(0).SetActive(true);
-                        mailItem.GetChild(0).GetComponent<Image>().sprite = closeItem.Sprites[1];
-                        mailItem.GetChild(0).GetComponent<Image>().Resize(true, newSpriteSize, newSpriteSize);
-                        mailItem.GetChild(0).transform.localPosition = closeItem.IconOffset1*newSpriteSize + new Vector2(0, closeItem.IconOffset*newSize);
-                    }
-                    else
-                    {
-                        mailItem.GetChild(0).SetActive(false);
-                    }
-
-                    mailItem.GetChild(2).GetComponent<Text>().text = closeItem.Name;
-
-                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CloseSprite}{closeItem.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CloseSprite}{closeItem.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
                 }
                 else
                 {
@@ -731,21 +678,16 @@ public class HttpManager : Regist
                 {
                     flowerInfo.Add();
 
-                    Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
-
                     float newSpriteSize = 0.225f;
 
-                    mailItem.GetChild(1).SetActive(false);
-
-                    mailItem.GetChild(0).GetComponent<Image>().sprite = flowerInfo.Icon;
+                    Icon2.SetActive(false);
+                    Icon3.SetActive(false);
+                    Icon1.sprite = flowerInfo.Icon;
+                    Icon1.Resize(true, newSpriteSize, newSpriteSize);
+                    Icon1.transform.localPosition = new Vector2(0, 0);
+                    lab.text = flowerInfo.Name;
 
-                    mailItem.GetChild(0).GetComponent<Image>().Resize(true, newSpriteSize, newSpriteSize);
-
-                    mailItem.GetChild(0).transform.localPosition = new Vector2(0, 0);
-
-                    mailItem.GetChild(2).GetComponent<Text>().text = flowerInfo.Name;
-
-                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
                 }
                 else
                 {
@@ -757,41 +699,30 @@ public class HttpManager : Regist
         {
             Manager.AddCoin(double.Parse(mailReward.Value), StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Mail);
 
-            Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
-
             float newSpriteSize = 0.75f;
 
-            mailItem.GetChild(1).SetActive(false);
-
-            mailItem.GetChild(0).GetComponent<Image>().sprite = ResourceManager.LoadSprite("金币", Folder.UI);
-
-            mailItem.GetChild(0).GetComponent<Image>().Resize(true, newSpriteSize, newSpriteSize);
-
-            mailItem.GetChild(0).transform.localPosition = new Vector2(0, 0);
+            Icon2.SetActive(false);
+            Icon3.SetActive(false);
+            Icon1.sprite = ResourceManager.LoadSprite(ResourceLabel.Gold, Folder.UI);
+            Icon1.Resize(true, newSpriteSize, newSpriteSize);
+            Icon1.transform.localPosition = new Vector2(0, 0);
+            lab.text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
-
-            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
         }
         else if (mailReward.Key == "diamond")
         {
             Manager.AddDiamond(double.Parse(mailReward.Value), StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Mail);
 
-            Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
-
             float newSpriteSize = 0.75f;
-
-            mailItem.GetChild(1).SetActive(false);
-
-            mailItem.GetChild(0).GetComponent<Image>().sprite = ResourceManager.LoadSprite("钻石", Folder.UI);
-
-            mailItem.GetChild(0).GetComponent<Image>().Resize(true, newSpriteSize, newSpriteSize);
-
-            mailItem.GetChild(0).transform.localPosition = new Vector2(0, 0);
-
-            mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
-
-            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.DiamondSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            Icon2.SetActive(false);
+            Icon3.SetActive(false);
+            Icon1.sprite = ResourceManager.LoadSprite(ResourceLabel.Diamond, Folder.UI);
+            Icon1.Resize(true, newSpriteSize, newSpriteSize);
+            Icon1.transform.localPosition = new Vector2(0, 0);
+            lab.text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
+
+            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.DiamondSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
         }
         else
         {
@@ -804,7 +735,6 @@ public class HttpManager : Regist
         MailRewardList = new List<MailReward>();
 
         XmlDocument xmlDoc = new XmlDocument();
-        //Debug.Log("Decode");
         try
         {
             xmlDoc.LoadXml(mailXml);
@@ -815,20 +745,11 @@ public class HttpManager : Regist
         }
 
         XmlNodeList rewardNodeList = xmlDoc.SelectSingleNode("mail").SelectNodes("OneTimeReward");
-        //Debug.Log(ManaData.GetPlayerString("OneTimeReward"));
-        List<string> receivedIdList = Auxiliary.StringToStrings(' ', ConfigManager.GetPlayerString("OneTimeReward"), new List<string>());
-
-        //Debug.Log("");
-        //foreach (var id in receivedIdList)
-        //{
-        //    Debug.Log(id);
-        //}
-        //Debug.Log("");
+        List<string> receivedIdList = Auxiliary.StringToStrings(' ', ConfigManager.GetStringFormConfig(PlayerConfigLabel.OneTimeReward), new List<string>());
 
         for (int i = 0; i < rewardNodeList.Count; i++)
         {
             string id = rewardNodeList[i].SelectSingleNode("id").InnerText;
-            //Debug.Log(id);
             if (receivedIdList.Contains(id))
             {
                 continue;
@@ -839,7 +760,6 @@ public class HttpManager : Regist
 
             if (Time < startTime || Time > endTime)
             {
-                //Debug.Log("Skip");
                 continue;
             }
 
@@ -875,9 +795,9 @@ public class HttpManager : Regist
                     PackLock = true;
                 }
 
-                if (ConfigManager.PlayerDoc_ != null)
+                if (ConfigManager.configDocument != null)
                 {
-                    ConfigManager.SavePlayerBool("PackLock", PackLock);
+                    ConfigManager.SaveBoolToConfig(PlayerConfigLabel.PackLock, PackLock);
                 }
             }
         );
@@ -923,21 +843,20 @@ public class HttpManager : Regist
         if (jsonData.Inst_Object.ContainsKey("c"))
         {
             Connect = true;
-            //Debug.Log(jsonData.ToJson());
             JsonData = jsonData;
 
             Time = DateUtil.GetTime(jsonData["time"].ToJson());
 
             PraiseAmt = int.Parse(jsonData["p"].ToJson().Trim('"'));
 
-            if (ConfigManager.DamageLock)
+            if (ConfigManager.PlayerDocumentDamageFlag)
             {
                 ID = jsonData["o"].ToString();
                 SerialNumber = jsonData["i"].ToString();
             }
-            else if (ConfigManager.PlayerDoc_ != null)
+            else if (ConfigManager.configDocument != null)
             {
-                if (ConfigManager.GetPlayerString("ID") == "Default")
+                if (ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID) == PlayerConfigLabel.DefaultID)
                 {
                     ID = jsonData["o"].ToString();
 
@@ -947,7 +866,7 @@ public class HttpManager : Regist
                     }
                 }
 
-                if (ConfigManager.GetPlayerString("SerialNumber") == "Default")
+                if (ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber) == PlayerConfigLabel.DefaultID)
                 {
                     SerialNumber = JsonData["i"].ToString();
                 }
@@ -959,14 +878,10 @@ public class HttpManager : Regist
 
                 StaticsManager.GetInstance().ActOrReg(ID, DataEyeGA.AccountType.Official);
             }
-
-            //ManaDebug.Log("<color=red>连接成功</color>");
         }
         else
         {
             Connect = false;
-
-            //ManaDebug.Log("<color=red>连接失败</color>");
         }
     }
 
@@ -980,17 +895,11 @@ public class HttpManager : Regist
         urlData.Add("u", SerialNumber);
         urlData.Add("v", ReplayVersion);
 
-        ConfigManager.SavePlayerConfig();
+        ConfigManager.SaveConfigDocument();
 
-        urlData.Add("l", ConfigManager.PlayerDoc.OuterXml);
+        urlData.Add("l", ConfigManager.ConfigDocument.OuterXml);
 
-        URLRequest.CreateURLRequest(false, SaveURL, urlData, SaveCallback, URLRequest.Method.POST);
-        //URLRequest.CreateStrURLRequest(false, NewBaseURL + "/user/save", urlData, Debug.Log, URLRequest.Method.POST);
-    }
-
-    private static void SaveCallback(JsonData jsonData)
-    {
-        //ManaDebug.Log("<color=red>发送存档成功</color>");
+        URLRequest.CreateURLRequest(false, SaveURL, urlData, data => {}, URLRequest.Method.POST);
     }
 
 
@@ -1052,52 +961,12 @@ public class HttpManager : Regist
                 }
             }
         );
-
-        //URLRequest.CreateStrURLRequest
-        //(
-        //    false,
-        //    NewBaseURL + "/index/gift",
-        //    urlData,
-        //    Debug.Log
-        //);
-
-        //JsonData rootJson = new JsonData();
-        //JsonData jData = new JsonData();
-        //rootJson["l"] = jData;
-        //JsonData json = new JsonData();
-        //json["i"] = 1;
-        //json["g"] = "g100";
-        //jData.Add(json);
-        //json = new JsonData();
-        //json["i"] = 2;
-        //json["g"] = "d200";
-        //jData.Add(json);
-        //json = new JsonData();
-        //json["i"] = 3;
-        //json["g"] = "p1";
-        //rootJson.Add(json);
-        //json = new JsonData();
-        //json["i"] = 4;
-        //json["g"] = "f1";
-        //rootJson.Add(json);
-        //json = new JsonData();
-        //json["i"] = 5;
-        //json["g"] = "c1";
-        //rootJson.Add(json);
-        //json = new JsonData();
-        //json["i"] = 6;
-        //json["g"] = "s1";
-        //rootJson.Add(json);
-        //json = new JsonData();
-        //json["i"] = 7;
-        //json["g"] = "a1";
-        //rootJson.Add(json);
-        //Debug.Log(rootJson.ToJson());
-        //Debug.Log(rootJson["l"][0].ToJson());
-        //Debug.Log(rootJson["l"][1].ToJson());
     }
 
 
+    private static string SmtpHost = "smtp.163.com";
+    private static string ReporterMailAccount = "dashgamegarden@163.com";
+    private static string ReporterMailPassword = "cs670cs";
     public static void Report()
     {
         ResourceManager.Get(ObjectLabel.Lb_Info).TweenBacCG();
@@ -1126,7 +995,7 @@ public class HttpManager : Regist
 
             mailMessage.To.Add(new MailAddress(ReportMailAddress));
 
-            mailMessage.From = new MailAddress("dashgamegarden@163.com");
+            mailMessage.From = new MailAddress(ReporterMailAccount);
 
             ReportContent = content;
 
@@ -1134,9 +1003,9 @@ public class HttpManager : Regist
 
             mailMessage.Subject = ID + " MyLovelyGargen Issue";
 
-            SmtpClient smtpClient = new SmtpClient("smtp.163.com");
+            SmtpClient smtpClient = new SmtpClient(SmtpHost);
             
-            smtpClient.Credentials = new MyCredentials("dashgamegarden@163.com", "cs670cs");
+            smtpClient.Credentials = new MyCredentials(ReporterMailAccount, ReporterMailPassword);
             smtpClient.SendAsync(mailMessage, "Async");
 
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Lb_Send0));

+ 8 - 28
Assets/Script/Manage/IAPManager.cs

@@ -1,4 +1,4 @@
-using cn.sharesdk.unity3d;
+using cn.sharesdk.unity3d;
 
 using UnityEngine;
 using UnityEngine.UI;
@@ -62,6 +62,8 @@ public class IAPManager : MonoBehaviour, IStoreListener
         InitializeShare();
     }
 
+    private float ReloadADsTime = 10f;
+    private float ReloadADChestTime = 1200f;
     public void Update()
     {
         if (ChestList.Count > 0)
@@ -69,7 +71,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
         Timer += Time.deltaTime;
 
-        if (Timer >= 10)
+        if (Timer >= ReloadADsTime)
         {
             Timer = 0;
 
@@ -82,7 +84,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
                 if (ADPlayTime == null)
                     return;
 
-                if (HttpManager.Connect && (HttpManager.Time.Subtract((DateTime)ADPlayTime).TotalSeconds > 1200))
+                if (HttpManager.Connect && (HttpManager.Time.Subtract((DateTime)ADPlayTime).TotalSeconds > ReloadADChestTime))
                 {
                     if (GardenManager.MiniLock && !VisitManager.InVisit && !TutorialManager.NewplayerTutorial && !SFSManager.PlazaRoomController.InPlazaRoom && !Player.InDressRoom)
                     {
@@ -105,23 +107,15 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void Initialize()
     {
-        //InitializeAD();
-        
-        //GameObject.Find(PrefabLabel.I_Lab).GetComponent<Text>().text = "Error Code : AD";
-
         GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I1";
 
         InitializeIAP();
 
         GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I2";
 
-        ADPlayTime = DateTime.Parse(ConfigManager.GetPlayerString("ADPlayTime"));
+        ADPlayTime = DateTime.Parse(ConfigManager.GetStringFormConfig(PlayerConfigLabel.ADPlayTime));
 
         GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I3";
-
-        //InitializeShare();
-
-        //GameObject.Find(PrefabLabel.I_Lab).GetComponent<Text>().text = "Error Code : Share";
     }
 
     public static void InitializeAD()
@@ -159,7 +153,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
             return;
         }
 
-        PayChannel = ResourceManager.Load<TextAsset>("Setting", Folder.Config).text.ToEnum<PayChannel>();
+        PayChannel = ResourceManager.Load<TextAsset>(ResourceLabel.Setting, Folder.Config).text.ToEnum<PayChannel>();
 
         if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
@@ -251,7 +245,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
             Manager.AdAmt++;
 
             ADPlayTime = HttpManager.Time;
-            ConfigManager.SavePlayerString(PlayerConfigLabel.ADPlayTime, ADPlayTime.ToString());
+            ConfigManager.SaveStringToConfig(PlayerConfigLabel.ADPlayTime, ADPlayTime.ToString());
         }
         else if (showResult == ShowResult.Skipped)
         {
@@ -266,15 +260,6 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void Purchase(string str)
     {
-        //bool freeze = true;
-
-        //if (freeze)
-        //{
-        //    Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__TemporarilyUnavailible));
-
-        //    return;
-        //}
-
         if (!Complete)
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
@@ -327,16 +312,11 @@ public class IAPManager : MonoBehaviour, IStoreListener
         Complete = true;
         IStoreController = controller;
         IExtensionProvider = extensions;
-
-        //ManaDebug.Log("初始化IAP成功");
     }
 
     public void OnInitializeFailed(InitializationFailureReason error)
     {
         Complete = false;
-
-        //Debug.Log("初始化IAP失败");
-        //ManaDebug.Log("初始化IAP失败");
     }
 
     public void OnPurchaseFailed(Product i, PurchaseFailureReason p)

+ 5 - 3
Assets/Script/Manage/InfoBoxManager.cs

@@ -111,7 +111,6 @@ public class InfoBoxManager : Regist
                     () =>
                     {
                         LayoutRebuilder.MarkLayoutForRebuild(VerticalLayoutGroup.GetComponent<RectTransform>());
-                        //VerticalLayoutGroup.SetLayoutVertical();
                     },
                     1
                 );
@@ -140,6 +139,9 @@ public class InfoBoxManager : Regist
     private const int MaxGardenInfoCount = 4;
     private const int MaxPlazaRoomCount = 300;
 
+    public static float GardenInfoBoxDuration = 45f;
+    public static float PlazaRoomInfoBoxDuration = Mathf.Infinity;
+
     public static InfoBox GardenInfoBox;
     public static InfoBox PlazaRoomInfoBox;
 
@@ -147,8 +149,8 @@ public class InfoBoxManager : Regist
 
     public override void FirstInit()
     {
-        GardenInfoBox = new InfoBox(MaxGardenInfoCount, 45f, ResourceLabel.GardenInfoItem, true, ObjType.C_InfoItem,  ResourceManager.Get(ObjectLabel.C_Info));
-        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, Mathf.Infinity, ResourceLabel.PlazaInfoItem, true, ObjType.X_InfoItem, ResourceManager.Get(ObjectLabel.X_Info));
+        GardenInfoBox = new InfoBox(MaxGardenInfoCount, GardenInfoBoxDuration, ResourceLabel.GardenInfoItem, true, ObjType.C_InfoItem,  ResourceManager.Get(ObjectLabel.C_Info));
+        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, PlazaRoomInfoBoxDuration, ResourceLabel.PlazaInfoItem, true, ObjType.X_InfoItem, ResourceManager.Get(ObjectLabel.X_Info));
     }
 
     public void Update()

+ 31 - 31
Assets/Script/Manage/Initializer.cs

@@ -9,6 +9,12 @@ using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
 
+public class LogoSceneLabel
+{
+    public static string Text = "Text";
+    public static string ManagerGame = "ManagerGame";
+}
+
 public class Initializer : MonoBehaviour
 {
     #region Config
@@ -156,7 +162,7 @@ public class Initializer : MonoBehaviour
         {
             GameObject.Find(ObjectLabel.Canvas).GetChild(0).SetActive(true);
             GameObject.Find(ObjectLabel.Canvas).GetChild(1).SetActive(true);
-            GameObject.Find("Text").GetComponent<Text>().text = progress + "\n" + e;
+            GameObject.Find(LogoSceneLabel.Text).GetComponent<Text>().text = progress + "\n" + e;
 
             throw new Exception();
         }
@@ -181,21 +187,14 @@ public class Initializer : MonoBehaviour
 
     public static void InitializeEntrance()
     {
-        //DelayCall.Call
-        //(
-        //    1,
-        //    () =>
-        //    {
-                if (Instance.CatchException)
-                {
-                    DebugManager.TryCatch(Initialize, EnableDebugLab);
-                }
-                else
-                {
-                    Initialize();
-                }
-        //    }
-        //);
+        if (Instance.CatchException)
+        {
+            DebugManager.TryCatch(Initialize, EnableDebugLab);
+        }
+        else
+        {
+            Initialize();
+        }
     }
 
     public static Text DebugLab;
@@ -205,40 +204,40 @@ public class Initializer : MonoBehaviour
         
         DebugLab.text = "Error code : 1";
 
-        TutorialManager.NewplayerTutorial = ConfigManager.GetPlayerBool("TutorialA");
+        TutorialManager.NewplayerTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.NewplayerTutorial);
         DebugLab.text = "Error code : 1-1";
 
-        TutorialManager.memoryMinigameTutorial = ConfigManager.GetPlayerBool("TutorialB");
+        TutorialManager.memoryMinigameTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.MemoryMinigameTutorial);
         DebugLab.text = "Error code : 1-2";
 
-        TutorialManager.visitTutorial = ConfigManager.GetPlayerBool("TutorialC");
+        TutorialManager.visitTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.VisitTutorial);
         DebugLab.text = "Error code : 1-3";
 
-        TutorialManager.dressroomTutorial = ConfigManager.GetPlayerBool("TutorialD");
+        TutorialManager.dressroomTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.DressroomTutorial);
         DebugLab.text = "Error code : 1-4";
 
-        TutorialManager.findMinigameTutorial = ConfigManager.GetPlayerBool("TutorialE");
+        TutorialManager.findMinigameTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.FindMinigameTutorial);
         DebugLab.text = "Error code : 1-5";
 
-        TutorialManager.plazaRoomTutorial = ConfigManager.GetPlayerBool("TutorialPlazaRoom");
+        TutorialManager.plazaRoomTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.TutorialPlazaRoom);
         DebugLab.text = "Error code : 1-5-1";
 
-        TutorialManager.NewplayerTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexA");
+        TutorialManager.NewplayerTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.NewplayerTutorialIndex);
         DebugLab.text = "Error code : 1-6";
 
-        TutorialManager.MemoryMinigameTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexB");
+        TutorialManager.MemoryMinigameTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.MemoryMinigameTutorialIndex);
         DebugLab.text = "Error code : 1-7";
 
-        TutorialManager.VisitTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexC");
+        TutorialManager.VisitTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.VisitTutorialIndex);
         DebugLab.text = "Error code : 1-8";
 
-        TutorialManager.DressroomTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexD");
+        TutorialManager.DressroomTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.DressroomIndex);
         DebugLab.text = "Error code : 1-9";
 
-        TutorialManager.FindMinigameTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexE");
+        TutorialManager.FindMinigameTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.FindMinigameTutorialIndex);
         DebugLab.text = "Error code : 1-10";
 
-        TutorialManager.PlazaRoomTutorialIndex = ConfigManager.GetPlayerInt("TutorialIndexPlazaRoom");
+        TutorialManager.PlazaRoomTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.TutorialIndexPlazaRoom);
         DebugLab.text = "Error code : 1-10-1";
 
         Bundle.LoadAtlasSprites();
@@ -325,12 +324,13 @@ public class Initializer : MonoBehaviour
         }
     }
 
+    private static float LoadingDelayTime = 3f;
     private static void ShowLoadingPanel()
     {
         ResourceManager.Get(ObjectLabel.U_Group).TweenForCG();
         ResourceManager.Get<CanvasGroup>(ObjectLabel.C_Main).alpha = 0;
 
-        Auxiliary.Instance.DelayCall(ActivateGame, 3f);
+        Auxiliary.Instance.DelayCall(ActivateGame, LoadingDelayTime);
     }
 
     private static void ActivateGame()
@@ -338,7 +338,7 @@ public class Initializer : MonoBehaviour
         ResourceManager.Get(ObjectLabel.U_LoadingPanel).TweenForCG();
         ResourceManager.Get<CanvasGroup>(ObjectLabel.C_Main).alpha = 1;
 
-        AudioManager.MusicTheme.TweenForAudio();
+        AudioManager.GardenThemeAudio.TweenForAudio();
     }
 
     public static void EnableDebugLab()
@@ -361,7 +361,7 @@ public class Initializer : MonoBehaviour
             yield return null;
         }
 
-        while (ConfigManager.DamageLock)
+        while (ConfigManager.PlayerDocumentDamageFlag)
         {
             yield return null;
         }

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

@@ -22,7 +22,7 @@ public class MulLanStr
 
     public MulLanStr(string pageAndID)
     {
-        string[] strings = pageAndID.Split(new[] { "__" }, StringSplitOptions.None);
+        string[] strings = pageAndID.Split(new[] { LabelUtility.LanguagePageSeperator }, StringSplitOptions.None);
         Page = strings[0];
         ID = strings[1];
     }
@@ -96,11 +96,11 @@ public class LanguageManager : Regist
             kv.Key.text = Translate(kv.Value);
         }
 
-        foreach (var kv in AchieveManager.AchieveDic)
+        foreach (var kv in AchieveManager.AchieveItemDictionary)
         {
-            if (kv.Value.AchieveItem != null)
+            if (kv.Value.Item != null)
             {
-                kv.Value.Lab.text = Achieve.GetDescription(kv.Value.Desc, kv.Value.TargetValue);
+                kv.Value.DescriptionText.text = AchieveItem.GetDescription(kv.Value.Description, kv.Value.TargetValue);
             }
         }
 

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

@@ -1,4 +1,4 @@
-using LitJson;
+using LitJson;
 
 using UnityEngine;
 using UnityEngine.UI;
@@ -13,7 +13,7 @@ using System.Collections.Generic;
 
 public class Manager : Regist 
 {
-    #region 变量
+    #region Config
 
     #region 成就
 
@@ -24,7 +24,7 @@ public class Manager : Regist
         {
             AdAmt_ = value;
 
-            AchieveManager.UpdateStatus(AchieveType.AdAmt, AdAmt_);
+            AchieveManager.UpdateStatus(AchieveType.PlayADsAmt, AdAmt_);
         }
     }
     public static double SkillAmt
@@ -34,7 +34,7 @@ public class Manager : Regist
         {
             SkillAmt_ = value;
 
-            AchieveManager.UpdateStatus(AchieveType.SkillAmt, SkillAmt_);
+            AchieveManager.UpdateStatus(AchieveType.UseSkillAmt, SkillAmt_);
         }
     }
     public static double SignAmt
@@ -74,7 +74,7 @@ public class Manager : Regist
         {
             MiniGameAmt_ = value;
 
-            AchieveManager.UpdateStatus(AchieveType.MiniGameAmt, MiniGameAmt_);
+            AchieveManager.UpdateStatus(AchieveType.PlayMinigameAmt, MiniGameAmt_);
         }
     }
     public static double ElfLevel
@@ -84,7 +84,7 @@ public class Manager : Regist
         {
             ElfLevel_ = value;
 
-            AchieveManager.UpdateStatus(AchieveType.ElfLevel, ElfLevel_);
+            AchieveManager.UpdateStatus(AchieveType.AllElfLevel, ElfLevel_);
         }
     }
     public static double TotalCoin
@@ -104,7 +104,7 @@ public class Manager : Regist
         {
             FlowerCoin_ = value;
             
-            AchieveManager.UpdateStatus(AchieveType.FlowerCoin, FlowerCoin_);
+            AchieveManager.UpdateStatus(AchieveType.TotalFlowerAwardCoin, FlowerCoin_);
         }
     }
     public static double TotalPerson
@@ -114,7 +114,7 @@ public class Manager : Regist
         {
             TotalPerson_ = value;
 
-            AchieveManager.UpdateStatus(AchieveType.TotalPerson, TotalPerson_);
+            AchieveManager.UpdateStatus(AchieveType.TotalVisitPerson, TotalPerson_);
         }
     }
     public static double CostDiamond
@@ -124,7 +124,7 @@ public class Manager : Regist
         {
             CostDiamond_ = value;
 
-            AchieveManager.UpdateStatus(AchieveType.CostDiamond, CostDiamond_);
+            AchieveManager.UpdateStatus(AchieveType.SpendDiamond, CostDiamond_);
         }
     }
     public static double CreateRoomAmt
@@ -309,7 +309,7 @@ public class Manager : Regist
         {
             Person_ = value;
 
-            ResourceManager.SetText(ObjectLabel.F_PersonLab, (60*(Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
+            ResourceManager.SetText(ObjectLabel.F_PersonLab, (IncomeDisplayTime*(Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
         }
     }
     public static float SkillPerson
@@ -341,7 +341,7 @@ public class Manager : Regist
                 }
             }
 
-            ResourceManager.SetText(ObjectLabel.F_PersonLab, (60*(Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
+            ResourceManager.SetText(ObjectLabel.F_PersonLab, (IncomeDisplayTime * (Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
         }
     }
     public static float CoinPerson
@@ -361,7 +361,7 @@ public class Manager : Regist
         {
             SkillPersonBuff_ = value;
 
-            ResourceManager.SetText(ObjectLabel.F_PersonLab, (60 * (Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
+            ResourceManager.SetText(ObjectLabel.F_PersonLab, (IncomeDisplayTime * (Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
         }
     }
     public static float SkillCoinPerson
@@ -495,7 +495,7 @@ public class Manager : Regist
 
         SaveThread();
 
-        CircleThread();
+        IncomeCircleThread();
     }
 
 
@@ -522,6 +522,7 @@ public class Manager : Regist
     }
 
 
+    private static float InputDetectTime = 60f;
     private void OpThread()
     {
         if (Auxiliary.AnyKeyUp)
@@ -534,7 +535,7 @@ public class Manager : Regist
         {
             OpTimer += Time.deltaTime;
 
-            if (OpTimer >= 60)
+            if (OpTimer >= InputDetectTime)
             {
                 OpTimer = 0;
 
@@ -583,6 +584,7 @@ public class Manager : Regist
         }
     }
 
+    private static float SaveConfigTime = 60f;
     private void SaveThread()
     {
         if (DownloadLock)
@@ -592,7 +594,7 @@ public class Manager : Regist
 
         SaveTimer += Time.deltaTime;
 
-        if (SaveTimer >= 60)
+        if (SaveTimer >= SaveConfigTime)
         {
             SaveTimer = 0;
 
@@ -614,7 +616,8 @@ public class Manager : Regist
         }
     }
 
-    private void CircleThread()
+    private static float IncomeDisplayTime = 60f;
+    private void IncomeCircleThread()
     {
         CircleTimer -= Time.deltaTime;
         
@@ -634,8 +637,6 @@ public class Manager : Regist
             ResourceManager.Get(ObjectLabel.C_IncomeLab).TweenReForGra();
             ResourceManager.Get(ObjectLabel.C_IncomeLab).TweenReForVec();
             ResourceManager.SetText(ObjectLabel.C_IncomeLab, "+" + Auxiliary.ShrinkNumberStr(temp, 0));
-
-            //ManaDebug.Log(string.Format("参观收益<color=red>{0:0.0}</color> = <color=red>{1}</color> * <color=red>{2}</color> * <color=red>{3}</color> * <color=red>{4}</color> (人次*金币*时间*加成)", temp, NewPerson, NewCoinPerson, CircleTime, 1 + SkillPlus));
         }
     }
 
@@ -693,7 +694,6 @@ public class Manager : Regist
 
             #endregion
 
-            //Debug.Log(skillRoot.ID);
             SkillDic.Add(skillRoot.FullID, skillRoot);
             SkillList.Add(skillRoot);
         }
@@ -715,13 +715,13 @@ public class Manager : Regist
 
     public override void FirstInit()
     {
-        ResourceManager.Get<Graphic>(ObjectLabel.F_Elf).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
-        ResourceManager.Get<Graphic>(ObjectLabel.F_Store).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
-        ResourceManager.Get<Graphic>(ObjectLabel.F_Magic).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
+        ResourceManager.Get<Graphic>(ObjectLabel.F_Elf).material = Lib.GrayMat;
+        ResourceManager.Get<Graphic>(ObjectLabel.F_Store).material = Lib.GrayMat;
+        ResourceManager.Get<Graphic>(ObjectLabel.F_Magic).material = Lib.GrayMat;
 
-        ResourceManager.Get<Graphic>(ObjectLabel.F_ElfLab).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
-        ResourceManager.Get<Graphic>(ObjectLabel.F_StoreLab).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
-        ResourceManager.Get<Graphic>(ObjectLabel.F_MagicLab).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
+        ResourceManager.Get<Graphic>(ObjectLabel.F_ElfLab).material = Lib.GrayMat;
+        ResourceManager.Get<Graphic>(ObjectLabel.F_StoreLab).material = Lib.GrayMat;
+        ResourceManager.Get<Graphic>(ObjectLabel.F_MagicLab).material = Lib.GrayMat;
 
         ResourceManager.Get<Button>(ObjectLabel.F_Elf).interactable = false;
         ResourceManager.Get<Button>(ObjectLabel.F_Store).interactable = false;
@@ -747,10 +747,10 @@ public class Manager : Regist
     {
         Instance = this;
 
-        Coin = ConfigManager.GetPlayerDouble(PlayerConfigLabel.Coin);
-        Diamond = ConfigManager.GetPlayerDouble(PlayerConfigLabel.Diamond);
-        MiniTimer = ConfigManager.GetPlayerFloat(PlayerConfigLabel.MiniTimer);
-        CircleTimer = ConfigManager.GetPlayerFloat(PlayerConfigLabel.CircleTimer);
+        Coin = ConfigManager.GetDoubleFormConfig(PlayerConfigLabel.Coin);
+        Diamond = ConfigManager.GetDoubleFormConfig(PlayerConfigLabel.Diamond);
+        MiniTimer = ConfigManager.GetFloatFormConfig(PlayerConfigLabel.MiniTimer);
+        CircleTimer = ConfigManager.GetFloatFormConfig(PlayerConfigLabel.CircleTimer);
 
         if (MiniTimer > 0)
         {
@@ -762,8 +762,8 @@ public class Manager : Regist
         }
 
 
-        HttpManager.ID = ConfigManager.GetPlayerString(PlayerConfigLabel.ID);
-        HttpManager.SerialNumber = ConfigManager.GetPlayerString(PlayerConfigLabel.SerialNumber);
+        HttpManager.ID = ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID);
+        HttpManager.SerialNumber = ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber);
 
         List<string> offlineList = ConfigManager.GetOfflineConfig();
 
@@ -772,7 +772,7 @@ public class Manager : Regist
         OfflineFml = offlineList[0];
 
 
-        List<double> dataList = ConfigManager.GetAchieveData();
+        List<double> dataList = ConfigManager.GetAchieveValues();
 
         AdAmt = dataList[0];
         ElfLevel = dataList[4];
@@ -792,23 +792,22 @@ public class Manager : Regist
     }
 
 
+    private static float MinOfflineTime = 120f; 
     public static void RegistSkill(bool firstRegist)
     {
         OfflineLock = false;
 
         ResourceManager.SetActive(ObjectLabel.Ba_Lab2, false);
 
-        if (HttpManager.Connect && ConfigManager.GetPlayerBool(PlayerConfigLabel.QuitFlag))
+        if (HttpManager.Connect && ConfigManager.GetBoolFormConfig(PlayerConfigLabel.QuitFlag))
         {
-            QuitTime = DateTime.Parse(ConfigManager.GetPlayerString(PlayerConfigLabel.QuitTime));
+            QuitTime = DateTime.Parse(ConfigManager.GetStringFormConfig(PlayerConfigLabel.QuitTime));
 
             Elapse = (float)HttpManager.Time.Subtract(QuitTime).TotalSeconds;
 
             MiniTimer -= Elapse;
 
-            //ManaDebug.Log(string.Format("离线时间<color=red>{0}</color>", Elapse));
-
-            if (Elapse <= 120)
+            if (Elapse <= MinOfflineTime)
             {
                 Elapse = 0;
             }
@@ -838,8 +837,6 @@ public class Manager : Regist
             {
                 TempUseList.Add(new List<Skill>());
             }
-
-            //ManaDebug.Log(string.Format("离线周期<color=red>{0}</color>", circle));
         }
 
 
@@ -913,6 +910,7 @@ public class Manager : Regist
         AddDiamond(0, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
     }
 
+    private static int DefaultPurchaseAmt = 1;
     public static void Pay(string id, double amt, Current current, UnityAction succeedCallback, StaticsManager.ItemID itemId, StaticsManager.ConsumeModule consumeModule, bool navigate = true, bool useBubbleTweenNavigate = true, UnityAction navigateCall = null)
     {
         if (TutorialManager.PayExempt)
@@ -946,7 +944,7 @@ public class Manager : Regist
 
                 succeedCallback.Invoke();
 
-                StaticsManager.GetInstance().UseItem(itemId, StaticsManager.ItemType.金币, "1", consumeModule);
+                StaticsManager.GetInstance().UseItem(itemId, StaticsManager.ItemType.金币, DefaultPurchaseAmt.ToString(), consumeModule);
             }
             else
             {
@@ -1019,7 +1017,7 @@ public class Manager : Regist
 
                 succeedCallback.Invoke();
 
-                StaticsManager.GetInstance().PurchaseItem(itemId, StaticsManager.ItemType.钻石, "1", amt.ToString("0"), consumeModule);
+                StaticsManager.GetInstance().PurchaseItem(itemId, StaticsManager.ItemType.钻石, DefaultPurchaseAmt.ToString(), amt.ToString("0"), consumeModule);
             }
             else
             {
@@ -1098,22 +1096,19 @@ public class Manager : Regist
 
         if (HttpManager.Connect)
         {
-            if (ConfigManager.GetPlayerString(PlayerConfigLabel.ID) == "Default")
+            if (ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID) == PlayerConfigLabel.DefaultID)
             {
                 HttpManager.ID = HttpManager.JsonData["o"].ToString();
 
                 ResourceManager.SetText(ObjectLabel.L_UserLab, HttpManager.ID);
             }
 
-            if (ConfigManager.GetPlayerString(PlayerConfigLabel.SerialNumber) == "Default")
+            if (ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber) == PlayerConfigLabel.DefaultSerialNumber)
             {
                 HttpManager.SerialNumber = HttpManager.JsonData["i"].ToString();
             }
         }
 
-        //ManaSocial.UpdatePage(true);
-
-
         RegistSkill(true);
         RegistIncome();
 
@@ -1157,15 +1152,15 @@ public class Manager : Regist
             ResourceManager.SetText(ObjectLabel.La_Lab, Language.GetStr(LanguageLabel.UI__La_Lab0));
 
 
-            ConfigManager.PlayerDoc.LoadXml(jsonData["l"].ToString());
+            ConfigManager.ConfigDocument.LoadXml(jsonData["l"].ToString());
 
-            ConfigManager.PlayerNode = ConfigManager.PlayerDoc.SelectSingleNode(PlayerConfigLabel.RootNode);
+            ConfigManager.ConfigRootNode = ConfigManager.ConfigDocument.SelectSingleNode(PlayerConfigLabel.RootNode);
 
 
-            ResourceManager.SetText(ObjectLabel.L_UserLab, ConfigManager.GetPlayerString(PlayerConfigLabel.ID));
+            ResourceManager.SetText(ObjectLabel.L_UserLab, ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID));
 
-            HttpManager.ID = ConfigManager.GetPlayerString(PlayerConfigLabel.ID);
-            HttpManager.SerialNumber = ConfigManager.GetPlayerString(PlayerConfigLabel.SerialNumber);
+            HttpManager.ID = ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID);
+            HttpManager.SerialNumber = ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber);
 
 
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__La_Lab0), null, null, () => { Application.Quit(); }, null, false);
@@ -1175,7 +1170,7 @@ public class Manager : Regist
 
             DownloadLock = true;
 
-            ConfigManager.SaveXml();
+            ConfigManager.SaveConfigDocumentToDisk();
             PlayerPrefs.SetString(Lib.ConfigPrefs, "");
         }
         else
@@ -1193,8 +1188,8 @@ public class Manager : Regist
         {
             VisitManager.DataReverse();
 
-            ConfigManager.SavePlayerConfig();
-            ConfigManager.SaveXml();
+            ConfigManager.SaveConfigDocument();
+            ConfigManager.SaveConfigDocumentToDisk();
         }
     }
 
@@ -1211,8 +1206,8 @@ public class Manager : Regist
 
             VisitManager.DataReverse();
 
-            ConfigManager.SavePlayerConfig();
-            ConfigManager.SaveXml();
+            ConfigManager.SaveConfigDocument();
+            ConfigManager.SaveConfigDocumentToDisk();
         }
         else
         {

+ 135 - 72
Assets/Script/Manage/MiniGameManager.cs

@@ -46,13 +46,15 @@ public class Award
 
     #endregion
 
+    private float MinScore = 1;
+    private float MaxScore = Mathf.Infinity;
     public void GetAward(int score)
     {
         #region 获得奖励
 
         #region Rate
 
-        Score = (int)Mathf.Clamp(score, 1, Mathf.Infinity);
+        Score = (int)Mathf.Clamp(score, MinScore, MaxScore);
 
         if (Score < Standard[1])
         {
@@ -686,7 +688,7 @@ public class MiniGameManager : Regist
 
             TimerBk.fillAmount = GameTimer_/GameTime;
 
-            TimerBk.material.SetFloat("_Fill", TimerBk.fillAmount);
+            TimerBk.material.SetFloat(MaterialLabel.TimerMatFill, TimerBk.fillAmount);
         }
     }
 
@@ -747,10 +749,19 @@ public class MiniGameManager : Regist
     public static float FadeTime = 2f;
     public static float GameTime = 45f;
     public static float PanaltyTime = 1f;
-    private static float PrepareTime = 3;
+    public static float PrepareTime = 3;
     public static float NewOpTime;
     public static float NewFadeTime;
 
+    public static List<Transform> D_MemoryGameBtns = new List<Transform>();
+    public static List<Transform> D_MemoryGameIcons = new List<Transform>();
+    public static List<Transform> D_MemoryGameTicks = new List<Transform>();
+    public static List<Transform> D_MemoryGameArrows = new List<Transform>();
+    public static List<Transform> D_FindGameBtns = new List<Transform>();
+    public static List<Transform> D_FindGameIcons = new List<Transform>();
+    public static List<Transform> D_FindGameArrows = new List<Transform>();
+    public static List<Transform> MinigameSlots = new List<Transform>();
+
     #endregion
 
     private void Update()
@@ -933,7 +944,7 @@ public class MiniGameManager : Regist
     {
         Award = new Award(ConfigManager.GetAwardConfig());
 
-        MiniGameIndex = ConfigManager.GetPlayerInt("MiniGameIndex");
+        MiniGameIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.MiniGameIndex);
     }
 
     public override void RegistReference()
@@ -953,6 +964,56 @@ public class MiniGameManager : Regist
         PrepareLab = ResourceManager.Get<Text>(ObjectLabel.D_PrepareLab);
 
         TimerBk = ResourceManager.Get<Image>(ObjectLabel.D_TimerIcon);
+
+        MinigameSlots.Add(ResourceManager.Get(GardenLabel.SlotMini1));
+        MinigameSlots.Add(ResourceManager.Get(GardenLabel.SlotMini2));
+        MinigameSlots.Add(ResourceManager.Get(GardenLabel.SlotMini3));
+        MinigameSlots.Add(ResourceManager.Get(GardenLabel.SlotMini4));
+        MinigameSlots.Add(ResourceManager.Get(GardenLabel.SlotMini5));
+        MinigameSlots.Add(ResourceManager.Get(GardenLabel.SlotMini6));
+        MinigameSlots.Add(ResourceManager.Get(GardenLabel.SlotMini7));
+        MinigameSlots.Add(ResourceManager.Get(GardenLabel.SlotMini8));
+        MinigameSlots.Add(ResourceManager.Get(GardenLabel.SlotMini9));
+
+        D_MemoryGameBtns.Add(ResourceManager.Get(ObjectLabel.D_FlowerBtn1));
+        D_MemoryGameBtns.Add(ResourceManager.Get(ObjectLabel.D_FlowerBtn2));
+        D_MemoryGameBtns.Add(ResourceManager.Get(ObjectLabel.D_FlowerBtn3));
+        D_MemoryGameBtns.Add(ResourceManager.Get(ObjectLabel.D_FlowerBtn4));
+        D_MemoryGameBtns.Add(ResourceManager.Get(ObjectLabel.D_FlowerBtn5));
+        D_MemoryGameBtns.Add(ResourceManager.Get(ObjectLabel.D_FlowerBtn6));
+
+        D_MemoryGameTicks.Add(ResourceManager.Get(ObjectLabel.D_FlowerTick1));
+        D_MemoryGameTicks.Add(ResourceManager.Get(ObjectLabel.D_FlowerTick2));
+        D_MemoryGameTicks.Add(ResourceManager.Get(ObjectLabel.D_FlowerTick3));
+        D_MemoryGameTicks.Add(ResourceManager.Get(ObjectLabel.D_FlowerTick4));
+        D_MemoryGameTicks.Add(ResourceManager.Get(ObjectLabel.D_FlowerTick5));
+        D_MemoryGameTicks.Add(ResourceManager.Get(ObjectLabel.D_FlowerTick6));
+
+        D_MemoryGameIcons.Add(ResourceManager.Get(ObjectLabel.D_FlowerIcon1));
+        D_MemoryGameIcons.Add(ResourceManager.Get(ObjectLabel.D_FlowerIcon2));
+        D_MemoryGameIcons.Add(ResourceManager.Get(ObjectLabel.D_FlowerIcon3));
+        D_MemoryGameIcons.Add(ResourceManager.Get(ObjectLabel.D_FlowerIcon4));
+        D_MemoryGameIcons.Add(ResourceManager.Get(ObjectLabel.D_FlowerIcon5));
+        D_MemoryGameIcons.Add(ResourceManager.Get(ObjectLabel.D_FlowerIcon6));
+
+        D_MemoryGameArrows.Add(ResourceManager.Get(ObjectLabel.D_FlowerArrow1));
+        D_MemoryGameArrows.Add(ResourceManager.Get(ObjectLabel.D_FlowerArrow2));
+        D_MemoryGameArrows.Add(ResourceManager.Get(ObjectLabel.D_FlowerArrow3));
+        D_MemoryGameArrows.Add(ResourceManager.Get(ObjectLabel.D_FlowerArrow4));
+        D_MemoryGameArrows.Add(ResourceManager.Get(ObjectLabel.D_FlowerArrow5));
+        D_MemoryGameArrows.Add(ResourceManager.Get(ObjectLabel.D_FlowerArrow6));
+
+        D_FindGameBtns.Add(ResourceManager.Get(ObjectLabel.D_FlowerBtn7));
+        D_FindGameBtns.Add(ResourceManager.Get(ObjectLabel.D_FlowerBtn8));
+        D_FindGameBtns.Add(ResourceManager.Get(ObjectLabel.D_FlowerBtn9));
+
+        D_FindGameIcons.Add(ResourceManager.Get(ObjectLabel.D_FlowerIcon7));
+        D_FindGameIcons.Add(ResourceManager.Get(ObjectLabel.D_FlowerIcon8));
+        D_FindGameIcons.Add(ResourceManager.Get(ObjectLabel.D_FlowerIcon9));
+
+        D_FindGameArrows.Add(ResourceManager.Get(ObjectLabel.D_FlowerArrow7));
+        D_FindGameArrows.Add(ResourceManager.Get(ObjectLabel.D_FlowerArrow8));
+        D_FindGameArrows.Add(ResourceManager.Get(ObjectLabel.D_FlowerArrow9));
     }
 
 
@@ -973,13 +1034,13 @@ public class MiniGameManager : Regist
         {
             Flower flower = IdleList.Find(tempFlower => { return tempFlower.ID == id; });
 
-            ResourceManager.GetHudText($"+{FindScore}", Color.white, 90, flower.ChildDic["ScorePosTra"], ResourceManager.Get(ObjectLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{FindScore}", Color.white, 90, flower.ChildDic[FlowerLabel.ScorePosTra], ResourceManager.Get(ObjectLabel.D_HudParent), true);
 
             Score += FindScore;
 
             flower.PlayFlashLight();
 
-            AudioManager.PlayClip(Clip.BtnClip);
+            AudioManager.PlayClip(AudioLabel.ClickButton);
 
             FindGameRoundEnd();
         }
@@ -988,11 +1049,10 @@ public class MiniGameManager : Regist
             Panalty = true;
             PanaltyTimer = PanaltyTime;
 
-            ResourceManager.Get("D_FlowerIcon" + btnIndex).TweenForGra();
+            D_FindGameIcons[btnIndex].TweenForGra();
+            D_FindGameBtns[btnIndex].Shake(0.5f, 3, new Vector3(20f, 0, 0), Curve.EaseOutQuad);
 
-            ResourceManager.Get("D_FlowerBtn" + btnIndex).Shake(0.5f, 3, new Vector3(20f, 0, 0), Curve.EaseOutQuad);
-
-            AudioManager.PlayClip(Clip.ErrorClip);
+            AudioManager.PlayClip(AudioLabel.Error);
         }
     }
 
@@ -1013,22 +1073,17 @@ public class MiniGameManager : Regist
 
         if (slotIndex == IndexList[0])
         {
-            int uiIndex = MemoryGameIndexMap(IndexList[0]);
-
-            ResourceManager.Get<Image>("D_FlowerBtn" + uiIndex).material = Lib.GrayMat;
-
-            ResourceManager.Get<Button>("D_FlowerBtn" + uiIndex).interactable = false;
-
-            ResourceManager.Get<Image>("D_FlowerIcon" + uiIndex).material = Lib.GrayMat;
-
-            ResourceManager.SetActive("D_FlowerTick" + uiIndex, true);
+            D_MemoryGameBtns[index].GetComponent<Image>().material = Lib.GrayMat;
+            D_MemoryGameBtns[index].GetComponent<Button>().interactable = false;
+            D_MemoryGameIcons[index].GetComponent<Image>().material = Lib.GrayMat;
+            D_MemoryGameTicks[index].SetActive(true);
 
             IndexList.RemoveAt(0);
 
 
             Flower flower = FlowerDic[slotIndex];
 
-            ResourceManager.GetHudText($"+{MemoryScore}", Color.white, 90, flower.ChildDic["ScorePosTra"], ResourceManager.Get(ObjectLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{MemoryScore}", Color.white, 90, flower.ChildDic[FlowerLabel.ScorePosTra], ResourceManager.Get(ObjectLabel.D_HudParent), true);
 
             Score += MemoryScore;
 
@@ -1042,7 +1097,7 @@ public class MiniGameManager : Regist
             }
 
 
-            AudioManager.PlayClip(Clip.BtnClip);
+            AudioManager.PlayClip(AudioLabel.ClickButton);
 
             TweenRoot tween = flower.FlowerIcon.TweenBacSr();
 
@@ -1065,11 +1120,10 @@ public class MiniGameManager : Regist
             Panalty = true;
             PanaltyTimer = PanaltyTime;
             
-            ResourceManager.Get("D_FlowerIcon" + index).TweenForGra();
-
-            ResourceManager.Get("D_FlowerBtn" + index).Shake(0.5f, 3, new Vector3(20f, 0, 0), Curve.EaseOutQuad);
+            D_MemoryGameIcons[index].TweenForGra();
+            D_MemoryGameBtns[index].Shake(0.5f, 3, new Vector3(20f, 0, 0), Curve.EaseOutQuad);
 
-            AudioManager.PlayClip(Clip.ErrorClip);
+            AudioManager.PlayClip(AudioLabel.Error);
         }
     }
 
@@ -1136,7 +1190,7 @@ public class MiniGameManager : Regist
 
     public static void CreateOperate()
     {
-        AudioManager.PlayClip(Clip.BubbleClip);
+        AudioManager.PlayClip(AudioLabel.Bubble);
 
         if (TutorialManager.NewplayerTutorial && TutorialLock)
         {
@@ -1278,7 +1332,7 @@ public class MiniGameManager : Regist
 
     public static void SetNewFlowerStatus()
     {
-        bool newFlowerFlag = ConfigManager.GetPlayerBool(PlayerConfigLabel.NewFlowerFlag);
+        bool newFlowerFlag = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.NewFlowerFlag);
 
         if (newFlowerFlag)
         {
@@ -1302,11 +1356,11 @@ public class MiniGameManager : Regist
 
         if (Random.Range(0, 1f) <= flowerRate)
         {
-            ConfigManager.SavePlayerBool(PlayerConfigLabel.NewFlowerFlag, true);
+            ConfigManager.SaveBoolToConfig(PlayerConfigLabel.NewFlowerFlag, true);
         }
         else
         {
-            ConfigManager.SavePlayerBool(PlayerConfigLabel.NewFlowerFlag, false);
+            ConfigManager.SaveBoolToConfig(PlayerConfigLabel.NewFlowerFlag, false);
         }
     }
 
@@ -1360,7 +1414,7 @@ public class MiniGameManager : Regist
 
     public static void GameOver()
     {
-        AudioManager.PlayClip(Clip.MiniEndClip);
+        AudioManager.PlayClip(AudioLabel.MinigameEnd);
 
         Award.GetAward(Score);
 
@@ -1420,6 +1474,8 @@ public class MiniGameManager : Regist
         ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
     }
 
+    private static int PunchGameSlotAmt = 9;
+    private static List<int> PunchGameSlotIDs = new List<int> {0, 1, 2, 3, 4, 5, 6, 7, 8};
     public static void EnterPunchGame()
     {
         PunchGameOperate.SetActive(true);
@@ -1442,7 +1498,7 @@ public class MiniGameManager : Regist
 
         if (Award.FlowerLock)
         {
-            for (int i = 1; i < 10; i++)
+            for (int i = 0; i < PunchGameSlotAmt; i++)
             {
                 while (true)
                 {
@@ -1450,7 +1506,7 @@ public class MiniGameManager : Regist
 
                     if (flowerInfo.Unlock)
                     {
-                        IdleList.Add(ResourceManager.GetFlower(flowerInfo, ResourceManager.Get("SlotMini" + i)));
+                        IdleList.Add(ResourceManager.GetFlower(flowerInfo, MinigameSlots[i]));
 
                         break;
                     }
@@ -1461,11 +1517,11 @@ public class MiniGameManager : Regist
         {
             List<int> idList = new List<int>();
 
-            idList = new List<int>() {1, 2, 3, 4, 5, 6, 7, 8, 9};
+            idList = new List<int>(PunchGameSlotIDs);
 
-            int special = idList.Random(1, true, true)[0];
+            int specialSlotID = idList.Random(1, true, true)[0];
 
-            Flower flower = ResourceManager.GetFlower(GardenManager.FlowerInfoDic[Award.FlowerID], ResourceManager.Get("SlotMini" + special));
+            Flower flower = ResourceManager.GetFlower(GardenManager.FlowerInfoDic[Award.FlowerID], MinigameSlots[specialSlotID]);
 
             flower.PlayNewFlowerEffec();
 
@@ -1479,7 +1535,7 @@ public class MiniGameManager : Regist
 
                     if (flowerInfo.Unlock)
                     {
-                        flower = ResourceManager.GetFlower(flowerInfo, ResourceManager.Get("SlotMini" + idList[i]));
+                        flower = ResourceManager.GetFlower(flowerInfo, MinigameSlots[idList[i]]);
 
                         IdleList.Add(flower);
 
@@ -1490,6 +1546,7 @@ public class MiniGameManager : Regist
         }
     }
 
+    private static List<int> MemoryGameSlotIDs = new List<int> {0, 1, 3, 4, 6, 7};
     public static void EnterMemoryGame()
     {
         MemoryGameOperate.SetActive(true);
@@ -1516,7 +1573,7 @@ public class MiniGameManager : Regist
         ResourceManager.SetActive(ObjectLabel.D_Begin, true);
         ResourceManager.SetActive(ObjectLabel.D_DescB, true);
 
-        List<int> idList = new List<int>() {1, 2, 4, 5, 7, 8};
+        List<int> idList = new List<int>(MemoryGameSlotIDs);
 
         FlowerDic = new Dictionary<int, Flower>();
 
@@ -1532,7 +1589,7 @@ public class MiniGameManager : Regist
 
                     if (flowerInfo.Unlock)
                     {
-                        flower = ResourceManager.GetFlower(flowerInfo, ResourceManager.Get("SlotMini" + idList[i]));
+                        flower = ResourceManager.GetFlower(flowerInfo, MinigameSlots[idList[i]]);
 
                         IdleList.Add(flower);
 
@@ -1545,15 +1602,15 @@ public class MiniGameManager : Regist
         }
         else
         {
-            int special = idList.Random(1, true, true)[0];
+            int specialSlotID = idList.Random(1, true, true)[0];
 
-            flower = ResourceManager.GetFlower(GardenManager.FlowerInfoDic[Award.FlowerID], ResourceManager.Get("SlotMini" + special));
+            flower = ResourceManager.GetFlower(GardenManager.FlowerInfoDic[Award.FlowerID], MinigameSlots[specialSlotID]);
 
             flower.PlayNewFlowerEffec();
 
             IdleList.Add(flower);
 
-            FlowerDic.Add(special, flower);
+            FlowerDic.Add(specialSlotID, flower);
 
             for (int i = 0; i < idList.Count; i++)
             {
@@ -1563,7 +1620,7 @@ public class MiniGameManager : Regist
 
                     if (flowerInfo.Unlock)
                     {
-                        flower = ResourceManager.GetFlower(flowerInfo, ResourceManager.Get("SlotMini" + idList[i]));
+                        flower = ResourceManager.GetFlower(flowerInfo, MinigameSlots[idList[i]]);
 
                         IdleList.Add(flower);
 
@@ -1607,7 +1664,7 @@ public class MiniGameManager : Regist
     private static float DropDiamondOffsetTime = 5;
     public static void GameBegin()
     {
-        ConfigManager.SavePlayerBool("NewFlowerFlag", false);
+        ConfigManager.SaveBoolToConfig(PlayerConfigLabel.NewFlowerFlag, false);
 
         Game = true;
         MiniGameIndex++;
@@ -1689,12 +1746,14 @@ public class MiniGameManager : Regist
             ResourceManager.SetActive(ObjectLabel.D_FlowerBtn5, true);
             ResourceManager.SetActive(ObjectLabel.D_FlowerBtn6, true);
 
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon1, FlowerDic[1].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon2, FlowerDic[2].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon3, FlowerDic[4].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon4, FlowerDic[5].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon5, FlowerDic[7].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon6, FlowerDic[8].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
+            float deltaSIzeX = 1.0625f;
+            float deltaSIzeY = 1.0625f;
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon1, FlowerDic[0].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon2, FlowerDic[1].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon3, FlowerDic[3].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon4, FlowerDic[4].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon5, FlowerDic[6].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon6, FlowerDic[7].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
         }
 
         PrepareLab.StreamForScale();
@@ -1724,7 +1783,7 @@ public class MiniGameManager : Regist
 
         IndexList = new List<int>();
 
-        List<int> randomList = new List<int>() { 1, 2, 4, 5, 7, 8 };
+        List<int> randomList = new List<int>(MemoryGameSlotIDs);
 
         for (int i = 0; i < randomList.Count; i++)
         {
@@ -1746,7 +1805,7 @@ public class MiniGameManager : Regist
         }
     }
 
-
+    private static List<int> FindGameSlotIDs = new List<int> {0, 1, 2, 3, 4, 5, 6, 7, 8};
     public static void FindGameRoundEnd()
     {
         if (IdleList[0].ID == Award.FlowerID)
@@ -1787,7 +1846,7 @@ public class MiniGameManager : Regist
 
         FindGameFlowerIDs = new List<int>();
 
-        List<int> slotList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+        List<int> slotIDs = new List<int>(FindGameSlotIDs);
 
 
         FlowerInfo flowerInfo;
@@ -1803,13 +1862,13 @@ public class MiniGameManager : Regist
 
         FindGameFlowerIDs.Add(flowerInfo.ID_);
 
-        IdleList.Add(ResourceManager.GetFlower(flowerInfo, ResourceManager.Get("SlotMini" + slotList.Random(1, true, true)[0])));
+        IdleList.Add(ResourceManager.GetFlower(flowerInfo, MinigameSlots[slotIDs.Random(1, true, true)[0]]));
 
-        while (slotList.Count > 0)
+        while (slotIDs.Count > 0)
         {
             flowerInfo = GardenManager.FlowerInfoDic.Random(false, info => { return info.Unlock && info.ID_ != FindGameFlowerIDs[0]; });
 
-            if (slotList.Count == 1)
+            if (slotIDs.Count == 1)
             {
                 if (!FindGameFlowerIDs.Contains(flowerInfo.ID_))
                 {
@@ -1821,11 +1880,11 @@ public class MiniGameManager : Regist
                 FindGameFlowerIDs.UniqueAdd(flowerInfo.ID_);
             }
 
-            int amt = Mathf.Min(Random.Range(2, 9), slotList.Count);
+            int amt = Mathf.Min(Random.Range(2, 9), slotIDs.Count);
 
             for (int i = 0; i < amt; i++)
             {
-                IdleList.Add(ResourceManager.GetFlower(flowerInfo, ResourceManager.Get("SlotMini" + slotList.Random(1, true, true)[0])));
+                IdleList.Add(ResourceManager.GetFlower(flowerInfo, MinigameSlots[slotIDs.Random(1, true, true)[0]]));
             }
         }
 
@@ -1861,10 +1920,11 @@ public class MiniGameManager : Regist
             throw new Exception();
         }
 
-
-        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon7, GardenManager.FlowerInfoDic[idList[0]].Icon).Resize(true, 1.0625f, 1.0625f);
-        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon8, GardenManager.FlowerInfoDic[idList[1]].Icon).Resize(true, 1.0625f, 1.0625f);
-        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon9, GardenManager.FlowerInfoDic[idList[2]].Icon).Resize(true, 1.0625f, 1.0625f);
+        float deltaSIzeX = 1.0625f;
+        float deltaSIzeY = 1.0625f;
+        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon7, GardenManager.FlowerInfoDic[idList[0]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon8, GardenManager.FlowerInfoDic[idList[1]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon9, GardenManager.FlowerInfoDic[idList[2]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
 
         for (int i = 0; i < idList.Count; i++)
         {
@@ -1873,13 +1933,16 @@ public class MiniGameManager : Regist
 
             if (firstRound && TutorialManager.FindMinigameTutorial && id == FindGameFlowerIDs[0])
             {
-                FindGameCorrectBtn = ResourceManager.Get("D_FlowerBtn" + (7 + i));
-
-                ResourceManager.SetButtonEvent("D_FlowerBtn" + (7 + i), () => { OperateFindGame(id, (7 + index)); TutorialManager.EndClickCorrectButton(); });
+                FindGameCorrectBtn = D_FindGameBtns[i];
+                Button button = FindGameCorrectBtn.GetComponent<Button>();
+                button.onClick.RemoveAllListeners();
+                button.onClick.AddListener(() => { OperateFindGame(id, index); TutorialManager.EndClickCorrectButton(); });
             }
             else
             {
-                ResourceManager.SetButtonEvent("D_FlowerBtn" + (7 + i), () => { OperateFindGame(id, (7 + index)); });
+                Button button = D_FindGameBtns[i].GetComponent<Button>();
+                button.onClick.RemoveAllListeners();
+                button.onClick.AddListener(() => { OperateFindGame(id, index); });
             }
         }
     }
@@ -1909,11 +1972,15 @@ public class MiniGameManager : Regist
 
     public static int MemoryGameIndexMap(int slotIndex)
     {
-        if (slotIndex == 1)
+        if (slotIndex == 0)
+        {
+            return 0;
+        }
+        else if (slotIndex == 1)
         {
             return 1;
         }
-        else if (slotIndex == 2)
+        else if (slotIndex == 3)
         {
             return 2;
         }
@@ -1921,7 +1988,7 @@ public class MiniGameManager : Regist
         {
             return 3;
         }
-        else if (slotIndex == 5)
+        else if (slotIndex == 6)
         {
             return 4;
         }
@@ -1929,10 +1996,6 @@ public class MiniGameManager : Regist
         {
             return 5;
         }
-        else if (slotIndex == 8)
-        {
-            return 6;
-        }
         else
         {
             throw new Exception();

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

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Events;
 
@@ -23,7 +23,7 @@ public class NickNameManager : Regist
 
     public override void FirstInit()
 	{
-		SetNickName (ConfigManager.GetPlayerString (PlayerConfigLabel.NickName));
+		SetNickName (ConfigManager.GetStringFormConfig (PlayerConfigLabel.NickName));
 		inputField = ResourceManager.Get<InputField> (ObjectLabel.T_InputField);
 	    string defaultNames = ResourceManager.Load<TextAsset>(ResourceLabel.DefaultNickName, Folder.Config).text;
 	    string[] names = defaultNames.Split('\n');
@@ -127,7 +127,7 @@ public class NickNameManager : Regist
 
         SetNickName(inputField.text);
 
-        AudioManager.PlayClip(Clip.CloseClip);
+        AudioManager.PlayClip(AudioLabel.Close);
         CloseNickNameSettingPanel();
 
         OnSetNickNameSucceed.SafeInvoke();
@@ -136,7 +136,7 @@ public class NickNameManager : Regist
     public static void SetNickName(string nickName)
 	{
 		NickName = nickName;
-		ConfigManager.SavePlayerString (PlayerConfigLabel.NickName, nickName);
+		ConfigManager.SaveStringToConfig (PlayerConfigLabel.NickName, nickName);
 
 		ResourceManager.SetText (ObjectLabel.C_NickNameLab, nickName);
 	}

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

@@ -65,31 +65,29 @@ public class PlayerManager : Regist
         }
         else
         {
-            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);
-
+            PlayerPink = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get(TutorialLabel.PinkPlayerPos), false, ObjType.Player);
+            PlayerBlond = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get(TutorialLabel.BlondPlayerPos), false, ObjType.Player);
+            PlayerBrown = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get(TutorialLabel.BrownPlayerPos), false, ObjType.Player);
+            
             if (PlayerPink.GetComponent<Player>() == null)
             {
                 PlayerPink.AddScript<Player>().BuildPink();
-                //PlayerPink.transform.position = ManaReso.Get("PlayerPos3").position;
             }
 
             if (PlayerBlond.GetComponent<Player>() == null)
             {
                 PlayerBlond.AddScript<Player>().BuildBlond();
-                //PlayerPink.transform.position = ManaReso.Get("PlayerPos2").position;
             }
 
             if (PlayerBrown.GetComponent<Player>() == null)
             {
                 PlayerBrown.AddScript<Player>().BuildBrown();
-                //PlayerPink.transform.position = ManaReso.Get("PlayerPos1").position;
             }
 
-            PlayerPink.localScale = new Vector3(0.8f, 0.8f, 0.8f);
-            PlayerBlond.localScale = new Vector3(0.8f, 0.8f, 0.8f);
-            PlayerBrown.localScale = new Vector3(0.8f, 0.8f, 0.8f);
+            Vector3 tutorialPlayerScale = new Vector3(0.8f, 0.8f, 0.8f);
+            PlayerPink.localScale = tutorialPlayerScale;
+            PlayerBlond.localScale = tutorialPlayerScale;
+            PlayerBrown.localScale = tutorialPlayerScale;
 
             SeleTra = PlayerBlond;
         }
@@ -161,7 +159,7 @@ public class PlayerManager : Regist
 
 
         Transform tra = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, transform, false, ObjType.Player);
-        tra.SetParent(ResourceManager.Get("GardenNormal"));
+        tra.SetParent(ResourceManager.Get(GardenLabel.GardenNormal));
 
         Player = tra.GetComponent<Player>();
 
@@ -178,7 +176,7 @@ public class PlayerManager : Regist
 
         Player.SetAllCollider(true);
         Player.Flip(PlayerDirection.Left);
-        Player.transform.position = ResourceManager.Get("PlayerPosTra").position;
+        Player.transform.position = ResourceManager.Get(GardenLabel.PlayerPosTra).position;
 
         tra.localScale = new Vector3(0.5f, 0.5f, 0.5f);
 

+ 7 - 12
Assets/Script/Manage/PlazaRoomManager.cs

@@ -18,7 +18,7 @@ public class PlazaRoomManager : Regist
         {
             if (itemHeight == 0)
             {
-                itemHeight = (Grid.GetChild(0).GetComponent<RectTransform>().rect.height + Grid.GetComponent<VerticalLayoutGroup>().spacing);
+                itemHeight = Grid.GetChild(0).GetComponent<RectTransform>().rect.height + Grid.GetComponent<VerticalLayoutGroup>().spacing;
             }
             
             return itemHeight;
@@ -81,9 +81,9 @@ public class PlazaRoomManager : Regist
         MaxPlayerSlider = ResourceManager.Get<Slider>(ObjectLabel.AAb_Slider);
         
         DurationSlider.onValueChanged.AddListener(OnSliderValueChange);
-        DurationSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(Clip.BtnClip));
+        DurationSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(AudioLabel.ClickButton));
         MaxPlayerSlider.onValueChanged.AddListener(OnSliderValueChange);
-        MaxPlayerSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(Clip.BtnClip));
+        MaxPlayerSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(AudioLabel.ClickButton));
     }
 
 
@@ -152,10 +152,7 @@ public class PlazaRoomManager : Regist
         else
         {
             int availableItemAmt = MaxRoomItem - PlazaRoomItems.Count;
-            //if (LastIndex == 0)
-            //{
-                NextPage(availableItemAmt, ref FirstIndex, ref LastIndex, RoomDatas);
-            //}
+            NextPage(availableItemAmt, ref FirstIndex, ref LastIndex, RoomDatas);
             DownloadLock = false;
         }
 
@@ -191,10 +188,7 @@ public class PlazaRoomManager : Regist
         else
         {
             int availableItemAmt = MaxRoomItem - PlazaRoomItems.Count;
-            //if (LastIndex == 0)
-            //{
-                NextPage(availableItemAmt, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
-            //}
+            NextPage(availableItemAmt, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
             DownloadLock = false;
         }
 
@@ -389,6 +383,7 @@ public class PlazaRoomManager : Regist
     public static int Cost;
     public static int Duration;
     public static int MaxPlayer;
+    public static int MaxRoomNameChar = 24;
     public static string CostFml;
     public static string ValueFml;
     private static Text DurationLab;
@@ -405,7 +400,7 @@ public class PlazaRoomManager : Regist
             return;
         }
 
-        if (roomName.GetBytes() > 24)
+        if (roomName.GetBytes() > MaxRoomNameChar)
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__AA_TooLong));
             return;

+ 25 - 27
Assets/Script/Manage/ResourceManager.cs

@@ -465,6 +465,7 @@ public class ResourceManager : Regist
     }
 
 
+    private static string UnityDefaultSuffix = "(Clone)";
     public static Transform Get(string goName, Folder folder, bool compile, Transform par, bool worldSpace, ObjType objType = ObjType.Null, Type type = null)
     {
         Transform tra = Get(objType);
@@ -474,7 +475,7 @@ public class ResourceManager : Regist
             GameObject go = Load<GameObject>(goName, folder, objType);
 
             go = Instantiate(go, par, worldSpace);
-            go.name = go.name.Replace("(Clone)", "");
+            go.name = go.name.Replace(UnityDefaultSuffix, "");
 
             if (compile)
             {
@@ -534,7 +535,7 @@ public class ResourceManager : Regist
             GameObject go = Load<GameObject>(goName, folder, objType);
             
             go = Instantiate(go, pos, Quaternion.identity, par);
-            go.name = go.name.Replace("(Clone)", "");
+            go.name = go.name.Replace(UnityDefaultSuffix, "");
 
             if (compile)
             {
@@ -577,28 +578,28 @@ public class ResourceManager : Regist
     }
 
 
+    private static float StarMinOffset = -0.0001f;
+    private static float StarMaxOffset = -0.001f;
     public static Star GetStar()
     {
-        int slotIndex = Random.Range(0, 9);
+        int slotIndex = Random.Range(0, GardenManager.TotalSlotAmtInOnePage);
 
-        bool forceLeft = slotIndex == 3 || slotIndex == 8;
-        bool forceRight = slotIndex == 0 || slotIndex == 4;
+        bool forceLeft = slotIndex == GardenManager.RightTopSlotIndex || slotIndex == GardenManager.RightDownSlotIndex;
+        bool forceRight = slotIndex == GardenManager.LeftTopSlotIndex || slotIndex == GardenManager.LeftDownSlotIndex;
 
-        slotIndex += Garden.CurPage*9;
+        slotIndex += Garden.CurPage* GardenManager.TotalSlotAmtInOnePage;
 
 
         Slot slot = GardenManager.SlotList[slotIndex];
 
         Vector3 pos = slot.transform.position;
 
-        //pos.z = -0.35f + Random.Range(-0.01f, 0.01f);
-
         Transform tra = Get(ResourceLabel.Star, Folder.Scene, false, null, pos, ObjType.Star);
 
         Star star = tra.GetComponent<Star>();
 
         tra.parent = slot.transform;
-        tra.SetLZ(-0.1f + Random.Range(-0.0001f, -0.001f));
+        tra.SetLZ(-0.1f + Random.Range(StarMinOffset, StarMaxOffset));
 
         if (star == null)
         {
@@ -616,7 +617,7 @@ public class ResourceManager : Regist
 
     public static ADChest GetADChest()
     {
-        Transform tra = Get(ResourceLabel.ADChest, Folder.Scene, false, Get("GardenPage"), true, ObjType.ADChest);
+        Transform tra = Get(ResourceLabel.ADChest, Folder.Scene, false, Get(GardenLabel.SlotPage), true, ObjType.ADChest);
 
         ADChest chest = tra.GetComponentInChildren<ADChest>(true);
 
@@ -636,7 +637,7 @@ public class ResourceManager : Regist
 
     public static PlazaRoomChest GetPlazaRoomChest(Vector3 position)
     {
-        Transform tra = Get(ResourceLabel.PlazaRoomChest, Folder.Scene, false, Get("PlazaRoom"), position, ObjType.PlazaRoomChest);
+        Transform tra = Get(ResourceLabel.PlazaRoomChest, Folder.Scene, false, Get(ResourceLabel.PlazaRoom), position, ObjType.PlazaRoomChest);
 
         PlazaRoomChest chest = tra.GetComponentInChildren<PlazaRoomChest>(true);
 
@@ -650,18 +651,18 @@ public class ResourceManager : Regist
 
     public static Drop GetDrop(ObjType objType)
     {
-        AudioManager.PlayClip(Clip.DropClip);
+        AudioManager.PlayClip(AudioLabel.Minigame_DropAward);
 
-        Vector3 leftPos = Get("MiniLeft").position;
+        Vector3 leftPos = Get(GardenLabel.MiniLeft).position;
         Vector3 rightPos;
 
         if (MiniGameManager.PunchGame || MiniGameManager.FindGame)
         {
-            rightPos = Get("MiniRight1").position;
+            rightPos = Get(GardenLabel.MiniRight1).position;
         }
         else
         {
-            rightPos = Get("MiniRight2").position;
+            rightPos = Get(GardenLabel.MiniRight2).position;
         }
 
         Vector3 pos = Vector3.Lerp(leftPos, rightPos, Random.Range(0, 1f));
@@ -703,9 +704,6 @@ public class ResourceManager : Regist
         flower.FlowerInfo = flowerInfo;
         flower.Slot = slot;
 
-        //flower.FlowerIcon.SetActive(true);
-        //flower.FlowerIcon.SetAlpha(1);
-
         flower.SetShadow();
         flower.SetCollider(collider);
 
@@ -724,9 +722,6 @@ public class ResourceManager : Regist
 
         flower.FlowerInfo = flowerInfo;
 
-        //flower.FlowerIcon.SetActive(true);
-        //flower.FlowerIcon.SetAlpha(1);
-
         flower.SetShadow();
         flower.SetCollider(false);
 
@@ -800,6 +795,9 @@ public class ResourceManager : Regist
     }
 
 
+    private static char ElfSeperator = '_';
+    private static float ElfMinOffset = 0.001f;
+    private static float ElfMaxOffset = 0.1f;
     public static Transform GetElf(Flower flower, Vector4 offset, ElfType elfType)
     {
         Transform tra;
@@ -809,9 +807,9 @@ public class ResourceManager : Regist
         Transform par = flower.transform;
 
 
-        ObjType obj = elfType.ToString().Split('_')[0].ToEnum<ObjType>();
+        ObjType obj = elfType.ToString().Split(ElfSeperator)[0].ToEnum<ObjType>();
 
-        pos.z -= Random.Range(0.001f, 0.1f);
+        pos.z -= Random.Range(ElfMinOffset, ElfMaxOffset);
 
         tra = Get(obj.ToString(), Folder.Scene, false, par, pos, obj);
 
@@ -878,7 +876,7 @@ public class ResourceManager : Regist
 
     public static Transform GetAchieveItem()
     {
-        Transform tra = Get(ResourceLabel.AchieveItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.M_Grid), false, ObjType.AchieveItem);
+        Transform tra = Get(ResourceLabel.AchieveItem, Folder.UI, false, Get(ObjectLabel.M_Grid), false, ObjType.AchieveItem);
 
         return tra;
     }
@@ -953,7 +951,7 @@ public class ResourceManager : Regist
 
             if (ui)
             {
-                go = (GameObject)Instantiate(bundleRequest.asset, GameObject.Find("ManagerGame").transform.GetChild(0).GetChild(0));
+                go = (GameObject)Instantiate(bundleRequest.asset, GameObject.Find(LogoSceneLabel.ManagerGame).transform.GetChild(0).GetChild(0));
             }
             else
             {
@@ -962,13 +960,13 @@ public class ResourceManager : Regist
 
             ObjPoolDic.Add(go, objType);
 
-            go.name = go.name.Replace("(Clone)", "");
+            go.name = go.name.Replace(UnityDefaultSuffix, "");
 
             Save(go);
 
             if (ui)
             {
-                go.SetParent(GameObject.Find("ManagerGame").transform.GetChild(0).GetChild(0));
+                go.SetParent(GameObject.Find(LogoSceneLabel.ManagerGame).transform.GetChild(0).GetChild(0));
             }
         };
 

+ 33 - 24
Assets/Script/Manage/SignManager.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 
 using System;
@@ -9,6 +9,14 @@ using System.Collections.Generic;
 
 using Random = UnityEngine.Random;
 
+public class SignItemLabel
+{
+    public static string Lab1 = "Lab1";
+    public static string Lab2 = "Lab2";
+    public static string Icon1 = "Icon1";
+    public static string Icon2 = "Icon2";
+}
+
 public class Sign
 {
     #region Config
@@ -66,11 +74,11 @@ public class Sign
 
         Auxiliary.CompileDic(tra, dic);
 
-        Lab1 = dic["Lab1"].GetComponent<Text>();
-        Lab2 = dic["Lab2"].GetComponent<Text>();
+        Lab1 = dic[SignItemLabel.Lab1].GetComponent<Text>();
+        Lab2 = dic[SignItemLabel.Lab2].GetComponent<Text>();
 
-        Icon = dic["Icon1"].GetComponent<Image>();
-        Mark = dic["Icon2"].GetComponent<Image>();
+        Icon = dic[SignItemLabel.Icon1].GetComponent<Image>();
+        Mark = dic[SignItemLabel.Icon2].GetComponent<Image>();
 
         OriginSize = Icon.rectTransform.sizeDelta;
 
@@ -96,7 +104,7 @@ public class Sign
             return;
         }
 
-        AudioManager.PlayClip(Clip.CurrentClip);
+        AudioManager.PlayClip(AudioLabel.GetCurrent);
 
         Mark.SetActive(true);
 
@@ -198,13 +206,14 @@ public class Sign
         }
     }
 
+    private static int MaxSignIndex = 22;
     public static void ResetSign()
     {
         SignManager.SignTime = HttpManager.Time;
 
         SignManager.SignIndex++;
 
-        if (SignManager.SignIndex == 22)
+        if (SignManager.SignIndex == MaxSignIndex)
         {
             SignManager.SignIndex = 1;
             SignManager.SignRound++;
@@ -564,13 +573,13 @@ public class Lottery
         ResourceManager.Get(ObjectLabel.Bb_SignIn).TweenBacCG();
         ResourceManager.Get(ObjectLabel.Bc_Lottery).TweenBacCG();
 
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
     }
 
 
     public static void OnClick(int index)
     {
-        AudioManager.PlayClip(Clip.CurrentClip);
+        AudioManager.PlayClip(AudioLabel.GetCurrent);
 
         ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack1).interactable = false;
         ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack2).interactable = false;
@@ -613,25 +622,25 @@ public class Lottery
 
         BK.SetActive(true);
 
-        if (Type == 1)
+        if (Type == LotteryType.Coin.GetHashCode())
         {
             Manager.AddCoin(Value, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Checkin);
 
             ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + Language.GetStr(LanguageLabel.Common__Coin) + " " + Value);
         }
-        else if (Type == 2)
+        else if (Type == LotteryType.Diamond.GetHashCode())
         {
             Manager.AddDiamond(Value, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Checkin);
 
             ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + Language.GetStr(LanguageLabel.Common__Diamond) + " " + Value);
         }
-        else if (Type == 3)
+        else if (Type == LotteryType.Flower.GetHashCode())
         {
             GardenManager.FlowerInfoDic[Value].Add();
 
             ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + GardenManager.FlowerInfoDic[Value].Name);
         }
-        else if (Type == 4)
+        else if (Type == LotteryType.Close.GetHashCode())
         {
             PlayerManager.CloseItemDic[Value].Unlock();
 
@@ -644,7 +653,7 @@ public class Lottery
 
 public class SignManager : Regist 
 {
-    #region 变量
+    #region Config
 
     public static int SignIndex;
     public static int SignRound;
@@ -725,11 +734,11 @@ public class SignManager : Regist
 
     public static bool ShowSignReward()
     {
-        if (ConfigManager.GetPlayerBool("QuitFlag") && HttpManager.Connect)
+        if (ConfigManager.GetBoolFormConfig(PlayerConfigLabel.QuitFlag) && HttpManager.Connect)
         {
-            int daySpan = HttpManager.Time.Day - SignManager.SignTime.Day;
-            int yearSpan = HttpManager.Time.Year - SignManager.SignTime.Year;
-            int monthSpan = HttpManager.Time.Month - SignManager.SignTime.Month;
+            int daySpan = HttpManager.Time.Day - SignTime.Day;
+            int yearSpan = HttpManager.Time.Year - SignTime.Year;
+            int monthSpan = HttpManager.Time.Month - SignTime.Month;
 
             if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
             {
@@ -745,13 +754,13 @@ public class SignManager : Regist
 
     public static bool ShowNotification()
     {
-        if (HttpManager.NotificationIndex > ConfigManager.GetPlayerInt(PlayerConfigLabel.NotificationIndex) && HttpManager.NotificationReady)
+        if (HttpManager.NotificationIndex > ConfigManager.GetIntFormConfig(PlayerConfigLabel.NotificationIndex) && HttpManager.NotificationReady)
         {
             ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
 
-            ConfigManager.SavePlayerInt(PlayerConfigLabel.NotificationIndex, HttpManager.NotificationIndex);
+            ConfigManager.SaveIntToConfig(PlayerConfigLabel.NotificationIndex, HttpManager.NotificationIndex);
 
-            AnnounceManager.Show();
+            AnnounceManager.ShowAnnouncePanel();
 
             return true;
         }
@@ -772,10 +781,10 @@ public class SignManager : Regist
 
     public override void SecondInit()
     {
-        SignTime = DateTime.Parse(ConfigManager.GetPlayerString(PlayerConfigLabel.SignTime));
+        SignTime = DateTime.Parse(ConfigManager.GetStringFormConfig(PlayerConfigLabel.SignTime));
 
-        SignIndex = ConfigManager.GetPlayerInt(PlayerConfigLabel.SignIndex);
-        SignRound = ConfigManager.GetPlayerInt(PlayerConfigLabel.SignRound);
+        SignIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.SignIndex);
+        SignRound = ConfigManager.GetIntFormConfig(PlayerConfigLabel.SignRound);
 
         Transform par = ResourceManager.Get(ObjectLabel.Bb_Grid);
 

+ 4 - 3
Assets/Script/Manage/SocialManager.cs

@@ -471,14 +471,14 @@ public class SocialManager : Regist
 
     public static void OpenRankPanel()
     {
-        AudioManager.PlayClip(Clip.BubbleClip);
+        AudioManager.PlayClip(AudioLabel.Bubble);
 
         ResourceManager.Get(ObjectLabel.S_RankBK).TweenForCG();
     }
 
     public static void CloseRankPanel()
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         ResourceManager.Get(ObjectLabel.S_RankBK).TweenBacCG();
     }
@@ -510,6 +510,7 @@ public class SocialManager : Regist
     }
 
 
+    private static float CommentUpdateTime = 30f;
     public static void Comment()
     {
         if (string.IsNullOrEmpty(InputField.text))
@@ -519,7 +520,7 @@ public class SocialManager : Regist
             return;
         }
 
-        if ((DateTime.Now - CommentTime).TotalSeconds > 30)
+        if ((DateTime.Now - CommentTime).TotalSeconds > CommentUpdateTime)
         {
             CommentTime = DateTime.Now;
 

+ 121 - 142
Assets/Script/Manage/TutorialManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -103,20 +103,22 @@ public class TutorialManager : Regist
 
     public override void ThirdInit()
     {
-        ResourceManager.Get<Image>(ObjectLabel.N_Mask).material = ResourceManager.Load<Material>("UIMaskMat", Folder.UI);
+        ResourceManager.Get<Image>(ObjectLabel.N_Mask).material = Lib.UIMaskMat;
 
         Tutorial.Arrow = ResourceManager.Get(ObjectLabel.N_Arrow);
         Tutorial.Material = ResourceManager.Get<Image>(ObjectLabel.N_Mask).material;
 
         if (NewplayerTutorial)
         {
-            ResourceManager.Get("TutorialMask").AddScript<SceneMask>();
+            ResourceManager.Get(TutorialLabel.TutorialMask).AddScript<SceneMask>();
 
-            ResourceManager.Get("Tutorial").CreateTweenSr(0, 1, 1f, true, true, Curve.EaseOutQuad, false, true).AlphaOnly = true;
-            ResourceManager.Get("PlayerBk1").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
-            ResourceManager.Get("PlayerBk2").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
-            ResourceManager.Get("PlayerBk3").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
-            ResourceManager.Get("TutorialMask").CreateTweenSr(0, 180 / 255f, 0.25f, true, true, Curve.EaseOutQuad);
+            Vector3 playerDisplayScale = new Vector3(0.75f, 0.75f, 0.75f);
+            Vector3 playerSelectScale = new Vector3(0.9f, 0.9f, 0.9f);
+            ResourceManager.Get(TutorialLabel.Tutorial).CreateTweenSr(0, 1, 1f, true, true, Curve.EaseOutQuad, false, true).AlphaOnly = true;
+            ResourceManager.Get(TutorialLabel.PlayerBk1).CreateTweenScale(playerDisplayScale, playerSelectScale, 1f, true, true, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk2).CreateTweenScale(playerDisplayScale, playerSelectScale, 1f, true, true, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk3).CreateTweenScale(playerDisplayScale, playerSelectScale, 1f, true, true, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.TutorialMask).CreateTweenSr(0, 180 / 255f, 0.25f, true, true, Curve.EaseOutQuad);
 
 
             if (NewplayerTutorialIndex == 1)
@@ -139,16 +141,16 @@ public class TutorialManager : Regist
 
                 ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
 
-                ResourceManager.SetActive("Tutorial", true);
-                ResourceManager.SetActive("TutorialMask", true);
-                ResourceManager.SetActive("TutorialCollider", true);
+                ResourceManager.SetActive(TutorialLabel.Tutorial, true);
+                ResourceManager.SetActive(TutorialLabel.TutorialMask, true);
+                ResourceManager.SetActive(TutorialLabel.TutorialCollider, true);
 
                 Garden.Instance.TutorialToRegular();
                 UIManager.Instance.TutorialToRegular();
 
                 Transform tra = GardenManager.SlotList[0].transform;
 
-                Tutorial.HightScene(0.1f, 0.075f, tra.FindChild("SlotArrow"), tra);
+                Tutorial.HightScene(0.1f, 0.075f, tra.FindChild(SlotLabel.SlotArrow), tra);
             }
             else if (NewplayerTutorialIndex == 6)
             {
@@ -165,11 +167,11 @@ public class TutorialManager : Regist
 
     public static void EndChoseCharacter()
     {
-        StaticsManager.GetInstance().TutoComplete("A1");
+        StaticsManager.GetInstance().TutoComplete("EndChoseCharacter");
 
-        Destroy(ResourceManager.Get("PlayerBk1").gameObject);
-        Destroy(ResourceManager.Get("PlayerBk2").gameObject);
-        Destroy(ResourceManager.Get("PlayerBk3").gameObject);
+        Destroy(ResourceManager.Get(TutorialLabel.PlayerBk1).gameObject);
+        Destroy(ResourceManager.Get(TutorialLabel.PlayerBk2).gameObject);
+        Destroy(ResourceManager.Get(TutorialLabel.PlayerBk3).gameObject);
 
         SetNickname();
     }
@@ -180,23 +182,14 @@ public class TutorialManager : Regist
 
         NickNameManager.OnSetNickNameSucceed = null;
 
-        StaticsManager.GetInstance().TutoComplete("A1_1");
-
-        //Auxiliary.Instance.DelayCall
-        //(
-        //    () =>
-        //    {
-        //        ManaReso.SetActive(PrefabLabel.T_Close, true);
-        //    },
-        //    0.25f
-        //);
+        StaticsManager.GetInstance().TutoComplete("EndSetNickname");
 
         ClickEnterMinigame();
     }
 
     public static void EndClickEnterMinigame()
     {
-        StaticsManager.GetInstance().TutoComplete("A2");
+        StaticsManager.GetInstance().TutoComplete("EndClickEnterMinigame");
 
         Tutorial.HightDisable();
 
@@ -205,7 +198,7 @@ public class TutorialManager : Regist
 
     public static void EndPlayPunchMinigame()
     {
-        StaticsManager.GetInstance().TutoComplete("A3");
+        StaticsManager.GetInstance().TutoComplete("EndPlayPunchMinigame");
 
         Tutorial.HightDisable();
 
@@ -216,7 +209,7 @@ public class TutorialManager : Regist
 
     public static void EndClickSlot()
     {
-        StaticsManager.GetInstance().TutoComplete("A4");
+        StaticsManager.GetInstance().TutoComplete("EndClickSlot");
 
         Tutorial.HightDisable();
 
@@ -225,14 +218,14 @@ public class TutorialManager : Regist
 
     public static void EndPlantFlower()
     {
-        StaticsManager.GetInstance().TutoComplete("A5");
+        StaticsManager.GetInstance().TutoComplete("EndPlantFlower");
 
         ClickManagePanel();
     }
 
     public static void EndClickManagePanel()
     {
-        StaticsManager.GetInstance().TutoComplete("A6");
+        StaticsManager.GetInstance().TutoComplete("EndClickManagePanel");
 
         Tutorial.HightDisable();
 
@@ -241,7 +234,7 @@ public class TutorialManager : Regist
 
     public static void EndOpenUnlockPanel()
     {
-        StaticsManager.GetInstance().TutoComplete("A7");
+        StaticsManager.GetInstance().TutoComplete("EndOpenUnlockPanel");
 
         Tutorial.HightDisable(0, true);
 
@@ -250,7 +243,7 @@ public class TutorialManager : Regist
 
     public static void EndClickConfirmButton()
     {
-        StaticsManager.GetInstance().TutoComplete("A8");
+        StaticsManager.GetInstance().TutoComplete("EndClickConfirmButton");
 
         Tutorial.HightDisable(0, true);
 
@@ -264,11 +257,11 @@ public class TutorialManager : Regist
 
     public static void EndShowTip()
     {
-        StaticsManager.GetInstance().TutoComplete("A");
+        StaticsManager.GetInstance().TutoComplete("EndShowTip");
 
         NewplayerTutorial = false;
 
-        AudioManager.PlayClip(Clip.CloseClip);
+        AudioManager.PlayClip(AudioLabel.Close);
 
         AchieveManager.UpdateHint();
 
@@ -276,7 +269,7 @@ public class TutorialManager : Regist
         ResourceManager.Get(ObjectLabel.F_TipBK).TweenBacCG();
         ResourceManager.SetActive(ObjectLabel.F_TipBtn, false);
 
-        ResourceManager.SetActive("Tutorial", false);
+        ResourceManager.SetActive(TutorialLabel.Tutorial, false);
         ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
 
         ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForCG();
@@ -296,14 +289,14 @@ public class TutorialManager : Regist
         PlayerManager.PlayerBlond.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
         PlayerManager.PlayerBrown.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
 
-        ResourceManager.Get("PlayerBk2").TweenForScale();
+        ResourceManager.Get(TutorialLabel.PlayerBk2).TweenForScale();
         PlayerManager.PlayerBlond.TweenForScale();
 
-        ResourceManager.SetActive("PlayerBk1", true);
-        ResourceManager.SetActive("PlayerBk2", true);
-        ResourceManager.SetActive("PlayerBk3", true);
-        ResourceManager.SetActive("TutorialMask", true);
-        ResourceManager.SetActive("TutorialCollider", true);
+        ResourceManager.SetActive(TutorialLabel.PlayerBk1, true);
+        ResourceManager.SetActive(TutorialLabel.PlayerBk2, true);
+        ResourceManager.SetActive(TutorialLabel.PlayerBk3, true);
+        ResourceManager.SetActive(TutorialLabel.TutorialMask, true);
+        ResourceManager.SetActive(TutorialLabel.TutorialCollider, true);
 
         ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
         ResourceManager.SetActive(ObjectLabel.N_Confirm, true);
@@ -384,7 +377,7 @@ public class TutorialManager : Regist
 
                 ResourceManager.TraDic.Add(tra.name, tra);
 
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
 
                 if (PlayerManager.PlayerPink != PlayerManager.SeleTra)
@@ -402,13 +395,13 @@ public class TutorialManager : Regist
                     PlayerManager.PlayerBrown.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
                 }
 
-                ResourceManager.Get("PlayerBk1").SetCollider(false);
-                ResourceManager.Get("PlayerBk2").SetCollider(false);
-                ResourceManager.Get("PlayerBk3").SetCollider(false);
+                ResourceManager.Get(TutorialLabel.PlayerBk1).SetCollider(false);
+                ResourceManager.Get(TutorialLabel.PlayerBk2).SetCollider(false);
+                ResourceManager.Get(TutorialLabel.PlayerBk3).SetCollider(false);
 
-                tra.CreateTweenScale(ResourceManager.Get("PlayerPosTra").localScale, 1f, true, true, Curve.EaseOutQuad);
-                tra.CreateTweenVec3D(ResourceManager.Get("PlayerPosTra").position, 1f, false, true, true, Curve.EaseOutQuad);
-                tra.SetParent(ResourceManager.Get("GardenNormal"));
+                tra.CreateTweenScale(ResourceManager.Get(GardenLabel.PlayerPosTra).localScale, 1f, true, true, Curve.EaseOutQuad);
+                tra.CreateTweenVec3D(ResourceManager.Get(GardenLabel.PlayerPosTra).position, 1f, false, true, true, Curve.EaseOutQuad);
+                tra.SetParent(ResourceManager.Get(GardenLabel.GardenNormal));
 
                 tra.TweenForVec();
                 tra.TweenForScale();
@@ -416,7 +409,7 @@ public class TutorialManager : Regist
 
                 ResourceManager.Get(ObjectLabel.N_Confirm).TweenBacCG();
 
-                TweenRoot tween = ResourceManager.Get("Tutorial").TweenBacSr();
+                TweenRoot tween = ResourceManager.Get(TutorialLabel.Tutorial).TweenBacSr();
 
                 tween.AddEventOnetime
                 (
@@ -434,8 +427,6 @@ public class TutorialManager : Regist
     {
         NewplayerTutorialIndex = SetNicknameTutorialIndex;
 
-        //ManaReso.SetActive(PrefabLabel.T_Close, false);
-
         NickNameManager.ShowNickNameSettingPanelFirstTime();
 
         NickNameManager.OnSetNickNameSucceed = EndSetNickname;
@@ -481,7 +472,7 @@ public class TutorialManager : Regist
 
     public static void PlayPunchMinigame()
     {
-        ResourceManager.Get("Tutorial").SetCollider(false);
+        ResourceManager.Get(TutorialLabel.Tutorial).SetCollider(false);
 
         ResourceManager.SetActive(ObjectLabel.D_Quit, false);
 
@@ -529,16 +520,16 @@ public class TutorialManager : Regist
             EventType.BackwardFinish, 
             () =>
             {
-                ResourceManager.Get("Tutorial").SetCollider(true);
+                ResourceManager.Get(TutorialLabel.Tutorial).SetCollider(true);
 
-                ResourceManager.Get<SpriteRenderer>("TutorialMask").material.SetAlpha("_Color", 1);
+                ResourceManager.Get<SpriteRenderer>(TutorialLabel.TutorialMask).material.SetAlpha(MaterialLabel.DefaultMatColor, 1);
 
-                ResourceManager.SetActive("TutorialMask", true);
-                ResourceManager.SetActive("TutorialCollider", true);
+                ResourceManager.SetActive(TutorialLabel.TutorialMask, true);
+                ResourceManager.SetActive(TutorialLabel.TutorialCollider, true);
 
                 Transform tra = GardenManager.SlotList[0].transform;
 
-                Tutorial.HightScene(0.1f, 0.075f, tra.FindChild("SlotArrow"), tra);
+                Tutorial.HightScene(0.1f, 0.075f, tra.FindChild(SlotLabel.SlotArrow), tra);
             }
         );
     }
@@ -554,7 +545,7 @@ public class TutorialManager : Regist
             {
                 Transform tra = ResourceManager.Get(ObjectLabel.G_RegularGrid).GetChild(0);
 
-                Tutorial.HightScreen(tra.FindChild("Arrow0"), tra);
+                Tutorial.HightScreen(tra.FindChild(FlowerItemLabel.Arrow0), tra);
             }
         );
 
@@ -663,7 +654,7 @@ public class TutorialManager : Regist
             {
                 Transform tra = Manager.SkillDic["Ability1"].SkillItem;
 
-                Tutorial.HightScreen(tra.FindChild("Arrow0"), tra.FindChild("Arrow1"), tra.FindChild("Btn"));
+                Tutorial.HightScreen(tra.FindChild(SkillItemLabel.Arrow0), tra.FindChild(SkillItemLabel.Arrow1), tra.FindChild(SkillItemLabel.Btn));
             }
         );
 
@@ -716,7 +707,7 @@ public class TutorialManager : Regist
             {
                 Transform tra = Manager.SkillDic["Skill1"].SkillItem;
 
-                Tutorial.HightScreen(tra.FindChild("Arrow0"), tra.FindChild("Arrow1"), tra.FindChild("Btn"));
+                Tutorial.HightScreen(tra.FindChild(SkillItemLabel.Arrow0), tra.FindChild(SkillItemLabel.Arrow1), tra.FindChild(SkillItemLabel.Btn));
             }
         );
 
@@ -806,7 +797,7 @@ public class TutorialManager : Regist
 
     public static void EndClickVisitBtn()
     {
-        StaticsManager.GetInstance().TutoComplete("C");
+        StaticsManager.GetInstance().TutoComplete("EndClickVisitBtn");
 
         Tutorial.HightDisable();
 
@@ -921,42 +912,42 @@ public class TutorialManager : Regist
 
     public static void EndShowFirstCorrectButton()
     {
-        StaticsManager.GetInstance().TutoComplete("B1");
+        StaticsManager.GetInstance().TutoComplete("EndShowFirstCorrectButton");
 
         Tutorial.HightDisable(0, false);
     }
 
     public static void EndShowSecondCorrectButton()
     {
-        StaticsManager.GetInstance().TutoComplete("B2");
+        StaticsManager.GetInstance().TutoComplete("EndShowSecondCorrectButton");
 
         Tutorial.HightDisable(0, false);
     }
 
     public static void EndShowThirdCorrectButton()
     {
-        StaticsManager.GetInstance().TutoComplete("B3");
+        StaticsManager.GetInstance().TutoComplete("EndShowThirdCorrectButton");
 
         Tutorial.HightDisable(0, false);
     }
 
     public static void EndShowFourthCorrectButton()
     {
-        StaticsManager.GetInstance().TutoComplete("B4");
+        StaticsManager.GetInstance().TutoComplete("EndShowFourthCorrectButton");
 
         Tutorial.HightDisable(0, false);
     }
 
     public static void EndShowFifthCorrectButton()
     {
-        StaticsManager.GetInstance().TutoComplete("B5");
+        StaticsManager.GetInstance().TutoComplete("EndShowFifthCorrectButton");
 
         Tutorial.HightDisable(0, false);
     }
 
     public static void EndShowSixthCorrectButton()
     {
-        StaticsManager.GetInstance().TutoComplete("B");
+        StaticsManager.GetInstance().TutoComplete("EndShowSixthCorrectButton");
 
         Tutorial.HightDisable();
 
@@ -978,108 +969,96 @@ public class TutorialManager : Regist
         MiniGameManager.Pause = true;
 
         int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
-
-        Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
-
-        ResourceManager.AddButtonEventOnetime
-            (
-                "D_FlowerBtn" + index,
-                () =>
-                {
-                    EndShowFirstCorrectButton();
-                    ShowSecondCorrectButton();
-                }
-            );
+        Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        button.AddButtonEventOnetime
+        (
+            () =>
+            {
+                EndShowFirstCorrectButton();
+                ShowSecondCorrectButton();
+            }
+        );
     }
 
     public static void ShowSecondCorrectButton()
     {
         int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
-
-        Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
-
-        ResourceManager.AddButtonEventOnetime
-            (
-                "D_FlowerBtn" + index,
-                () =>
-                {
-                    EndShowSecondCorrectButton();
-                    ShowThirdCorrectButton();
-                }
-            );
+        Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        button.AddButtonEventOnetime
+        (
+            () =>
+            {
+                EndShowSecondCorrectButton();
+                ShowThirdCorrectButton();
+            }
+        );
     }
 
     public static void ShowThirdCorrectButton()
     {
         int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
-
-        Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
-
-        ResourceManager.AddButtonEventOnetime
-            (
-                "D_FlowerBtn" + index,
-                () =>
-                {
-                    EndShowThirdCorrectButton();
-                    ShowFourthCorrectButton();
-                }
-            );
+        Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        button.AddButtonEventOnetime
+        (
+            () =>
+            {
+                EndShowThirdCorrectButton();
+                ShowFourthCorrectButton();
+            }
+        );
     }
 
     public static void ShowFourthCorrectButton()
     {
         int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
-
-        Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
-
-        ResourceManager.AddButtonEventOnetime
-            (
-                "D_FlowerBtn" + index,
-                () =>
-                {
-                    EndShowFourthCorrectButton();
-                    ShowFifthCorrectButton();
-                }
-            );
+        Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        button.AddButtonEventOnetime
+        (
+            () =>
+            {
+                EndShowFourthCorrectButton();
+                ShowFifthCorrectButton();
+            }
+        );
     }
 
     public static void ShowFifthCorrectButton()
     {
         int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
-
-        Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
-
-        ResourceManager.AddButtonEventOnetime
-            (
-                "D_FlowerBtn" + index,
-                () =>
-                {
-                    EndShowFifthCorrectButton();
-                    ShowSixthCorrectButton();
-                }
-            );
+        Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        button.AddButtonEventOnetime
+        (
+            () =>
+            {
+                EndShowFifthCorrectButton();
+                ShowSixthCorrectButton();
+            }
+        );
     }
 
     public static void ShowSixthCorrectButton()
     {
         int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
-
-        Tutorial.HightScreen(ResourceManager.Get("D_FlowerArrow" + index), ResourceManager.Get("D_FlowerBtn" + index));
-
-        ResourceManager.AddButtonEventOnetime
-            (
-                "D_FlowerBtn" + index,
-                () =>
-                {
-                    EndShowSixthCorrectButton();
-                }
-            );
+        Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
+        Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
+        button.AddButtonEventOnetime
+        (
+            () =>
+            {
+                EndShowSixthCorrectButton();
+            }
+        );
     }
 
 
     public static void EndClickDressroomButton()
     {
-        StaticsManager.GetInstance().TutoComplete("D");
+        StaticsManager.GetInstance().TutoComplete("EndClickDressroomButton");
 
         DressroomTutorial = false;
 
@@ -1188,7 +1167,7 @@ public class TutorialManager : Regist
 
     public static void EndClickCorrectButton()
     {
-        StaticsManager.GetInstance().TutoComplete("E");
+        StaticsManager.GetInstance().TutoComplete("EndClickCorrectButton");
 
         FindMinigameTutorial = false;
 
@@ -1217,7 +1196,7 @@ public class TutorialManager : Regist
 
     public static void EndClickPlazaRoomBtn()
     {
-        StaticsManager.GetInstance().TutoComplete("PlazaRoom1");
+        StaticsManager.GetInstance().TutoComplete("EndClickPlazaRoomBtn");
 
         Tutorial.HightDisable();
 

+ 101 - 115
Assets/Script/Manage/UIManager.cs

@@ -1,4 +1,4 @@
-using LitJson;
+using LitJson;
 
 using UnityEngine;
 using UnityEngine.UI;
@@ -48,22 +48,6 @@ public class UIManager : Regist
         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(ResourceLabel.GroupA, Folder.UI, true, Canvas, false, ObjType.GroupA);
-        //tra.SetActive(true);
-
-        //tra = ResourceManager.Get(ResourceLabel.GroupB, Folder.UI, true, Canvas, false, ObjType.GroupB);
-        //tra.SetActive(true);
-
-        //tra = ResourceManager.Get(ResourceLabel.GroupC, Folder.UI, true, Canvas, false, ObjType.GroupC);
-        //tra.SetActive(true);
-
-        //tra = ResourceManager.Get(ResourceLabel.GroupE, Folder.UI, true, Canvas, false, ObjType.GroupE);
-        //tra.SetActive(true);
-
-        //tra = ResourceManager.Get(ResourceLabel.GroupD, Folder.UI, true, Canvas, false, ObjType.GroupD);
-        //tra.SetActive(true);
-
-        //ResourceManager.TraDic.Add(Canvas.name, Canvas);
         ResourceManager.SetActive(ObjectLabel.C_Main, true);
         ResourceManager.SetActive(ObjectLabel.U_LoadingPanel, true);
 
@@ -88,6 +72,8 @@ public class UIManager : Regist
         InitialInstantiate();
     }
 
+    private int MinigameDisplayCoinAwardRatio = 10;
+    private int MinigameDisplayDiamondAward = 10;
     public override void FirstInit()
     {
         Instance = this;
@@ -148,7 +134,7 @@ public class UIManager : Regist
             ObjectLabel.Ba_Confirm,
             () =>
             {
-                AudioManager.PlayClip(Clip.CurrentClip);
+                AudioManager.PlayClip(AudioLabel.GetCurrent);
 
                 ResourceManager.Get(ObjectLabel.Ba_Notice).TweenBacCG();
 
@@ -199,7 +185,7 @@ public class UIManager : Regist
             ObjectLabel.Bb_Confirm,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
                 ResourceManager.Get(ObjectLabel.Bb_SignIn).TweenBacCG();
@@ -248,7 +234,7 @@ public class UIManager : Regist
                 ObjectLabel.Bd_Get,
                 () =>
                 {
-                    AudioManager.PlayClip(Clip.BtnClip);
+                    AudioManager.PlayClip(AudioLabel.ClickButton);
 
                     ResourceManager.Get(ObjectLabel.Bd_Mail0).TweenBacCG();
 
@@ -310,7 +296,7 @@ public class UIManager : Regist
             ObjectLabel.C_Setting,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.L_Setting).TweenForCG();
             }
@@ -406,13 +392,13 @@ public class UIManager : Regist
             ObjectLabel.C_MiniGame,
             () =>
             {
-                ResourceManager.Get("GardenMini").TweenForVec();
+                ResourceManager.Get(GardenLabel.GardenMini).TweenForVec();
 
                 ResourceManager.Get(ObjectLabel.D_MiniGame).TweenForCG();
 
                 MiniGameManager.GameEnter();
 
-                AudioManager.PlayClip(Clip.BubbleClip);
+                AudioManager.PlayClip(AudioLabel.Bubble);
             }
         );
 
@@ -433,7 +419,7 @@ public class UIManager : Regist
             ObjectLabel.C_DressRoom,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 if (Manager.Level < 13)
                 {
@@ -471,7 +457,7 @@ public class UIManager : Regist
             ObjectLabel.C_Praise,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 SocialManager.Praise();
             }
@@ -488,7 +474,7 @@ public class UIManager : Regist
             ObjectLabel.C_Notify,
             () =>
             {
-                AnnounceManager.Show();
+                AnnounceManager.ShowAnnouncePanel();
             }
         );
 
@@ -514,7 +500,7 @@ public class UIManager : Regist
             ObjectLabel.C_Comment,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 SocialManager.OpenCommentPanel();
             }
@@ -547,7 +533,7 @@ public class UIManager : Regist
                     }
                 );
 
-                AudioManager.PlayClip(Clip.BubbleClip);
+                AudioManager.PlayClip(AudioLabel.Bubble);
             }
         );
 
@@ -560,7 +546,7 @@ public class UIManager : Regist
             ObjectLabel.C_EnterPlazaRoom,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 PlazaRoomManager.OpenPanel();
             }
@@ -575,7 +561,7 @@ public class UIManager : Regist
             ObjectLabel.C_NickNameBK,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
                 NickNameManager.ShowNickNameSettingPanel();
             }
         );
@@ -636,7 +622,7 @@ public class UIManager : Regist
             ObjectLabel.D_Quit,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 MiniGameManager.Pause = true;
 
@@ -646,8 +632,8 @@ public class UIManager : Regist
                 ResourceManager.Get(ObjectLabel.Da_DiamondGroup).GetTweenScale().InDestination = true;
 
                 ResourceManager.SetText(ObjectLabel.Da_Tit, Language.GetStr(LanguageLabel.UI__Da_Tit0));
-                ResourceManager.SetText(ObjectLabel.Da_CoinLab, $"{10*Manager.Level}+");
-                ResourceManager.SetText(ObjectLabel.Da_DiamondLab, "10+");
+                ResourceManager.SetText(ObjectLabel.Da_CoinLab, $"{MinigameDisplayCoinAwardRatio*Manager.Level}+");
+                ResourceManager.SetText(ObjectLabel.Da_DiamondLab, $"{MinigameDisplayDiamondAward}+");
 
                 ResourceManager.SetActive(ObjectLabel.Da_Lab, true);
                 ResourceManager.SetActive(ObjectLabel.Da_Quit, true);
@@ -703,7 +689,7 @@ public class UIManager : Regist
             {
                 MiniGameManager.GamePrepare();
 
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
             }
         );
 
@@ -764,7 +750,7 @@ public class UIManager : Regist
         {
             ResourceManager.Get(ObjectLabel.C_Main).TweenBacCG();
 
-            AudioManager.MusicTheme.TweenBacAudio();
+            AudioManager.GardenThemeAudio.TweenBacAudio();
 
             ResourceManager.SetText(ObjectLabel.D_ScoreLab);
             ResourceManager.SetText(ObjectLabel.D_BeginLab, Language.GetStr(LanguageLabel.UI__D_BeginLab0));
@@ -775,9 +761,9 @@ public class UIManager : Regist
 
         tween.OnForwardFinish += () =>
         {
-            AudioManager.MusicMini.TweenForAudio();
+            AudioManager.MinigameAudio.TweenForAudio();
 
-            ResourceManager.SetActive("GardenNormal", false);
+            ResourceManager.SetActive(GardenLabel.GardenNormal, false);
 
             GardenManager.RetrieveAllElf();
             IAPManager.RetrieveADChest();
@@ -785,9 +771,9 @@ public class UIManager : Regist
 
         tween.OnBackwardStart += () =>
         {
-            AudioManager.MusicMini.TweenBacAudio();
+            AudioManager.MinigameAudio.TweenBacAudio();
 
-            ResourceManager.SetActive("GardenNormal", true);
+            ResourceManager.SetActive(GardenLabel.GardenNormal, true);
         };
 
         tween.OnBackwardFinish += () =>
@@ -795,7 +781,7 @@ public class UIManager : Regist
             ResourceManager.Get(ObjectLabel.C_Main).TweenForCG();
             ResourceManager.Get(ObjectLabel.C_Group).GetTweenCG().InOrigin = true;
 
-            AudioManager.MusicTheme.TweenForAudio();
+            AudioManager.GardenThemeAudio.TweenForAudio();
 
             GardenManager.MiniLock = true;
 
@@ -879,13 +865,13 @@ public class UIManager : Regist
             false,
             new List<UnityAction>()
             {
-                    () => { text.text = "3"; AudioManager.PlayClip(Clip.BubbleClip); },
+                    () => { text.text = "3"; AudioManager.PlayClip(AudioLabel.Bubble); },
                     () => { },
-                    () => { text.text = "2";; AudioManager.PlayClip(Clip.BubbleClip); },
+                    () => { text.text = "2";; AudioManager.PlayClip(AudioLabel.Bubble); },
                     () => { },
-                    () => { text.text = "1";; AudioManager.PlayClip(Clip.BubbleClip); },
+                    () => { text.text = "1";; AudioManager.PlayClip(AudioLabel.Bubble); },
                     () => { },
-                    () => { text.text = Language.GetStr(LanguageLabel.UI__D_PrepareLab); AudioManager.PlayClip(Clip.CurrentClip); },
+                    () => { text.text = Language.GetStr(LanguageLabel.UI__D_PrepareLab); AudioManager.PlayClip(AudioLabel.GetCurrent); },
                     () => { },
             }
         );
@@ -914,10 +900,10 @@ public class UIManager : Regist
             ObjectLabel.Da_Quit,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.Da_Info).TweenBacCG();
-                ResourceManager.Get("GardenMini").TweenBacVec();
+                ResourceManager.Get(GardenLabel.GardenMini).TweenBacVec();
                 ResourceManager.Get(ObjectLabel.D_MiniGame).TweenBacCG();
 
                 MiniGameManager.GameEnd();
@@ -939,7 +925,7 @@ public class UIManager : Regist
             ObjectLabel.Da_Cancel,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.Da_Info).TweenBacCG();
 
@@ -958,10 +944,10 @@ public class UIManager : Regist
             ObjectLabel.Da_GetAward,
             () =>
             {
-                AudioManager.PlayClip(Clip.CurrentClip);
+                AudioManager.PlayClip(AudioLabel.GetCurrent);
 
                 ResourceManager.Get(ObjectLabel.Da_Info).TweenBacCG();
-                ResourceManager.Get("GardenMini").TweenBacVec();
+                ResourceManager.Get(GardenLabel.GardenMini).TweenBacVec();
                 ResourceManager.Get(ObjectLabel.D_MiniGame).TweenBacCG();
 
                 InfoBoxManager.GardenInfoBox.Show(Award.Info, 10f, Color.white, Lib.Atlas);
@@ -1048,12 +1034,12 @@ public class UIManager : Regist
         };
 
 
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn1, () => { MiniGameManager.OperateMemoryGame(1,1); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn2, () => { MiniGameManager.OperateMemoryGame(2,2); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn3, () => { MiniGameManager.OperateMemoryGame(3,4); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn4, () => { MiniGameManager.OperateMemoryGame(4,5); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn5, () => { MiniGameManager.OperateMemoryGame(5,7); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn6, () => { MiniGameManager.OperateMemoryGame(6,8); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn1, () => { MiniGameManager.OperateMemoryGame(0,0); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn2, () => { MiniGameManager.OperateMemoryGame(1,1); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn3, () => { MiniGameManager.OperateMemoryGame(2,3); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn4, () => { MiniGameManager.OperateMemoryGame(3,4); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn5, () => { MiniGameManager.OperateMemoryGame(4,6); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn6, () => { MiniGameManager.OperateMemoryGame(5,7); });
 
         #endregion
 
@@ -1180,7 +1166,7 @@ public class UIManager : Regist
             ObjectLabel.Ea_Reset,
             () =>
             {
-                ConfigManager.ResetPlayerConfig();
+                ConfigManager.ResetConfigDocument();
             }
         );
 
@@ -1307,7 +1293,7 @@ public class UIManager : Regist
             ObjectLabel.F_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
             }
@@ -1340,7 +1326,7 @@ public class UIManager : Regist
             ObjectLabel.F_Elf,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.F_Elf).TweenForScale();
                 ResourceManager.Get(ObjectLabel.F_Store).TweenBacScale();
@@ -1376,7 +1362,7 @@ public class UIManager : Regist
             ObjectLabel.F_Store,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.F_Elf).TweenBacScale();
                 ResourceManager.Get(ObjectLabel.F_Store).TweenForScale();
@@ -1412,7 +1398,7 @@ public class UIManager : Regist
             ObjectLabel.F_Magic,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.F_Elf).TweenBacScale();
                 ResourceManager.Get(ObjectLabel.F_Store).TweenBacScale();
@@ -1448,7 +1434,7 @@ public class UIManager : Regist
             ObjectLabel.F_Garden,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.F_Elf).TweenBacScale();
                 ResourceManager.Get(ObjectLabel.F_Store).TweenBacScale();
@@ -1532,7 +1518,7 @@ public class UIManager : Regist
             ObjectLabel.F_PersonBtn,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 string suffix = "";
 
@@ -1562,7 +1548,7 @@ public class UIManager : Regist
             ObjectLabel.F_CoinPersonBtn,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 string suffix = "";
 
@@ -1599,7 +1585,7 @@ public class UIManager : Regist
             ObjectLabel.Fe_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
             }
@@ -1615,7 +1601,7 @@ public class UIManager : Regist
             ObjectLabel.Fg_Btn,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get<Button>(ObjectLabel.Fg_Btn).interactable = false;
 
@@ -1634,7 +1620,7 @@ public class UIManager : Regist
             ObjectLabel.Fg_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.Fg_Reconnect).TweenBacCG();
             }
@@ -1669,7 +1655,7 @@ public class UIManager : Regist
             ObjectLabel.G_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.G_Flower).TweenBacCG();
             }
@@ -1683,7 +1669,7 @@ public class UIManager : Regist
 
         tween.OnForwardStart += () =>
         {
-            AudioManager.PlayClip(Clip.BubbleClip);
+            AudioManager.PlayClip(AudioLabel.Bubble);
 
             ResourceManager.Get(ObjectLabel.C_Main).TweenBacCG();
 
@@ -1716,7 +1702,7 @@ public class UIManager : Regist
             ObjectLabel.G_Special,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.SetActive(ObjectLabel.G_SpecialScrr, true);
                 ResourceManager.SetActive(ObjectLabel.G_RegularScrr, false);
@@ -1737,7 +1723,7 @@ public class UIManager : Regist
             ObjectLabel.G_Regular,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.SetActive(ObjectLabel.G_SpecialScrr, false);
                 ResourceManager.SetActive(ObjectLabel.G_RegularScrr, true);
@@ -1756,7 +1742,7 @@ public class UIManager : Regist
             ObjectLabel.G_Retrieve,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.G_Flower).TweenBacCG();
 
@@ -1779,7 +1765,7 @@ public class UIManager : Regist
             ObjectLabel.H_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.H_FlowerCard).TweenBacCG();
             }
@@ -1814,7 +1800,7 @@ public class UIManager : Regist
             ObjectLabel.H_Icon2,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 GardenManager.PlantFlower(GardenManager.SeleInfo);
             }
@@ -1879,7 +1865,7 @@ public class UIManager : Regist
 
         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Lc_CreditsContent), new MulLanStr(LanguageLabel.UI__Lc_CreditsContent));
 
-        ResourceManager.SetText(ObjectLabel.L_UserLab, ConfigManager.GetPlayerString("ID"));
+        ResourceManager.SetText(ObjectLabel.L_UserLab, ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID));
 
         #region L_Setting
 
@@ -1904,7 +1890,7 @@ public class UIManager : Regist
             ObjectLabel.L_Confirm,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.L_Setting).TweenBacCG();
             }
@@ -1922,7 +1908,7 @@ public class UIManager : Regist
             ObjectLabel.Lc_CreditsMask,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.Lc_CreditsMask).TweenBacCG();
                 ResourceManager.Get(ObjectLabel.Lc_CreditsContent).TweenBacCG();
@@ -1949,7 +1935,7 @@ public class UIManager : Regist
             {
                 ShowCredits();
 
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
             }
         );
 
@@ -1965,7 +1951,7 @@ public class UIManager : Regist
             {
                 IAPManager.Share();
 
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
             }
         );
 
@@ -1985,7 +1971,7 @@ public class UIManager : Regist
             {
                 AudioManager.Instance.AudioSwitch();
 
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
             }
         );
 
@@ -1998,7 +1984,7 @@ public class UIManager : Regist
             ObjectLabel.L_MusicBtn,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 AudioManager.Instance.MusicSwitch();
             }
@@ -2013,7 +1999,7 @@ public class UIManager : Regist
             ObjectLabel.L_ReportBtn,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.Lb_Info).TweenForCG();
             }
@@ -2028,7 +2014,7 @@ public class UIManager : Regist
             ObjectLabel.L_ChangeBtn,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.La_Info).TweenForCG();
             }
@@ -2043,7 +2029,7 @@ public class UIManager : Regist
             ObjectLabel.L_ResetBtn,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 Bubble.Show
                 (
@@ -2053,7 +2039,7 @@ public class UIManager : Regist
                     null,
                     () =>
                     {
-                        ConfigManager.ResetPlayerConfig();
+                        ConfigManager.ResetConfigDocument();
                     }
                 );
             }
@@ -2069,7 +2055,7 @@ public class UIManager : Regist
             ObjectLabel.L_TraChi,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get<Button>(ObjectLabel.L_TraChi).interactable = false;
                 ResourceManager.Get<Button>(ObjectLabel.L_SimChi).interactable = true;
@@ -2092,7 +2078,7 @@ public class UIManager : Regist
             ObjectLabel.L_SimChi,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get<Button>(ObjectLabel.L_TraChi).interactable = true;
                 ResourceManager.Get<Button>(ObjectLabel.L_SimChi).interactable = false;
@@ -2115,7 +2101,7 @@ public class UIManager : Regist
             ObjectLabel.L_English,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get<Button>(ObjectLabel.L_TraChi).interactable = true;
                 ResourceManager.Get<Button>(ObjectLabel.L_SimChi).interactable = true;
@@ -2145,7 +2131,7 @@ public class UIManager : Regist
             ObjectLabel.La_Cancel,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.La_Info).TweenBacCG();
             }
@@ -2160,7 +2146,7 @@ public class UIManager : Regist
             ObjectLabel.La_Confirm,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 string id = ResourceManager.Get<InputField>(ObjectLabel.La_InputField).text;
 
@@ -2191,7 +2177,7 @@ public class UIManager : Regist
             ObjectLabel.Lb_Cancel,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.Lb_Info).TweenBacCG();
             }
@@ -2206,7 +2192,7 @@ public class UIManager : Regist
             ObjectLabel.Lb_Confirm,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 HttpManager.Report();
             }
@@ -2227,7 +2213,7 @@ public class UIManager : Regist
             ObjectLabel.M_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.M_Achieve).TweenBacGra();
             }
@@ -2413,7 +2399,7 @@ public class UIManager : Regist
             ObjectLabel.P_Hair,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.P_Hair).TweenForScale();
                 ResourceManager.Get(ObjectLabel.P_Top).TweenBacScale();
@@ -2457,7 +2443,7 @@ public class UIManager : Regist
             ObjectLabel.P_Top,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.P_Hair).TweenBacScale();
                 ResourceManager.Get(ObjectLabel.P_Top).TweenForScale();
@@ -2501,7 +2487,7 @@ public class UIManager : Regist
             ObjectLabel.P_Dress,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.P_Hair).TweenBacScale();
                 ResourceManager.Get(ObjectLabel.P_Top).TweenBacScale();
@@ -2545,7 +2531,7 @@ public class UIManager : Regist
             ObjectLabel.P_Decarator,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.P_Hair).TweenBacScale();
                 ResourceManager.Get(ObjectLabel.P_Top).TweenBacScale();
@@ -2589,7 +2575,7 @@ public class UIManager : Regist
                 ObjectLabel.P_Wing,
                 () =>
                 {
-                    AudioManager.PlayClip(Clip.BtnClip);
+                    AudioManager.PlayClip(AudioLabel.ClickButton);
 
                     ResourceManager.Get(ObjectLabel.P_Hair).TweenBacScale();
                     ResourceManager.Get(ObjectLabel.P_Top).TweenBacScale();
@@ -2633,7 +2619,7 @@ public class UIManager : Regist
             ObjectLabel.P_Shoe,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.P_Hair).TweenBacScale();
                 ResourceManager.Get(ObjectLabel.P_Top).TweenBacScale();
@@ -2748,7 +2734,7 @@ public class UIManager : Regist
                 ObjectLabel.Pa_Close,
                 () =>
                 {
-                    AudioManager.PlayClip(Clip.CloseClip);
+                    AudioManager.PlayClip(AudioLabel.Close);
 
                     ResourceManager.Get(ObjectLabel.Pa_Info).TweenBacCG();
                 }
@@ -2874,7 +2860,7 @@ public class UIManager : Regist
             ObjectLabel.T_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
                 NickNameManager.CloseNickNameSettingPanel();
             }
         );
@@ -2884,7 +2870,7 @@ public class UIManager : Regist
             ObjectLabel.T_Random,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
                 NickNameManager.SetRandomName();
             }
         );
@@ -2921,7 +2907,7 @@ public class UIManager : Regist
             ObjectLabel.X_CreateChest,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ChestManager.OpenCreateChestPanel();
             }
@@ -2936,7 +2922,7 @@ public class UIManager : Regist
             ObjectLabel.X_Quit,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 SFSObject arg = new SFSObject();
                 arg.PutInt(SFSLabel.CommandID, PlazaRoomReq.LeaveRoom.GetHashCode());
@@ -2954,7 +2940,7 @@ public class UIManager : Regist
             ObjectLabel.X_SendPublicMessage,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 if (SFSManager.GardenSmartFox.PlazaRoomController.SendPublicMessage(ResourceManager.Get<InputField>(ObjectLabel.X_InputField).text))
                 {
@@ -3144,7 +3130,7 @@ public class UIManager : Regist
             ObjectLabel.Y_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 ChestManager.CloseCreateChestPanel();
             }
@@ -3167,7 +3153,7 @@ public class UIManager : Regist
             ObjectLabel.Yb_Btn,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ChestManager.CreateChest();
             }
@@ -3182,7 +3168,7 @@ public class UIManager : Regist
             ObjectLabel.Y_Btn,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 PlazaRoomChest.CurrentChest.GetAward(ResourceManager.Get<InputField>(ObjectLabel.Y_InputField).text);
             }
@@ -3227,7 +3213,7 @@ public class UIManager : Regist
             ObjectLabel.Z_Create,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 PlazaRoomManager.OpenCreatePanel();
             }
@@ -3242,7 +3228,7 @@ public class UIManager : Regist
             ObjectLabel.Z_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 PlazaRoomManager.ClosePanel();
             }
@@ -3257,7 +3243,7 @@ public class UIManager : Regist
             ObjectLabel.Z_InfoImg50,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 if (PlazaRoomManager.FilterEnabled)
                     PlazaRoomManager.DisableFilter();
@@ -3287,7 +3273,7 @@ public class UIManager : Regist
             ObjectLabel.AA_Close,
             () =>
             {
-                AudioManager.PlayClip(Clip.CloseClip);
+                AudioManager.PlayClip(AudioLabel.Close);
 
                 PlazaRoomManager.CloseCreatePanel();
             }
@@ -3302,7 +3288,7 @@ public class UIManager : Regist
             ObjectLabel.AA_Btn,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 PlazaRoomManager.CreateRoom();
 
@@ -3336,11 +3322,11 @@ public class UIManager : Regist
     {
         HudTarget hudTarget = ResourceManager.Get(ObjectLabel.C_MiniGame).AddComponent<HudTarget>();
 
-        hudTarget.PosTra = PlayerManager.Player.ChildDic["EnterGameTra"];
+        hudTarget.PosTra = PlayerManager.Player.ChildDic[PlayerLabel.EnterGameTra];
 
         hudTarget = ResourceManager.Get(ObjectLabel.C_Tip).AddComponent<HudTarget>();
 
-        hudTarget.PosTra = PlayerManager.Player.ChildDic["EnterGameTra"];
+        hudTarget.PosTra = PlayerManager.Player.ChildDic[PlayerLabel.EnterGameTra];
     }
 
 
@@ -3421,7 +3407,7 @@ public class UIManager : Regist
     {
         ResourceManager.Get(ObjectLabel.F_Manage0).TweenForVec();
 
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         if (TutorialManager.NewplayerTutorial)
         {

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

@@ -165,7 +165,7 @@ public class VisitManager : Regist
                     () =>
                     {
                         text.text = (CoolTime - tempInt).ToString();
-                        AudioManager.PlayClip(Clip.BtnClip);
+                        AudioManager.PlayClip(AudioLabel.ClickButton);
                     }
                 );
 
@@ -186,7 +186,7 @@ public class VisitManager : Regist
 
             tween.OnForwardFinish += () =>
             {
-                AudioManager.PlayClip(Clip.BubbleClip);
+                AudioManager.PlayClip(AudioLabel.Bubble);
             };
         }
 
@@ -272,31 +272,31 @@ public class VisitManager : Regist
 
         if (OriginBird)
         {
-            ResourceManager.Get("Bird0").GetTweenSr().InDestination = true;
+            ResourceManager.Get(GardenLabel.BirdPivot).GetTweenSr().InDestination = true;
         }
         else
         {
-            ResourceManager.Get("Bird0").GetTweenSr().InOrigin = true;
+            ResourceManager.Get(GardenLabel.BirdPivot).GetTweenSr().InOrigin = true;
         }
 
         if (OriginTree)
         {
-            ResourceManager.Get("Tree1").GetTweenSr().InDestination = true;
-            ResourceManager.Get("Tree2").GetTweenSr().InDestination = true;
+            ResourceManager.Get(GardenLabel.GardenLeftTree).GetTweenSr().InDestination = true;
+            ResourceManager.Get(GardenLabel.GardenRightTree).GetTweenSr().InDestination = true;
         }
         else
         {
-            ResourceManager.Get("Tree1").GetTweenSr().InOrigin = true;
-            ResourceManager.Get("Tree2").GetTweenSr().InOrigin = true;
+            ResourceManager.Get(GardenLabel.GardenLeftTree).GetTweenSr().InOrigin = true;
+            ResourceManager.Get(GardenLabel.GardenRightTree).GetTweenSr().InOrigin = true;
         }
 
         if (OriginRainbow)
         {
-            ResourceManager.Get("Rainbow").GetTweenSr().InDestination = true;
+            ResourceManager.Get(GardenLabel.GardenRainbow).GetTweenSr().InDestination = true;
         }
         else
         {
-            ResourceManager.Get("Rainbow").GetTweenSr().InOrigin = true;
+            ResourceManager.Get(GardenLabel.GardenRainbow).GetTweenSr().InOrigin = true;
         }
 
         #endregion
@@ -305,16 +305,16 @@ public class VisitManager : Regist
 
         ResourceManager.Save(PlayerManager.Player);
 
-        ResourceManager.TraDic.Remove("Player");
+        ResourceManager.TraDic.Remove(PlayerLabel.Player);
 
         PlayerManager.Instance.GetPlayer();
         UIManager.SetEnterGameLabel();
 
         Garden.PlayerPos = new List<Vector3>();
 
-        Garden.Player = ResourceManager.Get("Player");
-        Garden.PlayerPos.Add(PlayerManager.Player.ChildDic["RightPos"].position);
-        Garden.PlayerPos.Add(PlayerManager.Player.ChildDic["LeftPos"].position);
+        Garden.Player = ResourceManager.Get(PlayerLabel.Player);
+        Garden.PlayerPos.Add(PlayerManager.Player.ChildDic[PlayerLabel.RightPos].position);
+        Garden.PlayerPos.Add(PlayerManager.Player.ChildDic[PlayerLabel.LeftPos].position);
 
         #endregion
 
@@ -371,33 +371,33 @@ public class VisitManager : Regist
 
         if (!InVisit)
         {
-            if (ResourceManager.Get("Bird0").gameObject.activeSelf)
+            if (ResourceManager.Get(GardenLabel.BirdPivot).gameObject.activeSelf)
             {
                 OriginBird = true;
             }
 
-            if (ResourceManager.Get("Tree1").gameObject.activeSelf)
+            if (ResourceManager.Get(GardenLabel.GardenLeftTree).gameObject.activeSelf)
             {
                 OriginTree = true;
             }
 
-            if (ResourceManager.Get("Rainbow").gameObject.activeSelf)
+            if (ResourceManager.Get(GardenLabel.GardenRainbow).gameObject.activeSelf)
             {
                 OriginRainbow = true;
             }
         }
 
-        ResourceManager.SetActive("Bird0", false);
-        ResourceManager.SetActive("Tree1", false);
-        ResourceManager.SetActive("Tree2", false);
-        ResourceManager.SetActive("Rainbow", false);
+        ResourceManager.SetActive(GardenLabel.BirdPivot, false);
+        ResourceManager.SetActive(GardenLabel.GardenLeftTree, false);
+        ResourceManager.SetActive(GardenLabel.GardenRightTree, false);
+        ResourceManager.SetActive(GardenLabel.GardenRainbow, false);
 
         #endregion
 
         #region Ability
 
         Slot = GardenManager.DefaultSlot;
-        Slot += ConfigManager.GetPlayerInt(PlayerConfigLabel.ExtraSlot);
+        Slot += ConfigManager.GetIntFormConfig(PlayerConfigLabel.ExtraSlot);
 
         if (!InVisit)
         {
@@ -431,16 +431,16 @@ public class VisitManager : Regist
 
             if (attributeList[i][0].Value == "Ability2")
             {
-                ResourceManager.Get("Rainbow").GetTweenSr().InDestination = true;
+                ResourceManager.Get(GardenLabel.GardenRainbow).GetTweenSr().InDestination = true;
             }
             else if (attributeList[i][0].Value == "Ability3")
             {
-                ResourceManager.Get("Tree1").GetTweenSr().InDestination = true;
-                ResourceManager.Get("Tree2").GetTweenSr().InDestination = true;
+                ResourceManager.Get(GardenLabel.GardenLeftTree).GetTweenSr().InDestination = true;
+                ResourceManager.Get(GardenLabel.GardenRightTree).GetTweenSr().InDestination = true;
             }
             else if (attributeList[i][0].Value == "Ability4")
             {
-                ResourceManager.Get("Bird0").GetTweenSr().InDestination = true;
+                ResourceManager.Get(GardenLabel.BirdPivot).GetTweenSr().InDestination = true;
             }
             else if (attributeList[i][0].Value == "Ability5")
             {
@@ -629,15 +629,15 @@ public class VisitManager : Regist
 
         ResourceManager.Save(PlayerManager.Player);
 
-        ResourceManager.TraDic.Remove("Player");
+        ResourceManager.TraDic.Remove(PlayerLabel.Player);
 
         PlayerManager.Instance.GetPlayer(Node).SetAllCollider(false);
 
         Garden.PlayerPos = new List<Vector3>();
 
-        Garden.Player = ResourceManager.Get("Player");
-        Garden.PlayerPos.Add(PlayerManager.Player.ChildDic["RightPos"].position);
-        Garden.PlayerPos.Add(PlayerManager.Player.ChildDic["LeftPos"].position);
+        Garden.Player = ResourceManager.Get(PlayerLabel.Player);
+        Garden.PlayerPos.Add(PlayerManager.Player.ChildDic[PlayerLabel.RightPos].position);
+        Garden.PlayerPos.Add(PlayerManager.Player.ChildDic[PlayerLabel.LeftPos].position);
 
         #endregion
 
@@ -653,7 +653,7 @@ public class VisitManager : Regist
 
         #endregion
 
-        XmlNode nicknameNode = Document.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode("NickName");
+        XmlNode nicknameNode = Document.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.NickName);
         if (nicknameNode == null || string.IsNullOrEmpty(nicknameNode.Attributes[0].Value))
         {
             SetVisiteeNickName(Language.GetStr(LanguageLabel.UI__Unnamed));
@@ -801,7 +801,7 @@ public class VisitManager : Regist
 
                 GetArchive(archiveSource, info);
 
-                AudioManager.PlayClip(Clip.BubbleClip);
+                AudioManager.PlayClip(AudioLabel.Bubble);
 
                 ResourceManager.SetActive(ObjectLabel.C_Return, false);
 
@@ -906,7 +906,7 @@ public class VisitManager : Regist
         //Debug.Log(jsonData.ToJson());
         XmlDocument document = new XmlDocument();
         document.LoadXml(jsonData["l"].ToString());
-        XmlNode xmlNode = document.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode("SerialNumber");
+        XmlNode xmlNode = document.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.SerialNumber);
         if (xmlNode != null && xmlNode.Attributes[0].Value != HttpManager.SerialNumber)
         {
             UnusedDataList.Add(new VisitData(jsonData, document));
@@ -953,7 +953,7 @@ public class VisitManager : Regist
     {
         XmlDocument doc = new XmlDocument();
 
-        doc.LoadXml(ConfigManager.PlayerDoc.OuterXml); //以自己的存档做模板进行修改
+        doc.LoadXml(ConfigManager.ConfigDocument.OuterXml); //以自己的存档做模板进行修改
 
         int newLevel = Random.Range(1, 450); //随机等级
 
@@ -1021,13 +1021,13 @@ public class VisitManager : Regist
 
         plantList = plantList.TrimEnd(' ');
 
-        doc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode("PlantList").Attributes[0].Value = plantList;
+        doc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.PlantList).Attributes[0].Value = plantList;
 
         #endregion
 
         #region 随机一套服装 等级越高拥有的服装越多 再随机选几件穿上
 
-        XmlNode xmlNode = doc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode("DressData");
+        XmlNode xmlNode = doc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.DressData);
         xmlNode.Attributes[0].Value = "";
 
 

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

@@ -113,7 +113,7 @@ public class Chest : MonoBehaviour
     private float MaxSpeed = 3f; 
     public void Initialize(float freezY, bool forceLeft, bool forceRight)
     {
-        AudioManager.PlayClip(Clip.BubbleClip);
+        AudioManager.PlayClip(AudioLabel.Bubble);
 
         float speedX = Mathf.Lerp(MinSpeed, MaxSpeed, Random.Range(0f, 1f));
 
@@ -159,7 +159,7 @@ public class Chest : MonoBehaviour
 
     public virtual void OnPointerClick(PointerEventData eventData)
     {
-        AudioManager.PlayClip(Clip.CurrentClip);
+        AudioManager.PlayClip(AudioLabel.GetCurrent);
         Rigidbody.velocity = new Vector2();
         Rigidbody.isKinematic = true;
     }

+ 12 - 4
Assets/Script/Object/CommentItem.cs

@@ -7,6 +7,14 @@ using System.Collections.Generic;
 using LitJson;
 using Random = UnityEngine.Random;
 
+public class CommentItemLabel
+{
+    public static string Tit = "Tit";
+    public static string VisitLab = "VisitLab";
+    public static string VisitBtn = "VisitBtn";
+    public static string ContentLab = "ContentLab";
+}
+
 public class CommentData
 {
     public string SerialNumber;
@@ -73,10 +81,10 @@ public class CommentItem : Regist
 
         Auxiliary.CompileDic(transform, childDic);
 
-        Tit = childDic["Tit"].GetComponent<Text>();
-        VisitLab = childDic["VisitLab"].GetComponent<Text>();
-        VisitBtn = childDic["VisitBtn"].GetComponent<Button>();
-        ContentLab = childDic["ContentLab"].GetComponent<BestfitText>();
+        Tit = childDic[CommentItemLabel.Tit].GetComponent<Text>();
+        VisitLab = childDic[CommentItemLabel.VisitLab].GetComponent<Text>();
+        VisitBtn = childDic[CommentItemLabel.VisitBtn].GetComponent<Button>();
+        ContentLab = childDic[CommentItemLabel.ContentLab].GetComponent<BestfitText>();
         ContentLab.VerticalMaxSize = 20;
 
         VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;

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

@@ -88,7 +88,7 @@ public class Drop : Regist,IPointerClickHandler
 
     public virtual void OnPointerClick(PointerEventData eventData)
     {
-        AudioManager.PlayClip(Clip.CurrentClip);
+        AudioManager.PlayClip(AudioLabel.GetCurrent);
 
         MoveLock = false;
 

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

@@ -16,6 +16,6 @@ public class DropDiamond : Drop
 
         Award.BonusDiamond += diamond;
 
-        ResourceManager.GetHudText($"{TransferLabel.DiamondSprite}+diamond", Color.white, 90, transform, ResourceManager.Get(ObjectLabel.D_HudParent), true);
+        ResourceManager.GetHudText($"{TransferLabel.DiamondSprite}+{diamond}", Color.white, 90, transform, ResourceManager.Get(ObjectLabel.D_HudParent), true);
     }
 }

+ 53 - 40
Assets/Script/Object/Flower.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Serialization;
 using UnityEngine.EventSystems;
@@ -18,6 +18,25 @@ public enum OpType
     Fertilize,
 }
 
+public class FlowerLabel
+{
+    public static string GoldBk = "GoldBk";
+    public static string GoldIcon = "GoldIcon";
+    public static string FlashLight = "FlashLight";
+    public static string FlowerIcon = "FlowerIcon";
+    public static string OperateBk = "OperateBk";
+    public static string OperateIcon = "OperateIcon";
+    public static string OperateOutline1 = "OperateOutline1";
+    public static string NewFlowerEffect = "NewFlowerEffect";
+    public static string FlowerShadow = "FlowerShadow";
+    public static string ScorePosTra = "ScorePosTra";
+    public static string MiniGame = "MiniGame";
+    public static string Flash = "Flash";
+    public static string ParticleSystem = "Particle System";
+    public static string GoldPosTra = "GoldPosTra";
+    public static string GoldBKPosLeft = "GoldBKPosLeft";
+}
+
 public class FlowerInfo
 {
     #region Config
@@ -31,7 +50,7 @@ public class FlowerInfo
 
             AmountLab.SetActive(true);
 
-            AmountLab.text = "x" + amount;
+            AmountLab.text = AmountTextPrefix + amount;
         }
     }
     public int amount;
@@ -80,6 +99,8 @@ public class FlowerInfo
     private float SkillPlus = 0.1f;
 
     public static string IDPrefix = "Flower";
+    public static string AmountTextPrefix = "x";
+
     public string FullID
     {
         get
@@ -133,11 +154,11 @@ public class FlowerInfo
 
         Auxiliary.CompileDic(FlowerItem, ChildDic);
 
-        Text = ChildDic["Lab"].GetComponent<Text>();
-        Image = ChildDic["Icon"].GetComponent<Image>();
-        Button = ChildDic["FlowerItem"].GetComponent<Button>();
-        UIPartical = ChildDic["UIParticle System"].GetComponent<UIPartical>();
-        AmountLab = ChildDic["AmtLab"].GetComponent<Text>();
+        Text = ChildDic[FlowerItemLabel.Lab].GetComponent<Text>();
+        Image = ChildDic[FlowerItemLabel.Icon].GetComponent<Image>();
+        Button = ChildDic[FlowerItemLabel.FlowerItem].GetComponent<Button>();
+        UIPartical = ChildDic[FlowerItemLabel.UIParticleSystem].GetComponent<UIPartical>();
+        AmountLab = ChildDic[FlowerItemLabel.AmtLab].GetComponent<Text>();
 
         ID_ = int.Parse(attribute[0].Value);
         Icon_ = attribute[5].Value;
@@ -156,7 +177,7 @@ public class FlowerInfo
             {
                 if (Plant)
                 {
-                    AudioManager.PlayClip(Clip.BtnClip);
+                    AudioManager.PlayClip(AudioLabel.ClickButton);
 
                     GardenManager.ShowRetrieveCard(this);
                 }
@@ -302,15 +323,15 @@ public class Flower : Regist, IPointerClickHandler
 
         Auxiliary.CompileDic(transform, ChildDic);
 
-        GoldBk = ChildDic["GoldBk"];
-        GoldIcon = ChildDic["GoldIcon"];
-        FlashLightAC = ChildDic["FlashLight"].GetComponent<Animator>();
-        FlowerIcon = ChildDic["FlowerIcon"].GetComponent<SpriteRenderer>();
-        OperateBk = ChildDic["OperateBk"].GetComponent<SpriteRenderer>();
-        OperateIcon = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
-        OperateOutline = ChildDic["OperateOutline1"].GetComponent<SpriteRenderer>();
-        NewFlowerEffect = ChildDic["NewFlowerEffect"].GetComponent<ParticleSystem>();
-        ShadowSr = ChildDic["FlowerShadow"].GetComponent<SpriteRenderer>();
+        GoldBk = ChildDic[FlowerLabel.GoldBk];
+        GoldIcon = ChildDic[FlowerLabel.GoldIcon];
+        FlashLightAC = ChildDic[FlowerLabel.FlashLight].GetComponent<Animator>();
+        FlowerIcon = ChildDic[FlowerLabel.FlowerIcon].GetComponent<SpriteRenderer>();
+        OperateBk = ChildDic[FlowerLabel.OperateBk].GetComponent<SpriteRenderer>();
+        OperateIcon = ChildDic[FlowerLabel.OperateIcon].GetComponent<SpriteRenderer>();
+        OperateOutline = ChildDic[FlowerLabel.OperateOutline1].GetComponent<SpriteRenderer>();
+        NewFlowerEffect = ChildDic[FlowerLabel.NewFlowerEffect].GetComponent<ParticleSystem>();
+        ShadowSr = ChildDic[FlowerLabel.FlowerShadow].GetComponent<SpriteRenderer>();
 
         GoldBk.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
         GoldIcon.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
@@ -357,14 +378,14 @@ public class Flower : Regist, IPointerClickHandler
     {
         OpType = OpType.Null;
 
-        ChildDic["MiniGame"].SetActive(false);
+        ChildDic[FlowerLabel.MiniGame].SetActive(false);
 
         OperateBk.TweenBacScale();
     }
 
     public void GameBegin()
     {
-        ChildDic["MiniGame"].SetActive(true);
+        ChildDic[FlowerLabel.MiniGame].SetActive(true);
 
         OperateBk.SetActive(false);
     }
@@ -483,13 +504,13 @@ public class Flower : Regist, IPointerClickHandler
 
             OperateIcon.Shake(0.5f, 3, new Vector3(0.2f, 0, 0), Curve.EaseOutQuad);
 
-            AudioManager.PlayClip(Clip.ErrorClip);
+            AudioManager.PlayClip(AudioLabel.Error);
 
             return false;
         }
         else
         {
-            ResourceManager.GetHudText($"+{PunchScore}", Color.white, 90, ChildDic["ScorePosTra"], ResourceManager.Get(ObjectLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{PunchScore}", Color.white, 90, ChildDic[FlowerLabel.ScorePosTra], ResourceManager.Get(ObjectLabel.D_HudParent), true);
 
             MiniGameManager.Score += PunchScore;
 
@@ -503,7 +524,7 @@ public class Flower : Regist, IPointerClickHandler
             OperateIcon.SetActive(false);
             OperateOutline.SetActive(false);
 
-            AudioManager.PlayClip(Clip.BtnClip);
+            AudioManager.PlayClip(AudioLabel.ClickButton);
 
             return true;
         }
@@ -519,11 +540,11 @@ public class Flower : Regist, IPointerClickHandler
 
     public void Retrieve()
     {
-        ChildDic["Flash"].SetActive(false);
-        ChildDic["Particle System"].SetActive(false);
+        ChildDic[FlowerLabel.Flash].SetActive(false);
+        ChildDic[FlowerLabel.ParticleSystem].SetActive(false);
         
-        FlowerInfo.ChildDic["UIFlash"].SetActive(false);
-        FlowerInfo.ChildDic["UIParticle System"].SetActive(false);
+        FlowerInfo.ChildDic[FlowerItemLabel.UIFlash].SetActive(false);
+        FlowerInfo.ChildDic[FlowerItemLabel.UIParticleSystem].SetActive(false);
 
         ShadowSr.SetAlpha(1);
 
@@ -572,7 +593,7 @@ public class Flower : Regist, IPointerClickHandler
 
     public void GetAward()
     {
-        AudioManager.PlayClip(Clip.CurrentClip);
+        AudioManager.PlayClip(AudioLabel.GetCurrent);
 
         PlayFlashLight();
 
@@ -622,7 +643,7 @@ public class Flower : Regist, IPointerClickHandler
             }
         );
 
-        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, ChildDic["GoldPosTra"], ResourceManager.Get(ObjectLabel.A_HudParent), true);
+        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, ChildDic[FlowerLabel.GoldPosTra], ResourceManager.Get(ObjectLabel.A_HudParent), true);
 
         ResetAward();
     }
@@ -640,22 +661,14 @@ public class Flower : Regist, IPointerClickHandler
 
     public void ShowAward()
     {
-        //if (Slot.Index%9 == 3 || Slot.Index%9 == 8)
-        //{
-            GoldBk.SetX(ChildDic["GoldBKPosLeft"].position.x);
-            GoldBk.GetComponent<SpriteRenderer>().flipX = true;
-        //}
-        //else
-        //{
-        //    GoldBk.SetX(ChildDic["GoldBKPosRight"].position.x);
-        //    GoldBk.GetComponent<SpriteRenderer>().flipX = false;
-        //}
+        GoldBk.SetX(ChildDic[FlowerLabel.GoldBKPosLeft].position.x);
+        GoldBk.GetComponent<SpriteRenderer>().flipX = true;
 
         GoldBk.SetY(transform.position.y + 2.5f);
-        
+
         GoldBk.TweenReForSr();
         GoldIcon.TweenReForSr();
-        
+
         GoldBk.MoveOffset2D
         (
             new Vector3(0, 0.5f, 0),

+ 12 - 1
Assets/Script/Object/FlowerItem.cs

@@ -3,6 +3,17 @@ using UnityEngine;
 using System.Collections;
 using System.Collections.Generic;
 
+public class FlowerItemLabel
+{
+    public static string Arrow0 = "Arrow0";
+    public static string Lab = "Lab";
+    public static string Icon = "Icon";
+    public static string FlowerItem = "FlowerItem";
+    public static string UIParticleSystem = "UIParticle System";
+    public static string AmtLab = "AmtLab";
+    public static string UIFlash = "UIFlash";
+}
+
 public class FlowerItem : MonoBehaviour
 {
     public void OnDisable()
@@ -10,4 +21,4 @@ public class FlowerItem : MonoBehaviour
         transform.GetChild(0).GetChild(0).SetActive(false);
         transform.GetChild(0).GetChild(1).SetActive(false);
     }
-}
+}

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

@@ -14,7 +14,7 @@ public enum Direction
 
 public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandler, IBeginDragHandler
 {
-    #region 变量
+    #region Config
 
     public static int Page
     {
@@ -63,16 +63,16 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         #region Item
 
-        ResourceManager.Get("Bird0").CreateTweenSr(0, 1, 2f, false, true, Curve.EaseOutQuad, false, true);
-        ResourceManager.Get("Tree1").CreateTweenSr(0, 1, 2f, false, true, Curve.EaseOutQuad);
-        ResourceManager.Get("Tree2").CreateTweenSr(0, 1, 2f, false, true, Curve.EaseOutQuad);
-        ResourceManager.Get("Rainbow").CreateTweenSr(0, 1, 2f, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get(GardenLabel.BirdPivot).CreateTweenSr(0, 1, 2f, false, true, Curve.EaseOutQuad, false, true);
+        ResourceManager.Get(GardenLabel.GardenLeftTree).CreateTweenSr(0, 1, 2f, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get(GardenLabel.GardenRightTree).CreateTweenSr(0, 1, 2f, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get(GardenLabel.GardenRainbow).CreateTweenSr(0, 1, 2f, false, true, Curve.EaseOutQuad);
 
         #endregion
 
         #region Cloud1
 
-        Transform tra = ResourceManager.Get("Cloud1");
+        Transform tra = ResourceManager.Get(GardenLabel.GardenCloud1);
 
         TweenRoot tween = tra.CreateTweenVec2D(new Vector3(-14, tra.localPosition.y, tra.localPosition.z), 85f, true, false, true, Curve.Linear);
 
@@ -84,7 +84,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         #region Cloud2
 
-        tra = ResourceManager.Get("Cloud2");
+        tra = ResourceManager.Get(GardenLabel.GardenCloud2);
 
         tween = tra.CreateTweenVec2D(new Vector3(-14, tra.localPosition.y, tra.localPosition.z), 127.5f, true, false, true, Curve.Linear);
 
@@ -96,7 +96,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         #region Cloud3
 
-        tra = ResourceManager.Get("Cloud3");
+        tra = ResourceManager.Get(GardenLabel.GardenCloud3);
 
         tween = tra.CreateTweenVec2D(new Vector3(-14, tra.localPosition.y, tra.localPosition.z), 170f, true, false, true, Curve.Linear);
 
@@ -114,9 +114,9 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         #region GardenMini
 
-        ResourceManager.Get("GardenMini").CreateTweenVec2D
+        ResourceManager.Get(GardenLabel.GardenMini).CreateTweenVec2D
         (
-            ResourceManager.Get("MiniPos").position,
+            ResourceManager.Get(GardenLabel.MinigameLeftPos).position,
             0.5f,
             false,
             false,
@@ -128,7 +128,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         #region GardenPage
 
-        GardenPage = ResourceManager.Get("GardenPage");
+        GardenPage = ResourceManager.Get(GardenLabel.SlotPage);
 
         Move2D move2D = GardenPage.CreateMove2D();
 
@@ -149,24 +149,24 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
     public override void RegistReference()
     {
-        GardenBK2 = ResourceManager.Get("GardenBK2");
-        GardenBK3 = ResourceManager.Get("GardenBK3");
-        GardenBK4 = ResourceManager.Get("GardenBK4");
+        GardenBK2 = ResourceManager.Get(GardenLabel.GardenBK2);
+        GardenBK3 = ResourceManager.Get(GardenLabel.GardenBK3);
+        GardenBK4 = ResourceManager.Get(GardenLabel.GardenBK4);
 
-        GardenBK2Pos.Add(ResourceManager.Get("BK2RightPos").position);
-        GardenBK2Pos.Add(ResourceManager.Get("BK2LeftPos").position);
+        GardenBK2Pos.Add(ResourceManager.Get(GardenLabel.BK2RightPos).position);
+        GardenBK2Pos.Add(ResourceManager.Get(GardenLabel.BK2LeftPos).position);
 
-        GardenBK3Pos.Add(ResourceManager.Get("BK3RightPos").position);
-        GardenBK3Pos.Add(ResourceManager.Get("BK3LeftPos").position);
+        GardenBK3Pos.Add(ResourceManager.Get(GardenLabel.BK3RightPos).position);
+        GardenBK3Pos.Add(ResourceManager.Get(GardenLabel.BK3LeftPos).position);
 
-        GardenBK4Pos.Add(ResourceManager.Get("BK4RightPos").position);
-        GardenBK4Pos.Add(ResourceManager.Get("BK4LeftPos").position);
+        GardenBK4Pos.Add(ResourceManager.Get(GardenLabel.BK4RightPos).position);
+        GardenBK4Pos.Add(ResourceManager.Get(GardenLabel.BK4LeftPos).position);
 
         if (!TutorialManager.NewplayerTutorial)
         {
-            Player = ResourceManager.Get("Player");
-            PlayerPos.Add(PlayerManager.Player.ChildDic["RightPos"].position);
-            PlayerPos.Add(PlayerManager.Player.ChildDic["LeftPos"].position);
+            Player = ResourceManager.Get(PlayerLabel.Player);
+            PlayerPos.Add(PlayerManager.Player.ChildDic[PlayerLabel.RightPos].position);
+            PlayerPos.Add(PlayerManager.Player.ChildDic[PlayerLabel.LeftPos].position);
         }
     }
 
@@ -177,9 +177,9 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
     public override void TutorialToRegular()
     {
-        Player = ResourceManager.Get("Player");
-        PlayerPos.Add(PlayerManager.Player.ChildDic["RightPos"].position);
-        PlayerPos.Add(PlayerManager.Player.ChildDic["LeftPos"].position);
+        Player = ResourceManager.Get(PlayerLabel.Player);
+        PlayerPos.Add(PlayerManager.Player.ChildDic[PlayerLabel.RightPos].position);
+        PlayerPos.Add(PlayerManager.Player.ChildDic[PlayerLabel.LeftPos].position);
     }
 
 
@@ -328,7 +328,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
             return;
         }
         
-        if (eventData.rawPointerPress.transform.name.Contains("Slot"))
+        if (eventData.rawPointerPress.transform.name.Contains(SlotLabel.Slot))
         {
             if (VisitManager.InVisit)
             {

+ 52 - 27
Assets/Script/Object/Player.cs

@@ -1,4 +1,4 @@
-using DragonBones;
+using DragonBones;
 
 using UnityEngine;
 using UnityEngine.UI;
@@ -14,6 +14,21 @@ using Slot = DragonBones.Slot;
 using Random = UnityEngine.Random;
 using Transform = UnityEngine.Transform;
 
+public class PlayerLabel
+{
+    
+    public static string MessageBox = "MessageBox";
+    public static string NickName = "NickName";
+    public static string Pivot = "Pivot";
+    public static string Shadow = "Shadow";
+    public static string ExpressionMeshFilter = "ExpressionMeshFilter";
+    public static string ShadowParent = "ShadowParent";
+    public static string Player = "Player";
+    public static string RightPos = "RightPos";
+    public static string LeftPos = "LeftPos";
+    public static string EnterGameTra = "EnterGameTra";
+}
+
 public enum BodyPart
 {
     Leg = 0,
@@ -62,6 +77,16 @@ public class ExchangeInfo
     }
 }
 
+public class CloseItemLabel
+{
+    public static string Icon1 = "Icon1";
+    public static string Icon2 = "Icon2";
+    public static string Icon3 = "Icon3";
+    public static string CloseItem = "CloseItem";
+    public static string BuyBtn = "BuyBtn";
+    public static string BuyBtnLab = "BuyBtnLab";
+}
+
 public class CloseItem
 {
     public enum CloseType
@@ -194,12 +219,12 @@ public class CloseItem
 
         Auxiliary.CompileDic(Transform, ChildDic);
 
-        Icon1 = ChildDic["Icon1"].GetComponent<Image>();
-        Icon2 = ChildDic["Icon2"].GetComponent<Image>();
-        Icon3 = ChildDic["Icon3"].GetComponent<Image>();
-        DressBtn = ChildDic["CloseItem"].GetComponent<Button>();
-        BuyBtn = ChildDic["BuyBtn"].GetComponent<Button>();
-        BuyBtnLab = ChildDic["BuyBtnLab"].GetComponent<Text>();
+        Icon1 = ChildDic[CloseItemLabel.Icon1].GetComponent<Image>();
+        Icon2 = ChildDic[CloseItemLabel.Icon2].GetComponent<Image>();
+        Icon3 = ChildDic[CloseItemLabel.Icon3].GetComponent<Image>();
+        DressBtn = ChildDic[CloseItemLabel.CloseItem].GetComponent<Button>();
+        BuyBtn = ChildDic[CloseItemLabel.BuyBtn].GetComponent<Button>();
+        BuyBtnLab = ChildDic[CloseItemLabel.BuyBtnLab].GetComponent<Text>();
 
         BuyBtnLab.GetComponent<TextPlus>().SetY = true;
 
@@ -222,7 +247,7 @@ public class CloseItem
         (
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.Pa_Info).TweenForCG();
                 SetUpUI(newSize, new Vector2(0, 22), ResourceManager.Get<Image>(ObjectLabel.Pa_Icon1), ResourceManager.Get<Image>(ObjectLabel.Pa_Icon3), ResourceManager.Get<Image>(ObjectLabel.Pa_Icon2));
@@ -242,7 +267,7 @@ public class CloseItem
         (
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 if (BuyLevel > Manager.Level)
                 {
@@ -487,7 +512,7 @@ public class CloseItem
     public void OnBuySucceed()
     {
         Unlock();
-        AudioManager.PlayClip(Clip.CurrentClip);
+        AudioManager.PlayClip(AudioLabel.GetCurrent);
         PlayerManager.BoughtCloseList.UniqueAdd(id);
         HttpManager.Save();
     }
@@ -681,7 +706,7 @@ public class Player : Regist , IPointerClickHandler
         {
             if (pivot == null)
             {
-                pivot = UAC.transform.FindChild("Pivot");
+                pivot = UAC.transform.FindChild(PlayerLabel.Pivot);
             }
 
             return pivot;
@@ -743,7 +768,7 @@ public class Player : Regist , IPointerClickHandler
         Vector3 bigShadowScale = new Vector3(1.820952f, 2.418199f, 1.820952f);
         Vector3 smallShadowScale = new Vector3(1.081191f, 1.435807f, 1.081191f);
 
-        Shadow = ChildDic["Shadow"];
+        Shadow = ChildDic[PlayerLabel.Shadow];
         Shadow.CreateStreamScale
         (
             new List<float>() {0, 0, 0},
@@ -758,7 +783,7 @@ public class Player : Regist , IPointerClickHandler
         meshFilter.mesh.SetUVs(1, Enumerable.Repeat(new Vector2(0, 1), meshFilter.mesh.vertices.Length).ToList());
         Shadow.GetComponent<MeshRenderer>().sharedMaterial = UnityFactory.Materials[0];
 
-        ExpressionMeshFilter = ChildDic["ExpressionMeshFilter"].GetComponent<MeshFilter>();
+        ExpressionMeshFilter = ChildDic[PlayerLabel.ExpressionMeshFilter].GetComponent<MeshFilter>();
         ExpressionMeshFilter.GetComponent<MeshRenderer>().sharedMaterial = UnityFactory.Materials[0];
 
         return false;
@@ -863,7 +888,7 @@ public class Player : Regist , IPointerClickHandler
 
     public void OnPointerClick(PointerEventData eventData)
     {
-        AudioManager.PlayClip(Clip.CurrentClip);
+        AudioManager.PlayClip(AudioLabel.GetCurrent);
 
         PlayAnim(JumpAnimationName);
     }
@@ -959,7 +984,7 @@ public class Player : Regist , IPointerClickHandler
 
     public void Save(bool showNavigate)
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         List<CloseItem> closeUnitList = new List<CloseItem>();
 
@@ -1001,7 +1026,7 @@ public class Player : Regist , IPointerClickHandler
 
     public void Reset()
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         List<string> dressData = new List<string>(PlayerManager.DressData);
 
@@ -1103,13 +1128,13 @@ public class Player : Regist , IPointerClickHandler
                 EventType.BackwardFinish,
                 () =>
                 {
-                    transform.SetParent(ResourceManager.Get("GardenNormal"));
+                    transform.SetParent(ResourceManager.Get(GardenLabel.GardenNormal));
 
-                    transform.position = ResourceManager.Get("PlayerPosTra").position;
-                    transform.localScale = ResourceManager.Get("PlayerPosTra").lossyScale;
+                    transform.position = ResourceManager.Get(GardenLabel.PlayerPosTra).position;
+                    transform.localScale = ResourceManager.Get(GardenLabel.PlayerPosTra).lossyScale;
 
                     ResourceManager.Get(ResourceLabel.Garden).TweenForSr();
-                    ResourceManager.Get("DressRoom").TweenBacSr();
+                    ResourceManager.Get(DressroomLabel.DressRoom).TweenBacSr();
 
                     ResourceManager.Get(ObjectLabel.C_Main).TweenForCG();
                     ResourceManager.Get(ObjectLabel.P_DressRoom).TweenBacCG();
@@ -1173,13 +1198,13 @@ public class Player : Regist , IPointerClickHandler
 
                     ActiveShadow();
 
-                    transform.SetParent(ResourceManager.Get("DressRoom"));
+                    transform.SetParent(ResourceManager.Get(DressroomLabel.DressRoom));
 
-                    transform.position = ResourceManager.Get("DressRoomPos").position;
-                    transform.localScale = ResourceManager.Get("DressRoomPos").lossyScale;
+                    transform.position = ResourceManager.Get(DressroomLabel.DressRoomPos).position;
+                    transform.localScale = ResourceManager.Get(DressroomLabel.DressRoomPos).lossyScale;
 
                     ResourceManager.Get(ResourceLabel.Garden).TweenBacSr();
-                    ResourceManager.Get("DressRoom").TweenForSr();
+                    ResourceManager.Get(DressroomLabel.DressRoom).TweenForSr();
 
                     ResourceManager.Get(ObjectLabel.P_DressRoom).TweenForCG();
                 }
@@ -1201,15 +1226,15 @@ public class Player : Regist , IPointerClickHandler
 
     public void ActiveShadow()
     {
-        ChildDic["ShadowParent"].SetActive(true);
-        ChildDic["ShadowParent"].SetLZ(3);
+        ChildDic[PlayerLabel.ShadowParent].SetActive(true);
+        ChildDic[PlayerLabel.ShadowParent].SetLZ(3);
     }
 
     public void DeactiveShadow()
     {
         Shadow.GetStreamScale().Pause();
         Shadow.GetStreamScale().InOrigin = true;
-        ChildDic["ShadowParent"].SetActive(false);
+        ChildDic[PlayerLabel.ShadowParent].SetActive(false);
     }
 
     #region 换装

+ 23 - 7
Assets/Script/Object/PlazaRoom.cs

@@ -8,6 +8,22 @@ using UnityEngine.EventSystems;
 using Debug = UnityEngine.Debug;
 using Transform = UnityEngine.Transform;
 
+public class PlazaRoomLabel
+{
+    public static string PlayerLeftDownBorder = "PlayerLeftDownBorder";
+    public static string PlayerRightTopBorder = "PlayerRightTopBorder";
+    public static string PlazaRoomDefaultPosition = "PlazaRoomDefaultPosition";
+    public static string PlazaRoomSky = "PlazaRoomSky";
+    public static string PlazaRoomCameraLeftBorder = "PlazaRoomCameraLeftBorder";
+    public static string PlazaRoomCameraRightBorder = "PlazaRoomCameraRightBorder";
+    public static string PlazaRoomChestPos = "PlazaRoomChestPos";
+    public static string PlazaRoom = "PlazaRoom";
+    public static string PhonoGraph = "PhonoGraph";
+    public static string PlazaRoomCloud1 = "PlazaRoomCloud1";
+    public static string PlazaRoomCloud2 = "PlazaRoomCloud2";
+    public static string PlazaRoomCloud3 = "PlazaRoomCloud3";
+}
+
 public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 {
     private class StarCreater
@@ -32,7 +48,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
                 StarSpawnTime = Random.Range(MinStarSpawnTime, MaxStarSpawnTime);
                 StarSpawnTimer = 0;
 
-                Transform star = ResourceManager.Get(ResourceLabel.PlazaRoomStar, Folder.Scene, false, ResourceManager.Get("PlazaRoom"), false, ObjType.PlazaRoomStar, typeof(PlazaRoomStar));
+                Transform star = ResourceManager.Get(ResourceLabel.PlazaRoomStar, Folder.Scene, false, ResourceManager.Get(PlazaRoomLabel.PlazaRoom), false, ObjType.PlazaRoomStar, typeof(PlazaRoomStar));
                 star.GetComponent<PlazaRoomStar>().Show();
 
                 star.localScale = Vector3.Lerp(MinStarScale, MaxStarScale, Random.Range(0f, 1f));
@@ -69,16 +85,16 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         StarCreaters.Add(new StarCreater());
         StarCreaters.Add(new StarCreater());
 
-        Transform tra = ResourceManager.Get("PlazaRoom", Folder.Scene, true, null, true);
+        Transform tra = ResourceManager.Get(PlazaRoomLabel.PlazaRoom, Folder.Scene, true, null, true);
         tra.AddComponent<PlazaRoom>();
 
         UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(ResourceLabel.PhonoGraphSke, Folder.Config));
 
         UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.PhonoGraphTex, Folder.Config), ResourceLabel.PhonoGraphTexture);
 
-        UnityArmatureComponent uac = UnityFactory.factory.BuildArmatureComponent("PhonoGraph");
+        UnityArmatureComponent uac = UnityFactory.factory.BuildArmatureComponent(PlazaRoomLabel.PhonoGraph);
 
-        uac.transform.parent = ResourceManager.Get("PhonoGraph");
+        uac.transform.parent = ResourceManager.Get(PlazaRoomLabel.PhonoGraph);
         uac.anim.Play(PhonoGraphAnimName);
         uac.transform.localPosition = new Vector3();
     }
@@ -87,7 +103,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
     {
         #region Cloud1
 
-        Transform tra = ResourceManager.Get("PlazaRoomCloud1");
+        Transform tra = ResourceManager.Get(PlazaRoomLabel.PlazaRoomCloud1);
 
         //tra.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("云朵", Folder.Scene);
 
@@ -101,7 +117,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
         #region Cloud2
 
-        tra = ResourceManager.Get("PlazaRoomCloud2");
+        tra = ResourceManager.Get(PlazaRoomLabel.PlazaRoomCloud2);
 
         //tra.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("云朵", Folder.Scene);
 
@@ -115,7 +131,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
         #region Cloud3
 
-        tra = ResourceManager.Get("PlazaRoomCloud3");
+        tra = ResourceManager.Get(PlazaRoomLabel.PlazaRoomCloud3);
 
         //tra.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("云朵", Folder.Scene);
 

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,6 +9,11 @@ using UnityEngine.UI;
 using Random = UnityEngine.Random;
 using Transform = UnityEngine.Transform;
 
+public class PlazaRoomChestLabel
+{
+    public static string Hud = "Hud";
+}
+
 public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 {
     #region Config
@@ -300,7 +305,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         Deactive();
         TurnGray();
 
-        ChestTimerTransform = ResourceManager.Get("ChestTimer", Folder.UI, false, ResourceManager.Get(ObjectLabel.W_HudParent), false, ObjType.ChestTimer);
+        ChestTimerTransform = ResourceManager.Get(ResourceLabel.ChestTimer, Folder.UI, false, ResourceManager.Get(ObjectLabel.W_HudParent), false, ObjType.ChestTimer);
         ChestTimerLab = ChestTimerTransform.GetComponentInChildren<Text>();
         HudTarget hudTarget = ChestTimerTransform.GetComponent<HudTarget>();
         if (hudTarget == null)
@@ -309,7 +314,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
             ChestTimerTransform.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
             PlazaRoom.DepthDictionary.Add(transform, new List<Transform> {ChestTimerTransform});
         }
-        hudTarget.PosTra = transform.parent.FindChild("Hud");
+        hudTarget.PosTra = transform.parent.FindChild(PlazaRoomChestLabel.Hud);
         ResetChestTimer();
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultChestStatus(chestData.DatabaseRoomID);
 
@@ -431,7 +436,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         CurrentChest = this;
 
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         if (ChestData.ChestType == ChestType.Lucky)
         {

+ 21 - 9
Assets/Script/Object/PlazaRoomItem.cs

@@ -104,6 +104,18 @@ public class RoomData
     }
 }
 
+public class PlazaRoomItemLabel
+{
+    public static string ID = "ID";
+    public static string Name = "Name";
+    public static string Status = "Status";
+    public static string Duration = "Duration";
+    public static string People = "People";
+    public static string Img0 = "Img0";
+    public static string Btn = "Btn";
+    public static string BtnLab = "BtnLab";
+}
+
 public class PlazaRoomItem : MonoBehaviour
 {
     #region Config
@@ -131,14 +143,14 @@ public class PlazaRoomItem : MonoBehaviour
 
         Dictionary<string, Transform> dictionary = new Dictionary<string, Transform>();
         Auxiliary.CompileDic(transform, dictionary);
-        ID = dictionary["ID"].GetComponent<Text>();
-        Name = dictionary["Name"].GetComponent<Text>();
-        Status = dictionary["Status"].GetComponent<Text>();
-        Duration = dictionary["Duration"].GetComponent<Text>();
-        People = dictionary["People"].GetComponent<Text>();
-        Img0 = dictionary["Img0"].GetComponent<Image>();
-        Button = dictionary["Btn"].GetComponent<Button>();
-        ButtonLab = dictionary["BtnLab"].GetComponent<Text>();
+        ID = dictionary[PlazaRoomItemLabel.ID].GetComponent<Text>();
+        Name = dictionary[PlazaRoomItemLabel.Name].GetComponent<Text>();
+        Status = dictionary[PlazaRoomItemLabel.Status].GetComponent<Text>();
+        Duration = dictionary[PlazaRoomItemLabel.Duration].GetComponent<Text>();
+        People = dictionary[PlazaRoomItemLabel.People].GetComponent<Text>();
+        Img0 = dictionary[PlazaRoomItemLabel.Img0].GetComponent<Image>();
+        Button = dictionary[PlazaRoomItemLabel.Btn].GetComponent<Button>();
+        ButtonLab = dictionary[PlazaRoomItemLabel.BtnLab].GetComponent<Text>();
     }
 
     public PlazaRoomItem Init(RoomData roomData)
@@ -220,7 +232,7 @@ public class PlazaRoomItem : MonoBehaviour
 
     public static void OnJoinBtn(RoomData roomData)
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
         SFSManager.GardenSmartFox.PlazaRoomController.BeginEnterPlazaRoom(roomData);
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.JoinPlazaRoom(roomData.ID);
     }

+ 16 - 6
Assets/Script/Object/RankItem.cs

@@ -7,6 +7,16 @@ using System.Collections.Generic;
 
 using Random = UnityEngine.Random;
 
+public class RanktemLabel
+{
+    public static string Tit = "Tit";
+    public static string TitBK = "TitBK";
+    public static string VisitLab = "VisitLab";
+    public static string PraiseLab = "PraiseLab";
+    public static string VisitBtn = "VisitBtn";
+    public static string ContentLab = "ContentLab";
+}
+
 public class Ranktem : Regist
 {
     public Text Tit;
@@ -31,12 +41,12 @@ public class Ranktem : Regist
 
         Auxiliary.CompileDic(transform, childDic);
 
-        Tit = childDic["Tit"].GetComponent<Text>();
-        TitBK = childDic["TitBK"].GetComponent<Image>();
-        VisitLab = childDic["VisitLab"].GetComponent<Text>();
-        PraiseLab = childDic["PraiseLab"].GetComponent<Text>();
-        VisitBtn = childDic["VisitBtn"].GetComponent<Button>();
-        ContentLab = childDic["ContentLab"].GetComponent<Text>();
+        Tit = childDic[RanktemLabel.Tit].GetComponent<Text>();
+        TitBK = childDic[RanktemLabel.TitBK].GetComponent<Image>();
+        VisitLab = childDic[RanktemLabel.VisitLab].GetComponent<Text>();
+        PraiseLab = childDic[RanktemLabel.PraiseLab].GetComponent<Text>();
+        VisitBtn = childDic[RanktemLabel.VisitBtn].GetComponent<Button>();
+        ContentLab = childDic[RanktemLabel.ContentLab].GetComponent<Text>();
 
         VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
 

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

@@ -357,7 +357,7 @@ public class Ability : SkillRoot
                 EventType.BackwardFinish,
                 () =>
                 {
-                    ResourceManager.Get("MainCamera").Zoom2D(1.5f, 3f, 1, flower.ElfList.Back(0), Curve.EaseOutQuad);
+                    ResourceManager.Get(ResourceLabel.MainCamera).Zoom2D(1.5f, 3f, 1, flower.ElfList.Back(0), Curve.EaseOutQuad);
                 }
             );
         }
@@ -389,7 +389,7 @@ public class Ability : SkillRoot
                 EventType.BackwardFinish,
                 () =>
                 {
-                    ResourceManager.Get("MainCamera").Zoom2D(3.5f, 3f, 1, ResourceManager.Get(Item), Curve.EaseOutQuad);
+                    ResourceManager.Get(ResourceLabel.MainCamera).Zoom2D(3.5f, 3f, 1, ResourceManager.Get(Item), Curve.EaseOutQuad);
                 }
             );
         }
@@ -423,7 +423,7 @@ public class Ability : SkillRoot
 
     public void UnlockSucceed()
     {
-        AudioManager.PlayClip(Clip.SkillClip);
+        AudioManager.PlayClip(AudioLabel.UseSkill);
 
         ItemIcon.material = null;
         ItemStatus = SkillStatus.Upgrade;
@@ -442,7 +442,7 @@ public class Ability : SkillRoot
 
     protected void OnClick()
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
 
@@ -533,7 +533,7 @@ public class Ability : SkillRoot
 
     public void UpgradeSucceed()
     {
-        AudioManager.PlayClip(Clip.SkillClip);
+        AudioManager.PlayClip(AudioLabel.UseSkill);
 
         Level++;
 
@@ -576,7 +576,7 @@ public class Ability : SkillRoot
 
     public void UnlockAheadSucceed()
     {
-        AudioManager.PlayClip(Clip.SkillClip);
+        AudioManager.PlayClip(AudioLabel.UseSkill);
 
         if (UnlockCur == Current.Free)
         {

+ 31 - 9
Assets/Script/Object/Skill/BigSkill.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 
 using System;
@@ -73,6 +73,10 @@ public class BigSkill : Skill
 
     public SkillStatus BarStatus_;
 
+    public static List<Text> BigSkillTexts = new List<Text>();
+    public static List<Image> BigSkillBk0s = new List<Image>();
+    public static List<Image> BigSkillBk1s = new List<Image>();
+
     #endregion
 
     public BigSkill(XmlAttributeCollection attribute) : base(attribute)
@@ -363,9 +367,27 @@ public class BigSkill : Skill
     {
         base.RegistReference();
 
-        BarLab = ResourceManager.Get<Text>(string.Format("F_SkillLab{0}", BarIndex));
-        BarBk0 = ResourceManager.Get<Image>(string.Format("F_SkillBk{0}0", BarIndex));
-        BarBk1 = ResourceManager.Get<Image>(string.Format("F_SkillBk{0}1", BarIndex));
+        if (BigSkillBk0s.Count == 0)
+        {
+            BigSkillTexts.Add(ResourceManager.Get<Text>(ObjectLabel.F_SkillLab1));
+            BigSkillTexts.Add(ResourceManager.Get<Text>(ObjectLabel.F_SkillLab2));
+            BigSkillTexts.Add(ResourceManager.Get<Text>(ObjectLabel.F_SkillLab3));
+            BigSkillTexts.Add(ResourceManager.Get<Text>(ObjectLabel.F_SkillLab4));
+
+            BigSkillBk0s.Add(ResourceManager.Get<Image>(ObjectLabel.F_SkillBk10));
+            BigSkillBk0s.Add(ResourceManager.Get<Image>(ObjectLabel.F_SkillBk20));
+            BigSkillBk0s.Add(ResourceManager.Get<Image>(ObjectLabel.F_SkillBk30));
+            BigSkillBk0s.Add(ResourceManager.Get<Image>(ObjectLabel.F_SkillBk40));
+
+            BigSkillBk1s.Add(ResourceManager.Get<Image>(ObjectLabel.F_SkillBk11));
+            BigSkillBk1s.Add(ResourceManager.Get<Image>(ObjectLabel.F_SkillBk21));
+            BigSkillBk1s.Add(ResourceManager.Get<Image>(ObjectLabel.F_SkillBk31));
+            BigSkillBk1s.Add(ResourceManager.Get<Image>(ObjectLabel.F_SkillBk41));
+        }
+
+        BarLab = BigSkillTexts[BarIndex-1];
+        BarBk0 = BigSkillBk0s[BarIndex-1];
+        BarBk1 = BigSkillBk1s[BarIndex-1];
         BarBtn = BarBk1.GetComponent<Button>();
     }
 
@@ -379,7 +401,7 @@ public class BigSkill : Skill
             UnlockCur,
             () =>
             {
-                AudioManager.PlayClip(Clip.SkillClip);
+                AudioManager.PlayClip(AudioLabel.UseSkill);
 
                 BarStatus = SkillStatus.Buy;
                 ItemStatus = SkillStatus.Upgrade;
@@ -412,7 +434,7 @@ public class BigSkill : Skill
             UpgradeCur,
             () =>
             {
-                AudioManager.PlayClip(Clip.SkillClip);
+                AudioManager.PlayClip(AudioLabel.UseSkill);
 
                 Level++;
 
@@ -468,7 +490,7 @@ public class BigSkill : Skill
             BuyCur,
             () =>
             {
-                AudioManager.PlayClip(Clip.SkillClip);
+                AudioManager.PlayClip(AudioLabel.UseSkill);
 
                 ResourceManager.GetLightwall();
 
@@ -525,7 +547,7 @@ public class BigSkill : Skill
 
     protected override void OnClick()
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
 
@@ -612,7 +634,7 @@ public class BigSkill : Skill
                 }
                 else
                 {
-                    AudioManager.PlayClip(Clip.SkillClip);
+                    AudioManager.PlayClip(AudioLabel.UseSkill);
 
                     ItemStatus = SkillStatus.UnLock;
                 }

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

@@ -276,7 +276,7 @@ public class Pack : SkillRoot
 
     protected void OnClick()
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
 
@@ -306,7 +306,7 @@ public class Pack : SkillRoot
 
     protected void OnBuy()
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         Manager.Pay(FullID, UseAmt, BuyCur, ()=> OnBuySucceed(), StaticsManager.ItemID.购买礼包,  StaticsManager.ConsumeModule.Charge);
     }
@@ -368,7 +368,7 @@ public class Pack : SkillRoot
 
         Level++;
 
-        AudioManager.PlayClip(Clip.SkillClip);
+        AudioManager.PlayClip(AudioLabel.UseSkill);
 
         if (BuyCur == Current.Cash)
         {

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

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 
 using System;
@@ -357,7 +357,7 @@ public class Skill : SkillRoot
             BuyCur,
             () =>
             {
-                AudioManager.PlayClip(Clip.SkillClip);
+                AudioManager.PlayClip(AudioLabel.UseSkill);
 
                 if (BuyCur != Current.AD)
                 {
@@ -378,7 +378,7 @@ public class Skill : SkillRoot
 
     protected virtual void OnClick()
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
         if (ItemStatus == SkillStatus.Buy)
         {
@@ -447,7 +447,7 @@ public class Skill : SkillRoot
             UnlockAheadCur,
             () =>
             {
-                AudioManager.PlayClip(Clip.BtnClip);
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ItemIcon.material = null;
 

+ 8 - 1
Assets/Script/Object/Skill/SkillRoot.cs

@@ -43,9 +43,16 @@ public enum SkillStatus
     Upgrade,
 }
 
+public class SkillItemLabel
+{
+    public static string Btn = "Btn";
+    public static string Arrow0 = "Arrow0";
+    public static string Arrow1 = "Arrow1";
+}
+
 public abstract class SkillRoot
 {
-    #region 变量
+    #region Config
 
     #region 配置
 

+ 6 - 0
Assets/Script/Object/Slot.cs

@@ -4,6 +4,12 @@ using UnityEngine.UI;
 using System.Collections;
 using System.Collections.Generic;
 
+public class SlotLabel
+{
+    public static string Slot = "Slot";
+    public static string SlotArrow = "SlotArrorw";
+}
+
 public class Slot : Regist
 {
     #region Config

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

@@ -98,7 +98,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
     private float MaxSpeed = 3f;
     public void Initialize(float freezY, bool forceLeft, bool forceRight)
     {
-        AudioManager.PlayClip(Clip.BubbleClip);
+        AudioManager.PlayClip(AudioLabel.Bubble);
 
 
         float speedX = Mathf.Lerp(MinSpeed, MaxSpeed, Random.Range(0f, 1f));
@@ -142,7 +142,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
 
     public void OnPointerClick(PointerEventData eventData)
     {
-        AudioManager.PlayClip(Clip.CurrentClip);
+        AudioManager.PlayClip(AudioLabel.GetCurrent);
 
 
         Rigidbody.velocity = new Vector2();
@@ -157,12 +157,12 @@ public class Star : MonoBehaviour, IPointerClickHandler
 
         Move2D move2D = new Move2D(transform);
         move2D.Restrain2D = Restrain2D.Y;
-        Vector3 destination = PlayerManager.Player.ChildDic["EnterGameTra"].position;
+        Vector3 destination = PlayerManager.Player.ChildDic[PlayerLabel.EnterGameTra].position;
         move2D.StartMove(destination, 0.5f, false, Curve.EaseOutQuad);
 
         move2D = new Move2D(transform);
         move2D.Restrain2D = Restrain2D.X;
-        destination = PlayerManager.Player.ChildDic["EnterGameTra"].position;
+        destination = PlayerManager.Player.ChildDic[PlayerLabel.EnterGameTra].position;
         move2D.StartMove(destination, 0.5f, false, Curve.Linear);
 
         DelayCall.Call

+ 39 - 26
Assets/Script/Object/Tutorial.cs

@@ -10,6 +10,19 @@ using System.Collections.Generic;
 
 using Transform = UnityEngine.Transform;
 
+public class TutorialLabel
+{
+    public static string PinkPlayerPos = "PlayerPos3";
+    public static string BlondPlayerPos = "PlayerPos2";
+    public static string BrownPlayerPos = "PlayerPos1";
+    public static string Tutorial = "Tutorial";
+    public static string PlayerBk1 = "PlayerBk1";
+    public static string PlayerBk2 = "PlayerBk2";
+    public static string PlayerBk3 = "PlayerBk3";
+    public static string TutorialMask = "TutorialMask";
+    public static string TutorialCollider = "TutorialCollider";
+}
+
 public class Tutorial : Regist, IPointerClickHandler
 {
     #region Config
@@ -202,21 +215,21 @@ public class Tutorial : Regist, IPointerClickHandler
 
     public void OnPointerClick(PointerEventData eventData)
     {
-        AudioManager.PlayClip(Clip.BtnClip);
+        AudioManager.PlayClip(AudioLabel.ClickButton);
 
-        if (eventData.rawPointerPress.name == "PlayerBk1")
+        if (eventData.rawPointerPress.name == TutorialLabel.PlayerBk1)
         {
-            Vector3 offset = ResourceManager.Get("PlayerBk1").position;
+            Vector3 offset = ResourceManager.Get(TutorialLabel.PlayerBk1).position;
             offset.x = -offset.x;
             offset.y = 0;
 
-            ResourceManager.Get("PlayerBk1").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
-            ResourceManager.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
-            ResourceManager.Get("PlayerBk3").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk1).MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk2).MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk3).MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
 
-            ResourceManager.Get("PlayerBk1").TweenForScale();
-            ResourceManager.Get("PlayerBk2").TweenBacScale();
-            ResourceManager.Get("PlayerBk3").TweenBacScale();
+            ResourceManager.Get(TutorialLabel.PlayerBk1).TweenForScale();
+            ResourceManager.Get(TutorialLabel.PlayerBk2).TweenBacScale();
+            ResourceManager.Get(TutorialLabel.PlayerBk3).TweenBacScale();
 
             PlayerManager.PlayerPink.TweenBacScale();
             PlayerManager.PlayerBlond.TweenBacScale();
@@ -224,19 +237,19 @@ public class Tutorial : Regist, IPointerClickHandler
 
             PlayerManager.SeleTra = PlayerManager.PlayerBrown;
         }
-        else if (eventData.rawPointerPress.name == "PlayerBk2")
+        else if (eventData.rawPointerPress.name == TutorialLabel.PlayerBk2)
         {
-            Vector3 offset = ResourceManager.Get("PlayerBk2").position;
+            Vector3 offset = ResourceManager.Get(TutorialLabel.PlayerBk2).position;
             offset.x = -offset.x;
             offset.y = 0;
 
-            ResourceManager.Get("PlayerBk1").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
-            ResourceManager.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
-            ResourceManager.Get("PlayerBk3").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk1).MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk2).MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk3).MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
 
-            ResourceManager.Get("PlayerBk2").TweenForScale();
-            ResourceManager.Get("PlayerBk1").TweenBacScale();
-            ResourceManager.Get("PlayerBk3").TweenBacScale();
+            ResourceManager.Get(TutorialLabel.PlayerBk2).TweenForScale();
+            ResourceManager.Get(TutorialLabel.PlayerBk1).TweenBacScale();
+            ResourceManager.Get(TutorialLabel.PlayerBk3).TweenBacScale();
 
             PlayerManager.PlayerPink.TweenBacScale();
             PlayerManager.PlayerBlond.TweenForScale();
@@ -244,19 +257,19 @@ public class Tutorial : Regist, IPointerClickHandler
 
             PlayerManager.SeleTra = PlayerManager.PlayerBlond;
         }
-        else if (eventData.rawPointerPress.name == "PlayerBk3")
+        else if (eventData.rawPointerPress.name == TutorialLabel.PlayerBk3)
         {
-            Vector3 offset = ResourceManager.Get("PlayerBk3").position;
+            Vector3 offset = ResourceManager.Get(TutorialLabel.PlayerBk3).position;
             offset.x = -offset.x;
             offset.y = 0;
 
-            ResourceManager.Get("PlayerBk1").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
-            ResourceManager.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
-            ResourceManager.Get("PlayerBk3").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk1).MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk2).MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ResourceManager.Get(TutorialLabel.PlayerBk3).MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
 
-            ResourceManager.Get("PlayerBk3").TweenForScale();
-            ResourceManager.Get("PlayerBk1").TweenBacScale();
-            ResourceManager.Get("PlayerBk2").TweenBacScale();
+            ResourceManager.Get(TutorialLabel.PlayerBk3).TweenForScale();
+            ResourceManager.Get(TutorialLabel.PlayerBk1).TweenBacScale();
+            ResourceManager.Get(TutorialLabel.PlayerBk2).TweenBacScale();
 
             PlayerManager.PlayerPink.TweenForScale();
             PlayerManager.PlayerBlond.TweenBacScale();
@@ -264,7 +277,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
             PlayerManager.SeleTra = PlayerManager.PlayerPink;
         }
-        else if (eventData.rawPointerPress.name == "TutorialCollider")
+        else if (eventData.rawPointerPress.name == TutorialLabel.TutorialCollider)
         {
             if (TutorialManager.NewplayerTutorialIndex == 4)
             {

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -72,7 +72,7 @@ public class ChestData
     private static void Initialize()
     {
         Initialized = true;
-        DefaultPosition = ResourceManager.Get("PlazaRoomChestPos").position;
+        DefaultPosition = ResourceManager.Get(PlazaRoomLabel.PlazaRoomChestPos).position;
     }
 }
 
@@ -150,8 +150,8 @@ public class ChestManager : Regist
 
     public override void FirstInit()
     {
-        XmlNodeList RefundNodes = ConfigManager.PlayerNode.SelectNodes(PlayerConfigLabel.RefundNode);
-        XmlNodeList ReceivedNodes = ConfigManager.PlayerNode.SelectNodes(PlayerConfigLabel.ReceivedNode);
+        XmlNodeList RefundNodes = ConfigManager.ConfigRootNode.SelectNodes(PlayerConfigLabel.RefundNode);
+        XmlNodeList ReceivedNodes = ConfigManager.ConfigRootNode.SelectNodes(PlayerConfigLabel.ReceivedNode);
         for (int i = 0; i < RefundNodes.Count; i++)
         {
             RefundRoomIDs.Add(int.Parse(RefundNodes[i].InnerText));
@@ -336,7 +336,7 @@ public class ChestManager : Regist
             return;
         }
 
-        AudioManager.PlayClip(Clip.BubbleClip);
+        AudioManager.PlayClip(AudioLabel.Bubble);
 
         InstantiateChest(chestData);
 
@@ -432,7 +432,7 @@ public class ChestManager : Regist
     private static int SystemChestActivateTimespan = 600;
     public static void ReceiveAllChestData(List<ChestData> chestDatas)
     {
-        AudioManager.PlayClip(Clip.BubbleClip);
+        AudioManager.PlayClip(AudioLabel.Bubble);
 
         foreach (var chestData in chestDatas)
         {
@@ -526,7 +526,7 @@ public class ChestManager : Regist
         }
         else
         {
-            AudioManager.PlayClip(Clip.CurrentClip);
+            AudioManager.PlayClip(AudioLabel.GetCurrent);
 
             ResourceManager.Get(ObjectLabel.Y_Chest).TweenForCG();
             ResourceManager.SetActive(ObjectLabel.Ya_GetAward, true);
@@ -574,19 +574,19 @@ public class ChestManager : Regist
 
     public static void SaveToConfig()
     {
-        ClearRefundAndOperateData(ConfigManager.PlayerNode);
+        ClearRefundAndOperateData(ConfigManager.ConfigRootNode);
 
         foreach (var id in RefundRoomIDs)
         {
-            XmlNode node = ConfigManager.PlayerDoc.CreateNode(XmlNodeType.Element, PlayerConfigLabel.RefundNode, null);
+            XmlNode node = ConfigManager.ConfigDocument.CreateNode(XmlNodeType.Element, PlayerConfigLabel.RefundNode, null);
             node.InnerText = id.ToString();
-            ConfigManager.PlayerNode.AppendChild(node);
+            ConfigManager.ConfigRootNode.AppendChild(node);
         }
         foreach (var kv in OperateDataDictionary)
         {
-            XmlNode node = ConfigManager.PlayerDoc.CreateNode(XmlNodeType.Element, PlayerConfigLabel.ReceivedNode, null);
+            XmlNode node = ConfigManager.ConfigDocument.CreateNode(XmlNodeType.Element, PlayerConfigLabel.ReceivedNode, null);
             node.InnerText = kv.Value.ToString();
-            ConfigManager.PlayerNode.AppendChild(node);
+            ConfigManager.ConfigRootNode.AppendChild(node);
             //Debug.LogWarning($"{kv.Key}|{kv.Value}");
         }
     }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 
 using System.Collections.Generic;
@@ -56,7 +56,7 @@ public class PlazaRoomController
                 hudTarget = NickNameTransform.AddComponent<HudTarget>();
             }
 
-            hudTarget.PosTra = Player.ChildDic["NickName"];
+            hudTarget.PosTra = Player.ChildDic[PlayerLabel.NickName];
             hudTarget.SetPosition();
 
             NickName = string.IsNullOrEmpty(nickname) ? Language.GetStr(LanguageLabel.UI__Unnamed) : nickname;
@@ -75,7 +75,7 @@ public class PlazaRoomController
                 hudTarget = MessageBox.AddComponent<HudTarget>();
             }
 
-            hudTarget.PosTra = Player.ChildDic["MessageBox"];
+            hudTarget.PosTra = Player.ChildDic[PlayerLabel.MessageBox];
 
             MessageBox.CreateTweenCG(0, 1, 0.25f, true, true, Curve.EaseOutQuad).InOrigin = true;
         }
@@ -188,7 +188,7 @@ public class PlazaRoomController
         IsBlackMaskFinish = false;
         JoinRoomResult = JoinRoomResult.Pending;
 
-        AudioManager.MusicTheme.TweenBacAudio();
+        AudioManager.GardenThemeAudio.TweenBacAudio();
 
         ResourceManager.Get(ObjectLabel.B_SignIn0).TweenBacCG();
         ResourceManager.Get(ObjectLabel.T_NickName).TweenBacCG();
@@ -248,15 +248,15 @@ public class PlazaRoomController
 
             if (JoinRoomResult == JoinRoomResult.RoomFullError)
             {
-                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_RoomFull), null, null, () => { ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG(); AudioManager.MusicTheme.TweenForAudio(); }, null, false);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_RoomFull), null, null, () => { ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG(); AudioManager.GardenThemeAudio.TweenForAudio(); }, null, false);
             }
             else if (JoinRoomResult == JoinRoomResult.RoomExpireError)
             {
-                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_RoomExpire), null, null, () => { ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG(); AudioManager.MusicTheme.TweenForAudio(); }, null, false);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_RoomExpire), null, null, () => { ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG(); AudioManager.GardenThemeAudio.TweenForAudio(); }, null, false);
             }
             else
             {
-                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_Unknown), null, null, () => { ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG(); AudioManager.MusicTheme.TweenForAudio(); }, null, false);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_Unknown), null, null, () => { ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG(); AudioManager.GardenThemeAudio.TweenForAudio(); }, null, false);
             }
         }
     }
@@ -269,12 +269,12 @@ public class PlazaRoomController
         {
             if (kv.Value.Player.transform.parent == null)
             {
-                kv.Value.Player.transform.parent = ResourceManager.Get("PlazaRoom");
+                kv.Value.Player.transform.parent = ResourceManager.Get(PlazaRoomLabel.PlazaRoom);
                 kv.Value.Player.transform.localScale = PlazaRoomPlayerScale;
             }
         }
 
-        AudioManager.MusicPartyTheme.TweenForAudio();
+        AudioManager.PartyThemeAudio.TweenForAudio();
 
         InPlazaRoom = true;
         PlazaRoomManager.ClosePanel();
@@ -282,14 +282,14 @@ public class PlazaRoomController
         GardenManager.RetrieveAllElf();
         IAPManager.RetrieveADChest();
 
-        GardenSmartFox.PlazaRoomController.PlazaRoomSky = ResourceManager.Get("PlazaRoomSky");
+        GardenSmartFox.PlazaRoomController.PlazaRoomSky = ResourceManager.Get(PlazaRoomLabel.PlazaRoomSky);
         SkyOriginPosition = GardenSmartFox.PlazaRoomController.PlazaRoomSky.position;
 
-        GardenSmartFox.PlazaRoomController.PlazaRoomCamera = ResourceManager.Get<Camera>("MainCamera");
+        GardenSmartFox.PlazaRoomController.PlazaRoomCamera = ResourceManager.Get<Camera>(ResourceLabel.MainCamera);
         GardenSmartFox.PlazaRoomController.CameraOriginPosition = GardenSmartFox.PlazaRoomController.PlazaRoomCamera.transform.position;
 
-        GardenSmartFox.PlazaRoomController.CameraLeftBorder = ResourceManager.Get("PlazaRoomCameraLeftBorder").position.x;
-        GardenSmartFox.PlazaRoomController.CameraRightBorder = ResourceManager.Get("PlazaRoomCameraRightBorder").position.x;
+        GardenSmartFox.PlazaRoomController.CameraLeftBorder = ResourceManager.Get(PlazaRoomLabel.PlazaRoomCameraLeftBorder).position.x;
+        GardenSmartFox.PlazaRoomController.CameraRightBorder = ResourceManager.Get(PlazaRoomLabel.PlazaRoomCameraRightBorder).position.x;
 
         GardenSmartFox.PlazaRoomController.PlazaRoomCamera.transform.SetX(GardenSmartFox.PlazaRoomController.CameraLeftBorder);
 
@@ -297,7 +297,7 @@ public class PlazaRoomController
 
         ResourceManager.SetActive(ObjectLabel.C_Main2, false);
         ResourceManager.SetActive(ResourceLabel.Garden, false);
-        ResourceManager.SetActive("PlazaRoom", true);
+        ResourceManager.SetActive(PlazaRoomLabel.PlazaRoom, true);
         ResourceManager.SetActive(ObjectLabel.W_HudParent, true);
         ResourceManager.SetActive(ObjectLabel.X_PlazaRoom, true);
     }
@@ -317,14 +317,14 @@ public class PlazaRoomController
 
                 InPlazaRoom = false;
 
-                AudioManager.MusicTheme.TweenForAudio();
+                AudioManager.GardenThemeAudio.TweenForAudio();
 
                 PlazaRoomSky.position = SkyOriginPosition;
                 PlazaRoomCamera.transform.position = CameraOriginPosition;
 
                 ResourceManager.SetActive(ObjectLabel.C_Main2, true);
                 ResourceManager.SetActive(ResourceLabel.Garden, true);
-                ResourceManager.SetActive("PlazaRoom", false);
+                ResourceManager.SetActive(PlazaRoomLabel.PlazaRoom, false);
                 ResourceManager.SetActive(ObjectLabel.W_HudParent, false);
                 ResourceManager.SetActive(ObjectLabel.X_PlazaRoom, false);
 
@@ -488,7 +488,7 @@ public class PlazaRoomController
 
     public void OnExitPlazaRoom()
     {
-        AudioManager.MusicPartyTheme.TweenBacAudio();
+        AudioManager.PartyThemeAudio.TweenBacAudio();
         ExitPlazaRoom();
     }
 
@@ -663,8 +663,8 @@ public class PlazaRoomController
     private float ShaowLocalZ = 3;
     public PlazaRoomPlayer InstantiatePlayer(string nickName, Vector3 position, PlayerDirection direction, List<int> dressDataIDs)
     {
-        Transform parent = ResourceManager.Get("PlazaRoom", false);
-        Transform tra = ResourceManager.Get("Player", Folder.Scene, false, parent, false, ObjType.Player);
+        Transform parent = ResourceManager.Get(PlazaRoomLabel.PlazaRoom, false);
+        Transform tra = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, parent, false, ObjType.Player);
 
         Player player = tra.GetComponent<Player>();
 
@@ -712,7 +712,7 @@ public class PlazaRoomController
     public static Vector3 GetDefaultPosition()
     {
         float zOffset = Random.Range(MinZOffset, MaxZOffset);
-        Vector3 position = ResourceManager.Get("PlazaRoomDefaultPosition").position;
+        Vector3 position = ResourceManager.Get(PlazaRoomLabel.PlazaRoomDefaultPosition).position;
         position.z += zOffset;
         return position;
     }

+ 3 - 3
Assets/Script/SFS/Object/Robot.cs

@@ -53,9 +53,9 @@ public class Robot
             return;
         }
 
-        LeftDownBorder = ResourceManager.Get("PlayerLeftDownBorder").position;
-        RightTop = ResourceManager.Get("PlayerRightTopBorder").position;
-        Camera = ResourceManager.Get<Camera>("MainCamera");
+        LeftDownBorder = ResourceManager.Get(PlazaRoomLabel.PlayerLeftDownBorder).position;
+        RightTop = ResourceManager.Get(PlazaRoomLabel.PlayerRightTopBorder).position;
+        Camera = ResourceManager.Get<Camera>(ResourceLabel.MainCamera);
 
         XmlDocument document = ConfigManager.GetXmlDocument(ResourceLabel.RobotConfig);
         XmlNode dataNode = document.SelectSingleNode(ConfigLabel.RootNode).SelectSingleNode(ConfigLabel.ChildNode);

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

@@ -58,7 +58,7 @@ public class Amount
 
 public class Auxiliary : Regist
 {
-    #region 变量
+    #region Config
 
     public string String1;
     public string String2;
@@ -179,6 +179,7 @@ public class Auxiliary : Regist
         if (Input.GetKeyDown(KeyCode.Z))
         {
             Manager.MiniTimer = 0;
+            TutorialManager.MemoryMinigameTutorial = true;
         }
 
         //if (Input.GetKeyDown(KeyCode.X))

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

@@ -348,11 +348,11 @@ public class Bundle : MonoBehaviour
 
         if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config, () => { ConfigManager.PlayerDoc = ConfigManager.PlayerDoc; HttpManager.PackTypeRequest(); });
+            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config, () => { ConfigManager.ConfigDocument = ConfigManager.ConfigDocument; HttpManager.PackTypeRequest(); });
         }
         else
         {
-            ConfigManager.PlayerDoc = ConfigManager.PlayerDoc;
+            ConfigManager.ConfigDocument = ConfigManager.ConfigDocument;
             HttpManager.PackTypeRequest();
         }
 

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

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -31,7 +31,7 @@ public class Language
 
     public static void Initialize()
     {
-        LanguageManager.CurrentLanguage = ConfigManager.GetPlayerString("Language").ToEnum<CurrentLanguage>();
+        LanguageManager.CurrentLanguage = ConfigManager.GetStringFormConfig("Language").ToEnum<CurrentLanguage>();
 
         LanguageDic.Add(CurrentLanguage.English, ResourceManager.Load<TextAsset>("English", Folder.Config));
         LanguageDic.Add(CurrentLanguage.ChineseSimplified, ResourceManager.Load<TextAsset>("ChineseSimplified", Folder.Config));

+ 2 - 2
Assets/Script/Tool/DashGame/Logo.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.SceneManagement;
 
 using System;
@@ -18,7 +18,7 @@ public class Logo : MonoBehaviour
     {
         Camera = GameObject.Find("Main Camera");
         
-        AudioManager.InitAudioSettingFromPlayerPrefs();
+        AudioManager.LoadPrefs();
         AudioManager.SetLogoVolume();
     }
 

+ 3 - 3
Assets/Script/Tool/LabelUtility/LabelUtility.cs

@@ -19,9 +19,9 @@ public class LabelUtility : MonoBehaviour
     public List<TextAsset> Languages;
     public List<GameObject> Prefabs;
 
-    private static string Mark = "//Mark";
-    private static string Prefix = "public static string ";
-    private static string LanguagePageSeperator = "__";
+    public static string Mark = "//Mark";
+    public static string Prefix = "public static string ";
+    public static string LanguagePageSeperator = "__";
 
     #endregion
 

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

@@ -48,14 +48,18 @@ public class Lib
 
     public static Material GrayMat
     {
-        get { return ResourceManager.Load<Material>("GrayMat", Folder.UI); }
+        get { return ResourceManager.Load<Material>(ResourceLabel.GrayMat, Folder.UI); }
+    }
+    public static Material UIMaskMat
+    {
+        get { return ResourceManager.Load<Material>(ResourceLabel.UIMaskMat, Folder.UI); }
     }
     public static Material GraySpriteMat
     {
-        get { return ResourceManager.Load<Material>("GraySpriteMat", Folder.UI); }
+        get { return ResourceManager.Load<Material>(ResourceLabel.GraySpriteMat, Folder.UI); }
     }
     public static Material GrayMeshMat
     {
-        get { return ResourceManager.Load<Material>("GrayMeshMat", Folder.UI); }
+        get { return ResourceManager.Load<Material>(ResourceLabel.GrayMeshMat, Folder.UI); }
     }
 }

+ 4 - 4
Assets/Script/Tool/UI/Bubble.cs

@@ -47,7 +47,7 @@ public class Bubble : Regist
 
     public static void Show(string tit = null, string lab = null, string notifyLab = null, Sprite sprite = null, UnityAction confirmAction = null, UnityAction cancelAction = null, bool enableCancle = true)
     {
-        AudioManager.PlayClip(Clip.BubbleClip);
+        AudioManager.PlayClip(AudioLabel.Bubble);
 
         Box.TweenForScale();
         Background.TweenForGra();
@@ -108,7 +108,7 @@ public class Bubble : Regist
             (
                 () =>
                 {
-                    AudioManager.PlayClip(Clip.BtnClip);
+                    AudioManager.PlayClip(AudioLabel.ClickButton);
                 }
             );
 
@@ -131,7 +131,7 @@ public class Bubble : Regist
             (
                 () =>
                 {
-                    AudioManager.PlayClip(Clip.BtnClip);
+                    AudioManager.PlayClip(AudioLabel.ClickButton);
                 }
             );
         }
@@ -142,6 +142,6 @@ public class Bubble : Regist
         Box.TweenBacScale();
         Background.TweenBacGra();
 
-        AudioManager.PlayClip(Clip.CloseClip);
+        AudioManager.PlayClip(AudioLabel.Close);
     }
 }

+ 1 - 1
Assets/Script/Tool/UI/Toast.cs

@@ -49,7 +49,7 @@ public class Toast : Regist
 
     public static void Show(float time, string str)
     {
-        AudioManager.PlayClip(Clip.ErrorClip);
+        AudioManager.PlayClip(AudioLabel.Error);
 
         On = true;
         Text.text = str;

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