|
@@ -60,46 +60,60 @@ public class Award
|
|
|
|
|
|
public void GetAward(int score)
|
|
|
{
|
|
|
- ManaReso.SetActive("Da_Flower", false);
|
|
|
- ManaReso.SetActive("Da_Diamond", false);
|
|
|
+ ManaReso.Get("Da_Info").TweenForCG();
|
|
|
+
|
|
|
+ ManaReso.SetActive("Da_Lab", false);
|
|
|
+ ManaReso.SetActive("Da_Quit", false);
|
|
|
+ ManaReso.SetActive("Da_Cancel", false);
|
|
|
+ ManaReso.SetActive("Da_VGroup", false);
|
|
|
+ ManaReso.SetActive("Da_HGroup", false);
|
|
|
+ ManaReso.SetActive("Da_ScoreTit", false);
|
|
|
+ ManaReso.SetActive("Da_GetAward", false);
|
|
|
+ ManaReso.SetActive("Da_FlowerGroup", false);
|
|
|
+ ManaReso.SetActive("Da_DiamondGroup", false);
|
|
|
+
|
|
|
+ bool flowerFlag = false;
|
|
|
+ bool diamondFlag = false;
|
|
|
|
|
|
int coin = (int) Auxiliary.FmlParse(CoinFml, "s", score.ToString());
|
|
|
- coin = (int) (coin * ManaData.SkillPlus) + BonusCoin;
|
|
|
+ coin = (int) (coin * (1 + ManaData.SkillPlus)) + BonusCoin;
|
|
|
|
|
|
ManaData.Coin += coin;
|
|
|
- ManaReso.SetText("Da_CoinLab", coin.ToString());
|
|
|
-
|
|
|
|
|
|
+
|
|
|
+ int diamond = 0;
|
|
|
float diamondRate = (float) Auxiliary.FmlParse(DiamondFml, "l", Mathf.Clamp(ManaData.Level, 1, 1000).ToString());
|
|
|
|
|
|
if (Random.Range(0, 1f) <= diamondRate)
|
|
|
{
|
|
|
+ diamondFlag = true;
|
|
|
+
|
|
|
ManaReso.SetActive("Da_Diamond", true);
|
|
|
|
|
|
- int diamond = (int) Mathf.Lerp(DiamondMin, DiamondMax, Random.Range(0, 1f)) + BonusDiamond;
|
|
|
+ diamond = (int) Mathf.Lerp(DiamondMin, DiamondMax, Random.Range(0, 1f)) + BonusDiamond;
|
|
|
|
|
|
ManaData.Diamond += diamond;
|
|
|
- ManaReso.SetText("Da_DiamondLab", diamond.ToString());
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
if (BonusDiamond > 0)
|
|
|
{
|
|
|
+ diamondFlag = true;
|
|
|
+
|
|
|
ManaReso.SetActive("Da_Diamond", true);
|
|
|
|
|
|
ManaData.Diamond += BonusDiamond;
|
|
|
- ManaReso.SetText("Da_DiamondLab", BonusDiamond.ToString());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
int standard;
|
|
|
|
|
|
- if (score < Standard[0])
|
|
|
+ if (score < Standard[1])
|
|
|
{
|
|
|
standard = 0;
|
|
|
}
|
|
|
- else if (score < Standard[1])
|
|
|
+ else if (score < Standard[2])
|
|
|
{
|
|
|
standard = 1;
|
|
|
}
|
|
@@ -110,13 +124,11 @@ public class Award
|
|
|
|
|
|
|
|
|
float flowerRate = (float) Auxiliary.FmlParse(DiamondFml, "l", ManaData.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
|
|
|
-
|
|
|
+
|
|
|
if (Random.Range(0, 1f) <= flowerRate)
|
|
|
{
|
|
|
if (Random.Range(0, 1f) <= Odds[standard])
|
|
|
{
|
|
|
- ManaReso.SetActive("Da_Flower", true);
|
|
|
-
|
|
|
int Anti = 0;
|
|
|
FlowerInfo flowerInfo;
|
|
|
|
|
@@ -126,15 +138,22 @@ public class Award
|
|
|
|
|
|
if (Anti > 1000)
|
|
|
{
|
|
|
- ManaReso.SetText("Da_FlowerLab", "没有可用的花朵");
|
|
|
-
|
|
|
- break;
|
|
|
+ throw new Exception();
|
|
|
}
|
|
|
|
|
|
flowerInfo = ManaGarden.FlowerInfoList.Random();
|
|
|
|
|
|
if (flowerInfo.Unlock)
|
|
|
{
|
|
|
+ flowerFlag = true;
|
|
|
+
|
|
|
+ Vector2 newSize = flowerInfo.Sprite.rect.size;
|
|
|
+ newSize.x *= 0.2f;
|
|
|
+ newSize.y *= 0.2f;
|
|
|
+
|
|
|
+ ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Sprite;
|
|
|
+ ManaReso.Get<Image>("Da_FlowerIcon").rectTransform.sizeDelta = newSize;
|
|
|
+
|
|
|
ManaReso.SetText("Da_FlowerLab", Language.GetStr("FlowerName", "Flower" + flowerInfo.ID));
|
|
|
|
|
|
break;
|
|
@@ -145,6 +164,185 @@ public class Award
|
|
|
|
|
|
BonusCoin = 0;
|
|
|
BonusDiamond = 0;
|
|
|
+
|
|
|
+
|
|
|
+ ManaReso.SetActive("Da_VGroup", true);
|
|
|
+ ManaReso.SetActive("Da_CoinGroup", true);
|
|
|
+
|
|
|
+ if (diamondFlag)
|
|
|
+ {
|
|
|
+ ManaReso.SetActive("Da_DiamondGroup", true);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (flowerFlag)
|
|
|
+ {
|
|
|
+ ManaReso.SetActive("Da_FlowerGroup", true);
|
|
|
+ }
|
|
|
+
|
|
|
+ Auxiliary.Instance.DelayCall
|
|
|
+ (
|
|
|
+ () =>
|
|
|
+ {
|
|
|
+ ManaReso.SetActive("Da_FlowerGroup", false);
|
|
|
+ ManaReso.SetActive("Da_DiamondGroup", false);
|
|
|
+
|
|
|
+ ManaReso.Get("Da_VGroup").GetComponent<VerticalLayoutGroup>().enabled = false;
|
|
|
+ },
|
|
|
+ 1
|
|
|
+ );
|
|
|
+
|
|
|
+ Tween tween = ManaReso.Get("Da_Info").GetTweenCG();
|
|
|
+
|
|
|
+ tween.OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+ ManaReso.SetActive("Da_HGroup", true);
|
|
|
+ ManaReso.Get("Da_Star1").TweenForScale();
|
|
|
+ };
|
|
|
+
|
|
|
+ ManaReso.SetText("Da_CoinLab", "");
|
|
|
+ ManaReso.SetText("Da_ScoreLab", "");
|
|
|
+ ManaReso.SetText("Da_DiamondLab", "");
|
|
|
+
|
|
|
+ ManaReso.Get("Da_CoinLab").CreateTweenNumber(0, coin, 1.5f, true, true, Curve.EaseOutQuad);
|
|
|
+ ManaReso.Get("Da_ScoreLab").CreateTweenNumber(0, score, 1.5f, true, true, Curve.EaseOutQuad);
|
|
|
+ ManaReso.Get("Da_DiamondLab").CreateTweenNumber(0, diamond, 1.5f, true, true, Curve.EaseOutQuad);
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_ScoreTit").GetTweenText();
|
|
|
+ tween.InOrigin = true;
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_Star3").GetTweenScale();
|
|
|
+ tween.InOrigin = true;
|
|
|
+ tween.OnForwardFinish = null;
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_Star2").GetTweenScale();
|
|
|
+ tween.InOrigin = true;
|
|
|
+ tween.OnForwardFinish = null;
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_Star1").GetTweenScale();
|
|
|
+ tween.InOrigin = true;
|
|
|
+ tween.OnForwardFinish = null;
|
|
|
+
|
|
|
+ if (standard == 0)
|
|
|
+ {
|
|
|
+ ManaReso.SetActive("Da_Star2", false);
|
|
|
+ ManaReso.SetActive("Da_Star3", false);
|
|
|
+ }
|
|
|
+ else if (standard == 1)
|
|
|
+ {
|
|
|
+ ManaReso.SetActive("Da_Star2", true);
|
|
|
+ ManaReso.SetActive("Da_Star3", false);
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_Star1").GetTweenScale();
|
|
|
+
|
|
|
+ tween.OnForwardFinish += () =>
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_Star2").TweenForScale();
|
|
|
+ };
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_Star2").GetTweenScale();
|
|
|
+ }
|
|
|
+ else if (standard == 2)
|
|
|
+ {
|
|
|
+ ManaReso.SetActive("Da_Star2", true);
|
|
|
+ ManaReso.SetActive("Da_Star3", true);
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_Star1").GetTweenScale();
|
|
|
+
|
|
|
+ tween.OnForwardFinish += () =>
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_Star2").TweenForScale();
|
|
|
+ };
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_Star2").GetTweenScale();
|
|
|
+
|
|
|
+ tween.OnForwardFinish += () =>
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_Star3").TweenForScale();
|
|
|
+ };
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_Star3").GetTweenScale();
|
|
|
+ }
|
|
|
+
|
|
|
+ tween.OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_ScoreTit").TweenForText();
|
|
|
+ };
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_ScoreTit").GetTweenText();
|
|
|
+
|
|
|
+ tween.OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_ScoreLab").TweenForNumber();
|
|
|
+ };
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_ScoreLab").GetTweenNumber();
|
|
|
+
|
|
|
+ tween.OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+ ManaReso.Get<CanvasGroup>("Da_VGroup").alpha = 1;
|
|
|
+ ManaReso.SetActive("Da_VGroup", true);
|
|
|
+
|
|
|
+ ManaReso.Get("Da_CoinGroup").TweenForScale();
|
|
|
+
|
|
|
+ if (diamondFlag)
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_DiamondGroup").TweenForScale();
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_CoinGroup").GetTweenScale();
|
|
|
+
|
|
|
+ tween.OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_CoinLab").TweenForNumber();
|
|
|
+ };
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_CoinLab").GetTweenNumber();
|
|
|
+
|
|
|
+ if (diamondFlag)
|
|
|
+ {
|
|
|
+ tween = ManaReso.Get("Da_DiamondGroup").GetTweenScale();
|
|
|
+
|
|
|
+ tween.OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_DiamondLab").TweenForNumber();
|
|
|
+ };
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_DiamondLab").GetTweenNumber();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_DiamondGroup").GetTweenScale().OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+
|
|
|
+ };
|
|
|
+ }
|
|
|
+
|
|
|
+ if (flowerFlag)
|
|
|
+ {
|
|
|
+ tween = ManaReso.Get("Da_CoinLab").GetTweenNumber();
|
|
|
+
|
|
|
+ tween.OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+ ManaReso.SetActive("Da_FlowerGroup", true);
|
|
|
+
|
|
|
+ ManaReso.Get("Da_FlowerGroup").TweenForScale();
|
|
|
+ };
|
|
|
+
|
|
|
+ tween = ManaReso.Get("Da_FlowerGroup").GetTweenScale();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_CoinLab").GetTweenNumber().OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+
|
|
|
+ };
|
|
|
+ }
|
|
|
+
|
|
|
+ tween.OnForwardFinish = () =>
|
|
|
+ {
|
|
|
+ ManaReso.Get("Da_GetAward").TweenForCG();
|
|
|
+ };
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -510,11 +708,6 @@ public class ManaMiniGame : Regist
|
|
|
|
|
|
Award.GetAward(Score);
|
|
|
|
|
|
- ManaReso.SetActive("Da_Info", true);
|
|
|
- ManaReso.SetActive("Da_Quit", false);
|
|
|
- ManaReso.SetActive("Da_Cancel", false);
|
|
|
- ManaReso.SetActive("Da_GetAward", true);
|
|
|
-
|
|
|
GameAbort();
|
|
|
}
|
|
|
|
|
@@ -595,7 +788,6 @@ public class ManaMiniGame : Regist
|
|
|
ManaReso.SetActive("D_Begin", true);
|
|
|
|
|
|
ManaReso.SetText("Da_Tit", string.Format(Language.GetStr("UI", "Da_Tit1")));
|
|
|
- ManaReso.SetText("Da_Lab", string.Format("{0}{1}", Language.GetStr("UI", "Da_Lab1"), Score));
|
|
|
|
|
|
Score = 0;
|
|
|
|