Browse Source

替换语言字符串

LiuQilin 7 years ago
parent
commit
a9b83186da
53 changed files with 1305 additions and 1302 deletions
  1. 7 7
      Assets/Resource/Prefab/PrefabUI/Canvas.prefab
  2. 1 1
      Assets/Script/Function/ThanksGift.cs
  3. 1 1
      Assets/Script/Label/LanguageLabel.cs
  4. 8 8
      Assets/Script/Label/ObjectLabel.cs
  5. 0 0
      Assets/Script/Label/ObjectLabel.cs.meta
  6. 13 13
      Assets/Script/Manage/AchieveManager.cs
  7. 4 4
      Assets/Script/Manage/AnnounceManager.cs
  8. 13 13
      Assets/Script/Manage/AudioManager.cs
  9. 1 1
      Assets/Script/Manage/DebugManager.cs
  10. 31 31
      Assets/Script/Manage/GardenManager.cs
  11. 23 23
      Assets/Script/Manage/HttpManager.cs
  12. 19 19
      Assets/Script/Manage/IAPManager.cs
  13. 2 2
      Assets/Script/Manage/InfoBoxManager.cs
  14. 10 10
      Assets/Script/Manage/Initializer.cs
  15. 1 7
      Assets/Script/Manage/LanguageManager.cs
  16. 62 62
      Assets/Script/Manage/Manager.cs
  17. 208 208
      Assets/Script/Manage/MiniGameManager.cs
  18. 19 19
      Assets/Script/Manage/NickNameManager.cs
  19. 50 50
      Assets/Script/Manage/PlazaRoomManager.cs
  20. 9 9
      Assets/Script/Manage/ResourceManager.cs
  21. 64 64
      Assets/Script/Manage/SignManager.cs
  22. 22 22
      Assets/Script/Manage/SocialManager.cs
  23. 136 136
      Assets/Script/Manage/TutorialManager.cs
  24. 193 193
      Assets/Script/Manage/UIManager.cs
  25. 37 35
      Assets/Script/Manage/VisitManager.cs
  26. 3 3
      Assets/Script/Object/ADChest.cs
  27. 2 2
      Assets/Script/Object/CommentItem.cs
  28. 1 1
      Assets/Script/Object/DropDiamond.cs
  29. 1 1
      Assets/Script/Object/DropGold.cs
  30. 17 17
      Assets/Script/Object/Flower.cs
  31. 3 3
      Assets/Script/Object/Garden.cs
  32. 44 39
      Assets/Script/Object/Player.cs
  33. 23 23
      Assets/Script/Object/PlazaRoomChest.cs
  34. 9 9
      Assets/Script/Object/PlazaRoomItem.cs
  35. 2 2
      Assets/Script/Object/RankItem.cs
  36. 41 41
      Assets/Script/Object/Skill/Ability.cs
  37. 27 27
      Assets/Script/Object/Skill/BigSkill.cs
  38. 18 17
      Assets/Script/Object/Skill/Pack.cs
  39. 27 27
      Assets/Script/Object/Skill/Skill.cs
  40. 5 5
      Assets/Script/Object/Skill/SkillRoot.cs
  41. 1 1
      Assets/Script/Object/Slot.cs
  42. 1 1
      Assets/Script/Object/Star.cs
  43. 8 8
      Assets/Script/Object/Tutorial.cs
  44. 40 40
      Assets/Script/SFS/Manager/ChestManager.cs
  45. 28 28
      Assets/Script/SFS/Manager/PlazaRoomController.cs
  46. 2 2
      Assets/Script/ThirdParty/Alipay/AlipayManager.cs
  47. 4 4
      Assets/Script/Tool/Auxiliary.cs
  48. 18 18
      Assets/Script/Tool/DashGame/Language.cs
  49. 4 4
      Assets/Script/Tool/LabelUtility/Editor/LabelUtilityLabelUtilityWindow.cs
  50. 29 29
      Assets/Script/Tool/LabelUtility/LabelUtility.cs
  51. 2 1
      Assets/Script/Tool/LabelUtility/SerializeObject.prefab
  52. 9 9
      Assets/Script/Tool/UI/Bubble.cs
  53. 2 2
      Assets/Script/Tool/UI/Toast.cs

+ 7 - 7
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -361,7 +361,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224823986724501370}
   m_Layer: 5
-  m_Name: AAa_Fill Area
+  m_Name: AAa_FillArea
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1275,7 +1275,7 @@ GameObject:
   - component: {fileID: 199111776308985300}
   - component: {fileID: 198796749136035602}
   m_Layer: 5
-  m_Name: H_UIParticle System
+  m_Name: H_UIParticleSystem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4930,7 +4930,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224521353109076628}
   m_Layer: 5
-  m_Name: AAa_Handle Slide Area
+  m_Name: AAa_HandleSlideArea
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8235,7 +8235,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224254914947534298}
   m_Layer: 5
-  m_Name: Yb_Fill Area
+  m_Name: Yb_FillArea
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8754,7 +8754,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224972636750745400}
   m_Layer: 5
-  m_Name: AAb_Fill Area
+  m_Name: AAb_FillArea
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9200,7 +9200,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224763430984373628}
   m_Layer: 5
-  m_Name: Yb_Handle Slide Area
+  m_Name: Yb_HandleSlideArea
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -11028,7 +11028,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224216105693868578}
   m_Layer: 5
-  m_Name: AAb_Handle Slide Area
+  m_Name: AAb_HandleSlideArea
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

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

@@ -238,7 +238,7 @@ public class ThanksGift
                     Init(jData);
                     getGift(packID);
                 },
-                () => Bubble.Show(null, Language.GetStr("UI", "GetThanksGiftInfoFailed")
+                () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)
                 )
             );
         }

+ 1 - 1
Assets/Script/Label/LanguageLabel.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 
 using UnityEngine;

+ 8 - 8
Assets/Script/Label/PrefabLabel.cs → Assets/Script/Label/ObjectLabel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 using UnityEngine;
 
-public class PrefabLabel
+public class ObjectLabel
 {
 	public static string Canvas = "Canvas";
 	public static string E_Debug = "E_Debug";
@@ -383,7 +383,7 @@ public class PrefabLabel
 	public static string H_UIFlashLight = "H_UIFlashLight";
 	public static string H_UIFlash = "H_UIFlash";
 	public static string H_UIFlash2 = "H_UIFlash2";
-	public static string H_UIParticleSystem = "H_UIParticle System";
+	public static string H_UIParticleSystem = "H_UIParticleSystem";
 	public static string H_Icon2 = "H_Icon2";
 	public static string H_ArrowPos = "H_ArrowPos";
 	public static string H_Close = "H_Close";
@@ -525,17 +525,17 @@ public class PrefabLabel
 	public static string AAa_Tit = "AAa_Tit";
 	public static string AAa_ValueLab = "AAa_ValueLab";
 	public static string AAa_Background = "AAa_Background";
-	public static string AAa_FillArea = "AAa_Fill Area";
+	public static string AAa_FillArea = "AAa_FillArea";
 	public static string AAa_Fill = "AAa_Fill";
-	public static string AAa_HandleSlideArea = "AAa_Handle Slide Area";
+	public static string AAa_HandleSlideArea = "AAa_HandleSlideArea";
 	public static string AAa_Handle = "AAa_Handle";
 	public static string AAb_Slider = "AAb_Slider";
 	public static string AAb_Tit = "AAb_Tit";
 	public static string AAb_ValueLab = "AAb_ValueLab";
 	public static string AAb_Background = "AAb_Background";
-	public static string AAb_FillArea = "AAb_Fill Area";
+	public static string AAb_FillArea = "AAb_FillArea";
 	public static string AAb_Fill = "AAb_Fill";
-	public static string AAb_HandleSlideArea = "AAb_Handle Slide Area";
+	public static string AAb_HandleSlideArea = "AAb_HandleSlideArea";
 	public static string AAb_Handle = "AAb_Handle";
 	public static string AA_Tip = "AA_Tip";
 	public static string W_HudParent = "W_HudParent";
@@ -596,9 +596,9 @@ public class PrefabLabel
 	public static string Yb_SliderTit = "Yb_SliderTit";
 	public static string Yb_SliderValueLab = "Yb_SliderValueLab";
 	public static string Yb_Background = "Yb_Background";
-	public static string Yb_FillArea = "Yb_Fill Area";
+	public static string Yb_FillArea = "Yb_FillArea";
 	public static string Yb_Fill = "Yb_Fill";
-	public static string Yb_HandleSlideArea = "Yb_Handle Slide Area";
+	public static string Yb_HandleSlideArea = "Yb_HandleSlideArea";
 	public static string Yb_Handle = "Yb_Handle";
 	public static string Yb_Desc = "Yb_Desc";
 	public static string Yb_CostLab = "Yb_CostLab";

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


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

@@ -47,11 +47,11 @@ public class Achieve
 
     private string NameLanLabel
     {
-        get { return LabelUtility.ConbineLanguageLabel(LanguageLabel.AchieveName,FullID); }
+        get { return LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveName,FullID); }
     }
     private string DescLanLabel
     {
-        get { return LabelUtility.ConbineLanguageLabel(LanguageLabel.AchieveDesc, FullID); }
+        get { return LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveDesc, FullID); }
     }
     public string FullID
     {
@@ -175,7 +175,7 @@ public class Achieve
         Button.onClick.RemoveAllListeners();
         Button.onClick.AddListener(GetAward);
 
-        LanguageManager.Add(Tit, new MulLanStr("AchieveName", FullID));
+        LanguageManager.Add(Tit, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.AchieveName, FullID)));
 
 
         if (Lock)
@@ -328,7 +328,7 @@ public class Achieve
 
         Button.image.material = null;
 
-        LanguageManager.Add(BtnLab, new MulLanStr("Object", "AchieveItem_BtnLab2"));
+        LanguageManager.Add(BtnLab, new MulLanStr(LanguageLabel.Object__AchieveItem_BtnLab2));
     }
 
     public void ToProcess(double value)
@@ -344,7 +344,7 @@ public class Achieve
 
         List<object> objList = new List<object>();
         
-        objList.Add(new MulLanStr("Object", "AchieveItem_BtnLab0"));
+        objList.Add(new MulLanStr(LanguageLabel.Object__AchieveItem_BtnLab0));
         objList.Add("\n");
 
         if (!DiamondOnce.Equal(0))
@@ -354,14 +354,14 @@ public class Achieve
 
         if (!CoinPerson.Equal(0))
         {
-            objList.Add(new MulLanStr("Common", "CoinPerson"));
+            objList.Add(new MulLanStr(LanguageLabel.Common__CoinPerson));
             objList.Add("+");
             objList.Add(CoinPerson.ToString("0") + " ");
         }
 
         if (!Person.Equal(0))
         {
-            objList.Add(new MulLanStr("Common", "Person"));
+            objList.Add(new MulLanStr(LanguageLabel.Common__Person));
             objList.Add("+");
             objList.Add(Person.ToString("0") + " ");
         }
@@ -387,7 +387,7 @@ public class Achieve
 
         List<object> objList = new List<object>();
 
-        objList.Add(new MulLanStr("Object", "AchieveItem_BtnLab1"));
+        objList.Add(new MulLanStr(LanguageLabel.Object__AchieveItem_BtnLab1));
         objList.Add("\n");
 
         if (!DiamondOnce.Equal(0))
@@ -397,14 +397,14 @@ public class Achieve
 
         if (!CoinPerson.Equal(0))
         {
-            objList.Add(new MulLanStr("Common", "CoinPerson"));
+            objList.Add(new MulLanStr(LanguageLabel.Common__CoinPerson));
             objList.Add("+");
             objList.Add(CoinPerson.ToString("0") + " ");
         }
 
         if (!Person.Equal(0))
         {
-            objList.Add(new MulLanStr("Common", "Person"));
+            objList.Add(new MulLanStr(LanguageLabel.Common__Person));
             objList.Add("+");
             objList.Add(Person.ToString("0") + " ");
         }
@@ -574,7 +574,7 @@ public class AchieveManager : Regist
         }
 
 
-        TweenOutline tween = ResourceManager.Get<Outline>(PrefabLabel.C_Achieve).GetTweenOutline();
+        TweenOutline tween = ResourceManager.Get<Outline>(ObjectLabel.C_Achieve).GetTweenOutline();
 
         if (tween == null)
         {
@@ -619,7 +619,7 @@ public class AchieveManager : Regist
     private static int MaxDisplayAmt = 4;
     public static void OpenAchievePanel()
     {
-        TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.M_Achieve0).TweenForVec();
+        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.M_Achieve0).TweenForVec();
 
         AudioManager.PlayClip(Clip.BtnClip);
 
