From 6277d77214cd861c0a537b47c600240b30e1a4d4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 15 十二月 2025 16:27:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/HeroFightingCardCell.cs | 1 +
Main/System/Settlement/BattleFailWin.cs | 9 +++++++--
Main/System/Settlement/BoneBattleFailWin.cs | 6 ++++++
Main/System/ItemTip/ItemTipUtility.cs | 9 +++++++++
4 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/Main/System/ItemTip/ItemTipUtility.cs b/Main/System/ItemTip/ItemTipUtility.cs
index 45b1aa2..7922bcd 100644
--- a/Main/System/ItemTip/ItemTipUtility.cs
+++ b/Main/System/ItemTip/ItemTipUtility.cs
@@ -249,6 +249,15 @@
return;
}
+
+ if (showGetWay)
+ {
+ //楠岃瘉鏈夋病閰嶇疆鑾峰彇閫斿緞
+ if (ItemConfig.Get(itemId).GetWay.Length == 0)
+ {
+ showGetWay = false;
+ }
+ }
Show(new ItemViewInfo()
{
itemId = itemId,
diff --git a/Main/System/Main/HeroFightingCardCell.cs b/Main/System/Main/HeroFightingCardCell.cs
index 73c1b92..189f7e7 100644
--- a/Main/System/Main/HeroFightingCardCell.cs
+++ b/Main/System/Main/HeroFightingCardCell.cs
@@ -133,6 +133,7 @@
{
HeroUIManager.Instance.OnUnLockHeroCountEvent?.Invoke();
SysNotifyMgr.Instance.ShowTip("HeroCountUnLock5", TeamConst.MaxTeamHeroCount - HeroUIManager.Instance.lockIndexList.Count);
+ NewBieCenter.Instance.StartNewBieGuide(95);
};
unlockEffect.Play();
}
diff --git a/Main/System/Settlement/BattleFailWin.cs b/Main/System/Settlement/BattleFailWin.cs
index a376208..4b04e92 100644
--- a/Main/System/Settlement/BattleFailWin.cs
+++ b/Main/System/Settlement/BattleFailWin.cs
@@ -4,14 +4,19 @@
//鎴樺満缁撶畻鐣岄潰锛屽瓨鍦ㄥ涓殑鎯呭喌
public class BattleFailWin : UIBase
{
-
+ [SerializeField] Button tipHeroCultivateBtn;
[SerializeField] Button tipEquipBtn;
[SerializeField] Button tipHeroPosBtn;
[SerializeField] ButtonEx detailBtn;
string battleName = BattleConst.StoryBossBattleField;
-
+
protected override void InitComponent()
{
+ tipHeroCultivateBtn.AddListener(() =>
+ {
+ CloseWindow();
+ });
+
tipEquipBtn.AddListener(() =>
{
CloseWindow();
diff --git a/Main/System/Settlement/BoneBattleFailWin.cs b/Main/System/Settlement/BoneBattleFailWin.cs
index 48ea591..9f467e4 100644
--- a/Main/System/Settlement/BoneBattleFailWin.cs
+++ b/Main/System/Settlement/BoneBattleFailWin.cs
@@ -5,12 +5,18 @@
public class BoneBattleFailWin : UIBase
{
[SerializeField] TextEx txtFuncName;
+ [SerializeField] Button tipHeroCultivateBtn;
[SerializeField] Button tipEquipBtn;
[SerializeField] Button tipHeroPosBtn;
[SerializeField] ButtonEx detailBtn;
string battleName = BattleConst.BoneBattleField;
protected override void InitComponent()
{
+ tipHeroCultivateBtn.AddListener(() =>
+ {
+ CloseWindow();
+ });
+
tipEquipBtn.AddListener(() =>
{
CloseWindow();
--
Gitblit v1.8.0