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