From 5c10580a5b352b9a0b417af63f7d88355fcb32a4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 27 十月 2025 18:37:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Battle/BattleField/BattleField.cs | 3 ++-
Main/Config/ConfigManager.cs | 3 +++
Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs | 9 +++++----
Main/System/Battle/BattleField/RecordActions/BattleStartAction.cs | 2 +-
Main/System/Battle/Skill/SkillBase.cs | 2 +-
Main/System/ChallengeTab/ChallengeTabWin.cs | 2 +-
Main/System/Team/TeamBase.cs | 7 ++++++-
Main/Config/Configs/BattleMapConfig.cs | 5 ++++-
8 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/Main/Config/ConfigManager.cs b/Main/Config/ConfigManager.cs
index 32e5261..bfc605f 100644
--- a/Main/Config/ConfigManager.cs
+++ b/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 瀛楀吀
diff --git a/Main/Config/Configs/BattleMapConfig.cs b/Main/Config/Configs/BattleMapConfig.cs
index eda3756..8703adf 100644
--- a/Main/Config/Configs/BattleMapConfig.cs
+++ b/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)
{
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs
index 3db6693..78c52cc 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs
+++ b/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));
}
}
}
diff --git a/Main/System/Battle/BattleField/BattleField.cs b/Main/System/Battle/BattleField/BattleField.cs
index b6c1989..129ec74 100644
--- a/Main/System/Battle/BattleField/BattleField.cs
+++ b/Main/System/Battle/BattleField/BattleField.cs
@@ -433,7 +433,8 @@
{
obj.layerMgr.UpdateLayer();
}
-
+
+ battleRootNode.SetSortingOrder();
// RendererAdjuster[] adjusters = battleRootNode.GetComponentsInChildren<RendererAdjuster>(true);
// if (null != adjusters)
// {
diff --git a/Main/System/Battle/BattleField/RecordActions/BattleStartAction.cs b/Main/System/Battle/BattleField/RecordActions/BattleStartAction.cs
index 833f506..44f26c2 100644
--- a/Main/System/Battle/BattleField/RecordActions/BattleStartAction.cs
+++ b/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, () =>
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index a42d02f..2cb5134 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -344,7 +344,7 @@
}
battleField.battleRootNode.skillMaskNode.SetActive(true);
- battleField.battleRootNode.SetSortingOrder();
+ // battleField.battleRootNode.SetSortingOrder();
}
// 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍�
diff --git a/Main/System/ChallengeTab/ChallengeTabWin.cs b/Main/System/ChallengeTab/ChallengeTabWin.cs
index 278206f..0fc7804 100644
--- a/Main/System/ChallengeTab/ChallengeTabWin.cs
+++ b/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()
diff --git a/Main/System/Team/TeamBase.cs b/Main/System/Team/TeamBase.cs
index 522db83..13f0f91 100644
--- a/Main/System/Team/TeamBase.cs
+++ b/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;
--
Gitblit v1.8.0