From 330c5a30027fd33e2f77643f4c3c2f77b4d91a0f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 10 五月 2024 16:42:13 +0800
Subject: [PATCH] 10019 【砍树】回合战斗(回合战斗NPC相关属性统一调整到NPC扩展表;去除副本回合制表,新增冒险关卡表;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 78040d1..fed3780 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -48463,7 +48463,8 @@
     Head = tagHead()
     MapID = 0    #(DWORD MapID)// 自定义地图ID,可用于绑定战斗场景功能(如野外关卡,爬塔功能,竞技场等)
     FuncLineID = 0    #(WORD FuncLineID)
-    PlayerID = 0    #(DWORD PlayerID)// 对应玩家ID,可为0,某些功能可能有用,如竞技场
+    TagType = 0    #(BYTE TagType)// 战斗目标类型,0-NPC,1-玩家,2-队伍
+    TagID = 0    #(DWORD TagID)// 战斗目标类型对应的ID
     State = 0    #(BYTE State)// 0-起始状态标记;1-准备完毕;2-战斗中;3-战斗结束;4-结算奖励;5-结束状态标记
     TurnNum = 0    #(BYTE TurnNum)// 当前轮次
     TurnMax = 0    #(BYTE TurnMax)// 最大轮次
@@ -48482,7 +48483,8 @@
         _pos = self.Head.ReadData(_lpData, _pos)
         self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.FuncLineID,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.PlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.TagType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.TagID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.State,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.TurnNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.TurnMax,_pos = CommFunc.ReadBYTE(_lpData, _pos)
@@ -48497,7 +48499,8 @@
         self.Head.SubCmd = 0x20
         self.MapID = 0
         self.FuncLineID = 0
-        self.PlayerID = 0
+        self.TagType = 0
+        self.TagID = 0
         self.State = 0
         self.TurnNum = 0
         self.TurnMax = 0
@@ -48510,6 +48513,7 @@
         length += self.Head.GetLength()
         length += 4
         length += 2
+        length += 1
         length += 4
         length += 1
         length += 1
@@ -48524,7 +48528,8 @@
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
         data = CommFunc.WriteDWORD(data, self.MapID)
         data = CommFunc.WriteWORD(data, self.FuncLineID)
-        data = CommFunc.WriteDWORD(data, self.PlayerID)
+        data = CommFunc.WriteBYTE(data, self.TagType)
+        data = CommFunc.WriteDWORD(data, self.TagID)
         data = CommFunc.WriteBYTE(data, self.State)
         data = CommFunc.WriteBYTE(data, self.TurnNum)
         data = CommFunc.WriteBYTE(data, self.TurnMax)
@@ -48537,7 +48542,8 @@
                                 Head:%s,
                                 MapID:%d,
                                 FuncLineID:%d,
-                                PlayerID:%d,
+                                TagType:%d,
+                                TagID:%d,
                                 State:%d,
                                 TurnNum:%d,
                                 TurnMax:%d,
@@ -48548,7 +48554,8 @@
                                 self.Head.OutputString(),
                                 self.MapID,
                                 self.FuncLineID,
-                                self.PlayerID,
+                                self.TagType,
+                                self.TagID,
                                 self.State,
                                 self.TurnNum,
                                 self.TurnMax,

--
Gitblit v1.8.0