Browse Source

测试新的工具

LiuQilin 8 years ago
parent
commit
a4b35e8db8
67 changed files with 1655 additions and 1655 deletions
  1. 2 2
      Assets/RecyclePool/LabelUtility.meta
  2. 0 0
      Assets/RecyclePool/LabelUtility/Editor.meta
  3. 86 0
      Assets/RecyclePool/LabelUtility/Editor/LabelUtilityLabelUtilityWindow.cs
  4. 0 0
      Assets/RecyclePool/LabelUtility/Editor/LabelUtilityLabelUtilityWindow.cs.meta
  5. 246 0
      Assets/RecyclePool/LabelUtility/LabelUtility.cs
  6. 0 0
      Assets/RecyclePool/LabelUtility/LabelUtility.cs.meta
  7. 0 17
      Assets/RecyclePool/LabelUtility/SerializeObject.prefab
  8. 0 0
      Assets/RecyclePool/LabelUtility/SerializeObject.prefab.meta
  9. 4 4
      Assets/Script/Label/CanvasLabel.cs
  10. 0 0
      Assets/Script/Label/CanvasLabel.cs.meta
  11. 14 3
      Assets/Script/Label/LanguageLabel.cs
  12. 6 7
      Assets/Script/Manage/AchieveManager.cs
  13. 3 3
      Assets/Script/Manage/AnnounceManager.cs
  14. 12 12
      Assets/Script/Manage/AudioManager.cs
  15. 11 11
      Assets/Script/Manage/CDMinigamePanelManager.cs
  16. 2 2
      Assets/Script/Manage/DebugManager.cs
  17. 15 15
      Assets/Script/Manage/EnterMinigamePanelManager.cs
  18. 27 27
      Assets/Script/Manage/GardenManager.cs
  19. 8 8
      Assets/Script/Manage/HttpManager.cs
  20. 5 5
      Assets/Script/Manage/IAPManager.cs
  21. 2 2
      Assets/Script/Manage/InfoBoxManager.cs
  22. 13 13
      Assets/Script/Manage/Initializer.cs
  23. 1 1
      Assets/Script/Manage/LanguageManager.cs
  24. 57 57
      Assets/Script/Manage/Manager.cs
  25. 242 242
      Assets/Script/Manage/MiniGameManager.cs
  26. 16 16
      Assets/Script/Manage/NickNameManager.cs
  27. 46 46
      Assets/Script/Manage/PlazaRoomManager.cs
  28. 9 9
      Assets/Script/Manage/RechargeGiftManager.cs
  29. 9 9
      Assets/Script/Manage/ResourceManager.cs
  30. 64 64
      Assets/Script/Manage/SignManager.cs
  31. 26 26
      Assets/Script/Manage/SocialManager.cs
  32. 145 145
      Assets/Script/Manage/TutorialManager.cs
  33. 198 198
      Assets/Script/Manage/UIManager.cs
  34. 34 34
      Assets/Script/Manage/VisitManager.cs
  35. 2 2
      Assets/Script/Object/ADChest.cs
  36. 2 2
      Assets/Script/Object/CommentItem.cs
  37. 1 1
      Assets/Script/Object/DropDiamond.cs
  38. 1 1
      Assets/Script/Object/DropGold.cs
  39. 12 12
      Assets/Script/Object/Flower.cs
  40. 1 1
      Assets/Script/Object/Garden.cs
  41. 31 31
      Assets/Script/Object/Player.cs
  42. 19 19
      Assets/Script/Object/PlazaRoomChest.cs
  43. 1 1
      Assets/Script/Object/PlazaRoomItem.cs
  44. 2 2
      Assets/Script/Object/RankItem.cs
  45. 36 36
      Assets/Script/Object/Skill/Ability.cs
  46. 35 35
      Assets/Script/Object/Skill/BigSkill.cs
  47. 12 12
      Assets/Script/Object/Skill/Pack.cs
  48. 17 17
      Assets/Script/Object/Skill/Skill.cs
  49. 5 5
      Assets/Script/Object/Skill/SkillRoot.cs
  50. 8 8
      Assets/Script/Object/Tutorial.cs
  51. 30 30
      Assets/Script/SFS/Manager/ChestManager.cs
  52. 24 24
      Assets/Script/SFS/Manager/PlazaRoomController.cs
  53. 12 12
      Assets/Script/Social/AddFriendPanel.cs
  54. 2 2
      Assets/Script/Social/ApplicantItem.cs
  55. 2 2
      Assets/Script/Social/FriendItem.cs
  56. 22 22
      Assets/Script/Social/FriendPanel.cs
  57. 15 15
      Assets/Script/Social/MessagePanel.cs
  58. 1 1
      Assets/Script/Social/PlazaroomMemberItem.cs
  59. 12 12
      Assets/Script/Social/PlazaroomMemberPanel.cs
  60. 18 18
      Assets/Script/Tool/DashGame/Language.cs
  61. 0 86
      Assets/Script/Tool/LabelUtility/Editor/LabelUtilityLabelUtilityWindow.cs
  62. 0 246
      Assets/Script/Tool/LabelUtility/LabelUtility.cs
  63. 8 8
      Assets/Script/Tool/UI/Bubble.cs
  64. 1 1
      Assets/Script/Tool/UI/Toast.cs
  65. 1 0
      Assets/Tookits/LabelUtility/Editor/LabelUtilityWindow.cs
  66. 0 7
      Assets/Tookits/LabelUtility/LabelUtility.cs
  67. 19 6
      Assets/Tookits/LabelUtility/LabelUtility.prefab

+ 2 - 2
Assets/Script/Tool/LabelUtility.meta → Assets/RecyclePool/LabelUtility.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: e45d2afe88aed8e4b87d8cca86e383da
+guid: 41d39fb3544e3bb4e92bc420c3b81c67
 folderAsset: yes
-timeCreated: 1510531616
+timeCreated: 1512444025
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 0 - 0
Assets/Script/Tool/LabelUtility/Editor.meta → Assets/RecyclePool/LabelUtility/Editor.meta


+ 86 - 0
Assets/RecyclePool/LabelUtility/Editor/LabelUtilityLabelUtilityWindow.cs

@@ -0,0 +1,86 @@
+//using System;
+//using System.Collections;
+//using System.Collections.Generic;
+//using System.IO;
+//using System.Linq;
+//using System.Text.RegularExpressions;
+//using AtlasUtility;
+//using UnityEditor;
+//using UnityEngine;
+//
+//public class LabelUtilityWindow : EditorWindow
+//{
+//    #region Config
+//
+//    protected LabelUtility Instance;
+//
+//    protected SerializedProperty Script;
+//    protected SerializedProperty Languages;
+//    protected SerializedProperty Prefabs;
+//
+//    protected SerializedObject SerializedObject;
+//
+//    #endregion
+//
+//    [MenuItem("DashGame/LabelUtility")]
+//    protected static void ShowWindow()
+//    {
+//        Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
+//
+//        LabelUtilityWindow window = GetWindow<LabelUtilityWindow>(inspectorType);
+//
+//        window.titleContent = new GUIContent("LabelUtility");
+//        window.Show();
+//    }
+//
+//    private void OnEnable()
+//    {
+//        Instance = InstanceManager.SearchInstance<LabelUtility>();
+//        SerializedObject = new SerializedObject(Instance);
+//
+//        Script = SerializedObject.FindProperty("Script");
+//        Languages = SerializedObject.FindProperty("Languages");
+//        Prefabs = SerializedObject.FindProperty("Prefabs");
+//    }
+//
+//    private void OnGUI()
+//    {
+//        SerializedObject.Update();
+//
+//        EditorGUILayout.PropertyField(Script, new GUIContent("Script"));
+//        EditorGUILayout.PropertyField(Prefabs, new GUIContent("Prefabs"), true);
+//        EditorGUILayout.PropertyField(Languages, new GUIContent("Languages"), true);
+//
+//        if (GUILayout.Button("ClearLabels"))
+//        {
+//            Instance.ClearLabels(true);
+//        }
+//
+//        if (GUILayout.Button("CreateLabelFromPrefabs"))
+//        {
+//           Instance.CreateLabelFromPrefabs();
+//        }
+//
+//        if (GUILayout.Button("ClearAndCreateLabelFromPrefabs"))
+//        {
+//            Instance.CreateLabelFromPrefabs();
+//        }
+//
+//        if (GUILayout.Button("CreateLabelFromLanguage"))
+//        {
+//            Instance.CreateLabelFromLanguage();
+//        }
+//
+//        if (GUILayout.Button("ClearAndCreateLabelFromLanguage"))
+//        {
+//            Instance.CreateLabelFromLanguage();
+//        }
+//
+//        //if (GUILayout.Button("ReplaceLanguageLabels"))
+//        //{
+//        //    Instance.ReplaceLanguageLabels();
+//        //}
+//
+//        SerializedObject.ApplyModifiedProperties();
+//    }
+//}

+ 0 - 0
Assets/Script/Tool/LabelUtility/Editor/LabelUtilityLabelUtilityWindow.cs.meta → Assets/RecyclePool/LabelUtility/Editor/LabelUtilityLabelUtilityWindow.cs.meta


+ 246 - 0
Assets/RecyclePool/LabelUtility/LabelUtility.cs

@@ -0,0 +1,246 @@
+//using System;
+//using System.Collections;
+//using System.Collections.Generic;
+//using System.IO;
+//using System.Text;
+//using System.Text.RegularExpressions;
+//using System.Xml;
+//#if UNITY_EDITOR
+//using UnityEditor;
+//#endif
+//using UnityEngine;
+//using AtlasUtility;
+//
+//public class LabelUtility : MonoBehaviour
+//{
+//    #region Config
+//
+//    public TextAsset Script;
+//    public List<TextAsset> Languages;
+//    public List<GameObject> Prefabs;
+//
+//    public static string Mark = "//Mark";
+//    public static string Prefix = "public static string ";
+//    public static string LanguagePageSeperator = "__";
+//
+//    #endregion
+//
+//    #if UNITY_EDITOR
+//    public void ClearLabels(bool showWarning)
+//    {
+//        if (showWarning)
+//        {
+//            if (!EditorUtility.DisplayDialog("注意", "清空所有标签?", "确定", "取消"))
+//            {
+//                return;
+//            }
+//        }
+//
+//        string path = AssetDatabase.GetAssetPath(Script);
+//        string fileStr = File.ReadAllText(path);
+//        fileStr = Regex.Replace(fileStr, "(?<=\\{)[^\\}]*(?=\\})", $"\r\n\t{Mark}\r\n");
+//        File.WriteAllText(path, fileStr);
+//    }
+//
+//    public void CreateLabelFromPrefabs()
+//    {
+//        if (EditorUtility.DisplayDialog("注意", "新建Prefab标签?", "确定", "取消"))
+//        {
+//            StringBuilder stringBuilder = new StringBuilder(Script.text);
+//            foreach (var prefab in Prefabs)
+//            {
+//                CreateLabel(prefab, stringBuilder);
+//            }
+//            string path = AssetDatabase.GetAssetPath(Script);
+//            File.WriteAllText(path, stringBuilder.ToString());
+//        }
+//    }
+//
+//    public void ClearAndCreateLabelFromPrefabs()
+//    {
+//        ClearLabels(false);
+//        CreateLabelFromPrefabs();
+//    }
+//
+//    private void CreateLabel(GameObject prefab, StringBuilder stringBuilder)
+//    {
+//        Transform[] transforms = prefab.GetComponentsInChildren<Transform>(true);
+//        Match match = Regex.Match(stringBuilder.ToString(), Mark);
+//        if (match.Success)
+//        {
+//            stringBuilder.Replace(Mark, "", match.Index, match.Length);
+//            int insertIndex = match.Index + 2;
+//            for (int i = 0; i < transforms.Length; i++)
+//            {
+//                string insertStr = $"\t{Prefix}{transforms[i].name} = \"{transforms[i].name}\";";
+//                stringBuilder.Insert(insertIndex, insertStr);
+//                insertIndex += insertStr.Length;
+//
+//                if (i < transforms.Length - 1)
+//                {
+//                    stringBuilder.Insert(insertIndex, "\r\n");
+//                    insertIndex += 2;
+//                }
+//                else if (i == transforms.Length - 1)
+//                {
+//                    stringBuilder.Insert(insertIndex, $"\r\n\t{Mark}\r\n");
+//                }
+//            }
+//        }
+//        else
+//        {
+//            throw new Exception("没有找到标记");
+//        }
+//    }
+//
+//    public void CreateLabelFromLanguage()
+//    {
+//        if (EditorUtility.DisplayDialog("注意", "新建Language标签?", "确定", "取消"))
+//        {
+//            StringBuilder stringBuilder = new StringBuilder(Script.text);
+//            foreach (var language in Languages)
+//            {
+//                XmlDocument document = new XmlDocument();
+//                document.LoadXml(language.text);
+//                CreateLabelFromLanguageDocument(document, stringBuilder);
+//            }
+//            string path = AssetDatabase.GetAssetPath(Script);
+//            File.WriteAllText(path, stringBuilder.ToString());
+//        }
+//    }
+//
+//    private void CreateLabelFromLanguageDocument(XmlDocument document, StringBuilder stringBuilder)
+//    {
+//        XmlNodeList childNodes = document.SelectSingleNode("lan").ChildNodes;
+//        for (int i = 0; i < childNodes.Count; i++)
+//        {
+//            CreateLabel(childNodes[i], stringBuilder);
+//        }
+//    }
+//
+//    public void ClearAndCreateLabelFromLanguageDocument()
+//    {
+//        ClearLabels(false);
+//        CreateLabelFromLanguage();
+//    }
+//
+//    private void CreateLabel(XmlNode node, StringBuilder stringBuilder)
+//    {
+//        Match match = Regex.Match(stringBuilder.ToString(), Mark);
+//        if (match.Success)
+//        {
+//            stringBuilder.Replace(Mark, "", match.Index, match.Length);
+//            int insertIndex = match.Index + 2;
+//            for (int i = 0; i < node.ChildNodes.Count; i++)
+//            {
+//                XmlNode childNode = node.ChildNodes[i];
+//                string insertStr;
+//                if (i == 0)
+//                {
+//                    insertStr = $"\t{Prefix}{node.Name} = \"{node.Name}\";\r\n";
+//                    stringBuilder.Insert(insertIndex, insertStr);
+//                    insertIndex += insertStr.Length;
+//                }
+//                insertStr = $"\t{Prefix}{node.Name}{LanguagePageSeperator}{childNode.Name} = \"{node.Name}{LanguagePageSeperator}{childNode.Name}\";";
+//                stringBuilder.Insert(insertIndex, insertStr);
+//                insertIndex += insertStr.Length;
+//
+//                if (i < node.ChildNodes.Count - 1)
+//                {
+//                    stringBuilder.Insert(insertIndex, "\r\n");
+//                    insertIndex += 2;
+//                }
+//                else if (i == node.ChildNodes.Count - 1)
+//                {
+//                    stringBuilder.Insert(insertIndex, $"\r\n\t{Mark}\r\n");
+//                }
+//            }
+//        }
+//        else
+//        {
+//            throw new Exception("没有找到标记");
+//        }
+//    }
+//    #endif
+//
+//    public static string CombineLanguageLabel(string page, string id)
+//    {
+//        return $"{page}{LanguagePageSeperator}{id}";
+//    }
+//
+//    //public void ReplaceLabels()
+//    //{
+//    //    Transform[] transforms = Prefabs[0].GetComponentsInChildren<Transform>(true);
+//    //    string[] pathes = Directory.GetFiles(Application.dataPath, "*.cs", SearchOption.AllDirectories);
+//    //    foreach (var path in pathes)
+//    //    {
+//    //        if (path.Contains("PrefabLabel"))
+//    //        {
+//    //            continue;
+//    //        }
+//
+//    //        string fileStr = File.ReadAllText(path);
+//
+//    //        foreach (var transform in transforms)
+//    //        {
+//    //            if (transform.name == "Canvas")
+//    //            {
+//    //                continue;
+//    //            }
+//
+//    //            fileStr = Regex.Replace(fileStr, $"\"{transform.name}\"", $"PrefabLabel.{transform.name}");
+//    //        }
+//
+//    //        File.WriteAllText(path, fileStr);
+//    //    }
+//    //}
+//
+//    //public void TestReplaceLabels()
+//    //{
+//    //    Transform[] transforms = Prefabs[0].GetComponentsInChildren<Transform>(true);
+//    //    string path = AssetDatabase.GetAssetPath(TextAsset);
+//    //    string fileStr = File.ReadAllText(path);
+//
+//    //    foreach (var transform in transforms)
+//    //    {
+//    //        if (transform.name == "Canvas")
+//    //        {
+//    //            continue;
+//    //        }
+//
+//    //        fileStr = Regex.Replace(fileStr, $"\"{transform.name}\"", $"PrefabLabel.{transform.name}");
+//    //    }
+//
+//    //    File.WriteAllText(path, fileStr);
+//    //}
+//
+//    //public void ReplaceLanguageLabels()
+//    //{
+//    //    string[] pathes = Directory.GetFiles(Application.dataPath, "*.cs", SearchOption.AllDirectories);
+//    //    foreach (var path in pathes)
+//    //    {
+//    //        ReplaceLanguageLabel(path);
+//    //    }
+//    //}
+//
+//    //public void ReplaceLanguageLabel(string path)
+//    //{
+//    //    string fileStr = File.ReadAllText(path);
+//    //    string pattern = "(?<=Language\\.GetStr\\()[^\\)]+(?=\\))|(?<=MulLanStr\\()[^\\)]+(?=\\))";
+//    //    Match match = Regex.Match(fileStr, pattern);
+//    //    while (match.Success)
+//    //    {
+//    //        string[] strings = match.Value.Replace(" ", "").Split(',');
+//    //        if (strings.Length == 1)
+//    //        {
+//    //            match = match.NextMatch();
+//    //        }
+//    //        else
+//    //        {
+//    //            fileStr = fileStr.ReplaceByLength(match.Index, match.Length, $"LanguageLabel.{strings[0].Trim('"')}{LanguagePageSeperator}{strings[1].Trim('"')}");
+//    //            match = Regex.Match(fileStr, pattern);
+//    //        }
+//    //    }
+//    //    File.WriteAllText(path, fileStr);
+//    //}
+//}

+ 0 - 0
Assets/Script/Tool/LabelUtility/LabelUtility.cs.meta → Assets/RecyclePool/LabelUtility/LabelUtility.cs.meta


+ 0 - 17
Assets/Script/Tool/LabelUtility/SerializeObject.prefab → Assets/RecyclePool/LabelUtility/SerializeObject.prefab

@@ -19,7 +19,6 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 4977813053446552}
-  - component: {fileID: 114188865886771778}
   m_Layer: 0
   m_Name: SerializeObject
   m_TagString: Untagged
@@ -40,19 +39,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114188865886771778
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1594177319052792}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e4a9dafa00b004e4e94c57cd88b01101, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Script: {fileID: 11500000, guid: 1615e3353e063d443bf237fb8aade024, type: 3}
-  Languages:
-  - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
-  Prefabs:
-  - {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}

+ 0 - 0
Assets/Script/Tool/LabelUtility/SerializeObject.prefab.meta → Assets/RecyclePool/LabelUtility/SerializeObject.prefab.meta


+ 4 - 4
Assets/Script/Label/ObjectLabel.cs → Assets/Script/Label/CanvasLabel.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 
 using UnityEngine;
 
-public class ObjectLabel
+public class CanvasLabel
 {
-	
-	public static string Canvas = "Canvas";
+    //StartMarkMark-LabelUtilityʹÓÃ-Îðɾ
+    public static string Canvas = "Canvas";
 	public static string E_Debug = "E_Debug";
 	public static string E_Group = "E_Group";
 	public static string E_Scrr = "E_Scrr";
@@ -868,5 +868,5 @@ public class ObjectLabel
 	public static string U_Group = "U_Group";
 	public static string U_Icon = "U_Icon";
 	public static string U_Lab = "U_Lab";
-	//Mark
+    //EndMarkMark-LabelUtilityʹÓÃ-Îðɾ
 }

+ 0 - 0
Assets/Script/Label/ObjectLabel.cs.meta → Assets/Script/Label/CanvasLabel.cs.meta


+ 14 - 3
Assets/Script/Label/LanguageLabel.cs

@@ -5,8 +5,19 @@ using UnityEngine;
 
 public class LanguageLabel
 {
-	
-	public static string UI = "UI";
+    #region
+
+    public static string LanguagePageSeperator = "__";
+
+    #endregion
+
+    public static string CombineLanguageLabel(string page, string id)
+    {
+        return $"{page}{LanguagePageSeperator}{id}";
+    }
+
+    //StartMarkMark-LabelUtilityʹÓÃ-Îðɾ
+    public static string UI = "UI";
 	public static string UI__C_MiniGameLab = "UI__C_MiniGameLab";
 	public static string UI__C_GardenLab = "UI__C_GardenLab";
 	public static string UI__C_DressRoom = "UI__C_DressRoom";
@@ -863,5 +874,5 @@ public class LanguageLabel
 	public static string MinigameName__Punch = "MinigameName__Punch";
 	public static string MinigameName__Memory = "MinigameName__Memory";
 	public static string MinigameName__Find = "MinigameName__Find";
-	//Mark
+    //EndMarkMark-LabelUtilityʹÓÃ-Îðɾ
 }

+ 6 - 7
Assets/Script/Manage/AchieveManager.cs

@@ -7,7 +7,6 @@ using System.Xml;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
-
 using Object = UnityEngine.Object;
 
 public enum AchieveType
@@ -64,7 +63,7 @@ public class AchieveItem
     }
     private string NameLanguageLabel
     {
-        get { return LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveName,FullID); }
+        get { return LanguageLabel.CombineLanguageLabel(LanguageLabel.AchieveName,FullID); }
     }
 
     public string Description
@@ -76,7 +75,7 @@ public class AchieveItem
     }
     private string DescriptionLanguageLabel
     {
-        get { return LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveDesc, FullID); }
+        get { return LanguageLabel.CombineLanguageLabel(LanguageLabel.AchieveDesc, FullID); }
     }
 
     public string FullID
@@ -188,7 +187,7 @@ public class AchieveItem
         Button.onClick.RemoveAllListeners();
         Button.onClick.AddListener(GetAward);
 
-        LanguageManager.Add(Title, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveName, FullID)));
+        LanguageManager.Add(Title, new MulLanStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.AchieveName, FullID)));
 
 
         if (Lock)
@@ -588,7 +587,7 @@ public class AchieveManager : Regist
         }
 
 
-        TweenOutline tween = ResourceManager.Get<Outline>(ObjectLabel.C_Achieve).GetTweenOutline();
+        TweenOutline tween = ResourceManager.Get<Outline>(CanvasLabel.C_Achieve).GetTweenOutline();
 
         if (tween == null)
         {
@@ -633,7 +632,7 @@ public class AchieveManager : Regist
     private static int MaxDisplayAmt = 4;
     public static void OpenAchievePanel()
     {
-        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.M_Achieve0).TweenForVec();
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.M_Achieve0).TweenForVec();
 
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
@@ -654,7 +653,7 @@ public class AchieveManager : Regist
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ScrollRect scrollRect = ResourceManager.Get<ScrollRect>(ObjectLabel.M_Scrr);
+                    ScrollRect scrollRect = ResourceManager.Get<ScrollRect>(CanvasLabel.M_Scrr);
                     int index = completedAchieveItem.Item.GetSiblingIndex();
                     if (index < scrollRect.content.childCount - MaxDisplayAmt)
                     {

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

@@ -44,7 +44,7 @@ public class AnnounceManager
 
         for (int i = 0; i < contents.Count; i++)
         {
-            Transform transform = ResourceManager.Get(ResourceLabel.NotifyItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.R_Grid), false);
+            Transform transform = ResourceManager.Get(ResourceLabel.NotifyItem, Folder.UI, false, ResourceManager.Get(CanvasLabel.R_Grid), false);
 
             if (contents[i].IsSprite)
             {
@@ -78,13 +78,13 @@ public class AnnounceManager
 
         AudioManager.PlayClip(AudioLabel.Bubble);
 
-        ResourceManager.Get(ObjectLabel.R_Notify).TweenForCG();
+        ResourceManager.Get(CanvasLabel.R_Notify).TweenForCG();
 
         Auxiliary.Instance.DelayCall
         (
             () =>
             {
-                LayoutRebuilder.MarkLayoutForRebuild(ResourceManager.Get<RectTransform>(ObjectLabel.R_Grid));
+                LayoutRebuilder.MarkLayoutForRebuild(ResourceManager.Get<RectTransform>(CanvasLabel.R_Grid));
             },
             1
         );

+ 12 - 12
Assets/Script/Manage/AudioManager.cs

@@ -118,14 +118,14 @@ public class AudioManager : Regist
 
         if (!MusicOn)
         {
-            ResourceManager.SetActive(ObjectLabel.L_MusicOn, false);
-            ResourceManager.SetActive(ObjectLabel.L_MusicOff, true);
+            ResourceManager.SetActive(CanvasLabel.L_MusicOn, false);
+            ResourceManager.SetActive(CanvasLabel.L_MusicOff, true);
         }
 
         if (!AudioOn)
         {
-            ResourceManager.SetActive(ObjectLabel.L_AudioOn, false);
-            ResourceManager.SetActive(ObjectLabel.L_AudioOff, true);
+            ResourceManager.SetActive(CanvasLabel.L_AudioOn, false);
+            ResourceManager.SetActive(CanvasLabel.L_AudioOff, true);
         }
     }
 
@@ -171,8 +171,8 @@ public class AudioManager : Regist
         {
             MusicOn = false;
 
-            ResourceManager.SetActive(ObjectLabel.L_MusicOn, false);
-            ResourceManager.SetActive(ObjectLabel.L_MusicOff, true);
+            ResourceManager.SetActive(CanvasLabel.L_MusicOn, false);
+            ResourceManager.SetActive(CanvasLabel.L_MusicOff, true);
             
             MinigameAudio.Pause();
             GardenThemeAudio.Pause();
@@ -184,8 +184,8 @@ public class AudioManager : Regist
         {
             MusicOn = true;
 
-            ResourceManager.SetActive(ObjectLabel.L_MusicOn, true);
-            ResourceManager.SetActive(ObjectLabel.L_MusicOff, false);
+            ResourceManager.SetActive(CanvasLabel.L_MusicOn, true);
+            ResourceManager.SetActive(CanvasLabel.L_MusicOff, false);
 
             MinigameAudio.UnPause();
             PartyThemeAudio.UnPause();
@@ -209,8 +209,8 @@ public class AudioManager : Regist
         {
             AudioOn = false;
 
-            ResourceManager.SetActive(ObjectLabel.L_AudioOn, false);
-            ResourceManager.SetActive(ObjectLabel.L_AudioOff, true);
+            ResourceManager.SetActive(CanvasLabel.L_AudioOn, false);
+            ResourceManager.SetActive(CanvasLabel.L_AudioOff, true);
 
             PlayerPrefs.SetInt(Lib.AudioPrefs, 0);
         }
@@ -218,8 +218,8 @@ public class AudioManager : Regist
         {
             AudioOn = true;
 
-            ResourceManager.SetActive(ObjectLabel.L_AudioOn, true);
-            ResourceManager.SetActive(ObjectLabel.L_AudioOff, false);
+            ResourceManager.SetActive(CanvasLabel.L_AudioOn, true);
+            ResourceManager.SetActive(CanvasLabel.L_AudioOff, false);
 
             PlayerPrefs.SetInt(Lib.AudioPrefs, 1);
         }

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

@@ -63,17 +63,17 @@ public class CDMinigamePanelManager : Regist
     {
         Init();
 
-        Title = ResourceManager.Get<Text>(ObjectLabel.AD_Title);
-        CoinCostText = ResourceManager.Get<Text>(ObjectLabel.AD_CoinCostText);
-        DiamondCostText = ResourceManager.Get<Text>(ObjectLabel.AD_DiamondCostText);
-        ComfirmButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AD_ConfirmButtonTitle);
-        CoinDescriptionText = ResourceManager.Get<Text>(ObjectLabel.AD_CoinDescription);
-        DiamondDescriptionText = ResourceManager.Get<Text>(ObjectLabel.AD_DiamondDescription);
-        Mask = ResourceManager.Get(ObjectLabel.AD_CDMinigameMask);
-        CoinToggle = ResourceManager.Get<Toggle>(ObjectLabel.AD_CoinToggle);
-        DiamondToggle = ResourceManager.Get<Toggle>(ObjectLabel.AD_DiamondToggle);
-        CloseButton = ResourceManager.Get<Button>(ObjectLabel.AD_CloseButton);
-        ComfirmButton = ResourceManager.Get<Button>(ObjectLabel.AD_ConfirmButton);
+        Title = ResourceManager.Get<Text>(CanvasLabel.AD_Title);
+        CoinCostText = ResourceManager.Get<Text>(CanvasLabel.AD_CoinCostText);
+        DiamondCostText = ResourceManager.Get<Text>(CanvasLabel.AD_DiamondCostText);
+        ComfirmButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AD_ConfirmButtonTitle);
+        CoinDescriptionText = ResourceManager.Get<Text>(CanvasLabel.AD_CoinDescription);
+        DiamondDescriptionText = ResourceManager.Get<Text>(CanvasLabel.AD_DiamondDescription);
+        Mask = ResourceManager.Get(CanvasLabel.AD_CDMinigameMask);
+        CoinToggle = ResourceManager.Get<Toggle>(CanvasLabel.AD_CoinToggle);
+        DiamondToggle = ResourceManager.Get<Toggle>(CanvasLabel.AD_DiamondToggle);
+        CloseButton = ResourceManager.Get<Button>(CanvasLabel.AD_CloseButton);
+        ComfirmButton = ResourceManager.Get<Button>(CanvasLabel.AD_ConfirmButton);
 
         Mask.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         CoinToggle.onValueChanged.AddListener(OnCoinToggleSelect);

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

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Serialization;
 
@@ -19,7 +19,7 @@ public class DebugManager : MonoBehaviour
         {
             if (debugBugText == null)
             {
-                DebugBugText = ResourceManager.Get<Text>(ObjectLabel.E_ScrrLab, false);
+                DebugBugText = ResourceManager.Get<Text>(CanvasLabel.E_ScrrLab, false);
             }
 
             return debugBugText;

+ 15 - 15
Assets/Script/Manage/EnterMinigamePanelManager.cs

@@ -48,19 +48,19 @@ public class EnterMinigamePanelManager : Regist
 
     public override void RegistReference()
     {
-        Title = ResourceManager.Get<Text>(ObjectLabel.AC_Title);
-        CostText = ResourceManager.Get<Text>(ObjectLabel.AC_CostText);
-        ChangeButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AC_ChangeButtonTitle);
-        ConfirmButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AC_ConfirmButtonTitle);
-        MinigameTypeText0 = ResourceManager.Get<Text>(ObjectLabel.AC_GamaTypeText0);
-        MinigameTypeText1 = ResourceManager.Get<Text>(ObjectLabel.AC_GamaTypeText1);
-        ChangeButton = ResourceManager.Get<Button>(ObjectLabel.AC_ChangeButton);
-        CloseButton = ResourceManager.Get<Button>(ObjectLabel.AC_CloseButton);
-        ConfirmButton = ResourceManager.Get<Button>(ObjectLabel.AC_ConfirmButton);
-        PanelMask = ResourceManager.Get(ObjectLabel.AC_EnterMinigamePanelMask);
-        ScrollPos0 = ResourceManager.Get(ObjectLabel.AC_ScrollPos0);
-        ScrollPos1 = ResourceManager.Get(ObjectLabel.AC_ScrollPos1);
-        ScrollPos2 = ResourceManager.Get(ObjectLabel.AC_ScrollPos2);
+        Title = ResourceManager.Get<Text>(CanvasLabel.AC_Title);
+        CostText = ResourceManager.Get<Text>(CanvasLabel.AC_CostText);
+        ChangeButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AC_ChangeButtonTitle);
+        ConfirmButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AC_ConfirmButtonTitle);
+        MinigameTypeText0 = ResourceManager.Get<Text>(CanvasLabel.AC_GamaTypeText0);
+        MinigameTypeText1 = ResourceManager.Get<Text>(CanvasLabel.AC_GamaTypeText1);
+        ChangeButton = ResourceManager.Get<Button>(CanvasLabel.AC_ChangeButton);
+        CloseButton = ResourceManager.Get<Button>(CanvasLabel.AC_CloseButton);
+        ConfirmButton = ResourceManager.Get<Button>(CanvasLabel.AC_ConfirmButton);
+        PanelMask = ResourceManager.Get(CanvasLabel.AC_EnterMinigamePanelMask);
+        ScrollPos0 = ResourceManager.Get(CanvasLabel.AC_ScrollPos0);
+        ScrollPos1 = ResourceManager.Get(CanvasLabel.AC_ScrollPos1);
+        ScrollPos2 = ResourceManager.Get(CanvasLabel.AC_ScrollPos2);
 
         LanguageManager.Add(Title, new MulLanStr(LanguageLabel.UI__AC_Title));
         LanguageManager.Add(ChangeButtonTitle, new MulLanStr(LanguageLabel.UI__AC_ChangeButtonTitle));