@@ -640,7 +640,7 @@ public class AchieveManager : Regist
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ScrollRect scrollRect = ResourceManager.Get<ScrollRect>(PrefabLabel.M_Scrr);
+                    ScrollRect scrollRect = ResourceManager.Get<ScrollRect>(ObjectLabel.M_Scrr);
                     int index = completedAchieve.AchieveItem.GetSiblingIndex();
                     if (index < scrollRect.content.childCount - MaxDisplayAmt)
                     {

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

@@ -66,14 +66,14 @@ public class AnnounceManager
 
         AudioManager.PlayClip(Clip.BubbleClip);
 
-        ResourceManager.Get(PrefabLabel.R_Notify).TweenForCG();
+        ResourceManager.Get(ObjectLabel.R_Notify).TweenForCG();
 
         Auxiliary.Instance.DelayCall
         (
             () =>
             {
-                ResourceManager.Get<VerticalLayoutGroup>(PrefabLabel.R_Grid).CalculateLayoutInputVertical();
-                ResourceManager.Get<VerticalLayoutGroup>(PrefabLabel.R_Grid).SetLayoutVertical();
+                ResourceManager.Get<VerticalLayoutGroup>(ObjectLabel.R_Grid).CalculateLayoutInputVertical();
+                ResourceManager.Get<VerticalLayoutGroup>(ObjectLabel.R_Grid).SetLayoutVertical();
             },
             1
         );
@@ -87,7 +87,7 @@ public class AnnounceManager
 
         for (int i = 0; i < contents.Count; i++)
         {
-            Transform transform = ResourceManager.Get("NotifyItem", Folder.UI, false, ResourceManager.Get(PrefabLabel.R_Grid), false);
+            Transform transform = ResourceManager.Get("NotifyItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.R_Grid), false);
 
             if (contents[i].IsImage)
             {

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

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 using System.Collections;
 using System.Collections.Generic;
@@ -152,14 +152,14 @@ public class AudioManager : Regist
 
         if (!Music)
         {
-            ResourceManager.SetActive(PrefabLabel.L_MusicOn, false);
-            ResourceManager.SetActive(PrefabLabel.L_MusicOff, true);
+            ResourceManager.SetActive(ObjectLabel.L_MusicOn, false);
+            ResourceManager.SetActive(ObjectLabel.L_MusicOff, true);
         }
 
         if (!Audio)
         {
-            ResourceManager.SetActive(PrefabLabel.L_AudioOn, false);
-            ResourceManager.SetActive(PrefabLabel.L_AudioOff, true);
+            ResourceManager.SetActive(ObjectLabel.L_AudioOn, false);
+            ResourceManager.SetActive(ObjectLabel.L_AudioOff, true);
         }
     }
 
@@ -206,8 +206,8 @@ public class AudioManager : Regist
         {
             Music = false;
 
-            ResourceManager.SetActive(PrefabLabel.L_MusicOn, false);
-            ResourceManager.SetActive(PrefabLabel.L_MusicOff, true);
+            ResourceManager.SetActive(ObjectLabel.L_MusicOn, false);
+            ResourceManager.SetActive(ObjectLabel.L_MusicOff, true);
             
             MusicMini.Pause();
             MusicTheme.Pause();
@@ -219,8 +219,8 @@ public class AudioManager : Regist
         {
             Music = true;
 
-            ResourceManager.SetActive(PrefabLabel.L_MusicOn, true);
-            ResourceManager.SetActive(PrefabLabel.L_MusicOff, false);
+            ResourceManager.SetActive(ObjectLabel.L_MusicOn, true);
+            ResourceManager.SetActive(ObjectLabel.L_MusicOff, false);
 
             MusicMini.UnPause();
             MusicPartyTheme.UnPause();
@@ -244,8 +244,8 @@ public class AudioManager : Regist
         {
             Audio = false;
 
-            ResourceManager.SetActive(PrefabLabel.L_AudioOn, false);
-            ResourceManager.SetActive(PrefabLabel.L_AudioOff, true);
+            ResourceManager.SetActive(ObjectLabel.L_AudioOn, false);
+            ResourceManager.SetActive(ObjectLabel.L_AudioOff, true);
 
             PlayerPrefs.SetInt(Lib.AudioPrefs, 0);
         }
@@ -253,8 +253,8 @@ public class AudioManager : Regist
         {
             Audio = true;
 
-            ResourceManager.SetActive(PrefabLabel.L_AudioOn, true);
-            ResourceManager.SetActive(PrefabLabel.L_AudioOff, false);
+            ResourceManager.SetActive(ObjectLabel.L_AudioOn, true);
+            ResourceManager.SetActive(ObjectLabel.L_AudioOff, false);
 
             PlayerPrefs.SetInt(Lib.AudioPrefs, 1);
         }

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

@@ -19,7 +19,7 @@ public class DebugManager : MonoBehaviour
         {
             if (Lab_ == null)
             {
-                Lab = ResourceManager.Get<Text>(PrefabLabel.E_ScrrLab, false);
+                Lab = ResourceManager.Get<Text>(ObjectLabel.E_ScrrLab, false);
             }
 
             return Lab_;

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

@@ -46,7 +46,7 @@ public class GardenManager : Regist
         {
             Slot_ = value;
 
-            ResourceManager.SetText(PrefabLabel.G_CollectLab2, string.Format("{0}/{1}", Slot_, Page * 9));
+            ResourceManager.SetText(ObjectLabel.G_CollectLab2, string.Format("{0}/{1}", Slot_, Page * 9));
         }
     }
     public static int Page
@@ -62,8 +62,8 @@ public class GardenManager : Regist
 
             AchieveManager.UpdateStatus(AchieveType.FlowerAmt, MyFlower_);
 
-            ResourceManager.SetText(PrefabLabel.F_FlowerLab, string.Format("{0}", MyFlower));
-            ResourceManager.SetText(PrefabLabel.G_CollectLab1, string.Format("{0}/{1}", MyFlower, TotalFlower));
+            ResourceManager.SetText(ObjectLabel.F_FlowerLab, string.Format("{0}", MyFlower));
+            ResourceManager.SetText(ObjectLabel.G_CollectLab1, string.Format("{0}/{1}", MyFlower, TotalFlower));
 
             if (MyFlower_ >= TutorialManager.MinFlowerForFindGame && Manager.Level >= TutorialManager.FindMinigameTutorialLevel)
             {
@@ -343,10 +343,10 @@ public class GardenManager : Regist
 
     public override void RegistReference()
     {
-        RetrieveButton = ResourceManager.Get<Button>(PrefabLabel.H_Btn);
-        RetrieveButtonLab = ResourceManager.Get<Text>(PrefabLabel.H_BtnLab);
-        PurchaseButton = ResourceManager.Get<Button>(PrefabLabel.H_Btn1);
-        PurchaseButtonLab = ResourceManager.Get<Text>(PrefabLabel.H_BtnLab1);
+        RetrieveButton = ResourceManager.Get<Button>(ObjectLabel.H_Btn);
+        RetrieveButtonLab = ResourceManager.Get<Text>(ObjectLabel.H_BtnLab);
+        PurchaseButton = ResourceManager.Get<Button>(ObjectLabel.H_Btn1);
+        PurchaseButtonLab = ResourceManager.Get<Text>(ObjectLabel.H_BtnLab1);
     }
 
 
@@ -442,12 +442,12 @@ public class GardenManager : Regist
 
         SeleInfo = flowerInfo;
 
-        ResourceManager.Get(PrefabLabel.H_FlowerCard).TweenForCG();
-        ResourceManager.SetText(PrefabLabel.H_Lab, flowerInfo.Name);
+        ResourceManager.Get(ObjectLabel.H_FlowerCard).TweenForCG();
+        ResourceManager.SetText(ObjectLabel.H_Lab, flowerInfo.Name);
 
         SetPlantStatus(flowerInfo);
 
-        Image image = ResourceManager.Get<Image>(PrefabLabel.H_Icon2);
+        Image image = ResourceManager.Get<Image>(ObjectLabel.H_Icon2);
         image.material = material;
         image.sprite = flowerInfo.Icon;
         image.Resize(true, 0.6125f, 0.6125f);
@@ -456,7 +456,7 @@ public class GardenManager : Regist
     private static void SetRetrieveBtn(Button button, Text buttonLab, Slot seleSlot = null)
     {
         RetrieveButton = button;
-        buttonLab.text = Language.GetStr("UI", PrefabLabel.H_BtnLab1);
+        buttonLab.text = Language.GetStr(LanguageLabel.UI__H_BtnLab1);
         button.image.material = null;
         button.onClick.RemoveAllListeners();
         button.onClick.AddListener
@@ -474,14 +474,14 @@ public class GardenManager : Regist
     {
         if (flowerInfo.UnlockCur == Current.Free)
         {
-            buttonLab.text = Language.GetStr("UI", "H_BtnLab2");
+            buttonLab.text = Language.GetStr(LanguageLabel.UI__H_BtnLab2);
             button.image.material = Lib.GrayMat;
             button.onClick.RemoveAllListeners();
             button.onClick.AddListener
             (
                 () =>
                 {
-                    Bubble.Show(null, Language.GetStr("UI", "H_BtnLab3"));
+                    Bubble.Show(null, Language.GetStr(LanguageLabel.UI__H_BtnLab3));
                 }
             );
         }
@@ -509,7 +509,7 @@ public class GardenManager : Regist
 
                             AudioManager.PlayClip(Clip.CurrentClip);
 
-                            ResourceManager.Get(PrefabLabel.H_Icon1).FindChild($"{PrefabLabel.H_UIFlashLight}/{PrefabLabel.H_UIParticleSystem}").GetComponent<UIPartical>().Begin();
+                            ResourceManager.Get(ObjectLabel.H_Icon1).FindChild($"{ObjectLabel.H_UIFlashLight}/{ObjectLabel.H_UIParticleSystem}").GetComponent<UIPartical>().Begin();
                         },
                         StaticsManager.ItemID.解锁花朵,
                         StaticsManager.ConsumeModule.Shop,
@@ -517,15 +517,15 @@ public class GardenManager : Regist
                         false,
                         () =>
                         {
-                            ResourceManager.Get(PrefabLabel.H_FlowerCard).TweenBacCG();
-                            TweenCG tweenCg = ResourceManager.Get(PrefabLabel.G_Flower).TweenBacCG();
+                            ResourceManager.Get(ObjectLabel.H_FlowerCard).TweenBacCG();
+                            TweenCG tweenCg = ResourceManager.Get(ObjectLabel.G_Flower).TweenBacCG();
 
                             tweenCg.AddEventOnetime
                             (
                                 EventType.BackwardFinish,
                                 () =>
                                 {
-                                    ResourceManager.Get(PrefabLabel.F_Manage0).TweenForVec();
+                                    ResourceManager.Get(ObjectLabel.F_Manage0).TweenForVec();
                                 }
                             );
                         }
@@ -539,18 +539,18 @@ public class GardenManager : Regist
     {
         if (flowerInfo.RemainAmount == 0)
         {
-            ResourceManager.Get<Button>(PrefabLabel.H_Icon2).interactable = false;
-            ResourceManager.SetActive(PrefabLabel.H_AmtLab, false);
-            ResourceManager.SetActive(PrefabLabel.H_Desc, false);
-            ResourceManager.SetActive(PrefabLabel.H_Rotate, false);
+            ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = false;
+            ResourceManager.SetActive(ObjectLabel.H_AmtLab, false);
+            ResourceManager.SetActive(ObjectLabel.H_Desc, false);
+            ResourceManager.SetActive(ObjectLabel.H_Rotate, false);
         }
         else
         {
-            ResourceManager.SetActive(PrefabLabel.H_Desc, true);
-            ResourceManager.Get<Button>(PrefabLabel.H_Icon2).interactable = true;
-            ResourceManager.SetActive(PrefabLabel.H_AmtLab, true);
-            ResourceManager.SetText(PrefabLabel.H_AmtLab, "x" + flowerInfo.RemainAmount);
-            ResourceManager.SetActive(PrefabLabel.H_Rotate, true);
+            ResourceManager.SetActive(ObjectLabel.H_Desc, true);
+            ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = true;
+            ResourceManager.SetActive(ObjectLabel.H_AmtLab, true);
+            ResourceManager.SetText(ObjectLabel.H_AmtLab, "x" + flowerInfo.RemainAmount);
+            ResourceManager.SetActive(ObjectLabel.H_Rotate, true);
         }
     }
 
@@ -564,17 +564,17 @@ public class GardenManager : Regist
 
     private static void PlayFlowerCardMatTween()
     {
-        if (ResourceManager.Get<Image>(PrefabLabel.H_Icon2).material != Lib.GrayMat)
+        if (ResourceManager.Get<Image>(ObjectLabel.H_Icon2).material != Lib.GrayMat)
         {
             return;
         }
 
-        Material material = new Material(ResourceManager.Get<Image>(PrefabLabel.H_Icon2).material);
+        Material material = new Material(ResourceManager.Get<Image>(ObjectLabel.H_Icon2).material);
 
         MaterialUnit materialUnit = new MaterialUnit
         (
             material,
-            ResourceManager.Get(PrefabLabel.H_Icon2),
+            ResourceManager.Get(ObjectLabel.H_Icon2),
             new List<string>()
             {
                 "_GrayLerp",
@@ -590,7 +590,7 @@ public class GardenManager : Regist
 
         FlowerCardMatTween.OnForwardFinish = () =>
         {
-            ResourceManager.Get<Image>(PrefabLabel.H_Icon2).material = null;
+            ResourceManager.Get<Image>(ObjectLabel.H_Icon2).material = null;
         };
 
         materialUnit.TweenForMatFloat();
@@ -653,7 +653,7 @@ public class GardenManager : Regist
 
         if (slot == null)
         {
-            Bubble.Show(null, Language.GetStr("Common", "NoValidSlot"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.Common__NoValidSlot));
         }
         else
         {

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

@@ -216,11 +216,11 @@ public class HttpManager : Regist
                 }
                 else if (data.Contains("Could not resolve host"))
                 {
-                    failCallback.Invoke(Language.GetStr("UI", "Fg_Lab3"));
+                    failCallback.Invoke(Language.GetStr(LanguageLabel.UI__Fg_Lab3));
                 }
                 else
                 {
-                    failCallback.Invoke(Language.GetStr("UI", "T_RepeatName"));
+                    failCallback.Invoke(Language.GetStr(LanguageLabel.UI__T_RepeatName));
                 }
             },
             URLRequest.Method.POST
@@ -425,7 +425,7 @@ public class HttpManager : Regist
 
         if (Initializer.Complete)
         {
-            ResourceManager.Get(PrefabLabel.C_Notify).TweenForCG();
+            ResourceManager.Get(ObjectLabel.C_Notify).TweenForCG();
         }
 
         //Debug.Log("Done");
@@ -505,12 +505,12 @@ public class HttpManager : Regist
             {
                 if (data == "{\"error\":0}")
                 {
-                    Bubble.Show(Language.GetStr("UI", "Q_CommentDone"));
+                    Bubble.Show(Language.GetStr(LanguageLabel.UI__Q_CommentDone));
                     SocialManager.UpdatePage(false);
                 }
                 else
                 {
-                    Bubble.Show(Language.GetStr("UI", "Q_CommentFail"));
+                    Bubble.Show(Language.GetStr(LanguageLabel.UI__Q_CommentFail));
                 }
             },
             URLRequest.Method.POST
@@ -650,7 +650,7 @@ public class HttpManager : Regist
 
                 pack.OnBuySucceed();
 
-                Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(PrefabLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
+                Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
 
                 float newSpriteSize = 0.35f;
 
@@ -664,7 +664,7 @@ public class HttpManager : Regist
 
                 mailItem.GetChild(2).GetComponent<Text>().text = pack.Name;
 
-                InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {TransferLabel.PackSprite}{pack.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.PackSprite}{pack.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
             }
             else
             {
@@ -687,7 +687,7 @@ public class HttpManager : Regist
                         PlayerManager.BoughtCloseList.UniqueAdd(idList[i]);
                     }
 
-                    Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(PrefabLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
+                    Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
 
                     float newSize = 0.6f;
                     float newSpriteSize = closeItem.PixelSize*newSize/closeItem.Sprites[0].rect.width;
@@ -712,7 +712,7 @@ public class HttpManager : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = closeItem.Name;
 
-                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {TransferLabel.CloseSprite}{closeItem.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CloseSprite}{closeItem.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
                 }
                 else
                 {
@@ -731,7 +731,7 @@ public class HttpManager : Regist
                 {
                     flowerInfo.Add();
 
-                    Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(PrefabLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
+                    Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
 
                     float newSpriteSize = 0.225f;
 
@@ -745,7 +745,7 @@ public class HttpManager : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = flowerInfo.Name;
 
-                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {TransferLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
                 }
                 else
                 {
@@ -757,7 +757,7 @@ public class HttpManager : Regist
         {
             Manager.AddCoin(double.Parse(mailReward.Value), StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Mail);
 
-            Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(PrefabLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
+            Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
 
             float newSpriteSize = 0.75f;
 
@@ -771,13 +771,13 @@ public class HttpManager : Regist
 
             mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {TransferLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
         else if (mailReward.Key == "diamond")
         {
             Manager.AddDiamond(double.Parse(mailReward.Value), StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Mail);
 
-            Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(PrefabLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
+            Transform mailItem = ResourceManager.Get("MailItem", Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
 
             float newSpriteSize = 0.75f;
 
@@ -791,7 +791,7 @@ public class HttpManager : Regist
 
             mailItem.GetChild(2).GetComponent<Text>().text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr("Common", "Get")} {TransferLabel.DiamondSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.DiamondSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
         else
         {
@@ -943,7 +943,7 @@ public class HttpManager : Regist
 
                     if (Initializer.Complete)
                     {
-                        ResourceManager.SetText(PrefabLabel.L_UserLab, ID);
+                        ResourceManager.SetText(ObjectLabel.L_UserLab, ID);
                     }
                 }
 
@@ -1100,25 +1100,25 @@ public class HttpManager : Regist
 
     public static void Report()
     {
-        ResourceManager.Get(PrefabLabel.Lb_Info).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Lb_Info).TweenBacCG();
 
-        string emailAddress = ResourceManager.Get<Text>(PrefabLabel.Lb_InputLab0).text;
+        string emailAddress = ResourceManager.Get<Text>(ObjectLabel.Lb_InputLab0).text;
 
         if (string.IsNullOrEmpty(emailAddress) || !emailAddress.Contains("@"))
         {
-            Bubble.Show(null, Language.GetStr("UI", "Lb_Send3"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Lb_Send3));
             return;
         }
 
-        string content = ResourceManager.Get<Text>(PrefabLabel.Lb_InputLab).text;
+        string content = ResourceManager.Get<Text>(ObjectLabel.Lb_InputLab).text;
 
         if (string.IsNullOrEmpty(content))
         {
-            Bubble.Show(null, Language.GetStr("UI", "Lb_Send2"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Lb_Send2));
         }
         else if(ReportContent == content)
         {
-            Bubble.Show(null, Language.GetStr("UI", "Lb_Send1"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Lb_Send1));
         }
         else
         {
@@ -1139,7 +1139,7 @@ public class HttpManager : Regist
             smtpClient.Credentials = new MyCredentials("dashgamegarden@163.com", "cs670cs");
             smtpClient.SendAsync(mailMessage, "Async");
 
-            Bubble.Show(null, Language.GetStr("UI", "Lb_Send0"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Lb_Send0));
         }
     }
 

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

@@ -109,15 +109,15 @@ public class IAPManager : MonoBehaviour, IStoreListener
         
         //GameObject.Find(PrefabLabel.I_Lab).GetComponent<Text>().text = "Error Code : AD";
 
-        GameObject.Find(PrefabLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I1";
+        GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I1";
 
         InitializeIAP();
 
-        GameObject.Find(PrefabLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I2";
+        GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I2";
 
         ADPlayTime = DateTime.Parse(ConfigManager.GetPlayerString("ADPlayTime"));
 
-        GameObject.Find(PrefabLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I3";
+        GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I3";
 
         //InitializeShare();
 
@@ -238,7 +238,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
         }
         else
         {
-            Bubble.Show(null, Language.GetStr("IAP", "LoadAd"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__LoadAd));
         }
     }
     
@@ -255,11 +255,11 @@ public class IAPManager : MonoBehaviour, IStoreListener
         }
         else if (showResult == ShowResult.Skipped)
         {
-            Bubble.Show(null, Language.GetStr("IAP", "IncompleteAd"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__IncompleteAd));
         }
         else if (showResult == ShowResult.Failed)
         {
-            Bubble.Show(null, Language.GetStr("IAP", "FailAd"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__FailAd));
         }
     }
 
@@ -270,14 +270,14 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
         //if (freeze)
         //{
-        //    Bubble.Show(null, Language.GetStr("IAP", "TemporarilyUnavailible"));
+        //    Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__TemporarilyUnavailible));
 
         //    return;
         //}
 
         if (!Complete)
         {
-            Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
 
             InitializeIAP();
 
@@ -286,7 +286,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
         if (!ProductList.Contains(ProductIdDic[str]))
         {
-            Bubble.Show(null, Language.GetStr("IAP", "PurchaseUnvalid"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseUnvalid));
 
             return;
         }
@@ -298,7 +298,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
                 ThanksGift.Init(jData);
                 PurchaseCore(str);
             },
-            () => { Bubble.Show(null, Language.GetStr("UI", "GetThanksGiftInfoFailed")); }
+            () => { Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)); }
         );
     }
 
@@ -341,12 +341,12 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public void OnPurchaseFailed(Product i, PurchaseFailureReason p)
     {
-        Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));
+        Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
     }
 
     public PurchaseProcessingResult ProcessPurchase(PurchaseEventArgs e)
     {
-        Bubble.Show(null, Language.GetStr("IAP", "PurchaseSuccess"));
+        Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseSuccess));
 
         string packName = PackNameDic[e.purchasedProduct.definition.id];
 
@@ -360,8 +360,8 @@ public class IAPManager : MonoBehaviour, IStoreListener
     {
         ShareContent shareContent = new ShareContent();
 
-        shareContent.SetText(Language.GetStr("Common", "ShareContent"));
-        shareContent.SetTitle(Language.GetStr("Common", "ShareTit"));
+        shareContent.SetText(Language.GetStr(LanguageLabel.Common__ShareContent));
+        shareContent.SetTitle(Language.GetStr(LanguageLabel.Common__ShareTit));
         shareContent.SetTitleUrl(Language.GetShareUrl());
 
         shareContent.SetSite(Language.GetShareUrl());
@@ -393,8 +393,8 @@ public class IAPManager : MonoBehaviour, IStoreListener
     {
         if (!string.IsNullOrEmpty(ImagePath))
         {
-            ResourceManager.SetActive(PrefabLabel.P_Open, true);
-            ResourceManager.SetActive(PrefabLabel.P_Share, true);
+            ResourceManager.SetActive(ObjectLabel.P_Open, true);
+            ResourceManager.SetActive(ObjectLabel.P_Share, true);
 
             ImagePath = null;
         }
@@ -403,15 +403,15 @@ public class IAPManager : MonoBehaviour, IStoreListener
         {
             Manager.ShareAmt++;
             
-            Bubble.Show(null, Language.GetStr("Common", "ShareSuccess"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.Common__ShareSuccess));
         }
         else if (state == ResponseState.Fail)
         {
-            Bubble.Show(null, Language.GetStr("Common", "ShareFail"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.Common__ShareFail));
         }
         else if (state == ResponseState.Cancel)
         {
-            Bubble.Show(null, Language.GetStr("Common", "ShareFail"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.Common__ShareFail));
         }
     }
 

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

@@ -147,8 +147,8 @@ public class InfoBoxManager : Regist
 
     public override void FirstInit()
     {
-        GardenInfoBox = new InfoBox(MaxGardenInfoCount, 45f, ResourceLabel.GardenInfoItem, true, ObjType.C_InfoItem,  ResourceManager.Get(PrefabLabel.C_Info));
-        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, Mathf.Infinity, ResourceLabel.PlazaInfoItem, true, ObjType.X_InfoItem, ResourceManager.Get(PrefabLabel.X_Info));
+        GardenInfoBox = new InfoBox(MaxGardenInfoCount, 45f, ResourceLabel.GardenInfoItem, true, ObjType.C_InfoItem,  ResourceManager.Get(ObjectLabel.C_Info));
+        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, Mathf.Infinity, ResourceLabel.PlazaInfoItem, true, ObjType.X_InfoItem, ResourceManager.Get(ObjectLabel.X_Info));
     }
 
     public void Update()

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

@@ -154,8 +154,8 @@ public class Initializer : MonoBehaviour
         }
         catch (Exception e)
         {
-            GameObject.Find(PrefabLabel.Canvas).GetChild(0).SetActive(true);
-            GameObject.Find(PrefabLabel.Canvas).GetChild(1).SetActive(true);
+            GameObject.Find(ObjectLabel.Canvas).GetChild(0).SetActive(true);
+            GameObject.Find(ObjectLabel.Canvas).GetChild(1).SetActive(true);
             GameObject.Find("Text").GetComponent<Text>().text = progress + "\n" + e;
 
             throw new Exception();
@@ -201,7 +201,7 @@ public class Initializer : MonoBehaviour
     public static Text DebugLab;
     public static void Initialize()
     {
-        DebugLab = GameObject.Find(PrefabLabel.U_DebugLab).GetComponent<Text>();
+        DebugLab = GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>();
         
         DebugLab.text = "Error code : 1";
 
@@ -291,7 +291,7 @@ public class Initializer : MonoBehaviour
 
         if (HttpManager.NotificationReady)
         {
-            ResourceManager.Get(PrefabLabel.C_Notify).TweenForCG();
+            ResourceManager.Get(ObjectLabel.C_Notify).TweenForCG();
         }
 
         DebugLab.text = "Error code : 7";
@@ -327,24 +327,24 @@ public class Initializer : MonoBehaviour
 
     private static void ShowLoadingPanel()
     {
-        ResourceManager.Get(PrefabLabel.U_Group).TweenForCG();
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.C_Main).alpha = 0;
+        ResourceManager.Get(ObjectLabel.U_Group).TweenForCG();
+        ResourceManager.Get<CanvasGroup>(ObjectLabel.C_Main).alpha = 0;
 
         Auxiliary.Instance.DelayCall(ActivateGame, 3f);
     }
 
     private static void ActivateGame()
     {
-        ResourceManager.Get(PrefabLabel.U_LoadingPanel).TweenForCG();
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.C_Main).alpha = 1;
+        ResourceManager.Get(ObjectLabel.U_LoadingPanel).TweenForCG();
+        ResourceManager.Get<CanvasGroup>(ObjectLabel.C_Main).alpha = 1;
 
         AudioManager.MusicTheme.TweenForAudio();
     }
 
     public static void EnableDebugLab()
     {
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.U_Group).alpha = 0;
-        ResourceManager.Get<Text>(PrefabLabel.U_DebugLab).enabled = true;
+        ResourceManager.Get<CanvasGroup>(ObjectLabel.U_Group).alpha = 0;
+        ResourceManager.Get<Text>(ObjectLabel.U_DebugLab).enabled = true;
         throw new Exception();
     }
 

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

@@ -27,15 +27,9 @@ public class MulLanStr
         ID = strings[1];
     }
 
-    public MulLanStr(string id, string page)
-    {
-        ID = id;
-        Page = page;
-    }
-
     public override string ToString()
     {
-        return Language.GetStr(ID, Page);
+        return Language.GetStr(Page, ID);
     }
 }
 

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

@@ -251,11 +251,11 @@ public class Manager : Regist
 
             if (Level < TutorialManager.DressroomTutorialLevel)
             {
-                ResourceManager.Get<Image>(PrefabLabel.C_DressRoom).material = Lib.GrayMat;
+                ResourceManager.Get<Image>(ObjectLabel.C_DressRoom).material = Lib.GrayMat;
             }
             else
             {
-                ResourceManager.Get<Image>(PrefabLabel.C_DressRoom).material = null;
+                ResourceManager.Get<Image>(ObjectLabel.C_DressRoom).material = null;
             }
 
             if (GardenManager.MyFlower >= TutorialManager.MinFlowerForFindGame && Level_ >= TutorialManager.FindMinigameTutorialLevel)
@@ -275,7 +275,7 @@ public class Manager : Regist
                 }
                 else
                 {
-                    ResourceManager.SetActive(PrefabLabel.C_Visit, true);
+                    ResourceManager.SetActive(ObjectLabel.C_Visit, true);
                 }
             }
 
@@ -297,7 +297,7 @@ public class Manager : Regist
                 }
                 else
                 {
-                    ResourceManager.SetActive(PrefabLabel.C_EnterPlazaRoom, true);
+                    ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom, true);
                 }
             }
         }
@@ -309,7 +309,7 @@ public class Manager : Regist
         {
             Person_ = value;
 
-            ResourceManager.SetText(PrefabLabel.F_PersonLab, (60*(Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
+            ResourceManager.SetText(ObjectLabel.F_PersonLab, (60*(Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
         }
     }
     public static float SkillPerson
@@ -319,7 +319,7 @@ public class Manager : Regist
         {
             SkillPerson_ = value;
 
-            TweenOutline tween = ResourceManager.Get(PrefabLabel.F_PersonLab).GetTweenOutline();
+            TweenOutline tween = ResourceManager.Get(ObjectLabel.F_PersonLab).GetTweenOutline();
 
             if (SkillPerson_.Equal(0))
             {
@@ -341,7 +341,7 @@ public class Manager : Regist
                 }
             }
 
-            ResourceManager.SetText(PrefabLabel.F_PersonLab, (60*(Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
+            ResourceManager.SetText(ObjectLabel.F_PersonLab, (60*(Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
         }
     }
     public static float CoinPerson
@@ -351,7 +351,7 @@ public class Manager : Regist
         {
             CoinPerson_ = value;
 
-            ResourceManager.SetText(PrefabLabel.F_CoinPersonLab, (CoinPerson_ + SkillCoinPerson_).ToString("0"));
+            ResourceManager.SetText(ObjectLabel.F_CoinPersonLab, (CoinPerson_ + SkillCoinPerson_).ToString("0"));
         }
     }
     public static float SkillPersonBuff
@@ -361,7 +361,7 @@ public class Manager : Regist
         {
             SkillPersonBuff_ = value;
 
-            ResourceManager.SetText(PrefabLabel.F_PersonLab, (60 * (Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
+            ResourceManager.SetText(ObjectLabel.F_PersonLab, (60 * (Person_ * (1 + SkillPersonBuff_) + SkillPerson_)).ToString("0"));
         }
     }
     public static float SkillCoinPerson
@@ -371,7 +371,7 @@ public class Manager : Regist
         {
             SkillCoinPerson_ = value;
 
-            TweenOutline tween = ResourceManager.Get(PrefabLabel.F_CoinPersonLab).GetTweenOutline();
+            TweenOutline tween = ResourceManager.Get(ObjectLabel.F_CoinPersonLab).GetTweenOutline();
 
             if (SkillCoinPerson_.Equal(0))
             {
@@ -393,7 +393,7 @@ public class Manager : Regist
                 }
             }
 
-            ResourceManager.SetText(PrefabLabel.F_CoinPersonLab, (CoinPerson_ + SkillCoinPerson_).ToString("0"));
+            ResourceManager.SetText(ObjectLabel.F_CoinPersonLab, (CoinPerson_ + SkillCoinPerson_).ToString("0"));
         }
     }
 
@@ -409,9 +409,9 @@ public class Manager : Regist
         {
             Coin_ = value;
             
-            ResourceManager.SetText(PrefabLabel.F_CoinLab, Auxiliary.ShrinkNumberStr(Coin_));
-            ResourceManager.SetText(PrefabLabel.C_CoinLab, Auxiliary.ShrinkNumberStr(Coin_));
-            ResourceManager.SetText(PrefabLabel.P_CoinLab, Auxiliary.ShrinkNumberStr(Coin_));
+            ResourceManager.SetText(ObjectLabel.F_CoinLab, Auxiliary.ShrinkNumberStr(Coin_));
+            ResourceManager.SetText(ObjectLabel.C_CoinLab, Auxiliary.ShrinkNumberStr(Coin_));
+            ResourceManager.SetText(ObjectLabel.P_CoinLab, Auxiliary.ShrinkNumberStr(Coin_));
 
             AchieveManager.UpdateStatus(AchieveType.CurrentCoin, Coin_);
         }
@@ -423,8 +423,8 @@ public class Manager : Regist
         {
             Diamond_ = value;
 
-            ResourceManager.SetText(PrefabLabel.F_DiamondLab, Auxiliary.ShrinkNumberStr(Diamond_));
-            ResourceManager.SetText(PrefabLabel.P_DiamondLab, Auxiliary.ShrinkNumberStr(Diamond_));
+            ResourceManager.SetText(ObjectLabel.F_DiamondLab, Auxiliary.ShrinkNumberStr(Diamond_));
+            ResourceManager.SetText(ObjectLabel.P_DiamondLab, Auxiliary.ShrinkNumberStr(Diamond_));
         }
     }
 
@@ -528,7 +528,7 @@ public class Manager : Regist
         {
             OpTimer = 0;
 
-            ResourceManager.Get(PrefabLabel.C_Group).TweenForCG();
+            ResourceManager.Get(ObjectLabel.C_Group).TweenForCG();
         }
         else
         {
@@ -538,7 +538,7 @@ public class Manager : Regist
             {
                 OpTimer = 0;
 
-                ResourceManager.Get(PrefabLabel.C_Group).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
             }
         }
     }
@@ -568,15 +568,15 @@ public class Manager : Regist
         {
             MiniTimer -= Time.deltaTime;
 
-            ResourceManager.SetText(PrefabLabel.C_MiniGameLab, Mathf.CeilToInt(MiniTimer).ToString());
+            ResourceManager.SetText(ObjectLabel.C_MiniGameLab, Mathf.CeilToInt(MiniTimer).ToString());
 
             if (MiniTimer < 0)
             {
                 MiniLock = true;
 
-                ResourceManager.Get(PrefabLabel.C_MiniGame).TweenBacRect();
+                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacRect();
 
-                ResourceManager.SetText(PrefabLabel.C_MiniGameLab, "");
+                ResourceManager.SetText(ObjectLabel.C_MiniGameLab, "");
 
                 StaticsManager.GetInstance().RewardItem(StaticsManager.ItemID.获得小游戏, StaticsManager.ItemType.小游戏,  "1", StaticsManager.ConsumeModule.None);
             }
@@ -631,9 +631,9 @@ public class Manager : Regist
 
             AddCoin(temp, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
 
-            ResourceManager.Get(PrefabLabel.C_IncomeLab).TweenReForGra();
-            ResourceManager.Get(PrefabLabel.C_IncomeLab).TweenReForVec();
-            ResourceManager.SetText(PrefabLabel.C_IncomeLab, "+" + Auxiliary.ShrinkNumberStr(temp, 0));
+            ResourceManager.Get(ObjectLabel.C_IncomeLab).TweenReForGra();
+            ResourceManager.Get(ObjectLabel.C_IncomeLab).TweenReForVec();
+            ResourceManager.SetText(ObjectLabel.C_IncomeLab, "+" + Auxiliary.ShrinkNumberStr(temp, 0));
 
             //ManaDebug.Log(string.Format("参观收益<color=red>{0:0.0}</color> = <color=red>{1}</color> * <color=red>{2}</color> * <color=red>{3}</color> * <color=red>{4}</color> (人次*金币*时间*加成)", temp, NewPerson, NewCoinPerson, CircleTime, 1 + SkillPlus));
         }
@@ -715,17 +715,17 @@ public class Manager : Regist
 
     public override void FirstInit()
     {
-        ResourceManager.Get<Graphic>(PrefabLabel.F_Elf).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
-        ResourceManager.Get<Graphic>(PrefabLabel.F_Store).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
-        ResourceManager.Get<Graphic>(PrefabLabel.F_Magic).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
+        ResourceManager.Get<Graphic>(ObjectLabel.F_Elf).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
+        ResourceManager.Get<Graphic>(ObjectLabel.F_Store).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
+        ResourceManager.Get<Graphic>(ObjectLabel.F_Magic).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
 
-        ResourceManager.Get<Graphic>(PrefabLabel.F_ElfLab).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
-        ResourceManager.Get<Graphic>(PrefabLabel.F_StoreLab).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
-        ResourceManager.Get<Graphic>(PrefabLabel.F_MagicLab).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
+        ResourceManager.Get<Graphic>(ObjectLabel.F_ElfLab).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
+        ResourceManager.Get<Graphic>(ObjectLabel.F_StoreLab).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
+        ResourceManager.Get<Graphic>(ObjectLabel.F_MagicLab).material = ResourceManager.Load<Material>("GrayMat", Folder.UI);
 
-        ResourceManager.Get<Button>(PrefabLabel.F_Elf).interactable = false;
-        ResourceManager.Get<Button>(PrefabLabel.F_Store).interactable = false;
-        ResourceManager.Get<Button>(PrefabLabel.F_Magic).interactable = false;
+        ResourceManager.Get<Button>(ObjectLabel.F_Elf).interactable = false;
+        ResourceManager.Get<Button>(ObjectLabel.F_Store).interactable = false;
+        ResourceManager.Get<Button>(ObjectLabel.F_Magic).interactable = false;
 
 
         List<XmlAttributeCollection> attributeList = ConfigManager.GetSkillList();
@@ -754,7 +754,7 @@ public class Manager : Regist
 
         if (MiniTimer > 0)
         {
-            ResourceManager.Get(PrefabLabel.C_MiniGame).TweenForRect();
+            ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForRect();
         }
         else
         {
@@ -796,7 +796,7 @@ public class Manager : Regist
     {
         OfflineLock = false;
 
-        ResourceManager.SetActive(PrefabLabel.Ba_Lab2, false);
+        ResourceManager.SetActive(ObjectLabel.Ba_Lab2, false);
 
         if (HttpManager.Connect && ConfigManager.GetPlayerBool(PlayerConfigLabel.QuitFlag))
         {
@@ -821,8 +821,8 @@ public class Manager : Regist
             {
                 Elapse = (long)MaxTime;
 
-                ResourceManager.SetText(PrefabLabel.Ba_Lab2, Language.GetStr("UI", PrefabLabel.Ba_Lab2));
-                ResourceManager.SetActive(PrefabLabel.Ba_Lab2, true);
+                ResourceManager.SetText(ObjectLabel.Ba_Lab2, Language.GetStr(LanguageLabel.UI__Ba_Lab2));
+                ResourceManager.SetActive(ObjectLabel.Ba_Lab2, true);
             }
         }
 
@@ -898,13 +898,13 @@ public class Manager : Regist
         {
             coin = MaxCoin;
 
-            ResourceManager.SetText(PrefabLabel.Ba_Lab2, Language.GetStr("UI", PrefabLabel.Ba_Lab2));
-            ResourceManager.SetActive(PrefabLabel.Ba_Lab2, true);
+            ResourceManager.SetText(ObjectLabel.Ba_Lab2, Language.GetStr(LanguageLabel.UI__Ba_Lab2));
+            ResourceManager.SetActive(ObjectLabel.Ba_Lab2, true);
         }
 
         AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Income);
 
-        ResourceManager.SetText(PrefabLabel.Ba_IconLab, Auxiliary.ShrinkNumberStr(coin));
+        ResourceManager.SetText(ObjectLabel.Ba_IconLab, Auxiliary.ShrinkNumberStr(coin));
     }
 
     public static void SwitchLanguage()
@@ -950,14 +950,14 @@ public class Manager : Regist
             }
             else
             {
-                ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
 
                 if (navigate)
                 {
                     Bubble.Show
                     (
-                        Language.GetStr("Common", "ShortCoin"),
-                        Language.GetStr("Common", "NavigateCoin"),
+                        Language.GetStr(LanguageLabel.Common__ShortCoin),
+                        Language.GetStr(LanguageLabel.Common__NavigateCoin),
                         null,
                         Lib.GoldSprite,
                         () =>
@@ -966,7 +966,7 @@ public class Manager : Regist
 
                             if (useBubbleTweenNavigate)
                             {
-                                TweenRoot tween = ResourceManager.Get(PrefabLabel.K_Bubble0).GetTweenScale();
+                                TweenRoot tween = ResourceManager.Get(ObjectLabel.K_Bubble0).GetTweenScale();
 
                                 tween.AddEventOnetime
                                 (
@@ -979,7 +979,7 @@ public class Manager : Regist
                             }
                             else
                             {
-                                TweenRoot tween = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+                                TweenRoot tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
                                 tween.AddEventOnetime
                                 (
@@ -997,7 +997,7 @@ public class Manager : Regist
                 {
                     Bubble.Show
                     (
-                        Language.GetStr("Common", "ShortCoin"),
+                        Language.GetStr(LanguageLabel.Common__ShortCoin),
                         null,
                         null,
                         Lib.GoldSprite
@@ -1023,14 +1023,14 @@ public class Manager : Regist
             }
             else
             {
-                ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
 
                 if (navigate)
                 {
                     Bubble.Show
                     (
-                        Language.GetStr("Common", "ShortDiamond"),
-                        Language.GetStr("Common", "NavigateDiamond"),
+                        Language.GetStr(LanguageLabel.Common__ShortDiamond),
+                        Language.GetStr(LanguageLabel.Common__NavigateDiamond),
                         null,
                         Lib.DiamondSprite,
                         () =>
@@ -1039,7 +1039,7 @@ public class Manager : Regist
 
                             if (useBubbleTweenNavigate)
                             {
-                                TweenRoot tween = ResourceManager.Get(PrefabLabel.K_Bubble0).GetTweenScale();
+                                TweenRoot tween = ResourceManager.Get(ObjectLabel.K_Bubble0).GetTweenScale();
 
                                 tween.AddEventOnetime
                                 (
@@ -1052,7 +1052,7 @@ public class Manager : Regist
                             }
                             else
                             {
-                                TweenRoot tween = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+                                TweenRoot tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
                                 tween.AddEventOnetime
                                     (
@@ -1070,7 +1070,7 @@ public class Manager : Regist
                 {
                     Bubble.Show
                     (
-                        Language.GetStr("Common", "ShortDiamond"),
+                        Language.GetStr(LanguageLabel.Common__ShortDiamond),
                         null,
                         null,
                         Lib.DiamondSprite
@@ -1102,7 +1102,7 @@ public class Manager : Regist
             {
                 HttpManager.ID = HttpManager.JsonData["o"].ToString();
 
-                ResourceManager.SetText(PrefabLabel.L_UserLab, HttpManager.ID);
+                ResourceManager.SetText(ObjectLabel.L_UserLab, HttpManager.ID);
             }
 
             if (ConfigManager.GetPlayerString(PlayerConfigLabel.SerialNumber) == "Default")
@@ -1139,10 +1139,10 @@ public class Manager : Regist
 
     public static void Download(string id)
     {
-        ResourceManager.SetText(PrefabLabel.La_Lab, Language.GetStr("UI", "L_Downloading"));
+        ResourceManager.SetText(ObjectLabel.La_Lab, Language.GetStr(LanguageLabel.UI__L_Downloading));
 
-        ResourceManager.SetActive(PrefabLabel.La_Lab, true);
-        ResourceManager.SetActive(PrefabLabel.La_Mask, true);
+        ResourceManager.SetActive(ObjectLabel.La_Lab, true);
+        ResourceManager.SetActive(ObjectLabel.La_Mask, true);
 
 
         HttpManager.DownloadByID(id, DownloadCallback);
@@ -1152,9 +1152,9 @@ public class Manager : Regist
     {
         if (jsonData.Inst_Object.Keys.Contains("l"))
         {
-            ResourceManager.Get(PrefabLabel.La_Info).TweenBacCG();
+            ResourceManager.Get(ObjectLabel.La_Info).TweenBacCG();
 
-            ResourceManager.SetText(PrefabLabel.La_Lab, Language.GetStr("UI", "La_Lab0"));
+            ResourceManager.SetText(ObjectLabel.La_Lab, Language.GetStr(LanguageLabel.UI__La_Lab0));
 
 
             ConfigManager.PlayerDoc.LoadXml(jsonData["l"].ToString());
@@ -1162,13 +1162,13 @@ public class Manager : Regist
             ConfigManager.PlayerNode = ConfigManager.PlayerDoc.SelectSingleNode(PlayerConfigLabel.RootNode);
 
 
-            ResourceManager.SetText(PrefabLabel.L_UserLab, ConfigManager.GetPlayerString(PlayerConfigLabel.ID));
+            ResourceManager.SetText(ObjectLabel.L_UserLab, ConfigManager.GetPlayerString(PlayerConfigLabel.ID));
 
             HttpManager.ID = ConfigManager.GetPlayerString(PlayerConfigLabel.ID);
             HttpManager.SerialNumber = ConfigManager.GetPlayerString(PlayerConfigLabel.SerialNumber);
 
 
-            Bubble.Show(null, Language.GetStr("UI", "La_Lab0"), null, null, () => { Application.Quit(); }, null, false);
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__La_Lab0), null, null, () => { Application.Quit(); }, null, false);
 
 
             SaveLock = true;
@@ -1180,9 +1180,9 @@ public class Manager : Regist
         }
         else
         {
-            ResourceManager.SetText(PrefabLabel.La_Lab, Language.GetStr("UI", "La_Lab1"));
+            ResourceManager.SetText(ObjectLabel.La_Lab, Language.GetStr(LanguageLabel.UI__La_Lab1));
 
-            ResourceManager.SetActive(PrefabLabel.La_Mask, false);
+            ResourceManager.SetActive(ObjectLabel.La_Mask, false);
         }
     }
 

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

@@ -85,15 +85,15 @@ public class Award
         Coin = (int)(Coin * (1 + Manager.SkillPlus) + BonusCoin);
         Coin = (int) Mathf.Clamp(Coin, 1, Mathf.Infinity);
 
-        ResourceManager.Get<Text>(PrefabLabel.Da_CoinLab).text = Coin.ToString();
-        ResourceManager.Get<Text>(PrefabLabel.Da_CoinLab).Resize(true, false);
-        ResourceManager.Get<ContentSizeFitter>(PrefabLabel.Da_CoinGroup).enabled = true;
+        ResourceManager.Get<Text>(ObjectLabel.Da_CoinLab).text = Coin.ToString();
+        ResourceManager.Get<Text>(ObjectLabel.Da_CoinLab).Resize(true, false);
+        ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_CoinGroup).enabled = true;
 
-        ResourceManager.SetActive(PrefabLabel.Da_CoinLab, true);
+        ResourceManager.SetActive(ObjectLabel.Da_CoinLab, true);
 
         Manager.AddCoin(Coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.MiniGame);
 
-        sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), TransferLabel.CoinSprite, Coin);
+        sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.CoinSprite, Coin);
 
         #endregion
 
@@ -107,17 +107,17 @@ public class Award
 
             Diamond = (int)(Mathf.Lerp(DiamondMin, DiamondMax, Random.Range(0, 1f)) + BonusDiamond);
 
-            ResourceManager.Get<Text>(PrefabLabel.Da_DiamondLab).text = Diamond.ToString();
-            ResourceManager.Get<Text>(PrefabLabel.Da_DiamondLab).Resize(true, false);
-            ResourceManager.Get<ContentSizeFitter>(PrefabLabel.Da_DiamondGroup).enabled = true;
+            ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).text = Diamond.ToString();
+            ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).Resize(true, false);
+            ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_DiamondGroup).enabled = true;
 
-            ResourceManager.SetActive(PrefabLabel.Da_DiamondLab, true);
+            ResourceManager.SetActive(ObjectLabel.Da_DiamondLab, true);
 
             Manager.AddDiamond(Diamond, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.MiniGame);
 
-            ResourceManager.SetActive(PrefabLabel.Da_Diamond, true);
+            ResourceManager.SetActive(ObjectLabel.Da_Diamond, true);
 
-            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), TransferLabel.DiamondSprite, Diamond);
+            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.DiamondSprite, Diamond);
         }
         else
         {
@@ -127,17 +127,17 @@ public class Award
 
                 Diamond = BonusDiamond;
 
-                ResourceManager.Get<Text>(PrefabLabel.Da_DiamondLab).text = Diamond.ToString();
-                ResourceManager.Get<Text>(PrefabLabel.Da_DiamondLab).Resize(true, false);
-                ResourceManager.Get<ContentSizeFitter>(PrefabLabel.Da_DiamondGroup).enabled = true;
+                ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).text = Diamond.ToString();
+                ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).Resize(true, false);
+                ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_DiamondGroup).enabled = true;
 
-                ResourceManager.SetActive(PrefabLabel.Da_DiamondLab, true);
+                ResourceManager.SetActive(ObjectLabel.Da_DiamondLab, true);
 
                 Manager.AddDiamond(Diamond, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.MiniGame);
 
-                ResourceManager.SetActive(PrefabLabel.Da_Diamond, true);
+                ResourceManager.SetActive(ObjectLabel.Da_Diamond, true);
 
-                sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), TransferLabel.DiamondSprite, Diamond);
+                sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.DiamondSprite, Diamond);
             }
             else
             {
@@ -155,14 +155,14 @@ public class Award
 
             FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[1];
 
-            ResourceManager.SetActive(PrefabLabel.Da_FlowerIcon, true);
+            ResourceManager.SetActive(ObjectLabel.Da_FlowerIcon, true);
 
-            ResourceManager.Get<Image>(PrefabLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
-            ResourceManager.Get<Image>(PrefabLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
+            ResourceManager.Get<Image>(ObjectLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
+            ResourceManager.Get<Image>(ObjectLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
 
-            ResourceManager.SetText(PrefabLabel.Da_FlowerLab, flowerInfo.Name);
+            ResourceManager.SetText(ObjectLabel.Da_FlowerLab, flowerInfo.Name);
 
-            sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), TransferLabel.FlowerSprite, flowerInfo.Name);
+            sb.AppendFormat("{0}{1}{2}", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.FlowerSprite, flowerInfo.Name);
         }
         else
         {       
@@ -177,20 +177,20 @@ public class Award
                     flowerInfo.Add();
 
 
-                    ResourceManager.SetActive(PrefabLabel.Da_Flower, true);
+                    ResourceManager.SetActive(ObjectLabel.Da_Flower, true);
 
-                    ResourceManager.Get<Image>(PrefabLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
-                    ResourceManager.Get<Image>(PrefabLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
+                    ResourceManager.Get<Image>(ObjectLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
+                    ResourceManager.Get<Image>(ObjectLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
 
-                    ResourceManager.SetText(PrefabLabel.Da_FlowerLab, flowerInfo.Name);
+                    ResourceManager.SetText(ObjectLabel.Da_FlowerLab, flowerInfo.Name);
 
-                    sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), TransferLabel.FlowerSprite, flowerInfo.Name);
+                    sb.AppendFormat("{0}{1}{2}", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.FlowerSprite, flowerInfo.Name);
                 }
                 else
                 {
-                    ResourceManager.SetActive(PrefabLabel.Da_Flower, false);
+                    ResourceManager.SetActive(ObjectLabel.Da_Flower, false);
 
-                    ResourceManager.SetText(PrefabLabel.Da_FlowerLab, Language.GetStr("UI", "Da_HigherScore"));
+                    ResourceManager.SetText(ObjectLabel.Da_FlowerLab, Language.GetStr(LanguageLabel.UI__Da_HigherScore));
                 }
             }
         }
@@ -204,17 +204,17 @@ public class Award
 
         #endregion
 
-        ResourceManager.SetActive(PrefabLabel.Da_Info, true);
+        ResourceManager.SetActive(ObjectLabel.Da_Info, true);
 
         Auxiliary.Instance.DelayCall
             (
                 () =>
                 {
-                    ResourceManager.Get<Text>(PrefabLabel.Da_CoinLab).SetLayoutDirty();
-                    ResourceManager.Get<Text>(PrefabLabel.Da_DiamondLab).SetLayoutDirty();
+                    ResourceManager.Get<Text>(ObjectLabel.Da_CoinLab).SetLayoutDirty();
+                    ResourceManager.Get<Text>(ObjectLabel.Da_DiamondLab).SetLayoutDirty();
 
-                    ResourceManager.Get<ContentSizeFitter>(PrefabLabel.Da_CoinGroup).enabled = false;
-                    ResourceManager.Get<ContentSizeFitter>(PrefabLabel.Da_DiamondGroup).enabled = false;
+                    ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_CoinGroup).enabled = false;
+                    ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_DiamondGroup).enabled = false;
 
                     InitializeAnim();
                 },
@@ -228,46 +228,46 @@ public class Award
 
         #region Reset
 
-        ResourceManager.Get(PrefabLabel.Da_Info).TweenForCG();
+        ResourceManager.Get(ObjectLabel.Da_Info).TweenForCG();
 
-        ResourceManager.SetText(PrefabLabel.Da_Tit, Language.GetStr("UI", "Da_Tit1"));
-        ResourceManager.SetText(PrefabLabel.Da_CoinLab, "0");
-        ResourceManager.SetText(PrefabLabel.Da_DiamondLab, "0");
+        ResourceManager.SetText(ObjectLabel.Da_Tit, Language.GetStr(LanguageLabel.UI__Da_Tit1));
+        ResourceManager.SetText(ObjectLabel.Da_CoinLab, "0");
+        ResourceManager.SetText(ObjectLabel.Da_DiamondLab, "0");
 
-        ResourceManager.SetActive(PrefabLabel.Da_Lab, false);
-        ResourceManager.SetActive(PrefabLabel.Da_Quit, false);
-        ResourceManager.SetActive(PrefabLabel.Da_Cancel, false);
+        ResourceManager.SetActive(ObjectLabel.Da_Lab, false);
+        ResourceManager.SetActive(ObjectLabel.Da_Quit, false);
+        ResourceManager.SetActive(ObjectLabel.Da_Cancel, false);
 
-        ResourceManager.SetActive(PrefabLabel.Da_CoinLab, false);
-        ResourceManager.SetActive(PrefabLabel.Da_ScoreTit, false);
-        ResourceManager.SetActive(PrefabLabel.Da_ScoreLab, false);
-        ResourceManager.SetActive(PrefabLabel.Da_GetAward, false);
-        ResourceManager.SetActive(PrefabLabel.Da_DiamondLab, 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(PrefabLabel.Da_VGroup, true);
-        ResourceManager.SetActive(PrefabLabel.Da_HGroup1, false);
-        ResourceManager.SetActive(PrefabLabel.Da_FlowerGroup, false);
-        ResourceManager.SetActive(PrefabLabel.Da_DiamondGroup, 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);
 
         if (FlowerFlag)
         {
-            ResourceManager.SetActive(PrefabLabel.Da_FlowerGroup, true);
+            ResourceManager.SetActive(ObjectLabel.Da_FlowerGroup, true);
         }
 
         if (DiamondFlag)
         {
-            ResourceManager.SetActive(PrefabLabel.Da_DiamondGroup, true);
+            ResourceManager.SetActive(ObjectLabel.Da_DiamondGroup, true);
         }
 
         Auxiliary.Instance.DelayCall
         (
             () =>
             {
-                ResourceManager.Get<VerticalLayoutGroup>(PrefabLabel.Da_VGroup).enabled = false;
+                ResourceManager.Get<VerticalLayoutGroup>(ObjectLabel.Da_VGroup).enabled = false;
 
-                ResourceManager.SetActive(PrefabLabel.Da_CoinGroup, false);
-                ResourceManager.SetActive(PrefabLabel.Da_FlowerGroup, false);
-                ResourceManager.SetActive(PrefabLabel.Da_DiamondGroup, false);
+                ResourceManager.SetActive(ObjectLabel.Da_CoinGroup, false);
+                ResourceManager.SetActive(ObjectLabel.Da_FlowerGroup, false);
+                ResourceManager.SetActive(ObjectLabel.Da_DiamondGroup, false);
             },
             1
         );
@@ -279,9 +279,9 @@ public class Award
 
         float time = Mathf.Max(timeCoin, timeDiamond);
         
-        ResourceManager.Get(PrefabLabel.Da_CoinLab).CreateTweenNumber(0, Coin, time, false, true, Curve.EaseOutQuad);
-        ResourceManager.Get(PrefabLabel.Da_ScoreLab).CreateTweenNumber(0, Score, timeScore, false, true, Curve.EaseOutQuad);
-        ResourceManager.Get(PrefabLabel.Da_DiamondLab).CreateTweenNumber(0, Diamond, time, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get(ObjectLabel.Da_CoinLab).CreateTweenNumber(0, Coin, 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, Diamond, time, false, true, Curve.EaseOutQuad);
 
         #endregion
 
@@ -292,14 +292,14 @@ public class Award
 
         if (FlowerFlag)
         {
-            tween = ResourceManager.Get(PrefabLabel.Da_CoinLab).GetTweenNumber();
+            tween = ResourceManager.Get(ObjectLabel.Da_CoinLab).GetTweenNumber();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.Da_FlowerGroup).TweenReForScale();
+                    ResourceManager.Get(ObjectLabel.Da_FlowerGroup).TweenReForScale();
                 }
             );
         }
@@ -310,51 +310,51 @@ public class Award
 
         if (FlowerFlag)
         {
-            tween = ResourceManager.Get(PrefabLabel.Da_FlowerGroup).GetTweenScale();
+            tween = ResourceManager.Get(ObjectLabel.Da_FlowerGroup).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.Da_GetAward).TweenReForCG();
+                    ResourceManager.Get(ObjectLabel.Da_GetAward).TweenReForCG();
                 }
             );
         }
         else
         {
-            tween = ResourceManager.Get(PrefabLabel.Da_CoinLab).GetTweenNumber();
+            tween = ResourceManager.Get(ObjectLabel.Da_CoinLab).GetTweenNumber();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.Da_GetAward).TweenReForCG();
+                    ResourceManager.Get(ObjectLabel.Da_GetAward).TweenReForCG();
                 }
             );
         }
 
         if (TutorialManager.NewplayerTutorial)
         {
-            tween = ResourceManager.Get(PrefabLabel.Da_GetAward).GetTweenCG();
+            tween = ResourceManager.Get(ObjectLabel.Da_GetAward).GetTweenCG();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.Da_Arrow0), ResourceManager.Get(PrefabLabel.Da_Arrow1), ResourceManager.Get(PrefabLabel.Da_GetAward));
+                    Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.Da_Arrow0), ResourceManager.Get(ObjectLabel.Da_Arrow1), ResourceManager.Get(ObjectLabel.Da_GetAward));
                 }
             );
         }
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.Da_GetAward,
+            ObjectLabel.Da_GetAward,
             () =>
             {
-                ResourceManager.Get(PrefabLabel.Da_VGroup).GetComponent<VerticalLayoutGroup>().enabled = true;
+                ResourceManager.Get(ObjectLabel.Da_VGroup).GetComponent<VerticalLayoutGroup>().enabled = true;
             }
         );
 
