From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/HappyXB/HeroCallResultWin.cs | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/Main/System/HappyXB/HeroCallResultWin.cs b/Main/System/HappyXB/HeroCallResultWin.cs
index 5830d55..e9a7be4 100644
--- a/Main/System/HappyXB/HeroCallResultWin.cs
+++ b/Main/System/HappyXB/HeroCallResultWin.cs
@@ -123,6 +123,7 @@
resultState = HeroUIManager.Instance.selectCallIndex == 0 ? ResultState.single : ResultState.ten;
RefreshState();
+ CheckWishFinishOnSkip();
}
else
{
@@ -338,7 +339,11 @@
roleLHModelTween2.SetStartState();
roleLHModelTween2.Play();
- bgTexture.SetTexture2D("countryBG" + hero.Country);
+ bgTexture.SetTexture2D(HeroUIManager.Instance.GetBGName(hero.SkinIDList[0], hero.Country));
+ if (IsWishHero(heroID))
+ {
+ UIManager.Instance.OpenWindow<HeroCallXYFinishWin>();
+ }
}
void RefreshHeroInfo(int heroID)
@@ -365,4 +370,45 @@
}
callTip.text = Language.Get("HeroCall6", needCount, string.Join(Language.Get("L1130"), qualityStrList.ToArray()));
}
+
+ /// <summary>
+ /// 璺宠繃鍔ㄧ敾鏃讹紝妫�鏌ユ槸鍚︽娊鍒颁簡蹇冩効姝﹀皢
+ /// </summary>
+ void CheckWishFinishOnSkip()
+ {
+ // 鍙湁楂樼骇鎷涘嫙鎵嶆湁蹇冩効
+ if (HeroUIManager.Instance.selectCallType != HappXBTitle.HeroCallAdvanced) return;
+
+ for (int i = 0; i < HappyXBModel.Instance.xbResultDict.Count; i++)
+ {
+ int heroID = HappyXBModel.Instance.xbResultDict[i].itemId;
+ if (IsWishHero(heroID))
+ {
+ // 鎶藉埌浜嗗績鎰挎灏嗭紝鎵撳紑瀹屾垚鐗规晥鐣岄潰
+ UIManager.Instance.OpenWindow<HeroCallXYFinishWin>();
+ break;
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鎸囧畾鐨勮嫳闆処D鏄惁涓哄綋鍓嶉�変腑鐨勫績鎰挎灏�
+ /// </summary>
+ bool IsWishHero(int heroID)
+ {
+ if (HeroUIManager.Instance.selectCallType != HappXBTitle.HeroCallAdvanced) return false;
+
+ var hero = HeroConfig.Get(heroID);
+ if (hero == null) return false;
+
+ if (HappyXBModel.Instance.TryGetHeroWishIDByQuality((int)HappXBTitle.HeroCallAdvanced, hero.Quality, out int wishID, out _, out _))
+ {
+ var libCfg = TreasureItemLibConfig.Get(wishID);
+ if (libCfg != null && libCfg.ItemID == heroID)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0