@@ -135,7 +135,7 @@ public class EnterMinigamePanelManager : Regist
 
     public static void OpenPanel()
     {
-        string languageLabel = LabelUtility.CombineLanguageLabel(LanguageLabel.MinigameName, CurrentMiniGameType.ToString());
+        string languageLabel = LanguageLabel.CombineLanguageLabel(LanguageLabel.MinigameName, CurrentMiniGameType.ToString());
         MinigameTypeText0.text = Language.GetStr(languageLabel);
         MinigameTypeText1.text = Language.GetStr(languageLabel);
         ChangeGameTypeCost = Auxiliary.FmlParse(ChangeGameTypeCostFormula, "i", Manager.CircleIncome.ToString());
@@ -205,7 +205,7 @@ public class EnterMinigamePanelManager : Regist
         tween.AddEventOnetime(EventType.ForwardFinish, () => OnArriveScrollPos1(tween));
 
         ScrollMiniGameType = AvailableGameTypes.Random()[0];
-        string languageLabel = LabelUtility.CombineLanguageLabel(LanguageLabel.MinigameName, ScrollMiniGameType.ToString());
+        string languageLabel = LanguageLabel.CombineLanguageLabel(LanguageLabel.MinigameName, ScrollMiniGameType.ToString());
         tween.Target.GetComponent<Text>().text = Language.GetStr(languageLabel);
 
         if (ScrollTimer + CurrentScrollDuration >= ScrollTime)

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

@@ -86,7 +86,7 @@ public class GardenManager : Regist
         {
             totalSlot = value;
 
-            ResourceManager.SetText(ObjectLabel.G_CollectLab2, string.Format("{0}/{1}", totalSlot, TotalSlotPage * TotalSlotInOnePage));
+            ResourceManager.SetText(CanvasLabel.G_CollectLab2, string.Format("{0}/{1}", totalSlot, TotalSlotPage * TotalSlotInOnePage));
         }
     }
     public static int totalSlot;
@@ -105,8 +105,8 @@ public class GardenManager : Regist
 
             AchieveManager.UpdateStatus(AchieveType.UnlockFlowerAmt, totalUnlockFlower);
 
-            ResourceManager.SetText(ObjectLabel.F_FlowerLab, string.Format("{0}", TotalUnlockFlower));
-            ResourceManager.SetText(ObjectLabel.G_CollectLab1, string.Format("{0}/{1}", TotalUnlockFlower, TotalFlower));
+            ResourceManager.SetText(CanvasLabel.F_FlowerLab, string.Format("{0}", TotalUnlockFlower));
+            ResourceManager.SetText(CanvasLabel.G_CollectLab1, string.Format("{0}/{1}", TotalUnlockFlower, TotalFlower));
 
             if (totalUnlockFlower >= TutorialManager.MinFlowerForFindGame && Manager.GardenLevel >= TutorialManager.FindMinigameTutorialLevel)
             {
@@ -398,10 +398,10 @@ public class GardenManager : Regist
 
     public override void RegistReference()
     {
-        RetrieveFlowerButton = ResourceManager.Get<Button>(ObjectLabel.H_Btn);
-        RetrieveFlowerButtonText = ResourceManager.Get<Text>(ObjectLabel.H_BtnLab);
-        BuyFlowerButton = ResourceManager.Get<Button>(ObjectLabel.H_Btn1);
-        BuyFlowerButtonText = ResourceManager.Get<Text>(ObjectLabel.H_BtnLab1);
+        RetrieveFlowerButton = ResourceManager.Get<Button>(CanvasLabel.H_Btn);
+        RetrieveFlowerButtonText = ResourceManager.Get<Text>(CanvasLabel.H_BtnLab);
+        BuyFlowerButton = ResourceManager.Get<Button>(CanvasLabel.H_Btn1);
+        BuyFlowerButtonText = ResourceManager.Get<Text>(CanvasLabel.H_BtnLab1);
     }
 
 
@@ -511,18 +511,18 @@ public class GardenManager : Regist
     {
         if (flowerInfo.RemainAmount == 0)
         {
-            ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = false;
-            ResourceManager.SetActive(ObjectLabel.H_AmtLab, false);
-            ResourceManager.SetActive(ObjectLabel.H_Rotate, false);
-            ResourceManager.SetText(ObjectLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_AllPlanted));
+            ResourceManager.Get<Button>(CanvasLabel.H_Icon2).interactable = false;
+            ResourceManager.SetActive(CanvasLabel.H_AmtLab, false);
+            ResourceManager.SetActive(CanvasLabel.H_Rotate, false);
+            ResourceManager.SetText(CanvasLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_AllPlanted));
         }
         else
         {
-            ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = true;
-            ResourceManager.SetActive(ObjectLabel.H_AmtLab, true);
-            ResourceManager.SetText(ObjectLabel.H_AmtLab, FlowerInfo.AmountTextPrefix + flowerInfo.RemainAmount);
-            ResourceManager.SetActive(ObjectLabel.H_Rotate, true);
-            ResourceManager.SetText(ObjectLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_PlantTip));
+            ResourceManager.Get<Button>(CanvasLabel.H_Icon2).interactable = true;
+            ResourceManager.SetActive(CanvasLabel.H_AmtLab, true);
+            ResourceManager.SetText(CanvasLabel.H_AmtLab, FlowerInfo.AmountTextPrefix + flowerInfo.RemainAmount);
+            ResourceManager.SetActive(CanvasLabel.H_Rotate, true);
+            ResourceManager.SetText(CanvasLabel.H_Desc, Language.GetStr(LanguageLabel.UI__H_PlantTip));
         }
     }
 
@@ -565,7 +565,7 @@ public class GardenManager : Regist
 
                             AudioManager.PlayClip(AudioLabel.GetCurrent);
 
-                            ResourceManager.Get(ObjectLabel.H_Icon1).FindChild($"{ObjectLabel.H_UIFlashLight}/{ObjectLabel.H_UIParticleSystem}").GetComponent<UIPartical>().Begin();
+                            ResourceManager.Get(CanvasLabel.H_Icon1).FindChild($"{CanvasLabel.H_UIFlashLight}/{CanvasLabel.H_UIParticleSystem}").GetComponent<UIPartical>().Begin();
                         },
                         StaticsManager.ItemID.解锁花朵,
                         StaticsManager.ConsumeModule.Shop,
@@ -573,15 +573,15 @@ public class GardenManager : Regist
                         false,
                         () =>
                         {
-                            ResourceManager.Get(ObjectLabel.H_FlowerCard).TweenBacCG();
-                            TweenCG tweenCg = ResourceManager.Get(ObjectLabel.G_Flower).TweenBacCG();
+                            ResourceManager.Get(CanvasLabel.H_FlowerCard).TweenBacCG();
+                            TweenCG tweenCg = ResourceManager.Get(CanvasLabel.G_Flower).TweenBacCG();
 
                             tweenCg.AddEventOnetime
                             (
                                 EventType.BackwardFinish,
                                 () =>
                                 {
-                                    ResourceManager.Get(ObjectLabel.F_Manage0).TweenForVec();
+                                    ResourceManager.Get(CanvasLabel.F_Manage0).TweenForVec();
                                 }
                             );
                         }
@@ -593,17 +593,17 @@ public class GardenManager : Regist
 
     private static void PlayFlowerCardMaterialTween()
     {
-        if (ResourceManager.Get<Image>(ObjectLabel.H_Icon2).material != Lib.GrayMat)
+        if (ResourceManager.Get<Image>(CanvasLabel.H_Icon2).material != Lib.GrayMat)
         {
             return;
         }
 
-        Material material = new Material(ResourceManager.Get<Image>(ObjectLabel.H_Icon2).material);
+        Material material = new Material(ResourceManager.Get<Image>(CanvasLabel.H_Icon2).material);
 
         MaterialUnit materialUnit = new MaterialUnit
         (
             material,
-            ResourceManager.Get(ObjectLabel.H_Icon2),
+            ResourceManager.Get(CanvasLabel.H_Icon2),
             new List<string>()
             {
                 MaterialLabel.GrayMatGrayLerp,
@@ -619,7 +619,7 @@ public class GardenManager : Regist
 
         FlowerCardMaterialTween.OnForwardFinish = () =>
         {
-            ResourceManager.Get<Image>(ObjectLabel.H_Icon2).material = null;
+            ResourceManager.Get<Image>(CanvasLabel.H_Icon2).material = null;
         };
 
         materialUnit.TweenForMatFloat();
@@ -705,12 +705,12 @@ public class GardenManager : Regist
 
         SelectFlowerInfo = flowerInfo;
 
-        ResourceManager.Get(ObjectLabel.H_FlowerCard).TweenForCG();
-        ResourceManager.SetText(ObjectLabel.H_Lab, flowerInfo.Name);
+        ResourceManager.Get(CanvasLabel.H_FlowerCard).TweenForCG();
+        ResourceManager.SetText(CanvasLabel.H_Lab, flowerInfo.Name);
 
         UpdatePlantCardStatus(flowerInfo);
 
-        Image image = ResourceManager.Get<Image>(ObjectLabel.H_Icon2);
+        Image image = ResourceManager.Get<Image>(CanvasLabel.H_Icon2);
         image.material = material;
         image.sprite = flowerInfo.Icon;
         image.Resize(true, DeltaSize.FlowerCardSpriteX, DeltaSize.FlowerCardSpriteY);

+ 8 - 8
Assets/Script/Manage/HttpManager.cs

@@ -228,7 +228,7 @@ public class HttpManager : Regist
 
     public override void RegistReference()
     {
-        WifiButton = ResourceManager.Get<Button>(ObjectLabel.C_WifiButton);
+        WifiButton = ResourceManager.Get<Button>(CanvasLabel.C_WifiButton);
 
         WifiButton.onClick.AddListener(OnWifiButtonClick);
 
@@ -486,8 +486,8 @@ public class HttpManager : Regist
 
         if (Initializer.Inited)
         {
-            ResourceManager.SetActive(ObjectLabel.C_NotifyParent, true);
-            ResourceManager.Get(ObjectLabel.C_Notify).TweenForCG();
+            ResourceManager.SetActive(CanvasLabel.C_NotifyParent, true);
+            ResourceManager.Get(CanvasLabel.C_Notify).TweenForCG();
         }
     }
 
@@ -687,7 +687,7 @@ public class HttpManager : Regist
     {
         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);
+        Transform mailItem = ResourceManager.Get(ResourceLabel.MailItem, Folder.UI, false, ResourceManager.Get(CanvasLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
         Dictionary<string, Transform> childDictionary = new Dictionary<string, Transform>();
         Auxiliary.CompileDic(mailItem, childDictionary);
         Text lab = childDictionary[MailItemLabel.Title].GetComponent<Text>();
@@ -946,7 +946,7 @@ public class HttpManager : Regist
 
                     if (Initializer.Inited)
                     {
-                        ResourceManager.SetText(ObjectLabel.L_UserLab, ID);
+                        ResourceManager.SetText(CanvasLabel.L_UserLab, ID);
                     }
                 }
 
@@ -1432,9 +1432,9 @@ public class HttpManager : Regist
     private static string ReporterMailPassword = "cs670cs";
     public static void ReportIssue()
     {
-        ResourceManager.Get(ObjectLabel.Lb_Info).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Lb_Info).TweenBacCG();
 
-        string emailAddress = ResourceManager.Get<Text>(ObjectLabel.Lb_InputLab0).text;
+        string emailAddress = ResourceManager.Get<Text>(CanvasLabel.Lb_InputLab0).text;
 
         if (string.IsNullOrEmpty(emailAddress) || !emailAddress.Contains("@"))
         {
@@ -1442,7 +1442,7 @@ public class HttpManager : Regist
             return;
         }
 
-        string content = ResourceManager.Get<Text>(ObjectLabel.Lb_InputLab).text;
+        string content = ResourceManager.Get<Text>(CanvasLabel.Lb_InputLab).text;
 
         if (string.IsNullOrEmpty(content))
         {

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

@@ -106,15 +106,15 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void Init()
     {
-        GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I1";
+        GameObject.Find(CanvasLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I1";
 
         InitIAP();
 
-        GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I2";
+        GameObject.Find(CanvasLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I2";
 
         LastPlayADsTime = DateTime.Parse(ConfigManager.GetStringFormConfig(PlayerConfigLabel.ADPlayTime));
 
-        GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I3";
+        GameObject.Find(CanvasLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I3";
     }
 
     public static void InitAD()
@@ -379,8 +379,8 @@ public class IAPManager : MonoBehaviour, IStoreListener
     {
         if (!string.IsNullOrEmpty(ImagePath))
         {
-            ResourceManager.SetActive(ObjectLabel.P_Open, true);
-            ResourceManager.SetActive(ObjectLabel.P_Share, true);
+            ResourceManager.SetActive(CanvasLabel.P_Open, true);
+            ResourceManager.SetActive(CanvasLabel.P_Share, true);
 
             ImagePath = null;
         }

+ 2 - 2
Assets/Script/Manage/InfoBoxManager.cs

@@ -149,8 +149,8 @@ public class InfoBoxManager : Regist
 
     public override void FirstInit()
     {
-        GardenInfoBox = new InfoBox(MaxGardenInfoItemCount, GardenInfoBoxDisplayTime, ResourceLabel.GardenInfoItem, true, ObjType.GardenInfoItem,  ResourceManager.Get(ObjectLabel.C_Info));
-        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomItemCount, PlazaRoomInfoBoxDisplayTime, ResourceLabel.PlazaInfoItem, true, ObjType.PlazaroomInfoItem, ResourceManager.Get(ObjectLabel.X_Info));
+        GardenInfoBox = new InfoBox(MaxGardenInfoItemCount, GardenInfoBoxDisplayTime, ResourceLabel.GardenInfoItem, true, ObjType.GardenInfoItem,  ResourceManager.Get(CanvasLabel.C_Info));
+        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomItemCount, PlazaRoomInfoBoxDisplayTime, ResourceLabel.PlazaInfoItem, true, ObjType.PlazaroomInfoItem, ResourceManager.Get(CanvasLabel.X_Info));
     }
 
     public void Update()

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

@@ -235,7 +235,7 @@ public class Initializer : MonoBehaviour
 
     public static void Init()
     {
-        DebugText = GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>();
+        DebugText = GameObject.Find(CanvasLabel.U_DebugLab).GetComponent<Text>();
         
         DebugText.text = "Error code : 1";
 
@@ -325,7 +325,7 @@ public class Initializer : MonoBehaviour
 
         if (HttpManager.IsAnnounceReady)
         {
-            ResourceManager.Get(ObjectLabel.C_Notify).TweenForCG();
+            ResourceManager.Get(CanvasLabel.C_Notify).TweenForCG();
         }
 
         DebugText.text = "Error code : 7";
@@ -383,43 +383,43 @@ 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;
+        ResourceManager.Get(CanvasLabel.U_Group).TweenForCG();
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.C_Main).alpha = 0;
 
-        ResourceManager.SetText(ObjectLabel.U_Lab, Language.GetStr(LanguageLabel.UI__U_Lab));
+        ResourceManager.SetText(CanvasLabel.U_Lab, Language.GetStr(LanguageLabel.UI__U_Lab));
 
         Auxiliary.Instance.DelayCall(ActivateGame, LoadingDelayTime);
     }
 
     public static void SetWarningTitleAndText()
     {
-        ResourceManager.SetText(ObjectLabel.U_WarningTitle, Language.GetStr(LanguageLabel.UI__U_WarningTitle));
+        ResourceManager.SetText(CanvasLabel.U_WarningTitle, Language.GetStr(LanguageLabel.UI__U_WarningTitle));
         if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
         {
-            ResourceManager.SetText(ObjectLabel.U_WarningText, Language.GetStr(LanguageLabel.UI__U_WarningText));
+            ResourceManager.SetText(CanvasLabel.U_WarningText, Language.GetStr(LanguageLabel.UI__U_WarningText));
         }
         else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
         {
-            ResourceManager.SetActive(ObjectLabel.U_WarningText, false);
+            ResourceManager.SetActive(CanvasLabel.U_WarningText, false);
         }
         else
         {
-            ResourceManager.SetActive(ObjectLabel.U_WarningText, false);
+            ResourceManager.SetActive(CanvasLabel.U_WarningText, false);
         }
     }
 
 
     private static void ActivateGame()
     {
-        ResourceManager.Get(ObjectLabel.U_LoadingPanel).TweenForCG();
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.C_Main).alpha = 1;
+        ResourceManager.Get(CanvasLabel.U_LoadingPanel).TweenForCG();
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.C_Main).alpha = 1;
 
         AudioManager.GardenThemeAudio.TweenForAudio();
     }
 
     public static void EnableDebugLab()
     {
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.U_Group).alpha = 0;
-        ResourceManager.Get<Text>(ObjectLabel.U_DebugLab).enabled = true;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.U_Group).alpha = 0;
+        ResourceManager.Get<Text>(CanvasLabel.U_DebugLab).enabled = true;
     }
 }

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

@@ -22,7 +22,7 @@ public class MulLanStr
 
     public MulLanStr(string pageAndID)
     {
-        string[] strings = pageAndID.Split(new[] { LabelUtility.LanguagePageSeperator }, StringSplitOptions.None);
+        string[] strings = pageAndID.Split(new[] { LanguageLabel.LanguagePageSeperator }, StringSplitOptions.None);
         Page = strings[0];
         ID = strings[1];
     }

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

@@ -239,7 +239,7 @@ public class Manager : Regist
                 return;
             }
 
-            LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.C_LevelText), new MulLanStr(LanguageLabel.UI__C_Level), gardenLevel.ToString());
+            LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.C_LevelText), new MulLanStr(LanguageLabel.UI__C_Level), gardenLevel.ToString());
 
             VisitManager.UpdateVisitCost();
 
@@ -270,11 +270,11 @@ public class Manager : Regist
 
             if (GardenLevel < TutorialManager.DressroomTutorialLevel)
             {
-                ResourceManager.Get<Image>(ObjectLabel.C_DressRoom).material = Lib.GrayMat;
+                ResourceManager.Get<Image>(CanvasLabel.C_DressRoom).material = Lib.GrayMat;
             }
             else
             {
-                ResourceManager.Get<Image>(ObjectLabel.C_DressRoom).material = null;
+                ResourceManager.Get<Image>(CanvasLabel.C_DressRoom).material = null;
             }
 
             if (GardenManager.TotalUnlockFlower >= TutorialManager.MinFlowerForFindGame && gardenLevel >= TutorialManager.FindMinigameTutorialLevel)
@@ -287,7 +287,7 @@ public class Manager : Regist
 
             if (gardenLevel >= TutorialManager.CommentTutorialLevel)
             {
-                ResourceManager.Get(ObjectLabel.C_CommentParent).TweenForCG();
+                ResourceManager.Get(CanvasLabel.C_CommentParent).TweenForCG();
             }
 
             if (gardenLevel >= TutorialManager.VisitTutorialLevel)
@@ -299,7 +299,7 @@ public class Manager : Regist
                 }
                 else
                 {
-                    ResourceManager.SetActive(ObjectLabel.C_Visit, true);
+                    ResourceManager.SetActive(CanvasLabel.C_Visit, true);
                 }
             }
 
@@ -321,7 +321,7 @@ public class Manager : Regist
                 }
                 else
                 {
-                    ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom, true);
+                    ResourceManager.SetActive(CanvasLabel.C_EnterPlazaRoom, true);
                 }
             }
         }
@@ -335,7 +335,7 @@ public class Manager : Regist
         {
             person = value;
 
-            ResourceManager.SetText(ObjectLabel.F_PersonLab, (IncomeDisplayTime*(person * (1 + skillPersonBuff) + skillPerson)).ToString("0"));
+            ResourceManager.SetText(CanvasLabel.F_PersonLab, (IncomeDisplayTime*(person * (1 + skillPersonBuff) + skillPerson)).ToString("0"));
         }
     }
     private static float person;
@@ -347,7 +347,7 @@ public class Manager : Regist
         {
             skillPerson = value;
 
-            TweenOutline tween = ResourceManager.Get(ObjectLabel.F_PersonLab).GetTweenOutline();
+            TweenOutline tween = ResourceManager.Get(CanvasLabel.F_PersonLab).GetTweenOutline();
 
             if (skillPerson.Equal(0))
             {
@@ -369,7 +369,7 @@ public class Manager : Regist
                 }
             }
 
-            ResourceManager.SetText(ObjectLabel.F_PersonLab, (IncomeDisplayTime * (person * (1 + skillPersonBuff) + skillPerson)).ToString("0"));
+            ResourceManager.SetText(CanvasLabel.F_PersonLab, (IncomeDisplayTime * (person * (1 + skillPersonBuff) + skillPerson)).ToString("0"));
         }
     }
     public static float skillPerson;
@@ -381,7 +381,7 @@ public class Manager : Regist
         {
             coinPerson = value;
 
-            ResourceManager.SetText(ObjectLabel.F_CoinPersonLab, (coinPerson + skillCoinPerson).ToString("0"));
+            ResourceManager.SetText(CanvasLabel.F_CoinPersonLab, (coinPerson + skillCoinPerson).ToString("0"));
         }
     }
     private static float coinPerson;
@@ -393,7 +393,7 @@ public class Manager : Regist
         {
             skillPersonBuff = value;
 
-            ResourceManager.SetText(ObjectLabel.F_PersonLab, (IncomeDisplayTime * (person * (1 + skillPersonBuff) + skillPerson)).ToString("0"));
+            ResourceManager.SetText(CanvasLabel.F_PersonLab, (IncomeDisplayTime * (person * (1 + skillPersonBuff) + skillPerson)).ToString("0"));
         }
     }
     public static float skillPersonBuff;
@@ -405,7 +405,7 @@ public class Manager : Regist
         {
             skillCoinPerson = value;
 
-            TweenOutline tween = ResourceManager.Get(ObjectLabel.F_CoinPersonLab).GetTweenOutline();
+            TweenOutline tween = ResourceManager.Get(CanvasLabel.F_CoinPersonLab).GetTweenOutline();
 
             if (skillCoinPerson.Equal(0))
             {
@@ -427,7 +427,7 @@ public class Manager : Regist
                 }
             }
 
-            ResourceManager.SetText(ObjectLabel.F_CoinPersonLab, (coinPerson + skillCoinPerson).ToString("0"));
+            ResourceManager.SetText(CanvasLabel.F_CoinPersonLab, (coinPerson + skillCoinPerson).ToString("0"));
         }
     }
     public static float skillCoinPerson;
@@ -439,9 +439,9 @@ public class Manager : Regist
         {
             coin = value;
             
-            ResourceManager.SetText(ObjectLabel.F_CoinLab, Auxiliary.ShrinkNumberStr(coin));
-            ResourceManager.SetText(ObjectLabel.C_CoinLab, Auxiliary.ShrinkNumberStr(coin));
-            ResourceManager.SetText(ObjectLabel.P_CoinLab, Auxiliary.ShrinkNumberStr(coin));
+            ResourceManager.SetText(CanvasLabel.F_CoinLab, Auxiliary.ShrinkNumberStr(coin));
+            ResourceManager.SetText(CanvasLabel.C_CoinLab, Auxiliary.ShrinkNumberStr(coin));
+            ResourceManager.SetText(CanvasLabel.P_CoinLab, Auxiliary.ShrinkNumberStr(coin));
 
             AchieveManager.UpdateStatus(AchieveType.CurrentCoin, coin);
 
@@ -457,8 +457,8 @@ public class Manager : Regist
         {
             diamond = value;
 
-            ResourceManager.SetText(ObjectLabel.F_DiamondLab, Auxiliary.ShrinkNumberStr(diamond));
-            ResourceManager.SetText(ObjectLabel.P_DiamondLab, Auxiliary.ShrinkNumberStr(diamond));
+            ResourceManager.SetText(CanvasLabel.F_DiamondLab, Auxiliary.ShrinkNumberStr(diamond));
+            ResourceManager.SetText(CanvasLabel.P_DiamondLab, Auxiliary.ShrinkNumberStr(diamond));
 
             OnDiamondChange.SafeInvoke(diamond);
         }
@@ -545,7 +545,7 @@ public class Manager : Regist
         {
             InputDetectTimer = 0;
 
-            ResourceManager.Get(ObjectLabel.C_Group).TweenForCG();
+            ResourceManager.Get(CanvasLabel.C_Group).TweenForCG();
         }
         else
         {
@@ -555,7 +555,7 @@ public class Manager : Regist
             {
                 InputDetectTimer = 0;
 
-                ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.C_Group).TweenBacCG();
             }
         }
     }
@@ -585,15 +585,15 @@ public class Manager : Regist
         {
             MinigameCDTimer -= Time.deltaTime;
 
-            ResourceManager.SetText(ObjectLabel.C_MiniGameLab, Mathf.CeilToInt(MinigameCDTimer).ToString());
+            ResourceManager.SetText(CanvasLabel.C_MiniGameLab, Mathf.CeilToInt(MinigameCDTimer).ToString());
 
             if (MinigameCDTimer < 0)
             {
                 MinigameFlag = true;
 
-                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacRect();
+                ResourceManager.Get(CanvasLabel.C_MiniGame).TweenBacRect();
 
-                ResourceManager.SetText(ObjectLabel.C_MiniGameLab, "");
+                ResourceManager.SetText(CanvasLabel.C_MiniGameLab, "");
 
                 StaticsManager.GetInstance().RewardItem(StaticsManager.ItemID.获得小游戏, StaticsManager.ItemType.小游戏, "1", StaticsManager.ConsumeModule.None);
             }
@@ -648,9 +648,9 @@ public class Manager : Regist
 
             AddCoin(circleIncome, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
 
-            ResourceManager.Get(ObjectLabel.C_IncomeLab).TweenReForGra();
-            ResourceManager.Get(ObjectLabel.C_IncomeLab).TweenReForVec();
-            ResourceManager.SetText(ObjectLabel.C_IncomeLab, "+" + Auxiliary.ShrinkNumberStr(circleIncome, 0));
+            ResourceManager.Get(CanvasLabel.C_IncomeLab).TweenReForGra();
+            ResourceManager.Get(CanvasLabel.C_IncomeLab).TweenReForVec();
+            ResourceManager.SetText(CanvasLabel.C_IncomeLab, "+" + Auxiliary.ShrinkNumberStr(circleIncome, 0));
         }
     }
 
@@ -752,17 +752,17 @@ public class Manager : Regist
 
     public override void FirstInit()
     {
-        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>(CanvasLabel.F_Elf).material = Lib.GrayMat;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_Store).material = Lib.GrayMat;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_Magic).material = Lib.GrayMat;
 
-        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<Graphic>(CanvasLabel.F_ElfLab).material = Lib.GrayMat;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_StoreLab).material = Lib.GrayMat;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_MagicLab).material = Lib.GrayMat;
 
-        ResourceManager.Get<Button>(ObjectLabel.F_Elf).interactable = false;
-        ResourceManager.Get<Button>(ObjectLabel.F_Store).interactable = false;
-        ResourceManager.Get<Button>(ObjectLabel.F_Magic).interactable = false;
+        ResourceManager.Get<Button>(CanvasLabel.F_Elf).interactable = false;
+        ResourceManager.Get<Button>(CanvasLabel.F_Store).interactable = false;
+        ResourceManager.Get<Button>(CanvasLabel.F_Magic).interactable = false;
 
 
         List<XmlAttributeCollection> attributeList = ConfigManager.GetSkillList();
@@ -791,7 +791,7 @@ public class Manager : Regist
 
         if (MinigameCDTimer > 0)
         {
-            ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForRect();
+            ResourceManager.Get(CanvasLabel.C_MiniGame).TweenForRect();
         }
         else
         {
@@ -833,7 +833,7 @@ public class Manager : Regist
     {
         OfflineFlag = false;
 
-        ResourceManager.SetActive(ObjectLabel.Ba_Lab2, false);
+        ResourceManager.SetActive(CanvasLabel.Ba_Lab2, false);
 
         if (HttpManager.IsConnect && ConfigManager.GetBoolFormConfig(PlayerConfigLabel.QuitFlag))
         {
@@ -856,8 +856,8 @@ public class Manager : Regist
             {
                 OfflineTime = (long)OfflineMaxTime;
 
-                ResourceManager.SetText(ObjectLabel.Ba_Lab2, Language.GetStr(LanguageLabel.UI__Ba_Lab2));
-                ResourceManager.SetActive(ObjectLabel.Ba_Lab2, true);
+                ResourceManager.SetText(CanvasLabel.Ba_Lab2, Language.GetStr(LanguageLabel.UI__Ba_Lab2));
+                ResourceManager.SetActive(CanvasLabel.Ba_Lab2, true);
             }
         }
 
@@ -931,13 +931,13 @@ public class Manager : Regist
         {
             coin = OfflineMaxCoin;
 
-            ResourceManager.SetText(ObjectLabel.Ba_Lab2, Language.GetStr(LanguageLabel.UI__Ba_Lab2));
-            ResourceManager.SetActive(ObjectLabel.Ba_Lab2, true);
+            ResourceManager.SetText(CanvasLabel.Ba_Lab2, Language.GetStr(LanguageLabel.UI__Ba_Lab2));
+            ResourceManager.SetActive(CanvasLabel.Ba_Lab2, true);
         }
 
         AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
 
-        ResourceManager.SetText(ObjectLabel.Ba_IconLab, Auxiliary.ShrinkNumberStr(coin));
+        ResourceManager.SetText(CanvasLabel.Ba_IconLab, Auxiliary.ShrinkNumberStr(coin));
     }
 
     public new static void SwitchLanguage()
@@ -983,7 +983,7 @@ public class Manager : Regist
             }
             else
             {
-                ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
 
                 if (navigate)
                 {
@@ -999,7 +999,7 @@ public class Manager : Regist
 
                             if (useBubbleTweenNavigate)
                             {
-                                TweenRoot tween = ResourceManager.Get(ObjectLabel.K_Bubble0).GetTweenScale();
+                                TweenRoot tween = ResourceManager.Get(CanvasLabel.K_Bubble0).GetTweenScale();
 
                                 tween.AddEventOnetime
                                 (
@@ -1012,7 +1012,7 @@ public class Manager : Regist
                             }
                             else
                             {
-                                TweenRoot tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+                                TweenRoot tween = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
                                 tween.AddEventOnetime
                                 (
@@ -1056,7 +1056,7 @@ public class Manager : Regist
             }
             else
             {
-                ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
 
                 if (navigate)
                 {
@@ -1072,7 +1072,7 @@ public class Manager : Regist
 
                             if (useBubbleTweenNavigate)
                             {
-                                TweenRoot tween = ResourceManager.Get(ObjectLabel.K_Bubble0).GetTweenScale();
+                                TweenRoot tween = ResourceManager.Get(CanvasLabel.K_Bubble0).GetTweenScale();
 
                                 tween.AddEventOnetime
                                 (
@@ -1085,7 +1085,7 @@ public class Manager : Regist
                             }
                             else
                             {
-                                TweenRoot tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+                                TweenRoot tween = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
                                 tween.AddEventOnetime
                                     (
@@ -1135,7 +1135,7 @@ public class Manager : Regist
             {
                 HttpManager.ID = HttpManager.LoginCallbackData["o"].ToString();
 
-                ResourceManager.SetText(ObjectLabel.L_UserLab, HttpManager.ID);
+                ResourceManager.SetText(CanvasLabel.L_UserLab, HttpManager.ID);
             }
 
             if (ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber) == PlayerConfigLabel.DefaultSerialNumber)
@@ -1169,10 +1169,10 @@ public class Manager : Regist
 
     public static void SwitchConfig(string id)
     {
-        ResourceManager.SetText(ObjectLabel.La_Lab, Language.GetStr(LanguageLabel.UI__L_Downloading));
+        ResourceManager.SetText(CanvasLabel.La_Lab, Language.GetStr(LanguageLabel.UI__L_Downloading));
 
-        ResourceManager.SetActive(ObjectLabel.La_Lab, true);
-        ResourceManager.SetActive(ObjectLabel.La_Mask, true);
+        ResourceManager.SetActive(CanvasLabel.La_Lab, true);
+        ResourceManager.SetActive(CanvasLabel.La_Mask, true);
 
 
         HttpManager.GetConfigByID(id, SwitchConfigCallback);
@@ -1182,9 +1182,9 @@ public class Manager : Regist
     {
         if (jsonData.Inst_Object.Keys.Contains("l"))
         {
-            ResourceManager.Get(ObjectLabel.La_Info).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.La_Info).TweenBacCG();
 
-            ResourceManager.SetText(ObjectLabel.La_Lab, Language.GetStr(LanguageLabel.UI__La_Lab0));
+            ResourceManager.SetText(CanvasLabel.La_Lab, Language.GetStr(LanguageLabel.UI__La_Lab0));
 
 
             ConfigManager.ConfigDocument.LoadXml(jsonData["l"].ToString());
@@ -1192,7 +1192,7 @@ public class Manager : Regist
             ConfigManager.ConfigRootNode = ConfigManager.ConfigDocument.SelectSingleNode(PlayerConfigLabel.RootNode);
 
 
-            ResourceManager.SetText(ObjectLabel.L_UserLab, ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID));
+            ResourceManager.SetText(CanvasLabel.L_UserLab, ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID));
 
             HttpManager.ID = ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID);
             HttpManager.SerialNumber = ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber);
@@ -1210,9 +1210,9 @@ public class Manager : Regist
         }
         else
         {
-            ResourceManager.SetText(ObjectLabel.La_Lab, Language.GetStr(LanguageLabel.UI__La_Lab1));
+            ResourceManager.SetText(CanvasLabel.La_Lab, Language.GetStr(LanguageLabel.UI__La_Lab1));
 
-            ResourceManager.SetActive(ObjectLabel.La_Mask, false);
+            ResourceManager.SetActive(CanvasLabel.La_Mask, false);
         }
     }
 

+ 242 - 242
Assets/Script/Manage/MiniGameManager.cs

@@ -89,11 +89,11 @@ public class MinigameAward
         CoinAward = (int)(CoinAward * (1 + Manager.SkillPlus) + DropCoin);
         CoinAward = (int) Mathf.Clamp(CoinAward, 1, Mathf.Infinity);
 
-        ResourceManager.Get<Text>(ObjectLabel.Da_CoinLab).text = CoinAward.ToString();
-        ResourceManager.Get<Text>(ObjectLabel.Da_CoinLab).Resize(true, false);
-        ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_CoinGroup).enabled = true;
+        ResourceManager.Get<Text>(CanvasLabel.Da_CoinLab).text = CoinAward.ToString();
+        ResourceManager.Get<Text>(CanvasLabel.Da_CoinLab).Resize(true, false);
+        ResourceManager.Get<ContentSizeFitter>(CanvasLabel.Da_CoinGroup).enabled = true;
 
-        ResourceManager.SetActive(ObjectLabel.Da_CoinLab, true);
+        ResourceManager.SetActive(CanvasLabel.Da_CoinLab, true);
 
         Manager.AddCoin(CoinAward, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.MiniGame);
 
@@ -111,15 +111,15 @@ public class MinigameAward
 
             DiamondAward = (int)(Mathf.Lerp(MinDiamondAward, MaxDiamondAward, Random.Range(0, 1f)) + DropDiamond);
 
-            ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).text = DiamondAward.ToString();
-            ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).Resize(true, false);
-            ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_DiamondGroup).enabled = true;
+            ResourceManager.Get<Text>(CanvasLabel.Da_DiamondLab).text = DiamondAward.ToString();
+            ResourceManager.Get<Text>(CanvasLabel.Da_DiamondLab).Resize(true, false);
+            ResourceManager.Get<ContentSizeFitter>(CanvasLabel.Da_DiamondGroup).enabled = true;
 