@@ -364,15 +364,15 @@ public class Award
 
         if (Rate == 0)
         {
-            tween = ResourceManager.Get(PrefabLabel.Da_Star1).GetTweenScale();
+            tween = ResourceManager.Get(ObjectLabel.Da_Star1).GetTweenScale();
         }
         else if (Rate == 1)
         {
-            tween = ResourceManager.Get(PrefabLabel.Da_Star2).GetTweenScale();
+            tween = ResourceManager.Get(ObjectLabel.Da_Star2).GetTweenScale();
         }
         else if (Rate == 2)
         {
-            tween = ResourceManager.Get(PrefabLabel.Da_Star3).GetTweenScale();
+            tween = ResourceManager.Get(ObjectLabel.Da_Star3).GetTweenScale();
         }
 
         tween.AddEventOnetime
@@ -380,11 +380,11 @@ public class Award
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(PrefabLabel.Da_ScoreTit).TweenReForFont();
+                ResourceManager.Get(ObjectLabel.Da_ScoreTit).TweenReForFont();
             }
         );
 
-        tween = ResourceManager.Get(PrefabLabel.Da_ScoreTit).GetTweenFont();
+        tween = ResourceManager.Get(ObjectLabel.Da_ScoreTit).GetTweenFont();
         tween.InOrigin = true;
 
         tween.AddEventOnetime
@@ -392,7 +392,7 @@ public class Award
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(PrefabLabel.Da_ScoreLab).TweenReForNumber();
+                ResourceManager.Get(ObjectLabel.Da_ScoreLab).TweenReForNumber();
             }
         );
 
@@ -400,78 +400,78 @@ public class Award
 
         #region 五角星
 
-        tween = ResourceManager.Get(PrefabLabel.Da_Star3).GetTweenScale();
+        tween = ResourceManager.Get(ObjectLabel.Da_Star3).GetTweenScale();
         tween.InOrigin = true;
 
-        tween = ResourceManager.Get(PrefabLabel.Da_Star2).GetTweenScale();
+        tween = ResourceManager.Get(ObjectLabel.Da_Star2).GetTweenScale();
         tween.InOrigin = true;
 
-        tween = ResourceManager.Get(PrefabLabel.Da_Star1).GetTweenScale();
+        tween = ResourceManager.Get(ObjectLabel.Da_Star1).GetTweenScale();
         tween.InOrigin = true;
 
 
-        tween = ResourceManager.Get(PrefabLabel.Da_Info).GetTweenCG();
+        tween = ResourceManager.Get(ObjectLabel.Da_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(PrefabLabel.Da_Star1).TweenReForScale();
+                ResourceManager.Get(ObjectLabel.Da_Star1).TweenReForScale();
 
-                ResourceManager.SetActive(PrefabLabel.Da_HGroup1, true);
+                ResourceManager.SetActive(ObjectLabel.Da_HGroup1, true);
             }
         );
 
 
         if (Rate == 0)
         {
-            ResourceManager.SetActive(PrefabLabel.Da_Star2, false);
-            ResourceManager.SetActive(PrefabLabel.Da_Star3, false);
+            ResourceManager.SetActive(ObjectLabel.Da_Star2, false);
+            ResourceManager.SetActive(ObjectLabel.Da_Star3, false);
         }
         else if (Rate == 1)
         {
-            ResourceManager.SetActive(PrefabLabel.Da_Star2, true);
-            ResourceManager.SetActive(PrefabLabel.Da_Star3, false);
+            ResourceManager.SetActive(ObjectLabel.Da_Star2, true);
+            ResourceManager.SetActive(ObjectLabel.Da_Star3, false);
 
 
-            tween = ResourceManager.Get(PrefabLabel.Da_Star1).GetTweenScale();
+            tween = ResourceManager.Get(ObjectLabel.Da_Star1).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.Da_Star2).TweenReForScale();
+                    ResourceManager.Get(ObjectLabel.Da_Star2).TweenReForScale();
                 }
             );
         }
         else if (Rate == 2)
         {
-            ResourceManager.SetActive(PrefabLabel.Da_Star2, true);
-            ResourceManager.SetActive(PrefabLabel.Da_Star3, true);
+            ResourceManager.SetActive(ObjectLabel.Da_Star2, true);
+            ResourceManager.SetActive(ObjectLabel.Da_Star3, true);
 
 
-            tween = ResourceManager.Get(PrefabLabel.Da_Star1).GetTweenScale();
+            tween = ResourceManager.Get(ObjectLabel.Da_Star1).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.Da_Star2).TweenReForScale();
+                    ResourceManager.Get(ObjectLabel.Da_Star2).TweenReForScale();
                 }
             );
 
 
-            tween = ResourceManager.Get(PrefabLabel.Da_Star2).GetTweenScale();
+            tween = ResourceManager.Get(ObjectLabel.Da_Star2).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.Da_Star3).TweenReForScale();
+                    ResourceManager.Get(ObjectLabel.Da_Star3).TweenReForScale();
                 }
             );
         }
@@ -480,43 +480,43 @@ public class Award
 
         #region 金币钻石
 
-        tween = ResourceManager.Get(PrefabLabel.Da_ScoreLab).GetTweenNumber();
+        tween = ResourceManager.Get(ObjectLabel.Da_ScoreLab).GetTweenNumber();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(PrefabLabel.Da_CoinGroup).TweenReForScale();
+                ResourceManager.Get(ObjectLabel.Da_CoinGroup).TweenReForScale();
 
                 if (DiamondFlag)
                 {
-                    ResourceManager.Get(PrefabLabel.Da_DiamondGroup).TweenReForScale();
+                    ResourceManager.Get(ObjectLabel.Da_DiamondGroup).TweenReForScale();
                 }
             }
         );
 
-        tween = ResourceManager.Get(PrefabLabel.Da_CoinGroup).GetTweenScale();
+        tween = ResourceManager.Get(ObjectLabel.Da_CoinGroup).GetTweenScale();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.Get(PrefabLabel.Da_CoinLab).TweenReForNumber();
+                ResourceManager.Get(ObjectLabel.Da_CoinLab).TweenReForNumber();
             }
         );
 
         if (DiamondFlag)
         {
-            tween = ResourceManager.Get(PrefabLabel.Da_DiamondGroup).GetTweenScale();
+            tween = ResourceManager.Get(ObjectLabel.Da_DiamondGroup).GetTweenScale();
 
             tween.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.Da_DiamondLab).TweenReForNumber();
+                    ResourceManager.Get(ObjectLabel.Da_DiamondLab).TweenReForNumber();
                 }
             );
         }
@@ -604,7 +604,7 @@ public class MiniGameManager : Regist
         {
             Score_ = value;
 
-            ResourceManager.SetText(PrefabLabel.D_ScoreLab, ScoreLab + Score_);
+            ResourceManager.SetText(ObjectLabel.D_ScoreLab, ScoreLab + Score_);
         }
     }
     public static bool Game
@@ -616,11 +616,11 @@ public class MiniGameManager : Regist
 
             if (Game_)
             {
-                ResourceManager.SetText(PrefabLabel.D_StatusLab, Language.GetStr("UI", "D_StatusLab1"));
+                ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab1));
             }
             else
             {
-                ResourceManager.SetText(PrefabLabel.D_StatusLab, Language.GetStr("UI", "D_StatusLab0"));
+                ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab0));
             }
         }
     }
@@ -635,11 +635,11 @@ public class MiniGameManager : Regist
             {
                 if (Pause_)
                 {
-                    ResourceManager.SetText(PrefabLabel.D_StatusLab, Language.GetStr("UI", "D_StatusLab2"));
+                    ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab2));
                 }
                 else
                 {
-                    ResourceManager.SetText(PrefabLabel.D_StatusLab, Language.GetStr("UI", "D_StatusLab1"));
+                    ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab1));
                 }
             }
             else if (Prepare)
@@ -666,11 +666,11 @@ public class MiniGameManager : Regist
             {
                 if (Panalty_)
                 {
-                    ResourceManager.SetText(PrefabLabel.D_StatusLab, Language.GetStr("UI", "D_StatusLab3"));
+                    ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab3));
                 }
                 else
                 {
-                    ResourceManager.SetText(PrefabLabel.D_StatusLab, Language.GetStr("UI", "D_StatusLab1"));
+                    ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab1));
                 }
             }
         }
@@ -938,21 +938,21 @@ public class MiniGameManager : Regist
 
     public override void RegistReference()
     {
-        Grid = ResourceManager.Get(PrefabLabel.D_Grid);
-        Begin = ResourceManager.Get(PrefabLabel.D_Begin);
-        Timer = ResourceManager.Get(PrefabLabel.D_Timer);
+        Grid = ResourceManager.Get(ObjectLabel.D_Grid);
+        Begin = ResourceManager.Get(ObjectLabel.D_Begin);
+        Timer = ResourceManager.Get(ObjectLabel.D_Timer);
 
-        PunchGameStatus = ResourceManager.Get(PrefabLabel.D_Status1);
-        MemoryGameStatus = ResourceManager.Get(PrefabLabel.D_Status2);
-        FindGameStatus = ResourceManager.Get(PrefabLabel.D_Status3);
-        PunchGameOperate = ResourceManager.Get(PrefabLabel.D_Operate1);
-        MemoryGameOperate = ResourceManager.Get(PrefabLabel.D_Operate2);
-        FindGameOperate = ResourceManager.Get(PrefabLabel.D_Operate3);
+        PunchGameStatus = ResourceManager.Get(ObjectLabel.D_Status1);
+        MemoryGameStatus = ResourceManager.Get(ObjectLabel.D_Status2);
+        FindGameStatus = ResourceManager.Get(ObjectLabel.D_Status3);
+        PunchGameOperate = ResourceManager.Get(ObjectLabel.D_Operate1);
+        MemoryGameOperate = ResourceManager.Get(ObjectLabel.D_Operate2);
+        FindGameOperate = ResourceManager.Get(ObjectLabel.D_Operate3);
 
-        TimerLab = ResourceManager.Get<Text>(PrefabLabel.D_TimerLab);
-        PrepareLab = ResourceManager.Get<Text>(PrefabLabel.D_PrepareLab);
+        TimerLab = ResourceManager.Get<Text>(ObjectLabel.D_TimerLab);
+        PrepareLab = ResourceManager.Get<Text>(ObjectLabel.D_PrepareLab);
 
-        TimerBk = ResourceManager.Get<Image>(PrefabLabel.D_TimerIcon);
+        TimerBk = ResourceManager.Get<Image>(ObjectLabel.D_TimerIcon);
     }
 
 
@@ -973,7 +973,7 @@ public class MiniGameManager : Regist
         {
             Flower flower = IdleList.Find(tempFlower => { return tempFlower.ID == id; });
 
-            ResourceManager.GetHudText($"+{FindScore}", Color.white, 90, flower.ChildDic["ScorePosTra"], ResourceManager.Get(PrefabLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{FindScore}", Color.white, 90, flower.ChildDic["ScorePosTra"], ResourceManager.Get(ObjectLabel.D_HudParent), true);
 
             Score += FindScore;
 
@@ -1028,7 +1028,7 @@ public class MiniGameManager : Regist
 
             Flower flower = FlowerDic[slotIndex];
 
-            ResourceManager.GetHudText($"+{MemoryScore}", Color.white, 90, flower.ChildDic["ScorePosTra"], ResourceManager.Get(PrefabLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{MemoryScore}", Color.white, 90, flower.ChildDic["ScorePosTra"], ResourceManager.Get(ObjectLabel.D_HudParent), true);
 
             Score += MemoryScore;
 
@@ -1105,33 +1105,33 @@ public class MiniGameManager : Regist
 
     public static void ResetOprerate()
     {
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerBtn1).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerBtn2).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerBtn3).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerBtn4).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerBtn5).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerBtn6).material = null;
-
-        ResourceManager.Get<Button>(PrefabLabel.D_FlowerBtn1).interactable = true;
-        ResourceManager.Get<Button>(PrefabLabel.D_FlowerBtn2).interactable = true;
-        ResourceManager.Get<Button>(PrefabLabel.D_FlowerBtn3).interactable = true;
-        ResourceManager.Get<Button>(PrefabLabel.D_FlowerBtn4).interactable = true;
-        ResourceManager.Get<Button>(PrefabLabel.D_FlowerBtn5).interactable = true;
-        ResourceManager.Get<Button>(PrefabLabel.D_FlowerBtn6).interactable = true;
-
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerIcon1).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerIcon2).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerIcon3).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerIcon4).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerIcon5).material = null;
-        ResourceManager.Get<Image>(PrefabLabel.D_FlowerIcon6).material = null;
-
-        ResourceManager.SetActive(PrefabLabel.D_FlowerTick1, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerTick2, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerTick3, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerTick4, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerTick5, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerTick6, false);
+        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);
     }
 
     public static void CreateOperate()
@@ -1149,13 +1149,13 @@ public class MiniGameManager : Regist
             OperateList.Add(flower);
             IdleList.Remove(flower);
 
-            Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.D_WaterArrow0), ResourceManager.Get(PrefabLabel.D_WaterArrow1), ResourceManager.Get(PrefabLabel.D_Water1));
+            Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.D_WaterArrow0), ResourceManager.Get(ObjectLabel.D_WaterArrow1), ResourceManager.Get(ObjectLabel.D_Water1));
 
             Tutorial.SetArea(OperateList[0].OperateIcon.transform, 0.1f, 0.125f);
 
             ResourceManager.AddButtonEventOnetime
             (
-                PrefabLabel.D_Water2,
+                ObjectLabel.D_Water2,
                 () =>
                 {
                     Pause = false;
@@ -1325,11 +1325,11 @@ public class MiniGameManager : Regist
         }
 
 
-        ResourceManager.Get(PrefabLabel.C_MiniGame).TweenForCG();
+        ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForCG();
 
         if (Manager.MiniTimer > 0)
         {
-            ResourceManager.Get(PrefabLabel.C_MiniGame).TweenForRect();
+            ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForRect();
         }
 
 
@@ -1412,12 +1412,12 @@ public class MiniGameManager : Regist
             EnterFindGame();
         }
 
-        ScoreLab = Language.GetStr("UI", PrefabLabel.D_ScoreLab);
+        ScoreLab = Language.GetStr(LanguageLabel.UI__D_ScoreLab);
 
         TimerBk.fillAmount = 0;
         TimerLab.text = GameTime.ToString("0");
 
-        ResourceManager.Get(PrefabLabel.C_MiniGame).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
     }
 
     public static void EnterPunchGame()
@@ -1429,15 +1429,15 @@ public class MiniGameManager : Regist
         Grid.SetParent(PunchGameStatus);
         Begin.SetParent(PunchGameOperate);
 
