From 440e8a4e3febfc1d98f11da2fbd7eaf75c12e877 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 22 十月 2025 15:04:17 +0800
Subject: [PATCH] 125 战斗 细节调整
---
Main/System/HeroUI/HeroTrainWin.cs | 259 +++++++++++++++++++++++++++++++++------------------
1 files changed, 167 insertions(+), 92 deletions(-)
diff --git a/Main/System/HeroUI/HeroTrainWin.cs b/Main/System/HeroUI/HeroTrainWin.cs
index e905dd1..11d1c80 100644
--- a/Main/System/HeroUI/HeroTrainWin.cs
+++ b/Main/System/HeroUI/HeroTrainWin.cs
@@ -9,6 +9,7 @@
/// </summary>
public class HeroTrainWin : UIBase
{
+ [SerializeField] RawImage bgTexture;
[SerializeField] Button showFuncBtn; //鍙樉绀虹珛缁樻椂鐐瑰嚮锛屾樉绀哄姛鑳�
[SerializeField] Transform funcForm;
[SerializeField] UIHeroController roleLhModel; //灞曠ず鑻遍泟绔嬬粯
@@ -53,8 +54,8 @@
[SerializeField] Text[] inheritAttrText; //姝﹀皢浼氱户鎵跨殑灞炴��
[SerializeField] RichText heroAddPerText; //涓诲叕锛堜笂闃碉級鍔犳垚鎻忚堪
[SerializeField] Text[] heroAddAttrPerText; //涓诲叕锛堜笂闃碉級鍔犳垚
- [SerializeField] Text[] addPerText; //澧炲姞鐧惧垎姣旓紙椋樺姩锛�
- [SerializeField] PositionTween addPerObject;
+ [SerializeField] Transform addPerParent;
+ [SerializeField] HeroTrainAddAttrCell addPerObject;
[SerializeField] Image lvupMoneyIcon;
[SerializeField] Text lvupMoneyText;
[SerializeField] Text lvupBtnText;
@@ -80,6 +81,20 @@
[SerializeField] Text starUPBtnText;
[SerializeField] Button washBtn;
+ //鍐荤粨澶勭悊
+ [SerializeField] Button freezeTipBtn;
+ [SerializeField] GameObject freezeTipGo;
+ [SerializeField] Text freezeStarText;
+ [SerializeField] Text freezeAawkeLVText;
+ [SerializeField] List<Image> starImgFreezeList;
+
+ //浼孩鐐圭敤鍥剧墖浠ｆ浛
+ [SerializeField] Image redpointAwake;
+ [SerializeField] Image redpointGift;
+ [SerializeField] Image redpointLVUP;
+
+
+ Queue<HeroTrainAddAttrCell> lvupAttrQueue = new Queue<HeroTrainAddAttrCell>();
string guid;
HeroInfo hero;
@@ -107,7 +122,10 @@
});
lockBtn.AddListener(() => { hero.ChangeLockState(); });
- resetBtn.AddListener(ResetBtnClick);
+ resetBtn.AddListener(() =>
+ {
+ HeroUIManager.Instance.ResetBtnClick(hero);
+ });
deleteBtn.AddListener(DeleteHero);
awakeBtn.AddListener(() =>
{
@@ -156,6 +174,11 @@
potentialCellList = new List<GameObject>();
awakeCellList = new List<GameObject>();
+
+ freezeTipBtn.AddListener(() =>
+ {
+ freezeTipGo.SetActive(!freezeTipGo.activeSelf);
+ });
}
@@ -164,7 +187,7 @@
PackManager.Instance.RefreshItemLockEvent += RefreshItemLockEvent;
HeroManager.Instance.onHeroChangeEvent += RefreshHeroEvent;
UIManager.Instance.OnCloseWindow += OnCloseWindow;
- HeroUIManager.Instance.OnTeamPosChangeEvent += TeamPosChangeEvent;
+ TeamManager.Instance.OnTeamChange += TeamPosChangeEvent;
guid = HeroUIManager.Instance.selectHeroGuid;
hero = HeroManager.Instance.GetHero(guid);
unfoldState = false;
@@ -178,7 +201,7 @@
PackManager.Instance.RefreshItemLockEvent -= RefreshItemLockEvent;
HeroManager.Instance.onHeroChangeEvent -= RefreshHeroEvent;
UIManager.Instance.OnCloseWindow -= OnCloseWindow;
- HeroUIManager.Instance.OnTeamPosChangeEvent -= TeamPosChangeEvent;
+ TeamManager.Instance.OnTeamChange -= TeamPosChangeEvent;
}
private void OnCloseWindow(UIBase closeUI)
@@ -196,16 +219,16 @@
public void Display()
{
+ bgTexture.SetTexture2D("countryBG" + hero.heroConfig.Country);
roleLhModel.Create(hero.SkinID, 1, motionName: "", isLh: true);
- roleXsModel.Create(hero.SkinID);
+ roleXsModel.Create(hero.SkinID, 1);
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);
- nameText.text = hero.breakLevel == 0 ? hero.heroConfig.Name : Language.Get("herocardbreaklv", hero.heroConfig.Name, hero.breakLevel);
RefreshConn();
normalSkillCell.Init(hero.heroConfig.AtkSkillID, () =>
@@ -226,6 +249,10 @@
RefreshFetter();
RefreshGift();
RefreshAwake();
+ RefreshFreeze();
+ RefreshRedImg();
+
+ HeroUIManager.Instance.RemoveNewHero(hero.heroId);
}
void RefreshItemLockEvent(PackType type, string guid, bool lockState)
@@ -276,74 +303,9 @@
Display();
}
- void ResetBtnClick()
- {
- //鍗囩骇銆佺獊鐮淬�佽閱�
- if (hero.heroLevel == 1 && hero.breakLevel == 0 && hero.awakeLevel == 0)
- {
- SysNotifyMgr.Instance.ShowTip("HeroCanNotReset");
- return;
- }
-
- List<Item> items = new List<Item>();
- var payBack1 = CommonFunc.AddDict(HeroUIManager.Instance.GetHeroLVPayBack(hero.Quality, hero.heroLevel),
- HeroUIManager.Instance.GetHeroBreakPayBack(hero.Quality, hero.breakLevel));
- //宸茶閱掔殑闇�瑕佹秷鑰楄揣甯�
- if (hero.awakeLevel == 0)
- {
- items = CommonFunc.ChangeToItemList(payBack1);
- ConfirmCancel.ShowItemsConfirm(items, Language.Get("herocard42"), Language.Get("herocard43"), (bool isOk) =>
- {
- if (isOk)
- {
- //鍙戝寘
- SendReborn(hero.itemHero.gridIndex);
- }
- });
- }
- else
- {
-
- if (HeroUIManager.Instance.awakeRebirthCnt >= HeroUIManager.Instance.rebornAwakeHeroMaxCount)
- {
- SysNotifyMgr.Instance.ShowTip("HeroRebornAwakeMax");
- return;
- }
-
- payBack1 = CommonFunc.AddDict(payBack1, HeroUIManager.Instance.GetHeroQualityAwakePayBack(hero.Quality, hero.awakeLevel));
- items = CommonFunc.ChangeToItemList(payBack1);
- var info2 = Language.Get("herocard44", HeroUIManager.Instance.awakeRebirthCnt);
- var payBackMoney = HeroQualityAwakeConfig.GetQualityAwakeConfig(hero.Quality, hero.awakeLevel).RebirthCostMoney;
- ConfirmCancel.ShowItemsConfirm(items, Language.Get("herocard42"), Language.Get("herocard43"), (bool isOk) =>
- {
- if (isOk)
- {
- if (UIHelper.GetMoneyCnt(HeroUIManager.Instance.payBackMoneyType) < payBackMoney)
- {
- ItemTipUtility.ShowMoneyTip(HeroUIManager.Instance.payBackMoneyType);
- return;
- }
- //鍙戝寘
- SendReborn(hero.itemHero.gridIndex);
- }
- }, info2, "", payBackMoney, HeroUIManager.Instance.payBackMoneyType);
-
- }
-
- }
-
- void SendReborn(int index)
- {
- var pack = new CB239_tagCSHeroRebirth();
- pack.ItemIndex = (ushort)index;
- GameNetSystem.Instance.SendInfo(pack);
-
- HeroUIManager.Instance.lastFightPower = new KeyValuePair<string, long>(hero.itemHero.guid, hero.CalculatePower(false));
-
- }
void DeleteHero()
{
@@ -382,6 +344,7 @@
{
RefreshStars();
nameText.text = hero.breakLevel == 0 ? hero.heroConfig.Name : Language.Get("herocardbreaklv", hero.heroConfig.Name, hero.breakLevel);
+
nameText.color = UIHelper.GetUIColorByFunc(hero.Quality);
if (hero.Quality >= 4)
@@ -450,14 +413,14 @@
lvupBtnText.text = Language.Get("L1111");
var breakConfig = HeroQualityBreakConfig.GetQualityBreakConfig(hero.Quality, hero.breakLevel);
lvupMoneyIcon.SetOrgSprite(ItemConfig.Get(breakConfig.UPCostItem[0]).IconKey);
- lvupMoneyText.text = UIHelper.ShowUseItem(PackType.Item, breakConfig.UPCostItem[0], breakConfig.UPCostItem[1], TextColType.NavyBrown);
+ lvupMoneyText.text = UIHelper.ShowUseItem(PackType.Item, breakConfig.UPCostItem[0], breakConfig.UPCostItem[1]);
}
else
{
lvupBtnText.text = Language.Get("L1109");
var lvupConfig = HeroQualityLVConfig.GetQualityLVConfig(hero.Quality, hero.heroLevel);
lvupMoneyIcon.SetOrgSprite(ItemConfig.Get(lvupConfig.UPCostItem[0]).IconKey);
- lvupMoneyText.text = UIHelper.ShowUseItem(PackType.Item, lvupConfig.UPCostItem[0], lvupConfig.UPCostItem[1], TextColType.NavyBrown);
+ lvupMoneyText.text = UIHelper.ShowUseItem(PackType.Item, lvupConfig.UPCostItem[0], lvupConfig.UPCostItem[1]);
}
lvupBtn.SetInteractable(true);
@@ -466,7 +429,7 @@
{
lvupBtnText.text = Language.Get("L1110");
lvupBtn.SetInteractable(false);
- lvupMoneyIcon.SetActive(false);
+ lvupMoneyText.SetActive(false);
}
}
@@ -497,21 +460,38 @@
GameNetSystem.Instance.SendInfo(pack);
//棰勬樉绀�
lvupEffect.Play();
- addPerObject.SetActive(true);
- for (int i = 0; i < addPerText.Length; i++)
- {
- addPerText[i].text = "+" + PlayerPropertyConfig.GetValueDescription(PlayerPropertyConfig.basePerAttrs[i], hero.qualityConfig.LVAddPer);
- }
- addPerObject.Play(() =>
- {
- addPerObject.SetActive(false);
+ var cell = RequestCell();
+ cell.transform.localPosition = new Vector3(0, 0, 0);
+ cell.Display(hero.qualityConfig.LVAddPer, ()=>
+ {
+ cell.SetActive(false);
+ 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));
}
}
}
+
+
+ HeroTrainAddAttrCell RequestCell()
+ {
+
+ if (lvupAttrQueue.Count == 0)
+ {
+ return Instantiate(addPerObject, addPerParent);
+ }
+ return lvupAttrQueue.Dequeue();
+ }
+
+
+ void ReturnCell(HeroTrainAddAttrCell cell)
+ {
+ lvupAttrQueue.Enqueue(cell);
+ }
+
void RefreshAllPotential()
{
@@ -533,7 +513,8 @@
if (nextQualityBreakConfig.AttrIDList[j] == 0)
continue;
string format = i < hero.breakLevel ? "{0}" + UIHelper.AppendColor(TextColType.Green, "+{1}") : "{0}+{1}";
- attrStrArr.Add(PlayerPropertyConfig.GetFullDescription(nextQualityBreakConfig.AttrIDList[j], nextQualityBreakConfig.AttrValueList[j], format));
+ attrStrArr.Add((string.IsNullOrEmpty(nextQualityBreakConfig.SkillIName) ? string.Empty : Language.Get("L1039", nextQualityBreakConfig.SkillIName)) +
+ PlayerPropertyConfig.GetFullDescription(nextQualityBreakConfig.AttrIDList[j], nextQualityBreakConfig.AttrValueList[j], format));
}
if (nextQualityBreakConfig.SkillID != 0)
@@ -541,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
{
@@ -701,13 +682,14 @@
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 += PlayerPropertyConfig.GetFullDescription(config.AttrIDList[k], config.AttrValueList[k], "{0}+" + UIHelper.AppendColor(TextColType.Green, "{1}"))
+ 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");
}
}
@@ -726,8 +708,101 @@
}
}
- void TeamPosChangeEvent(List<int> posList, int flyFrom, Vector3 startPos)
- {
- fightPowerText.text = UIHelper.ReplaceLargeArtNum(hero.CalculatePower());
+ void TeamPosChangeEvent(TeamType teamType)
+ {
+ if (teamType != TeamType.Story)
+ return;
+ fightPowerText.text = UIHelper.ReplaceLargeArtNum(hero.CalculateFightPower());
+ }
+
+ void RefreshFreeze()
+ {
+ //鑷冲皯闇�瑕佽閱掑埌澶氬皯绾�
+ int needAwakeLV = HeroUIManager.Instance.GetAwakeLVByStarLV(hero.heroId, hero.heroStarMaxBefore);
+ if (hero.awakeLevel < needAwakeLV)
+ {
+ freezeTipBtn.SetActive(true);
+ //鏄熺骇
+ for (int i = 0; i < starImgFreezeList.Count; i++)
+ {
+ if ((hero.heroStarMaxBefore - 1) % starImgFreezeList.Count >= i)
+ {
+ starImgFreezeList[i].SetActive(true);
+ starImgFreezeList[i].SetSprite("herostar" + (((hero.heroStarMaxBefore - 1) / starImgFreezeList.Count) + 1) * starImgFreezeList.Count);
+ }
+ else
+ {
+ starImgFreezeList[i].SetActive(false);
+ }
+ }
+ freezeStarText.text = Language.Get("HeroAwake16", hero.heroStarMaxBefore);
+ freezeAawkeLVText.text = Language.Get("HeroAwake17", needAwakeLV);
+
+ }
+ else
+ {
+ freezeTipBtn.SetActive(false);
+ }
+
+ freezeTipGo.SetActive(false);
+ }
+
+ void RefreshRedImg()
+ {
+ redpointAwake.SetActive(false);
+ redpointGift.SetActive(false);
+ redpointLVUP.SetActive(false);
+ if (!hero.IsInTeamByTeamType(TeamType.Story))
+ {
+ return;
+ }
+
+
+ var heroCnt = PackManager.Instance.GetItemCountByID(PackType.Hero, hero.heroId);
+ var itemPack = PackManager.Instance.GetSinglePack(PackType.Item);
+
+ //5鏄熷悗鎵嶈兘瑙夐啋
+ if (hero.heroStar >= HeroUIManager.Instance.starLevelCanAwake)
+ {
+ //鍒ゆ柇瑙夐啋鏉愭枡鏄惁瓒冲
+ var maxAwakeLV = HeroAwakeConfig.GetMaxAwakeLV(hero.heroId);
+ if (hero.awakeLevel < maxAwakeLV)
+ {
+ var config = HeroQualityAwakeConfig.GetQualityAwakeConfig(hero.Quality, hero.awakeLevel);
+ if (itemPack.GetCountById(config.UPCostItem[0]) >= config.UPCostItem[1])
+ {
+ redpointAwake.SetActive(true);
+ }
+ }
+ }
+
+ if (heroCnt > 1)
+ {
+ redpointGift.SetActive(true);
+ }
+
+ var maxBreakLV = HeroBreakConfig.GetMaxBreakLv(hero.heroId);
+ if (hero.breakLevel < maxBreakLV)
+ {
+ if (HeroUIManager.Instance.IsLVMaxByBreakLevel(hero))
+ {
+ var breakConfig = HeroQualityBreakConfig.GetQualityBreakConfig(hero.Quality, hero.breakLevel);
+ if (itemPack.GetCountById(breakConfig.UPCostItem[0]) >= breakConfig.UPCostItem[1])
+ {
+ redpointLVUP.SetActive(true);
+ return;
+ }
+ return;
+ }
+ }
+
+ if (!HeroUIManager.Instance.IsLVMax(hero))
+ {
+ var lvupConfig = HeroQualityLVConfig.GetQualityLVConfig(hero.Quality, hero.heroLevel);
+ if (itemPack.GetCountById(lvupConfig.UPCostItem[0]) >= lvupConfig.UPCostItem[1])
+ {
+ redpointLVUP.SetActive(true);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0