From 4087d18ce7cbd1578a6e287962bd902386984048 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 14 七月 2025 10:55:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index c847a2f..47e278f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1812,17 +1812,37 @@
 PacketSubCMD_1=0x26
 PacketCallFunc_1=OnVisitFairyDomain
 
-;回合攻击
-[TurnAttack]
-ScriptName = Attack\TurnAttack.py
+;主线战斗
+[GameLogic_MainLevel]
+ScriptName = GameWorldLogic\FBProcess\GameLogic_MainLevel.py
 Writer = hxp
 Releaser = hxp
 RegType = 0
 RegisterPackCount = 1
 
 PacketCMD_1=0xB4
+PacketSubCMD_1=0x15
+PacketCallFunc_1=OnMainDropItemOP
+
+;回合攻击
+[TurnAttack]
+ScriptName = Attack\TurnAttack.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 3
+
+PacketCMD_1=0xB4
 PacketSubCMD_1=0x10
 PacketCallFunc_1=OnTurnFight
+
+PacketCMD_2=0xB4
+PacketSubCMD_2=0x13
+PacketCallFunc_2=OnMainFightReq
+
+PacketCMD_3=0xB4
+PacketSubCMD_3=0x14
+PacketCallFunc_3=OnTurnFightReportView
 
 ;镜像战斗
 [MirrorAttack]
@@ -1910,7 +1930,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 8
+RegisterPackCount = 10
 
 PacketCMD_1=0xB2
 PacketSubCMD_1=0x30
@@ -1940,6 +1960,14 @@
 PacketSubCMD_7=0x36
 PacketCallFunc_7=OnHeroWearSkin
 
-PacketCMD_8=0xB4
-PacketSubCMD_8=0x12
-PacketCallFunc_8=OnHeroBattlePosSave
+PacketCMD_8=0xB2
+PacketSubCMD_8=0x37
+PacketCallFunc_8=OnHeroBookUP
+
+PacketCMD_9=0xB2
+PacketSubCMD_9=0x38
+PacketCallFunc_9=OnHeroLock
+
+PacketCMD_10=0xB4
+PacketSubCMD_10=0x12
+PacketCallFunc_10=OnHeroLineupSave

--
Gitblit v1.8.0