-        PrepareLab.SetParent(ResourceManager.Get(PrefabLabel.D_PrepareLayout1));
+        PrepareLab.SetParent(ResourceManager.Get(ObjectLabel.D_PrepareLayout1));
 
 
-        ResourceManager.SetActive(PrefabLabel.D_Rip1, false);
-        ResourceManager.SetActive(PrefabLabel.D_Water1, false);
-        ResourceManager.SetActive(PrefabLabel.D_Fertilize1, false);
+        ResourceManager.SetActive(ObjectLabel.D_Rip1, false);
+        ResourceManager.SetActive(ObjectLabel.D_Water1, false);
+        ResourceManager.SetActive(ObjectLabel.D_Fertilize1, false);
 
-        ResourceManager.SetActive(PrefabLabel.D_Begin, true);
-        ResourceManager.SetActive(PrefabLabel.D_DescA, true);
+        ResourceManager.SetActive(ObjectLabel.D_Begin, true);
+        ResourceManager.SetActive(ObjectLabel.D_DescA, true);
 
 
         if (Award.FlowerLock)
@@ -1499,22 +1499,22 @@ public class MiniGameManager : Regist
         Grid.SetParent(MemoryGameStatus);
         Begin.SetParent(MemoryGameOperate);
 
-        PrepareLab.SetParent(ResourceManager.Get(PrefabLabel.D_PrepareLayout2));
+        PrepareLab.SetParent(ResourceManager.Get(ObjectLabel.D_PrepareLayout2));
 
 
         ResetOprerate();
 
-        ResourceManager.Get(PrefabLabel.D_Mask).TweenBacGra();
+        ResourceManager.Get(ObjectLabel.D_Mask).TweenBacGra();
 
-        ResourceManager.SetActive(PrefabLabel.D_FlowerBtn1, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerBtn2, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerBtn3, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerBtn4, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerBtn5, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerBtn6, false);
+        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(PrefabLabel.D_Begin, true);
-        ResourceManager.SetActive(PrefabLabel.D_DescB, true);
+        ResourceManager.SetActive(ObjectLabel.D_Begin, true);
+        ResourceManager.SetActive(ObjectLabel.D_DescB, true);
 
         List<int> idList = new List<int>() {1, 2, 4, 5, 7, 8};
 
@@ -1585,18 +1585,18 @@ public class MiniGameManager : Regist
     {
         FindGameOperate.SetActive(true);
 
-        ResourceManager.SetActive(PrefabLabel.D_Begin, true);
-        ResourceManager.SetActive(PrefabLabel.D_DescC, true);
+        ResourceManager.SetActive(ObjectLabel.D_Begin, true);
+        ResourceManager.SetActive(ObjectLabel.D_DescC, true);
 
-        ResourceManager.SetActive(PrefabLabel.D_FlowerBtn7, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerBtn8, false);
-        ResourceManager.SetActive(PrefabLabel.D_FlowerBtn9, false);
+        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn7, false);
+        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn8, false);
+        ResourceManager.SetActive(ObjectLabel.D_FlowerBtn9, false);
 
         Begin.SetParent(FindGameOperate);
         Timer.SetParent(FindGameStatus);
         Grid.SetParent(FindGameStatus);
 
-        PrepareLab.SetParent(ResourceManager.Get(PrefabLabel.D_PrepareLayout3));
+        PrepareLab.SetParent(ResourceManager.Get(ObjectLabel.D_PrepareLayout3));
 
         FindGameRoundReset(true);
     }
@@ -1666,35 +1666,35 @@ public class MiniGameManager : Regist
         Prepare = true;
         PrepareTimer = PrepareTime;
 
-        ResourceManager.Get(PrefabLabel.D_Begin).SetActive(false);
-        ResourceManager.Get(PrefabLabel.D_DescA).SetActive(false);
-        ResourceManager.Get(PrefabLabel.D_DescB).SetActive(false);
-        ResourceManager.Get(PrefabLabel.D_DescC).SetActive(false);
+        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);
 
         if (PunchGame)
         {
-            ResourceManager.Get(PrefabLabel.D_Rip1).SetActive(true);
-            ResourceManager.Get(PrefabLabel.D_Water1).SetActive(true);
-            ResourceManager.Get(PrefabLabel.D_Fertilize1).SetActive(true);
+            ResourceManager.Get(ObjectLabel.D_Rip1).SetActive(true);
+            ResourceManager.Get(ObjectLabel.D_Water1).SetActive(true);
+            ResourceManager.Get(ObjectLabel.D_Fertilize1).SetActive(true);
         }
 
         if (MemoryGame)
         {
-            ResourceManager.Get(PrefabLabel.D_Mask).TweenForGra();
+            ResourceManager.Get(ObjectLabel.D_Mask).TweenForGra();
 
-            ResourceManager.SetActive(PrefabLabel.D_FlowerBtn1, true);
-            ResourceManager.SetActive(PrefabLabel.D_FlowerBtn2, true);
-            ResourceManager.SetActive(PrefabLabel.D_FlowerBtn3, true);
-            ResourceManager.SetActive(PrefabLabel.D_FlowerBtn4, true);
-            ResourceManager.SetActive(PrefabLabel.D_FlowerBtn5, true);
-            ResourceManager.SetActive(PrefabLabel.D_FlowerBtn6, true);
+            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.SetSprite(PrefabLabel.D_FlowerIcon1, FlowerDic[1].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(PrefabLabel.D_FlowerIcon2, FlowerDic[2].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(PrefabLabel.D_FlowerIcon3, FlowerDic[4].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(PrefabLabel.D_FlowerIcon4, FlowerDic[5].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(PrefabLabel.D_FlowerIcon5, FlowerDic[7].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
-            ResourceManager.SetSprite(PrefabLabel.D_FlowerIcon6, FlowerDic[8].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon1, FlowerDic[1].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon2, FlowerDic[2].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon3, FlowerDic[4].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon4, FlowerDic[5].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon5, FlowerDic[7].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
+            ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon6, FlowerDic[8].FlowerInfo.Icon).Resize(true, 1.0625f, 1.0625f);
         }
 
         PrepareLab.StreamForScale();
@@ -1703,7 +1703,7 @@ public class MiniGameManager : Regist
 
     public static void MemoryGameRoundEnd()
     {
-        ResourceManager.Get(PrefabLabel.D_Mask).TweenForGra();
+        ResourceManager.Get(ObjectLabel.D_Mask).TweenForGra();
     }
 
     private static float MemoryGameDecreaseRate = 0.3f;
@@ -1738,7 +1738,7 @@ public class MiniGameManager : Regist
 
     public static void MemoryGameRoundBegin()
     {
-        ResourceManager.Get(PrefabLabel.D_Mask).TweenBacGra();
+        ResourceManager.Get(ObjectLabel.D_Mask).TweenBacGra();
 
         if (TutorialManager.MemoryMinigameTutorial)
         {
@@ -1760,9 +1760,9 @@ public class MiniGameManager : Regist
             IdleList[i].FlowerIcon.TweenForSr();
         }
 
-        ResourceManager.Get(PrefabLabel.D_FlowerBtn7).TweenBacCG();
-        ResourceManager.Get(PrefabLabel.D_FlowerBtn8).TweenBacCG();
-        ResourceManager.Get(PrefabLabel.D_FlowerBtn9).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.D_FlowerBtn7).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.D_FlowerBtn8).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.D_FlowerBtn9).TweenBacCG();
 
         Auxiliary.Instance.DelayCall
         (
@@ -1862,9 +1862,9 @@ public class MiniGameManager : Regist
         }
 
 
-        ResourceManager.SetSprite(PrefabLabel.D_FlowerIcon7, GardenManager.FlowerInfoDic[idList[0]].Icon).Resize(true, 1.0625f, 1.0625f);
-        ResourceManager.SetSprite(PrefabLabel.D_FlowerIcon8, GardenManager.FlowerInfoDic[idList[1]].Icon).Resize(true, 1.0625f, 1.0625f);
-        ResourceManager.SetSprite(PrefabLabel.D_FlowerIcon9, GardenManager.FlowerInfoDic[idList[2]].Icon).Resize(true, 1.0625f, 1.0625f);
+        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon7, GardenManager.FlowerInfoDic[idList[0]].Icon).Resize(true, 1.0625f, 1.0625f);
+        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon8, GardenManager.FlowerInfoDic[idList[1]].Icon).Resize(true, 1.0625f, 1.0625f);
+        ResourceManager.SetSprite(ObjectLabel.D_FlowerIcon9, GardenManager.FlowerInfoDic[idList[2]].Icon).Resize(true, 1.0625f, 1.0625f);
 
         for (int i = 0; i < idList.Count; i++)
         {
@@ -1891,9 +1891,9 @@ public class MiniGameManager : Regist
             IdleList[0].PlayNewFlowerEffec();
         }
 
-        ResourceManager.Get(PrefabLabel.D_FlowerBtn7).TweenReForCG();
-        ResourceManager.Get(PrefabLabel.D_FlowerBtn8).TweenReForCG();
-        ResourceManager.Get(PrefabLabel.D_FlowerBtn9).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.D_FlowerBtn7).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.D_FlowerBtn8).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.D_FlowerBtn9).TweenReForCG();
 
         for (int i = 0; i < IdleList.Count; i++)
         {
@@ -1948,7 +1948,7 @@ public class MiniGameManager : Regist
             {
                 if (Game || Prepare)
                 {
-                    ResourceManager.Get<Button>(PrefabLabel.D_Quit).onClick.Invoke();
+                    ResourceManager.Get<Button>(ObjectLabel.D_Quit).onClick.Invoke();
                 }
             }
         }

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

@@ -24,7 +24,7 @@ public class NickNameManager : Regist
     public override void FirstInit()
 	{
 		SetNickName (ConfigManager.GetPlayerString (PlayerConfigLabel.NickName));
-		inputField = ResourceManager.Get<InputField> (PrefabLabel.T_InputField);
+		inputField = ResourceManager.Get<InputField> (ObjectLabel.T_InputField);
 	    string defaultNames = ResourceManager.Load<TextAsset>(ResourceLabel.DefaultNickName, Folder.Config).text;
 	    string[] names = defaultNames.Split('\n');
         FirstNames = names[0].Split('|')[1].Split(',').ToList();
@@ -61,28 +61,28 @@ public class NickNameManager : Regist
 	{
 	    if (string.IsNullOrEmpty(NickName))
 	    {
-	        ResourceManager.SetActive(PrefabLabel.T_Close, false);
+	        ResourceManager.SetActive(ObjectLabel.T_Close, false);
 	    }
 	    else
 	    {
-            ResourceManager.SetActive(PrefabLabel.T_Close, true);
+            ResourceManager.SetActive(ObjectLabel.T_Close, true);
 	        inputField.text = NickName;
 	    }
 
-	    ResourceManager.SetText(PrefabLabel.T_Tit, Language.GetStr("UI", PrefabLabel.T_Tit));
+	    ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
 
 	    if (!TutorialManager.PlazaRoomTutorial && !TutorialManager.VisitTutorial && !TutorialManager.DressroomTutorial)
 	    {
-            ResourceManager.Get(PrefabLabel.C_Main).TweenBacCG();
+            ResourceManager.Get(ObjectLabel.C_Main).TweenBacCG();
         }
 
-        ResourceManager.Get (PrefabLabel.T_NickNameBK).TweenForCG ();
+        ResourceManager.Get (ObjectLabel.T_NickNameBK).TweenForCG ();
 	}
 
 	public static void CloseNickNameSettingPanel()
 	{
-		ResourceManager.Get (PrefabLabel.C_Main).TweenForCG ();
-		ResourceManager.Get (PrefabLabel.T_NickNameBK).TweenBacCG ();
+		ResourceManager.Get (ObjectLabel.C_Main).TweenForCG ();
+		ResourceManager.Get (ObjectLabel.T_NickNameBK).TweenBacCG ();
 	}
 
 	public static void ResetNickName()
@@ -93,8 +93,8 @@ public class NickNameManager : Regist
             return;
 	    }
 
-	    ResourceManager.SetText(PrefabLabel.T_Tit, Language.GetStr("UI", "T_Checking"));
-	    ResourceManager.Get<CanvasGroup>(PrefabLabel.T_NickNameBK).interactable = false;
+	    ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Checking));
+	    ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = false;
 
 		if (InputFieldValidate ())
         {
@@ -107,23 +107,23 @@ public class NickNameManager : Regist
 		}
 		else
 		{
-	    ResourceManager.SetText(PrefabLabel.T_Tit, Language.GetStr("UI", PrefabLabel.T_Tit));
-            ResourceManager.Get<CanvasGroup>(PrefabLabel.T_NickNameBK).interactable = true;
+	    ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
+            ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = true;
         }
 	}
 
     public static void ResetFailed(string str)
     {
-        ResourceManager.SetText(PrefabLabel.T_Tit, Language.GetStr("UI", PrefabLabel.T_Tit));
+        ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
 
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.T_NickNameBK).interactable = true;
+        ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = true;
 
         Bubble.Show(null, str);
     }
 
     public static void ResetSucceed()
     {
-	    ResourceManager.Get<CanvasGroup>(PrefabLabel.T_NickNameBK).interactable = true;
+	    ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = true;
 
         SetNickName(inputField.text);
 
@@ -138,7 +138,7 @@ public class NickNameManager : Regist
 		NickName = nickName;
 		ConfigManager.SavePlayerString (PlayerConfigLabel.NickName, nickName);
 
-		ResourceManager.SetText (PrefabLabel.C_NickNameLab, nickName);
+		ResourceManager.SetText (ObjectLabel.C_NickNameLab, nickName);
 	}
 
     public static bool InputFieldValidate()
@@ -161,12 +161,12 @@ public class NickNameManager : Regist
 
         if (charCnt == 0)
         {
-            Bubble.Show(null, Language.GetStr("UI", "T_AllWhiteSpace"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__T_AllWhiteSpace));
             return false;
         }
         else if (charCnt > 12)
         {
-            Bubble.Show(null, Language.GetStr("UI", "T_TooLong"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__T_TooLong));
             inputField.text = inputField.text.Substring(0, 12);
             return false;
         }
@@ -174,7 +174,7 @@ public class NickNameManager : Regist
         {
             if (StringFilter.ContainSensitiveWord(inputField.text))
             {
-                Bubble.Show(null, Language.GetStr("Common", "ContainSensitiveWord"));
+                Bubble.Show(null, Language.GetStr(LanguageLabel.Common__ContainSensitiveWord));
                 return false;
             }
             else

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

@@ -63,7 +63,7 @@ public class PlazaRoomManager : Regist
 
     public override void ThirdInit()
     {
-        VirtualScrollRect virtualScrollRect = ResourceManager.Get<VirtualScrollRect>(PrefabLabel.Z_ScrollRect);
+        VirtualScrollRect virtualScrollRect = ResourceManager.Get<VirtualScrollRect>(ObjectLabel.Z_ScrollRect);
         virtualScrollRect.OnVerticalLessEqual0 = NextPageGate;
         virtualScrollRect.OnVerticalGreaterEqual1 = PreviousPageGate;
 
@@ -73,12 +73,12 @@ public class PlazaRoomManager : Regist
 
     public override void RegistReference()
     {
-        Grid = ResourceManager.Get(PrefabLabel.Z_Grid);
-        ScrollRect = ResourceManager.Get<VirtualScrollRect>(PrefabLabel.Z_ScrollRect);
-        DurationLab = ResourceManager.Get<Text>(PrefabLabel.AAa_ValueLab);
-        DurationSlider = ResourceManager.Get<Slider>(PrefabLabel.AAa_Slider);
-        MaxPlayerLab = ResourceManager.Get<Text>(PrefabLabel.AAb_ValueLab);
-        MaxPlayerSlider = ResourceManager.Get<Slider>(PrefabLabel.AAb_Slider);
+        Grid = ResourceManager.Get(ObjectLabel.Z_Grid);
+        ScrollRect = ResourceManager.Get<VirtualScrollRect>(ObjectLabel.Z_ScrollRect);
+        DurationLab = ResourceManager.Get<Text>(ObjectLabel.AAa_ValueLab);
+        DurationSlider = ResourceManager.Get<Slider>(ObjectLabel.AAa_Slider);
+        MaxPlayerLab = ResourceManager.Get<Text>(ObjectLabel.AAb_ValueLab);
+        MaxPlayerSlider = ResourceManager.Get<Slider>(ObjectLabel.AAb_Slider);
         
         DurationSlider.onValueChanged.AddListener(OnSliderValueChange);
         DurationSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(Clip.BtnClip));
@@ -99,27 +99,27 @@ public class PlazaRoomManager : Regist
 
     public static void DownloadRoomData()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Z_Tip), new MulLanStr("UI", "Loading"));
-        ResourceManager.Get(PrefabLabel.Z_Tip).TweenForCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__Loading));
+        ResourceManager.Get(ObjectLabel.Z_Tip).TweenForCG();
         DownloadLock = true;
         SFSManager.GardenSmartFox.ExecuteAfterCheckConection
         (
             () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomData(LastIndex),
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Z_Tip), new MulLanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(PrefabLabel.Z_Tip).TweenBacCG(); }); } },
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Z_Tip), new MulLanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(PrefabLabel.Z_Tip).TweenBacCG(); }); } }
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = 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(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } }
          );
     }
 
     public static void DownloadCustomRoomData()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Z_Tip), new MulLanStr("UI", "Loading"));
-        ResourceManager.Get(PrefabLabel.Z_Tip).TweenForCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__Loading));
+        ResourceManager.Get(ObjectLabel.Z_Tip).TweenForCG();
         DownloadLock = true;
         SFSManager.GardenSmartFox.ExecuteAfterCheckConection
         (
             () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetCustomRoomData(CustomLastIndex, long.Parse(HttpManager.SerialNumber)),
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Z_Tip), new MulLanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(PrefabLabel.Z_Tip).TweenBacCG(); }); } },
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Z_Tip), new MulLanStr("UI", "LoadFailed")); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(PrefabLabel.Z_Tip).TweenBacCG(); }); } }
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = 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(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } }
         );
     }
 
@@ -142,8 +142,8 @@ public class PlazaRoomManager : Regist
             return;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Z_Tip), new MulLanStr("UI", "LoadSucceed"));
-        DelayCall.Call(0.5f, () => { ResourceManager.Get(PrefabLabel.Z_Tip).TweenBacCG(); });
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadSucceed));
+        DelayCall.Call(0.5f, () => { ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); });
 
         if (sfsArray.Count == 0)
         {
@@ -181,8 +181,8 @@ public class PlazaRoomManager : Regist
             return;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Z_Tip), new MulLanStr("UI", "LoadSucceed"));
-        DelayCall.Call(0.5f, () => { ResourceManager.Get(PrefabLabel.Z_Tip).TweenBacCG(); });
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadSucceed));
+        DelayCall.Call(0.5f, () => { ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); });
 
         if (sfsArray.Count == 0)
         {
@@ -342,18 +342,18 @@ public class PlazaRoomManager : Regist
             DownloadCustomRoomData();
         }
         OnSliderValueChange(0);
-        ResourceManager.Get(PrefabLabel.Z_BK).TweenForCG();
+        ResourceManager.Get(ObjectLabel.Z_BK).TweenForCG();
     }
 
     public static void ClosePanel()
     {
-        ResourceManager.Get(PrefabLabel.Z_BK).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Z_BK).TweenBacCG();
     }
 
     public static void EnableFilter()
     {
         FilterEnabled = true;
-        ResourceManager.SetActive(PrefabLabel.Z_InfoImg51, true);
+        ResourceManager.SetActive(ObjectLabel.Z_InfoImg51, true);
         ClearGrid();
         NextPage(PageVolume, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
     }
@@ -361,7 +361,7 @@ public class PlazaRoomManager : Regist
     public static void DisableFilter()
     {
         FilterEnabled = false;
-        ResourceManager.SetActive(PrefabLabel.Z_InfoImg51, false);
+        ResourceManager.SetActive(ObjectLabel.Z_InfoImg51, false);
         ClearGrid();
         NextPage(PageVolume, ref FirstIndex, ref LastIndex, RoomDatas);
     }
@@ -380,7 +380,7 @@ public class PlazaRoomManager : Regist
 
         PlazaRoomItems = new List<PlazaRoomItem>();
 
-        ResourceManager.Get(PrefabLabel.Z_Tip).GetTweenCG().InOrigin = true;
+        ResourceManager.Get(ObjectLabel.Z_Tip).GetTweenCG().InOrigin = true;
 
         DownloadLock = false;
     }
@@ -397,29 +397,29 @@ public class PlazaRoomManager : Regist
     private static Slider MaxPlayerSlider;
     public static void CreateRoom()
     {
-        string roomName = ResourceManager.Get<InputField>(PrefabLabel.AA_InputField).text;
+        string roomName = ResourceManager.Get<InputField>(ObjectLabel.AA_InputField).text;
 
         if (string.IsNullOrEmpty(roomName))
         {
-            Bubble.Show(null, Language.GetStr("UI", "AA_AllWhiteSpace"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__AA_AllWhiteSpace));
             return;
         }
 
         if (roomName.GetBytes() > 24)
         {
-            Bubble.Show(null, Language.GetStr("UI", "AA_TooLong"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__AA_TooLong));
             return;
         }
 
         if (StringFilter.ContainSensitiveWord(roomName))
         {
-            Bubble.Show(null, Language.GetStr("Common", "ContainSensitiveWord"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.Common__ContainSensitiveWord));
             return;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.AA_Tip), new MulLanStr("UI", "AA_SendRequest"));
-        ResourceManager.Get(PrefabLabel.AA_Tip).TweenForCG();
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.AA_CreatePlazaRoom).interactable = false;
+        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;
 
         int value = (int) Auxiliary.FmlParse(ValueFml, "c", Cost.ToString(), "p", MaxPlayer.ToString(), "h", Duration.ToString());
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CreateRoom(roomName, long.Parse(HttpManager.SerialNumber), Duration, MaxPlayer, value);
@@ -427,9 +427,9 @@ public class PlazaRoomManager : Regist
 
     public static void OnCreateRoomError()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.AA_Tip), new MulLanStr("UI", "AA_CreateError"));
-        ResourceManager.Get(PrefabLabel.AA_Tip).TweenBacCG();
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.AA_CreatePlazaRoom).interactable = true;
+        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;
 
         Debug.Log("create error");
     }
@@ -457,9 +457,9 @@ public class PlazaRoomManager : Regist
 
         Manager.CreateRoomAmt++;
 
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.AA_Tip), new MulLanStr("UI", "AA_CreateSucceed"));
-        ResourceManager.Get(PrefabLabel.AA_Tip).TweenBacCG();
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.AA_CreatePlazaRoom).interactable = true;
+        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;
         DownloadRoomData();
 
         Manager.AddDiamond(-Cost, StaticsManager.ItemID.创建派对, StaticsManager.ConsumeModule.Charge);
@@ -472,36 +472,36 @@ public class PlazaRoomManager : Regist
     {
         Duration = (int) DurationSlider.value;
         MaxPlayer = (int) MaxPlayerSlider.value;
-        DurationLab.text = Duration + Language.GetStr("UI", "AAa_Value");
-        MaxPlayerLab.text = MaxPlayer + Language.GetStr("UI", "AAb_Value");
+        DurationLab.text = Duration + Language.GetStr(LanguageLabel.UI__AAa_Value);
+        MaxPlayerLab.text = MaxPlayer + Language.GetStr(LanguageLabel.UI__AAb_Value);
 
         Cost = (int) Auxiliary.FmlParse(CostFml, "h", Duration.ToString(), "p", MaxPlayer.ToString());
-        ResourceManager.SetText(PrefabLabel.AA_Desc, Language.GetStr("UI", "AA_Cost") + TransferLabel.DiamondSprite + Cost);
+        ResourceManager.SetText(ObjectLabel.AA_Desc, Language.GetStr(LanguageLabel.UI__AA_Cost) + TransferLabel.DiamondSprite + Cost);
         
         if (Cost > Manager.Diamond)
         {
-            ResourceManager.SetText(PrefabLabel.AA_BtnLab, Language.GetStr("UI", "AA_NoEnoughDiamond"));
-            ResourceManager.Get<Button>(PrefabLabel.AA_Btn).image.material = Lib.GrayMat;
-            ResourceManager.Get<Button>(PrefabLabel.AA_Btn).interactable = false;
+            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;
         }
         else
         {
-            ResourceManager.SetText(PrefabLabel.AA_BtnLab, Language.GetStr("UI", "AA_Create"));
-            ResourceManager.Get<Button>(PrefabLabel.AA_Btn).image.material = null;
-            ResourceManager.Get<Button>(PrefabLabel.AA_Btn).interactable = true;
+            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;
         }
     }
 
     public static void OpenCreatePanel()
     {
-        ResourceManager.Get(PrefabLabel.AA_CreatePlazaRoom).TweenForCG();
+        ResourceManager.Get(ObjectLabel.AA_CreatePlazaRoom).TweenForCG();
 
-        string defaultName = Language.GetStr("UI", "AA_DefaultName").Replace(TransferLabel.Value, NickNameManager.NickName);
-        ResourceManager.Get<InputField>(PrefabLabel.AA_InputField).text = defaultName;
+        string defaultName = Language.GetStr(LanguageLabel.UI__AA_DefaultName).Replace(TransferLabel.Value, NickNameManager.NickName);
+        ResourceManager.Get<InputField>(ObjectLabel.AA_InputField).text = defaultName;
     }
 
     public static void CloseCreatePanel()
     {
-        ResourceManager.Get(PrefabLabel.AA_CreatePlazaRoom).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.AA_CreatePlazaRoom).TweenBacCG();
     }
 }

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

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

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

@@ -103,9 +103,9 @@ public class Sign
         ResetSign();
 
 
-        ResourceManager.SetActive(PrefabLabel.Bb_Get, false);
-        ResourceManager.SetActive(PrefabLabel.Bb_Rotate, true);
-        ResourceManager.SetActive(PrefabLabel.Bb_Confirm, true);
+        ResourceManager.SetActive(ObjectLabel.Bb_Get, false);
+        ResourceManager.SetActive(ObjectLabel.Bb_Rotate, true);
+        ResourceManager.SetActive(ObjectLabel.Bb_Confirm, true);
 
         if (FlowerList.Valid())
         {
@@ -115,13 +115,13 @@ public class Sign
 
                 if (flowerInfo.Unlock == false)
                 {
-                    ResourceManager.SetText(PrefabLabel.Bb_InfoLabA, flowerInfo.Name);
+                    ResourceManager.SetText(ObjectLabel.Bb_InfoLabA, flowerInfo.Name);
 
-                    ResourceManager.SetActive(PrefabLabel.Bb_IconA, true);
+                    ResourceManager.SetActive(ObjectLabel.Bb_IconA, true);
 
-                    ResourceManager.SetSprite(PrefabLabel.Bb_IconA0, flowerInfo.Icon);
+                    ResourceManager.SetSprite(ObjectLabel.Bb_IconA0, flowerInfo.Icon);
                     
-                    ResourceManager.Get<Image>(PrefabLabel.Bb_IconA0).Resize(true, 0.8125f, 0.8125f);
+                    ResourceManager.Get<Image>(ObjectLabel.Bb_IconA0).Resize(true, 0.8125f, 0.8125f);
 
                     flowerInfo.Add();
 
@@ -132,21 +132,21 @@ public class Sign
 
         if (Diamond > 0)
         {
-            ResourceManager.SetText(PrefabLabel.Bb_InfoLabB, Diamond.ToString());
+            ResourceManager.SetText(ObjectLabel.Bb_InfoLabB, Diamond.ToString());
 
-            ResourceManager.SetSprite(PrefabLabel.Bb_IconB, Lib.DiamondSprite);
+            ResourceManager.SetSprite(ObjectLabel.Bb_IconB, Lib.DiamondSprite);
 
-            ResourceManager.SetActive(PrefabLabel.Bb_IconB, true);
+            ResourceManager.SetActive(ObjectLabel.Bb_IconB, true);
 
             Manager.AddDiamond(Diamond, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Checkin);
         }
         else if (Coin > 0)
         {
-            ResourceManager.SetText(PrefabLabel.Bb_InfoLabB, Coin.ToString());
+            ResourceManager.SetText(ObjectLabel.Bb_InfoLabB, Coin.ToString());
 
-            ResourceManager.SetSprite(PrefabLabel.Bb_IconB, Lib.GoldSprite);
+            ResourceManager.SetSprite(ObjectLabel.Bb_IconB, Lib.GoldSprite);
 
-            ResourceManager.SetActive(PrefabLabel.Bb_IconB, true);
+            ResourceManager.SetActive(ObjectLabel.Bb_IconB, true);
 
             Manager.AddCoin(Coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Checkin);
         }
@@ -209,7 +209,7 @@ public class Sign
             SignManager.SignIndex = 1;
             SignManager.SignRound++;
 
-            ResourceManager.Get(PrefabLabel.B_SignIn).GetTweenCG().AddEventOnetime
+            ResourceManager.Get(ObjectLabel.B_SignIn).GetTweenCG().AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
@@ -265,9 +265,9 @@ public class Lottery
 
     public static void Configure(List<XmlAttributeCollection> attributeList)
     {
-        PosList.Add(ResourceManager.Get(PrefabLabel.Bc_LotteryItem1).position);
-        PosList.Add(ResourceManager.Get(PrefabLabel.Bc_LotteryItem2).position);
-        PosList.Add(ResourceManager.Get(PrefabLabel.Bc_LotteryItem3).position);
+        PosList.Add(ResourceManager.Get(ObjectLabel.Bc_LotteryItem1).position);
+        PosList.Add(ResourceManager.Get(ObjectLabel.Bc_LotteryItem2).position);
+        PosList.Add(ResourceManager.Get(ObjectLabel.Bc_LotteryItem3).position);
 
         for (int i = 0; i < attributeList.Count; i++)
         {
@@ -465,8 +465,8 @@ public class Lottery
     {
         ResetSign = resetSign;
 
-        ResourceManager.Get(PrefabLabel.Bc_Lottery).TweenForCG();
-        ResourceManager.Get(PrefabLabel.Ba_Notice0).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Bc_Lottery).TweenForCG();
+        ResourceManager.Get(ObjectLabel.Ba_Notice0).TweenBacCG();
 
         float random = Random.Range(0f, 1f);
 
@@ -481,9 +481,9 @@ public class Lottery
             }
         }
 
-        TempLotteryList.Add(CreateLottery(TempTypeList[0], 0, ResourceManager.Get(PrefabLabel.Bc_LotteryItem1)));
-        TempLotteryList.Add(CreateLottery(TempTypeList[1], 1, ResourceManager.Get(PrefabLabel.Bc_LotteryItem2)));
-        TempLotteryList.Add(CreateLottery(TempTypeList[2], 2, ResourceManager.Get(PrefabLabel.Bc_LotteryItem3)));
+        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)));
 
         List<Vector3> posList = PosList.Disturb();
 