-            ResourceManager.SetActive(ObjectLabel.Da_DiamondLab, true);
+            ResourceManager.SetActive(CanvasLabel.Da_DiamondLab, true);
 
             Manager.AddDiamond(DiamondAward, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.MiniGame);
 
-            ResourceManager.SetActive(ObjectLabel.Da_Diamond, true);
+            ResourceManager.SetActive(CanvasLabel.Da_Diamond, true);
 
             sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.DiamondSprite, DiamondAward);
         }
@@ -131,15 +131,15 @@ public class MinigameAward
 
                 DiamondAward = DropDiamond;
 
-                ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).text = DiamondAward.ToString();
-                ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).Resize(true, false);
-                ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_DiamondGroup).enabled = true;
+                ResourceManager.Get<Text>(CanvasLabel.Da_DiamondLab).text = DiamondAward.ToString();
+                ResourceManager.Get<Text>(CanvasLabel.Da_DiamondLab).Resize(true, false);
+                ResourceManager.Get<ContentSizeFitter>(CanvasLabel.Da_DiamondGroup).enabled = true;
 
-                ResourceManager.SetActive(ObjectLabel.Da_DiamondLab, true);
+                ResourceManager.SetActive(CanvasLabel.Da_DiamondLab, true);
 
                 Manager.AddDiamond(DiamondAward, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.MiniGame);
 
-                ResourceManager.SetActive(ObjectLabel.Da_Diamond, true);
+                ResourceManager.SetActive(CanvasLabel.Da_Diamond, true);
 
                 sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.DiamondSprite, DiamondAward);
             }
@@ -159,12 +159,12 @@ public class MinigameAward
 
             FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[1];
 
-            ResourceManager.SetActive(ObjectLabel.Da_FlowerIcon, true);
+            ResourceManager.SetActive(CanvasLabel.Da_FlowerIcon, true);
 
-            ResourceManager.Get<Image>(ObjectLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
-            ResourceManager.Get<Image>(ObjectLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
+            ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
+            ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
 
-            ResourceManager.SetText(ObjectLabel.Da_FlowerLab, flowerInfo.Name);
+            ResourceManager.SetText(CanvasLabel.Da_FlowerLab, flowerInfo.Name);
 
             sb.AppendFormat("{0}{1}{2}", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.FlowerSprite, flowerInfo.Name);
         }
@@ -181,20 +181,20 @@ public class MinigameAward
                     flowerInfo.Add();
 
 
-                    ResourceManager.SetActive(ObjectLabel.Da_Flower, true);
+                    ResourceManager.SetActive(CanvasLabel.Da_Flower, true);
 
-                    ResourceManager.Get<Image>(ObjectLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
-                    ResourceManager.Get<Image>(ObjectLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
+                    ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
+                    ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
 
-                    ResourceManager.SetText(ObjectLabel.Da_FlowerLab, flowerInfo.Name);
+                    ResourceManager.SetText(CanvasLabel.Da_FlowerLab, flowerInfo.Name);
 
                     sb.AppendFormat("{0}{1}{2}", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.FlowerSprite, flowerInfo.Name);
                 }
                 else
                 {
-                    ResourceManager.SetActive(ObjectLabel.Da_Flower, false);
+                    ResourceManager.SetActive(CanvasLabel.Da_Flower, false);
 
-                    ResourceManager.SetText(ObjectLabel.Da_FlowerLab, Language.GetStr(LanguageLabel.UI__Da_HigherScore));
+                    ResourceManager.SetText(CanvasLabel.Da_FlowerLab, Language.GetStr(LanguageLabel.UI__Da_HigherScore));
                 }
             }
         }
@@ -208,17 +208,17 @@ public class MinigameAward
 
         #endregion
 
-        ResourceManager.SetActive(ObjectLabel.Da_Info, true);
+        ResourceManager.SetActive(CanvasLabel.Da_Info, true);
 
         Auxiliary.Instance.DelayCall
             (
                 () =>
                 {
-                    ResourceManager.Get<Text>(ObjectLabel.Da_CoinLab).SetLayoutDirty();
-                    ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).SetLayoutDirty();
+                    ResourceManager.Get<Text>(CanvasLabel.Da_CoinLab).SetLayoutDirty();
+                    ResourceManager.Get<Text>(CanvasLabel.Da_DiamondLab).SetLayoutDirty();
 
-                    ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_CoinGroup).enabled = false;
-                    ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_DiamondGroup).enabled = false;
+                    ResourceManager.Get<ContentSizeFitter>(CanvasLabel.Da_CoinGroup).enabled = false;
+                    ResourceManager.Get<ContentSizeFitter>(CanvasLabel.Da_DiamondGroup).enabled = false;
 
                     SetupAnimation();
                 },
@@ -251,46 +251,46 @@ public class MinigameAward
 
         #region Reset
 
-        ResourceManager.Get(ObjectLabel.Da_Info).TweenForCG();
+        ResourceManager.Get(CanvasLabel.Da_Info).TweenForCG();
 
-        ResourceManager.SetText(ObjectLabel.Da_Tit, Language.GetStr(LanguageLabel.UI__Da_Tit1));
-        ResourceManager.SetText(ObjectLabel.Da_CoinLab, "0");
-        ResourceManager.SetText(ObjectLabel.Da_DiamondLab, "0");
+        ResourceManager.SetText(CanvasLabel.Da_Tit, Language.GetStr(LanguageLabel.UI__Da_Tit1));
+        ResourceManager.SetText(CanvasLabel.Da_CoinLab, "0");
+        ResourceManager.SetText(CanvasLabel.Da_DiamondLab, "0");
 
-        ResourceManager.SetActive(ObjectLabel.Da_Lab, false);
-        ResourceManager.SetActive(ObjectLabel.Da_Quit, false);
-        ResourceManager.SetActive(ObjectLabel.Da_Cancel, false);
+        ResourceManager.SetActive(CanvasLabel.Da_Lab, false);
+        ResourceManager.SetActive(CanvasLabel.Da_Quit, false);
+        ResourceManager.SetActive(CanvasLabel.Da_Cancel, false);
 
-        ResourceManager.SetActive(ObjectLabel.Da_CoinLab, false);
-        ResourceManager.SetActive(ObjectLabel.Da_ScoreTit, false);
-        ResourceManager.SetActive(ObjectLabel.Da_ScoreLab, false);
-        ResourceManager.SetActive(ObjectLabel.Da_GetAward, false);
-        ResourceManager.SetActive(ObjectLabel.Da_DiamondLab, false);
+        ResourceManager.SetActive(CanvasLabel.Da_CoinLab, false);
+        ResourceManager.SetActive(CanvasLabel.Da_ScoreTit, false);
+        ResourceManager.SetActive(CanvasLabel.Da_ScoreLab, false);
+        ResourceManager.SetActive(CanvasLabel.Da_GetAward, false);
+        ResourceManager.SetActive(CanvasLabel.Da_DiamondLab, false);
 
-        ResourceManager.SetActive(ObjectLabel.Da_VGroup, true);
-        ResourceManager.SetActive(ObjectLabel.Da_HGroup1, false);
-        ResourceManager.SetActive(ObjectLabel.Da_FlowerGroup, false);
-        ResourceManager.SetActive(ObjectLabel.Da_DiamondGroup, false);
+        ResourceManager.SetActive(CanvasLabel.Da_VGroup, true);
+        ResourceManager.SetActive(CanvasLabel.Da_HGroup1, false);
+        ResourceManager.SetActive(CanvasLabel.Da_FlowerGroup, false);
+        ResourceManager.SetActive(CanvasLabel.Da_DiamondGroup, false);
 
         if (UnlockFlowerFlag)
         {
-            ResourceManager.SetActive(ObjectLabel.Da_FlowerGroup, true);
+            ResourceManager.SetActive(CanvasLabel.Da_FlowerGroup, true);
         }
 
         if (HaveDiamondFlag)
         {
-            ResourceManager.SetActive(ObjectLabel.Da_DiamondGroup, true);
+            ResourceManager.SetActive(CanvasLabel.Da_DiamondGroup, true);
         }
 
         Auxiliary.Instance.DelayCall
         (
             () =>
             {
-                ResourceManager.Get<VerticalLayoutGroup>(ObjectLabel.Da_VGroup).enabled = false;
+                ResourceManager.Get<VerticalLayoutGroup>(CanvasLabel.Da_VGroup).enabled = false;
 
-                ResourceManager.SetActive(ObjectLabel.Da_CoinGroup, false);
-                ResourceManager.SetActive(ObjectLabel.Da_FlowerGroup, false);
-                ResourceManager.SetActive(ObjectLabel.Da_DiamondGroup, false);
+                ResourceManager.SetActive(CanvasLabel.Da_CoinGroup, false);
+                ResourceManager.SetActive(CanvasLabel.Da_FlowerGroup, false);
+                ResourceManager.SetActive(CanvasLabel.Da_DiamondGroup, false);
             },
             1
         );
@@ -302,9 +302,9 @@ public class MinigameAward
 
         float time = Mathf.Max(timeCoin, timeDiamond);
         
-        ResourceManager.Get(ObjectLabel.Da_CoinLab).CreateTweenNumber(0, CoinAward, time, false, true, Curve.EaseOutQuad);
-        ResourceManager.Get(ObjectLabel.Da_ScoreLab).CreateTweenNumber(0, Score, timeScore, false, true, Curve.EaseOutQuad);
-        ResourceManager.Get(ObjectLabel.Da_DiamondLab).CreateTweenNumber(0, DiamondAward, time, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get(CanvasLabel.Da_CoinLab).CreateTweenNumber(0, CoinAward, time, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get(CanvasLabel.Da_ScoreLab).CreateTweenNumber(0, Score, timeScore, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get(CanvasLabel.Da_DiamondLab).CreateTweenNumber(0, DiamondAward, time, false, true, Curve.EaseOutQuad);
 
         #endregion
 
@@ -315,14 +315,14 @@ public class MinigameAward
 
         if (UnlockFlowerFlag)
         {
-            tween = ResourceManager.Get(ObjectLabel.Da_CoinLab).GetTweenNumber();
+            tween = ResourceManager.Get(CanvasLabel.Da_CoinLab).GetTweenNumber();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.Da_FlowerGroup).TweenReForScale();
+                    ResourceManager.Get(CanvasLabel.Da_FlowerGroup).TweenReForScale();
                 }
             );
         }
@@ -333,51 +333,51 @@ public class MinigameAward
 
         if (UnlockFlowerFlag)
         {
-            tween = ResourceManager.Get(ObjectLabel.Da_FlowerGroup).GetTweenScale();
+            tween = ResourceManager.Get(CanvasLabel.Da_FlowerGroup).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.Da_GetAward).TweenReForCG();
+                    ResourceManager.Get(CanvasLabel.Da_GetAward).TweenReForCG();
                 }
             );
         }
         else
         {
-            tween = ResourceManager.Get(ObjectLabel.Da_CoinLab).GetTweenNumber();
+            tween = ResourceManager.Get(CanvasLabel.Da_CoinLab).GetTweenNumber();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.Da_GetAward).TweenReForCG();
+                    ResourceManager.Get(CanvasLabel.Da_GetAward).TweenReForCG();
                 }
             );
         }
 
         if (TutorialManager.NewplayerTutorial)
         {
-            tween = ResourceManager.Get(ObjectLabel.Da_GetAward).GetTweenCG();
+            tween = ResourceManager.Get(CanvasLabel.Da_GetAward).GetTweenCG();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.Da_Arrow0), ResourceManager.Get(ObjectLabel.Da_Arrow1), ResourceManager.Get(ObjectLabel.Da_GetAward));
+                    Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.Da_Arrow0), ResourceManager.Get(CanvasLabel.Da_Arrow1), ResourceManager.Get(CanvasLabel.Da_GetAward));
                 }
             );
         }
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.Da_GetAward,
+            CanvasLabel.Da_GetAward,
             () =>
             {
-                ResourceManager.Get(ObjectLabel.Da_VGroup).GetComponent<VerticalLayoutGroup>().enabled = true;
+                ResourceManager.Get(CanvasLabel.Da_VGroup).GetComponent<VerticalLayoutGroup>().enabled = true;
             }
         );
 
@@ -387,15 +387,15 @@ public class MinigameAward
 
         if (Rate == 0)
         {
-            tween = ResourceManager.Get(ObjectLabel.Da_Star1).GetTweenScale();
+            tween = ResourceManager.Get(CanvasLabel.Da_Star1).GetTweenScale();
         }
         else if (Rate == 1)
         {
-            tween = ResourceManager.Get(ObjectLabel.Da_Star2).GetTweenScale();
+            tween = ResourceManager.Get(CanvasLabel.Da_Star2).GetTweenScale();
         }
         else if (Rate == 2)
         {
-            tween = ResourceManager.Get(ObjectLabel.Da_Star3).GetTweenScale();
+            tween = ResourceManager.Get(CanvasLabel.Da_Star3).GetTweenScale();
         }
 
         tween.AddEventOnetime
@@ -403,11 +403,11 @@ public class MinigameAward
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(ObjectLabel.Da_ScoreTit).TweenReForFont();
+                ResourceManager.Get(CanvasLabel.Da_ScoreTit).TweenReForFont();
             }
         );
 
-        tween = ResourceManager.Get(ObjectLabel.Da_ScoreTit).GetTweenFont();
+        tween = ResourceManager.Get(CanvasLabel.Da_ScoreTit).GetTweenFont();
         tween.InOrigin = true;
 
         tween.AddEventOnetime
@@ -415,7 +415,7 @@ public class MinigameAward
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(ObjectLabel.Da_ScoreLab).TweenReForNumber();
+                ResourceManager.Get(CanvasLabel.Da_ScoreLab).TweenReForNumber();
             }
         );
 
@@ -423,78 +423,78 @@ public class MinigameAward
 
         #region 五角星
 
-        tween = ResourceManager.Get(ObjectLabel.Da_Star3).GetTweenScale();
+        tween = ResourceManager.Get(CanvasLabel.Da_Star3).GetTweenScale();
         tween.InOrigin = true;
 
-        tween = ResourceManager.Get(ObjectLabel.Da_Star2).GetTweenScale();
+        tween = ResourceManager.Get(CanvasLabel.Da_Star2).GetTweenScale();
         tween.InOrigin = true;
 
-        tween = ResourceManager.Get(ObjectLabel.Da_Star1).GetTweenScale();
+        tween = ResourceManager.Get(CanvasLabel.Da_Star1).GetTweenScale();
         tween.InOrigin = true;
 
 
-        tween = ResourceManager.Get(ObjectLabel.Da_Info).GetTweenCG();
+        tween = ResourceManager.Get(CanvasLabel.Da_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(ObjectLabel.Da_Star1).TweenReForScale();
+                ResourceManager.Get(CanvasLabel.Da_Star1).TweenReForScale();
 
-                ResourceManager.SetActive(ObjectLabel.Da_HGroup1, true);
+                ResourceManager.SetActive(CanvasLabel.Da_HGroup1, true);
             }
         );
 
 
         if (Rate == 0)
         {
-            ResourceManager.SetActive(ObjectLabel.Da_Star2, false);
-            ResourceManager.SetActive(ObjectLabel.Da_Star3, false);
+            ResourceManager.SetActive(CanvasLabel.Da_Star2, false);
+            ResourceManager.SetActive(CanvasLabel.Da_Star3, false);
         }
         else if (Rate == 1)
         {
-            ResourceManager.SetActive(ObjectLabel.Da_Star2, true);
-            ResourceManager.SetActive(ObjectLabel.Da_Star3, false);
+            ResourceManager.SetActive(CanvasLabel.Da_Star2, true);
+            ResourceManager.SetActive(CanvasLabel.Da_Star3, false);
 
 
-            tween = ResourceManager.Get(ObjectLabel.Da_Star1).GetTweenScale();
+            tween = ResourceManager.Get(CanvasLabel.Da_Star1).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.Da_Star2).TweenReForScale();
+                    ResourceManager.Get(CanvasLabel.Da_Star2).TweenReForScale();
                 }
             );
         }
         else if (Rate == 2)
         {
-            ResourceManager.SetActive(ObjectLabel.Da_Star2, true);
-            ResourceManager.SetActive(ObjectLabel.Da_Star3, true);
+            ResourceManager.SetActive(CanvasLabel.Da_Star2, true);
+            ResourceManager.SetActive(CanvasLabel.Da_Star3, true);
 
 
-            tween = ResourceManager.Get(ObjectLabel.Da_Star1).GetTweenScale();
+            tween = ResourceManager.Get(CanvasLabel.Da_Star1).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.Da_Star2).TweenReForScale();
+                    ResourceManager.Get(CanvasLabel.Da_Star2).TweenReForScale();
                 }
             );
 
 
-            tween = ResourceManager.Get(ObjectLabel.Da_Star2).GetTweenScale();
+            tween = ResourceManager.Get(CanvasLabel.Da_Star2).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.Da_Star3).TweenReForScale();
+                    ResourceManager.Get(CanvasLabel.Da_Star3).TweenReForScale();
                 }
             );
         }
@@ -503,43 +503,43 @@ public class MinigameAward
 
         #region 金币钻石
 
-        tween = ResourceManager.Get(ObjectLabel.Da_ScoreLab).GetTweenNumber();
+        tween = ResourceManager.Get(CanvasLabel.Da_ScoreLab).GetTweenNumber();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(ObjectLabel.Da_CoinGroup).TweenReForScale();
+                ResourceManager.Get(CanvasLabel.Da_CoinGroup).TweenReForScale();
 
                 if (HaveDiamondFlag)
                 {
-                    ResourceManager.Get(ObjectLabel.Da_DiamondGroup).TweenReForScale();
+                    ResourceManager.Get(CanvasLabel.Da_DiamondGroup).TweenReForScale();
                 }
             }
         );
 
-        tween = ResourceManager.Get(ObjectLabel.Da_CoinGroup).GetTweenScale();
+        tween = ResourceManager.Get(CanvasLabel.Da_CoinGroup).GetTweenScale();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(ObjectLabel.Da_CoinLab).TweenReForNumber();
+                ResourceManager.Get(CanvasLabel.Da_CoinLab).TweenReForNumber();
             }
         );
 
         if (HaveDiamondFlag)
         {
-            tween = ResourceManager.Get(ObjectLabel.Da_DiamondGroup).GetTweenScale();
+            tween = ResourceManager.Get(CanvasLabel.Da_DiamondGroup).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.Da_DiamondLab).TweenReForNumber();
+                    ResourceManager.Get(CanvasLabel.Da_DiamondLab).TweenReForNumber();
                 }
             );
         }
@@ -616,7 +616,7 @@ public class MiniGameManager : Regist
         {
             score = value;
 
-            ResourceManager.SetText(ObjectLabel.D_ScoreLab, ScoreTextPrefix + score);
+            ResourceManager.SetText(CanvasLabel.D_ScoreLab, ScoreTextPrefix + score);
         }
     }
     private static int score;
@@ -631,11 +631,11 @@ public class MiniGameManager : Regist
 
             if (game)
             {
-                ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab1));
+                ResourceManager.SetText(CanvasLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab1));
             }
             else
             {
-                ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab0));
+                ResourceManager.SetText(CanvasLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab0));
             }
         }
     }
@@ -652,11 +652,11 @@ public class MiniGameManager : Regist
             {
                 if (pause)
                 {
-                    ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab2));
+                    ResourceManager.SetText(CanvasLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab2));
                 }
                 else
                 {
-                    ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab1));
+                    ResourceManager.SetText(CanvasLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab1));
                 }
             }
             else if (IsPrepare)
@@ -685,11 +685,11 @@ public class MiniGameManager : Regist
             {
                 if (panalty)
                 {
-                    ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab3));
+                    ResourceManager.SetText(CanvasLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab3));
                 }
                 else
                 {
-                    ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab1));
+                    ResourceManager.SetText(CanvasLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab1));
                 }
             }
         }
@@ -980,21 +980,21 @@ public class MiniGameManager : Regist
 
     public override void RegistReference()
     {
-        DisplayGrid = ResourceManager.Get(ObjectLabel.D_Grid);
-        MinigameBeginButtonParent = ResourceManager.Get(ObjectLabel.D_Begin);
-        MinigameTimerParent = ResourceManager.Get(ObjectLabel.D_Timer);
+        DisplayGrid = ResourceManager.Get(CanvasLabel.D_Grid);
+        MinigameBeginButtonParent = ResourceManager.Get(CanvasLabel.D_Begin);
+        MinigameTimerParent = ResourceManager.Get(CanvasLabel.D_Timer);
 
-        PunchGameStatusParent = ResourceManager.Get(ObjectLabel.D_Status1);
-        MemoryGameStatusParent = ResourceManager.Get(ObjectLabel.D_Status2);
-        FindGameStatusParent = ResourceManager.Get(ObjectLabel.D_Status3);
-        PunchGameOperateParent = ResourceManager.Get(ObjectLabel.D_Operate1);
-        MemoryGameOperateParent = ResourceManager.Get(ObjectLabel.D_Operate2);
-        FindGameOperateParent = ResourceManager.Get(ObjectLabel.D_Operate3);
+        PunchGameStatusParent = ResourceManager.Get(CanvasLabel.D_Status1);
+        MemoryGameStatusParent = ResourceManager.Get(CanvasLabel.D_Status2);
+        FindGameStatusParent = ResourceManager.Get(CanvasLabel.D_Status3);
+        PunchGameOperateParent = ResourceManager.Get(CanvasLabel.D_Operate1);
+        MemoryGameOperateParent = ResourceManager.Get(CanvasLabel.D_Operate2);
+        FindGameOperateParent = ResourceManager.Get(CanvasLabel.D_Operate3);
 
-        MinigameTimerText = ResourceManager.Get<Text>(ObjectLabel.D_TimerLab);
-        PrepareText = ResourceManager.Get<Text>(ObjectLabel.D_PrepareLab);
+        MinigameTimerText = ResourceManager.Get<Text>(CanvasLabel.D_TimerLab);
+        PrepareText = ResourceManager.Get<Text>(CanvasLabel.D_PrepareLab);
 
-        MinigameTimerBk = ResourceManager.Get<Image>(ObjectLabel.D_TimerIcon);
+        MinigameTimerBk = ResourceManager.Get<Image>(CanvasLabel.D_TimerIcon);
 
         MinigameSlots.Add(ResourceManager.Get(GardenLabel.MinigameSlot1));
         MinigameSlots.Add(ResourceManager.Get(GardenLabel.MinigameSlot2));
@@ -1006,45 +1006,45 @@ public class MiniGameManager : Regist
         MinigameSlots.Add(ResourceManager.Get(GardenLabel.MinigameSlot8));
         MinigameSlots.Add(ResourceManager.Get(GardenLabel.MinigameSlot9));
 
-        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));
+        D_MemoryGameBtns.Add(ResourceManager.Get(CanvasLabel.D_FlowerBtn1));
+        D_MemoryGameBtns.Add(ResourceManager.Get(CanvasLabel.D_FlowerBtn2));
+        D_MemoryGameBtns.Add(ResourceManager.Get(CanvasLabel.D_FlowerBtn3));
+        D_MemoryGameBtns.Add(ResourceManager.Get(CanvasLabel.D_FlowerBtn4));
+        D_MemoryGameBtns.Add(ResourceManager.Get(CanvasLabel.D_FlowerBtn5));
+        D_MemoryGameBtns.Add(ResourceManager.Get(CanvasLabel.D_FlowerBtn6));
+
+        D_MemoryGameTicks.Add(ResourceManager.Get(CanvasLabel.D_FlowerTick1));
+        D_MemoryGameTicks.Add(ResourceManager.Get(CanvasLabel.D_FlowerTick2));
+        D_MemoryGameTicks.Add(ResourceManager.Get(CanvasLabel.D_FlowerTick3));
+        D_MemoryGameTicks.Add(ResourceManager.Get(CanvasLabel.D_FlowerTick4));
+        D_MemoryGameTicks.Add(ResourceManager.Get(CanvasLabel.D_FlowerTick5));
+        D_MemoryGameTicks.Add(ResourceManager.Get(CanvasLabel.D_FlowerTick6));
+
+        D_MemoryGameIcons.Add(ResourceManager.Get(CanvasLabel.D_FlowerIcon1));
+        D_MemoryGameIcons.Add(ResourceManager.Get(CanvasLabel.D_FlowerIcon2));
+        D_MemoryGameIcons.Add(ResourceManager.Get(CanvasLabel.D_FlowerIcon3));
+        D_MemoryGameIcons.Add(ResourceManager.Get(CanvasLabel.D_FlowerIcon4));
+        D_MemoryGameIcons.Add(ResourceManager.Get(CanvasLabel.D_FlowerIcon5));
+        D_MemoryGameIcons.Add(ResourceManager.Get(CanvasLabel.D_FlowerIcon6));
+
+        D_MemoryGameArrows.Add(ResourceManager.Get(CanvasLabel.D_FlowerArrow1));
+        D_MemoryGameArrows.Add(ResourceManager.Get(CanvasLabel.D_FlowerArrow2));
+        D_MemoryGameArrows.Add(ResourceManager.Get(CanvasLabel.D_FlowerArrow3));
+        D_MemoryGameArrows.Add(ResourceManager.Get(CanvasLabel.D_FlowerArrow4));
+        D_MemoryGameArrows.Add(ResourceManager.Get(CanvasLabel.D_FlowerArrow5));
+        D_MemoryGameArrows.Add(ResourceManager.Get(CanvasLabel.D_FlowerArrow6));
+
+        D_FindGameBtns.Add(ResourceManager.Get(CanvasLabel.D_FlowerBtn7));
+        D_FindGameBtns.Add(ResourceManager.Get(CanvasLabel.D_FlowerBtn8));
+        D_FindGameBtns.Add(ResourceManager.Get(CanvasLabel.D_FlowerBtn9));
+
+        D_FindGameIcons.Add(ResourceManager.Get(CanvasLabel.D_FlowerIcon7));
+        D_FindGameIcons.Add(ResourceManager.Get(CanvasLabel.D_FlowerIcon8));
+        D_FindGameIcons.Add(ResourceManager.Get(CanvasLabel.D_FlowerIcon9));
+
+        D_FindGameArrows.Add(ResourceManager.Get(CanvasLabel.D_FlowerArrow7));
+        D_FindGameArrows.Add(ResourceManager.Get(CanvasLabel.D_FlowerArrow8));
+        D_FindGameArrows.Add(ResourceManager.Get(CanvasLabel.D_FlowerArrow9));
     }
 
 
@@ -1179,9 +1179,9 @@ public class MiniGameManager : Regist
         MinigameTimerBk.fillAmount = 0;
         MinigameTimerText.text = GameTime.ToString("0");
 
-        ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.C_MiniGame).TweenBacCG();
         ResourceManager.Get(GardenLabel.Minigame).TweenForVec();
-        ResourceManager.Get(ObjectLabel.D_MiniGame).TweenForCG();
+        ResourceManager.Get(CanvasLabel.D_MiniGame).TweenForCG();
         AudioManager.PlayClip(AudioLabel.Bubble);
     }
 
@@ -1246,37 +1246,37 @@ public class MiniGameManager : Regist
         IsPrepare = true;
         PrepareTimer = PrepareTime;
 
-        ResourceManager.Get(ObjectLabel.D_Begin).SetActive(false);
-        ResourceManager.Get(ObjectLabel.D_DescA).SetActive(false);
-        ResourceManager.Get(ObjectLabel.D_DescB).SetActive(false);
-        ResourceManager.Get(ObjectLabel.D_DescC).SetActive(false);
+        ResourceManager.Get(CanvasLabel.D_Begin).SetActive(false);
+        ResourceManager.Get(CanvasLabel.D_DescA).SetActive(false);
+        ResourceManager.Get(CanvasLabel.D_DescB).SetActive(false);
+        ResourceManager.Get(CanvasLabel.D_DescC).SetActive(false);
 
         if (miniGameType == MiniGameType.Punch)
         {
-            ResourceManager.Get(ObjectLabel.D_Rip1).SetActive(true);
-            ResourceManager.Get(ObjectLabel.D_Water1).SetActive(true);
-            ResourceManager.Get(ObjectLabel.D_Fertilize1).SetActive(true);
+            ResourceManager.Get(CanvasLabel.D_Rip1).SetActive(true);
+            ResourceManager.Get(CanvasLabel.D_Water1).SetActive(true);
+            ResourceManager.Get(CanvasLabel.D_Fertilize1).SetActive(true);
         }
 
         if (miniGameType == MiniGameType.Memory)
         {
-            ResourceManager.Get(ObjectLabel.D_Mask).TweenForGra();
+            ResourceManager.Get(CanvasLabel.D_Mask).TweenForGra();
 
-            ResourceManager.SetActive(ObjectLabel.D_FlowerBtn1, true);
-            ResourceManager.SetActive(ObjectLabel.D_FlowerBtn2, true);
-            ResourceManager.SetActive(ObjectLabel.D_FlowerBtn3, true);
-            ResourceManager.SetActive(ObjectLabel.D_FlowerBtn4, true);
-            ResourceManager.SetActive(ObjectLabel.D_FlowerBtn5, true);
-            ResourceManager.SetActive(ObjectLabel.D_FlowerBtn6, true);
+            ResourceManager.SetActive(CanvasLabel.D_FlowerBtn1, true);
+            ResourceManager.SetActive(CanvasLabel.D_FlowerBtn2, true);
+            ResourceManager.SetActive(CanvasLabel.D_FlowerBtn3, true);
+            ResourceManager.SetActive(CanvasLabel.D_FlowerBtn4, true);
+            ResourceManager.SetActive(CanvasLabel.D_FlowerBtn5, true);
+            ResourceManager.SetActive(CanvasLabel.D_FlowerBtn6, true);
 
             float deltaSIzeX = 1.0625f;
             float deltaSIzeY = 1.0625f;
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon1, MinigameFlowerDictionary[0].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon2, MinigameFlowerDictionary[1].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon3, MinigameFlowerDictionary[3].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon4, MinigameFlowerDictionary[4].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon5, MinigameFlowerDictionary[6].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon6, MinigameFlowerDictionary[7].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon1, MinigameFlowerDictionary[0].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon2, MinigameFlowerDictionary[1].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon3, MinigameFlowerDictionary[3].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon4, MinigameFlowerDictionary[4].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon5, MinigameFlowerDictionary[6].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon6, MinigameFlowerDictionary[7].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
         }
 
         PrepareText.StreamForScale();
@@ -1295,11 +1295,11 @@ public class MiniGameManager : Regist
             ResetNewFlowerFlag();
         //}
 
-        ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForCG();
+        ResourceManager.Get(CanvasLabel.C_MiniGame).TweenForCG();
 
         if (Manager.MinigameCDTimer > 0)
         {
-            ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForRect();
+            ResourceManager.Get(CanvasLabel.C_MiniGame).TweenForRect();
         }
 
 
