From d06c3bfcbd48ee2981cc7496de05db1e9bf01c9c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 12 八月 2025 17:25:38 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(主阵容变更时重新开始战斗;主阵容属性变化时实时更新主线战斗;主线战斗请求CD限制1秒;计算buff属性、buff添加删除通用逻辑;4012效果状态逻辑;)

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc               |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/__init__.pyc      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini                            |    6 +++---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/__init__.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc           |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/Buff_4012.pyc     |    0 
 11 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 4b8559d..f0009f9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1799,9 +1799,9 @@
 RegType = 0
 RegisterPackCount = 3
 
-PacketCMD_1=0xB4
-PacketSubCMD_1=0x10
-PacketCallFunc_1=OnTurnFight
+PacketCMD_1=
+PacketSubCMD_1=
+PacketCallFunc_1=
 
 PacketCMD_2=0xB4
 PacketSubCMD_2=0x13
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
index 04b1168..4383b61 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
index eb45c7b..e333c16 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 414aae5..2dc31fc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc
index 6a0b416..5ad1245 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/__init__.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/__init__.pyc
new file mode 100644
index 0000000..f257cd6
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/__init__.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
index b7e4cb8..01c3247 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/Buff_4012.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/Buff_4012.pyc
new file mode 100644
index 0000000..939c468
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/Buff_4012.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/__init__.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/__init__.pyc
new file mode 100644
index 0000000..c20a603
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/__init__.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
new file mode 100644
index 0000000..7cd5770
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
index ee8ab8f..916da5f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
Binary files differ

--
Gitblit v1.8.0