@@ -491,9 +491,9 @@ public class Lottery
         TempLotteryList[1].Item.position = posList[1];
         TempLotteryList[2].Item.position = posList[2];
 
-        Button button1 = ResourceManager.Get<Button>(PrefabLabel.Bc_LotteryBack1);
-        Button button2 = ResourceManager.Get<Button>(PrefabLabel.Bc_LotteryBack2);
-        Button button3 = ResourceManager.Get<Button>(PrefabLabel.Bc_LotteryBack3);
+        Button button1 = ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack1);
+        Button button2 = ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack2);
+        Button button3 = ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack3);
 
         button1.interactable = false;
         button2.interactable = false;
@@ -503,9 +503,9 @@ public class Lottery
         (
             () =>
             {
-                ResourceManager.Get(PrefabLabel.Bc_LotteryItem1).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
-                ResourceManager.Get(PrefabLabel.Bc_LotteryItem2).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
-                ResourceManager.Get(PrefabLabel.Bc_LotteryItem3).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
+                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);
             },
             1f
         );
@@ -514,9 +514,9 @@ public class Lottery
         (
             () =>
             {
-                ResourceManager.Get(PrefabLabel.Bc_LotteryItem1).TweenForEuler();
-                ResourceManager.Get(PrefabLabel.Bc_LotteryItem2).TweenForEuler();
-                ResourceManager.Get(PrefabLabel.Bc_LotteryItem3).TweenForEuler();
+                ResourceManager.Get(ObjectLabel.Bc_LotteryItem1).TweenForEuler();
+                ResourceManager.Get(ObjectLabel.Bc_LotteryItem2).TweenForEuler();
+                ResourceManager.Get(ObjectLabel.Bc_LotteryItem3).TweenForEuler();
             },
             1.5f
         );
@@ -529,9 +529,9 @@ public class Lottery
                 button2.interactable = true;
                 button3.interactable = true;
 
-                ResourceManager.Get(PrefabLabel.Bc_LotteryItem1).Move2D(PosList[0], 0.25f, false, Curve.EaseOutQuad);
-                ResourceManager.Get(PrefabLabel.Bc_LotteryItem2).Move2D(PosList[1], 0.25f, false, Curve.EaseOutQuad);
-                ResourceManager.Get(PrefabLabel.Bc_LotteryItem3).Move2D(PosList[2], 0.25f, false, Curve.EaseOutQuad);
+                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);
             },
             2f
         );
@@ -540,9 +540,9 @@ public class Lottery
         (
             () =>
             {
-                ResourceManager.Get(PrefabLabel.Bc_Lab).TweenForCG();
+                ResourceManager.Get(ObjectLabel.Bc_Lab).TweenForCG();
 
-                ResourceManager.SetText(PrefabLabel.Bc_Lab, Language.GetStr("UI", PrefabLabel.Bc_Lab));
+                ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab));
             },
             2.5f
         );
@@ -554,15 +554,15 @@ public class Lottery
         TempValueList = new List<int>();
         TempLotteryList = new List<Lottery>();
 
-        ResourceManager.Get(PrefabLabel.Bc_Lab).TweenBacCG();
-        ResourceManager.Get(PrefabLabel.Bc_Confirm).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Bc_Lab).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Bc_Confirm).TweenBacCG();
 
-        ResourceManager.Get(PrefabLabel.Ba_Notice0).TweenForCG();
+        ResourceManager.Get(ObjectLabel.Ba_Notice0).TweenForCG();
 
-        ResourceManager.Get(PrefabLabel.B_SignIn).TweenBacCG();
-        ResourceManager.Get(PrefabLabel.Ba_Notice).TweenBacCG();
-        ResourceManager.Get(PrefabLabel.Bb_SignIn).TweenBacCG();
-        ResourceManager.Get(PrefabLabel.Bc_Lottery).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Ba_Notice).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Bb_SignIn).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Bc_Lottery).TweenBacCG();
 
         AudioManager.PlayClip(Clip.BtnClip);
     }
@@ -572,9 +572,9 @@ public class Lottery
     {
         AudioManager.PlayClip(Clip.CurrentClip);
 
-        ResourceManager.Get<Button>(PrefabLabel.Bc_LotteryBack1).interactable = false;
-        ResourceManager.Get<Button>(PrefabLabel.Bc_LotteryBack2).interactable = false;
-        ResourceManager.Get<Button>(PrefabLabel.Bc_LotteryBack3).interactable = false;
+        ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack1).interactable = false;
+        ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack2).interactable = false;
+        ResourceManager.Get<Button>(ObjectLabel.Bc_LotteryBack3).interactable = false;
 
         TempLotteryList[0].Item.TweenBacEuler();
 
@@ -594,11 +594,11 @@ public class Lottery
             (
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.Bc_Confirm).TweenForCG();
+                    ResourceManager.Get(ObjectLabel.Bc_Confirm).TweenForCG();
 
-                    ResourceManager.Get(PrefabLabel.Bc_LotteryItem1).TweenBacEuler();
-                    ResourceManager.Get(PrefabLabel.Bc_LotteryItem2).TweenBacEuler();
-                    ResourceManager.Get(PrefabLabel.Bc_LotteryItem3).TweenBacEuler();
+                    ResourceManager.Get(ObjectLabel.Bc_LotteryItem1).TweenBacEuler();
+                    ResourceManager.Get(ObjectLabel.Bc_LotteryItem2).TweenBacEuler();
+                    ResourceManager.Get(ObjectLabel.Bc_LotteryItem3).TweenBacEuler();
                 },
                 1f
             );
@@ -617,19 +617,19 @@ public class Lottery
         {
             Manager.AddCoin(Value, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Checkin);
 
-            ResourceManager.SetText(PrefabLabel.Bc_Lab, Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Coin") + " " + Value);
+            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + Language.GetStr(LanguageLabel.Common__Coin) + " " + Value);
         }
         else if (Type == 2)
         {
             Manager.AddDiamond(Value, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Checkin);
 
-            ResourceManager.SetText(PrefabLabel.Bc_Lab, Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Diamond") + " " + Value);
+            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + Language.GetStr(LanguageLabel.Common__Diamond) + " " + Value);
         }
         else if (Type == 3)
         {
             GardenManager.FlowerInfoDic[Value].Add();
 
-            ResourceManager.SetText(PrefabLabel.Bc_Lab, Language.GetStr("UI", "Bc_Lab1") + " " + GardenManager.FlowerInfoDic[Value].Name);
+            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + GardenManager.FlowerInfoDic[Value].Name);
         }
         else if (Type == 4)
         {
@@ -637,7 +637,7 @@ public class Lottery
 
             PlayerManager.BoughtCloseList.UniqueAdd(Value);
 
-            ResourceManager.SetText(PrefabLabel.Bc_Lab, Language.GetStr("UI", "Bc_Lab1") + " " + PlayerManager.CloseItemDic[Value].Name);
+            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + PlayerManager.CloseItemDic[Value].Name);
         }
     }
 }
@@ -693,10 +693,10 @@ public class SignManager : Regist
     {
         if (Manager.OfflineLock)
         {
-            ResourceManager.Get(PrefabLabel.C_Group).TweenBacCG();
+            ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
 
-            ResourceManager.Get(PrefabLabel.B_SignIn).TweenForCG();
-            ResourceManager.Get(PrefabLabel.Ba_Notice).TweenForCG();
+            ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
+            ResourceManager.Get(ObjectLabel.Ba_Notice).TweenForCG();
 
             return true;
         }
@@ -712,10 +712,10 @@ public class SignManager : Regist
         {
                 HttpManager.GetMailReward();
 
-                ResourceManager.Get(PrefabLabel.C_Group).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
 
-                ResourceManager.Get(PrefabLabel.B_SignIn).TweenForCG();
-                ResourceManager.Get(PrefabLabel.Bd_Mail0).TweenForCG();
+                ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
+                ResourceManager.Get(ObjectLabel.Bd_Mail0).TweenForCG();
 
                 return true;
         }
@@ -733,8 +733,8 @@ public class SignManager : Regist
 
             if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
             {
-                ResourceManager.Get(PrefabLabel.B_SignIn).TweenForCG();
-                ResourceManager.Get(PrefabLabel.Bb_SignIn).TweenForCG();
+                ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
+                ResourceManager.Get(ObjectLabel.Bb_SignIn).TweenForCG();
 
                 return true;
             }
@@ -747,7 +747,7 @@ public class SignManager : Regist
     {
         if (HttpManager.NotificationIndex > ConfigManager.GetPlayerInt(PlayerConfigLabel.NotificationIndex) && HttpManager.NotificationReady)
         {
-            ResourceManager.Get(PrefabLabel.B_SignIn).TweenBacCG();
+            ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
 
             ConfigManager.SavePlayerInt(PlayerConfigLabel.NotificationIndex, HttpManager.NotificationIndex);
 
@@ -777,7 +777,7 @@ public class SignManager : Regist
         SignIndex = ConfigManager.GetPlayerInt(PlayerConfigLabel.SignIndex);
         SignRound = ConfigManager.GetPlayerInt(PlayerConfigLabel.SignRound);
 
-        Transform par = ResourceManager.Get(PrefabLabel.Bb_Grid);
+        Transform par = ResourceManager.Get(ObjectLabel.Bb_Grid);
 
         List<XmlAttributeCollection> attributeList = ConfigManager.GetSignConfig();
 

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

@@ -82,10 +82,10 @@ public class SocialManager : Regist
 
     public override void FirstInit()
     {
-        PraiseText = ResourceManager.Get<Text>(PrefabLabel.C_PraiseText);
-        PraiseBtn = ResourceManager.Get<Button>(PrefabLabel.C_Praise);
-        InputField = ResourceManager.Get<InputField>(PrefabLabel.Q_InputField);
-        ScrollRectPlus = ResourceManager.Get<ScrollRectPlus>(PrefabLabel.Q_ScrollRect);
+        PraiseText = ResourceManager.Get<Text>(ObjectLabel.C_PraiseText);
+        PraiseBtn = ResourceManager.Get<Button>(ObjectLabel.C_Praise);
+        InputField = ResourceManager.Get<InputField>(ObjectLabel.Q_InputField);
+        ScrollRectPlus = ResourceManager.Get<ScrollRectPlus>(ObjectLabel.Q_ScrollRect);
 
         ScrollRectPlus.onValueChanged.AddListener(OnScroll);
     }
@@ -358,8 +358,8 @@ public class SocialManager : Regist
 
         ClearComment();
 
-        ResourceManager.Get(PrefabLabel.Q_Tip).TweenForCG();
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Q_Tip), Language.GetStr("UI", "Loading"));
+        ResourceManager.Get(ObjectLabel.Q_Tip).TweenForCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__Loading));
 
         if (isPlayer)
         {
@@ -379,14 +379,14 @@ public class SocialManager : Regist
                 {
                     if (!VisitManager.InVisit)
                     {
-                        DelayCall.Call(0.5f, () => ResourceManager.Get(PrefabLabel.Q_Tip).TweenBacCG());
-                        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Q_Tip), Language.GetStr("UI", "LoadSucceed"));
+                        DelayCall.Call(0.5f, () => ResourceManager.Get(ObjectLabel.Q_Tip).TweenBacCG());
+                        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__LoadSucceed));
 
                         InputCommentData(true, data);
                         NextPage(true, true);
 
-                        ResourceManager.Get<CanvasGroup>(PrefabLabel.Q_CommentBK).interactable = false;
-                        DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(PrefabLabel.Q_CommentBK).interactable = true);
+                        ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = false;
+                        DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = true);
                     }
                 }
             );
@@ -409,14 +409,14 @@ public class SocialManager : Regist
                 {
                     if (VisitManager.InVisit)
                     {
-                        DelayCall.Call(0.5f, () => ResourceManager.Get(PrefabLabel.Q_Tip).TweenBacCG());
-                        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Q_Tip), Language.GetStr("UI", "LoadSucceed"));
+                        DelayCall.Call(0.5f, () => ResourceManager.Get(ObjectLabel.Q_Tip).TweenBacCG());
+                        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__LoadSucceed));
 
                         InputCommentData(false, data);
                         NextPage(false, true);
 
-                        ResourceManager.Get<CanvasGroup>(PrefabLabel.Q_CommentBK).interactable = false;
-                        DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(PrefabLabel.Q_CommentBK).interactable = true);
+                        ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = false;
+                        DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = true);
                     }
                 }
             );
@@ -473,14 +473,14 @@ public class SocialManager : Regist
     {
         AudioManager.PlayClip(Clip.BubbleClip);
 
-        ResourceManager.Get(PrefabLabel.S_RankBK).TweenForCG();
+        ResourceManager.Get(ObjectLabel.S_RankBK).TweenForCG();
     }
 
     public static void CloseRankPanel()
     {
         AudioManager.PlayClip(Clip.BtnClip);
 
-        ResourceManager.Get(PrefabLabel.S_RankBK).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.S_RankBK).TweenBacCG();
     }
 
     public static void RecordRankPanel()
@@ -514,7 +514,7 @@ public class SocialManager : Regist
     {
         if (string.IsNullOrEmpty(InputField.text))
         {
-            Bubble.Show(Language.GetStr("UI", "Lb_Send2"));
+            Bubble.Show(Language.GetStr(LanguageLabel.UI__Lb_Send2));
 
             return;
         }
@@ -531,7 +531,7 @@ public class SocialManager : Regist
         }
         else
         {
-            Bubble.Show(Language.GetStr("UI", "Q_CommentTip"));
+            Bubble.Show(Language.GetStr(LanguageLabel.UI__Q_CommentTip));
         }
     }
 
@@ -547,7 +547,7 @@ public class SocialManager : Regist
         {
             if (string.IsNullOrEmpty(VisitManager.VisiteeSerialNumber))
             {
-                Bubble.Show(null, Language.GetStr("UI", "C_CannotComment"));
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__C_CannotComment));
                 return;
             }
             else
@@ -557,14 +557,14 @@ public class SocialManager : Regist
         }
 
         IsPanelOpen = true;
-        ResourceManager.Get(PrefabLabel.Q_CommentBK).TweenForCG();
+        ResourceManager.Get(ObjectLabel.Q_CommentBK).TweenForCG();
 
-        ResourceManager.SetActive(PrefabLabel.Q_InputBK, VisitManager.InVisit);
+        ResourceManager.SetActive(ObjectLabel.Q_InputBK, VisitManager.InVisit);
     }
 
     public static void CloseCommentPanel()
     {
-        ResourceManager.Get(PrefabLabel.Q_CommentBK).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Q_CommentBK).TweenBacCG();
         IsPanelOpen = false;
     }
 

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

@@ -103,10 +103,10 @@ public class TutorialManager : Regist
 
     public override void ThirdInit()
     {
-        ResourceManager.Get<Image>(PrefabLabel.N_Mask).material = ResourceManager.Load<Material>("UIMaskMat", Folder.UI);
+        ResourceManager.Get<Image>(ObjectLabel.N_Mask).material = ResourceManager.Load<Material>("UIMaskMat", Folder.UI);
 
-        Tutorial.Arrow = ResourceManager.Get(PrefabLabel.N_Arrow);
-        Tutorial.Material = ResourceManager.Get<Image>(PrefabLabel.N_Mask).material;
+        Tutorial.Arrow = ResourceManager.Get(ObjectLabel.N_Arrow);
+        Tutorial.Material = ResourceManager.Get<Image>(ObjectLabel.N_Mask).material;
 
         if (NewplayerTutorial)
         {
@@ -121,7 +121,7 @@ public class TutorialManager : Regist
 
             if (NewplayerTutorialIndex == 1)
             {
-                ResourceManager.Get(PrefabLabel.C_MiniGame).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
 
                 ChoseCharacter();
             }
@@ -135,9 +135,9 @@ public class TutorialManager : Regist
             }
             else if (NewplayerTutorialIndex == 4)
             {
-                ResourceManager.Get(PrefabLabel.C_MiniGame).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
 
-                ResourceManager.SetActive(PrefabLabel.N_Tutorial, true);
+                ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
 
                 ResourceManager.SetActive("Tutorial", true);
                 ResourceManager.SetActive("TutorialMask", true);
@@ -152,7 +152,7 @@ public class TutorialManager : Regist
             }
             else if (NewplayerTutorialIndex == 6)
             {
-                ResourceManager.Get(PrefabLabel.C_MiniGame).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
 
                 Garden.Instance.TutorialToRegular();
                 UIManager.Instance.TutorialToRegular();
@@ -209,7 +209,7 @@ public class TutorialManager : Regist
 
         Tutorial.HightDisable();
 
-        ResourceManager.SetActive(PrefabLabel.D_Quit, true);
+        ResourceManager.SetActive(ObjectLabel.D_Quit, true);
 
         ClickSlot();
     }
@@ -273,13 +273,13 @@ public class TutorialManager : Regist
         AchieveManager.UpdateHint();
 
         Tutorial.HightDisable();
-        ResourceManager.Get(PrefabLabel.F_TipBK).TweenBacCG();
-        ResourceManager.SetActive(PrefabLabel.F_TipBtn, false);
+        ResourceManager.Get(ObjectLabel.F_TipBK).TweenBacCG();
+        ResourceManager.SetActive(ObjectLabel.F_TipBtn, false);
 
         ResourceManager.SetActive("Tutorial", false);
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, false);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
 
-        ResourceManager.Get(PrefabLabel.C_MiniGame).TweenForCG();
+        ResourceManager.Get(ObjectLabel.C_MiniGame).TweenForCG();
 
         PlayerManager.Player.SetAllCollider(true);
 
@@ -305,12 +305,12 @@ public class TutorialManager : Regist
         ResourceManager.SetActive("TutorialMask", true);
         ResourceManager.SetActive("TutorialCollider", true);
 
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, true);
-        ResourceManager.SetActive(PrefabLabel.N_Confirm, true);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
+        ResourceManager.SetActive(ObjectLabel.N_Confirm, true);
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.N_Confirm,
+            ObjectLabel.N_Confirm,
             () =>
             {
                 if (PlayerManager.SeleTra == PlayerManager.PlayerPink)
@@ -414,7 +414,7 @@ public class TutorialManager : Regist
                 tra.TweenForScale();
 
 
-                ResourceManager.Get(PrefabLabel.N_Confirm).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.N_Confirm).TweenBacCG();
 
                 TweenRoot tween = ResourceManager.Get("Tutorial").TweenBacSr();
 
@@ -448,30 +448,30 @@ public class TutorialManager : Regist
         Garden.Instance.TutorialToRegular();
         UIManager.Instance.TutorialToRegular();
 
-        ResourceManager.Get(PrefabLabel.C_Group).TweenForCG();
-        ResourceManager.Get(PrefabLabel.C_MiniGame).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Group).TweenForCG();
+        ResourceManager.Get(ObjectLabel.C_MiniGame).TweenReForCG();
 
-        ResourceManager.SetActive(PrefabLabel.C_Coin, false);
-        ResourceManager.SetActive(PrefabLabel.C_Group1, false);
-        ResourceManager.SetActive(PrefabLabel.C_Group3, false);
+        ResourceManager.SetActive(ObjectLabel.C_Coin, false);
+        ResourceManager.SetActive(ObjectLabel.C_Group1, false);
+        ResourceManager.SetActive(ObjectLabel.C_Group3, false);
 
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, true);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
 
 
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.N_Mask).TweenForGra();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.C_MiniArrow0), ResourceManager.Get(PrefabLabel.C_MiniArrow1), ResourceManager.Get(PrefabLabel.C_MiniGame));
+                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.C_MiniArrow0), ResourceManager.Get(ObjectLabel.C_MiniArrow1), ResourceManager.Get(ObjectLabel.C_MiniGame));
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.C_MiniGame,
+            ObjectLabel.C_MiniGame,
             () =>
             {
                 EndClickEnterMinigame();
@@ -483,23 +483,23 @@ public class TutorialManager : Regist
     {
         ResourceManager.Get("Tutorial").SetCollider(false);
 
-        ResourceManager.SetActive(PrefabLabel.D_Quit, false);
+        ResourceManager.SetActive(ObjectLabel.D_Quit, false);
 
 
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.D_MiniGame).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.D_MiniGame).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.D_BeginArrow0), ResourceManager.Get(PrefabLabel.D_BeginArrow1), ResourceManager.Get(PrefabLabel.D_Begin));
+                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.D_BeginArrow0), ResourceManager.Get(ObjectLabel.D_BeginArrow1), ResourceManager.Get(ObjectLabel.D_Begin));
             }
         );
 
         ResourceManager.PushButtonEventOnetime
         (
-            PrefabLabel.D_Begin,
+            ObjectLabel.D_Begin,
             () =>
             {
                 Tutorial.HightDisable();
@@ -508,12 +508,12 @@ public class TutorialManager : Regist
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.Da_GetAward,
+            ObjectLabel.Da_GetAward,
             () =>
             {
                 EndPlayPunchMinigame();
 
-                ResourceManager.Get(PrefabLabel.C_MiniGame).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.C_MiniGame).TweenBacCG();
             }
         );
     }
@@ -522,7 +522,7 @@ public class TutorialManager : Regist
     {
         NewplayerTutorialIndex = 4;
 
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.D_MiniGame).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.D_MiniGame).GetTweenCG();
 
         tween.AddEventOnetime
         (
@@ -545,14 +545,14 @@ public class TutorialManager : Regist
 
     public static void PlantFlower()
     {
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.G_Flower).TweenForCG();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.G_Flower).TweenForCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Transform tra = ResourceManager.Get(PrefabLabel.G_RegularGrid).GetChild(0);
+                Transform tra = ResourceManager.Get(ObjectLabel.G_RegularGrid).GetChild(0);
 
                 Tutorial.HightScreen(tra.FindChild("Arrow0"), tra);
             }
@@ -568,49 +568,49 @@ public class TutorialManager : Regist
             }
         );
 
-        tween = ResourceManager.Get(PrefabLabel.H_FlowerCard).GetTweenCG();
+        tween = ResourceManager.Get(ObjectLabel.H_FlowerCard).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.H_ArrowPos), ResourceManager.Get(PrefabLabel.H_Icon2));
+                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.H_ArrowPos), ResourceManager.Get(ObjectLabel.H_Icon2));
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.H_Icon2,
+            ObjectLabel.H_Icon2,
             () =>
             {
                 Tutorial.HightDisable(0, true);
 
-                ResourceManager.Get(PrefabLabel.H_FlowerCard).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.H_FlowerCard).TweenBacCG();
             }
         );
 
-        tween = ResourceManager.Get(PrefabLabel.H_FlowerCard).GetTweenCG();
+        tween = ResourceManager.Get(ObjectLabel.H_FlowerCard).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.BackwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.G_Arrow0), ResourceManager.Get(PrefabLabel.G_Close));
+                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.G_Arrow0), ResourceManager.Get(ObjectLabel.G_Close));
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.G_Close,
+            ObjectLabel.G_Close,
             () =>
             {
                 Tutorial.HightDisable();
             }
         );
 
-        tween = ResourceManager.Get(PrefabLabel.G_Flower).GetTweenCG();
+        tween = ResourceManager.Get(ObjectLabel.G_Flower).GetTweenCG();
 
         tween.AddEventOnetime
         (
@@ -626,25 +626,25 @@ public class TutorialManager : Regist
     {
         NewplayerTutorialIndex = 6;
 
-        ResourceManager.SetActive(PrefabLabel.C_Coin, true);
-        ResourceManager.SetActive(PrefabLabel.C_Group1, true);
-        ResourceManager.SetActive(PrefabLabel.C_Group3, true);
+        ResourceManager.SetActive(ObjectLabel.C_Coin, true);
+        ResourceManager.SetActive(ObjectLabel.C_Group1, true);
+        ResourceManager.SetActive(ObjectLabel.C_Group3, true);
 
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, true);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
 
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.C_Group).TweenForCG();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.C_Group).TweenForCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish, () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.C_ManageArrow0), ResourceManager.Get(PrefabLabel.C_Manage));
+                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.C_ManageArrow0), ResourceManager.Get(ObjectLabel.C_Manage));
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.C_Manage,
+            ObjectLabel.C_Manage,
             () =>
             {
                 EndClickManagePanel();
@@ -654,7 +654,7 @@ public class TutorialManager : Regist
 
     public static void OpenUnlockPanel()
     {
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
         tween.AddEventOnetime
         (
@@ -681,22 +681,22 @@ public class TutorialManager : Regist
         );
 
 
-        tween = ResourceManager.Get(PrefabLabel.Fe_Info).GetTweenCG();
+        tween = ResourceManager.Get(ObjectLabel.Fe_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish, 
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.Fe_Arrow0), ResourceManager.Get(PrefabLabel.Fe_Arrow1), ResourceManager.Get(PrefabLabel.Fe_Btn));
+                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.Fe_Arrow0), ResourceManager.Get(ObjectLabel.Fe_Arrow1), ResourceManager.Get(ObjectLabel.Fe_Btn));
 
                 ResourceManager.AddButtonEventOnetime
                 (
-                    PrefabLabel.Fe_Btn,
+                    ObjectLabel.Fe_Btn,
 
                     () =>
                     {
-                        ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                        ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
 
                         EndOpenUnlockPanel();
                     }
@@ -707,7 +707,7 @@ public class TutorialManager : Regist
 
     public static void ClickConfirmButton()
     {
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.Fe_Info).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.Fe_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
@@ -734,21 +734,21 @@ public class TutorialManager : Regist
         );
 
 
-        tween = ResourceManager.Get(PrefabLabel.Fe_Info).GetTweenCG();
+        tween = ResourceManager.Get(ObjectLabel.Fe_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.Fe_Arrow0), ResourceManager.Get(PrefabLabel.Fe_Arrow1), ResourceManager.Get(PrefabLabel.Fe_Btn));
+                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.Fe_Arrow0), ResourceManager.Get(ObjectLabel.Fe_Arrow1), ResourceManager.Get(ObjectLabel.Fe_Btn));
 
                 ResourceManager.AddButtonEventOnetime
                 (
-                    PrefabLabel.Fe_Btn,
+                    ObjectLabel.Fe_Btn,
                     () =>
                     {
-                        ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                        ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
                         EndClickConfirmButton();
                     }
                 );
