From 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 16:10:43 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/MainLevel/MainBossEnterWin.cs | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/Main/System/MainLevel/MainBossEnterWin.cs b/Main/System/MainLevel/MainBossEnterWin.cs
index 9c23ddf..634ef81 100644
--- a/Main/System/MainLevel/MainBossEnterWin.cs
+++ b/Main/System/MainLevel/MainBossEnterWin.cs
@@ -24,6 +24,8 @@
[SerializeField] Button fightBtn;
[SerializeField] Image fightIcon;
[SerializeField] ScrollerController dropItemScroller;
+ [SerializeField] Button heroRoadBtn;
+ [SerializeField] Button funPresetBtn;
protected override void InitComponent()
@@ -33,12 +35,21 @@
{
RankModel.Instance.ResetQueryParam();
RankModel.Instance.QueryRankByPage(0, watchID: (int)PlayerDatas.Instance.baseData.PlayerID);
- var win = UIManager.Instance.OpenWindow<PlayerRankWin>();
- win.rankType = 0;
+ UIManager.Instance.OpenWindow<PlayerRankWin>(0);
});
fightBtn.AddListener(FightBoss);
+
+ heroRoadBtn.AddListener(() =>
+ {
+ UIManager.Instance.OpenWindow<DayMissionBaseWin>(2);
+ });
+
+ funPresetBtn.AddListener(()=>
+ {
+ FuncPresetManager.Instance.ClickBattlePreset((int)BattlePreSetType.Story);
+ });
}
protected override void OnPreOpen()
@@ -129,6 +140,10 @@
}
}
bossBG.SetOrgSprite(chapterConfig.BG, "MainLevel");
+
+ heroRoadBtn.SetActive(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.DayMission));
+
+ funPresetBtn.SetActive(FuncPresetManager.Instance.IsPreShow());
}
@@ -136,11 +151,10 @@
{
if (MainLevelManager.Instance.CanChallengeBoss())
{
- var pack = new CB410_tagCMTurnFight();
- pack.MapID = 2;
- GameNetSystem.Instance.SendInfo(pack);
-
+ BattleManager.Instance.SendTurnFight(2);
+ BattleManager.Instance.storyBattleField.CleanBattle();
AutoFightModel.Instance.isPause = true;
+ // AutoFightModel.Instance.isAutoAttack = false;
}
CloseWindow();
}
--
Gitblit v1.8.0