Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

7 天以前 b1f98c42a6b859b35c26e0722efb38a6e9c215be

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

 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/Battle/BattleConst.cs

@@ -9,6 +9,15 @@
        typeof(BattleWin),
        typeof(StoryBossBattleWin),
        typeof(ArenaBattleWin),
        typeof(BoneFieldBattleWin),
    };

    public static Dictionary<string, string> battleNameToWinName = new Dictionary<string, string>()
    {
        { "StoryBattleField", "BattleWin" },
        { "StoryBossBattleField", "StoryBossBattleWin" },
        { "ArenaBattleField", "ArenaBattleWin" },
        { "BoneBattleField", "BoneFieldBattleWin" },
    };

    public const int BattleStartEffectID = 1001; // Example effect ID for battle start

 Main/System/Battle/BattleField/BattleRootNode.cs

@@ -56,6 +56,7 @@
        if (imgBackground != null)
        {
            imgBackground.texture = texture;
            imgBackground.raycastTarget = false;
            // imgBackground.SetNativeSize();
        }
    }

 Main/System/Battle/BattleManager.cs

@@ -30,7 +30,7 @@

    public Action<string, BattleField> onBattleFieldCreate;

    public Action<string, BattleField> onBattleFieldDestroy;
    public Action onBattleFieldDestroy;

    public bool isWaitServerStory = false;  //主线等服务端回报 0425

@@ -532,7 +532,7 @@

        GameObject.DestroyImmediate(battleField.battleRootNode.gameObject);

        onBattleFieldDestroy?.Invoke(battleField.guid, battleField);
        onBattleFieldDestroy?.Invoke();

    }

@@ -605,4 +605,21 @@
        }
        return false;
    }

    // 获取当前正在显示的战斗场景名称，如果没有则返回空字符串
    public string GetActiveBattleName()
    {
        foreach (var kvp in battleFields)
        {
            BattleField battleField = kvp.Value;
            if (battleField == null)
                continue;

            var battleName = battleField.ToString();
            if (BattleConst.battleNameToWinName.ContainsKey(battleName)
            && UIManager.Instance.IsOpened(BattleConst.battleNameToWinName[battleName]))
                return battleName;
        }
        return "";
    }
}

 Main/System/Battle/BattleWin.cs

@@ -6,6 +6,7 @@
{
    // 组件引用
    public Transform mountPoint;
    [SerializeField] Button fightBtn;

    private BattleRootNode battleRootNode = null;

@@ -22,6 +23,11 @@
        // 初始化组件引用 绑定按钮等UI组件事件

        btnStop.AddListener(PauseGame);

        fightBtn.AddListener(()=>
        {
            UIManager.Instance.GetUI<MainWin>()?.ClickFunc(0);
        });
    }

    private void PauseGame()

 Main/System/ChallengeTab/ChallengeTabWin.cs

@@ -5,7 +5,7 @@
{
    [SerializeField] ChallengeTabButton btnBoneField;
    [SerializeField] ChallengeTabButton btnArena;
    public static Action OnCloseChallengeTabWin;
    
    protected override void InitComponent()
    {
        base.InitComponent();
@@ -28,7 +28,7 @@
        TimeMgr.Instance.OnDayEvent -= OnDayEvent;
        FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
        OnCloseChallengeTabWin?.Invoke();
        UIManager.Instance.GetUI<MainWin>()?.RestoreFuncBtn();
    }
    private void OnDayEvent()
    {
@@ -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

@@ -27,7 +27,6 @@
    [SerializeField] UIEffectPlayer fightEffect;
    [SerializeField] UIEffectPlayer openCloseAnim;
    [SerializeField] FillTween cdTween;
    int index = 0;

    public bool isFirstOpen = true; //首次打开
    public Text hammerText;
@@ -45,14 +44,13 @@
        UpdateCurrency();
        UpdatePlayerInfo();
        RefreshFightBtn();
        DisplayTopBar(index);
        DisplayTopBar();
    }

    protected override void OnPreOpen()
    {
        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
        AutoFightModel.Instance.OnFightEvent += OnSkillCast;
        ChallengeTabWin.OnCloseChallengeTabWin += OnCloseChallengeTabWin;
        BattleManager.Instance.onBattleFieldCreate += OnBattleFieldCreate;
        BattleManager.Instance.onBattleFieldDestroy += OnBattleFieldDestroy;
        base.OnPreOpen();
@@ -65,7 +63,6 @@
    {
        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
        AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
        ChallengeTabWin.OnCloseChallengeTabWin -= OnCloseChallengeTabWin;
        BattleManager.Instance.onBattleFieldCreate -= OnBattleFieldCreate;
        BattleManager.Instance.onBattleFieldDestroy -= OnBattleFieldDestroy;
        base.OnPreClose();
@@ -76,16 +73,11 @@
        Refresh();
    }

    private void OnBattleFieldDestroy(string guid, BattleField battleField)
    private void OnBattleFieldDestroy()
    {
        Refresh();
    }

    private void OnCloseChallengeTabWin()
    {
        tabButtons[3].state = TitleBtnState.Normal;
        tabButtons[3].UpdateButtonState();
    }

    //外部调用点击功能
    public void ClickFunc(int functionOrder)
@@ -99,37 +91,13 @@
        tabButtons[functionOrder].SelectBtn();
    }

    public void DisplayTopBar(int index)
    public void DisplayTopBar()
    {
        bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
        switch (index)
        {
            case 0:
            case 2:
                topBar.SetActive(true);
                break;
            case 1:
            case 4:
                topBar.SetActive(false);
                break;
            case 3:
                topBar.SetActive(!isOtherBattleInProgress);
                break;
            default:
                topBar.SetActive(true);
                break;
        }
        topBar.SetActive(functionOrder == 0 || functionOrder == 2);
    }

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

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



        TabChangeEvent?.Invoke();
        
        // 如果点击当前已选中的标签，不做处理
        if (functionOrder == index && currentSubUI != null)
        {
@@ -149,13 +117,14 @@
        // 更新当前选中的标签索引
        functionOrder = index;

        DisplayTopBar();

        // 关闭当前打开的子界面
        CloseCurrentSubUI();

        // 根据选中的标签打开对应的界面
        OpenSubUIByTabIndex();

        TabChangeEvent?.Invoke();
    }

    //战斗按钮动画
@@ -236,7 +205,15 @@
    /// </summary>
    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);
            return;
        }


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

        
        SelectBottomTab(index);
    }


 Main/System/Place.meta

File was deleted

 Main/System/Place/PlaceWin.cs

File was deleted

 Main/System/Place/PlaceWin.cs.meta

File was deleted