@@ -758,7 +758,7 @@ public class TutorialManager : Regist
 
     public static void UseBigSkill()
     {
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.Fe_Info).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.Fe_Info).GetTweenCG();
 
         tween.AddEventOnetime
         (
@@ -767,14 +767,14 @@ public class TutorialManager : Regist
             {
                 ConnectExempt = true;
 
-                Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.F_Arrow0), ResourceManager.Get(PrefabLabel.F_Skill1));
+                Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.F_Arrow0), ResourceManager.Get(ObjectLabel.F_Skill1));
             }
         );
 
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.F_SkillBk11,
+            ObjectLabel.F_SkillBk11,
             () =>
             {
                 EndUseBigSkill();
@@ -785,22 +785,22 @@ public class TutorialManager : Regist
 
     public static void ShowTip()
     {
-        ResourceManager.Get(PrefabLabel.N_Mask).TweenForGra();
-
-        ResourceManager.Get(PrefabLabel.F_TipBK).TweenForCG();
-        ResourceManager.SetText(PrefabLabel.F_Tip, Language.GetStr("UI", PrefabLabel.F_Tip));
-
-        ResourceManager.SetActive(PrefabLabel.F_TipBtn, true);
-        ResourceManager.AddButtonEventOnetime(PrefabLabel.F_TipBtn, () => EndShowTip());
-
-        ResourceManager.Get<ContentSizeFitter>(PrefabLabel.F_TipBK).SetLayoutVertical();
-        ResourceManager.Get<ContentSizeFitter>(PrefabLabel.F_TipBK).SetLayoutHorizontal();
-        Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.F_CoinLabArrow), ResourceManager.Get(PrefabLabel.F_TipBtn), 3);
-        Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.F_CoinLabArrow), ResourceManager.Get(PrefabLabel.F_TipBK), 1);
-        Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.F_CoinLabArrow), ResourceManager.Get(PrefabLabel.F_Tip), 2);
-        Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.F_CoinLabArrow), ResourceManager.Get(PrefabLabel.F_DataB), 1);
-        Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.F_CoinLabArrow), ResourceManager.Get(PrefabLabel.F_CoinLab), 2);
-        Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.F_CoinLabArrow), ResourceManager.Get(PrefabLabel.F_DiamondLab), 2);
+        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);
     }
 
 
@@ -812,7 +812,7 @@ public class TutorialManager : Regist
 
         VisitTutorial = false;
 
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, false);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
 
         PayExemptAmt = 0;
         ConnectExemptAmt = 0;
@@ -826,20 +826,20 @@ public class TutorialManager : Regist
 
         UIManager.BlockOfflinePanel();
 
-        TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
         if (tweenRoot.InDestination)
         {
-            TweenRoot tween = ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+            TweenRoot tween = ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
 
             tween.AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.F_Manage).TweenBacGra();
+                    ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
 
-                    tween = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+                    tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
                     tween.AddEventOnetime
                     (
@@ -859,10 +859,10 @@ public class TutorialManager : Regist
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.C_Return,
+            ObjectLabel.C_Return,
             () =>
             {
-                TweenRoot tween = ResourceManager.Get(PrefabLabel.I_BlackMask).GetTweenCG();
+                TweenRoot tween = ResourceManager.Get(ObjectLabel.I_BlackMask).GetTweenCG();
                 tween.AddEventOnetime
                 (
                     EventType.BackwardFinish,
@@ -877,20 +877,20 @@ public class TutorialManager : Regist
 
     public static void ShowVisitBtn()
     {
-        ResourceManager.Get(PrefabLabel.C_Main).TweenReForCG();
-        ResourceManager.Get(PrefabLabel.C_Group).TweenReForCG();
-        ResourceManager.Get(PrefabLabel.C_Group0).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Main).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Group).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Group0).TweenReForCG();
 
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.C_Group).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.C_Group).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.SetActive(PrefabLabel.N_Tutorial, true);
+                ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
 
-                tween = ResourceManager.Get(PrefabLabel.N_Mask).TweenForGra();
+                tween = ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
 
                 tween.AddEventOnetime
                 (
@@ -899,14 +899,14 @@ public class TutorialManager : Regist
                     {
                         PayExemptAmt = 1;
 
-                        ResourceManager.SetActive(PrefabLabel.C_Visit, true);
+                        ResourceManager.SetActive(ObjectLabel.C_Visit, true);
 
-                        ResourceManager.Get<HorizontalLayoutGroup>(PrefabLabel.C_Group4).SetLayoutHorizontal();
-                        Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.C_VisitArrow0), ResourceManager.Get(PrefabLabel.C_Visit));
+                        ResourceManager.Get<HorizontalLayoutGroup>(ObjectLabel.C_Group4).SetLayoutHorizontal();
+                        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.C_VisitArrow0), ResourceManager.Get(ObjectLabel.C_Visit));
 
                         ResourceManager.AddButtonEventOnetime
                         (
-                            PrefabLabel.C_Visit,
+                            ObjectLabel.C_Visit,
                             () =>
                             {
                                 EndClickVisitBtn();
@@ -970,9 +970,9 @@ public class TutorialManager : Regist
     {
         memoryMinigameTutorial = false;
 
-        ResourceManager.Get(PrefabLabel.N_Mask).TweenForGra();
+        ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
 
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, true);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
 
 
         MiniGameManager.Pause = true;
@@ -1083,13 +1083,13 @@ public class TutorialManager : Regist
 
         DressroomTutorial = false;
 
-        ResourceManager.Get(PrefabLabel.C_Main2).TweenForCG();
+        ResourceManager.Get(ObjectLabel.C_Main2).TweenForCG();
 
         Tutorial.HightDisable();
 
-        ResourceManager.Get(PrefabLabel.N_LabBK).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.N_LabBK).TweenBacCG();
 
-        TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.I_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
         (
@@ -1098,17 +1098,17 @@ public class TutorialManager : Regist
             {
                 Tutorial.MaskLock = true;
 
-                ResourceManager.SetActive(PrefabLabel.N_Button, false);
-                ResourceManager.SetActive(PrefabLabel.N_Tutorial, false);
+                ResourceManager.SetActive(ObjectLabel.N_Button, false);
+                ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
             }
         );
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.P_Return,
+            ObjectLabel.P_Return,
             () =>
             {
-                tweenRoot = ResourceManager.Get(PrefabLabel.I_BlackMask).TweenBacCG();
+                tweenRoot = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
 
                 tweenRoot.AddEventOnetime
                 (
@@ -1129,7 +1129,7 @@ public class TutorialManager : Regist
 
         UIManager.BlockOfflinePanel();
 
-        TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
         if (tweenRoot.InDestination)
         {
@@ -1142,14 +1142,14 @@ public class TutorialManager : Regist
                 }
             );
 
-            tweenRoot = ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+            tweenRoot = ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
 
             tweenRoot.AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
                 {
-                    tweenRoot = ResourceManager.Get(PrefabLabel.F_Manage).TweenBacGra();
+                    tweenRoot = ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
                 }
             );
         }
@@ -1161,28 +1161,28 @@ public class TutorialManager : Regist
 
     public static void ShowDressroomButton()
     {
-        ResourceManager.Get(PrefabLabel.C_Main).TweenReForCG();
-        ResourceManager.Get(PrefabLabel.C_Group).TweenReForCG();
-        ResourceManager.Get(PrefabLabel.C_Group0).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Main).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Group).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Group0).TweenReForCG();
 
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, true);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
 
-        ResourceManager.Get(PrefabLabel.N_Mask).TweenForGra();
+        ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
 
-        Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.C_DressRoomArrow), ResourceManager.Get(PrefabLabel.C_DressRoom));
+        Tutorial.HightScreen(ResourceManager.Get(ObjectLabel.C_DressRoomArrow), ResourceManager.Get(ObjectLabel.C_DressRoom));
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.C_DressRoom,
+            ObjectLabel.C_DressRoom,
             () =>
             {
                 EndClickDressroomButton();
             }
         );
 
-        ResourceManager.SetText(PrefabLabel.N_Lab, Language.GetStr("UI", PrefabLabel.N_Lab));
+        ResourceManager.SetText(ObjectLabel.N_Lab, Language.GetStr(LanguageLabel.UI__N_Lab));
 
-        Tutorial.ShowDescriptScreen(ResourceManager.Get(PrefabLabel.C_DressRoomLabPos).position);
+        Tutorial.ShowDescriptScreen(ResourceManager.Get(ObjectLabel.C_DressRoomLabPos).position);
     }
 
 
@@ -1194,7 +1194,7 @@ public class TutorialManager : Regist
 
         Tutorial.HightDisable();
 
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, false);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
 
         MiniGameManager.Pause = false;
     }
@@ -1209,7 +1209,7 @@ public class TutorialManager : Regist
     {
         MiniGameManager.Pause = true;
 
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, true);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
 
         Tutorial.HightScreen(arrowTra, targetTra);
     }
@@ -1223,7 +1223,7 @@ public class TutorialManager : Regist
 
         PlazaRoomTutorial = false;
 
-        ResourceManager.SetActive(PrefabLabel.N_Tutorial, false);
+        ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);
 
         PayExemptAmt = 0;
         ConnectExemptAmt = 0;
@@ -1231,10 +1231,10 @@ public class TutorialManager : Regist
 
         ResourceManager.AddButtonEventOnetime
         (
-            PrefabLabel.X_Quit,
+            ObjectLabel.X_Quit,
             () =>
             {
-                TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.V_BlackMask).TweenForCG();
+                TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG();
 
                 tweenRoot.AddEventOnetime
                 (
@@ -1255,20 +1255,20 @@ public class TutorialManager : Regist
 
         UIManager.BlockOfflinePanel();
 
-        TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
         if (tweenRoot.InDestination)
         {
-            TweenRoot tween = ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+            TweenRoot tween = ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
 
             tween.AddEventOnetime
             (
                 EventType.BackwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.F_Manage).TweenBacGra();
+                    ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
 
-                    tween = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+                    tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
                     tween.AddEventOnetime
                     (
@@ -1289,34 +1289,34 @@ public class TutorialManager : Regist
 
     public static void ShowPlazaRoomBtn()
     {
-        ResourceManager.Get(PrefabLabel.C_Main).TweenReForCG();
-        ResourceManager.Get(PrefabLabel.C_Group).TweenReForCG();
-        ResourceManager.Get(PrefabLabel.C_Group0).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Main).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Group).TweenReForCG();
+        ResourceManager.Get(ObjectLabel.C_Group0).TweenReForCG();
 
-        TweenRoot tween = ResourceManager.Get(PrefabLabel.C_Group).GetTweenCG();
+        TweenRoot tween = ResourceManager.Get(ObjectLabel.C_Group).GetTweenCG();
 
         tween.AddEventOnetime
         (
             EventType.ForwardFinish,
             () =>
             {
-                ResourceManager.SetActive(PrefabLabel.N_Tutorial, true);
+                ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
 
-                tween = ResourceManager.Get(PrefabLabel.N_Mask).TweenForGra();
+                tween = ResourceManager.Get(ObjectLabel.N_Mask).TweenForGra();
 
                 tween.AddEventOnetime
                 (
                     EventType.ForwardFinish,
                     () =>
                     {
-                        ResourceManager.SetActive(PrefabLabel.C_EnterPlazaRoom, true);
-                        ResourceManager.Get<HorizontalLayoutGroup>(PrefabLabel.C_Group4).CalculateLayoutInputHorizontal();
-                        ResourceManager.Get<HorizontalLayoutGroup>(PrefabLabel.C_Group4).SetLayoutHorizontal();
-                        Tutorial.HightScreen(ResourceManager.Get(PrefabLabel.C_PlazaRoomArrow0), ResourceManager.Get(PrefabLabel.C_EnterPlazaRoom));
+                        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.AddButtonEventOnetime
                         (
-                            PrefabLabel.C_EnterPlazaRoom,
+                            ObjectLabel.C_EnterPlazaRoom,
                             () =>
                             {
                                 EndClickPlazaRoomBtn();

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


+ 37 - 35
Assets/Script/Manage/VisitManager.cs

@@ -45,7 +45,7 @@ public class VisitManager : Regist
         {
             Cost_ = value;
 
-            ResourceManager.Get<Text>(PrefabLabel.C_CostLab).text = TransferLabel.CoinSprite + Cost;
+            ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text = TransferLabel.CoinSprite + Cost;
         }
     }
 
@@ -132,7 +132,7 @@ public class VisitManager : Regist
 
         if (CoolTime != 0)
         {
-            Text text = ResourceManager.Get<Text>(PrefabLabel.C_VisitLab);
+            Text text = ResourceManager.Get<Text>(ObjectLabel.C_VisitLab);
 
             List<float> delayList = new List<float>();
             List<float> durationList = new List<float>();
@@ -172,7 +172,7 @@ public class VisitManager : Regist
                 actionList.Add(null);
             }
 
-            TweenRoot tween = ResourceManager.Get(PrefabLabel.C_VisitLab).CreateStreamScale
+            TweenRoot tween = ResourceManager.Get(ObjectLabel.C_VisitLab).CreateStreamScale
             (
                 delayList,
                 durationList,
@@ -198,19 +198,19 @@ public class VisitManager : Regist
 
     public static void ExitVisiteeGarden()
     {
-        ResourceManager.Get(PrefabLabel.I_BlackMask).TweenForCG();
+        ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
 
 		HideTip ();
 
-        ResourceManager.SetActive(PrefabLabel.C_Visit, true);
-        ResourceManager.SetActive(PrefabLabel.C_Coin, true);
-        ResourceManager.SetActive(PrefabLabel.C_Group1, true);
-        ResourceManager.SetActive(PrefabLabel.C_Group2, true);
+        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.Get<Button>(PrefabLabel.C_NickNameBK).interactable = true;
+        ResourceManager.Get<Button>(ObjectLabel.C_NickNameBK).interactable = true;
 
-        ResourceManager.SetActive(PrefabLabel.C_Return, false);
-        ResourceManager.SetActive(PrefabLabel.C_Garden, false);
+        ResourceManager.SetActive(ObjectLabel.C_Return, false);
+        ResourceManager.SetActive(ObjectLabel.C_Garden, false);
 
         GardenManager.MiniLock = true;
 
@@ -337,7 +337,7 @@ public class VisitManager : Regist
             return;
         }
 
-        ResourceManager.Get(PrefabLabel.I_BlackMask).TweenForCG();
+        ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
         //Debug.Log(Document.OuterXml);
         SetVisiteePraise(Document);
 
@@ -345,13 +345,13 @@ public class VisitManager : Regist
 
         Node = Document.SelectSingleNode(PlayerConfigLabel.RootNode);
 
-        ResourceManager.SetActive(PrefabLabel.C_Coin, false);
-        ResourceManager.SetActive(PrefabLabel.C_Group1, false);
-        ResourceManager.SetActive(PrefabLabel.C_Group2, false);
+        ResourceManager.SetActive(ObjectLabel.C_Coin, false);
+        ResourceManager.SetActive(ObjectLabel.C_Group1, false);
+        ResourceManager.SetActive(ObjectLabel.C_Group2, false);
 
-        ResourceManager.Get<Button>(PrefabLabel.C_NickNameBK).interactable = false;
+        ResourceManager.Get<Button>(ObjectLabel.C_NickNameBK).interactable = false;
 
-        ResourceManager.SetActive(PrefabLabel.C_Garden, true);
+        ResourceManager.SetActive(ObjectLabel.C_Garden, true);
 
         if (!InVisit)
         {
@@ -363,7 +363,7 @@ public class VisitManager : Regist
         }
 
 
-        ResourceManager.SetActive(PrefabLabel.C_Return, true);
+        ResourceManager.SetActive(ObjectLabel.C_Return, true);
 
         GardenManager.MiniLock = false;
 
@@ -419,7 +419,7 @@ public class VisitManager : Regist
             {
                 Level = int.Parse(attributeList[i][3].Value);
 
-                ResourceManager.SetText(PrefabLabel.C_GardenLab, Language.GetStr("UI", PrefabLabel.C_GardenLab) + Level);
+                ResourceManager.SetText(ObjectLabel.C_GardenLab, Language.GetStr(LanguageLabel.UI__C_GardenLab) + Level);
 
                 continue;
             }
@@ -656,7 +656,7 @@ public class VisitManager : Regist
         XmlNode nicknameNode = Document.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode("NickName");
         if (nicknameNode == null || string.IsNullOrEmpty(nicknameNode.Attributes[0].Value))
         {
-            SetVisiteeNickName(Language.GetStr("UI", "未命名"));
+            SetVisiteeNickName(Language.GetStr(LanguageLabel.UI__Unnamed));
         }
         else
         {
@@ -726,12 +726,12 @@ public class VisitManager : Regist
 
     public static void SetPlayerNickName()
     {
-        ResourceManager.SetText(PrefabLabel.C_NickNameLab, NickNameManager.NickName);
+        ResourceManager.SetText(ObjectLabel.C_NickNameLab, NickNameManager.NickName);
     }
 
     public static void SetVisiteeNickName(string nickname)
     {
-        ResourceManager.SetText(PrefabLabel.C_NickNameLab, nickname);
+        ResourceManager.SetText(ObjectLabel.C_NickNameLab, nickname);
     }
 
 
@@ -763,16 +763,18 @@ public class VisitManager : Regist
     }
 
 
+    private static int TipAmt = 10;
 	public static void ShowTip()
 	{
-		ResourceManager.SetActive (PrefabLabel.C_Tip, true);
+		ResourceManager.SetActive (ObjectLabel.C_Tip, true);
 
-		ResourceManager.Get<Text> (PrefabLabel.C_TipLab).text = Language.GetStr ("Tip", "Tip" + Random.Range(1,10));
+	    string languageID = LanguageLabel.Tip + Random.Range(1, TipAmt);
+        ResourceManager.Get<Text> (ObjectLabel.C_TipLab).text = Language.GetStr (LabelUtility.CombineLanguageLabel(LanguageLabel.Tip, languageID));
 	}
 
 	public static void HideTip()
 	{
-		ResourceManager.SetActive (PrefabLabel.C_Tip, false);
+		ResourceManager.SetActive (ObjectLabel.C_Tip, false);
 	}
 
 
@@ -783,7 +785,7 @@ public class VisitManager : Regist
             return;
         }
 
-        ResourceManager.SetActive(PrefabLabel.C_EnterPlazaRoom0, false);
+        ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, false);
 
         Manager.Pay
         (
@@ -792,7 +794,7 @@ public class VisitManager : Regist
             Current.Coin,
             () =>
             {
-                ResourceManager.Get(PrefabLabel.I_BlackMask).GetTweenCG().Duration = 0.5f;
+                ResourceManager.Get(ObjectLabel.I_BlackMask).GetTweenCG().Duration = 0.5f;
 
                 LoadComplete = false;
                 TweenComplete = false;
@@ -801,28 +803,28 @@ public class VisitManager : Regist
 
                 AudioManager.PlayClip(Clip.BubbleClip);
 
-                ResourceManager.SetActive(PrefabLabel.C_Return, false);
+                ResourceManager.SetActive(ObjectLabel.C_Return, false);
 
                 TweenRoot tween;
 
                 if (CoolTime != 0)
                 {
-                    ResourceManager.Get<Button>(PrefabLabel.C_Visit).interactable = false;
+                    ResourceManager.Get<Button>(ObjectLabel.C_Visit).interactable = false;
 
-                    tween = ResourceManager.Get(PrefabLabel.C_VisitLab).StreamReForScale();
+                    tween = ResourceManager.Get(ObjectLabel.C_VisitLab).StreamReForScale();
 
                     tween.AddEventOnetime
                     (
                         EventType.ForwardFinish,
                         () =>
                         {
-                            ResourceManager.Get<Button>(PrefabLabel.C_Visit).interactable = true;
+                            ResourceManager.Get<Button>(ObjectLabel.C_Visit).interactable = true;
                         }
                     );
                 }
 
 
-                tween = ResourceManager.Get(PrefabLabel.I_BlackMask).TweenBacCG();
+                tween = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
 
                 tween.AddEventOnetime
                 (
@@ -931,14 +933,14 @@ public class VisitManager : Regist
     {
         Bubble.Show
         (
-            Language.GetStr("UI", "C_VisitFail"),
+            Language.GetStr(LanguageLabel.UI__C_VisitFail),
             null,
             null,
             null,
             () =>
             {
-                ResourceManager.Get(PrefabLabel.I_BlackMask).TweenForCG();
-                ResourceManager.SetActive(PrefabLabel.C_EnterPlazaRoom0, true);
+                ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
+                ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, true);
             },
             null,
             false

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

@@ -12,7 +12,7 @@ public class ADChest : Chest, IPointerClickHandler
 
         Bubble.Show
         (
-            Language.GetStr("Object", "Chest"),
+            Language.GetStr(LanguageLabel.Object__Chest),
             null,
             null,
             ResourceManager.LoadSprite(ResourceLabel.Chest, Folder.Scene),
@@ -28,9 +28,9 @@ public class ADChest : Chest, IPointerClickHandler
 
                         IAPManager.ChestList.Remove(this);
 
-                        ResourceManager.Get(PrefabLabel.C_Group).TweenBacCG();
+                        ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
 
-                        ResourceManager.Get(PrefabLabel.B_SignIn).TweenForCG();
+                        ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
 
                         Lottery.EnterAnimation(false);
                     }

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

@@ -79,13 +79,13 @@ public class CommentItem : Regist
         ContentLab = childDic["ContentLab"].GetComponent<BestfitText>();
         ContentLab.VerticalMaxSize = 20;
 
-        VisitLab.text = ResourceManager.Get<Text>(PrefabLabel.C_CostLab).text;
+        VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
 
         VisitBtn.onClick.AddListener(Visit);
         
         Manager.OnLevelChange += () =>
         {
-            VisitLab.text = ResourceManager.Get<Text>(PrefabLabel.C_CostLab).text;
+            VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
         };
 
         return false;

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

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

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

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

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

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Serialization;
 using UnityEngine.EventSystems;
@@ -20,7 +20,7 @@ public enum OpType
 
 public class FlowerInfo
 {
-    #region 变量
+    #region Config
 
     public int Amount
     {
@@ -60,9 +60,9 @@ public class FlowerInfo
                 {
                     if (GardenManager.MyFlowerSpec == 0)
                     {
-                        ResourceManager.Get(PrefabLabel.G_Regular).TweenForVec();
+                        ResourceManager.Get(ObjectLabel.G_Regular).TweenForVec();
 
-                        ResourceManager.SetActive(PrefabLabel.G_Special, true);
+                        ResourceManager.SetActive(ObjectLabel.G_Special, true);
                     }
 
                     GardenManager.MyFlowerSpec++;
@@ -79,24 +79,24 @@ public class FlowerInfo
     }
     private float SkillPlus = 0.1f;
 
-    public static string FullIDPrefix = "Flower";
+    public static string IDPrefix = "Flower";
     public string FullID
     {
         get
         {
-            return FullIDPrefix + ID_;
+            return IDPrefix + ID_;
         }
     }
     public string Name
     {
         get
         {
-            return Language.GetStr("FlowerName", FullID);
+            return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.FlowerName, FullID));
         }
     }
     public string Description
     {
-        get { return Language.GetStr("FlowerDesc", FullID); }
+        get { return null; }
     }
 
     public Sprite Icon
@@ -127,7 +127,7 @@ public class FlowerInfo
 
     public FlowerInfo(XmlAttributeCollection attribute)
     {
-        FlowerItem = ResourceManager.Get(ResourceLabel.FlowerItem, Folder.UI, false, ResourceManager.Get(PrefabLabel.G_RegularGrid),  false, ObjType.FlowerItem);
+        FlowerItem = ResourceManager.Get(ResourceLabel.FlowerItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.G_RegularGrid),  false, ObjType.FlowerItem);
 
         FlowerItem.AddComponent<FlowerItem>();
 
@@ -458,15 +458,15 @@ public class Flower : Regist, IPointerClickHandler
     {
         if (opType == OpType.Rip)
         {
-            ResourceManager.Get(PrefabLabel.D_Rip2).TweenForScale();
+            ResourceManager.Get(ObjectLabel.D_Rip2).TweenForScale();
         }
         else if (opType == OpType.Water)
         {
-            ResourceManager.Get(PrefabLabel.D_Water2).TweenForScale();
+            ResourceManager.Get(ObjectLabel.D_Water2).TweenForScale();
         }
         else if (opType == OpType.Fertilize)
         {
-            ResourceManager.Get(PrefabLabel.D_Fertilize2).TweenForScale();
+            ResourceManager.Get(ObjectLabel.D_Fertilize2).TweenForScale();
         }
 
         if (opType != OpType)
@@ -489,7 +489,7 @@ public class Flower : Regist, IPointerClickHandler
         }
         else
         {
-            ResourceManager.GetHudText($"+{PunchScore}", Color.white, 90, ChildDic["ScorePosTra"], ResourceManager.Get(PrefabLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{PunchScore}", Color.white, 90, ChildDic["ScorePosTra"], ResourceManager.Get(ObjectLabel.D_HudParent), true);
 
             MiniGameManager.Score += PunchScore;
 
@@ -604,12 +604,12 @@ public class Flower : Regist, IPointerClickHandler
         
         Move2D move2D = new Move2D(flyGold);
         move2D.Restrain2D = Restrain2D.Y;
-        Vector3 destination = Camera.main.ScreenToWorldPoint(ResourceManager.Get(PrefabLabel.C_Coin).position);
+        Vector3 destination = Camera.main.ScreenToWorldPoint(ResourceManager.Get(ObjectLabel.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(PrefabLabel.C_Coin).position);
+        destination = Camera.main.ScreenToWorldPoint(ResourceManager.Get(ObjectLabel.C_Coin).position);
         move2D.StartMove(destination, 0.5f, false, Curve.Linear);
 
         DelayCall.Call
@@ -622,7 +622,7 @@ public class Flower : Regist, IPointerClickHandler
             }
         );
 
-        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, ChildDic["GoldPosTra"], ResourceManager.Get(PrefabLabel.A_HudParent), true);
+        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, ChildDic["GoldPosTra"], ResourceManager.Get(ObjectLabel.A_HudParent), true);
 
         ResetAward();
     }
@@ -675,7 +675,7 @@ public class Flower : Regist, IPointerClickHandler
                 return;
             }
 
-            ResourceManager.Get(PrefabLabel.G_Flower).TweenForCG();
+            ResourceManager.Get(ObjectLabel.G_Flower).TweenForCG();
 
             GardenManager.ShowRetrieveCard(FlowerInfo, Slot);
         }

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

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
 
@@ -339,11 +339,11 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
             if (slot.Lock == false)
             {
-                Toast.Show(1.5f, Language.GetStr("Common", "UnlockSlot"));
+                Toast.Show(1.5f, Language.GetStr(LanguageLabel.Common__UnlockSlot));
             }
             else
             {
-                ResourceManager.Get(PrefabLabel.G_Flower).TweenForCG();
+                ResourceManager.Get(ObjectLabel.G_Flower).TweenForCG();
             }
         }
     }

+ 44 - 39
Assets/Script/Object/Player.cs

@@ -78,10 +78,15 @@ public class CloseItem
 
     public string Name
     {
-        get { return Language.GetStr("DressRoom", "Armature" + ID); }
+        get { return LabelUtility.CombineLanguageLabel(LanguageLabel.DressRoom, FullID); }
     }
 
-    public int ID;
+    public static string IDPrefix = "Armature";
+    public string FullID
+    {
+        get { return IDPrefix + id; }
+    }
+    public int id;
     public int Index;
     public int BuyLevel;
     public int PixelSize;
@@ -120,12 +125,12 @@ public class CloseItem
     {
         Ignore = Auxiliary.StringToBool(attribute[19].Value, false);
 
-        ID = Auxiliary.StringToInt(attribute[0].Value, -1);
+        id = Auxiliary.StringToInt(attribute[0].Value, -1);
         BodyPart = BodyPartParse(attribute[4].Value);
         ArmatureName = attribute[16].Value;
 
-        PlayerManager.CloseIDDic.Add(ArmatureName, ID);
-        PlayerManager.CloseItemDic.Add(ID, this);
+        PlayerManager.CloseIDDic.Add(ArmatureName, id);
+        PlayerManager.CloseItemDic.Add(id, this);
 
         if (Ignore)
         {
@@ -153,31 +158,31 @@ public class CloseItem
 
     protected void CreateItem()
     {
-        Transform = ResourceManager.Get(ResourceLabel.CloseItem, Folder.UI, false, ResourceManager.Get(PrefabLabel.Canvas), false);
+        Transform = ResourceManager.Get(ResourceLabel.CloseItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.Canvas), false);
 
         if (Type == CloseType.Top)
         {
-            Transform.SetParent(ResourceManager.Get(PrefabLabel.Pb_TopGrid));
+            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pb_TopGrid));
         }
         else if (Type == CloseType.Hair)
         {
-            Transform.SetParent(ResourceManager.Get(PrefabLabel.Pa_HairGrid));
+            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pa_HairGrid));
         }
         else if (Type == CloseType.Dress)
         {
-            Transform.SetParent(ResourceManager.Get(PrefabLabel.Pc_DressGrid));
+            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pc_DressGrid));
         }
         else if (Type == CloseType.Wing)
         {
-            Transform.SetParent(ResourceManager.Get(PrefabLabel.Pe_WingGrid));
+            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pe_WingGrid));
         }
         else if (Type == CloseType.Decarator)
         {
-            Transform.SetParent(ResourceManager.Get(PrefabLabel.Pd_DecaratorGrid));
+            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pd_DecaratorGrid));
         }
         else if (Type == CloseType.Shoe)
         {
-            Transform.SetParent(ResourceManager.Get(PrefabLabel.Pf_ShoeGrid));
+            Transform.SetParent(ResourceManager.Get(ObjectLabel.Pf_ShoeGrid));
         }
         else
         {
@@ -219,15 +224,15 @@ public class CloseItem
             {
                 AudioManager.PlayClip(Clip.BtnClip);
 
-                ResourceManager.Get(PrefabLabel.Pa_Info).TweenForCG();
-                SetUpUI(newSize, new Vector2(0, 22), ResourceManager.Get<Image>(PrefabLabel.Pa_Icon1), ResourceManager.Get<Image>(PrefabLabel.Pa_Icon3), ResourceManager.Get<Image>(PrefabLabel.Pa_Icon2));
+                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.SetText(PrefabLabel.Pa_Lab, Name);
-                ResourceManager.SetText(PrefabLabel.Pa_BtnLab, Language.GetStr("UI", PrefabLabel.Pa_BtnLab) + Auxiliary.ImageParse(BuyCurrent) + BuyAmt);
+                ResourceManager.SetText(ObjectLabel.Pa_Lab, Name);
+                ResourceManager.SetText(ObjectLabel.Pa_BtnLab, Language.GetStr(LanguageLabel.UI__Pa_BtnLab) + Auxiliary.ImageParse(BuyCurrent) + BuyAmt);
 
                 ResourceManager.SetButtonEvent
                 (
-                    PrefabLabel.Pa_Btn,
+                    ObjectLabel.Pa_Btn,
                     OnBuy
                 );
             }
@@ -241,7 +246,7 @@ public class CloseItem
 
                 if (BuyLevel > Manager.Level)
                 {
-                    Bubble.Show(null, Language.GetStr("UI", "P_Unlock"));
+                    Bubble.Show(null, Language.GetStr(LanguageLabel.UI__P_Unlock));
                     return;
                 }
 
@@ -427,7 +432,7 @@ public class CloseItem
         BuyBtn.interactable = false;
         BuyBtn.image.material = Lib.GrayMat;
 
-        BuyBtnLab.text = Language.GetStr("UI", "P_BtnLab2");
+        BuyBtnLab.text = Language.GetStr(LanguageLabel.UI__P_BtnLab2);
 
         Manager.CloseAmt++;
     }