@@ -1358,7 +1358,7 @@ public class MiniGameManager : Regist
         {
             Flower flower = MinigameIdleFlowerList.Find(tempFlower => { return tempFlower.ID == id; });
 
-            ResourceManager.GetHudText($"+{FindCorrectScore}", Color.white, 90, flower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(ObjectLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{FindCorrectScore}", Color.white, 90, flower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
 
             Score += FindCorrectScore;
 
@@ -1405,7 +1405,7 @@ public class MiniGameManager : Regist
 
             Flower flower = MinigameFlowerDictionary[slotIndex];
 
-            ResourceManager.GetHudText($"+{MemoryCorrectScore}", Color.white, 90, flower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(ObjectLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{MemoryCorrectScore}", Color.white, 90, flower.ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
 
             Score += MemoryCorrectScore;
 
@@ -1464,13 +1464,13 @@ public class MiniGameManager : Regist
             PunchGameOperateList.Add(flower);
             MinigameIdleFlowerList.Remove(flower);
 
-            Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.D_WaterArrow0), ResourceManager.Get(ObjectLabel.D_WaterArrow1), ResourceManager.Get(ObjectLabel.D_Water1));
+            Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.D_WaterArrow0), ResourceManager.Get(CanvasLabel.D_WaterArrow1), ResourceManager.Get(CanvasLabel.D_Water1));
 
             Tutorial.SetArea(PunchGameOperateList[0].OperateIcon.transform, 0.1f, 0.125f);
 
             ResourceManager.AddButtonEventOnetime
             (
-                ObjectLabel.D_Water2,
+                CanvasLabel.D_Water2,
                 () =>
                 {
                     Pause = false;
@@ -1530,15 +1530,15 @@ public class MiniGameManager : Regist
         DisplayGrid.SetParent(PunchGameStatusParent);
         MinigameBeginButtonParent.SetParent(PunchGameOperateParent);
 
-        PrepareText.SetParent(ResourceManager.Get(ObjectLabel.D_PrepareLayout1));
+        PrepareText.SetParent(ResourceManager.Get(CanvasLabel.D_PrepareLayout1));
 
 
-        ResourceManager.SetActive(ObjectLabel.D_Rip1, false);
-        ResourceManager.SetActive(ObjectLabel.D_Water1, false);
-        ResourceManager.SetActive(ObjectLabel.D_Fertilize1, false);
+        ResourceManager.SetActive(CanvasLabel.D_Rip1, false);
+        ResourceManager.SetActive(CanvasLabel.D_Water1, false);
+        ResourceManager.SetActive(CanvasLabel.D_Fertilize1, false);
 
-        ResourceManager.SetActive(ObjectLabel.D_Begin, true);
-        ResourceManager.SetActive(ObjectLabel.D_DescA, true);
+        ResourceManager.SetActive(CanvasLabel.D_Begin, true);
+        ResourceManager.SetActive(CanvasLabel.D_DescA, true);
 
 
         if (MinigameAward.HaveNewFlowerFlag)
@@ -1600,22 +1600,22 @@ public class MiniGameManager : Regist
         DisplayGrid.SetParent(MemoryGameStatusParent);
         MinigameBeginButtonParent.SetParent(MemoryGameOperateParent);
 
-        PrepareText.SetParent(ResourceManager.Get(ObjectLabel.D_PrepareLayout2));
+        PrepareText.SetParent(ResourceManager.Get(CanvasLabel.D_PrepareLayout2));
 
 
         ResetMemoryGameButtons();
 
-        ResourceManager.Get(ObjectLabel.D_Mask).TweenBacGra();
+        ResourceManager.Get(CanvasLabel.D_Mask).TweenBacGra();
 
-        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn1, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn2, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn3, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn4, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn5, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn6, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerBtn1, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerBtn2, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerBtn3, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerBtn4, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerBtn5, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerBtn6, false);
 
-        ResourceManager.SetActive(ObjectLabel.D_Begin, true);
-        ResourceManager.SetActive(ObjectLabel.D_DescB, true);
+        ResourceManager.SetActive(CanvasLabel.D_Begin, true);
+        ResourceManager.SetActive(CanvasLabel.D_DescB, true);
 
         List<int> idList = new List<int>(MemoryGameSlotIDs);
 
@@ -1686,18 +1686,18 @@ public class MiniGameManager : Regist
     {
         FindGameOperateParent.SetActive(true);
 
-        ResourceManager.SetActive(ObjectLabel.D_Begin, true);
-        ResourceManager.SetActive(ObjectLabel.D_DescC, true);
+        ResourceManager.SetActive(CanvasLabel.D_Begin, true);
+        ResourceManager.SetActive(CanvasLabel.D_DescC, true);
 
-        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn7, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn8, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn9, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerBtn7, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerBtn8, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerBtn9, false);
 
         MinigameBeginButtonParent.SetParent(FindGameOperateParent);
         MinigameTimerParent.SetParent(FindGameStatusParent);
         DisplayGrid.SetParent(FindGameStatusParent);
 
-        PrepareText.SetParent(ResourceManager.Get(ObjectLabel.D_PrepareLayout3));
+        PrepareText.SetParent(ResourceManager.Get(CanvasLabel.D_PrepareLayout3));
 
         FindGameRoundReset(true);
     }
@@ -1705,7 +1705,7 @@ public class MiniGameManager : Regist
 
     public static void MemoryGameRoundEnd()
     {
-        ResourceManager.Get(ObjectLabel.D_Mask).TweenForGra();
+        ResourceManager.Get(CanvasLabel.D_Mask).TweenForGra();
     }
 
     public static void MemoryGameRoundReset()
@@ -1739,7 +1739,7 @@ public class MiniGameManager : Regist
 
     public static void MemoryGameRoundBegin()
     {
-        ResourceManager.Get(ObjectLabel.D_Mask).TweenBacGra();
+        ResourceManager.Get(CanvasLabel.D_Mask).TweenBacGra();
 
         if (TutorialManager.MemoryMinigameTutorial)
         {
@@ -1749,33 +1749,33 @@ public class MiniGameManager : Regist
 
     public static void ResetMemoryGameButtons()
     {
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerBtn1).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerBtn2).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerBtn3).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerBtn4).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerBtn5).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerBtn6).material = null;
-
-        ResourceManager.Get<Button>(ObjectLabel.D_FlowerBtn1).interactable = true;
-        ResourceManager.Get<Button>(ObjectLabel.D_FlowerBtn2).interactable = true;
-        ResourceManager.Get<Button>(ObjectLabel.D_FlowerBtn3).interactable = true;
-        ResourceManager.Get<Button>(ObjectLabel.D_FlowerBtn4).interactable = true;
-        ResourceManager.Get<Button>(ObjectLabel.D_FlowerBtn5).interactable = true;
-        ResourceManager.Get<Button>(ObjectLabel.D_FlowerBtn6).interactable = true;
-
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerIcon1).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerIcon2).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerIcon3).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerIcon4).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerIcon5).material = null;
-        ResourceManager.Get<Image>(ObjectLabel.D_FlowerIcon6).material = null;
-
-        ResourceManager.SetActive(ObjectLabel.D_FlowerTick1, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerTick2, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerTick3, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerTick4, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerTick5, false);
-        ResourceManager.SetActive(ObjectLabel.D_FlowerTick6, false);
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerBtn1).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerBtn2).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerBtn3).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerBtn4).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerBtn5).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerBtn6).material = null;
+
+        ResourceManager.Get<Button>(CanvasLabel.D_FlowerBtn1).interactable = true;
+        ResourceManager.Get<Button>(CanvasLabel.D_FlowerBtn2).interactable = true;
+        ResourceManager.Get<Button>(CanvasLabel.D_FlowerBtn3).interactable = true;
+        ResourceManager.Get<Button>(CanvasLabel.D_FlowerBtn4).interactable = true;
+        ResourceManager.Get<Button>(CanvasLabel.D_FlowerBtn5).interactable = true;
+        ResourceManager.Get<Button>(CanvasLabel.D_FlowerBtn6).interactable = true;
+
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerIcon1).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerIcon2).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerIcon3).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerIcon4).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerIcon5).material = null;
+        ResourceManager.Get<Image>(CanvasLabel.D_FlowerIcon6).material = null;
+
+        ResourceManager.SetActive(CanvasLabel.D_FlowerTick1, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerTick2, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerTick3, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerTick4, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerTick5, false);
+        ResourceManager.SetActive(CanvasLabel.D_FlowerTick6, false);
     }
 
     public static void MemoryGameFadeNext()
@@ -1851,9 +1851,9 @@ public class MiniGameManager : Regist
             MinigameIdleFlowerList[i].FlowerIcon.TweenForSr();
         }
 
-        ResourceManager.Get(ObjectLabel.D_FlowerBtn7).TweenBacCG();
-        ResourceManager.Get(ObjectLabel.D_FlowerBtn8).TweenBacCG();
-        ResourceManager.Get(ObjectLabel.D_FlowerBtn9).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.D_FlowerBtn7).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.D_FlowerBtn8).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.D_FlowerBtn9).TweenBacCG();
 
         Auxiliary.Instance.DelayCall
         (
@@ -1954,9 +1954,9 @@ public class MiniGameManager : Regist
 
         float deltaSIzeX = 1.0625f;
         float deltaSIzeY = 1.0625f;
-        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon7, GardenManager.FlowerInfoDictionary[idList[0]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon8, GardenManager.FlowerInfoDictionary[idList[1]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon9, GardenManager.FlowerInfoDictionary[idList[2]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon7, GardenManager.FlowerInfoDictionary[idList[0]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon8, GardenManager.FlowerInfoDictionary[idList[1]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon9, GardenManager.FlowerInfoDictionary[idList[2]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
 
         for (int i = 0; i < idList.Count; i++)
         {
@@ -1986,9 +1986,9 @@ public class MiniGameManager : Regist
             MinigameIdleFlowerList[0].PlayNewFlowerEffec();
         }
 
-        ResourceManager.Get(ObjectLabel.D_FlowerBtn7).TweenReForCG();
-        ResourceManager.Get(ObjectLabel.D_FlowerBtn8).TweenReForCG();
-        ResourceManager.Get(ObjectLabel.D_FlowerBtn9).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.D_FlowerBtn7).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.D_FlowerBtn8).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.D_FlowerBtn9).TweenReForCG();
 
         for (int i = 0; i < MinigameIdleFlowerList.Count; i++)
         {
@@ -2010,7 +2010,7 @@ public class MiniGameManager : Regist
             {
                 if (Game || IsPrepare)
                 {
-                    ResourceManager.Get<Button>(ObjectLabel.D_Quit).onClick.Invoke();
+                    ResourceManager.Get<Button>(CanvasLabel.D_Quit).onClick.Invoke();
                 }
             }
         }

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

@@ -25,7 +25,7 @@ public class NickNameManager : Regist
     public override void FirstInit()
 	{
 		SetNickName (ConfigManager.GetStringFormConfig (PlayerConfigLabel.NickName));
-		NicknameInputField = ResourceManager.Get<InputField> (ObjectLabel.T_InputField);
+		NicknameInputField = ResourceManager.Get<InputField> (CanvasLabel.T_InputField);
 	    string defaultNames = ResourceManager.Load<TextAsset>(ResourceLabel.DefaultNickName, Folder.Config).text;
 	    string[] names = defaultNames.Split('\n');
         DefaultFirstNames = names[0].Split('|')[1].Split(',').ToList();
@@ -57,28 +57,28 @@ public class NickNameManager : Regist
 	{
 	    if (string.IsNullOrEmpty(NickName))
 	    {
-	        ResourceManager.SetActive(ObjectLabel.T_Close, false);
+	        ResourceManager.SetActive(CanvasLabel.T_Close, false);
 	    }
 	    else
 	    {
-            ResourceManager.SetActive(ObjectLabel.T_Close, true);
+            ResourceManager.SetActive(CanvasLabel.T_Close, true);
 	        NicknameInputField.text = NickName;
 	    }
 
-	    ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
+	    ResourceManager.SetText(CanvasLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
 
 	    if (!TutorialManager.PlazaRoomTutorial && !TutorialManager.VisitTutorial && !TutorialManager.DressroomTutorial)
 	    {
-            ResourceManager.Get(ObjectLabel.C_Main).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.C_Main).TweenBacCG();
         }
 
-        ResourceManager.Get (ObjectLabel.T_NickNameBK).TweenForCG ();
+        ResourceManager.Get (CanvasLabel.T_NickNameBK).TweenForCG ();
 	}
 
 	public static void CloseNickNameSettingPanel()
 	{
-		ResourceManager.Get (ObjectLabel.C_Main).TweenForCG ();
-		ResourceManager.Get (ObjectLabel.T_NickNameBK).TweenBacCG ();
+		ResourceManager.Get (CanvasLabel.C_Main).TweenForCG ();
+		ResourceManager.Get (CanvasLabel.T_NickNameBK).TweenBacCG ();
 	}
 
 
@@ -87,7 +87,7 @@ public class NickNameManager : Regist
         NickName = nickName;
         ConfigManager.SaveStringToConfig(PlayerConfigLabel.NickName, nickName);
 
-        ResourceManager.SetText(ObjectLabel.C_NickNameLab, nickName);
+        ResourceManager.SetText(CanvasLabel.C_NickNameLab, nickName);
     }
 
     public static void SetRandomName()
@@ -103,8 +103,8 @@ public class NickNameManager : Regist
             return;
 	    }
 
-	    ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Checking));
-	    ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = false;
+	    ResourceManager.SetText(CanvasLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Checking));
+	    ResourceManager.Get<CanvasGroup>(CanvasLabel.T_NickNameBK).interactable = false;
 
 		if (ChectInputFieldValue ())
 		{
@@ -117,23 +117,23 @@ public class NickNameManager : Regist
 		}
 		else
 		{
-	    ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
-            ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = true;
+	    ResourceManager.SetText(CanvasLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
+            ResourceManager.Get<CanvasGroup>(CanvasLabel.T_NickNameBK).interactable = true;
         }
 	}
 
     public static void ResetFailed(string str)
     {
-        ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
+        ResourceManager.SetText(CanvasLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
 
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = true;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.T_NickNameBK).interactable = true;
 
         Bubble.Show(null, str);
     }
 
     public static void ResetSucceed()
     {
-	    ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = true;
+	    ResourceManager.Get<CanvasGroup>(CanvasLabel.T_NickNameBK).interactable = true;
 
         SetNickName(NicknameInputField.text);
 

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

@@ -67,7 +67,7 @@ public class PlazaRoomManager : Regist
 
     public override void ThirdInit()
     {
-        VirtualScrollRect virtualScrollRect = ResourceManager.Get<VirtualScrollRect>(ObjectLabel.Z_ScrollRect);
+        VirtualScrollRect virtualScrollRect = ResourceManager.Get<VirtualScrollRect>(CanvasLabel.Z_ScrollRect);
         virtualScrollRect.OnVerticalLessEqual0 = NextRoomPage;
         virtualScrollRect.OnVerticalGreaterEqual1 = PreviousRoomPage;
 
@@ -77,12 +77,12 @@ public class PlazaRoomManager : Regist
 
     public override void RegistReference()
     {
-        Grid = ResourceManager.Get(ObjectLabel.Z_Grid);
-        ScrollRect = ResourceManager.Get<VirtualScrollRect>(ObjectLabel.Z_ScrollRect);
-        CreateRoom_DurationText = ResourceManager.Get<Text>(ObjectLabel.AAa_ValueLab);
-        CreateRoom_DurationSlider = ResourceManager.Get<Slider>(ObjectLabel.AAa_Slider);
-        CreateRoom_MaxPlayerText = ResourceManager.Get<Text>(ObjectLabel.AAb_ValueLab);
-        CreateRoom_MaxPlayerSlider = ResourceManager.Get<Slider>(ObjectLabel.AAb_Slider);
+        Grid = ResourceManager.Get(CanvasLabel.Z_Grid);
+        ScrollRect = ResourceManager.Get<VirtualScrollRect>(CanvasLabel.Z_ScrollRect);
+        CreateRoom_DurationText = ResourceManager.Get<Text>(CanvasLabel.AAa_ValueLab);
+        CreateRoom_DurationSlider = ResourceManager.Get<Slider>(CanvasLabel.AAa_Slider);
+        CreateRoom_MaxPlayerText = ResourceManager.Get<Text>(CanvasLabel.AAb_ValueLab);
+        CreateRoom_MaxPlayerSlider = ResourceManager.Get<Slider>(CanvasLabel.AAb_Slider);
         
         CreateRoom_DurationSlider.onValueChanged.AddListener(OnSliderValueChange);
         CreateRoom_DurationSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(AudioLabel.ClickButton));
@@ -91,12 +91,12 @@ public class PlazaRoomManager : Regist
 
         Manager.OnCoinChange += coin =>
         {
-            ResourceManager.SetText(ObjectLabel.X_CoinText, ResourceManager.Get<Text>(ObjectLabel.F_CoinLab).text);
+            ResourceManager.SetText(CanvasLabel.X_CoinText, ResourceManager.Get<Text>(CanvasLabel.F_CoinLab).text);
         };
 
         Manager.OnDiamondChange += diamond =>
         {
-            ResourceManager.SetText(ObjectLabel.X_DiamondText, ResourceManager.Get<Text>(ObjectLabel.F_DiamondLab).text);
+            ResourceManager.SetText(CanvasLabel.X_DiamondText, ResourceManager.Get<Text>(CanvasLabel.F_DiamondLab).text);
         };
     }
 
@@ -113,27 +113,27 @@ public class PlazaRoomManager : Regist
 
     public static void DownloadNormalRoomData()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__Loading));
-        ResourceManager.Get(ObjectLabel.Z_Tip).TweenForCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__Loading));
+        ResourceManager.Get(CanvasLabel.Z_Tip).TweenForCG();
         DownloadDataFlag = true;
         SFSManager.GardenSmartFox.ExecuteAfterCheckConection
         (
             () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomData(NormalLastDisplayIndex),
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } },
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } }
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(CanvasLabel.Z_Tip).TweenBacCG(); }); } },
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(CanvasLabel.Z_Tip).TweenBacCG(); }); } }
          );
     }
 
     public static void DownloadCustomRoomData()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__Loading));
-        ResourceManager.Get(ObjectLabel.Z_Tip).TweenForCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__Loading));
+        ResourceManager.Get(CanvasLabel.Z_Tip).TweenForCG();
         DownloadDataFlag = true;
         SFSManager.GardenSmartFox.ExecuteAfterCheckConection
         (
             () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetCustomRoomData(CustomLastDisplayIndex, long.Parse(HttpManager.SerialNumber)),
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } },
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } }
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(CanvasLabel.Z_Tip).TweenBacCG(); }); } },
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(CanvasLabel.Z_Tip).TweenBacCG(); }); } }
         );
     }
 
@@ -156,8 +156,8 @@ public class PlazaRoomManager : Regist
             return;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadSucceed));
-        DelayCall.Call(0.5f, () => { ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); });
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadSucceed));
+        DelayCall.Call(0.5f, () => { ResourceManager.Get(CanvasLabel.Z_Tip).TweenBacCG(); });
 
         if (sfsArray.Count == 0)
         {
@@ -192,8 +192,8 @@ public class PlazaRoomManager : Regist
             return;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadSucceed));
-        DelayCall.Call(0.5f, () => { ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); });
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadSucceed));
+        DelayCall.Call(0.5f, () => { ResourceManager.Get(CanvasLabel.Z_Tip).TweenBacCG(); });
 
         if (sfsArray.Count == 0)
         {
@@ -348,18 +348,18 @@ public class PlazaRoomManager : Regist
             DownloadCustomRoomData();
         }
         OnSliderValueChange(0);
-        ResourceManager.Get(ObjectLabel.Z_BK).TweenForCG();
+        ResourceManager.Get(CanvasLabel.Z_BK).TweenForCG();
     }
 
     public static void CloseJoinRoomPanel()
     {
-        ResourceManager.Get(ObjectLabel.Z_BK).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Z_BK).TweenBacCG();
     }
 
     public static void EnableCreateByMeFilter()
     {
         FilterFlag = true;
-        ResourceManager.SetActive(ObjectLabel.Z_InfoImg51, true);
+        ResourceManager.SetActive(CanvasLabel.Z_InfoImg51, true);
         ClearScrollRect();
         NextRoomPage(ScrollRectPageVolume, ref CustomFirstDisplayIndex, ref CustomLastDisplayIndex, CustomRoomDatas);
     }
@@ -367,7 +367,7 @@ public class PlazaRoomManager : Regist
     public static void DisableCreateByMeFilter()
     {
         FilterFlag = false;
-        ResourceManager.SetActive(ObjectLabel.Z_InfoImg51, false);
+        ResourceManager.SetActive(CanvasLabel.Z_InfoImg51, false);
         ClearScrollRect();
         NextRoomPage(ScrollRectPageVolume, ref NormalFirstDisplayIndex, ref NormalLastDisplayIndex, NormalRoomDatas);
     }
@@ -386,7 +386,7 @@ public class PlazaRoomManager : Regist
 
         NormalPlazaRoomItems = new List<PlazaRoomItem>();
 
-        ResourceManager.Get(ObjectLabel.Z_Tip).GetTweenCG().InOrigin = true;
+        ResourceManager.Get(CanvasLabel.Z_Tip).GetTweenCG().InOrigin = true;
 
         DownloadDataFlag = false;
     }
@@ -404,7 +404,7 @@ public class PlazaRoomManager : Regist
     private static Slider CreateRoom_MaxPlayerSlider;
     public static void CreateRoom()
     {
-        string roomName = ResourceManager.Get<InputField>(ObjectLabel.AA_InputField).text;
+        string roomName = ResourceManager.Get<InputField>(CanvasLabel.AA_InputField).text;
 
         if (string.IsNullOrEmpty(roomName))
         {
@@ -424,9 +424,9 @@ public class PlazaRoomManager : Regist
             return;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.AA_Tip), new MulLanStr(LanguageLabel.UI__AA_SendRequest));
-        ResourceManager.Get(ObjectLabel.AA_Tip).TweenForCG();
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.AA_CreatePlazaRoom).interactable = false;
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.AA_Tip), new MulLanStr(LanguageLabel.UI__AA_SendRequest));
+        ResourceManager.Get(CanvasLabel.AA_Tip).TweenForCG();
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.AA_CreatePlazaRoom).interactable = false;
 
         int value = (int) Auxiliary.FmlParse(DefaultRoomValueFml, "c", CreateRoom_Cost.ToString(), "p", CreateRoom_MaxPlayer.ToString(), "h", CreateRoom_Duration.ToString());
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CreateRoom(roomName, long.Parse(HttpManager.SerialNumber), CreateRoom_Duration, CreateRoom_MaxPlayer, value);
@@ -434,9 +434,9 @@ public class PlazaRoomManager : Regist
 
     public static void OnCreateRoomError()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.AA_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateError));
-        ResourceManager.Get(ObjectLabel.AA_Tip).TweenBacCG();
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.AA_CreatePlazaRoom).interactable = true;
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.AA_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateError));
+        ResourceManager.Get(CanvasLabel.AA_Tip).TweenBacCG();
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.AA_CreatePlazaRoom).interactable = true;
 
         Debug.Log("create error");
     }
@@ -464,9 +464,9 @@ public class PlazaRoomManager : Regist
 
         Manager.CreateRoomAmt++;
 
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.AA_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateSucceed));
-        ResourceManager.Get(ObjectLabel.AA_Tip).TweenBacCG();
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.AA_CreatePlazaRoom).interactable = true;
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.AA_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateSucceed));
+        ResourceManager.Get(CanvasLabel.AA_Tip).TweenBacCG();
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.AA_CreatePlazaRoom).interactable = true;
         DownloadNormalRoomData();
 
         Manager.AddDiamond(-CreateRoom_Cost, StaticsManager.ItemID.创建派对, StaticsManager.ConsumeModule.Charge);
@@ -483,32 +483,32 @@ public class PlazaRoomManager : Regist
         CreateRoom_MaxPlayerText.text = CreateRoom_MaxPlayer + Language.GetStr(LanguageLabel.UI__AAb_Value);
 
         CreateRoom_Cost = (int) Auxiliary.FmlParse(CreateRoom_CostFml, "h", CreateRoom_Duration.ToString(), "p", CreateRoom_MaxPlayer.ToString());
-        ResourceManager.SetText(ObjectLabel.AA_Desc, Language.GetStr(LanguageLabel.UI__AA_Cost) + TransferLabel.DiamondSprite + CreateRoom_Cost);
+        ResourceManager.SetText(CanvasLabel.AA_Desc, Language.GetStr(LanguageLabel.UI__AA_Cost) + TransferLabel.DiamondSprite + CreateRoom_Cost);
         
         if (CreateRoom_Cost > Manager.Diamond)
         {
-            ResourceManager.SetText(ObjectLabel.AA_BtnLab, Language.GetStr(LanguageLabel.UI__AA_NoEnoughDiamond));
-            ResourceManager.Get<Button>(ObjectLabel.AA_Btn).image.material = Lib.GrayMat;
-            ResourceManager.Get<Button>(ObjectLabel.AA_Btn).interactable = false;
+            ResourceManager.SetText(CanvasLabel.AA_BtnLab, Language.GetStr(LanguageLabel.UI__AA_NoEnoughDiamond));
+            ResourceManager.Get<Button>(CanvasLabel.AA_Btn).image.material = Lib.GrayMat;
+            ResourceManager.Get<Button>(CanvasLabel.AA_Btn).interactable = false;
         }
         else
         {
-            ResourceManager.SetText(ObjectLabel.AA_BtnLab, Language.GetStr(LanguageLabel.UI__AA_Create));
-            ResourceManager.Get<Button>(ObjectLabel.AA_Btn).image.material = null;
-            ResourceManager.Get<Button>(ObjectLabel.AA_Btn).interactable = true;
+            ResourceManager.SetText(CanvasLabel.AA_BtnLab, Language.GetStr(LanguageLabel.UI__AA_Create));
+            ResourceManager.Get<Button>(CanvasLabel.AA_Btn).image.material = null;
+            ResourceManager.Get<Button>(CanvasLabel.AA_Btn).interactable = true;
         }
     }
 
     public static void OpenCreateRoomPanel()
     {
-        ResourceManager.Get(ObjectLabel.AA_CreatePlazaRoom).TweenForCG();
+        ResourceManager.Get(CanvasLabel.AA_CreatePlazaRoom).TweenForCG();
 
         string defaultName = Language.GetStr(LanguageLabel.UI__AA_DefaultName).Replace(TransferLabel.Value, NickNameManager.NickName);
-        ResourceManager.Get<InputField>(ObjectLabel.AA_InputField).text = defaultName;
+        ResourceManager.Get<InputField>(CanvasLabel.AA_InputField).text = defaultName;
     }
 
     public static void CloseCreateRoomPanel()
     {
-        ResourceManager.Get(ObjectLabel.AA_CreatePlazaRoom).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.AA_CreatePlazaRoom).TweenBacCG();
     }
 }

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

@@ -415,15 +415,15 @@ public class RechargeGiftManager
             GiftDictionary.Add(packID, rechargeGift);
         }
 
-        Title = ResourceManager.Get<Text>(ObjectLabel.AB_Title);
-        Description = ResourceManager.Get<Text>(ObjectLabel.AB_Description);
-        ConfirmButtonText = ResourceManager.Get<Text>(ObjectLabel.AB_ConfirmText);
-        AwardImage0 = ResourceManager.Get<Image>(ObjectLabel.AB_AwardImage0);
-        AwardImage1 = ResourceManager.Get<Image>(ObjectLabel.AB_AwardImage1);
-        AwardImage2 = ResourceManager.Get<Image>(ObjectLabel.AB_AwardImage2);
-        FlowerAwardImage = ResourceManager.Get<Image>(ObjectLabel.AB_FlowerAwardImage);
-        ConfirmButton = ResourceManager.Get<Button>(ObjectLabel.AB_Confirm);
-        PanelBK = ResourceManager.Get(ObjectLabel.AB_PanelBK);
+        Title = ResourceManager.Get<Text>(CanvasLabel.AB_Title);
+        Description = ResourceManager.Get<Text>(CanvasLabel.AB_Description);
+        ConfirmButtonText = ResourceManager.Get<Text>(CanvasLabel.AB_ConfirmText);
+        AwardImage0 = ResourceManager.Get<Image>(CanvasLabel.AB_AwardImage0);
+        AwardImage1 = ResourceManager.Get<Image>(CanvasLabel.AB_AwardImage1);
+        AwardImage2 = ResourceManager.Get<Image>(CanvasLabel.AB_AwardImage2);
+        FlowerAwardImage = ResourceManager.Get<Image>(CanvasLabel.AB_FlowerAwardImage);
+        ConfirmButton = ResourceManager.Get<Button>(CanvasLabel.AB_Confirm);
+        PanelBK = ResourceManager.Get(CanvasLabel.AB_PanelBK);
         AwardImages.Add(AwardImage0);
         AwardImages.Add(AwardImage1);
         AwardImages.Add(AwardImage2);

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

@@ -307,7 +307,7 @@ public class ResourceManager : Regist
     {
         Text text = Get<Text>(goName);
 
-        text.text = Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.UI, goName));
+        text.text = Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.UI, goName));
 
         return text;
     }
@@ -761,7 +761,7 @@ public class ResourceManager : Regist
 
     public static Ranktem GetRanktem(string rank, string praise, string serialNumber)
     {
-        Transform tra = Get(ResourceLabel.RankItem, Folder.UI, false, Get(ObjectLabel.S_Grid), false, ObjType.RankItem, typeof(Ranktem));
+        Transform tra = Get(ResourceLabel.RankItem, Folder.UI, false, Get(CanvasLabel.S_Grid), false, ObjType.RankItem, typeof(Ranktem));
 
         Ranktem ranktem = tra.GetComponent<Ranktem>();
 
@@ -775,7 +775,7 @@ public class ResourceManager : Regist
 
     public static CommentItem GetCommentItem(string nickname, string serialNumber, string content)
     {
-        Transform tra = Get(ResourceLabel.CommentItem, Folder.UI, false, Get(ObjectLabel.Q_Grid), false, ObjType.CommentItem, typeof(CommentItem));
+        Transform tra = Get(ResourceLabel.CommentItem, Folder.UI, false, Get(CanvasLabel.Q_Grid), false, ObjType.CommentItem, typeof(CommentItem));
 
         CommentItem commentItem = tra.GetComponent<CommentItem>();
 
@@ -843,19 +843,19 @@ public class ResourceManager : Regist
 
         if (skillRoot.SkillTab == SkillTab.Elf)
         {
-            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get(ObjectLabel.Fd_Grid), false, ObjType.SkillItem);
+            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get(CanvasLabel.Fd_Grid), false, ObjType.SkillItem);
         }
         else if (skillRoot.SkillTab == SkillTab.Store)
         {
-            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get(ObjectLabel.Fc_Grid), false, ObjType.SkillItem);
+            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get(CanvasLabel.Fc_Grid), false, ObjType.SkillItem);
         }
         else if (skillRoot.SkillTab == SkillTab.Magic)
         {
-            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get(ObjectLabel.Fb_Grid), false, ObjType.SkillItem);
+            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get(CanvasLabel.Fb_Grid), false, ObjType.SkillItem);
         }
         else if (skillRoot.SkillTab == SkillTab.Garden)
         {
-            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get(ObjectLabel.Fa_Grid), false, ObjType.SkillItem);
+            tra = Get(ResourceLabel.SkillItem, Folder.UI, false, Get(CanvasLabel.Fa_Grid), false, ObjType.SkillItem);
         }
         else
         {
@@ -870,7 +870,7 @@ public class ResourceManager : Regist
 
     public static Transform GetAchieveItem()
     {
-        Transform tra = Get(ResourceLabel.AchieveItem, Folder.UI, false, Get(ObjectLabel.M_Grid), false, ObjType.AchieveItem);
+        Transform tra = Get(ResourceLabel.AchieveItem, Folder.UI, false, Get(CanvasLabel.M_Grid), false, ObjType.AchieveItem);
 
         return tra;
     }
@@ -890,7 +890,7 @@ public class ResourceManager : Regist
 
     public static ParticleSystem GetLightwall()
     {
-        Transform tra = Get(ResourceLabel.LightwallUI, Folder.Effect, false, Get(ObjectLabel.Canvas), false, ObjType.LightwallUI, typeof(Effect));
+        Transform tra = Get(ResourceLabel.LightwallUI, Folder.Effect, false, Get(CanvasLabel.Canvas), false, ObjType.LightwallUI, typeof(Effect));
 
         ParticleSystem particle = tra.GetComponent<ParticleSystem>();
 

+ 64 - 64
Assets/Script/Manage/SignManager.cs

@@ -114,9 +114,9 @@ public class SignItem
         ResetSignRound();
 
 
-        ResourceManager.SetActive(ObjectLabel.Bb_Get, false);
-        ResourceManager.SetActive(ObjectLabel.Bb_Rotate, true);
-        ResourceManager.SetActive(ObjectLabel.Bb_Confirm, true);
+        ResourceManager.SetActive(CanvasLabel.Bb_Get, false);
+        ResourceManager.SetActive(CanvasLabel.Bb_Rotate, true);
+        ResourceManager.SetActive(CanvasLabel.Bb_Confirm, true);
 
         if (AwardFlowerIDs.Valid())
         {
@@ -126,13 +126,13 @@ public class SignItem
 
                 if (flowerInfo.Unlock == false)
                 {
-                    ResourceManager.SetText(ObjectLabel.Bb_InfoLabA, flowerInfo.Name);
+                    ResourceManager.SetText(CanvasLabel.Bb_InfoLabA, flowerInfo.Name);
 
-                    ResourceManager.SetActive(ObjectLabel.Bb_IconA, true);
+                    ResourceManager.SetActive(CanvasLabel.Bb_IconA, true);
 
-                    ResourceManager.SetSprite(ObjectLabel.Bb_IconA0, flowerInfo.Icon);
+                    ResourceManager.SetSprite(CanvasLabel.Bb_IconA0, flowerInfo.Icon);
                     
-                    ResourceManager.Get<Image>(ObjectLabel.Bb_IconA0).Resize(true, 0.8125f, 0.8125f);
+                    ResourceManager.Get<Image>(CanvasLabel.Bb_IconA0).Resize(true, 0.8125f, 0.8125f);
 
                     flowerInfo.Add();
 
@@ -143,21 +143,21 @@ public class SignItem
 
         if (Diamond > 0)
         {
-            ResourceManager.SetText(ObjectLabel.Bb_InfoLabB, Diamond.ToString());
+            ResourceManager.SetText(CanvasLabel.Bb_InfoLabB, Diamond.ToString());
 
-            ResourceManager.SetSprite(ObjectLabel.Bb_IconB, Lib.DiamondSprite);
+            ResourceManager.SetSprite(CanvasLabel.Bb_IconB, Lib.DiamondSprite);
 
-            ResourceManager.SetActive(ObjectLabel.Bb_IconB, true);
+            ResourceManager.SetActive(CanvasLabel.Bb_IconB, true);
 
             Manager.AddDiamond(Diamond, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Checkin);
         }
         else if (Coin > 0)
         {
-            ResourceManager.SetText(ObjectLabel.Bb_InfoLabB, Coin.ToString());
+            ResourceManager.SetText(CanvasLabel.Bb_InfoLabB, Coin.ToString());
 
-            ResourceManager.SetSprite(ObjectLabel.Bb_IconB, Lib.GoldSprite);
+            ResourceManager.SetSprite(CanvasLabel.Bb_IconB, Lib.GoldSprite);
 
-            ResourceManager.SetActive(ObjectLabel.Bb_IconB, true);
+            ResourceManager.SetActive(CanvasLabel.Bb_IconB, true);
 
             Manager.AddCoin(Coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Checkin);
         }
@@ -221,7 +221,7 @@ public class SignItem
             SignManager.SignIndex = 1;
             SignManager.SignRound++;
 
-            ResourceManager.Get(ObjectLabel.B_SignIn).GetTweenCG().AddEventOnetime
+            ResourceManager.Get(CanvasLabel.B_SignIn).GetTweenCG().AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
@@ -277,9 +277,9 @@ public class Lottery
 
     public static void Init(List<XmlAttributeCollection> attributeList)
     {
-        PosList.Add(ResourceManager.Get(ObjectLabel.Bc_LotteryItem1).position);
-        PosList.Add(ResourceManager.Get(ObjectLabel.Bc_LotteryItem2).position);
-        PosList.Add(ResourceManager.Get(ObjectLabel.Bc_LotteryItem3).position);
+        PosList.Add(ResourceManager.Get(CanvasLabel.Bc_LotteryItem1).position);
+        PosList.Add(ResourceManager.Get(CanvasLabel.Bc_LotteryItem2).position);
+        PosList.Add(ResourceManager.Get(CanvasLabel.Bc_LotteryItem3).position);
 
         for (int i = 0; i < attributeList.Count; i++)
         {
@@ -477,8 +477,8 @@ public class Lottery
     {
         ResetSignRound = resetSign;
 
-        ResourceManager.Get(ObjectLabel.Bc_Lottery).TweenForCG();
-        ResourceManager.Get(ObjectLabel.Ba_Notice0).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Bc_Lottery).TweenForCG();
+        ResourceManager.Get(CanvasLabel.Ba_Notice0).TweenBacCG();
 
         float random = Random.Range(0f, 1f);
 
@@ -493,9 +493,9 @@ public class Lottery
             }
         }
 
-        TempLotteryList.Add(CreateLottery(TempTypeList[0], 0, ResourceManager.Get(ObjectLabel.Bc_LotteryItem1)));
-        TempLotteryList.Add(CreateLottery(TempTypeList[1], 1, ResourceManager.Get(ObjectLabel.Bc_LotteryItem2)));
-        TempLotteryList.Add(CreateLottery(TempTypeList[2], 2, ResourceManager.Get(ObjectLabel.Bc_LotteryItem3)));
+        TempLotteryList.Add(CreateLottery(TempTypeList[0], 0, ResourceManager.Get(CanvasLabel.Bc_LotteryItem1)));
+        TempLotteryList.Add(CreateLottery(TempTypeList[1], 1, ResourceManager.Get(CanvasLabel.Bc_LotteryItem2)));
+        TempLotteryList.Add(CreateLottery(TempTypeList[2], 2, ResourceManager.Get(CanvasLabel.Bc_LotteryItem3)));
 
         List<Vector3> posList = PosList.Disturb();
 
@@ -503,9 +503,9 @@ public class Lottery
         TempLotteryList[1].Item.position = posList[1];
         TempLotteryList[2].Item.position = posList[2];
 
-        Button button1 = ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack1);
-        Button button2 = ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack2);
-        Button button3 = ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack3);
+        Button button1 = ResourceManager.Get<Button>(CanvasLabel.Bc_LotteryBack1);
+        Button button2 = ResourceManager.Get<Button>(CanvasLabel.Bc_LotteryBack2);
+        Button button3 = ResourceManager.Get<Button>(CanvasLabel.Bc_LotteryBack3);
 
         button1.interactable = false;
         button2.interactable = false;
@@ -515,9 +515,9 @@ public class Lottery
         (
             () =>
             {
-                ResourceManager.Get(ObjectLabel.Bc_LotteryItem1).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
-                ResourceManager.Get(ObjectLabel.Bc_LotteryItem2).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
-                ResourceManager.Get(ObjectLabel.Bc_LotteryItem3).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
+                ResourceManager.Get(CanvasLabel.Bc_LotteryItem1).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
+                ResourceManager.Get(CanvasLabel.Bc_LotteryItem2).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
+                ResourceManager.Get(CanvasLabel.Bc_LotteryItem3).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
             },
             1f
         );
@@ -526,9 +526,9 @@ public class Lottery
         (
             () =>
             {
-                ResourceManager.Get(ObjectLabel.Bc_LotteryItem1).TweenForEuler();
-                ResourceManager.Get(ObjectLabel.Bc_LotteryItem2).TweenForEuler();
-                ResourceManager.Get(ObjectLabel.Bc_LotteryItem3).TweenForEuler();
+                ResourceManager.Get(CanvasLabel.Bc_LotteryItem1).TweenForEuler();
+                ResourceManager.Get(CanvasLabel.Bc_LotteryItem2).TweenForEuler();
+                ResourceManager.Get(CanvasLabel.Bc_LotteryItem3).TweenForEuler();
             },
             1.5f
         );
@@ -541,9 +541,9 @@ public class Lottery
                 button2.interactable = true;
                 button3.interactable = true;
 
-                ResourceManager.Get(ObjectLabel.Bc_LotteryItem1).Move2D(PosList[0], 0.25f, false, Curve.EaseOutQuad);
-                ResourceManager.Get(ObjectLabel.Bc_LotteryItem2).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
-                ResourceManager.Get(ObjectLabel.Bc_LotteryItem3).Move2D(PosList[2], 0.25f, false, Curve.EaseOutQuad);
+                ResourceManager.Get(CanvasLabel.Bc_LotteryItem1).Move2D(PosList[0], 0.25f, false, Curve.EaseOutQuad);
+                ResourceManager.Get(CanvasLabel.Bc_LotteryItem2).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
+                ResourceManager.Get(CanvasLabel.Bc_LotteryItem3).Move2D(PosList[2], 0.25f, false, Curve.EaseOutQuad);
             },
             2f
         );
