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

yyl

2025-10-21 4145075707a34f925235d74306788b186328eac3

 Main/System/Battle/ArenaBattleWin.cs

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using LitJson;
using UnityEngine;
using UnityEngine.UI;
@@ -71,6 +72,7 @@
    {
        base.OnPreOpen();
        // SetBattleField(BattleManager.Instance.storyBattleField);
        MainWin.TabChangeEvent += OnTabChangeEvent;
        BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
        EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
        EventBroadcast.Instance.AddListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
@@ -81,11 +83,18 @@
    {
        base.OnPreClose();
        UIManager.Instance.CloseWindow<BattleHUDWin>();
        MainWin.TabChangeEvent -= OnTabChangeEvent;
        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);
    }

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

    private void OnBattleEnd(string guid, JsonData endData)
    {
        if (battleField != null && guid == battleField.guid)