@@ -443,7 +448,7 @@ public class CloseItem
             {
                 OnBuySucceed();
 
-                ResourceManager.Get(PrefabLabel.Pa_Info).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.Pa_Info).TweenBacCG();
 
                 ChangeDress(PlayerManager.Player);
                 SaveDressData();
@@ -456,7 +461,7 @@ public class CloseItem
             {
                 PlayerManager.Player.Reset();
 
-                TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.Pa_Info).TweenBacCG();
+                TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.Pa_Info).TweenBacCG();
 
                 tweenRoot.AddEventOnetime
                 (
@@ -467,12 +472,12 @@ public class CloseItem
                     }
                 );
 
-                ResourceManager.Get(PrefabLabel.B_SignIn0).GetTweenCG().AddEventOnetime
+                ResourceManager.Get(ObjectLabel.B_SignIn0).GetTweenCG().AddEventOnetime
                 (
                     EventType.ForwardFinish,
                     () =>
                     {
-                        ResourceManager.Get(PrefabLabel.F_Manage0).TweenForVec();
+                        ResourceManager.Get(ObjectLabel.F_Manage0).TweenForVec();
                     }
                 );
             }
@@ -483,7 +488,7 @@ public class CloseItem
     {
         Unlock();
         AudioManager.PlayClip(Clip.CurrentClip);
-        PlayerManager.BoughtCloseList.UniqueAdd(ID);
+        PlayerManager.BoughtCloseList.UniqueAdd(id);
         HttpManager.Save();
     }
 
@@ -1042,11 +1047,11 @@ public class Player : Regist , IPointerClickHandler
         {
             Bubble.Show
             (
-                null, Language.GetStr("UI", PrefabLabel.P_Return), null, null,
+                null, Language.GetStr(LanguageLabel.UI__P_Return), null, null,
                 () =>
                 {
                     Reset();
-                    ResourceManager.Get(PrefabLabel.K_Bubble).GetTweenGra().AddEventOnetime(EventType.BackwardFinish, () => { ExitDressRoom(); });
+                    ResourceManager.Get(ObjectLabel.K_Bubble).GetTweenGra().AddEventOnetime(EventType.BackwardFinish, () => { ExitDressRoom(); });
                 }
             );
         }
@@ -1066,7 +1071,7 @@ public class Player : Regist , IPointerClickHandler
 
                 closeUnitList.RemoveAt(i--);
 
-                ResourceManager.Get(PrefabLabel.Pa_Info).GetTweenCG().AddEventOnetime
+                ResourceManager.Get(ObjectLabel.Pa_Info).GetTweenCG().AddEventOnetime
                     (
                         EventType.BackwardFinish,
                         () =>
@@ -1091,7 +1096,7 @@ public class Player : Regist , IPointerClickHandler
     {
         Manager.SceneSwitchLock = false;
 
-        TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.I_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
             (
@@ -1106,13 +1111,13 @@ public class Player : Regist , IPointerClickHandler
                     ResourceManager.Get(ResourceLabel.Garden).TweenForSr();
                     ResourceManager.Get("DressRoom").TweenBacSr();
 
-                    ResourceManager.Get(PrefabLabel.C_Main).TweenForCG();
-                    ResourceManager.Get(PrefabLabel.P_DressRoom).TweenBacCG();
+                    ResourceManager.Get(ObjectLabel.C_Main).TweenForCG();
+                    ResourceManager.Get(ObjectLabel.P_DressRoom).TweenBacCG();
                 }
             );
 
 
-        tweenRoot = ResourceManager.Get(PrefabLabel.P_DressRoom).GetTweenCG();
+        tweenRoot = ResourceManager.Get(ObjectLabel.P_DressRoom).GetTweenCG();
 
         tweenRoot.AddEventOnetime
             (
@@ -1129,8 +1134,8 @@ public class Player : Regist , IPointerClickHandler
 
                     DeactiveShadow();
 
-                    ResourceManager.Get(PrefabLabel.B_SignIn0).TweenForCG();
-                    ResourceManager.Get(PrefabLabel.I_BlackMask).TweenForCG();
+                    ResourceManager.Get(ObjectLabel.B_SignIn0).TweenForCG();
+                    ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
                 }
             );
     }
@@ -1142,7 +1147,7 @@ public class Player : Regist , IPointerClickHandler
             return;
         }
 
-        ResourceManager.Get(PrefabLabel.B_SignIn0).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.B_SignIn0).TweenBacCG();
 
         InDressRoom = true;
 
@@ -1151,12 +1156,12 @@ public class Player : Regist , IPointerClickHandler
         Manager.SceneSwitchLock = true;
 
 
-        ResourceManager.Get(PrefabLabel.C_Main).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.C_Main).TweenBacCG();
 
 
         SetAllCollider(false);
 
-        TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.I_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
             (
@@ -1176,19 +1181,19 @@ public class Player : Regist , IPointerClickHandler
                     ResourceManager.Get(ResourceLabel.Garden).TweenBacSr();
                     ResourceManager.Get("DressRoom").TweenForSr();
 
-                    ResourceManager.Get(PrefabLabel.P_DressRoom).TweenForCG();
+                    ResourceManager.Get(ObjectLabel.P_DressRoom).TweenForCG();
                 }
             );
 
 
-        tweenRoot = ResourceManager.Get(PrefabLabel.P_DressRoom).GetTweenCG();
+        tweenRoot = ResourceManager.Get(ObjectLabel.P_DressRoom).GetTweenCG();
 
         tweenRoot.AddEventOnetime
             (
                 EventType.ForwardFinish,
                 () =>
                 {
-                    ResourceManager.Get(PrefabLabel.I_BlackMask).TweenForCG();
+                    ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
                 }
             );
     }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -253,7 +253,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         }
         ChestManager.OperateDataDictionary[CurrentChest.ChestData.ID].RemainGuessAmt = remainGuessAmt;
 
-        string hint = Language.GetStr("UI", "Y_GuessWrong");
+        string hint = Language.GetStr(LanguageLabel.UI__Y_GuessWrong);
         hint = hint.Replace(TransferLabel.Value, remainGuessAmt.ToString());
         Bubble.Show(null, hint);
 
@@ -267,7 +267,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     private void GuessSucceed()
     {
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.Y_Chest).interactable = false;
+        ResourceManager.Get<CanvasGroup>(ObjectLabel.Y_Chest).interactable = false;
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetChestAward(ChestData.ID);
     }
 
@@ -289,7 +289,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         if (chestData.ChestType == ChestType.GuessColor)
         {
             AnswerInfo = GardenManager.FlowerInfoDic.Random();
-            AnswerColor = Language.GetStr("FlowerColor", AnswerInfo.FullID).ToLower();
+            AnswerColor = Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.FlowerColor, AnswerInfo.FullID)).ToLower();
         }
     }
 
@@ -300,7 +300,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         Deactive();
         TurnGray();
 
-        ChestTimerTransform = ResourceManager.Get("ChestTimer", Folder.UI, false, ResourceManager.Get(PrefabLabel.W_HudParent), false, ObjType.ChestTimer);
+        ChestTimerTransform = ResourceManager.Get("ChestTimer", Folder.UI, false, ResourceManager.Get(ObjectLabel.W_HudParent), false, ObjType.ChestTimer);
         ChestTimerLab = ChestTimerTransform.GetComponentInChildren<Text>();
         HudTarget hudTarget = ChestTimerTransform.GetComponent<HudTarget>();
         if (hudTarget == null)
@@ -322,7 +322,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
         if (InputField == null)
         {
-            InputField = ResourceManager.Get<InputField>(PrefabLabel.Y_InputField);
+            InputField = ResourceManager.Get<InputField>(ObjectLabel.Y_InputField);
         }
 
         if (!Initialized)
@@ -445,41 +445,41 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
             }
             else
             {
-                Bubble.Show(null, Language.GetStr("UI", "Y_Unactive"));
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Y_Unactive));
             }
         }
         else
         {
             if (!IsActive)
             {
-                Bubble.Show(null, Language.GetStr("UI", "Y_OutOfChance"));
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Y_OutOfChance));
                 return;
             }
 
-            ResourceManager.Get(PrefabLabel.Y_Chest).TweenForCG();
-            ResourceManager.SetActive(PrefabLabel.Ya_GetAward, false);
-            ResourceManager.SetActive(PrefabLabel.Y_Guess, true);
-            ResourceManager.SetActive(PrefabLabel.Yb_CreateChest, false);
+            ResourceManager.Get(ObjectLabel.Y_Chest).TweenForCG();
+            ResourceManager.SetActive(ObjectLabel.Ya_GetAward, false);
+            ResourceManager.SetActive(ObjectLabel.Y_Guess, true);
+            ResourceManager.SetActive(ObjectLabel.Yb_CreateChest, false);
 
             if (ChestData.ChestType == ChestType.GuessColor)
             {
-                ResourceManager.SetActive(PrefabLabel.Y_RewardLab, false);
-                ResourceManager.SetActive(PrefabLabel.Y_RewardIcon, true);
-                ResourceManager.Get<Image>(PrefabLabel.Y_RewardIcon).sprite = AnswerInfo.Icon;
-                ResourceManager.Get<Image>(PrefabLabel.Y_RewardIcon).Resize(true, 0.3125f, 0.3125f);
-                ResourceManager.Get<Image>(PrefabLabel.Y_RewardIcon).color = Color.white;
-                LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Y_Tit), new MulLanStr("UI", "Yb_GuessColor"));
-                LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Y_Desc), new MulLanStr("UI", "Y_GuessColorDesc"));
+                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));
 
                 InputField.text = "";
                 InputField.characterLimit = 30;
             }
             else
             {
-                ResourceManager.SetActive(PrefabLabel.Y_RewardLab, true);
-                ResourceManager.SetActive(PrefabLabel.Y_RewardIcon, false);
-                LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Y_Tit), new MulLanStr("UI", "Yb_GuessNumber"));
-                LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Y_Desc), new MulLanStr("UI", "Y_GuessNumberDesc"));
+                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));
 
                 InputField.text = "";
                 InputField.characterLimit = 1;

+ 9 - 9
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(PrefabLabel.Z_Grid), false, ObjType.PlazaRoomItem, typeof(PlazaRoomItem)).GetComponent<PlazaRoomItem>();
+        PlazaRoomItem plazaRoomItem = ResourceManager.Get(ResourceLabel.PlazaRoomItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.Z_Grid), false, ObjType.PlazaRoomItem, typeof(PlazaRoomItem)).GetComponent<PlazaRoomItem>();
         plazaRoomItem.Regist();
         return plazaRoomItem;
     }
@@ -158,7 +158,7 @@ public class PlazaRoomItem : MonoBehaviour
 
         if (RoomData.IsSystemRoom)
         {
-            LanguageManager.Add(Name, new MulLanStr("UI", "Z_SystemRoomName"));
+            LanguageManager.Add(Name, new MulLanStr(LanguageLabel.UI__Z_SystemRoomName));
         }
         else
         {
@@ -167,7 +167,7 @@ public class PlazaRoomItem : MonoBehaviour
 
         if (RoomData.IsSystemRoom)
         {
-            LanguageManager.Add(Duration, new MulLanStr("UI", "Z_Permanent"));
+            LanguageManager.Add(Duration, new MulLanStr(LanguageLabel.UI__Z_Permanent));
         }
         else
         {
@@ -192,27 +192,27 @@ public class PlazaRoomItem : MonoBehaviour
     {
         if (available)
         {
-            LanguageManager.Add(People, new MulLanStr("UI", "Z_Available"));
+            LanguageManager.Add(People, new MulLanStr(LanguageLabel.UI__Z_Available));
             People.color = Lib.RoomRunning;
             Button.image.material = null;
-            LanguageManager.Add(ButtonLab, new MulLanStr("UI", "Z_Join"));
+            LanguageManager.Add(ButtonLab, new MulLanStr(LanguageLabel.UI__Z_Join));
         }
         else
         {
-            LanguageManager.Add(People, new MulLanStr("UI", "Z_Full"));
+            LanguageManager.Add(People, new MulLanStr(LanguageLabel.UI__Z_Full));
             People.color = Lib.RoomClosing;
             Button.image.material = Lib.GrayMat;
-            LanguageManager.Add(ButtonLab, new MulLanStr("UI", "Z_Full"));
+            LanguageManager.Add(ButtonLab, new MulLanStr(LanguageLabel.UI__Z_Full));
         }
 
         if (RoomData.RemainTime.TotalMinutes > 10)
         {
-            LanguageManager.Add(Status, new MulLanStr("UI", "Z_Running"));
+            LanguageManager.Add(Status, new MulLanStr(LanguageLabel.UI__Z_Running));
             Status.color = Lib.RoomRunning;
         }
         else
         {
-            LanguageManager.Add(Status, new MulLanStr("UI", "Z_Closing"));
+            LanguageManager.Add(Status, new MulLanStr(LanguageLabel.UI__Z_Closing));
             Status.color = Lib.RoomClosing;
         }
     }

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

@@ -38,13 +38,13 @@ public class Ranktem : Regist
         VisitBtn = childDic["VisitBtn"].GetComponent<Button>();
         ContentLab = childDic["ContentLab"].GetComponent<Text>();
 
-        VisitLab.text = ResourceManager.Get<Text>(PrefabLabel.C_CostLab).text;
+        VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
 
         VisitBtn.onClick.AddListener(Visit);
 
         Manager.OnLevelChange += () =>
         {
-            VisitLab.text = ResourceManager.Get<Text>(PrefabLabel.C_CostLab).text;
+            VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
         };
 
         return false;

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

@@ -81,26 +81,26 @@ public class Ability : SkillRoot
                 {
                     ItemBtn.interactable = false;
 
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab1"), "\n", new MulLanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab1), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv.ToString());
                 }
                 else
                 {
                     ItemBtn.interactable = true;
 
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab0"), "\n", new MulLanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab0), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv.ToString());
                 }
             }
             else if (ItemStatus_ == SkillStatus.UnLock)
             {
                 ItemBtn.interactable = true;
 
-                ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab1") + "\n" + Auxiliary.ImageParse(UnlockCur) + Auxiliary.ShrinkNumberStr(UnlockAmt);
+                ItemBtnLab.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab1) + "\n" + Auxiliary.ImageParse(UnlockCur) + Auxiliary.ShrinkNumberStr(UnlockAmt);
             }
             else if (ItemStatus_ == SkillStatus.Upgrade)
             {
                 ItemBtn.interactable = true;
 
-                ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab2") + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                ItemBtnLab.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
             }
         }
     }
@@ -148,17 +148,17 @@ public class Ability : SkillRoot
 
     public void UnlockTab()
     {
-        ResourceManager.Get<Graphic>(PrefabLabel.F_Elf).material = null;
-        ResourceManager.Get<Graphic>(PrefabLabel.F_Store).material = null;
-        ResourceManager.Get<Graphic>(PrefabLabel.F_Magic).material = null;
+        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>(PrefabLabel.F_ElfLab).material = null;
-        ResourceManager.Get<Graphic>(PrefabLabel.F_StoreLab).material = null;
-        ResourceManager.Get<Graphic>(PrefabLabel.F_MagicLab).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<Button>(PrefabLabel.F_Elf).interactable = true;
-        ResourceManager.Get<Button>(PrefabLabel.F_Store).interactable = true;
-        ResourceManager.Get<Button>(PrefabLabel.F_Magic).interactable = true;
+        ResourceManager.Get<Button>(ObjectLabel.F_Elf).interactable = true;
+        ResourceManager.Get<Button>(ObjectLabel.F_Store).interactable = true;
+        ResourceManager.Get<Button>(ObjectLabel.F_Magic).interactable = true;
     }
 
 
@@ -346,11 +346,11 @@ public class Ability : SkillRoot
             flower.GetElf(GardenManager.ElfList.Back(0), 0, 0, 0, 0);
 
 
-            ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+            ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
 
-            ResourceManager.Get(PrefabLabel.F_Manage).TweenBacGra();
+            ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
 
-            TweenRoot tween = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+            TweenRoot tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
             tween.AddEventOnetime
             (
@@ -378,11 +378,11 @@ public class Ability : SkillRoot
             );
 
 
-            ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+            ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
 
-            ResourceManager.Get(PrefabLabel.F_Manage).TweenBacGra();
+            ResourceManager.Get(ObjectLabel.F_Manage).TweenBacGra();
 
-            tween = ResourceManager.Get(PrefabLabel.F_Manage0).GetTweenVec();
+            tween = ResourceManager.Get(ObjectLabel.F_Manage0).GetTweenVec();
 
             tween.AddEventOnetime
             (
@@ -444,72 +444,72 @@ public class Ability : SkillRoot
     {
         AudioManager.PlayClip(Clip.BtnClip);
 
-        ResourceManager.Get(PrefabLabel.Fe_Info).TweenForCG();
+        ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
 
-        ResourceManager.SetText(PrefabLabel.Fe_Tit, Name);
+        ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
 
-        ResourceManager.SetSprite(PrefabLabel.Fe_Icon, Icon);
+        ResourceManager.SetSprite(ObjectLabel.Fe_Icon, Icon);
 
 
         if (ItemStatus == SkillStatus.Lock)
         {
-            ResourceManager.SetText(PrefabLabel.Fe_Lab0, "");
-            ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
+            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("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.SetButtonEvent
             (
-                PrefabLabel.Fe_Btn,
+                ObjectLabel.Fe_Btn,
                 () =>
                 {
                     UnlockAhead();
 
-                    ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
         else if (ItemStatus == SkillStatus.UnLock)
         {
-            ResourceManager.SetText(PrefabLabel.Fe_Lab0, "");
-            ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
+            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab1"), Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("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.SetButtonEvent
             (
-                PrefabLabel.Fe_Btn,
+                ObjectLabel.Fe_Btn,
                 () =>
                 {
                     Unlock();
 
-                    ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
         else if (ItemStatus == SkillStatus.Upgrade)
         {
-            ResourceManager.SetText(PrefabLabel.Fe_Lab0, GetDescription(0));
-            ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(1));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(1));
 
-            ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
 
             ResourceManager.SetButtonEvent
             (
-                PrefabLabel.Fe_Btn,
+                ObjectLabel.Fe_Btn,
                 () =>
                 {
                     Upgrade();
 
                     ItemLab.text = GetDescription(0);
 
-                    ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab2") + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                    ItemBtnLab.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
 
-                    ResourceManager.SetText(PrefabLabel.Fe_Tit, Name);
-                    ResourceManager.SetText(PrefabLabel.Fe_Lab0, GetDescription(0));
-                    ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(1));
+                    ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
+                    ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));
+                    ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(1));
 
-                    ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+                    ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
                 }
             );
         }

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

@@ -58,15 +58,15 @@ public class BigSkill : Skill
 
             if (ItemStatus_ == SkillStatus.Lock)
             {
-                LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab0"), "\n", new MulLanStr("UI", "Fe_BtnLab4"), UnlockLv);
+                LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab0), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv);
             }
             else if (ItemStatus_ == SkillStatus.UnLock)
             {
-                LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab1"), "\n", Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0"));
+                LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab1), "\n", Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0"));
             }
             else if (ItemStatus_ == SkillStatus.Upgrade)
             {
-                LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab2"), "\n", Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt));
+                LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab2), "\n", Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt));
             }
         }
     }
@@ -456,7 +456,7 @@ public class BigSkill : Skill
 
         if (!HttpManager.Connect)
         {
-            ResourceManager.Get(PrefabLabel.Fg_Reconnect).TweenForCG();
+            ResourceManager.Get(ObjectLabel.Fg_Reconnect).TweenForCG();
 
             return;
         }
@@ -479,7 +479,7 @@ public class BigSkill : Skill
                 GetBuff();
                 GetAward();
 
-                InfoBoxManager.GardenInfoBox.Show(string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", FullID)), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Show(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));
             },
             StaticsManager.ItemID.使用技能,
             StaticsManager.ConsumeModule.Shop
@@ -527,71 +527,71 @@ public class BigSkill : Skill
     {
         AudioManager.PlayClip(Clip.BtnClip);
 
-        ResourceManager.Get(PrefabLabel.Fe_Info).TweenForCG();
+        ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
 
-        ResourceManager.SetText(PrefabLabel.Fe_Tit, Name);
+        ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
 
-        ResourceManager.SetSprite(PrefabLabel.Fe_Icon, Icon);
+        ResourceManager.SetSprite(ObjectLabel.Fe_Icon, Icon);
 
         if (ItemStatus == SkillStatus.Lock)
         {
-            ResourceManager.SetText(PrefabLabel.Fe_Lab0, "");
-            ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
+            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("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.SetButtonEvent
             (
-                PrefabLabel.Fe_Btn,
+                ObjectLabel.Fe_Btn,
                 () =>
                 {
                     UnlockAhead();
 
-                    ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
         else if (ItemStatus == SkillStatus.UnLock)
         {
-            ResourceManager.SetText(PrefabLabel.Fe_Lab0, "");
-            ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
+            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab1"), Auxiliary.ImageParse(UnlockCur), UnlockAmt));
+            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab1), Auxiliary.ImageParse(UnlockCur), UnlockAmt));
 
             ResourceManager.SetButtonEvent
             (
-                PrefabLabel.Fe_Btn,
+                ObjectLabel.Fe_Btn,
                 () =>
                 {
                     Unlock();
 
-                    ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
         else if (ItemStatus == SkillStatus.Upgrade)
         {
-            ResourceManager.SetText(PrefabLabel.Fe_Lab0, GetDescription(0));
-            ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(1));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(1));
 
-            ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
             
             ResourceManager.SetButtonEvent
             (
-                PrefabLabel.Fe_Btn,
+                ObjectLabel.Fe_Btn,
                 () =>
                 {
                     Upgrade();
 
                     ItemLab.text = GetDescription(0);
 
-                    ItemBtnLab.text = Language.GetStr("UI", "Fe_BtnLab2") + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                    ItemBtnLab.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
 
-                    ResourceManager.SetText(PrefabLabel.Fe_Tit, Name);
-                    ResourceManager.SetText(PrefabLabel.Fe_Lab0, GetDescription(0));
-                    ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(1));
+                    ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
+                    ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));
+                    ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(1));
 
-                    ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab2"), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
+                    ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab2), Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt)));
                 }
             );
         }

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

@@ -23,7 +23,7 @@ public class Pack : SkillRoot
     {
         get
         {
-            return Language.GetStr("SkillName", FullID);
+            return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID));
         }
     }
 
@@ -72,11 +72,11 @@ public class Pack : SkillRoot
 
                 if (!string.IsNullOrEmpty(Label))
                 {
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", Label), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.UI, Label)), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
                 else
                 {
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab3), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
             }
             else if (ItemStatus_ == SkillStatus.Lock)
@@ -187,7 +187,7 @@ public class Pack : SkillRoot
 
         ItemLab.text = GetDescription(0);
 
-        LanguageManager.Add(ItemTit, new MulLanStr("SkillName", FullID));
+        LanguageManager.Add(ItemTit, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
 
 
         IAPManager.ProductActionDic.UniqueAdd(FullID, ()=>OnBuySucceed());
@@ -269,7 +269,7 @@ public class Pack : SkillRoot
             {
                 ItemBtn.interactable = false;
 
-                LanguageManager.Add(ItemBtnLab, Language.GetStr("UI", "Fe_BtnLab9"));
+                LanguageManager.Add(ItemBtnLab, Language.GetStr(LanguageLabel.UI__Fe_BtnLab9));
             }
         }
     }
@@ -278,27 +278,27 @@ public class Pack : SkillRoot
     {
         AudioManager.PlayClip(Clip.BtnClip);
 
-        ResourceManager.Get(PrefabLabel.Fe_Info).TweenForCG();
+        ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
 
-        ResourceManager.SetText(PrefabLabel.Fe_Tit, Name);
+        ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
 
-        ResourceManager.SetSprite(PrefabLabel.Fe_Icon, ItemIcon.sprite);
+        ResourceManager.SetSprite(ObjectLabel.Fe_Icon, ItemIcon.sprite);
 
         if (ItemStatus == SkillStatus.Buy)
         {
-            ResourceManager.SetText(PrefabLabel.Fe_Lab0, "");
-            ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
+            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab3"), Auxiliary.ImageParse(BuyCur), UseAmt));
+            ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab3), Auxiliary.ImageParse(BuyCur), UseAmt));
 
             ResourceManager.SetButtonEvent
             (
-                PrefabLabel.Fe_Btn,
+                ObjectLabel.Fe_Btn,
                 () =>
                 {
                     OnBuy();
 
-                    ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
                 }
             );
         }
@@ -327,7 +327,7 @@ public class Pack : SkillRoot
                 FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[int.Parse(Flowers[i])];
 
                 flowerInfo.Add();
-                tempFlower += string.Format("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), TransferLabel.FlowerSprite, flowerInfo.Name);
+                tempFlower += string.Format("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.FlowerSprite, flowerInfo.Name);
             }
         }
 
@@ -345,12 +345,12 @@ public class Pack : SkillRoot
 
         if (!tempCoin.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), TransferLabel.CoinSprite, Auxiliary.ShrinkNumberStr(tempCoin));
+            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.CoinSprite, Auxiliary.ShrinkNumberStr(tempCoin));
         }
 
         if (!tempDiamond.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), TransferLabel.DiamondSprite, Auxiliary.ShrinkNumberStr(tempDiamond));
+            sb.AppendFormat("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.DiamondSprite, Auxiliary.ShrinkNumberStr(tempDiamond));
         }
 
         if (!string.IsNullOrEmpty(tempFlower))
@@ -443,7 +443,8 @@ public class Pack : SkillRoot
                 {
                     for (int j = 0; j < Flowers.Length; j++)
                     {
-                        stringBuilder.Append(Language.GetStr("FlowerName", "Flower" + Flowers[j]));
+                        FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[int.Parse(Flowers[j])];
+                        stringBuilder.Append(Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.FlowerName, flowerInfo.FullID)));
 
                         if (j != Flowers.Length - 1)
                         {

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

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 
 using System;
@@ -91,11 +91,11 @@ public class Skill : SkillRoot
 
                 if (BuyCur == Current.AD)
                 {
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr("Common", "AD"));
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.Common__AD));
                 }
                 else
                 {
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab3), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
             }
             else if (ItemStatus_ == SkillStatus.Use)