@@ -552,9 +552,9 @@ public class Lottery
         (
             () =>
             {
-                ResourceManager.Get(ObjectLabel.Bc_Lab).TweenForCG();
+                ResourceManager.Get(CanvasLabel.Bc_Lab).TweenForCG();
 
-                ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab));
+                ResourceManager.SetText(CanvasLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab));
             },
             2.5f
         );
@@ -566,15 +566,15 @@ public class Lottery
         TempValueList = new List<int>();
         TempLotteryList = new List<Lottery>();
 
-        ResourceManager.Get(ObjectLabel.Bc_Lab).TweenBacCG();
-        ResourceManager.Get(ObjectLabel.Bc_Confirm).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Bc_Lab).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Bc_Confirm).TweenBacCG();
 
-        ResourceManager.Get(ObjectLabel.Ba_Notice0).TweenForCG();
+        ResourceManager.Get(CanvasLabel.Ba_Notice0).TweenForCG();
 
-        ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
-        ResourceManager.Get(ObjectLabel.Ba_Notice).TweenBacCG();
-        ResourceManager.Get(ObjectLabel.Bb_SignIn).TweenBacCG();
-        ResourceManager.Get(ObjectLabel.Bc_Lottery).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.B_SignIn).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Ba_Notice).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Bb_SignIn).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Bc_Lottery).TweenBacCG();
 
         AudioManager.PlayClip(AudioLabel.ClickButton);
     }
@@ -583,9 +583,9 @@ public class Lottery
     {
         AudioManager.PlayClip(AudioLabel.GetCurrent);
 
-        ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack1).interactable = false;
-        ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack2).interactable = false;
-        ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack3).interactable = false;
+        ResourceManager.Get<Button>(CanvasLabel.Bc_LotteryBack1).interactable = false;
+        ResourceManager.Get<Button>(CanvasLabel.Bc_LotteryBack2).interactable = false;
+        ResourceManager.Get<Button>(CanvasLabel.Bc_LotteryBack3).interactable = false;
 
         TempLotteryList[0].Item.TweenBacEuler();
 
@@ -605,11 +605,11 @@ public class Lottery
             (
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.Bc_Confirm).TweenForCG();
+                    ResourceManager.Get(CanvasLabel.Bc_Confirm).TweenForCG();
 
-                    ResourceManager.Get(ObjectLabel.Bc_LotteryItem1).TweenBacEuler();
-                    ResourceManager.Get(ObjectLabel.Bc_LotteryItem2).TweenBacEuler();
-                    ResourceManager.Get(ObjectLabel.Bc_LotteryItem3).TweenBacEuler();
+                    ResourceManager.Get(CanvasLabel.Bc_LotteryItem1).TweenBacEuler();
+                    ResourceManager.Get(CanvasLabel.Bc_LotteryItem2).TweenBacEuler();
+                    ResourceManager.Get(CanvasLabel.Bc_LotteryItem3).TweenBacEuler();
                 },
                 1f
             );
@@ -629,19 +629,19 @@ public class Lottery
         {
             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);
+            ResourceManager.SetText(CanvasLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + Language.GetStr(LanguageLabel.Common__Coin) + " " + Value);
         }
         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);
+            ResourceManager.SetText(CanvasLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + Language.GetStr(LanguageLabel.Common__Diamond) + " " + Value);
         }
         else if (Type == LotteryType.Flower.GetHashCode())
         {
             GardenManager.FlowerInfoDictionary[Value].Add();
 
-            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + GardenManager.FlowerInfoDictionary[Value].Name);
+            ResourceManager.SetText(CanvasLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + GardenManager.FlowerInfoDictionary[Value].Name);
         }
         else if (Type == LotteryType.Close.GetHashCode())
         {
@@ -649,7 +649,7 @@ public class Lottery
 
             PlayerManager.BoughtCloseIDs.UniqueAdd(Value);
 
-            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + PlayerManager.CloseItemDictionary[Value].Name);
+            ResourceManager.SetText(CanvasLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + PlayerManager.CloseItemDictionary[Value].Name);
         }
     }
 }
@@ -705,10 +705,10 @@ public class SignManager : Regist
     {
         if (Manager.OfflineFlag)
         {
-            ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.C_Group).TweenBacCG();
 
-            ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
-            ResourceManager.Get(ObjectLabel.Ba_Notice).TweenForCG();
+            ResourceManager.Get(CanvasLabel.B_SignIn).TweenForCG();
+            ResourceManager.Get(CanvasLabel.Ba_Notice).TweenForCG();
 
             return true;
         }
@@ -724,10 +724,10 @@ public class SignManager : Regist
         {
                 HttpManager.GetAllMailReward();
 
-                ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.C_Group).TweenBacCG();
 
-                ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
-                ResourceManager.Get(ObjectLabel.Bd_Mail0).TweenForCG();
+                ResourceManager.Get(CanvasLabel.B_SignIn).TweenForCG();
+                ResourceManager.Get(CanvasLabel.Bd_Mail0).TweenForCG();
 
                 return true;
         }
@@ -745,8 +745,8 @@ public class SignManager : Regist
 
             if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
             {
-                ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
-                ResourceManager.Get(ObjectLabel.Bb_SignIn).TweenForCG();
+                ResourceManager.Get(CanvasLabel.B_SignIn).TweenForCG();
+                ResourceManager.Get(CanvasLabel.Bb_SignIn).TweenForCG();
 
                 return true;
             }
@@ -760,7 +760,7 @@ public class SignManager : Regist
         //ConfigManager.SaveIntToConfig(PlayerConfigLabel.NotificationIndex, -1);
         if (HttpManager.AnnounceIndex > ConfigManager.GetIntFormConfig(PlayerConfigLabel.NotificationIndex) && HttpManager.IsAnnounceReady)
         {
-            ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.B_SignIn).TweenBacCG();
 
             ConfigManager.SaveIntToConfig(PlayerConfigLabel.NotificationIndex, HttpManager.AnnounceIndex);
 
@@ -790,7 +790,7 @@ public class SignManager : Regist
         SignIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.SignIndex);
         SignRound = ConfigManager.GetIntFormConfig(PlayerConfigLabel.SignRound);
 
-        Transform par = ResourceManager.Get(ObjectLabel.Bb_Grid);
+        Transform par = ResourceManager.Get(CanvasLabel.Bb_Grid);
 
         List<XmlAttributeCollection> attributeList = ConfigManager.GetSignConfig();
 

+ 26 - 26
Assets/Script/Manage/SocialManager.cs

@@ -89,11 +89,11 @@ public class SocialManager : Regist
 
     public override void FirstInit()
     {
-        PraiseText = ResourceManager.Get<Text>(ObjectLabel.C_PraiseText);
-        PraiseButton = ResourceManager.Get<Button>(ObjectLabel.C_Praise);
-        CommentInputField = ResourceManager.Get<InputField>(ObjectLabel.Q_InputField);
-        CommentScrollRect = ResourceManager.Get<ScrollRectPlus>(ObjectLabel.Q_ScrollRect);
-        CommentFriendFilterToggle = ResourceManager.Get<Toggle>(ObjectLabel.Q_FriendFilterButton);
+        PraiseText = ResourceManager.Get<Text>(CanvasLabel.C_PraiseText);
+        PraiseButton = ResourceManager.Get<Button>(CanvasLabel.C_Praise);
+        CommentInputField = ResourceManager.Get<InputField>(CanvasLabel.Q_InputField);
+        CommentScrollRect = ResourceManager.Get<ScrollRectPlus>(CanvasLabel.Q_ScrollRect);
+        CommentFriendFilterToggle = ResourceManager.Get<Toggle>(CanvasLabel.Q_FriendFilterButton);
 
         CommentFriendFilterToggle.onValueChanged.AddListener(OnCommentFriendFilterToggleClick);
 
@@ -183,25 +183,25 @@ public class SocialManager : Regist
         }
 
         IsPanelOpen = true;
-        ResourceManager.Get(ObjectLabel.Q_CommentBK).TweenForCG();
+        ResourceManager.Get(CanvasLabel.Q_CommentBK).TweenForCG();
 
         if (VisitManager.InVisit)
         {
-            ResourceManager.SetActive(ObjectLabel.Q_InputBK, true);
-            RectTransform rectTransform = ResourceManager.Get<RectTransform>(ObjectLabel.Q_ScrollRect);
+            ResourceManager.SetActive(CanvasLabel.Q_InputBK, true);
+            RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.Q_ScrollRect);
             rectTransform.sizeDelta = new Vector2(rectTransform.rect.size.x, 206.1f);
         }
         else
         {
-            ResourceManager.SetActive(ObjectLabel.Q_InputBK, false);
-            RectTransform rectTransform = ResourceManager.Get<RectTransform>(ObjectLabel.Q_ScrollRect);
+            ResourceManager.SetActive(CanvasLabel.Q_InputBK, false);
+            RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.Q_ScrollRect);
             rectTransform.sizeDelta = new Vector2(rectTransform.rect.size.x, 278.3f);
         }
     }
 
     public static void CloseCommentPanel()
     {
-        ResourceManager.Get(ObjectLabel.Q_CommentBK).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Q_CommentBK).TweenBacCG();
         IsPanelOpen = false;
     }
 
@@ -313,8 +313,8 @@ public class SocialManager : Regist
 
         ClearCommentPanel();
 
-        ResourceManager.Get(ObjectLabel.Q_Tip).TweenForCG();
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__Loading));
+        ResourceManager.Get(CanvasLabel.Q_Tip).TweenForCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__Loading));
 
         if (isPlayer)
         {
@@ -334,14 +334,14 @@ public class SocialManager : Regist
                 {
                     if (!VisitManager.InVisit)
                     {
-                        DelayCall.Call(0.5f, () => ResourceManager.Get(ObjectLabel.Q_Tip).TweenBacCG());
-                        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__LoadSucceed));
+                        DelayCall.Call(0.5f, () => ResourceManager.Get(CanvasLabel.Q_Tip).TweenBacCG());
+                        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__LoadSucceed));
 
                         ReceiveCommentDatas(true, data);
                         NextCommentPage(true, true);
 
-                        ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = false;
-                        DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = true);
+                        ResourceManager.Get<CanvasGroup>(CanvasLabel.Q_CommentBK).interactable = false;
+                        DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(CanvasLabel.Q_CommentBK).interactable = true);
                     }
                 }
             );
@@ -364,14 +364,14 @@ public class SocialManager : Regist
                 {
                     if (VisitManager.InVisit)
                     {
-                        DelayCall.Call(0.5f, () => ResourceManager.Get(ObjectLabel.Q_Tip).TweenBacCG());
-                        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__LoadSucceed));
+                        DelayCall.Call(0.5f, () => ResourceManager.Get(CanvasLabel.Q_Tip).TweenBacCG());
+                        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__LoadSucceed));
 
                         ReceiveCommentDatas(false, data);
                         NextCommentPage(false, true);
 
-                        ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = false;
-                        DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = true);
+                        ResourceManager.Get<CanvasGroup>(CanvasLabel.Q_CommentBK).interactable = false;
+                        DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(CanvasLabel.Q_CommentBK).interactable = true);
                     }
                 }
             );
@@ -618,14 +618,14 @@ public class SocialManager : Regist
     {
         AudioManager.PlayClip(AudioLabel.Bubble);
 
-        ResourceManager.Get(ObjectLabel.S_RankBK).TweenForCG();
+        ResourceManager.Get(CanvasLabel.S_RankBK).TweenForCG();
     }
 
     public static void CloseRankPanel()
     {
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
-        ResourceManager.Get(ObjectLabel.S_RankBK).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.S_RankBK).TweenBacCG();
     }
 
     public static void RecordRankPanel()
@@ -701,14 +701,14 @@ public class SocialManager : Regist
 
     public static void OnEnterVisiteeGarden()
     {
-        ResourceManager.SetActive(ObjectLabel.C_NotifyParent, false);
+        ResourceManager.SetActive(CanvasLabel.C_NotifyParent, false);
     }
 
     public static void OnExitVisiteeGarden()
     {
-        if (ResourceManager.Get(ObjectLabel.C_Notify).gameObject.activeSelf)
+        if (ResourceManager.Get(CanvasLabel.C_Notify).gameObject.activeSelf)
         {
-            ResourceManager.SetActive(ObjectLabel.C_NotifyParent, true);
+            ResourceManager.SetActive(CanvasLabel.C_NotifyParent, true);
         }
     }
 }

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

@@ -107,10 +107,10 @@ public class TutorialManager : Regist
 
     public override void ThirdInit()
     {
-        ResourceManager.Get<Image>(ObjectLabel.N_Mask).material = Lib.UIMaskMat;
+        ResourceManager.Get<Image>(CanvasLabel.N_Mask).material = Lib.UIMaskMat;
 
-        Tutorial.Arrow = ResourceManager.Get(ObjectLabel.N_Arrow);
-        Tutorial.Material = ResourceManager.Get<Image>(ObjectLabel.N_Mask).material;
+        Tutorial.Arrow = ResourceManager.Get(CanvasLabel.N_Arrow);
+        Tutorial.Material = ResourceManager.Get<Image>(CanvasLabel.N_Mask).material;
 
         if (NewplayerTutorial)
         {
@@ -127,7 +127,7 @@ public class TutorialManager : Regist
 
             if (NewplayerTutorialIndex == 1)
             {
-                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.C_MiniGame).TweenBacCG();
 
                 ChoseCharacter();
             }
@@ -141,9 +141,9 @@ public class TutorialManager : Regist
             }
             else if (NewplayerTutorialIndex == 4)
             {
-                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.C_MiniGame).TweenBacCG();
 
-                ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
+                ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
                 ResourceManager.SetActive(TutorialLabel.Tutorial, true);
                 ResourceManager.SetActive(TutorialLabel.TutorialMask, true);
@@ -158,7 +158,7 @@ public class TutorialManager : Regist
             }
             else if (NewplayerTutorialIndex == 6)
             {
-                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.C_MiniGame).TweenBacCG();
 
                 Garden.Instance.TutorialToRegular();
                 UIManager.Instance.TutorialToRegular();
@@ -206,7 +206,7 @@ public class TutorialManager : Regist
 
         Tutorial.HightDisable();
 
-        ResourceManager.SetActive(ObjectLabel.D_Quit, true);
+        ResourceManager.SetActive(CanvasLabel.D_Quit, true);
 
         ClickSlot();
     }
@@ -270,13 +270,13 @@ public class TutorialManager : Regist
         AchieveManager.UpdateHint();
 
         Tutorial.HightDisable();
-        ResourceManager.Get(ObjectLabel.F_TipBK).TweenBacCG();
-        ResourceManager.SetActive(ObjectLabel.F_TipBtn, false);
+        ResourceManager.Get(CanvasLabel.F_TipBK).TweenBacCG();
+        ResourceManager.SetActive(CanvasLabel.F_TipBtn, false);
 
         ResourceManager.SetActive(TutorialLabel.Tutorial, false);
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
 
-        ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForCG();
+        ResourceManager.Get(CanvasLabel.C_MiniGame).TweenForCG();
 
         PlayerManager.Player.SetAllCollider(true);
 
@@ -302,28 +302,28 @@ public class TutorialManager : Regist
         ResourceManager.SetActive(TutorialLabel.TutorialMask, true);
         ResourceManager.SetActive(TutorialLabel.TutorialCollider, true);
 
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
-        ResourceManager.SetActive(ObjectLabel.N_Confirm, true);
-        ResourceManager.SetActive(ObjectLabel.N_FormerPlayerButton, true);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.N_Confirm, true);
+        ResourceManager.SetActive(CanvasLabel.N_FormerPlayerButton, true);
 
         ResourceManager.AddButtonEvent
         (
-            ObjectLabel.N_FormerPlayerButton,
+            CanvasLabel.N_FormerPlayerButton,
             () =>
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
-                ResourceManager.Get(ObjectLabel.La_Info).TweenForCG();
+                ResourceManager.Get(CanvasLabel.La_Info).TweenForCG();
 
-                ResourceManager.Get(ObjectLabel.N_Confirm).TweenBacCG();
-                ResourceManager.Get(ObjectLabel.N_FormerPlayerButton).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.N_Confirm).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.N_FormerPlayerButton).TweenBacCG();
 
                 ResourceManager.AddButtonEventOnetime
                 (
-                    ObjectLabel.La_Cancel,
+                    CanvasLabel.La_Cancel,
                     () =>
                     {
-                        ResourceManager.Get(ObjectLabel.N_Confirm).TweenForCG();
-                        ResourceManager.Get(ObjectLabel.N_FormerPlayerButton).TweenForCG();
+                        ResourceManager.Get(CanvasLabel.N_Confirm).TweenForCG();
+                        ResourceManager.Get(CanvasLabel.N_FormerPlayerButton).TweenForCG();
                     }
                 );
             }
@@ -331,7 +331,7 @@ public class TutorialManager : Regist
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.N_Confirm,
+            CanvasLabel.N_Confirm,
             () =>
             {
                 if (PlayerManager.SelectedPlayer == PlayerManager.DefaultPinkPlayer)
@@ -435,8 +435,8 @@ public class TutorialManager : Regist
                 tra.TweenForScale();
 
 
-                ResourceManager.Get(ObjectLabel.N_Confirm).TweenBacCG();
-                ResourceManager.Get(ObjectLabel.N_FormerPlayerButton).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.N_Confirm).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.N_FormerPlayerButton).TweenBacCG();
 
                 TweenRoot tween = ResourceManager.Get(TutorialLabel.Tutorial).TweenBacSr();
 
@@ -468,30 +468,30 @@ public class TutorialManager : Regist
         Garden.Instance.TutorialToRegular();
         UIManager.Instance.TutorialToRegular();
 
-        ResourceManager.Get(ObjectLabel.C_Group).TweenForCG();
-        ResourceManager.Get(ObjectLabel.C_MiniGame).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Group).TweenForCG();
+        ResourceManager.Get(CanvasLabel.C_MiniGame).TweenReForCG();
 
-        ResourceManager.SetActive(ObjectLabel.C_Coin, false);
-        ResourceManager.SetActive(ObjectLabel.C_Group1, false);
-        ResourceManager.SetActive(ObjectLabel.C_Group3, false);
+        ResourceManager.SetActive(CanvasLabel.C_Coin, false);
+        ResourceManager.SetActive(CanvasLabel.C_Group1, false);
+        ResourceManager.SetActive(CanvasLabel.C_Group3, false);
 
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
 
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.C_MiniArrow0), ResourceManager.Get(ObjectLabel.C_MiniArrow1), ResourceManager.Get(ObjectLabel.C_MiniGame));
+                Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.C_MiniArrow0), ResourceManager.Get(CanvasLabel.C_MiniArrow1), ResourceManager.Get(CanvasLabel.C_MiniGame));
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.C_MiniGame,
+            CanvasLabel.C_MiniGame,
             () =>
             {
                 EndClickEnterMinigame();
@@ -503,23 +503,23 @@ public class TutorialManager : Regist
     {
         ResourceManager.Get(TutorialLabel.Tutorial).SetCollider(false);
 
-        ResourceManager.SetActive(ObjectLabel.D_Quit, false);
+        ResourceManager.SetActive(CanvasLabel.D_Quit, false);
 
 
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.D_MiniGame).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.D_MiniGame).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.D_BeginArrow0), ResourceManager.Get(ObjectLabel.D_BeginArrow1), ResourceManager.Get(ObjectLabel.D_Begin));
+                Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.D_BeginArrow0), ResourceManager.Get(CanvasLabel.D_BeginArrow1), ResourceManager.Get(CanvasLabel.D_Begin));
             }
         );
 
         ResourceManager.PushButtonEventOnetime
         (
-            ObjectLabel.D_Begin,
+            CanvasLabel.D_Begin,
             () =>
             {
                 Tutorial.HightDisable();
@@ -528,12 +528,12 @@ public class TutorialManager : Regist
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.Da_GetAward,
+            CanvasLabel.Da_GetAward,
             () =>
             {
                 EndPlayPunchMinigame();
 
-                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.C_MiniGame).TweenBacCG();
             }
         );
     }
@@ -542,7 +542,7 @@ public class TutorialManager : Regist
     {
         NewplayerTutorialIndex = 4;
 
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.D_MiniGame).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.D_MiniGame).GetTweenCG();
 
         tween.AddEventOnetime
         (
@@ -565,14 +565,14 @@ public class TutorialManager : Regist
 
     public static void PlantFlower()
     {
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.G_Flower).TweenForCG();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.G_Flower).TweenForCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Transform tra = ResourceManager.Get(ObjectLabel.G_RegularGrid).GetChild(0);
+                Transform tra = ResourceManager.Get(CanvasLabel.G_RegularGrid).GetChild(0);
 
                 Tutorial.HightScreen(tra.FindChild(FlowerItemLabel.ArrowPos), tra);
             }
@@ -588,49 +588,49 @@ public class TutorialManager : Regist
             }
         );
 
-        tween = ResourceManager.Get(ObjectLabel.H_FlowerCard).GetTweenCG();
+        tween = ResourceManager.Get(CanvasLabel.H_FlowerCard).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.H_ArrowPos), ResourceManager.Get(ObjectLabel.H_Icon2));
+                Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.H_ArrowPos), ResourceManager.Get(CanvasLabel.H_Icon2));
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.H_Icon2,
+            CanvasLabel.H_Icon2,
             () =>
             {
                 Tutorial.HightDisable(0, true);
 
-                ResourceManager.Get(ObjectLabel.H_FlowerCard).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.H_FlowerCard).TweenBacCG();
             }
         );
 
-        tween = ResourceManager.Get(ObjectLabel.H_FlowerCard).GetTweenCG();
+        tween = ResourceManager.Get(CanvasLabel.H_FlowerCard).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.BackwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.G_Arrow0), ResourceManager.Get(ObjectLabel.G_Close));
+                Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.G_Arrow0), ResourceManager.Get(CanvasLabel.G_Close));
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.G_Close,
+            CanvasLabel.G_Close,
             () =>
             {
                 Tutorial.HightDisable();
             }
         );
 
-        tween = ResourceManager.Get(ObjectLabel.G_Flower).GetTweenCG();
+        tween = ResourceManager.Get(CanvasLabel.G_Flower).GetTweenCG();
 
         tween.AddEventOnetime
         (
@@ -646,25 +646,25 @@ public class TutorialManager : Regist
     {
         NewplayerTutorialIndex = 6;
 
-        ResourceManager.SetActive(ObjectLabel.C_Coin, true);
-        ResourceManager.SetActive(ObjectLabel.C_Group1, true);
-        ResourceManager.SetActive(ObjectLabel.C_Group3, true);
+        ResourceManager.SetActive(CanvasLabel.C_Coin, true);
+        ResourceManager.SetActive(CanvasLabel.C_Group1, true);
+        ResourceManager.SetActive(CanvasLabel.C_Group3, true);
 
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.C_Group).TweenForCG();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.C_Group).TweenForCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish, () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.C_ManageArrow0), ResourceManager.Get(ObjectLabel.C_Manage));
+                Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.C_ManageArrow0), ResourceManager.Get(CanvasLabel.C_Manage));
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.C_Manage,
+            CanvasLabel.C_Manage,
             () =>
             {
                 EndClickManagePanel();
@@ -674,7 +674,7 @@ public class TutorialManager : Regist
 
     public static void OpenUnlockPanel()
     {
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
         tween.AddEventOnetime
         (
@@ -701,22 +701,22 @@ public class TutorialManager : Regist
         );
 
 
-        tween = ResourceManager.Get(ObjectLabel.Fe_Info).GetTweenCG();
+        tween = ResourceManager.Get(CanvasLabel.Fe_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish, 
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.Fe_Arrow0), ResourceManager.Get(ObjectLabel.Fe_Arrow1), ResourceManager.Get(ObjectLabel.Fe_Btn));
+                Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.Fe_Arrow0), ResourceManager.Get(CanvasLabel.Fe_Arrow1), ResourceManager.Get(CanvasLabel.Fe_Btn));
 
                 ResourceManager.AddButtonEventOnetime
                 (
-                    ObjectLabel.Fe_Btn,
+                    CanvasLabel.Fe_Btn,
 
                     () =>
                     {
-                        ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                        ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
 
                         EndOpenUnlockPanel();
                     }
@@ -727,7 +727,7 @@ public class TutorialManager : Regist
 
     public static void ClickConfirmButton()
     {
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.Fe_Info).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.Fe_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
@@ -754,21 +754,21 @@ public class TutorialManager : Regist
         );
 
 
-        tween = ResourceManager.Get(ObjectLabel.Fe_Info).GetTweenCG();
+        tween = ResourceManager.Get(CanvasLabel.Fe_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.Fe_Arrow0), ResourceManager.Get(ObjectLabel.Fe_Arrow1), ResourceManager.Get(ObjectLabel.Fe_Btn));
+                Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.Fe_Arrow0), ResourceManager.Get(CanvasLabel.Fe_Arrow1), ResourceManager.Get(CanvasLabel.Fe_Btn));
 
                 ResourceManager.AddButtonEventOnetime
                 (
-                    ObjectLabel.Fe_Btn,
+                    CanvasLabel.Fe_Btn,
                     () =>
                     {
-                        ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                        ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
                         EndClickConfirmButton();
                     }
                 );
@@ -778,7 +778,7 @@ public class TutorialManager : Regist
 
     public static void UseBigSkill()
     {
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.Fe_Info).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.Fe_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
@@ -787,14 +787,14 @@ public class TutorialManager : Regist
             {
                 ConnectExempt = true;
 
-                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.F_Arrow0), ResourceManager.Get(ObjectLabel.F_Skill1));
+                Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_Arrow0), ResourceManager.Get(CanvasLabel.F_Skill1));
             }
         );
 
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.F_SkillBk11,
+            CanvasLabel.F_SkillBk11,
             () =>
             {
                 EndUseBigSkill();
@@ -805,22 +805,22 @@ public class TutorialManager : Regist
 
     public static void ShowTip()
     {
-        ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
-
-        ResourceManager.Get(ObjectLabel.F_TipBK).TweenForCG();
-        ResourceManager.SetText(ObjectLabel.F_Tip, Language.GetStr(LanguageLabel.UI__F_Tip));
-
-        ResourceManager.SetActive(ObjectLabel.F_TipBtn, true);
-        ResourceManager.AddButtonEventOnetime(ObjectLabel.F_TipBtn, () => EndShowTip());
-
-        ResourceManager.Get<ContentSizeFitter>(ObjectLabel.F_TipBK).SetLayoutVertical();
-        ResourceManager.Get<ContentSizeFitter>(ObjectLabel.F_TipBK).SetLayoutHorizontal();
-        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.F_CoinLabArrow), ResourceManager.Get(ObjectLabel.F_TipBtn), 3);
-        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.F_CoinLabArrow), ResourceManager.Get(ObjectLabel.F_TipBK), 1);
-        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.F_CoinLabArrow), ResourceManager.Get(ObjectLabel.F_Tip), 2);
-        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.F_CoinLabArrow), ResourceManager.Get(ObjectLabel.F_DataB), 1);
-        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.F_CoinLabArrow), ResourceManager.Get(ObjectLabel.F_CoinLab), 2);
-        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.F_CoinLabArrow), ResourceManager.Get(ObjectLabel.F_DiamondLab), 2);
+        ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
+
+        ResourceManager.Get(CanvasLabel.F_TipBK).TweenForCG();
+        ResourceManager.SetText(CanvasLabel.F_Tip, Language.GetStr(LanguageLabel.UI__F_Tip));
+
+        ResourceManager.SetActive(CanvasLabel.F_TipBtn, true);
+        ResourceManager.AddButtonEventOnetime(CanvasLabel.F_TipBtn, () => EndShowTip());
+
+        ResourceManager.Get<ContentSizeFitter>(CanvasLabel.F_TipBK).SetLayoutVertical();
+        ResourceManager.Get<ContentSizeFitter>(CanvasLabel.F_TipBK).SetLayoutHorizontal();
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_TipBtn), 3);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_TipBK), 1);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_Tip), 2);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_DataB), 1);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_CoinLab), 2);
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.F_CoinLabArrow), ResourceManager.Get(CanvasLabel.F_DiamondLab), 2);
     }
 
 
@@ -832,7 +832,7 @@ public class TutorialManager : Regist
 
         VisitTutorial = false;
 
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
 
         PayExemptAmt = 0;
         ConnectExemptAmt = 0;
@@ -846,20 +846,20 @@ public class TutorialManager : Regist
 
         UIManager.BlockOfflinePanel();
 
