From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/HeroUI/HeroTrainWin.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Main/System/HeroUI/HeroTrainWin.cs b/Main/System/HeroUI/HeroTrainWin.cs
index 103d004..11d1c80 100644
--- a/Main/System/HeroUI/HeroTrainWin.cs
+++ b/Main/System/HeroUI/HeroTrainWin.cs
@@ -225,7 +225,7 @@
jobImg.SetSprite(HeroUIManager.Instance.GetJobIconName(hero.heroConfig.Class));
jobPosNameText.text = HeroUIManager.Instance.GetJobName(hero.heroConfig.Class);
descText.text = hero.heroConfig.Desc;
- fightPowerText.text = UIHelper.ReplaceLargeArtNum(hero.CalculatePower());
+ fightPowerText.text = UIHelper.ReplaceLargeArtNum(hero.CalculateFightPower());
PlayerMainDate.Instance.AddPowerNotOnTeam(hero);
lockImg.SetActive(hero.isLock);
unLockImg.SetActive(!hero.isLock);
@@ -429,7 +429,7 @@
{
lvupBtnText.text = Language.Get("L1110");
lvupBtn.SetInteractable(false);
- lvupMoneyIcon.SetActive(false);
+ lvupMoneyText.SetActive(false);
}
}
@@ -468,7 +468,7 @@
ReturnCell(cell);
});
- HeroUIManager.Instance.lastFightPower = new KeyValuePair<string, long>(hero.itemHero.guid, hero.CalculatePower(false));
+ HeroUIManager.Instance.lastFightPower = new KeyValuePair<string, long>(hero.itemHero.guid, hero.CalculateFightPower(false));
}
}
@@ -513,7 +513,7 @@
if (nextQualityBreakConfig.AttrIDList[j] == 0)
continue;
string format = i < hero.breakLevel ? "{0}" + UIHelper.AppendColor(TextColType.Green, "+{1}") : "{0}+{1}";
- attrStrArr.Add((string.IsNullOrEmpty(nextQualityBreakConfig.SkillIName) ? string.Empty : Language.Get("equipQualityFormat", nextQualityBreakConfig.SkillIName)) +
+ attrStrArr.Add((string.IsNullOrEmpty(nextQualityBreakConfig.SkillIName) ? string.Empty : Language.Get("L1039", nextQualityBreakConfig.SkillIName)) +
PlayerPropertyConfig.GetFullDescription(nextQualityBreakConfig.AttrIDList[j], nextQualityBreakConfig.AttrValueList[j], format));
}
@@ -522,7 +522,7 @@
var skill = SkillConfig.Get(nextQualityBreakConfig.SkillID);
if (skill != null)
{
- attrStrArr.Add(Language.Get("equipQualityFormat", skill.SkillName) + skill.Description);
+ attrStrArr.Add(Language.Get("L1039", skill.SkillName) + skill.Description);
}
else
{
@@ -682,13 +682,13 @@
else if (type == 2)
{
var skill = SkillConfig.Get(config.SkillID);
- awakeStr = Language.Get("equipQualityFormat", skill.SkillName) + skill.Description;
+ awakeStr = Language.Get("L1039", skill.SkillName) + skill.Description;
}
else
{
for (int k = 0; k < config.AttrIDList.Length; k++)
{
- awakeStr += (string.IsNullOrEmpty(config.SkillIName) ? string.Empty : Language.Get("equipQualityFormat", config.SkillIName)) +
+ awakeStr += (string.IsNullOrEmpty(config.SkillIName) ? string.Empty : Language.Get("L1039", config.SkillIName)) +
PlayerPropertyConfig.GetFullDescription(config.AttrIDList[k], config.AttrValueList[k], "{0}+" + UIHelper.AppendColor(TextColType.Green, "{1}"))
+ (k == config.AttrIDList.Length - 1 ? "" : "\n");
}
@@ -712,7 +712,7 @@
{
if (teamType != TeamType.Story)
return;
- fightPowerText.text = UIHelper.ReplaceLargeArtNum(hero.CalculatePower());
+ fightPowerText.text = UIHelper.ReplaceLargeArtNum(hero.CalculateFightPower());
}
void RefreshFreeze()
@@ -792,6 +792,7 @@
redpointLVUP.SetActive(true);
return;
}
+ return;
}
}
--
Gitblit v1.8.0