|
@@ -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();
|
|
|
}
|
|
|
}
|
|
|
}
|