-        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
         if (tweenRoot.InDestination)
         {
-            TweenRoot tween = ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+            TweenRoot tween = ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
 
             tween.AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
+                    ResourceManager.Get(CanvasLabel.F_Manage).TweenBacGra();
 
-                    tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+                    tween = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
                     tween.AddEventOnetime
                     (
@@ -879,10 +879,10 @@ public class TutorialManager : Regist
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.C_Return,
+            CanvasLabel.C_Return,
             () =>
             {
-                TweenRoot tween = ResourceManager.Get(ObjectLabel.I_BlackMask).GetTweenCG();
+                TweenRoot tween = ResourceManager.Get(CanvasLabel.I_BlackMask).GetTweenCG();
                 tween.AddEventOnetime
                 (
                     EventType.BackwardFinish,
@@ -897,20 +897,20 @@ public class TutorialManager : Regist
 
     public static void ShowVisitBtn()
     {
-        ResourceManager.Get(ObjectLabel.C_Main).TweenReForCG();
-        ResourceManager.Get(ObjectLabel.C_Group).TweenReForCG();
-        ResourceManager.Get(ObjectLabel.C_Group0).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Main).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Group).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Group0).TweenReForCG();
 
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.C_Group).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.C_Group).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
+                ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
-                tween = ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
+                tween = ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
 
                 tween.AddEventOnetime
                 (
@@ -919,14 +919,14 @@ public class TutorialManager : Regist
                     {
                         PayExemptAmt = 1;
 
-                        ResourceManager.SetActive(ObjectLabel.C_Visit, true);
+                        ResourceManager.SetActive(CanvasLabel.C_Visit, true);
 
-                        ResourceManager.Get<HorizontalLayoutGroup>(ObjectLabel.C_Group4).SetLayoutHorizontal();
-                        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.C_VisitArrow0), ResourceManager.Get(ObjectLabel.C_Visit));
+                        ResourceManager.Get<HorizontalLayoutGroup>(CanvasLabel.C_Group4).SetLayoutHorizontal();
+                        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.C_VisitArrow0), ResourceManager.Get(CanvasLabel.C_Visit));
 
                         ResourceManager.AddButtonEventOnetime
                         (
-                            ObjectLabel.C_Visit,
+                            CanvasLabel.C_Visit,
                             () =>
                             {
                                 EndClickVisitBtn();
@@ -990,9 +990,9 @@ public class TutorialManager : Regist
     {
         memoryMinigameTutorial = false;
 
-        ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
+        ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
 
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
 
         MiniGameManager.Pause = true;
@@ -1091,13 +1091,13 @@ public class TutorialManager : Regist
 
         DressroomTutorial = false;
 
-        ResourceManager.Get(ObjectLabel.C_Main2).TweenForCG();
+        ResourceManager.Get(CanvasLabel.C_Main2).TweenForCG();
 
         Tutorial.HightDisable();
 
-        ResourceManager.Get(ObjectLabel.N_LabBK).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.N_LabBK).TweenBacCG();
 
-        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.I_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
         (
@@ -1106,17 +1106,17 @@ public class TutorialManager : Regist
             {
                 Tutorial.MaskFlag = true;
 
-                ResourceManager.SetActive(ObjectLabel.N_Button, false);
-                ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
+                ResourceManager.SetActive(CanvasLabel.N_Button, false);
+                ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.P_Return,
+            CanvasLabel.P_Return,
             () =>
             {
-                tweenRoot = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
+                tweenRoot = ResourceManager.Get(CanvasLabel.I_BlackMask).TweenBacCG();
 
                 tweenRoot.AddEventOnetime
                 (
@@ -1137,7 +1137,7 @@ public class TutorialManager : Regist
 
         UIManager.BlockOfflinePanel();
 
-        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
         if (tweenRoot.InDestination)
         {
@@ -1150,14 +1150,14 @@ public class TutorialManager : Regist
                 }
             );
 
-            tweenRoot = ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+            tweenRoot = ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
 
             tweenRoot.AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
                 {
-                    tweenRoot = ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
+                    tweenRoot = ResourceManager.Get(CanvasLabel.F_Manage).TweenBacGra();
                 }
             );
         }
@@ -1169,28 +1169,28 @@ public class TutorialManager : Regist
 
     public static void ShowDressroomButton()
     {
-        ResourceManager.Get(ObjectLabel.C_Main).TweenReForCG();
-        ResourceManager.Get(ObjectLabel.C_Group).TweenReForCG();
-        ResourceManager.Get(ObjectLabel.C_Group0).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Main).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Group).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Group0).TweenReForCG();
 
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
-        ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
+        ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
 
-        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.C_DressRoomArrow), ResourceManager.Get(ObjectLabel.C_DressRoom));
+        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.C_DressRoomArrow), ResourceManager.Get(CanvasLabel.C_DressRoom));
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.C_DressRoom,
+            CanvasLabel.C_DressRoom,
             () =>
             {
                 EndClickDressroomButton();
             }
         );
 
-        ResourceManager.SetText(ObjectLabel.N_Lab, Language.GetStr(LanguageLabel.UI__N_Lab));
+        ResourceManager.SetText(CanvasLabel.N_Lab, Language.GetStr(LanguageLabel.UI__N_Lab));
 
-        Tutorial.ShowDescriptScreen(ResourceManager.Get(ObjectLabel.C_DressRoomLabPos).position);
+        Tutorial.ShowDescriptScreen(ResourceManager.Get(CanvasLabel.C_DressRoomLabPos).position);
     }
 
 
@@ -1202,7 +1202,7 @@ public class TutorialManager : Regist
 
         Tutorial.HightDisable();
 
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
 
         MiniGameManager.Pause = false;
     }
@@ -1217,7 +1217,7 @@ public class TutorialManager : Regist
     {
         MiniGameManager.Pause = true;
 
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
         Tutorial.HightScreen(arrowTra, targetTra);
     }
@@ -1231,7 +1231,7 @@ public class TutorialManager : Regist
 
         PlazaRoomTutorial = false;
 
-        ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
+        ResourceManager.SetActive(CanvasLabel.N_Tutorial, false);
 
         PayExemptAmt = 0;
         ConnectExemptAmt = 0;
@@ -1239,10 +1239,10 @@ public class TutorialManager : Regist
 
         ResourceManager.AddButtonEventOnetime
         (
-            ObjectLabel.X_Quit,
+            CanvasLabel.X_Quit,
             () =>
             {
-                TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG();
+                TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.V_BlackMask).TweenForCG();
 
                 tweenRoot.AddEventOnetime
                 (
@@ -1263,20 +1263,20 @@ public class TutorialManager : Regist
 
         UIManager.BlockOfflinePanel();
 
-        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
         if (tweenRoot.InDestination)
         {
-            TweenRoot tween = ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+            TweenRoot tween = ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
 
             tween.AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
+                    ResourceManager.Get(CanvasLabel.F_Manage).TweenBacGra();
 
-                    tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+                    tween = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
                     tween.AddEventOnetime
                     (
@@ -1297,34 +1297,34 @@ public class TutorialManager : Regist
 
     public static void ShowPlazaRoomBtn()
     {
-        ResourceManager.Get(ObjectLabel.C_Main).TweenReForCG();
-        ResourceManager.Get(ObjectLabel.C_Group).TweenReForCG();
-        ResourceManager.Get(ObjectLabel.C_Group0).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Main).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Group).TweenReForCG();
+        ResourceManager.Get(CanvasLabel.C_Group0).TweenReForCG();
 
-        TweenRoot tween = ResourceManager.Get(ObjectLabel.C_Group).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(CanvasLabel.C_Group).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
+                ResourceManager.SetActive(CanvasLabel.N_Tutorial, true);
 
-                tween = ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
+                tween = ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
 
                 tween.AddEventOnetime
                 (
                     EventType.ForwardFinish,
                     () =>
                     {
-                        ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom, true);
-                        ResourceManager.Get<HorizontalLayoutGroup>(ObjectLabel.C_Group4).CalculateLayoutInputHorizontal();
-                        ResourceManager.Get<HorizontalLayoutGroup>(ObjectLabel.C_Group4).SetLayoutHorizontal();
-                        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.C_PlazaRoomArrow0), ResourceManager.Get(ObjectLabel.C_EnterPlazaRoom));
+                        ResourceManager.SetActive(CanvasLabel.C_EnterPlazaRoom, true);
+                        ResourceManager.Get<HorizontalLayoutGroup>(CanvasLabel.C_Group4).CalculateLayoutInputHorizontal();
+                        ResourceManager.Get<HorizontalLayoutGroup>(CanvasLabel.C_Group4).SetLayoutHorizontal();
+                        Tutorial.HightScreen(ResourceManager.Get(CanvasLabel.C_PlazaRoomArrow0), ResourceManager.Get(CanvasLabel.C_EnterPlazaRoom));
 
                         ResourceManager.AddButtonEventOnetime
                         (
-                            ObjectLabel.C_EnterPlazaRoom,
+                            CanvasLabel.C_EnterPlazaRoom,
                             () =>
                             {
                                 EndClickPlazaRoomBtn();

File diff suppressed because it is too large
+ 198 - 198
Assets/Script/Manage/UIManager.cs


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

@@ -45,7 +45,7 @@ public class VisitManager : Regist
         {
             visitCost = value;
 
-            ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text = TransferLabel.CoinSprite + VisitCost;
+            ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text = TransferLabel.CoinSprite + VisitCost;
         }
     }
     public static int visitCost;
@@ -134,7 +134,7 @@ public class VisitManager : Regist
 
         if (VisitCDTime != 0)
         {
-            Text text = ResourceManager.Get<Text>(ObjectLabel.C_VisitLab);
+            Text text = ResourceManager.Get<Text>(CanvasLabel.C_VisitLab);
 
             List<float> delayList = new List<float>();
             List<float> durationList = new List<float>();
@@ -174,7 +174,7 @@ public class VisitManager : Regist
                 actionList.Add(null);
             }
 
-            TweenRoot tween = ResourceManager.Get(ObjectLabel.C_VisitLab).CreateStreamScale
+            TweenRoot tween = ResourceManager.Get(CanvasLabel.C_VisitLab).CreateStreamScale
             (
                 delayList,
                 durationList,
@@ -200,7 +200,7 @@ public class VisitManager : Regist
 
     public static void OnStartEnterVisiteeGarden()
     {
-        ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, false);
+        ResourceManager.SetActive(CanvasLabel.C_EnterPlazaRoom0, false);
     }
 
     public static void EnterVisiteeGarden(VisitData visitData)
@@ -223,19 +223,19 @@ public class VisitManager : Regist
 
     public static void StartExitVisiteeGarden()
     {
-        ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
+        ResourceManager.Get(CanvasLabel.I_BlackMask).TweenForCG();
 
 		HideTip ();
 
-        ResourceManager.SetActive(ObjectLabel.C_Visit, true);
-        ResourceManager.SetActive(ObjectLabel.C_Coin, true);
-        ResourceManager.SetActive(ObjectLabel.C_Group1, true);
-        ResourceManager.SetActive(ObjectLabel.C_Group2, true);
+        ResourceManager.SetActive(CanvasLabel.C_Visit, true);
+        ResourceManager.SetActive(CanvasLabel.C_Coin, true);
+        ResourceManager.SetActive(CanvasLabel.C_Group1, true);
+        ResourceManager.SetActive(CanvasLabel.C_Group2, true);
 
-        ResourceManager.Get<Button>(ObjectLabel.C_NickNameBK).interactable = true;
+        ResourceManager.Get<Button>(CanvasLabel.C_NickNameBK).interactable = true;
 
-        ResourceManager.SetActive(ObjectLabel.C_Return, false);
-        ResourceManager.SetActive(ObjectLabel.C_Garden, false);
+        ResourceManager.SetActive(CanvasLabel.C_Return, false);
+        ResourceManager.SetActive(CanvasLabel.C_Garden, false);
 
         GardenManager.InMinigameFlag = true;
 
@@ -358,7 +358,7 @@ public class VisitManager : Regist
 
     public static void OnStartExitVisiteeGarden()
     {
-        ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, true);
+        ResourceManager.SetActive(CanvasLabel.C_EnterPlazaRoom0, true);
     }
 
     public static void EnterVisiteeGarden()
@@ -368,7 +368,7 @@ public class VisitManager : Regist
             return;
         }
 
-        ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
+        ResourceManager.Get(CanvasLabel.I_BlackMask).TweenForCG();
         //Debug.Log(Document.OuterXml);
         SetVisiteePraise(VisiteeDocument);
 
@@ -376,13 +376,13 @@ public class VisitManager : Regist
 
         VisiteeRootNode = VisiteeDocument.SelectSingleNode(PlayerConfigLabel.RootNode);
 
-        ResourceManager.SetActive(ObjectLabel.C_Coin, false);
-        ResourceManager.SetActive(ObjectLabel.C_Group1, false);
-        ResourceManager.SetActive(ObjectLabel.C_Group2, false);
+        ResourceManager.SetActive(CanvasLabel.C_Coin, false);
+        ResourceManager.SetActive(CanvasLabel.C_Group1, false);
+        ResourceManager.SetActive(CanvasLabel.C_Group2, false);
 
-        ResourceManager.Get<Button>(ObjectLabel.C_NickNameBK).interactable = false;
+        ResourceManager.Get<Button>(CanvasLabel.C_NickNameBK).interactable = false;
 
-        ResourceManager.SetActive(ObjectLabel.C_Garden, true);
+        ResourceManager.SetActive(CanvasLabel.C_Garden, true);
 
         if (!InVisit)
         {
@@ -393,8 +393,8 @@ public class VisitManager : Regist
             GardenManager.StarList = new List<Star>();
         }
 
-        ResourceManager.SetActive(ObjectLabel.C_AddFriendButton, true);
-        ResourceManager.SetActive(ObjectLabel.C_Return, true);
+        ResourceManager.SetActive(CanvasLabel.C_AddFriendButton, true);
+        ResourceManager.SetActive(CanvasLabel.C_Return, true);
 
         GardenManager.InMinigameFlag = false;
 
@@ -450,7 +450,7 @@ public class VisitManager : Regist
             {
                 VisiteeLevel = int.Parse(attributeList[i][3].Value);
 
-                ResourceManager.SetText(ObjectLabel.C_GardenLab, Language.GetStr(LanguageLabel.UI__C_GardenLab) + VisiteeLevel);
+                ResourceManager.SetText(CanvasLabel.C_GardenLab, Language.GetStr(LanguageLabel.UI__C_GardenLab) + VisiteeLevel);
 
                 continue;
             }
@@ -707,7 +707,7 @@ public class VisitManager : Regist
             null,
             () =>
             {
-                ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
+                ResourceManager.Get(CanvasLabel.I_BlackMask).TweenForCG();
                 OnStartExitVisiteeGarden();
             },
             null,
@@ -778,12 +778,12 @@ public class VisitManager : Regist
 
     public static void SetPlayerNickName()
     {
-        ResourceManager.SetText(ObjectLabel.C_NickNameLab, NickNameManager.NickName);
+        ResourceManager.SetText(CanvasLabel.C_NickNameLab, NickNameManager.NickName);
     }
 
     public static void SetVisiteeNickName(string nickname)
     {
-        ResourceManager.SetText(ObjectLabel.C_NickNameLab, nickname);
+        ResourceManager.SetText(CanvasLabel.C_NickNameLab, nickname);
     }
 
 
@@ -817,15 +817,15 @@ public class VisitManager : Regist
 
 	public static void ShowTip()
 	{
-		ResourceManager.SetActive (ObjectLabel.C_Tip, true);
+		ResourceManager.SetActive (CanvasLabel.C_Tip, true);
 
 	    string languageID = LanguageLabel.Tip + Random.Range(1, MaxTipAmt);
-        ResourceManager.Get<Text> (ObjectLabel.C_TipLab).text = Language.GetStr (LabelUtility.CombineLanguageLabel(LanguageLabel.Tip, languageID));
+        ResourceManager.Get<Text> (CanvasLabel.C_TipLab).text = Language.GetStr (LanguageLabel.CombineLanguageLabel(LanguageLabel.Tip, languageID));
 	}
 
 	public static void HideTip()
 	{
-		ResourceManager.SetActive (ObjectLabel.C_Tip, false);
+		ResourceManager.SetActive (CanvasLabel.C_Tip, false);
 	}
 
 
@@ -845,7 +845,7 @@ public class VisitManager : Regist
             Current.Coin,
             () =>
             {
-                ResourceManager.Get(ObjectLabel.I_BlackMask).GetTweenCG().Duration = 0.5f;
+                ResourceManager.Get(CanvasLabel.I_BlackMask).GetTweenCG().Duration = 0.5f;
 
                 IsPullConfigComplete = false;
                 IsBlackMaskTweenComplete = false;
@@ -854,28 +854,28 @@ public class VisitManager : Regist
 
                 AudioManager.PlayClip(AudioLabel.Bubble);
 
-                ResourceManager.SetActive(ObjectLabel.C_Return, false);
+                ResourceManager.SetActive(CanvasLabel.C_Return, false);
 
                 TweenRoot tween;
 
                 if (VisitCDTime != 0)
                 {
-                    ResourceManager.Get<Button>(ObjectLabel.C_Visit).interactable = false;
+                    ResourceManager.Get<Button>(CanvasLabel.C_Visit).interactable = false;
 
-                    tween = ResourceManager.Get(ObjectLabel.C_VisitLab).StreamReForScale();
+                    tween = ResourceManager.Get(CanvasLabel.C_VisitLab).StreamReForScale();
 
                     tween.AddEventOnetime
                     (
                         EventType.ForwardFinish,
                         () =>
                         {
-                            ResourceManager.Get<Button>(ObjectLabel.C_Visit).interactable = true;
+                            ResourceManager.Get<Button>(CanvasLabel.C_Visit).interactable = true;
                         }
                     );
                 }
 
 
-                tween = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
+                tween = ResourceManager.Get(CanvasLabel.I_BlackMask).TweenBacCG();
 
                 tween.AddEventOnetime
                 (

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

@@ -28,9 +28,9 @@ public class ADChest : Chest, IPointerClickHandler
 
                         IAPManager.ADChests.Remove(this);
 
-                        ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
+                        ResourceManager.Get(CanvasLabel.C_Group).TweenBacCG();
 
-                        ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
+                        ResourceManager.Get(CanvasLabel.B_SignIn).TweenForCG();
 
                         Lottery.PlayAnimation(false);
                     }

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

@@ -105,7 +105,7 @@ public class CommentItem : Regist
         LanguageManager.Add(AddFriendButtonTitle, new MulLanStr(LanguageLabel.CommentItem__AddFriend));
         LanguageManager.Add(SendMessageButtonTitle, new MulLanStr(LanguageLabel.CommentItem__SendMessage));
 
-        ContentText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+        ContentText.text = ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text;
 
         VisitButton.onClick.AddListener(Visit);
         AddFriendButton.onClick.AddListener(OnAddFriendButtonClick);
@@ -113,7 +113,7 @@ public class CommentItem : Regist
 
         Manager.OnLevelChange += level =>
         {
-            ContentText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+            ContentText.text = ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text;
         };
 
         FriendPanel.OnFriendListRefresh += RefreshRelationship;

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

@@ -21,6 +21,6 @@ public class DropDiamond : Drop
 
         MinigameAward.DropDiamond += 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(CanvasLabel.D_HudParent), true);
     }
 }

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

@@ -20,6 +20,6 @@ public class DropGold : Drop
 
         MinigameAward.DropCoin += coin;
 
-        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, transform, ResourceManager.Get(ObjectLabel.D_HudParent), true);
+        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, transform, ResourceManager.Get(CanvasLabel.D_HudParent), true);
     }
 }

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

@@ -82,9 +82,9 @@ public class FlowerInfo
                 {
                     if (GardenManager.TotalUnlockSpecialFlower == 0)
                     {
-                        ResourceManager.Get(ObjectLabel.G_Regular).TweenForVec();
+                        ResourceManager.Get(CanvasLabel.G_Regular).TweenForVec();
 
-                        ResourceManager.SetActive(ObjectLabel.G_Special, true);
+                        ResourceManager.SetActive(CanvasLabel.G_Special, true);
                     }
 
                     GardenManager.TotalUnlockSpecialFlower++;
@@ -119,7 +119,7 @@ public class FlowerInfo
     {
         get
         {
-            return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.FlowerName, FullID));
+            return Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.FlowerName, FullID));
         }
     }
     public string Description
@@ -150,7 +150,7 @@ public class FlowerInfo
 
     public FlowerInfo(XmlAttributeCollection attribute)
     {
-        FlowerItem = ResourceManager.Get(ResourceLabel.FlowerItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.G_RegularGrid),  false, ObjType.FlowerItem);
+        FlowerItem = ResourceManager.Get(ResourceLabel.FlowerItem, Folder.UI, false, ResourceManager.Get(CanvasLabel.G_RegularGrid),  false, ObjType.FlowerItem);
 
         FlowerItem.AddComponent<FlowerItem>();
 
@@ -417,15 +417,15 @@ public class Flower : Regist, IPointerClickHandler
     {
         if (opType == OpType.Rip)
         {
-            ResourceManager.Get(ObjectLabel.D_Rip2).TweenForScale();
+            ResourceManager.Get(CanvasLabel.D_Rip2).TweenForScale();
         }
         else if (opType == OpType.Water)
         {
-            ResourceManager.Get(ObjectLabel.D_Water2).TweenForScale();
+            ResourceManager.Get(CanvasLabel.D_Water2).TweenForScale();
         }
         else if (opType == OpType.Fertilize)
         {
-            ResourceManager.Get(ObjectLabel.D_Fertilize2).TweenForScale();
+            ResourceManager.Get(CanvasLabel.D_Fertilize2).TweenForScale();
         }
 
         if (opType != PunchGameOperateType)
@@ -448,7 +448,7 @@ public class Flower : Regist, IPointerClickHandler
         }
         else
         {
-            ResourceManager.GetHudText($"+{MiniGameManager.PunchCorrectScore}", Color.white, 90, ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(ObjectLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{MiniGameManager.PunchCorrectScore}", Color.white, 90, ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(CanvasLabel.D_HudParent), true);
 
             MiniGameManager.Score += MiniGameManager.PunchCorrectScore;
 
@@ -616,12 +616,12 @@ public class Flower : Regist, IPointerClickHandler
         
         Move2D move2D = new Move2D(flyGold);
         move2D.Restrain2D = Restrain2D.Y;
-        Vector3 destination = Camera.main.ScreenToWorldPoint(ResourceManager.Get(ObjectLabel.C_Coin).position);
+        Vector3 destination = Camera.main.ScreenToWorldPoint(ResourceManager.Get(CanvasLabel.C_Coin).position);
         move2D.StartMove(destination, 0.5f, false, Curve.EaseOutQuad);
 
         move2D = new Move2D(flyGold);
         move2D.Restrain2D = Restrain2D.X;
-        destination = Camera.main.ScreenToWorldPoint(ResourceManager.Get(ObjectLabel.C_Coin).position);
+        destination = Camera.main.ScreenToWorldPoint(ResourceManager.Get(CanvasLabel.C_Coin).position);
         move2D.StartMove(destination, 0.5f, false, Curve.Linear);
 
         DelayCall.Call
@@ -634,7 +634,7 @@ public class Flower : Regist, IPointerClickHandler
             }
         );
 
-        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, ChildDic[FlowerLabel.AwardGoldPos], ResourceManager.Get(ObjectLabel.A_HudParent), true);
+        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, ChildDic[FlowerLabel.AwardGoldPos], ResourceManager.Get(CanvasLabel.A_HudParent), true);
 
         ResetAward();
     }
@@ -679,7 +679,7 @@ public class Flower : Regist, IPointerClickHandler
                 return;
             }
 
-            ResourceManager.Get(ObjectLabel.G_Flower).TweenForCG();
+            ResourceManager.Get(CanvasLabel.G_Flower).TweenForCG();
 
             GardenManager.ShowRetrieveCard(FlowerInfo, Slot);
         }

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

@@ -343,7 +343,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
             }
             else
             {
-                ResourceManager.Get(ObjectLabel.G_Flower).TweenForCG();
+                ResourceManager.Get(CanvasLabel.G_Flower).TweenForCG();
             }
         }
     }

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

@@ -102,7 +102,7 @@ public class CloseItem
 
     public string Name
     {
-        get { return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.DressRoom, FullID)); }
+        get { return Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.DressRoom, FullID)); }
     }
 
     public static string IDPrefix = "Armature";
@@ -184,31 +184,31 @@ public class CloseItem
 
     protected void CreateItem()
     {
-        Transform = ResourceManager.Get(ResourceLabel.CloseItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.Canvas), false);
+        Transform = ResourceManager.Get(ResourceLabel.CloseItem, Folder.UI, false, ResourceManager.Get(CanvasLabel.Canvas), false);
 
         if (Type == CloseType.Top)
         {
-            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pb_TopGrid));
+            Transform.SetParent(ResourceManager.Get(CanvasLabel.Pb_TopGrid));
         }
         else if (Type == CloseType.Hair)
         {
-            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pa_HairGrid));
+            Transform.SetParent(ResourceManager.Get(CanvasLabel.Pa_HairGrid));
         }
         else if (Type == CloseType.Dress)
         {
-            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pc_DressGrid));
+            Transform.SetParent(ResourceManager.Get(CanvasLabel.Pc_DressGrid));
         }
         else if (Type == CloseType.Wing)
         {
-            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pe_WingGrid));
+            Transform.SetParent(ResourceManager.Get(CanvasLabel.Pe_WingGrid));
         }
         else if (Type == CloseType.Decarator)
         {
-            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pd_DecaratorGrid));
+            Transform.SetParent(ResourceManager.Get(CanvasLabel.Pd_DecaratorGrid));
         }
         else if (Type == CloseType.Shoe)
         {
-            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pf_ShoeGrid));
+            Transform.SetParent(ResourceManager.Get(CanvasLabel.Pf_ShoeGrid));
         }
         else
         {
@@ -250,15 +250,15 @@ public class CloseItem
             {
                 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));
+                ResourceManager.Get(CanvasLabel.Pa_Info).TweenForCG();
+                SetupUI(newSize, new Vector2(0, 22), ResourceManager.Get<Image>(CanvasLabel.Pa_Icon1), ResourceManager.Get<Image>(CanvasLabel.Pa_Icon3), ResourceManager.Get<Image>(CanvasLabel.Pa_Icon2));
 
-                ResourceManager.SetText(ObjectLabel.Pa_Lab, Name);
-                ResourceManager.SetText(ObjectLabel.Pa_BtnLab, Language.GetStr(LanguageLabel.UI__Pa_BtnLab) + Auxiliary.ImageParse(BuyCurrent) + BuyCost);
+                ResourceManager.SetText(CanvasLabel.Pa_Lab, Name);
+                ResourceManager.SetText(CanvasLabel.Pa_BtnLab, Language.GetStr(LanguageLabel.UI__Pa_BtnLab) + Auxiliary.ImageParse(BuyCurrent) + BuyCost);
 
                 ResourceManager.SetButtonEvent
                 (
-                    ObjectLabel.Pa_Btn,
+                    CanvasLabel.Pa_Btn,
                     OnBuy
                 );
             }
@@ -471,7 +471,7 @@ public class CloseItem
             {
                 OnBuySucceed();
 
-                ResourceManager.Get(ObjectLabel.Pa_Info).TweenBacCG();
+                ResourceManager.Get(CanvasLabel.Pa_Info).TweenBacCG();
 
                 ChangeDress(PlayerManager.Player);
                 SaveDressData();
@@ -484,7 +484,7 @@ public class CloseItem
             {
                 PlayerManager.Player.ResetDressDatas();
 
-                TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.Pa_Info).TweenBacCG();
+                TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.Pa_Info).TweenBacCG();
 
                 tweenRoot.AddEventOnetime
                 (
@@ -495,12 +495,12 @@ public class CloseItem
                     }
                 );
 
-                ResourceManager.Get(ObjectLabel.B_SignIn0).GetTweenCG().AddEventOnetime
+                ResourceManager.Get(CanvasLabel.B_SignIn0).GetTweenCG().AddEventOnetime
                 (
                     EventType.ForwardFinish,
                     () =>
                     {
-                        ResourceManager.Get(ObjectLabel.F_Manage0).TweenForVec();
+                        ResourceManager.Get(CanvasLabel.F_Manage0).TweenForVec();
                     }
                 );
             }
@@ -1050,7 +1050,7 @@ public class Player : Regist , IPointerClickHandler
 
                 closeUnitList.RemoveAt(i--);
 
-                ResourceManager.Get(ObjectLabel.Pa_Info).GetTweenCG().AddEventOnetime
+                ResourceManager.Get(CanvasLabel.Pa_Info).GetTweenCG().AddEventOnetime
                     (
                         EventType.BackwardFinish,
                         () =>
@@ -1112,7 +1112,7 @@ public class Player : Regist , IPointerClickHandler
                 () =>
                 {
                     ResetDressDatas();
-                    ResourceManager.Get(ObjectLabel.K_Bubble).GetTweenGra().AddEventOnetime(EventType.BackwardFinish, () => { ExitDressRoom(); });
+                    ResourceManager.Get(CanvasLabel.K_Bubble).GetTweenGra().AddEventOnetime(EventType.BackwardFinish, () => { ExitDressRoom(); });
                 }
             );
         }
@@ -1122,7 +1122,7 @@ public class Player : Regist , IPointerClickHandler
     {
         Manager.SceneSwitchFlag = false;
 
-        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.I_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
             (
@@ -1137,13 +1137,13 @@ public class Player : Regist , IPointerClickHandler
                     ResourceManager.Get(ResourceLabel.Garden).TweenForSr();
                     ResourceManager.Get(DressroomLabel.DressRoom).TweenBacSr();
 
-                    ResourceManager.Get(ObjectLabel.C_Main).TweenForCG();
-                    ResourceManager.Get(ObjectLabel.P_DressRoom).TweenBacCG();
+                    ResourceManager.Get(CanvasLabel.C_Main).TweenForCG();
+                    ResourceManager.Get(CanvasLabel.P_DressRoom).TweenBacCG();
                 }
             );
 
 
-        tweenRoot = ResourceManager.Get(ObjectLabel.P_DressRoom).GetTweenCG();
+        tweenRoot = ResourceManager.Get(CanvasLabel.P_DressRoom).GetTweenCG();
 
         tweenRoot.AddEventOnetime
             (
@@ -1160,8 +1160,8 @@ public class Player : Regist , IPointerClickHandler
 
                     DeactiveShadow();
 
-                    ResourceManager.Get(ObjectLabel.B_SignIn0).TweenForCG();
-                    ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
+                    ResourceManager.Get(CanvasLabel.B_SignIn0).TweenForCG();
+                    ResourceManager.Get(CanvasLabel.I_BlackMask).TweenForCG();
                 }
             );
     }
@@ -1173,7 +1173,7 @@ public class Player : Regist , IPointerClickHandler
             return;
         }
 
-        ResourceManager.Get(ObjectLabel.B_SignIn0).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.B_SignIn0).TweenBacCG();
 
         InDressRoom = true;
 
@@ -1182,12 +1182,12 @@ public class Player : Regist , IPointerClickHandler
         Manager.SceneSwitchFlag = true;
 
 
-        ResourceManager.Get(ObjectLabel.C_Main).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.C_Main).TweenBacCG();
 
 
         SetAllCollider(false);
 
-        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.I_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
             (
@@ -1207,19 +1207,19 @@ public class Player : Regist , IPointerClickHandler
                     ResourceManager.Get(ResourceLabel.Garden).TweenBacSr();
                     ResourceManager.Get(DressroomLabel.DressRoom).TweenForSr();
 
-                    ResourceManager.Get(ObjectLabel.P_DressRoom).TweenForCG();
+                    ResourceManager.Get(CanvasLabel.P_DressRoom).TweenForCG();
                 }
             );
 
 
-        tweenRoot = ResourceManager.Get(ObjectLabel.P_DressRoom).GetTweenCG();
+        tweenRoot = ResourceManager.Get(CanvasLabel.P_DressRoom).GetTweenCG();
 
         tweenRoot.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
+                    ResourceManager.Get(CanvasLabel.I_BlackMask).TweenForCG();
                 }
             );
     }

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

@@ -273,7 +273,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     private void GuessSucceed()
     {
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.Y_Chest).interactable = false;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.Y_Chest).interactable = false;
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetChestAward(ChestData.ID);
     }
 
@@ -296,7 +296,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         if (chestData.ChestType == ChestType.GuessColor)
         {
             AnswerInfo = GardenManager.FlowerInfoDictionary.Random();
-            AnswerColor = Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.FlowerColor, AnswerInfo.FullID)).ToLower();
+            AnswerColor = Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.FlowerColor, AnswerInfo.FullID)).ToLower();
         }
     }
 
@@ -307,7 +307,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         Deactive();
         TurnGray();
 
-        ChestTimerTransform = ResourceManager.Get(ResourceLabel.ChestTimer, Folder.UI, false, ResourceManager.Get(ObjectLabel.W_HudParent), false, ObjType.ChestTimer);
+        ChestTimerTransform = ResourceManager.Get(ResourceLabel.ChestTimer, Folder.UI, false, ResourceManager.Get(CanvasLabel.W_HudParent), false, ObjType.ChestTimer);
         ChestTimerLab = ChestTimerTransform.GetComponentInChildren<Text>();
         HudTarget hudTarget = ChestTimerTransform.GetComponent<HudTarget>();
         if (hudTarget == null)
@@ -329,7 +329,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
         if (GuessInputField == null)
         {
-            GuessInputField = ResourceManager.Get<InputField>(ObjectLabel.Y_InputField);
+            GuessInputField = ResourceManager.Get<InputField>(CanvasLabel.Y_InputField);
         }
 
         if (!Inited)
@@ -459,30 +459,30 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
                 return;
             }
 
