Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 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;

@@ -24,6 +25,8 @@
    [SerializeField] Button fightBtn;
    [SerializeField] Image fightIcon;
    [SerializeField] ScrollerController dropItemScroller;
    [SerializeField] Button heroRoadBtn;
    [SerializeField] Button funPresetBtn;


    protected override void InitComponent()
@@ -31,14 +34,22 @@
        CloseBtn.AddListener(CloseWindow);
        rankBtn.AddListener(() =>
        {
            RankModel.Instance.ResetQueryParam();
            RankModel.Instance.QueryRankByPage(0, watchID: (int)PlayerDatas.Instance.baseData.PlayerID);
            var win = UIManager.Instance.OpenWindow<PlayerRankWin>();
            win.rankType = 0;

            UIManager.Instance.OpenWindowAsync<PlayerRankWin>(0).Forget();

        });

        fightBtn.AddListener(FightBoss);

        heroRoadBtn.AddListener(() =>
        {
            UIManager.Instance.OpenWindowAsync<DayMissionBaseWin>(2).Forget();
        });

        funPresetBtn.AddListener(()=>
        {
            FuncPresetManager.Instance.ClickBattlePreset((int)BattlePreSetType.Story);
        });
    }

    protected override void OnPreOpen()
@@ -93,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
            {
@@ -102,7 +113,7 @@
            }
        }

        bossModel.Create(npcConfig.SkinID, npcConfig.ModelScale);
        bossModel.Create(npcConfig.SkinID, npcConfig.ModelScale).Forget();

        fightPowerText.text = UIHelper.ReplaceLargeArtNum(levelConfig.FightPower);

@@ -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();
    }