@@ -106,7 +106,7 @@ public class Skill : SkillRoot
             {
                 ItemBtn.interactable = true;
 
-                LanguageManager.Add(ItemBtnLab, new MulLanStr("UI", "Fe_BtnLab0"), "\n", new MulLanStr("UI", "Fe_BtnLab4"), UnlockLv.ToString());
+                LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab0), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv.ToString());
             }
             else if (ItemStatus_ == SkillStatus.Cool)
             {
@@ -197,11 +197,11 @@ public class Skill : SkillRoot
 
         if (timeSpan.Hours >= 1)
         {
-            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab6"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab6), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
         }
         else
         {
-            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab6"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab6), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
         }
 
 
@@ -226,11 +226,11 @@ public class Skill : SkillRoot
 
         if (timeSpan.Hours >= 1)
         {
-            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab8"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab8), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
         }
         else
         {
-            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr("UI", "Fe_BtnLab8"), Language.GetStr("UI", "Fe_BtnLab7"), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab8), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
         }
 
 
@@ -287,12 +287,12 @@ public class Skill : SkillRoot
 
         if (!temp.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), TransferLabel.CoinSprite, temp.ToString("0"));
+            sb.AppendFormat("{0}{1}{2}", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.CoinSprite, temp.ToString("0"));
         }
 
         if (!DiamondOnce.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), TransferLabel.DiamondSprite, DiamondOnce.ToString("0"));
+            sb.AppendFormat("{0}{1}{2}", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.DiamondSprite, DiamondOnce.ToString("0"));
         }
 
         string str = sb.ToString();
@@ -369,7 +369,7 @@ public class Skill : SkillRoot
                 GetBuff();
                 GetAward();
 
-                InfoBoxManager.GardenInfoBox.Show(string.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", FullID)), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Show(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));
             },
             StaticsManager.ItemID.使用技能, 
             StaticsManager.ConsumeModule.Shop
@@ -388,51 +388,51 @@ public class Skill : SkillRoot
             }
             else
             {
-                ResourceManager.Get(PrefabLabel.Fe_Info).TweenForCG();
+                ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
 
-                ResourceManager.SetText(PrefabLabel.Fe_Tit, Name);
+                ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
 
-                ResourceManager.SetSprite(PrefabLabel.Fe_Icon, Icon);
+                ResourceManager.SetSprite(ObjectLabel.Fe_Icon, Icon);
 
-                ResourceManager.SetText(PrefabLabel.Fe_Lab0, "");
-                ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(0));
+                ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
+                ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
 
-                ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab3"), Auxiliary.ImageParse(BuyCur), UseAmt));
+                ResourceManager.SetText(ObjectLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr(LanguageLabel.UI__Fe_BtnLab3), Auxiliary.ImageParse(BuyCur), UseAmt));
 
                 ResourceManager.SetButtonEvent
                 (
-                    PrefabLabel.Fe_Btn,
+                    ObjectLabel.Fe_Btn,
                     () =>
                     {
                         Buy();
 
-                        ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                        ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
                     }
                 );
             }
         }
         else if (ItemStatus == SkillStatus.Lock)
         {
-            ResourceManager.Get(PrefabLabel.Fe_Info).TweenForCG();
+            ResourceManager.Get(ObjectLabel.Fe_Info).TweenForCG();
 
-            ResourceManager.SetText(PrefabLabel.Fe_Tit, Name);
+            ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
 
-            ResourceManager.SetSprite(PrefabLabel.Fe_Icon, Icon);
+            ResourceManager.SetSprite(ObjectLabel.Fe_Icon, Icon);
 
 
-            ResourceManager.SetText(PrefabLabel.Fe_Lab0, "");
-            ResourceManager.SetText(PrefabLabel.Fe_Lab1, GetDescription(0));
+            ResourceManager.SetText(ObjectLabel.Fe_Lab0, "");
+            ResourceManager.SetText(ObjectLabel.Fe_Lab1, GetDescription(0));
 
-            ResourceManager.SetText(PrefabLabel.Fe_BtnLab, string.Format("{0}({1}{2:0})", Language.GetStr("UI", "Fe_BtnLab0"), Auxiliary.ImageParse(UnlockAheadCur), UnlockAheadAmt.ToString("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.SetButtonEvent
             (
-                PrefabLabel.Fe_Btn,
+                ObjectLabel.Fe_Btn,
                 () =>
                 {
                     UnlockAhead();
 
-                    ResourceManager.Get(PrefabLabel.Fe_Info).TweenBacCG();
+                    ResourceManager.Get(ObjectLabel.Fe_Info).TweenBacCG();
                 }
             );
         }

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

@@ -60,7 +60,7 @@ public abstract class SkillRoot
     {
         get
         {
-            return Language.GetStr("SkillDesc", FullID);
+            return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillDesc, FullID));
         }
     }
     public string FullID
@@ -77,11 +77,11 @@ public abstract class SkillRoot
         {
             if (Level == 0)
             {
-                return Language.GetStr("SkillName", FullID);
+                return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID));
             }
             else
             {
-                return Language.GetStr("SkillName", FullID) + Level;
+                return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)) + Level;
             }
         }
     }
@@ -107,11 +107,11 @@ public abstract class SkillRoot
 
             if (Level == 0)
             {
-                LanguageManager.Add(ItemTit, new MulLanStr("SkillName", FullID));
+                LanguageManager.Add(ItemTit, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
             }
             else
             {
-                LanguageManager.Add(ItemTit, new MulLanStr("SkillName", FullID), Level);
+                LanguageManager.Add(ItemTit, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)), Level);
             }
         }
     }

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -167,14 +167,14 @@ public class ChestManager : Regist
 
     public override void RegistReference()
     {
-        Btn = ResourceManager.Get<Button>(PrefabLabel.Yb_Btn);
-        GuessBtn = ResourceManager.Get<Button>(PrefabLabel.Y_Btn);
-        Desc = ResourceManager.Get<Text>(PrefabLabel.Yb_Desc);
-        Slider = ResourceManager.Get<Slider>(PrefabLabel.Yb_Slider);
-        BtnLab = ResourceManager.Get<Text>(PrefabLabel.Yb_BtnLab);
-        InputField = ResourceManager.Get<InputField>(PrefabLabel.Yb_InputField);
-        GuessInputField = ResourceManager.Get<InputField>(PrefabLabel.Y_InputField);
-        SliderValueLab = ResourceManager.Get<Text>(PrefabLabel.Yb_SliderValueLab);
+        Btn = ResourceManager.Get<Button>(ObjectLabel.Yb_Btn);
+        GuessBtn = ResourceManager.Get<Button>(ObjectLabel.Y_Btn);
+        Desc = ResourceManager.Get<Text>(ObjectLabel.Yb_Desc);
+        Slider = ResourceManager.Get<Slider>(ObjectLabel.Yb_Slider);
+        BtnLab = ResourceManager.Get<Text>(ObjectLabel.Yb_BtnLab);
+        InputField = ResourceManager.Get<InputField>(ObjectLabel.Yb_InputField);
+        GuessInputField = ResourceManager.Get<InputField>(ObjectLabel.Y_InputField);
+        SliderValueLab = ResourceManager.Get<Text>(ObjectLabel.Yb_SliderValueLab);
 
         GuessInputField.onValueChanged.AddListener(OnGuessInputValueChange);
         OnGuessInputValueChange(null);
@@ -198,10 +198,10 @@ public class ChestManager : Regist
 
     public static void OpenCreateChestPanel()
     {
-        ResourceManager.Get(PrefabLabel.Y_Chest).TweenForCG();
-        ResourceManager.SetActive(PrefabLabel.Ya_GetAward, false);
-        ResourceManager.SetActive(PrefabLabel.Y_Guess, false);
-        ResourceManager.SetActive(PrefabLabel.Yb_CreateChest, true);
+        ResourceManager.Get(ObjectLabel.Y_Chest).TweenForCG();
+        ResourceManager.SetActive(ObjectLabel.Ya_GetAward, false);
+        ResourceManager.SetActive(ObjectLabel.Y_Guess, false);
+        ResourceManager.SetActive(ObjectLabel.Yb_CreateChest, true);
         OnSliderValueChange(Slider.value);
         OnInputValueChange(InputField.text);
         Slider.value = 1;
@@ -210,7 +210,7 @@ public class ChestManager : Regist
 
     public static void CloseCreateChestPanel()
     {
-        ResourceManager.Get(PrefabLabel.Y_Chest).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.Y_Chest).TweenBacCG();
     }
 
     public static void OnLuckyToggle(bool enable)
@@ -218,7 +218,7 @@ public class ChestManager : Regist
         if (enable)
         {
             ChestType = ChestType.Lucky;
-            LanguageManager.Add(Desc, new MulLanStr("UI", "Yb_LuckyDesc"));
+            LanguageManager.Add(Desc, new MulLanStr(LanguageLabel.UI__Yb_LuckyDesc));
         }
     }
 
@@ -227,7 +227,7 @@ public class ChestManager : Regist
         if (enable)
         {
             ChestType = ChestType.GuessColor;
-            LanguageManager.Add(Desc, new MulLanStr("UI", "Yb_GuessColorDesc"));
+            LanguageManager.Add(Desc, new MulLanStr(LanguageLabel.UI__Yb_GuessColorDesc));
         }
     }
 
@@ -236,7 +236,7 @@ public class ChestManager : Regist
         if (enable)
         {
             ChestType = ChestType.GuessNumber;
-            LanguageManager.Add(Desc, new MulLanStr("UI", "Yb_GuessNumberDesc"));
+            LanguageManager.Add(Desc, new MulLanStr(LanguageLabel.UI__Yb_GuessNumberDesc));
         }
     }
 
@@ -246,30 +246,30 @@ public class ChestManager : Regist
         {
             Btn.interactable = false;
             Btn.image.material = Lib.GrayMat;
-            LanguageManager.Add(BtnLab, new MulLanStr("UI", "Yb_Minimum"));
+            LanguageManager.Add(BtnLab, new MulLanStr(LanguageLabel.UI__Yb_Minimum));
             return;
         }
 
         Cost = int.Parse(value);
-        ResourceManager.SetText(PrefabLabel.Yb_CostLab, Language.GetStr("UI", "AA_Cost") + TransferLabel.DiamondSprite + Cost);
+        ResourceManager.SetText(ObjectLabel.Yb_CostLab, Language.GetStr(LanguageLabel.UI__AA_Cost) + TransferLabel.DiamondSprite + Cost);
         if (Manager.Diamond < Cost)
         {
             Btn.interactable = false;
             Btn.image.material = Lib.GrayMat;
-            LanguageManager.Add(BtnLab, new MulLanStr("Common", "ShortDiamond"));
+            LanguageManager.Add(BtnLab, new MulLanStr(LanguageLabel.Common__ShortDiamond));
         }
         else
         {
             Btn.interactable = true;
             Btn.image.material = null;
-            LanguageManager.Add(BtnLab, new MulLanStr("Common", "Confirm"));
+            LanguageManager.Add(BtnLab, new MulLanStr(LanguageLabel.Common__Confirm));
         }
     }
 
     public static void OnSliderValueChange(float value)
     {
         Round = (int) value;
-        SliderValueLab.text = Round + Language.GetStr("UI", PrefabLabel.Yb_SliderValueLab);
+        SliderValueLab.text = Round + Language.GetStr(LanguageLabel.UI__Yb_SliderValueLab);
     }
 
 
@@ -280,15 +280,15 @@ public class ChestManager : Regist
     private static ChestType ChestType = ChestType.Lucky;
     public static void CreateChest()
     {
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Y_Tip), new MulLanStr("UI", "AA_SendRequest"));
-        ResourceManager.Get(PrefabLabel.Y_Tip).TweenForCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tip), new MulLanStr(LanguageLabel.UI__AA_SendRequest));
+        ResourceManager.Get(ObjectLabel.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>(PrefabLabel.Y_Chest).interactable = false;
+        ResourceManager.Get<CanvasGroup>(ObjectLabel.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>(PrefabLabel.Y_Tip), new MulLanStr("UI", "AA_CreateError"));
-        ResourceManager.Get(PrefabLabel.Y_Tip).TweenBacCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateError));
+        ResourceManager.Get(ObjectLabel.Y_Tip).TweenBacCG();
 
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.Y_Chest).interactable = true;
+        ResourceManager.Get<CanvasGroup>(ObjectLabel.Y_Chest).interactable = true;
     }
 
     public static void OnCreateChestSucceed()
@@ -320,10 +320,10 @@ public class ChestManager : Regist
             Manager.CreateGuessNumberChestAmt++;
         }
 
-        LanguageManager.Add(ResourceManager.Get<Text>(PrefabLabel.Y_Tip), new MulLanStr("UI", "AA_CreateSucceed"));
-        ResourceManager.Get(PrefabLabel.Y_Tip).TweenBacCG();
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateSucceed));
+        ResourceManager.Get(ObjectLabel.Y_Tip).TweenBacCG();
 
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.Y_Chest).interactable = true;
+        ResourceManager.Get<CanvasGroup>(ObjectLabel.Y_Chest).interactable = true;
 
         Manager.AddDiamond(-Cost, StaticsManager.ItemID.创建宝箱, StaticsManager.ConsumeModule.Charge);
         CloseCreateChestPanel();
@@ -516,24 +516,24 @@ public class ChestManager : Regist
             OperateDataDictionary.Add(chestOperateData.ChestID, chestOperateData);
         }
 
-        ResourceManager.Get<CanvasGroup>(PrefabLabel.Y_Chest).interactable = true;
+        ResourceManager.Get<CanvasGroup>(ObjectLabel.Y_Chest).interactable = true;
 
         if (award <= 0)
         {
-            ResourceManager.Get(PrefabLabel.Y_Chest).TweenBacCG();
+            ResourceManager.Get(ObjectLabel.Y_Chest).TweenBacCG();
 
-            Bubble.Show(null, Language.GetStr("UI", "Y_SoldOut"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Y_SoldOut));
         }
         else
         {
             AudioManager.PlayClip(Clip.CurrentClip);
 
-            ResourceManager.Get(PrefabLabel.Y_Chest).TweenForCG();
-            ResourceManager.SetActive(PrefabLabel.Ya_GetAward, true);
-            ResourceManager.SetActive(PrefabLabel.Y_Guess, false);
-            ResourceManager.SetActive(PrefabLabel.Yb_CreateChest, false);
+            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.SetText(PrefabLabel.Ya_Desc, $"x{award}");
+            ResourceManager.SetText(ObjectLabel.Ya_Desc, $"x{award}");
             Manager.AddDiamond(award, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestAward);
 
             Manager.GetChestAwardAmt++;
@@ -568,7 +568,7 @@ public class ChestManager : Regist
         if (refund > 0)
         {
             Manager.AddDiamond(refund, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestRefund);
-            InfoBoxManager.GardenInfoBox.Show(Language.GetStr("UI", "Y_Refund")+refund, 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Show(Language.GetStr(LanguageLabel.UI__Y_Refund)+refund, 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
     }
 

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

@@ -47,7 +47,7 @@ public class PlazaRoomController
             TweenRoots = new List<TweenRoot>();
 
 
-            NickNameTransform = ResourceManager.Get(ResourceLabel.NickName, Folder.UI, false, ResourceManager.Get(PrefabLabel.W_HudParent), false, ObjType.NickName);
+            NickNameTransform = ResourceManager.Get(ResourceLabel.NickName, Folder.UI, false, ResourceManager.Get(ObjectLabel.W_HudParent), false, ObjType.NickName);
 
             HudTarget hudTarget = NickNameTransform.GetComponent<HudTarget>();
 
@@ -59,11 +59,11 @@ public class PlazaRoomController
             hudTarget.PosTra = Player.ChildDic["NickName"];
             hudTarget.SetPosition();
 
-            NickName = string.IsNullOrEmpty(nickname) ? Language.GetStr("UI", "未命名") : nickname;
+            NickName = string.IsNullOrEmpty(nickname) ? Language.GetStr(LanguageLabel.UI__Unnamed) : nickname;
             NickNameTransform.GetComponent<Text>().text = NickName;
 
 
-            MessageBox = ResourceManager.Get(ResourceLabel.MessageBox, Folder.UI, false, ResourceManager.Get(PrefabLabel.W_HudParent), false, ObjType.MessageBox);
+            MessageBox = ResourceManager.Get(ResourceLabel.MessageBox, Folder.UI, false, ResourceManager.Get(ObjectLabel.W_HudParent), false, ObjType.MessageBox);
             MessageLab = MessageBox.GetComponentInChildren<BestfitText>();
             MessageLab.VerticalMinSize = MinMessageFontSize;
             MessageLab.VerticalMaxSize = MaxMessageFontSize;
@@ -190,12 +190,12 @@ public class PlazaRoomController
 
         AudioManager.MusicTheme.TweenBacAudio();
 
-        ResourceManager.Get(PrefabLabel.B_SignIn0).TweenBacCG();
-        ResourceManager.Get(PrefabLabel.T_NickName).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.B_SignIn0).TweenBacCG();
+        ResourceManager.Get(ObjectLabel.T_NickName).TweenBacCG();
 
         Manager.SceneSwitchLock = true;
 
-        TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.V_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.V_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
         (
@@ -248,15 +248,15 @@ public class PlazaRoomController
 
             if (JoinRoomResult == JoinRoomResult.RoomFullError)
             {
-                Bubble.Show(null, Language.GetStr("UI", "Z_RoomFull"), null, null, () => { ResourceManager.Get(PrefabLabel.V_BlackMask).TweenForCG(); AudioManager.MusicTheme.TweenForAudio(); }, null, false);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_RoomFull), null, null, () => { ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG(); AudioManager.MusicTheme.TweenForAudio(); }, null, false);
             }
             else if (JoinRoomResult == JoinRoomResult.RoomExpireError)
             {
-                Bubble.Show(null, Language.GetStr("UI", "Z_RoomExpire"), null, null, () => { ResourceManager.Get(PrefabLabel.V_BlackMask).TweenForCG(); AudioManager.MusicTheme.TweenForAudio(); }, null, false);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_RoomExpire), null, null, () => { ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG(); AudioManager.MusicTheme.TweenForAudio(); }, null, false);
             }
             else
             {
-                Bubble.Show(null, Language.GetStr("UI", "Z_Unknown"), null, null, () => { ResourceManager.Get(PrefabLabel.V_BlackMask).TweenForCG(); AudioManager.MusicTheme.TweenForAudio(); }, null, false);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Z_Unknown), null, null, () => { ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG(); AudioManager.MusicTheme.TweenForAudio(); }, null, false);
             }
         }
     }
@@ -293,20 +293,20 @@ public class PlazaRoomController
 
         GardenSmartFox.PlazaRoomController.PlazaRoomCamera.transform.SetX(GardenSmartFox.PlazaRoomController.CameraLeftBorder);
 
-        ResourceManager.Get(PrefabLabel.V_BlackMask).TweenForCG();
+        ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG();
 
-        ResourceManager.SetActive(PrefabLabel.C_Main2, false);
+        ResourceManager.SetActive(ObjectLabel.C_Main2, false);
         ResourceManager.SetActive(ResourceLabel.Garden, false);
         ResourceManager.SetActive("PlazaRoom", true);
-        ResourceManager.SetActive(PrefabLabel.W_HudParent, true);
-        ResourceManager.SetActive(PrefabLabel.X_PlazaRoom, true);
+        ResourceManager.SetActive(ObjectLabel.W_HudParent, true);
+        ResourceManager.SetActive(ObjectLabel.X_PlazaRoom, true);
     }
 
     public void ExitPlazaRoom()
     {
         QuitPlazaRoom();
 
-        TweenRoot tweenRoot = ResourceManager.Get(PrefabLabel.V_BlackMask).TweenBacCG();
+        TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.V_BlackMask).TweenBacCG();
 
         tweenRoot.AddEventOnetime
         (
@@ -322,18 +322,18 @@ public class PlazaRoomController
                 PlazaRoomSky.position = SkyOriginPosition;
                 PlazaRoomCamera.transform.position = CameraOriginPosition;
 
-                ResourceManager.SetActive(PrefabLabel.C_Main2, true);
+                ResourceManager.SetActive(ObjectLabel.C_Main2, true);
                 ResourceManager.SetActive(ResourceLabel.Garden, true);
                 ResourceManager.SetActive("PlazaRoom", false);
-                ResourceManager.SetActive(PrefabLabel.W_HudParent, false);
-                ResourceManager.SetActive(PrefabLabel.X_PlazaRoom, false);
+                ResourceManager.SetActive(ObjectLabel.W_HudParent, false);
+                ResourceManager.SetActive(ObjectLabel.X_PlazaRoom, false);
 
-                ResourceManager.Get(PrefabLabel.V_BlackMask).TweenForCG();
-                ResourceManager.Get(PrefabLabel.B_SignIn0).TweenForCG();
-                ResourceManager.Get(PrefabLabel.T_NickName).TweenForCG();
+                ResourceManager.Get(ObjectLabel.V_BlackMask).TweenForCG();
+                ResourceManager.Get(ObjectLabel.B_SignIn0).TweenForCG();
+                ResourceManager.Get(ObjectLabel.T_NickName).TweenForCG();
 
-                ResourceManager.Get<Text>(PrefabLabel.X_CurrentInfoLab).text = "";
-                Transform tra = ResourceManager.Get(PrefabLabel.X_Info);
+                ResourceManager.Get<Text>(ObjectLabel.X_CurrentInfoLab).text = "";
+                Transform tra = ResourceManager.Get(ObjectLabel.X_Info);
                 while (tra.childCount > 0)
                 {
                     ResourceManager.Save(tra.GetChild(0));
@@ -585,11 +585,11 @@ public class PlazaRoomController
         string expressionName = Enum.GetName(typeof(ExpressionID), expressionID);
         plazaRoomPlayer.Player.ChangeExpression(expressionName, ExpressionDuration);
 
-        string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr("UI", "X_Self") : plazaRoomPlayer.NickName;
+        string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr(LanguageLabel.UI__X_Self) : plazaRoomPlayer.NickName;
         string message = $"{senderName}:\u3000<({expressionName}按钮)>";
         Color textColor = senderID == SFSManager.GardenSmartFox.User.Id ? Lib.SelfMessage : Lib.OtherMessage;
         InfoBoxManager.PlazaRoomInfoBox.Show(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
-        Text text = ResourceManager.Get<Text>(PrefabLabel.X_CurrentInfoLab);
+        Text text = ResourceManager.Get<Text>(ObjectLabel.X_CurrentInfoLab);
         text.color = textColor;
         text.text = message;
     }
@@ -601,13 +601,13 @@ public class PlazaRoomController
         PlazaRoomPlayer plazaRoomPlayer = UserInstanceDictionary[senderID];
         plazaRoomPlayer.ShowMessage(textColor, message);
 
-        string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr("UI", "X_Self") : plazaRoomPlayer.NickName;
+        string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr(LanguageLabel.UI__X_Self) : plazaRoomPlayer.NickName;
 
         message = $"{senderName}:\u3000{message}";
         InfoBoxManager.PlazaRoomInfoBox.Show(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
 
-        ResourceManager.SetText(PrefabLabel.X_CurrentInfoLab, message);
-        Text text = ResourceManager.Get<Text>(PrefabLabel.X_CurrentInfoLab);
+        ResourceManager.SetText(ObjectLabel.X_CurrentInfoLab, message);
+        Text text = ResourceManager.Get<Text>(ObjectLabel.X_CurrentInfoLab);
         text.color = textColor;
         text.text = message;
     }
@@ -630,7 +630,7 @@ public class PlazaRoomController
     {
         if (string.IsNullOrEmpty(message))
         {
-            Bubble.Show(null, Language.GetStr("UI", "内容不能为空"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__CannotEmpty));
 
             return false;
         }

+ 2 - 2
Assets/Script/ThirdParty/Alipay/AlipayManager.cs

@@ -58,7 +58,7 @@ public class AliplayManager : UnitySingleton<AliplayManager>
 
         if (int.Parse(result.Split('|')[0]) == 9000)
         {
-            Bubble.Show(null, Language.GetStr("IAP", "PurchaseSuccess"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseSuccess));
 
             JsonData jsonData = JsonMapper.ToObject(result.Split('|')[1]);
 
@@ -86,7 +86,7 @@ public class AliplayManager : UnitySingleton<AliplayManager>
         }
         else
         {
-            Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));
+            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
         }
     }
 }

+ 4 - 4
Assets/Script/Tool/Auxiliary.cs

@@ -1,4 +1,4 @@
-using LitJson;
+using LitJson;
 using MiniJSON;
 using ScottGarland;
 using DragonBones;
@@ -144,7 +144,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            HttpManager.GetThanksGiftInfo(ThanksGift.Init, () => Bubble.Show(null, Language.GetStr("UI", "GetThanksGiftInfoFailed")));
+            HttpManager.GetThanksGiftInfo(ThanksGift.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
         }
 
         //if (Input.GetKeyDown(KeyCode.A))
@@ -329,7 +329,7 @@ public class Auxiliary : Regist
         {
             MiniGameManager.Pause = true;
 
-            Bubble.Show(Language.GetStr("Common", "QuitGame"), null, null, null, Application.Quit, () => { MiniGameManager.Pause = false; });
+            Bubble.Show(Language.GetStr(LanguageLabel.Common__QuitGame), null, null, null, Application.Quit, () => { MiniGameManager.Pause = false; });
         }
 
         if (AnyKeyUp)
@@ -1052,7 +1052,7 @@ public class Auxiliary : Regist
         }
         else if (current == Current.Cash)
         {
-            return Language.GetStr("Common", "Cash");
+            return Language.GetStr(LanguageLabel.Common__Cash);
         }
         else
         {

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

@@ -61,33 +61,33 @@ public class Language
 
         if (LanguageManager.CurrentLanguage == CurrentLanguage.English)
         {
-            ResourceManager.Get<Button>(PrefabLabel.L_TraChi).interactable = true;
-            ResourceManager.Get<Button>(PrefabLabel.L_SimChi).interactable = true;
-            ResourceManager.Get<Button>(PrefabLabel.L_English).interactable = false;
+            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>(PrefabLabel.L_TraChi).image.color = Lib.LightGray;
-            ResourceManager.Get<Button>(PrefabLabel.L_SimChi).image.color = Lib.LightGray;
-            ResourceManager.Get<Button>(PrefabLabel.L_English).image.color = Lib.Orange;
+            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;
         }
         else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
         {
-            ResourceManager.Get<Button>(PrefabLabel.L_TraChi).interactable = true;
-            ResourceManager.Get<Button>(PrefabLabel.L_SimChi).interactable = false;
-            ResourceManager.Get<Button>(PrefabLabel.L_English).interactable = true;
+            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>(PrefabLabel.L_TraChi).image.color = Lib.LightGray;
-            ResourceManager.Get<Button>(PrefabLabel.L_SimChi).image.color = Lib.Orange;
-            ResourceManager.Get<Button>(PrefabLabel.L_English).image.color = Lib.LightGray;
+            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;
         }
         else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
         {
-            ResourceManager.Get<Button>(PrefabLabel.L_TraChi).interactable = false;
-            ResourceManager.Get<Button>(PrefabLabel.L_SimChi).interactable = true;
-            ResourceManager.Get<Button>(PrefabLabel.L_English).interactable = true;
+            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>(PrefabLabel.L_TraChi).image.color = Lib.Orange;
-            ResourceManager.Get<Button>(PrefabLabel.L_SimChi).image.color = Lib.LightGray;
-            ResourceManager.Get<Button>(PrefabLabel.L_English).image.color = Lib.LightGray;
+            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;
         }
     }
 

+ 4 - 4
Assets/Script/Tool/LabelUtility/Editor/LabelUtilityLabelUtilityWindow.cs

@@ -66,10 +66,10 @@ public class LabelUtilityWindow : EditorWindow
             Instance.CreateLabelFromLanguage();
         }
 
-        if (GUILayout.Button("ReplaceLanguageLabels"))
-        {
-            Instance.ReplaceLanguageLabels();
-        }
+        //if (GUILayout.Button("ReplaceLanguageLabels"))
+        //{
+        //    Instance.ReplaceLanguageLabels();
+        //}
 
         SerializedObject.ApplyModifiedProperties();
     }

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

@@ -144,7 +144,7 @@ public class LabelUtility : MonoBehaviour
         }
     }
 
-    public static string ConbineLanguageLabel(string page, string id)
+    public static string CombineLanguageLabel(string page, string id)
     {
         return $"{page}{LanguagePageSeperator}{id}";
     }
@@ -195,33 +195,33 @@ public class LabelUtility : MonoBehaviour
     //    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 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);
-    }
+    //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);
+    //}
 }

+ 2 - 1
Assets/Script/Tool/LabelUtility/SerializeObject.prefab

@@ -51,6 +51,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e4a9dafa00b004e4e94c57cd88b01101, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  TextAsset: {fileID: 11500000, guid: 1615e3353e063d443bf237fb8aade024, type: 3}
+  Script: {fileID: 11500000, guid: 1615e3353e063d443bf237fb8aade024, type: 3}
+  Languages: []
   Prefabs:
   - {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}

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

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

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

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

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