-            ResourceManager.Get(ObjectLabel.Y_Chest).TweenForCG();
-            ResourceManager.SetActive(ObjectLabel.Ya_GetAward, false);
-            ResourceManager.SetActive(ObjectLabel.Y_Guess, true);
-            ResourceManager.SetActive(ObjectLabel.Yb_CreateChest, false);
+            ResourceManager.Get(CanvasLabel.Y_Chest).TweenForCG();
+            ResourceManager.SetActive(CanvasLabel.Ya_GetAward, false);
+            ResourceManager.SetActive(CanvasLabel.Y_Guess, true);
+            ResourceManager.SetActive(CanvasLabel.Yb_CreateChest, false);
 
             if (ChestData.ChestType == ChestType.GuessColor)
             {
-                ResourceManager.SetActive(ObjectLabel.Y_RewardLab, false);
-                ResourceManager.SetActive(ObjectLabel.Y_RewardIcon, true);
-                ResourceManager.Get<Image>(ObjectLabel.Y_RewardIcon).sprite = AnswerInfo.Icon;
-                ResourceManager.Get<Image>(ObjectLabel.Y_RewardIcon).Resize(true, 0.3125f, 0.3125f);
-                ResourceManager.Get<Image>(ObjectLabel.Y_RewardIcon).color = Color.white;
-                LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tit), new MulLanStr(LanguageLabel.UI__Yb_GuessColor));
-                LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Desc), new MulLanStr(LanguageLabel.UI__Y_GuessColorDesc));
+                ResourceManager.SetActive(CanvasLabel.Y_RewardLab, false);
+                ResourceManager.SetActive(CanvasLabel.Y_RewardIcon, true);
+                ResourceManager.Get<Image>(CanvasLabel.Y_RewardIcon).sprite = AnswerInfo.Icon;
+                ResourceManager.Get<Image>(CanvasLabel.Y_RewardIcon).Resize(true, 0.3125f, 0.3125f);
+                ResourceManager.Get<Image>(CanvasLabel.Y_RewardIcon).color = Color.white;
+                LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Y_Tit), new MulLanStr(LanguageLabel.UI__Yb_GuessColor));
+                LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Y_Desc), new MulLanStr(LanguageLabel.UI__Y_GuessColorDesc));
 
                 GuessInputField.text = "";
                 GuessInputField.characterLimit = 30;
             }
             else
             {
-                ResourceManager.SetActive(ObjectLabel.Y_RewardLab, true);
-                ResourceManager.SetActive(ObjectLabel.Y_RewardIcon, false);
-                LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tit), new MulLanStr(LanguageLabel.UI__Yb_GuessNumber));
-                LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Desc), new MulLanStr(LanguageLabel.UI__Y_GuessNumberDesc));
+                ResourceManager.SetActive(CanvasLabel.Y_RewardLab, true);
+                ResourceManager.SetActive(CanvasLabel.Y_RewardIcon, false);
+                LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Y_Tit), new MulLanStr(LanguageLabel.UI__Yb_GuessNumber));
+                LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Y_Desc), new MulLanStr(LanguageLabel.UI__Y_GuessNumberDesc));
 
                 GuessInputField.text = "";
                 GuessInputField.characterLimit = 1;

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

@@ -71,7 +71,7 @@ public class RoomData
 
     public PlazaRoomItem CreateItem()
     {
-        PlazaRoomItem plazaRoomItem = ResourceManager.Get(ResourceLabel.PlazaRoomItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.Z_Grid), false, ObjType.PlazaRoomItem, typeof(PlazaRoomItem)).GetComponent<PlazaRoomItem>();
+        PlazaRoomItem plazaRoomItem = ResourceManager.Get(ResourceLabel.PlazaRoomItem, Folder.UI, false, ResourceManager.Get(CanvasLabel.Z_Grid), false, ObjType.PlazaRoomItem, typeof(PlazaRoomItem)).GetComponent<PlazaRoomItem>();
         plazaRoomItem.Init();
         return plazaRoomItem;
     }

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

@@ -48,13 +48,13 @@ public class Ranktem : Regist
         VisitBtn = childDic[RanktemLabel.VisitBtn].GetComponent<Button>();
         ContentText = childDic[RanktemLabel.ContentText].GetComponent<Text>();
 
-        VisitText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+        VisitText.text = ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text;
 
         VisitBtn.onClick.AddListener(Visit);
 
         Manager.OnLevelChange += (level) =>
         {
-            VisitText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+            VisitText.text = ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text;
         };
 
         return false;

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

@@ -152,17 +152,17 @@ public class Ability : SkillRoot
 
     public void UnlockTab()
     {
-        ResourceManager.Get<Graphic>(ObjectLabel.F_Elf).material = null;
-        ResourceManager.Get<Graphic>(ObjectLabel.F_Store).material = null;
-        ResourceManager.Get<Graphic>(ObjectLabel.F_Magic).material = null;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_Elf).material = null;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_Store).material = null;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_Magic).material = null;
 
-        ResourceManager.Get<Graphic>(ObjectLabel.F_ElfLab).material = null;
-        ResourceManager.Get<Graphic>(ObjectLabel.F_StoreLab).material = null;
-        ResourceManager.Get<Graphic>(ObjectLabel.F_MagicLab).material = null;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_ElfLab).material = null;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_StoreLab).material = null;
+        ResourceManager.Get<Graphic>(CanvasLabel.F_MagicLab).material = null;
 
-        ResourceManager.Get<Button>(ObjectLabel.F_Elf).interactable = true;
-        ResourceManager.Get<Button>(ObjectLabel.F_Store).interactable = true;
-        ResourceManager.Get<Button>(ObjectLabel.F_Magic).interactable = true;
+        ResourceManager.Get<Button>(CanvasLabel.F_Elf).interactable = true;
+        ResourceManager.Get<Button>(CanvasLabel.F_Store).interactable = true;
+        ResourceManager.Get<Button>(CanvasLabel.F_Magic).interactable = true;
     }
 
 
@@ -349,11 +349,11 @@ public class Ability : SkillRoot
             flower.GetElf(GardenManager.ElfList.Back(0), 0, 0, 0, 0);
 
 
-            ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
 
-            ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
+            ResourceManager.Get(CanvasLabel.F_Manage).TweenBacGra();
 
-            TweenRoot tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+            TweenRoot tween = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
             tween.AddEventOnetime
             (
@@ -381,11 +381,11 @@ public class Ability : SkillRoot
             );
 
 
-            ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
 
-            ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
+            ResourceManager.Get(CanvasLabel.F_Manage).TweenBacGra();
 
-            tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
+            tween = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
             tween.AddEventOnetime
             (
@@ -447,59 +447,59 @@ public class Ability : SkillRoot
     {
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
-        ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
+        ResourceManager.Get(CanvasLabel.Fe_Info).TweenForCG();
 
-        ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
+        ResourceManager.SetText(CanvasLabel.Fe_Tit, Name);
 
-        ResourceManager.SetSprite(ObjectLabel.Fe_Icon, Icon);
+        ResourceManager.SetSprite(CanvasLabel.Fe_Icon, Icon);
 
 
         if (ItemStatus == SkillStatus.Lock)
         {
-            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
-            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab0, "");
+            ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab0), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab0), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
 
             ResourceManager.SetButtonEvent
             (
-                ObjectLabel.Fe_Btn,
+                CanvasLabel.Fe_Btn,
                 () =>
                 {
                     UnlockAhead();
 
-                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
         else if (ItemStatus == SkillStatus.UnLock)
         {
-            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
-            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab0, "");
+            ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab1), Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0")));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab1), Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0")));
             
             ResourceManager.SetButtonEvent
             (
-                ObjectLabel.Fe_Btn,
+                CanvasLabel.Fe_Btn,
                 () =>
                 {
                     Unlock();
 
-                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
         else if (ItemStatus == SkillStatus.Upgrade)
         {
-            ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));
-            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(1));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab0, GetDescription(0));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(1));
 
-            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
 
             ResourceManager.SetButtonEvent
             (
-                ObjectLabel.Fe_Btn,
+                CanvasLabel.Fe_Btn,
                 () =>
                 {
                     Upgrade();
@@ -508,11 +508,11 @@ public class Ability : SkillRoot
 
                     ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
 
-                    ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
-                    ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));
-                    ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(1));
+                    ResourceManager.SetText(CanvasLabel.Fe_Tit, Name);
+                    ResourceManager.SetText(CanvasLabel.Fe_Lab0, GetDescription(0));
+                    ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(1));
 
-                    ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+                    ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
                 }
             );
         }

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

@@ -369,20 +369,20 @@ public class BigSkill : Skill
 
         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));
+            BigSkillTexts.Add(ResourceManager.Get<Text>(CanvasLabel.F_SkillLab1));
+            BigSkillTexts.Add(ResourceManager.Get<Text>(CanvasLabel.F_SkillLab2));
+            BigSkillTexts.Add(ResourceManager.Get<Text>(CanvasLabel.F_SkillLab3));
+            BigSkillTexts.Add(ResourceManager.Get<Text>(CanvasLabel.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));
+            BigSkillBk0s.Add(ResourceManager.Get<Image>(CanvasLabel.F_SkillBk10));
+            BigSkillBk0s.Add(ResourceManager.Get<Image>(CanvasLabel.F_SkillBk20));
+            BigSkillBk0s.Add(ResourceManager.Get<Image>(CanvasLabel.F_SkillBk30));
+            BigSkillBk0s.Add(ResourceManager.Get<Image>(CanvasLabel.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));
+            BigSkillBk1s.Add(ResourceManager.Get<Image>(CanvasLabel.F_SkillBk11));
+            BigSkillBk1s.Add(ResourceManager.Get<Image>(CanvasLabel.F_SkillBk21));
+            BigSkillBk1s.Add(ResourceManager.Get<Image>(CanvasLabel.F_SkillBk31));
+            BigSkillBk1s.Add(ResourceManager.Get<Image>(CanvasLabel.F_SkillBk41));
         }
 
         Text = BigSkillTexts[BigSkillIndex-1];
@@ -477,7 +477,7 @@ public class BigSkill : Skill
 
         if (!HttpManager.IsConnect)
         {
-            ResourceManager.Get(ObjectLabel.Fg_Reconnect).TweenForCG();
+            ResourceManager.Get(CanvasLabel.Fg_Reconnect).TweenForCG();
 
             return;
         }
@@ -500,7 +500,7 @@ public class BigSkill : Skill
                 GetBuff();
                 GetAward();
 
-                InfoBoxManager.GardenInfoBox.Display(string.Format("{0}{1}", Language.GetStr(LanguageLabel.UI__J_Info1), Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID))), 10f, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Display(string.Format("{0}{1}", Language.GetStr(LanguageLabel.UI__J_Info1), Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.SkillName, FullID))), 10f, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能,
             StaticsManager.ConsumeModule.Shop
@@ -548,58 +548,58 @@ public class BigSkill : Skill
     {
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
-        ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
+        ResourceManager.Get(CanvasLabel.Fe_Info).TweenForCG();
 
-        ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
+        ResourceManager.SetText(CanvasLabel.Fe_Tit, Name);
 
-        ResourceManager.SetSprite(ObjectLabel.Fe_Icon, Icon);
+        ResourceManager.SetSprite(CanvasLabel.Fe_Icon, Icon);
 
         if (ItemStatus == SkillStatus.Lock)
         {
-            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
-            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab0, "");
+            ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab0), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab0), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
 
             ResourceManager.SetButtonEvent
             (
-                ObjectLabel.Fe_Btn,
+                CanvasLabel.Fe_Btn,
                 () =>
                 {
                     UnlockAhead();
 
-                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
         else if (ItemStatus == SkillStatus.UnLock)
         {
-            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
-            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab0, "");
+            ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab1), Auxiliary.ImageParse(UnlockCur), UnlockAmt));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab1), Auxiliary.ImageParse(UnlockCur), UnlockAmt));
 
             ResourceManager.SetButtonEvent
             (
-                ObjectLabel.Fe_Btn,
+                CanvasLabel.Fe_Btn,
                 () =>
                 {
                     Unlock();
 
-                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
         else if (ItemStatus == SkillStatus.Upgrade)
         {
-            ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));
-            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(1));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab0, GetDescription(0));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(1));
 
-            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
             
             ResourceManager.SetButtonEvent
             (
-                ObjectLabel.Fe_Btn,
+                CanvasLabel.Fe_Btn,
                 () =>
                 {
                     Upgrade();
@@ -608,11 +608,11 @@ public class BigSkill : Skill
 
                     ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
 
-                    ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
-                    ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));
-                    ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(1));
+                    ResourceManager.SetText(CanvasLabel.Fe_Tit, Name);
+                    ResourceManager.SetText(CanvasLabel.Fe_Lab0, GetDescription(0));
+                    ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(1));
 
-                    ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+                    ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
                 }
             );
         }

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

@@ -24,7 +24,7 @@ public class Pack : SkillRoot
     {
         get
         {
-            return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID));
+            return Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.SkillName, FullID));
         }
     }
 
@@ -73,7 +73,7 @@ public class Pack : SkillRoot
 
                 if (!string.IsNullOrEmpty(Label))
                 {
-                    LanguageManager.Add(ButtonTitle, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.UI, Label)), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.UI, Label)), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
                 else
                 {
@@ -188,7 +188,7 @@ public class Pack : SkillRoot
 
         DescriptionText.text = GetDescription(0);
 
-        LanguageManager.Add(TitleText, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
+        LanguageManager.Add(TitleText, new MulLanStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
 
 
         IAPManager.BuyProductCallbackDictionary.UniqueAdd(FullID, ()=>OnBuySucceed());
@@ -279,27 +279,27 @@ public class Pack : SkillRoot
     {
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
-        ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
+        ResourceManager.Get(CanvasLabel.Fe_Info).TweenForCG();
 
-        ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
+        ResourceManager.SetText(CanvasLabel.Fe_Tit, Name);
 
-        ResourceManager.SetSprite(ObjectLabel.Fe_Icon, SkillIcon.sprite);
+        ResourceManager.SetSprite(CanvasLabel.Fe_Icon, SkillIcon.sprite);
 
         if (ItemStatus == SkillStatus.Buy)
         {
-            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
-            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab0, "");
+            ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab3), Auxiliary.ImageParse(BuyCur), UseAmt));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab3), Auxiliary.ImageParse(BuyCur), UseAmt));
 
             ResourceManager.SetButtonEvent
             (
-                ObjectLabel.Fe_Btn,
+                CanvasLabel.Fe_Btn,
                 () =>
                 {
                     OnBuy();
 
-                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
@@ -443,7 +443,7 @@ public class Pack : SkillRoot
                     for (int j = 0; j < Flowers.Length; j++)
                     {
                         FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[int.Parse(Flowers[j])];
-                        stringBuilder.Append(Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.FlowerName, flowerInfo.FullID)));
+                        stringBuilder.Append(Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.FlowerName, flowerInfo.FullID)));
 
                         if (j != Flowers.Length - 1)
                         {

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

@@ -369,7 +369,7 @@ public class Skill : SkillRoot
                 GetBuff();
                 GetAward();
 
-                InfoBoxManager.GardenInfoBox.Display(string.Format("{0}{1}", Language.GetStr(LanguageLabel.UI__J_Info1), Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID))), 10f, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Display(string.Format("{0}{1}", Language.GetStr(LanguageLabel.UI__J_Info1), Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.SkillName, FullID))), 10f, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能, 
             StaticsManager.ConsumeModule.Shop
@@ -388,51 +388,51 @@ public class Skill : SkillRoot
             }
             else
             {
-                ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
+                ResourceManager.Get(CanvasLabel.Fe_Info).TweenForCG();
 
-                ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
+                ResourceManager.SetText(CanvasLabel.Fe_Tit, Name);
 
-                ResourceManager.SetSprite(ObjectLabel.Fe_Icon, Icon);
+                ResourceManager.SetSprite(CanvasLabel.Fe_Icon, Icon);
 
-                ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
-                ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
+                ResourceManager.SetText(CanvasLabel.Fe_Lab0, "");
+                ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(0));
 
-                ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab3), Auxiliary.ImageParse(BuyCur), UseAmt));
+                ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab3), Auxiliary.ImageParse(BuyCur), UseAmt));
 
                 ResourceManager.SetButtonEvent
                 (
-                    ObjectLabel.Fe_Btn,
+                    CanvasLabel.Fe_Btn,
                     () =>
                     {
                         Buy();
 
-                        ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                        ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
                     }
                 );
             }
         }
         else if (ItemStatus == SkillStatus.Lock)
         {
-            ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
+            ResourceManager.Get(CanvasLabel.Fe_Info).TweenForCG();
 
-            ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
+            ResourceManager.SetText(CanvasLabel.Fe_Tit, Name);
 
-            ResourceManager.SetSprite(ObjectLabel.Fe_Icon, Icon);
+            ResourceManager.SetSprite(CanvasLabel.Fe_Icon, Icon);
 
 
-            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
-            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(CanvasLabel.Fe_Lab0, "");
+            ResourceManager.SetText(CanvasLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab0), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
+            ResourceManager.SetText(CanvasLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab0), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("0")));
 
             ResourceManager.SetButtonEvent
             (
-                ObjectLabel.Fe_Btn,
+                CanvasLabel.Fe_Btn,
                 () =>
                 {
                     UnlockAhead();
 
-                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(CanvasLabel.Fe_Info).TweenBacCG();
                 }
             );
         }

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

@@ -79,7 +79,7 @@ public abstract class SkillRoot
     {
         get
         {
-            return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillDesc, FullID));
+            return Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.SkillDesc, FullID));
         }
     }
 
@@ -95,11 +95,11 @@ public abstract class SkillRoot
         {
             if (Level == 0)
             {
-                return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID));
+                return Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.SkillName, FullID));
             }
             else
             {
-                return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)) + Level;
+                return Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.SkillName, FullID)) + Level;
             }
         }
     }
@@ -122,11 +122,11 @@ public abstract class SkillRoot
 
             if (Level == 0)
             {
-                LanguageManager.Add(TitleText, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
+                LanguageManager.Add(TitleText, new MulLanStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
             }
             else
             {
-                LanguageManager.Add(TitleText, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)), Level);
+                LanguageManager.Add(TitleText, new MulLanStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.SkillName, FullID)), Level);
             }
         }
     }

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

@@ -63,7 +63,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         PointScreen(arrowPos.position, target);
 
-        ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
+        ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
 
 
         HighLightList.Add(target);
@@ -83,7 +83,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         PointScreen(arrowPos.position, targetPos);
 
-        ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
+        ResourceManager.Get(CanvasLabel.N_Mask).TweenForGra();
 
 
         HighLightList.Add(target);
@@ -103,8 +103,8 @@ public class Tutorial : Regist, IPointerClickHandler
         HighLightList = new List<Transform>();
 
 
-        ResourceManager.Get(ObjectLabel.N_Mask).TweenBacGra();
-        ResourceManager.Get(ObjectLabel.N_Arrow).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.N_Mask).TweenBacGra();
+        ResourceManager.Get(CanvasLabel.N_Arrow).TweenBacCG();
 
         ClearArea();
 
@@ -123,7 +123,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         if (hideArrow)
         {
-            ResourceManager.Get(ObjectLabel.N_Arrow).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.N_Arrow).TweenBacCG();
         }
     }
 
@@ -193,9 +193,9 @@ public class Tutorial : Regist, IPointerClickHandler
 
     public static void ShowDescriptScreen(Vector3 pos)
     {
-        ResourceManager.Get(ObjectLabel.N_LabBK).TweenForCG();
+        ResourceManager.Get(CanvasLabel.N_LabBK).TweenForCG();
 
-        ResourceManager.Get(ObjectLabel.N_LabBK).transform.position = pos;
+        ResourceManager.Get(CanvasLabel.N_LabBK).transform.position = pos;
     }
 
 
@@ -203,7 +203,7 @@ public class Tutorial : Regist, IPointerClickHandler
     {
         pos = Camera.main.WorldToScreenPoint(pos);
 
-        Image image = ResourceManager.Get<Image>(ObjectLabel.N_Button);
+        Image image = ResourceManager.Get<Image>(CanvasLabel.N_Button);
 
         image.transform.position = pos;
 

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

@@ -167,14 +167,14 @@ public class ChestManager : Regist
 
     public override void RegistReference()
     {
-        Create_Button = ResourceManager.Get<Button>(ObjectLabel.Yb_Btn);
-        GuessButton = ResourceManager.Get<Button>(ObjectLabel.Y_Btn);
-        Create_DescriptionText = ResourceManager.Get<Text>(ObjectLabel.Yb_Desc);
-        Create_RoundSlider = ResourceManager.Get<Slider>(ObjectLabel.Yb_Slider);
-        Create_ButtonText = ResourceManager.Get<Text>(ObjectLabel.Yb_BtnLab);
-        Create_InputField = ResourceManager.Get<InputField>(ObjectLabel.Yb_InputField);
-        GuessInputField = ResourceManager.Get<InputField>(ObjectLabel.Y_InputField);
-        Create_SliderValueText = ResourceManager.Get<Text>(ObjectLabel.Yb_SliderValueLab);
+        Create_Button = ResourceManager.Get<Button>(CanvasLabel.Yb_Btn);
+        GuessButton = ResourceManager.Get<Button>(CanvasLabel.Y_Btn);
+        Create_DescriptionText = ResourceManager.Get<Text>(CanvasLabel.Yb_Desc);
+        Create_RoundSlider = ResourceManager.Get<Slider>(CanvasLabel.Yb_Slider);
+        Create_ButtonText = ResourceManager.Get<Text>(CanvasLabel.Yb_BtnLab);
+        Create_InputField = ResourceManager.Get<InputField>(CanvasLabel.Yb_InputField);
+        GuessInputField = ResourceManager.Get<InputField>(CanvasLabel.Y_InputField);
+        Create_SliderValueText = ResourceManager.Get<Text>(CanvasLabel.Yb_SliderValueLab);
 
         GuessInputField.onValueChanged.AddListener(OnGuessInputValueChange);
         OnGuessInputValueChange(null);
@@ -198,10 +198,10 @@ public class ChestManager : Regist
 
     public static void OpenCreateChestPanel()
     {
-        ResourceManager.Get(ObjectLabel.Y_Chest).TweenForCG();
-        ResourceManager.SetActive(ObjectLabel.Ya_GetAward, false);
-        ResourceManager.SetActive(ObjectLabel.Y_Guess, false);
-        ResourceManager.SetActive(ObjectLabel.Yb_CreateChest, true);
+        ResourceManager.Get(CanvasLabel.Y_Chest).TweenForCG();
+        ResourceManager.SetActive(CanvasLabel.Ya_GetAward, false);
+        ResourceManager.SetActive(CanvasLabel.Y_Guess, false);
+        ResourceManager.SetActive(CanvasLabel.Yb_CreateChest, true);
         OnSliderValueChange(Create_RoundSlider.value);
         OnInputValueChange(Create_InputField.text);
         Create_RoundSlider.value = 1;
@@ -210,7 +210,7 @@ public class ChestManager : Regist
 
     public static void CloseCreateChestPanel()
     {
-        ResourceManager.Get(ObjectLabel.Y_Chest).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.Y_Chest).TweenBacCG();
     }
 
     public static void OnLuckyToggle(bool enable)
@@ -251,7 +251,7 @@ public class ChestManager : Regist
         }
 
         Cost = int.Parse(value);
-        ResourceManager.SetText(ObjectLabel.Yb_CostLab, Language.GetStr(LanguageLabel.UI__AA_Cost) + TransferLabel.DiamondSprite + Cost);
+        ResourceManager.SetText(CanvasLabel.Yb_CostLab, Language.GetStr(LanguageLabel.UI__AA_Cost) + TransferLabel.DiamondSprite + Cost);
         if (Manager.Diamond < Cost)
         {
             Create_Button.interactable = false;
@@ -280,15 +280,15 @@ public class ChestManager : Regist
     private static ChestType ChestType = ChestType.Lucky;
     public static void CreateChest()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tip), new MulLanStr(LanguageLabel.UI__AA_SendRequest));
-        ResourceManager.Get(ObjectLabel.Y_Tip).TweenForCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Y_Tip), new MulLanStr(LanguageLabel.UI__AA_SendRequest));
+        ResourceManager.Get(CanvasLabel.Y_Tip).TweenForCG();
 
         int databaseRoomID = SFSManager.GardenSmartFox.PlazaRoomController.CurrentRoomData.ID;
         long serialNumber = long.Parse(HttpManager.SerialNumber);
         Vector3 position = PlayerPosToChestPos(SFSManager.PlazaRoomController.SelfInstance.Player.transform.position);
         SFSManager.PlazaRoomEvent.CreateChest(Round, Cost, ChestType, databaseRoomID, serialNumber, position);
 
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.Y_Chest).interactable = false;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.Y_Chest).interactable = false;
     }
 
     public static Vector3 PlayerPosToChestPos(Vector3 playerPos)
@@ -298,10 +298,10 @@ public class ChestManager : Regist
 
     public static void OnCreateChestError()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateError));
-        ResourceManager.Get(ObjectLabel.Y_Tip).TweenBacCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Y_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateError));
+        ResourceManager.Get(CanvasLabel.Y_Tip).TweenBacCG();
 
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.Y_Chest).interactable = true;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.Y_Chest).interactable = true;
     }
 
     public static void OnCreateChestSucceed()
@@ -320,10 +320,10 @@ public class ChestManager : Regist
             Manager.CreateGuessNumberChestAmt++;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateSucceed));
-        ResourceManager.Get(ObjectLabel.Y_Tip).TweenBacCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.Y_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateSucceed));
+        ResourceManager.Get(CanvasLabel.Y_Tip).TweenBacCG();
 
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.Y_Chest).interactable = true;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.Y_Chest).interactable = true;
 
         Manager.AddDiamond(-Cost, StaticsManager.ItemID.创建宝箱, StaticsManager.ConsumeModule.Charge);
         CloseCreateChestPanel();
@@ -516,11 +516,11 @@ public class ChestManager : Regist
             OperateDataDictionary.Add(chestOperateData.ChestID, chestOperateData);
         }
 
-        ResourceManager.Get<CanvasGroup>(ObjectLabel.Y_Chest).interactable = true;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.Y_Chest).interactable = true;
 
         if (award <= 0)
         {
-            ResourceManager.Get(ObjectLabel.Y_Chest).TweenBacCG();
+            ResourceManager.Get(CanvasLabel.Y_Chest).TweenBacCG();
 
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Y_SoldOut));
         }
@@ -528,12 +528,12 @@ public class ChestManager : Regist
         {
             AudioManager.PlayClip(AudioLabel.GetCurrent);
 
-            ResourceManager.Get(ObjectLabel.Y_Chest).TweenForCG();
-            ResourceManager.SetActive(ObjectLabel.Ya_GetAward, true);
-            ResourceManager.SetActive(ObjectLabel.Y_Guess, false);
-            ResourceManager.SetActive(ObjectLabel.Yb_CreateChest, false);
+            ResourceManager.Get(CanvasLabel.Y_Chest).TweenForCG();
+            ResourceManager.SetActive(CanvasLabel.Ya_GetAward, true);
+            ResourceManager.SetActive(CanvasLabel.Y_Guess, false);
+            ResourceManager.SetActive(CanvasLabel.Yb_CreateChest, false);
 
-            ResourceManager.SetText(ObjectLabel.Ya_Desc, $"x{award}");
+            ResourceManager.SetText(CanvasLabel.Ya_Desc, $"x{award}");
             Manager.AddDiamond(award, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestAward);
 
             Manager.GetChestAwardAmt++;

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

@@ -51,7 +51,7 @@ public class PlazaRoomController
             TweenRoots = new List<TweenRoot>();
 
 
-            NickNameTransform = ResourceManager.Get(ResourceLabel.NickName, Folder.UI, false, ResourceManager.Get(ObjectLabel.W_HudParent), false, ObjType.NickName);
+            NickNameTransform = ResourceManager.Get(ResourceLabel.NickName, Folder.UI, false, ResourceManager.Get(CanvasLabel.W_HudParent), false, ObjType.NickName);
 
             HudTarget hudTarget = NickNameTransform.GetComponent<HudTarget>();
 
@@ -72,7 +72,7 @@ public class PlazaRoomController
                 PlazaroomMemberPanel.AddMemberItem(nickname, serialNumber, joinedTime);
             }
 
-            MessageBox = ResourceManager.Get(ResourceLabel.MessageBox, Folder.UI, false, ResourceManager.Get(ObjectLabel.W_HudParent), false, ObjType.MessageBox);
+            MessageBox = ResourceManager.Get(ResourceLabel.MessageBox, Folder.UI, false, ResourceManager.Get(CanvasLabel.W_HudParent), false, ObjType.MessageBox);
             MessageLab = MessageBox.GetComponentInChildren<BestfitText>();
             MessageLab.VerticalMinSize = MinMessageFontSize;
             MessageLab.VerticalMaxSize = MaxMessageFontSize;
@@ -204,12 +204,12 @@ public class PlazaRoomController
 
         AudioManager.GardenThemeAudio.TweenBacAudio();
 
-        ResourceManager.Get(ObjectLabel.B_SignIn0).TweenBacCG();
-        ResourceManager.Get(ObjectLabel.T_NickName).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.B_SignIn0).TweenBacCG();
+        ResourceManager.Get(CanvasLabel.T_NickName).TweenBacCG();
 
         Manager.SceneSwitchFlag = true;
 
-        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.V_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.V_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
         (
@@ -262,15 +262,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.GardenThemeAudio.TweenForAudio(); }, null, false);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_RoomFull), null, null, () => { ResourceManager.Get(CanvasLabel.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.GardenThemeAudio.TweenForAudio(); }, null, false);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_RoomExpire), null, null, () => { ResourceManager.Get(CanvasLabel.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.GardenThemeAudio.TweenForAudio(); }, null, false);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_Unknown), null, null, () => { ResourceManager.Get(CanvasLabel.V_BlackMask).TweenForCG(); AudioManager.GardenThemeAudio.TweenForAudio(); }, null, false);
             }
         }
     }
@@ -307,13 +307,13 @@ public class PlazaRoomController
 
         GardenSmartFox.PlazaRoomController.PlazaRoomCamera.transform.SetX(GardenSmartFox.PlazaRoomController.CameraLeftBorder);
 
-        ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG();
+        ResourceManager.Get(CanvasLabel.V_BlackMask).TweenForCG();
 
-        ResourceManager.SetActive(ObjectLabel.C_Main2, false);
+        ResourceManager.SetActive(CanvasLabel.C_Main2, false);
         ResourceManager.SetActive(ResourceLabel.Garden, false);
         ResourceManager.SetActive(PlazaRoomLabel.PlazaRoom, true);
-        ResourceManager.SetActive(ObjectLabel.W_HudParent, true);
-        ResourceManager.SetActive(ObjectLabel.X_PlazaRoom, true);
+        ResourceManager.SetActive(CanvasLabel.W_HudParent, true);
+        ResourceManager.SetActive(CanvasLabel.X_PlazaRoom, true);
     }
 
     public bool ExitToVisitFlag;
@@ -324,7 +324,7 @@ public class PlazaRoomController
 
         AudioManager.PartyThemeAudio.TweenBacAudio();
 
-        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.V_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.V_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
         (
@@ -390,18 +390,18 @@ public class PlazaRoomController
         PlazaRoomSky.position = SkyOriginPosition;
         PlazaRoomCamera.transform.position = CameraOriginPosition;
 
-        ResourceManager.SetActive(ObjectLabel.C_Main2, true);
+        ResourceManager.SetActive(CanvasLabel.C_Main2, true);
         ResourceManager.SetActive(ResourceLabel.Garden, true);
         ResourceManager.SetActive(PlazaRoomLabel.PlazaRoom, false);
-        ResourceManager.SetActive(ObjectLabel.W_HudParent, false);
-        ResourceManager.SetActive(ObjectLabel.X_PlazaRoom, false);
+        ResourceManager.SetActive(CanvasLabel.W_HudParent, false);
+        ResourceManager.SetActive(CanvasLabel.X_PlazaRoom, false);
 
-        ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG();
-        ResourceManager.Get(ObjectLabel.B_SignIn0).TweenForCG();
-        ResourceManager.Get(ObjectLabel.T_NickName).TweenForCG();
+        ResourceManager.Get(CanvasLabel.V_BlackMask).TweenForCG();
+        ResourceManager.Get(CanvasLabel.B_SignIn0).TweenForCG();
+        ResourceManager.Get(CanvasLabel.T_NickName).TweenForCG();
 
-        ResourceManager.Get<Text>(ObjectLabel.X_CurrentInfoLab).text = "";
-        Transform tra = ResourceManager.Get(ObjectLabel.X_Info);
+        ResourceManager.Get<Text>(CanvasLabel.X_CurrentInfoLab).text = "";
+        Transform tra = ResourceManager.Get(CanvasLabel.X_Info);
         while (tra.childCount > 0)
         {
             ResourceManager.Save(tra.GetChild(0));
@@ -629,7 +629,7 @@ public class PlazaRoomController
         string message = $"{senderName}:\u3000<({expressionName}按钮)>";
         Color textColor = senderID == SFSManager.GardenSmartFox.User.Id ? Lib.SelfMessage : Lib.OtherMessage;
         InfoBoxManager.PlazaRoomInfoBox.Display(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
-        Text text = ResourceManager.Get<Text>(ObjectLabel.X_CurrentInfoLab);
+        Text text = ResourceManager.Get<Text>(CanvasLabel.X_CurrentInfoLab);
         text.color = textColor;
         text.text = message;
     }
@@ -646,8 +646,8 @@ public class PlazaRoomController
         message = $"{senderName}:\u3000{message}";
         InfoBoxManager.PlazaRoomInfoBox.Display(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
 
-        ResourceManager.SetText(ObjectLabel.X_CurrentInfoLab, message);
-        Text text = ResourceManager.Get<Text>(ObjectLabel.X_CurrentInfoLab);
+        ResourceManager.SetText(CanvasLabel.X_CurrentInfoLab, message);
+        Text text = ResourceManager.Get<Text>(CanvasLabel.X_CurrentInfoLab);
         text.color = textColor;
         text.text = message;
     }

+ 12 - 12
Assets/Script/Social/AddFriendPanel.cs

@@ -53,18 +53,18 @@ public class AddFriendPanel : Regist
 
     public override void RegistReference()
     {
-        Title = ResourceManager.Get<Text>(ObjectLabel.AG_Title);
-        SearchButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AG_SearchButtonTitle);
-        TipText = ResourceManager.Get<Text>(ObjectLabel.AG_TipText);
-        NicknameText = ResourceManager.Get<Text>(ObjectLabel.AG_NicknameText);
-        ChangeButtonUnderline = ResourceManager.Get<Text>(ObjectLabel.AG_ChangeButtonUnderline);
-        ApplyButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AG_ApplyButtonTitle);
-        ApplyButton = ResourceManager.Get<Button>(ObjectLabel.AG_ApplyButton);
-        SearchButton = ResourceManager.Get<Button>(ObjectLabel.AG_SearchButton);
-        ChangeButton = ResourceManager.Get<Button>(ObjectLabel.AG_ChangeButton);
-        CloseButton = ResourceManager.Get<Button>(ObjectLabel.AG_CloseButton);
-        AddFriendPanelMask = ResourceManager.Get(ObjectLabel.AG_AddFriendPanelMask);
-        InputField = ResourceManager.Get<InputField>(ObjectLabel.AG_InputField);
+        Title = ResourceManager.Get<Text>(CanvasLabel.AG_Title);
+        SearchButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AG_SearchButtonTitle);
+        TipText = ResourceManager.Get<Text>(CanvasLabel.AG_TipText);
+        NicknameText = ResourceManager.Get<Text>(CanvasLabel.AG_NicknameText);
+        ChangeButtonUnderline = ResourceManager.Get<Text>(CanvasLabel.AG_ChangeButtonUnderline);
+        ApplyButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AG_ApplyButtonTitle);
+        ApplyButton = ResourceManager.Get<Button>(CanvasLabel.AG_ApplyButton);
+        SearchButton = ResourceManager.Get<Button>(CanvasLabel.AG_SearchButton);
+        ChangeButton = ResourceManager.Get<Button>(CanvasLabel.AG_ChangeButton);
+        CloseButton = ResourceManager.Get<Button>(CanvasLabel.AG_CloseButton);
+        AddFriendPanelMask = ResourceManager.Get(CanvasLabel.AG_AddFriendPanelMask);
+        InputField = ResourceManager.Get<InputField>(CanvasLabel.AG_InputField);
         ChangeButtonTitle = ChangeButton.GetComponent<Text>();
 
         AddFriendPanelMask.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);

