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

yyl

3 天以前 5c10580a5b352b9a0b417af63f7d88355fcb32a4

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

 Main/Config/ConfigManager.cs

@@ -39,6 +39,7 @@
        // 加载配置文件

        HashSet<Type> configTypes = new HashSet<Type>() {

            typeof(ADAwardConfig),

            typeof(BattleMapConfig),

            typeof(ChestsAwardConfig),

            typeof(CTGConfig),

            typeof(DamageNumConfig),

@@ -224,6 +225,8 @@
    {

        // 清空 ADAwardConfig 字典

        ClearConfigDictionary<ADAwardConfig>();

        // 清空 BattleMapConfig 字典

        ClearConfigDictionary<BattleMapConfig>();

        // 清空 ChestsAwardConfig 字典

        ClearConfigDictionary<ChestsAwardConfig>();

        // 清空 CTGConfig 字典


 Main/Config/Configs/BattleMapConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           YYL
//    [  Date ]:           Friday, October 24, 2025
//    [  Date ]:           2025年10月27日
//--------------------------------------------------------

using System.Collections.Generic;
@@ -19,6 +19,7 @@
    public int MapID;
    public string MapName;
    public string MapBg;
    public int IsBoss;

    public override int LoadKey(string _key)
    {
@@ -35,6 +36,8 @@
            MapName = tables[1];

            MapBg = tables[2];

            int.TryParse(tables[3],out IsBoss); 
        }
        catch (Exception exception)
        {

 Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs

@@ -5,7 +5,8 @@

// B4 24 回合战斗初始化 #tagSCTurnFightInit

public class DTCB424_tagSCTurnFightInit : DtcBasic {
public class DTCB424_tagSCTurnFightInit : DtcBasic
{

    public override void Done(GameNetPackBasic vNetPack)
    {
@@ -36,7 +37,7 @@

        List<TeamBase> redTeamList = new List<TeamBase>();
        List<TeamBase> blueTeamList = new List<TeamBase>();

        bool isBoss = BattleMapConfig.HasKey((int)vNetData.MapID) && BattleMapConfig.Get((int)vNetData.MapID).IsBoss == 1;
        if (null != vNetData.FactionList)
        {
            foreach (var vFaction in vNetData.FactionList)
@@ -45,14 +46,14 @@
                {
                    foreach (var lineUp in vFaction.LineupList)
                    {
                        redTeamList.Add(new TeamBase(lineUp));
                        redTeamList.Add(new TeamBase(lineUp, isBoss));
                    }
                }
                else if (vFaction.Faction == 2)
                {
                    foreach (var lineUp in vFaction.LineupList)
                    {
                        blueTeamList.Add(new TeamBase(lineUp));
                        blueTeamList.Add(new TeamBase(lineUp, isBoss));
                    }
                }
            }

 Main/System/Battle/BattleField/BattleField.cs

@@ -433,7 +433,8 @@
        {
            obj.layerMgr.UpdateLayer();
        }

        
        battleRootNode.SetSortingOrder();
        // RendererAdjuster[] adjusters = battleRootNode.GetComponentsInChildren<RendererAdjuster>(true);
        // if (null != adjusters)
        // {

 Main/System/Battle/BattleField/RecordActions/BattleStartAction.cs

@@ -27,6 +27,7 @@
        //    隐藏部分UI
        EventBroadcast.Instance.Broadcast(EventName.DISPLAY_BATTLE_UI, battleField.guid, false);

        // battleField.battleRootNode.SetSortingOrder();
        battleField.StartBattle(() =>
        {
            if (1 == battleField.MapID)
@@ -36,7 +37,6 @@
                return;
            }

            battleField.battleRootNode.SetSortingOrder();
            battleField.battleRootNode.battleStartNode.SetActive(true);

            UniTaskExtension.DelayTime((GameObject)null, 1f, () =>

 Main/System/Battle/Skill/SkillBase.cs

@@ -344,7 +344,7 @@
        }

        battleField.battleRootNode.skillMaskNode.SetActive(true);
        battleField.battleRootNode.SetSortingOrder();
        // battleField.battleRootNode.SetSortingOrder();
    }

    // 命中目标回调：处理所有被命中的目标

 Main/System/ChallengeTab/ChallengeTabWin.cs

@@ -27,7 +27,7 @@
        AdsManager.Instance.OnAdsInfoListUpdateEvent -= OnAdsInfoListUpdateEvent;
        TimeMgr.Instance.OnDayEvent -= OnDayEvent;
        FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
        UIManager.Instance.GetUI<MainWin>()?.RestoreFuncBtn();
    }
    private void OnDayEvent()

 Main/System/Team/TeamBase.cs

@@ -40,8 +40,13 @@
    }

    //  这边来的可以没有队伍类型
    public TeamBase(HB424_tagSCTurnFightInit.tagSCTurnFightLineup lineUp)
    public TeamBase(HB424_tagSCTurnFightInit.tagSCTurnFightLineup lineUp, bool isBoss = false)
    {
        if (isBoss)
        {
            tempHeroes = new TeamHero[TeamConst.MaxTeamSlotCount];
            serverHeroes = new TeamHero[TeamConst.MaxTeamSlotCount];
        }
        teamIndex = lineUp.Num;
        playerId = lineUp.OwnerID;
        ShapeType = lineUp.ShapeType;