From 9e91c51e4ece0002b58e22e27ec57fd8d23176a9 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 29 八月 2025 15:24:42 +0800
Subject: [PATCH] 125 【战斗】战斗系统 协议更新

---
 Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs |   62 +-----------------------------
 Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB424_tagSCTurnFightInit.cs           |    6 +-
 Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB428_tagSCBuffRefresh.cs   |    9 ----
 Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB428_tagSCBuffRefresh.cs             |    2 +
 4 files changed, 9 insertions(+), 70 deletions(-)

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 fabaec0..79d6535 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs
@@ -1,67 +1,11 @@
 using UnityEngine;
 using System.Collections;
-using LitJson;
-using System.Collections.Generic;
 
 // B4 24 鍥炲悎鎴樻枟鍒濆鍖� #tagSCTurnFightInit
 
 public class DTCB424_tagSCTurnFightInit : DtcBasic {
-	public override void Done(GameNetPackBasic vNetPack)
-	{
-		base.Done(vNetPack);
-		HB424_tagSCTurnFightInit vNetData = vNetPack as HB424_tagSCTurnFightInit;
-
-		// 銆愭垬鏂楀湴鍥惧畾涔夈��
-		// 鍓嶅悗绔崗璁�氳鏃讹紝濡傛灉鏈塎apID銆丗uncLineID淇℃伅锛屼竴鑸唬琛ㄧ殑鏄煇涓垬鏂楀姛鑳斤紝
-		// 骞跺彲缁戝畾鏌愪釜鎴樻枟鍦烘櫙锛堢浉褰撲簬MMO涓殑涓嶅悓鍔熻兘鍙婃垬鏂楀満鏅湴鍥撅級
-		// 鍗$墝涓篃鍙悊瑙d负涓嶅悓鐨勬垬鏂楀姛鑳藉強缁戝畾涓嶅悓鐨勬垬鏂楄儗鏅浘涔嬬被
-		// 鐩墠鍑犱釜鍥哄畾MapID瀹氫箟
-		// 涓荤嚎灏忔�垬鏂� MapID = 1
-		// FuncLineID = 绔犺妭*10000+鍏冲崱缂栧彿*100+绗瑇娉紝濡傜涓�绔狅紝绗�10鍏冲崱锛岀5娉㈡椂鍊� = 11005锛�
-		// 鍗曠珷鏈�澶ф敮鎸�99灏忓叧锛屽崟鍏虫渶澶ф敮鎸�99娉㈡��
-		// 涓荤嚎boss鎴樻枟 MapID = 2
-		// FuncLineID = 绔犺妭*10000+鍏冲崱缂栧彿*100+绗瑇娉紝濡傜涓�绔狅紝绗�10鍏冲崱鐨刡oss鍊� = 11001锛�
-		// 娉細鍏冲崱boss娉㈡暟鍥哄畾涓哄彧鏈�1娉�
-		// 鍓嶇鍙�氳繃MapID鍙婂搴旂殑FuncLineID鍔犺浇涓嶅悓鐨勬垬鏂楀満鏅儗鏅�佽儗鏅煶涔愮瓑
-
-		// HB424_tagSCTurnFightInit
-		// MapID;    // 鑷畾涔夊湴鍥綢D锛屽彲鐢ㄤ簬缁戝畾鎴樻枟鍦板浘鍦烘櫙鍔熻兘锛堝涓荤嚎鍏冲崱銆佷富绾縝oss銆佺埇濉斻�佺珵鎶�鍦虹瓑锛�
-		// FuncLineID;    // MapID瀵瑰簲鐨勬墿灞曞�硷紝濡傚叿浣撴煇涓叧鍗$瓑
-		// TurnMax;    // 鏈�澶ц疆娆�
-		// Len;
-		// Msg;    // 鏈満鎴樻枟鎵╁睍淇℃伅锛屼竴鑸负json鏍煎紡锛屽叿浣撳唴瀹圭敱MapID鍐冲畾
-		// FactionCnt;
-		// FactionList;    // 闃佃惀鍒楄〃锛岄�氬父鍥哄畾鍙湁涓や釜闃佃惀
-
-		List<TeamBase> redTeamList = new List<TeamBase>();
-		List<TeamBase> blueTeamList = new List<TeamBase>();
-
-		if (null != vNetData.FactionList)
-		{
-			foreach (var vFaction in vNetData.FactionList)
-			{
-				if (vFaction.Faction == 1)
-				{
-					foreach (var lineUp in vFaction.LineupList)
-					{
-						redTeamList.Add(new TeamBase(lineUp));
-					}
-				}
-				else if (vFaction.Faction == 2)
-				{
-					foreach (var lineUp in vFaction.LineupList)
-					{
-						blueTeamList.Add(new TeamBase(lineUp));
-					}
-				}
-			}
-		}
-
-		JsonData extendData = JsonMapper.ToObject(vNetData.Msg);
-
-		string guid = BattleManager.Instance.GetGUID(vNetPack.packUID);
-		BattleField battleField = BattleManager.Instance.CreateBattleField(guid, (int)vNetData.MapID, (int)vNetData.FuncLineID, extendData, redTeamList, blueTeamList);
-		BattleStartAction battleStartAction = new BattleStartAction(battleField);
-		battleField.recordPlayer.PlayRecord(battleStartAction);
+    public override void Done(GameNetPackBasic vNetPack) {
+        base.Done(vNetPack);
+        HB424_tagSCTurnFightInit vNetData = vNetPack as HB424_tagSCTurnFightInit;
     }
 }
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB428_tagSCBuffRefresh.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB428_tagSCBuffRefresh.cs
index e213b0a..fb6ab65 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB428_tagSCBuffRefresh.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB428_tagSCBuffRefresh.cs
@@ -4,15 +4,8 @@
 // B4 28 Buff鍒锋柊 #tagSCBuffRefresh
 
 public class DTCB428_tagSCBuffRefresh : DtcBasic {
-    public override void Done(GameNetPackBasic vNetPack)
-    {
+    public override void Done(GameNetPackBasic vNetPack) {
         base.Done(vNetPack);
         HB428_tagSCBuffRefresh vNetData = vNetPack as HB428_tagSCBuffRefresh;
-        BattleField battleField = BattleManager.Instance.GetBattleField(vNetData.packUID);
-
-        if (null != battleField)
-        {
-            battleField.OnRefreshBuff(vNetData);
-        }
     }
 }
diff --git a/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB424_tagSCTurnFightInit.cs b/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB424_tagSCTurnFightInit.cs
index 7df7ae1..5a3f731 100644
--- a/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB424_tagSCTurnFightInit.cs
+++ b/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB424_tagSCTurnFightInit.cs
@@ -63,13 +63,13 @@
     public class tagSCTurnFightObj {
         public uint ObjID;        // 鎴樻枟鍗曚綅鍞竴ID
         public uint NPCID;        // 鎴樻枟NPCID锛屼笉鍚岀殑瀹炰緥ID瀵瑰簲鐨凬PCID鍙兘涓�鏍�
-        public uint HeroID;        // 鐜╁姝﹀皢ID锛屼粎鐜╁闃靛鏈�
-        public uint SkinID;        // 鐜╁姝﹀皢鐨偆ID锛屼粎鐜╁闃靛鏈�
+        public uint HeroID;        // 姝﹀皢ID锛岀帺瀹舵垨NPC鍧囧彲鑳芥湁锛屽鏋滄湁鍊煎垯澶栬鐩稿叧浠ヨ姝﹀皢涓哄噯锛屽惁鍒欎互NPCID涓哄噯
+        public uint SkinID;        // 姝﹀皢鐨偆ID锛岀帺瀹舵垨NPC鍧囧彲鑳芥湁锛屽鏋滄湁鍊煎垯鐨偆浠ヨ鍊间负鍑嗭紝鍚﹀垯鍙朜PCID瀵瑰簲鐨勭毊鑲D
         public uint HP;        // 褰撳墠琛�閲忥紝姹備綑20浜块儴鍒�
         public uint HPEx;        // 褰撳墠琛�閲忥紝鏁撮櫎20浜块儴鍒�
         public uint MaxHP;        // 鏈�澶ц閲忥紝姹備綑20浜块儴鍒�
         public uint MaxHPEx;        // 鏈�澶ц閲忥紝鏁撮櫎20浜块儴鍒�
-        public ushort LV;        // 绛夌骇
+        public ushort LV;        // 绛夌骇锛岀帺瀹剁殑姝﹀皢绛夌骇鎴朜PC鎴愰暱绛夌骇锛岀瓑绾ф樉绀轰互璇ュ�间负鍑�
         public byte PosNum;        // 鍦ㄦ湰闃靛涓殑绔欎綅锛屼粠1寮�濮嬶紝闈炰富鎴樻枟姝﹀皢涓�0锛屽绾㈤
         public ushort AngreXP;        // 褰撳墠鎬掓皵鍊�
     }
diff --git a/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB428_tagSCBuffRefresh.cs b/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB428_tagSCBuffRefresh.cs
index 411508b..d429114 100644
--- a/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB428_tagSCBuffRefresh.cs
+++ b/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB428_tagSCBuffRefresh.cs
@@ -14,6 +14,7 @@
     public uint Value1;
     public uint Value2;
     public uint Value3;
+    public byte IsAdd;    // 鏄惁鏄坊鍔�/瑕嗙洊鐨勶紝1-鏄紱0-鍚︿竴鑸负buff鐨勬暟鎹埛鏂�
 
     public HB428_tagSCBuffRefresh () {
         _cmd = (ushort)0xB428;
@@ -30,6 +31,7 @@
         TransBytes (out Value1, vBytes, NetDataType.DWORD);
         TransBytes (out Value2, vBytes, NetDataType.DWORD);
         TransBytes (out Value3, vBytes, NetDataType.DWORD);
+        TransBytes (out IsAdd, vBytes, NetDataType.BYTE);
     }
 
 }

--
Gitblit v1.8.0