+ 2 - 2
Assets/Script/Social/ApplicantItem.cs

@@ -66,10 +66,10 @@ public class ApplicantItem : VirtualScrollRectItem
         AcceptButton.onClick.AddListener(OnAcceptButtonClick);
         RefuseButton.onClick.AddListener(OnRefuseButtonClick);
 
-        VisitButtonTitle.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+        VisitButtonTitle.text = ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text;
         Manager.OnLevelChange += level =>
         {
-            VisitButtonTitle.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+            VisitButtonTitle.text = ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text;
         };
 
         return false;

+ 2 - 2
Assets/Script/Social/FriendItem.cs

@@ -69,10 +69,10 @@ public class FriendItem : VirtualScrollRectItem
         SendMessageButton.onClick.AddListener(OnSendMessageButtonClick);
         DeleteButton.onClick.AddListener(OnDeleteButtonClick);
 
-        VisitButtonTitle.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+        VisitButtonTitle.text = ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text;
         Manager.OnLevelChange += level =>
         {
-            VisitButtonTitle.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+            VisitButtonTitle.text = ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text;
         };
 
         MessagePanel.OnHaveNewMessage += OnHaveNewMessage;

+ 22 - 22
Assets/Script/Social/FriendPanel.cs

@@ -86,28 +86,28 @@ public class FriendPanel : Regist
 
     public override void RegistReference()
     {
-        NicknameTitle = ResourceManager.Get<Text>(ObjectLabel.AF_NicknameTitle);
-        ContentTitle = ResourceManager.Get<Text>(ObjectLabel.AF_ContentTitle);
-        CloseButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AF_CloseButtonTitle);
-        ApplicantTitle = ResourceManager.Get<Text>(ObjectLabel.AF_ApplicantTitle);
-        PanelTitle = ResourceManager.Get<Text>(ObjectLabel.AF_PanelTitle);
-        AcceptAllButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AF_AcceptAllButtonTitle);
-        AddFriendTitle = ResourceManager.Get<Text>(ObjectLabel.AF_AddFriendTitle);
-        FriendAmountText = ResourceManager.Get<Text>(ObjectLabel.AF_FriendAmountText);
-        NewApplicantFlagImage = ResourceManager.Get<Image>(ObjectLabel.AF_NewApplicantFlagImage);
-        AcceptAllButton = ResourceManager.Get<Button>(ObjectLabel.AF_AcceptAllButton);
-        AddFriendButton = ResourceManager.Get<Button>(ObjectLabel.AF_AddFriendButton);
-        CloseButton = ResourceManager.Get<Button>(ObjectLabel.AF_CloseButton);
-        ApplicantButton = ResourceManager.Get<Toggle>(ObjectLabel.AF_ApplicantButton);
-        OpenPanelButton = ResourceManager.Get<Button>(ObjectLabel.C_FriendButton);
-        OpenPanelButtonParent = ResourceManager.Get(ObjectLabel.C_FriendButtonParent);
-        FriendGrid = ResourceManager.Get(ObjectLabel.AF_FriendGrid);
-        ApplicantGrid = ResourceManager.Get(ObjectLabel.AF_ApplicantGrid);
-        FriendPanelParentMask = ResourceManager.Get(ObjectLabel.AF_FriendPanelParent);
-        FriendPanelMask = ResourceManager.Get(ObjectLabel.AF_FriendPanelMask);
-        PanelParentCanvasGroup = ResourceManager.Get<CanvasGroup>(ObjectLabel.AF_FriendPanelParent);
-        FriendScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(ObjectLabel.AF_FriendScrollRect);
-        ApplicantScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(ObjectLabel.AF_ApplicantScrollRect);
+        NicknameTitle = ResourceManager.Get<Text>(CanvasLabel.AF_NicknameTitle);
+        ContentTitle = ResourceManager.Get<Text>(CanvasLabel.AF_ContentTitle);
+        CloseButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AF_CloseButtonTitle);
+        ApplicantTitle = ResourceManager.Get<Text>(CanvasLabel.AF_ApplicantTitle);
+        PanelTitle = ResourceManager.Get<Text>(CanvasLabel.AF_PanelTitle);
+        AcceptAllButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AF_AcceptAllButtonTitle);
+        AddFriendTitle = ResourceManager.Get<Text>(CanvasLabel.AF_AddFriendTitle);
+        FriendAmountText = ResourceManager.Get<Text>(CanvasLabel.AF_FriendAmountText);
+        NewApplicantFlagImage = ResourceManager.Get<Image>(CanvasLabel.AF_NewApplicantFlagImage);
+        AcceptAllButton = ResourceManager.Get<Button>(CanvasLabel.AF_AcceptAllButton);
+        AddFriendButton = ResourceManager.Get<Button>(CanvasLabel.AF_AddFriendButton);
+        CloseButton = ResourceManager.Get<Button>(CanvasLabel.AF_CloseButton);
+        ApplicantButton = ResourceManager.Get<Toggle>(CanvasLabel.AF_ApplicantButton);
+        OpenPanelButton = ResourceManager.Get<Button>(CanvasLabel.C_FriendButton);
+        OpenPanelButtonParent = ResourceManager.Get(CanvasLabel.C_FriendButtonParent);
+        FriendGrid = ResourceManager.Get(CanvasLabel.AF_FriendGrid);
+        ApplicantGrid = ResourceManager.Get(CanvasLabel.AF_ApplicantGrid);
+        FriendPanelParentMask = ResourceManager.Get(CanvasLabel.AF_FriendPanelParent);
+        FriendPanelMask = ResourceManager.Get(CanvasLabel.AF_FriendPanelMask);
+        PanelParentCanvasGroup = ResourceManager.Get<CanvasGroup>(CanvasLabel.AF_FriendPanelParent);
+        FriendScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.AF_FriendScrollRect);
+        ApplicantScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.AF_ApplicantScrollRect);
 
         LanguageManager.Add(NicknameTitle, new MulLanStr(LanguageLabel.UI__AF_NicknameTitle));
         LanguageManager.Add(ContentTitle, new MulLanStr(LanguageLabel.UI__AF_ContentTitle));

+ 15 - 15
Assets/Script/Social/MessagePanel.cs

@@ -80,21 +80,21 @@ public class MessagePanel : Regist
 
     public override void RegistReference()
     {
-        NicknameTitle = ResourceManager.Get<Text>(ObjectLabel.AH_NicknameTitle);
-        ContentTitle = ResourceManager.Get<Text>(ObjectLabel.AH_ContentTitle);
-        TimeTitle = ResourceManager.Get<Text>(ObjectLabel.AH_TimeTitle);
-        PanelTitle = ResourceManager.Get<Text>(ObjectLabel.AH_PanelTitle);
-        PlaceholderTitle = ResourceManager.Get<Text>(ObjectLabel.AH_PlaceholderTitle);
-        InputText = ResourceManager.Get<Text>(ObjectLabel.AH_InputText);
-        SendMessageButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AH_SendMessageButtonTitle);
-        CloseButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AH_CloseButtonTitle);
-        LoadingTitle = ResourceManager.Get<Text>(ObjectLabel.AH_LoadingTitle);
-        CloseButton = ResourceManager.Get<Button>(ObjectLabel.AH_CloseButton);
-        SendMessageButton = ResourceManager.Get<Button>(ObjectLabel.AH_SendMessageButton);
-        Grid = ResourceManager.Get(ObjectLabel.AH_Grid);
-        MessagePanelMask = ResourceManager.Get(ObjectLabel.AH_MessagePanelMask);
-        InputField = ResourceManager.Get<InputField>(ObjectLabel.AH_InputField);
-        ScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(ObjectLabel.AH_ScrollRect);
+        NicknameTitle = ResourceManager.Get<Text>(CanvasLabel.AH_NicknameTitle);
+        ContentTitle = ResourceManager.Get<Text>(CanvasLabel.AH_ContentTitle);
+        TimeTitle = ResourceManager.Get<Text>(CanvasLabel.AH_TimeTitle);
+        PanelTitle = ResourceManager.Get<Text>(CanvasLabel.AH_PanelTitle);
+        PlaceholderTitle = ResourceManager.Get<Text>(CanvasLabel.AH_PlaceholderTitle);
+        InputText = ResourceManager.Get<Text>(CanvasLabel.AH_InputText);
+        SendMessageButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AH_SendMessageButtonTitle);
+        CloseButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AH_CloseButtonTitle);
+        LoadingTitle = ResourceManager.Get<Text>(CanvasLabel.AH_LoadingTitle);
+        CloseButton = ResourceManager.Get<Button>(CanvasLabel.AH_CloseButton);
+        SendMessageButton = ResourceManager.Get<Button>(CanvasLabel.AH_SendMessageButton);
+        Grid = ResourceManager.Get(CanvasLabel.AH_Grid);
+        MessagePanelMask = ResourceManager.Get(CanvasLabel.AH_MessagePanelMask);
+        InputField = ResourceManager.Get<InputField>(CanvasLabel.AH_InputField);
+        ScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.AH_ScrollRect);
         ScrollRect.Init(MaxRollAmount, MaxChildAmount, GetNextItem, GetPreviousItem, OnSaveItem);
 
         LoadingTitle.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);

+ 1 - 1
Assets/Script/Social/PlazaroomMemberItem.cs

@@ -81,7 +81,7 @@ public class PlazaroomMemberItem : MonoBehaviour
 
         LanguageManager.Add(AddFriendTitle, new MulLanStr(LanguageLabel.PlazaroomMemberItem__AddFriend));
 
-        VisitButtonTitle.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+        VisitButtonTitle.text = ResourceManager.Get<Text>(CanvasLabel.C_CostLab).text;
 
         VisitButton.onClick.AddListener(OnVisitButtonClick);
         AddFriendButton.onClick.AddListener(OnAddFriendButtonClick);

+ 12 - 12
Assets/Script/Social/PlazaroomMemberPanel.cs

@@ -29,18 +29,18 @@ public class PlazaroomMemberPanel : Regist
 
     public override void RegistReference()
     {
-        PanelTitle = ResourceManager.Get<Text>(ObjectLabel.AE_PanelTitle);
-        ContentTitle = ResourceManager.Get<Text>(ObjectLabel.AE_ContentTitle);
-        FriendFilterTitle = ResourceManager.Get<Text>(ObjectLabel.AE_FriendFilterTitle);
-        NicknameTitle = ResourceManager.Get<Text>(ObjectLabel.AE_NicknameTitle);
-        CloseButtonTitle = ResourceManager.Get<Text>(ObjectLabel.AE_CloseButtonTitle);
-        CloseButton = ResourceManager.Get<Button>(ObjectLabel.AE_CloseButton);
-        MemberButton = ResourceManager.Get<Button>(ObjectLabel.X_MemberButton);
-        FriendFilterButton = ResourceManager.Get<Button>(ObjectLabel.AE_FriendFilterButton);
-        FriendListButton = ResourceManager.Get<Button>(ObjectLabel.AE_FriendListButton);
-        FilterImage = ResourceManager.Get<Image>(ObjectLabel.AE_FriendFilterIcon);
-        Grid = ResourceManager.Get(ObjectLabel.AE_Grid);
-        PanelMask = ResourceManager.Get(ObjectLabel.AE_PlazaroomMemberPanelMask);
+        PanelTitle = ResourceManager.Get<Text>(CanvasLabel.AE_PanelTitle);
+        ContentTitle = ResourceManager.Get<Text>(CanvasLabel.AE_ContentTitle);
+        FriendFilterTitle = ResourceManager.Get<Text>(CanvasLabel.AE_FriendFilterTitle);
+        NicknameTitle = ResourceManager.Get<Text>(CanvasLabel.AE_NicknameTitle);
+        CloseButtonTitle = ResourceManager.Get<Text>(CanvasLabel.AE_CloseButtonTitle);
+        CloseButton = ResourceManager.Get<Button>(CanvasLabel.AE_CloseButton);
+        MemberButton = ResourceManager.Get<Button>(CanvasLabel.X_MemberButton);
+        FriendFilterButton = ResourceManager.Get<Button>(CanvasLabel.AE_FriendFilterButton);
+        FriendListButton = ResourceManager.Get<Button>(CanvasLabel.AE_FriendListButton);
+        FilterImage = ResourceManager.Get<Image>(CanvasLabel.AE_FriendFilterIcon);
+        Grid = ResourceManager.Get(CanvasLabel.AE_Grid);
+        PanelMask = ResourceManager.Get(CanvasLabel.AE_PlazaroomMemberPanelMask);
 
         LanguageManager.Add(PanelTitle, new MulLanStr(LanguageLabel.UI__AE_Title));
         LanguageManager.Add(ContentTitle, new MulLanStr(LanguageLabel.UI__AE_JoinedTimeTitle));

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

@@ -65,33 +65,33 @@ public class Language
 
         if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
         {
-            ResourceManager.Get<Button>(ObjectLabel.L_TraChi).interactable = true;
-            ResourceManager.Get<Button>(ObjectLabel.L_SimChi).interactable = true;
-            ResourceManager.Get<Button>(ObjectLabel.L_English).interactable = false;
+            ResourceManager.Get<Button>(CanvasLabel.L_TraChi).interactable = true;
+            ResourceManager.Get<Button>(CanvasLabel.L_SimChi).interactable = true;
+            ResourceManager.Get<Button>(CanvasLabel.L_English).interactable = false;
 
-            ResourceManager.Get<Button>(ObjectLabel.L_TraChi).image.color = Lib.LightGray;
-            ResourceManager.Get<Button>(ObjectLabel.L_SimChi).image.color = Lib.LightGray;
-            ResourceManager.Get<Button>(ObjectLabel.L_English).image.color = Lib.Orange;
+            ResourceManager.Get<Button>(CanvasLabel.L_TraChi).image.color = Lib.LightGray;
+            ResourceManager.Get<Button>(CanvasLabel.L_SimChi).image.color = Lib.LightGray;
+            ResourceManager.Get<Button>(CanvasLabel.L_English).image.color = Lib.Orange;
         }
         else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
         {
-            ResourceManager.Get<Button>(ObjectLabel.L_TraChi).interactable = true;
-            ResourceManager.Get<Button>(ObjectLabel.L_SimChi).interactable = false;
-            ResourceManager.Get<Button>(ObjectLabel.L_English).interactable = true;
+            ResourceManager.Get<Button>(CanvasLabel.L_TraChi).interactable = true;
+            ResourceManager.Get<Button>(CanvasLabel.L_SimChi).interactable = false;
+            ResourceManager.Get<Button>(CanvasLabel.L_English).interactable = true;
 
-            ResourceManager.Get<Button>(ObjectLabel.L_TraChi).image.color = Lib.LightGray;
-            ResourceManager.Get<Button>(ObjectLabel.L_SimChi).image.color = Lib.Orange;
-            ResourceManager.Get<Button>(ObjectLabel.L_English).image.color = Lib.LightGray;
+            ResourceManager.Get<Button>(CanvasLabel.L_TraChi).image.color = Lib.LightGray;
+            ResourceManager.Get<Button>(CanvasLabel.L_SimChi).image.color = Lib.Orange;
+            ResourceManager.Get<Button>(CanvasLabel.L_English).image.color = Lib.LightGray;
         }
         else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
         {
-            ResourceManager.Get<Button>(ObjectLabel.L_TraChi).interactable = false;
-            ResourceManager.Get<Button>(ObjectLabel.L_SimChi).interactable = true;
-            ResourceManager.Get<Button>(ObjectLabel.L_English).interactable = true;
+            ResourceManager.Get<Button>(CanvasLabel.L_TraChi).interactable = false;
+            ResourceManager.Get<Button>(CanvasLabel.L_SimChi).interactable = true;
+            ResourceManager.Get<Button>(CanvasLabel.L_English).interactable = true;
 
-            ResourceManager.Get<Button>(ObjectLabel.L_TraChi).image.color = Lib.Orange;
-            ResourceManager.Get<Button>(ObjectLabel.L_SimChi).image.color = Lib.LightGray;
-            ResourceManager.Get<Button>(ObjectLabel.L_English).image.color = Lib.LightGray;
+            ResourceManager.Get<Button>(CanvasLabel.L_TraChi).image.color = Lib.Orange;
+            ResourceManager.Get<Button>(CanvasLabel.L_SimChi).image.color = Lib.LightGray;
+            ResourceManager.Get<Button>(CanvasLabel.L_English).image.color = Lib.LightGray;
         }
     }
 

+ 0 - 86
Assets/Script/Tool/LabelUtility/Editor/LabelUtilityLabelUtilityWindow.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using AtlasUtility;
-using UnityEditor;
-using UnityEngine;
-
-public class LabelUtilityWindow : EditorWindow
-{
-    #region Config
-
-    protected LabelUtility Instance;
-
-    protected SerializedProperty Script;
-    protected SerializedProperty Languages;
-    protected SerializedProperty Prefabs;
-
-    protected SerializedObject SerializedObject;
-
-    #endregion
-
-    [MenuItem("DashGame/LabelUtility")]
-    protected static void ShowWindow()
-    {
-        Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
-
-        LabelUtilityWindow window = GetWindow<LabelUtilityWindow>(inspectorType);
-
-        window.titleContent = new GUIContent("LabelUtility");
-        window.Show();
-    }
-
-    private void OnEnable()
-    {
-        Instance = InstanceManager.SearchInstance<LabelUtility>();
-        SerializedObject = new SerializedObject(Instance);
-
-        Script = SerializedObject.FindProperty("Script");
-        Languages = SerializedObject.FindProperty("Languages");
-        Prefabs = SerializedObject.FindProperty("Prefabs");
-    }
-
-    private void OnGUI()
-    {
-        SerializedObject.Update();
-
-        EditorGUILayout.PropertyField(Script, new GUIContent("Script"));
-        EditorGUILayout.PropertyField(Prefabs, new GUIContent("Prefabs"), true);
-        EditorGUILayout.PropertyField(Languages, new GUIContent("Languages"), true);
-
-        if (GUILayout.Button("ClearLabels"))
-        {
-            Instance.ClearLabels(true);
-        }
-
-        if (GUILayout.Button("CreateLabelFromPrefabs"))
-        {
-           Instance.CreateLabelFromPrefabs();
-        }
-
-        if (GUILayout.Button("ClearAndCreateLabelFromPrefabs"))
-        {
-            Instance.CreateLabelFromPrefabs();
-        }
-
-        if (GUILayout.Button("CreateLabelFromLanguage"))
-        {
-            Instance.CreateLabelFromLanguage();
-        }
-
-        if (GUILayout.Button("ClearAndCreateLabelFromLanguage"))
-        {
-            Instance.CreateLabelFromLanguage();
-        }
-
-        //if (GUILayout.Button("ReplaceLanguageLabels"))
-        //{
-        //    Instance.ReplaceLanguageLabels();
-        //}
-
-        SerializedObject.ApplyModifiedProperties();
-    }
-}

+ 0 - 246
Assets/Script/Tool/LabelUtility/LabelUtility.cs

@@ -1,246 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml;
-#if UNITY_EDITOR
-using UnityEditor;
-#endif
-using UnityEngine;
-using AtlasUtility;
-
-public class LabelUtility : MonoBehaviour
-{
-    #region Config
-
-    public TextAsset Script;
-    public List<TextAsset> Languages;
-    public List<GameObject> Prefabs;
-
-    public static string Mark = "//Mark";
-    public static string Prefix = "public static string ";
-    public static string LanguagePageSeperator = "__";
-
-    #endregion
-
-    #if UNITY_EDITOR
-    public void ClearLabels(bool showWarning)
-    {
-        if (showWarning)
-        {
-            if (!EditorUtility.DisplayDialog("注意", "清空所有标签?", "确定", "取消"))
-            {
-                return;
-            }
-        }
-
-        string path = AssetDatabase.GetAssetPath(Script);
-        string fileStr = File.ReadAllText(path);
-        fileStr = Regex.Replace(fileStr, "(?<=\\{)[^\\}]*(?=\\})", $"\r\n\t{Mark}\r\n");
-        File.WriteAllText(path, fileStr);
-    }
-
-    public void CreateLabelFromPrefabs()
-    {
-        if (EditorUtility.DisplayDialog("注意", "新建Prefab标签?", "确定", "取消"))
-        {
-            StringBuilder stringBuilder = new StringBuilder(Script.text);
-            foreach (var prefab in Prefabs)
-            {
-                CreateLabel(prefab, stringBuilder);
-            }
-            string path = AssetDatabase.GetAssetPath(Script);
-            File.WriteAllText(path, stringBuilder.ToString());
-        }
-    }
-
-    public void ClearAndCreateLabelFromPrefabs()
-    {
-        ClearLabels(false);
-        CreateLabelFromPrefabs();
-    }
-
-    private void CreateLabel(GameObject prefab, StringBuilder stringBuilder)
-    {
-        Transform[] transforms = prefab.GetComponentsInChildren<Transform>(true);
-        Match match = Regex.Match(stringBuilder.ToString(), Mark);
-        if (match.Success)
-        {
-            stringBuilder.Replace(Mark, "", match.Index, match.Length);
-            int insertIndex = match.Index + 2;
-            for (int i = 0; i < transforms.Length; i++)
-            {
-                string insertStr = $"\t{Prefix}{transforms[i].name} = \"{transforms[i].name}\";";
-                stringBuilder.Insert(insertIndex, insertStr);
-                insertIndex += insertStr.Length;
-
-                if (i < transforms.Length - 1)
-                {
-                    stringBuilder.Insert(insertIndex, "\r\n");
-                    insertIndex += 2;
-                }
-                else if (i == transforms.Length - 1)
-                {
-                    stringBuilder.Insert(insertIndex, $"\r\n\t{Mark}\r\n");
-                }
-            }
-        }
-        else
-        {
-            throw new Exception("没有找到标记");
-        }
-    }
-
-    public void CreateLabelFromLanguage()
-    {
-        if (EditorUtility.DisplayDialog("注意", "新建Language标签?", "确定", "取消"))
-        {
-            StringBuilder stringBuilder = new StringBuilder(Script.text);
-            foreach (var language in Languages)
-            {
-                XmlDocument document = new XmlDocument();
-                document.LoadXml(language.text);
-                CreateLabelFromLanguageDocument(document, stringBuilder);
-            }
-            string path = AssetDatabase.GetAssetPath(Script);
-            File.WriteAllText(path, stringBuilder.ToString());
-        }
-    }
-
-    private void CreateLabelFromLanguageDocument(XmlDocument document, StringBuilder stringBuilder)
-    {
-        XmlNodeList childNodes = document.SelectSingleNode("lan").ChildNodes;
-        for (int i = 0; i < childNodes.Count; i++)
-        {
-            CreateLabel(childNodes[i], stringBuilder);
-        }
-    }
-
-    public void ClearAndCreateLabelFromLanguageDocument()
-    {
-        ClearLabels(false);
-        CreateLabelFromLanguage();
-    }
-
-    private void CreateLabel(XmlNode node, StringBuilder stringBuilder)
-    {
-        Match match = Regex.Match(stringBuilder.ToString(), Mark);
-        if (match.Success)
-        {
-            stringBuilder.Replace(Mark, "", match.Index, match.Length);
-            int insertIndex = match.Index + 2;
-            for (int i = 0; i < node.ChildNodes.Count; i++)
-            {
-                XmlNode childNode = node.ChildNodes[i];
-                string insertStr;
-                if (i == 0)
-                {
-                    insertStr = $"\t{Prefix}{node.Name} = \"{node.Name}\";\r\n";
-                    stringBuilder.Insert(insertIndex, insertStr);
-                    insertIndex += insertStr.Length;
-                }
-                insertStr = $"\t{Prefix}{node.Name}{LanguagePageSeperator}{childNode.Name} = \"{node.Name}{LanguagePageSeperator}{childNode.Name}\";";
-                stringBuilder.Insert(insertIndex, insertStr);
-                insertIndex += insertStr.Length;
-
-                if (i < node.ChildNodes.Count - 1)
-                {
-                    stringBuilder.Insert(insertIndex, "\r\n");
-                    insertIndex += 2;
-                }
-                else if (i == node.ChildNodes.Count - 1)
-                {
-                    stringBuilder.Insert(insertIndex, $"\r\n\t{Mark}\r\n");
-                }
-            }
-        }
-        else
-        {
-            throw new Exception("没有找到标记");
-        }
-    }
-    #endif
-
-    public static string CombineLanguageLabel(string page, string id)
-    {
-        return $"{page}{LanguagePageSeperator}{id}";
-    }
-
-    //public void ReplaceLabels()
-    //{
-    //    Transform[] transforms = Prefabs[0].GetComponentsInChildren<Transform>(true);
-    //    string[] pathes = Directory.GetFiles(Application.dataPath, "*.cs", SearchOption.AllDirectories);
-    //    foreach (var path in pathes)
-    //    {
-    //        if (path.Contains("PrefabLabel"))
-    //        {
-    //            continue;
-    //        }
-
-    //        string fileStr = File.ReadAllText(path);
-
-    //        foreach (var transform in transforms)
-    //        {
-    //            if (transform.name == "Canvas")
-    //            {
-    //                continue;
-    //            }
-
-    //            fileStr = Regex.Replace(fileStr, $"\"{transform.name}\"", $"PrefabLabel.{transform.name}");
-    //        }
-
-    //        File.WriteAllText(path, fileStr);
-    //    }
-    //}
-
-    //public void TestReplaceLabels()
-    //{
-    //    Transform[] transforms = Prefabs[0].GetComponentsInChildren<Transform>(true);
-    //    string path = AssetDatabase.GetAssetPath(TextAsset);
-    //    string fileStr = File.ReadAllText(path);
-
-    //    foreach (var transform in transforms)
-    //    {
-    //        if (transform.name == "Canvas")
-    //        {
-    //            continue;
-    //        }
-
-    //        fileStr = Regex.Replace(fileStr, $"\"{transform.name}\"", $"PrefabLabel.{transform.name}");
-    //    }
-
-    //    File.WriteAllText(path, fileStr);
-    //}
-
-    //public void ReplaceLanguageLabels()
-    //{
-    //    string[] pathes = Directory.GetFiles(Application.dataPath, "*.cs", SearchOption.AllDirectories);
-    //    foreach (var path in pathes)
-    //    {
-    //        ReplaceLanguageLabel(path);
-    //    }
-    //}
-
-    //public void ReplaceLanguageLabel(string path)
-    //{
-    //    string fileStr = File.ReadAllText(path);
-    //    string pattern = "(?<=Language\\.GetStr\\()[^\\)]+(?=\\))|(?<=MulLanStr\\()[^\\)]+(?=\\))";
-    //    Match match = Regex.Match(fileStr, pattern);
-    //    while (match.Success)
-    //    {
-    //        string[] strings = match.Value.Replace(" ", "").Split(',');
-    //        if (strings.Length == 1)
-    //        {
-    //            match = match.NextMatch();
-    //        }
-    //        else
-    //        {
-    //            fileStr = fileStr.ReplaceByLength(match.Index, match.Length, $"LanguageLabel.{strings[0].Trim('"')}{LanguagePageSeperator}{strings[1].Trim('"')}");
-    //            match = Regex.Match(fileStr, pattern);
-    //        }
-    //    }
-    //    File.WriteAllText(path, fileStr);
-    //}
-}

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

@@ -26,16 +26,16 @@ public class Bubble : Regist
             return true;
         }
 
-        Box = ResourceManager.Get(ObjectLabel.K_Bubble0);
-        Background = ResourceManager.Get(ObjectLabel.K_Bubble);
+        Box = ResourceManager.Get(CanvasLabel.K_Bubble0);
+        Background = ResourceManager.Get(CanvasLabel.K_Bubble);
 
-        Tit = ResourceManager.Get<Text>(ObjectLabel.K_Tit);
-        Lab = ResourceManager.Get<Text>(ObjectLabel.K_Lab);
-        NotifyLab = ResourceManager.Get<Text>(ObjectLabel.K_NotifyLab);
-        Icon = ResourceManager.Get<Image>(ObjectLabel.K_Icon);
+        Tit = ResourceManager.Get<Text>(CanvasLabel.K_Tit);
+        Lab = ResourceManager.Get<Text>(CanvasLabel.K_Lab);
+        NotifyLab = ResourceManager.Get<Text>(CanvasLabel.K_NotifyLab);
+        Icon = ResourceManager.Get<Image>(CanvasLabel.K_Icon);
 
-        Cancel = ResourceManager.Get<Button>(ObjectLabel.K_Cancel);
-        Confirm = ResourceManager.Get<Button>(ObjectLabel.K_Confirm);
+        Cancel = ResourceManager.Get<Button>(CanvasLabel.K_Cancel);
+        Confirm = ResourceManager.Get<Button>(CanvasLabel.K_Confirm);
 
         Box.CreateTweenScale(Vector3.zero, Vector3.one, 0.25f, false, true, Curve.EaseOutQuad);
 

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

@@ -41,7 +41,7 @@ public class Toast : Regist
         Transform = transform;
 
         transform.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-        transform.CreateTweenVec2D(ResourceManager.Get(ObjectLabel.O_Pos).position, 0.25f, false, false, true, Curve.EaseOutQuad);
+        transform.CreateTweenVec2D(ResourceManager.Get(CanvasLabel.O_Pos).position, 0.25f, false, false, true, Curve.EaseOutQuad);
 
         return false;
     }

+ 1 - 0
Assets/Tookits/LabelUtility/Editor/LabelUtilityWindow.cs

@@ -38,6 +38,7 @@ public class LabelUtilityWindow : EditorWindow
     private void OnEnable()
     {
         Instance = InstanceManager.SearchInstance<LabelUtility>();
+   
         SerializedObject = new SerializedObject(Instance);
 
         LabelSets = SerializedObject.FindProperty("LabelSets");

+ 0 - 7
Assets/Tookits/LabelUtility/LabelUtility.cs

@@ -247,13 +247,6 @@ public class LabelUtility : MonoBehaviour
         return transforms;
     }
 }
-
-/*To be delete
-    //private static string GetDefinedName(string str)
-    //{
-    //    return Regex.Match(str, "(?<=string)[^=]+(?=\\=)").Value.Trim();
-    //}
-*/
 #endif
 
 

+ 19 - 6
Assets/Tookits/LabelUtility/LabelUtility.prefab

@@ -19,7 +19,7 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 4977813053446552}
-  - component: {fileID: 114188865886771778}
+  - component: {fileID: 114902767536926886}
   m_Layer: 0
   m_Name: LabelUtility
   m_TagString: Untagged
@@ -40,7 +40,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114188865886771778
+--- !u!114 &114902767536926886
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
@@ -48,9 +48,22 @@ MonoBehaviour:
   m_GameObject: {fileID: 1594177319052792}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e4a9dafa00b004e4e94c57cd88b01101, type: 3}
+  m_Script: {fileID: 11500000, guid: c191ef3fc5b89274696e54e8d5314e1a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Script: {fileID: 0}
-  Languages: []
-  Prefabs: []
+  LabelSets:
+  - Name: CanvasLabel
+    LabelScriptPath: 
+    LabelScriptName: 
+    LabePrefix: public static string
+    LabelScript: {fileID: 11500000, guid: 1615e3353e063d443bf237fb8aade024, type: 3}
+    ComponentScriptPath: 
+    ComponentScriptName: 
+    ComponentPrefix: 
+    ComponentScript: {fileID: 0}
+    Languages: []
+    Prefabs:
+    - {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+    FoldOut: 1
+    TotalHeight: 414
+    ComponentPurviews: 

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