143 演武场-客户端 修改挑战界面,演武场布阵的显隐,达到条件才能切出非主线任务

lcy

2025-10-21 9e40cf7d1390e13bc90acf23c30eb002744fd6d4

143 演武场-客户端 修改挑战界面,演武场布阵的显隐,达到条件才能切出非主线任务

 Main/System/Arena/ArenaManager.cs

@@ -7,6 +7,7 @@
{
    public readonly int rankType = 1;    // 榜单类型
    public readonly int funcId = 27;    // 功能Id
    public readonly int DeployTroopsFuncId = 32;    // 布阵功能ID
    public readonly int recType = 308;  // 演武场玩家挑战记录类型 308
    public readonly int ChallengeMoneyType = 53;
    public readonly int NeedChallengeMoneyCnt = 1;

 Main/System/Arena/ArenaWin.cs

@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using UnityEngine;

public class ArenaWin : UIBase
{
    [SerializeField] ButtonEx btnClose;
    [SerializeField] ButtonEx btnRecord;
    [SerializeField] ButtonEx btnAward;
    [SerializeField] ButtonEx btnChallage;
@@ -20,7 +20,6 @@
    protected override void InitComponent()
    {
        base.InitComponent();
        btnClose.SetListener(() => UIManager.Instance.CloseWindow<ArenaWin>());
        btnAward.SetListener(() => UIManager.Instance.OpenWindow<ArenaAwardWin>());
        btnRecord.SetListener(() =>
        {
@@ -55,6 +54,7 @@
        ArenaManager.Instance.OnUpdateArenaPlayerInfo += OnUpdateArenaPlayerInfo;
        ArenaManager.Instance.OnUpdateGameRecInfo += OnUpdateGameRecInfo;
        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
        FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange;
        Display();
    }

@@ -67,7 +67,23 @@
        ArenaManager.Instance.OnUpdateArenaPlayerInfo -= OnUpdateArenaPlayerInfo;
        ArenaManager.Instance.OnUpdateGameRecInfo -= OnUpdateGameRecInfo;
        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
        FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;
    }

    private void OnFuncStateChange(int obj)
    {
        if (obj == ArenaManager.Instance.DeployTroopsFuncId)
        {
            DisplayDeployTroop();
        }
    }

    void DisplayDeployTroop()
    {
        bool isOpen = FuncOpen.Instance.IsFuncOpen(ArenaManager.Instance.DeployTroopsFuncId);
        btnDeployTroops.SetActive(isOpen);
    }


    private void PlayerDataRefresh(PlayerDataType type)
    {
@@ -104,6 +120,7 @@
        CreateScroller();
        DisplayMyRank();
        DisplayTop3();
        DisplayDeployTroop();
    }

    void CreateScroller()

 Main/System/Battle/ArenaBattleWin.cs

@@ -76,7 +76,7 @@
        BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
        EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
        EventBroadcast.Instance.AddListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
        //UIManager.Instance.CloseWindow<MainWin>();
        UIManager.Instance.CloseWindow<BattleWin>();
    }

    protected override void OnPreClose()
@@ -87,12 +87,12 @@
        BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
        EventBroadcast.Instance.RemoveListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
        EventBroadcast.Instance.RemoveListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
        //UIManager.Instance.OpenWindow<MainWin>(0);
        UIManager.Instance.OpenWindow<BattleWin>();
    }

    private void OnTabChangeEvent()
    {
        UIManager.Instance.CloseWindow<ArenaBattleWin>(true);
        UIManager.Instance.CloseWindow<ArenaBattleWin>();
    }

    private void OnBattleEnd(string guid, JsonData endData)
@@ -299,4 +299,18 @@
            return;
        txtWaveInfo.text = Language.Get("BoneField09", battleField.round, battleField.turnMax);
    }

    public void DisplayBattleWin()
    {
        if (!UIManager.Instance.IsOpened<BattleWin>())
        {
            BattleWin battleWin = UIManager.Instance.OpenWindow<BattleWin>();
            battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
        }
        else
        {
            BattleWin battleWin = UIManager.Instance.GetUI<BattleWin>();
            battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
        }
    }
}

 Main/System/ChallengeTab/ChallengeTabWin.cs

@@ -93,12 +93,16 @@
            BattleField arenaBattle = BattleManager.Instance.GetBattleFieldByMapID(3);
            if (arenaBattle != null)
            {
                ArenaBattleWin fsBattleWin = UIManager.Instance.GetUI<ArenaBattleWin>();
                if (null == fsBattleWin)
                ArenaBattleWin battleWin;
                if (!UIManager.Instance.IsOpened<ArenaBattleWin>())
                {
                    fsBattleWin = UIManager.Instance.OpenWindow<ArenaBattleWin>();
                    battleWin = UIManager.Instance.OpenWindow<ArenaBattleWin>();
                }
                fsBattleWin.SetBattleField(arenaBattle);
                else
                {
                    battleWin = UIManager.Instance.GetUI<ArenaBattleWin>();
                }
                battleWin.SetBattleField(arenaBattle);
            }
            else
            {

 Main/System/Main/MainWin.cs

@@ -123,13 +123,6 @@

    protected override void SelectBottomTab(int index)
    {
        bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
        if (isOtherBattleInProgress)
        {
            // 如果正在非主线战斗中，没满足解锁条件则不允许切换
        }
        DisplayTopBar(index);

        if (index == 3)
        {
            //挑战特殊显示逻辑
@@ -137,7 +130,7 @@
            return;
        }


        TabChangeEvent?.Invoke();

        // 如果点击当前已选中的标签，不做处理
        if (functionOrder == index && currentSubUI != null)
@@ -155,7 +148,6 @@
        // 根据选中的标签打开对应的界面
        OpenSubUIByTabIndex();

        TabChangeEvent?.Invoke();
    }

    //战斗按钮动画
@@ -237,6 +229,16 @@
    protected override void OnTabButtonClicked(int index)
    {
        this.index = index;
        int funcId = 32;
        bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
        // 如果正在非主线战斗中，没满足解锁条件则不允许切换
        if (isOtherBattleInProgress && !FuncOpen.Instance.IsFuncOpen(funcId))
        {
            string tip = FuncOpen.Instance.GetErrorTip(funcId);
            SysNotifyMgr.Instance.ShowTip("SwitchOutOfBattle", tip);
            tabButtons[functionOrder].SelectBtn();
            return;
        }


        if (index == 0)
@@ -253,6 +255,8 @@
            UIManager.Instance.OpenWindow<GuildJoinWin>();
            return;
        }

        DisplayTopBar(index);
        SelectBottomTab(index);
    }