From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/MainLevel/MainBossEnterWin.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Main/System/MainLevel/MainBossEnterWin.cs b/Main/System/MainLevel/MainBossEnterWin.cs
index 627c9b2..a124715 100644
--- a/Main/System/MainLevel/MainBossEnterWin.cs
+++ b/Main/System/MainLevel/MainBossEnterWin.cs
@@ -6,6 +6,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.UI;
@@ -25,6 +26,7 @@
[SerializeField] Image fightIcon;
[SerializeField] ScrollerController dropItemScroller;
[SerializeField] Button heroRoadBtn;
+ [SerializeField] Button funPresetBtn;
protected override void InitComponent()
@@ -32,9 +34,8 @@
CloseBtn.AddListener(CloseWindow);
rankBtn.AddListener(() =>
{
- RankModel.Instance.ResetQueryParam();
- RankModel.Instance.QueryRankByPage(0, watchID: (int)PlayerDatas.Instance.baseData.PlayerID);
- UIManager.Instance.OpenWindow<PlayerRankWin>(0);
+
+ UIManager.Instance.OpenWindowAsync<PlayerRankWin>(0).Forget();
});
@@ -42,7 +43,12 @@
heroRoadBtn.AddListener(() =>
{
- UIManager.Instance.OpenWindow<DayMissionBaseWin>(2);
+ UIManager.Instance.OpenWindowAsync<DayMissionBaseWin>(2).Forget();
+ });
+
+ funPresetBtn.AddListener(()=>
+ {
+ FuncPresetManager.Instance.ClickBattlePreset((int)BattlePreSetType.Story);
});
}
@@ -98,8 +104,8 @@
SmallTipWin.showText = Language.Get("SmallTipFomat",SkillConfig.Get(skillID)?.SkillName, SkillConfig.Get(skillID)?.Description) ;
SmallTipWin.worldPos = CameraManager.uiCamera.ScreenToWorldPoint(Input.mousePosition);
SmallTipWin.isDownShow = true;
- UIManager.Instance.OpenWindow<SmallTipWin>();
- });
+ UIManager.Instance.OpenWindowAsync<SmallTipWin>().Forget();
+ }).Forget();
}
else
{
@@ -107,7 +113,7 @@
}
}
- bossModel.Create(npcConfig.SkinID, npcConfig.ModelScale);
+ bossModel.Create(npcConfig.SkinID, npcConfig.ModelScale).Forget();
fightPowerText.text = UIHelper.ReplaceLargeArtNum(levelConfig.FightPower);
@@ -136,6 +142,8 @@
bossBG.SetOrgSprite(chapterConfig.BG, "MainLevel");
heroRoadBtn.SetActive(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.DayMission));
+
+ funPresetBtn.SetActive(FuncPresetManager.Instance.IsPreShow());
}
--
Gitblit v1.8.0