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