|
@@ -85,7 +85,7 @@ public class BigSkill : Skill
|
|
|
|
|
|
public override void AnnulA()
|
|
|
{
|
|
|
- CoolTimer = CD * CdBuff;
|
|
|
+ CoolTimer = CD * CdBuff - 1;
|
|
|
|
|
|
BarStatus = SkillStatus.Cool;
|
|
|
|
|
@@ -126,7 +126,7 @@ public class BigSkill : Skill
|
|
|
public override bool DoCool()
|
|
|
{
|
|
|
CoolTimer -= Time.deltaTime;
|
|
|
-
|
|
|
+
|
|
|
TimeSpan timeSpan = new TimeSpan(0, 0, 0, Mathf.CeilToInt(CoolTimer));
|
|
|
|
|
|
BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
|
|
@@ -202,16 +202,19 @@ public class BigSkill : Skill
|
|
|
NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
|
|
|
}
|
|
|
|
|
|
- UpgradeValue(ref NewPlus, Plus, UpgradePlus, Level - 1);
|
|
|
- UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, Level - 1);
|
|
|
- UpgradeValue(ref NewCoinOnceBuff, UpgradeCoinOnce, Level - 1);
|
|
|
- UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, Level - 1);
|
|
|
-
|
|
|
- UpgradeValue(ref NewPerson, Person, UpgradePerson, Level - 1);
|
|
|
- UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, Level - 1);
|
|
|
- UpgradeValue(ref NewDuration, Duration, UpgradeDuration, Level - 1);
|
|
|
- UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, Level - 1);
|
|
|
- UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, Level - 1);
|
|
|
+ if (BarStatus_ == SkillStatus.Upgrade)
|
|
|
+ {
|
|
|
+ UpgradeValue(ref NewPlus, Plus, UpgradePlus, Level - 1);
|
|
|
+ UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, Level - 1);
|
|
|
+ UpgradeValue(ref NewCoinOnceBuff, UpgradeCoinOnce, Level - 1);
|
|
|
+ UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, Level - 1);
|
|
|
+
|
|
|
+ UpgradeValue(ref NewPerson, Person, UpgradePerson, Level - 1);
|
|
|
+ UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, Level - 1);
|
|
|
+ UpgradeValue(ref NewDuration, Duration, UpgradeDuration, Level - 1);
|
|
|
+ UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, Level - 1);
|
|
|
+ UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, Level - 1);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (BarStatus_ == SkillStatus.Use)
|
|
@@ -432,7 +435,7 @@ public class BigSkill : Skill
|
|
|
|
|
|
ManaCenter.SkillAmt++;
|
|
|
|
|
|
- UseTimer = NewDuration;
|
|
|
+ UseTimer = NewDuration - 1;
|
|
|
|
|
|
BarStatus = SkillStatus.Use;
|
|
|
|
|
@@ -448,7 +451,14 @@ public class BigSkill : Skill
|
|
|
{
|
|
|
BarBtn.interactable = false;
|
|
|
|
|
|
- ManaCenter.UseList.Add(this);
|
|
|
+ if (NewDuration.Equal(0))
|
|
|
+ {
|
|
|
+ AnnulA();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ ManaCenter.UseList.Add(this);
|
|
|
+ }
|
|
|
|
|
|
ManaCenter.SkillPlus += NewPlus;
|
|
|
ManaCenter.SkillPerson += NewPerson;
|