From 6d830742d28d934698a5aa3dff2fdcacad8e48cf Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 九月 2025 14:11:22 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(增加属性ID技能增伤65、技能减伤66;曹轶技能;被动触发增加属性支持;)

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini |  832 ++++++++++-------------------------------------------------
 1 files changed, 144 insertions(+), 688 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 1ed0e32..f2128de 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -58,6 +58,34 @@
 PacketSubCMD_1=0x30
 PacketCallFunc_1=OnViewBillboard
 
+;功能组队
+[PlayerFuncTeam]
+ScriptName = Player\PlayerFuncTeam.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 5
+
+PacketCMD_1=0xB9
+PacketSubCMD_1=0x20
+PacketCallFunc_1=OnCreateFuncTeam
+
+PacketCMD_2=0xB9
+PacketSubCMD_2=0x21
+PacketCallFunc_2=OnChangeFuncTeam
+
+PacketCMD_3=0xB9
+PacketSubCMD_3=0x22
+PacketCallFunc_3=OnFuncTeamMemOP
+
+PacketCMD_4=0xB9
+PacketSubCMD_4=0x23
+PacketCallFunc_4=OnQueryFuncTeam
+
+PacketCMD_5=0xB9
+PacketSubCMD_5=0x24
+PacketCallFunc_5=OnQueryPlayerFuncTeam
+
 ;法器
 [PlayerFaQi]
 ScriptName = Player\PlayerFaQi.py
@@ -105,26 +133,6 @@
 PacketCMD_7=0xA5
 PacketSubCMD_7=0x35
 PacketCallFunc_7=OnHorseStarUp
-
-;玛雅加强
-[EquipPlus]
-ScriptName = Event\EventSrc\Operate_EquipPlus.py
-Writer = wdb
-Releaser = wdb
-RegType = 0
-RegisterPackCount = 3
-
-PacketCMD_1=0xA3
-PacketSubCMD_1=0x01
-PacketCallFunc_1=OnEquipMayaPlus
-
-PacketCMD_2=0xA3
-PacketSubCMD_2=0x16
-PacketCallFunc_2=OnEquipPlusEvolve
-
-PacketCMD_3=0xA5
-PacketSubCMD_3=0xC7
-PacketCallFunc_3=OnActivateMasterPlusLV
 
 ;npc交互
 [FunctionNPCCommon]
@@ -178,27 +186,6 @@
 PacketSubCMD_2=0x13
 PacketCallFunc_2=OnItemDecompound
 
-;装备宝石
-[EquipStone]
-ScriptName = Event\EventSrc\Operate_EquipStone.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 3
-
-PacketCMD_1=0xA3
-PacketSubCMD_1=0x04
-PacketCallFunc_1=OnEquipEnchase
-
-PacketCMD_2=0xA3
-PacketSubCMD_2=0x05
-PacketCallFunc_2=OnEquipStonePick
-
-PacketCMD_3=0xA3
-PacketSubCMD_3=0x06
-PacketCallFunc_3=OnEquipStoneUpgrade
-
-
 ;玩家战斗相关
 [PlayerBattle]
 ScriptName = Player\PlayerBattle.py
@@ -235,9 +222,9 @@
 PacketSubCMD_4=0x11
 PacketCallFunc_4=UpdateFamilyName
 
-PacketCMD_5=
-PacketSubCMD_5=
-PacketCallFunc_5=
+PacketCMD_5=0xA6
+PacketSubCMD_5=0x17
+PacketCallFunc_5=OnQueryFamilyAction
 
 PacketCMD_6=0xA6
 PacketSubCMD_6=0x12
@@ -417,7 +404,7 @@
 Writer = alee
 Releaser = alee
 RegType = 0
-RegisterPackCount = 11
+RegisterPackCount = 3
 
 PacketCMD_1=0xA2
 PacketSubCMD_1=0x03
@@ -428,40 +415,8 @@
 PacketCallFunc_2=PlayerOpenLongWarehouse
 
 PacketCMD_3=0xA2
-PacketSubCMD_3=0x06
-PacketCallFunc_3=PlayerQuickFinishTask
-
-PacketCMD_4=0xA2
-PacketSubCMD_4=0x09
-PacketCallFunc_4=PlayerSetRunMissionStar
-
-PacketCMD_5=0xA2
-PacketSubCMD_5=0x15
-PacketCallFunc_5=PlayerBuyDayMissionSum
-
-PacketCMD_6=0xA2
-PacketSubCMD_6=0x18
-PacketCallFunc_6=OnPlayerFinishTask
-
-PacketCMD_7=0xA2
-PacketSubCMD_7=0x21
-PacketCallFunc_7=OnGetRunTaskAward
-
-PacketCMD_8=0xA2
-PacketSubCMD_8=0x24
-PacketCallFunc_8=MoveTouchNPC
-
-PacketCMD_9=0xA2
-PacketSubCMD_9=0x25
-PacketCallFunc_9=ClientTaskCount
-
-PacketCMD_10=0xC1
-PacketSubCMD_10=0x06
-PacketCallFunc_10=OnCrossNPCTalk
-
-PacketCMD_11=0xA2
-PacketSubCMD_11=0x07
-PacketCallFunc_11=OnTakeTask
+PacketSubCMD_3=0x24
+PacketCallFunc_3=MoveTouchNPC
 
 ;VIP功能
 [PlayerVip]
@@ -469,23 +424,11 @@
 Writer = alee
 Releaser = alee
 RegType = 0
-RegisterPackCount = 4
+RegisterPackCount = 1
 
 PacketCMD_1=0xA8
-PacketSubCMD_1=0x01
-PacketCallFunc_1=BuyVipLV
-
-PacketCMD_2=0xA8
-PacketSubCMD_2=0x04
-PacketCallFunc_2=BuyVIPItem
-
-PacketCMD_3=0xA8
-PacketSubCMD_3=0x05
-PacketCallFunc_3=OnVIPKillNPCLVInfoSwitch
-
-PacketCMD_4=0xA8
-PacketSubCMD_4=0x06
-PacketCallFunc_4=OnQueryRecharge
+PacketSubCMD_1=0x06
+PacketCallFunc_1=OnQueryRecharge
 
 
 ;在线奖励
@@ -570,7 +513,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 25
+RegisterPackCount = 26
 
 PacketCMD_1 = 0xA5
 PacketSubCMD_1 = 0x04
@@ -672,17 +615,9 @@
 PacketSubCMD_25=0x20
 PacketCallFunc_25=OnMoneyExchange
 
-;购买相关的
-[BuySomething]
-ScriptName = Event\EventSrc\Operate_PlayerBuyZhenQi.py
-Writer = xcc
-Releaser = xcc
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1 = 0xA5
-PacketSubCMD_1 = 0x30
-PacketCallFunc_1 = OnPlayerBuySomething
+PacketCMD_26=0xA0
+PacketSubCMD_26=0x08
+PacketCallFunc_26=OnViewGameRec
 
 ;签到
 [PlayerSignDay]
@@ -696,39 +631,17 @@
 PacketSubCMD_1 = 0x09
 PacketCallFunc_1 = OnSignDay
 
-
-;新手卡
-[PlayerNewGuyCard]
-ScriptName = Player\PlayerNewGuyCard.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1 = 0xA5
-PacketSubCMD_1 = 0x10
-PacketCallFunc_1 = UseNewGuyCard
-
-
 ;境界
 [PlayerPrestigeSys]
 ScriptName = Player\PlayerPrestigeSys.py
 Writer = alee
 Releaser = alee
 RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 1
 
 PacketCMD_1 = 0xA5
-PacketSubCMD_1 = 0x24
-PacketCallFunc_1 = OpenRealmFB
-
-PacketCMD_2 = 0xA5
-PacketSubCMD_2 = 0x21
-PacketCallFunc_2 = OnTakeOutRealmExp
-
-PacketCMD_3 = 0xA5
-PacketSubCMD_3 = 0x23
-PacketCallFunc_3 = DoRealmLVUp
+PacketSubCMD_1 = 0x23
+PacketCallFunc_1 = DoRealmLVUp
 
 ;炼体
 [PlayerLianTi]
@@ -858,18 +771,6 @@
 PacketSubCMD_1=0x10
 PacketCallFunc_1=OnLuckyCloudBuy
 
-;跨服战场
-[PlayerCrossBattlefield]
-ScriptName = Player\PlayerCrossBattlefield.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xC1
-PacketSubCMD_1=0x09
-PacketCallFunc_1=OnCrossBattlefieldBuyOpen
-
 ;改名功能
 [UpdatePlayerName]
 ScriptName = Player\UpdatePlayerName.py
@@ -899,20 +800,6 @@
 PacketSubCMD_2=0x41
 PacketCallFunc_2=OnGetInvestReward
 
-
-;GM补偿
-[Compensation]
-ScriptName = Player\PlayerCompensationTube
-Writer = xmnathan
-Releaser = xmnathan
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xA5
-PacketSubCMD_1=0x3B
-PacketCallFunc_1=OnCMRequestCompensation
-
-
 ;自动战斗
 [AutoFightSetting]
 ScriptName = Player\ChPlayer
@@ -925,42 +812,9 @@
 PacketSubCMD_1=0x1A
 PacketCallFunc_1=OnSaveAutoFightSetting
 
-;镖车
-[PlayerTruck]
-ScriptName = Player\PlayerTruck.py
-Writer = jiang
-Releaser = jiang
-RegType = 0
-RegisterPackCount = 6
-
-PacketCMD_1=0xAE
-PacketSubCMD_1=0x01
-PacketCallFunc_1=PlayerRefurbishTruckLV
-
-PacketCMD_2=0xAE
-PacketSubCMD_2=0x02
-PacketCallFunc_2=PlayerBuyTruckLV
-
-PacketCMD_3=0xAE
-PacketSubCMD_3=0x03
-PacketCallFunc_3=QueryTruckLV
-
-PacketCMD_4=0xAE
-PacketSubCMD_4=0x04
-PacketCallFunc_4=QueryDestroyTruckCnt
-
-PacketCMD_5=0xAE
-PacketSubCMD_5=0x05
-PacketCallFunc_5=AutoTruck
-
-PacketCMD_6=0xAE
-PacketSubCMD_6=0x06
-PacketCallFunc_6=OverTruck
-
-
 ;玩家查看数据缓存
 [PlayerViewCache]
-ScriptName = Player\PlayerViewCacheTube.py
+ScriptName = Player\PlayerViewCache.py
 Writer = xmnathan
 Releaser = xmnathan
 RegType = 0
@@ -1006,54 +860,6 @@
 PacketCMD_4=0xA5
 PacketSubCMD_4=0x46
 PacketCallFunc_4=OnBuyTongTianLing
-
-;大师天赋
-[PlayerGreatMaster]
-ScriptName = Player\PlayerGreatMaster.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xA5
-PacketSubCMD_1=0x49
-PacketCallFunc_1=OnAddMasterSkillPoint
-
-PacketCMD_2=0xA5
-PacketSubCMD_2=0x50
-PacketCallFunc_2=OnResetMasterSkill
-
-;装备洗练
-[EquipWash]
-ScriptName = Event\EventSrc\Operate_EquipWash.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xA3
-PacketSubCMD_1=0x25
-PacketCallFunc_1=OnEquipWashAttr
-
-PacketCMD_2=0xA3
-PacketSubCMD_2=0x26
-PacketCallFunc_2=OnEquipWashAttrChangeOK
-
-;装备进阶
-[EquipEvolve]
-ScriptName = Event\EventSrc\Operate_EquipEvolve.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xA3
-PacketSubCMD_1=0x30
-PacketCallFunc_1=OnEquipEvolve
-
-PacketCMD_2=0xA3
-PacketSubCMD_2=0x31
-PacketCallFunc_2=OnEquipShenDecompose
 
 ;NPC
 [NPCCommon]
@@ -1121,41 +927,11 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 1
 
-PacketCMD_1=0xA2
-PacketSubCMD_1=0x16
-PacketCallFunc_1=OnPyTalk
-
-PacketCMD_2=0xA2
-PacketSubCMD_2=0x17
-PacketCallFunc_2=OnUsePYSpeaker
-
-PacketCMD_3=0xA2
-PacketSubCMD_3=0x26
-PacketCallFunc_3=OnVoiceChat
-
-
-;属性果实
-[PlayerAttrFruit]
-ScriptName = Player\PlayerAttrFruit.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 3
-
-PacketCMD_1=0xA3
-PacketSubCMD_1=0x2B
-PacketCallFunc_1=OnEatAllFruitItem
-
-PacketCMD_2=0xA3
-PacketSubCMD_2=0x2A
-PacketCallFunc_2=OnRecycleAttrFruit
-
-PacketCMD_3=0xA3
-PacketSubCMD_3=0x17
-PacketCallFunc_3=OnAddFruitUseLimit
-
+PacketCMD_1=0xB3
+PacketSubCMD_1=0x20
+PacketCallFunc_1=OnTalk
 
 ;开服活动
 [OpenServerCampaign]
@@ -1168,40 +944,6 @@
 PacketCMD_1=0xAB
 PacketSubCMD_1=0x11
 PacketCallFunc_1=OnQueryOpenServerCampaignAward
-
-
-;事件汇报
-[EventReport]
-ScriptName = EventReport.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xA1
-PacketSubCMD_1=0x01
-PacketCallFunc_1=ReceiveClientPCInfo
-
-PacketCMD_2=0xA2
-PacketSubCMD_2=0x19
-PacketCallFunc_2=OnSubmitBugSuggest
-
-;装备分解
-[EquipDecompose]
-ScriptName = Player\PlayerEquipDecompose.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xA3
-PacketSubCMD_1=0x2C
-PacketCallFunc_1=OnDoEquipDecompose
-
-PacketCMD_2=0xA3
-PacketSubCMD_2=0x2D
-PacketCallFunc_2=OnDecomposeSetingSave
-
 
 ;寻宝
 [PlayerTreasure]
@@ -1231,19 +973,6 @@
 PacketCMD_2=0xA5
 PacketSubCMD_2=0x20
 PacketCallFunc_2=OnCoatDecompose
-
-;悬赏任务
-[PlayerArrestTask]
-ScriptName = Player\PlayerArrestTask.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xA5
-PacketSubCMD_1=0x74
-PacketCallFunc_1=OnRefreshArrestTask
-
 
 ;羽翼精炼
 [PlayerWing]
@@ -1310,68 +1039,6 @@
 PacketSubCMD_1=0x0D
 PacketCallFunc_1=OnYinji
 
-
-
-;交易所
-[PlayerBourseTube]
-ScriptName = Player\PlayerBourseTube.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xB5
-PacketSubCMD_1=0x01
-PacketCallFunc_1=OnPlayerSellBourseItem
-
-PacketCMD_2=0xB5
-PacketSubCMD_2=0x02
-PacketCallFunc_2=OnPlayerBuyBourseItem
-
-;拍卖行
-[PlayerAuctionHouse]
-ScriptName = Player\PlayerAuctionHouse.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 3
-
-PacketCMD_1=0xB5
-PacketSubCMD_1=0x13
-PacketCallFunc_1=OnSellAuctionItem
-
-PacketCMD_2=0xB5
-PacketSubCMD_2=0x14
-PacketCallFunc_2=OnBiddingAuctionItem
-
-PacketCMD_3=0xB5
-PacketSubCMD_3=0x15
-PacketCallFunc_3=OnUnsellAuctionItem
-
-;法宝
-[PlayerMagicWeapon]
-ScriptName = Player\PlayerMagicWeapon.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 4
-
-PacketCMD_1=0xA5
-PacketSubCMD_1=0x1D
-PacketCallFunc_1=OnWearMagicWeapon
-
-PacketCMD_2=0xA5
-PacketSubCMD_2=0x0E
-PacketCallFunc_2=OnOpenMagicWeapon
-
-PacketCMD_3=0xA5
-PacketSubCMD_3=0x15
-PacketCallFunc_3=OnMagicWeaponUp
-
-PacketCMD_4=0xA5
-PacketSubCMD_4=0x12
-PacketCallFunc_4=OnThinkMagicWeapon
-
 ;副本
 [FBCommon]
 ScriptName = GameWorldLogic\FBProcess\FBCommon.py
@@ -1383,55 +1050,6 @@
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x75
 PacketCallFunc_1=BuyFBEnterCount
-
-;副本助战
-[FBHelpBattle]
-ScriptName = GameWorldLogic\FBProcess\FBHelpBattle.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 3
-
-PacketCMD_1=0xB1
-PacketSubCMD_1=0x5
-PacketCallFunc_1=OnHelpBattleCheckIn
-
-PacketCMD_2=0xB1
-PacketSubCMD_2=0x6
-PacketCallFunc_2=OnHelpBattleCall
-
-PacketCMD_3=0xB1
-PacketSubCMD_3=0x7
-PacketCallFunc_3=OnHelpBattleRefresh
-
-;组队
-[PlayerTeam]
-ScriptName = Player\PlayerTeam.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xB9
-PacketSubCMD_1=0x04
-PacketCallFunc_1=OnChangeTeamCheckState
-
-;炼丹炉
-[PlayerRefineStove]
-ScriptName = Player\PlayerRefineStove.py
-Writer = sgj
-Releaser = sgj
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xA5
-PacketSubCMD_1=0x76
-PacketCallFunc_1=PlayerRefineItem
-
-PacketCMD_2=0xA5
-PacketSubCMD_2=0x14
-PacketCallFunc_2=PlayerPrayElixir
-
 
 [PassiveBuffEffMng]
 ScriptName = Skill\PassiveBuffEffMng.py
@@ -1447,83 +1065,6 @@
 PacketCMD_2=0xB4
 PacketSubCMD_2=0x08
 PacketCallFunc_2=OnPassivePage
-
-;我要太极摇骰子
-[PlayerDiceEx]
-ScriptName = Player\PlayerDiceEx.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xAB
-PacketSubCMD_1=0x0C
-PacketCallFunc_1=OnDice
-
-;玩家脱机挂
-[PlayerTJG]
-ScriptName = Player\PlayerTJG.py
-Writer = alee
-Releaser = alee
-RegType = 0
-RegisterPackCount = 5
-
-PacketCMD_1 = 0xB2
-PacketSubCMD_1 = 0x01
-PacketCallFunc_1 = OnTJGState
-
-PacketCMD_2 = 0xB2
-PacketSubCMD_2 = 0x02
-PacketCallFunc_2 = OnSightZoom
-
-PacketCMD_3 = 0xB2
-PacketSubCMD_3 = 0x03
-PacketCallFunc_3 = OnTJGNPC
-
-PacketCMD_4 = 0xB2
-PacketSubCMD_4 = 0x04
-PacketCallFunc_4 = OnTJGSystemSet
-
-PacketCMD_5 = 0xB4
-PacketSubCMD_5 = 0x0A
-PacketCallFunc_5 = TJGNotifyDead
-
-
-;仙魔之争
-[GameLogic_XMZZ]
-ScriptName = GameWorldLogic\FBProcess\GameLogic_XMZZ.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xAB
-PacketSubCMD_1=0x03
-PacketCallFunc_1=OnXMZZBet
-
-;封魔坛
-[GameLogic_SealDemon]
-ScriptName = GameWorldLogic\FBProcess\GameLogic_SealDemon.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xB1
-PacketSubCMD_1=0x03
-PacketCallFunc_1=SetFMTDouble
-
-;宗门试炼
-[GameLogic_MunekadoTrial]
-ScriptName = GameWorldLogic\FBProcess\GameLogic_MunekadoTrial.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xA3
-PacketSubCMD_1=0x2F
-PacketCallFunc_1=OnTrialExange
 
 ;玩家装备
 [ChEquip]
@@ -1548,18 +1089,6 @@
 PacketCMD_4=A3
 PacketSubCMD_4=27
 PacketCallFunc_4=OnLingQiTrain
-
-;仙盟抢boss
-[FamilyRobBoss]
-ScriptName = GameWorldLogic\FamilyRobBoss.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xA2
-PacketSubCMD_1=0x28
-PacketCallFunc_1=OnQueryFamilyBossHurt
 
 ;神兽
 [PlayerDogz]
@@ -1588,18 +1117,6 @@
 PacketCMD_5=0xA5
 PacketSubCMD_5=0xC4
 PacketCallFunc_5=OnDogzEquipPlus
-
-;个推
-[PlayerGeTui]
-ScriptName = Player\PlayerGeTui.py
-Writer = Alee
-Releaser = Alee
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xB2
-PacketSubCMD_1=0x5
-PacketCallFunc_1=GeTuiSetting
 
 ;充值
 [PlayerCoin]
@@ -1633,18 +1150,6 @@
 PacketSubCMD_1=0x11
 PacketCallFunc_1=OnTryFirstGoldItem
 
-;绑玉转盘
-[PlayerBindJadeWheel]
-ScriptName = Player\PlayerBindJadeWheel.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xA5
-PacketSubCMD_1=0x17
-PacketCallFunc_1=OnStartBindJadeWheel
-
 ;限时抢购
 [PlayerFlashSale]
 ScriptName = Player\PlayerFlashSale.py
@@ -1672,58 +1177,6 @@
 PacketCMD_2=0xAA
 PacketSubCMD_2=0x06
 PacketCallFunc_2=OnActWishingDrag
-
-;boss历练活动
-[PlayerActBossTrial]
-ScriptName = Player\PlayerActBossTrial.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xAA
-PacketSubCMD_1=0x23
-PacketCallFunc_1=OnActBossTrialSubmit
-
-PacketCMD_2=0xAA
-PacketSubCMD_2=0x24
-PacketCallFunc_2=OnActBossTrialGetAward
-
-;垃圾分类活动
-[PlayerActGarbageSorting]
-ScriptName = Player\PlayerActGarbageSorting.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xAA
-PacketSubCMD_1=0x14
-PacketCallFunc_1=OnActGarbageSorting
-
-PacketCMD_2=0xAA
-PacketSubCMD_2=0x15
-PacketCallFunc_2=OnActGarbageGetTaskAward
-
-;仙匣秘境活动
-[PlayerActXianXiaMJ]
-ScriptName = Player\PlayerActXianXiaMJ.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 3
-
-PacketCMD_1=0xAA
-PacketSubCMD_1=0x16
-PacketCallFunc_1=OnActXianXiaMJSuperItem
-
-PacketCMD_2=0xAA
-PacketSubCMD_2=0x17
-PacketCallFunc_2=OnActXianXiaMJLottery
-
-PacketCMD_3=0xAA
-PacketSubCMD_3=0x18
-PacketCallFunc_3=OnActXianXiaMJAwardPoolRefresh
 
 ;天帝礼包活动
 [PlayerActGodGift]
@@ -1769,38 +1222,6 @@
 PacketSubCMD_1=0x09
 PacketCallFunc_1=OnActCollectWordsExchange
 
-;新聚魂
-[PlayerGatherTheSoul]
-ScriptName = Player\PlayerGatherTheSoul.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xB2
-PacketSubCMD_1=0x25
-PacketCallFunc_1=OnGatherTheSoulOP
-
-;聚魂
-[PlayerGatherSoul]
-ScriptName = Player\PlayerGatherSoul.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 3
-
-PacketCMD_1=0xA5
-PacketSubCMD_1=0x18
-PacketCallFunc_1=OnGatherSoulUp
-
-PacketCMD_2=0xA5
-PacketSubCMD_2=0x19
-PacketCallFunc_2=OnGatherSoulDecompose
-
-PacketCMD_3=0xA5
-PacketSubCMD_3=0x1C
-PacketCallFunc_3=OnGatherSoulCompound
-
 ;幸运鉴宝
 [PlayerLuckyTreasure]
 ScriptName = Player\PlayerLuckyTreasure.py
@@ -1812,18 +1233,6 @@
 PacketCMD_1=0xAA
 PacketSubCMD_1=0x08
 PacketCallFunc_1=OnStartLuckyTreasure
-
-;公共部位星数
-[Operate_EquipStar]
-ScriptName = Event\EventSrc\Operate_EquipStar.py
-Writer = xdh
-Releaser = xdh
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xA5
-PacketSubCMD_1=0xC5
-PacketCallFunc_1=OnEquipPartStarUp
 
 ;日常活动
 [PlayerActivity]
@@ -1848,22 +1257,6 @@
 PacketCMD_4=0xB0
 PacketSubCMD_4=0x29
 PacketCallFunc_4=OnActivityPlaceQuery
-
-;协助
-[PlayerAssist]
-ScriptName = Player\PlayerAssist.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xB0
-PacketSubCMD_1=0x10
-PacketCallFunc_1=OnRequestAssistBoss
-
-PacketCMD_2=0xB0
-PacketSubCMD_2=0x11
-PacketCallFunc_2=OnRequestAssistTeamFB
 
 ;转盘活动
 [PlayerActTurntable]
@@ -1893,9 +1286,9 @@
 PacketSubCMD_1=0x09
 PacketCallFunc_1=OnArenaMatch
 
-PacketCMD_2=0xB2
-PacketSubCMD_2=0x10
-PacketCallFunc_2=OnArenaBattle
+PacketCMD_2=
+PacketSubCMD_2=
+PacketCallFunc_2=
 
 ;节日祝福
 [PlayerFeastWish]
@@ -2001,17 +1394,17 @@
 PacketSubCMD_2=0x20
 PacketCallFunc_2=OnShentongSkillSet
 
-;缥缈仙域
-[PlayerFairyDomain]
-ScriptName = Player\PlayerFairyDomain.py
-Writer = xdh
-Releaser = xdh
+;主线战斗
+[GameLogic_MainLevel]
+ScriptName = GameWorldLogic\FBProcess\GameLogic_MainLevel.py
+Writer = hxp
+Releaser = hxp
 RegType = 0
 RegisterPackCount = 1
 
-PacketCMD_1=0xA5
-PacketSubCMD_1=0x26
-PacketCallFunc_1=OnVisitFairyDomain
+PacketCMD_1=0xB4
+PacketSubCMD_1=0x15
+PacketCallFunc_1=OnMainDropItemOP
 
 ;回合攻击
 [TurnAttack]
@@ -2019,51 +1412,59 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 3
 
 PacketCMD_1=0xB4
 PacketSubCMD_1=0x10
 PacketCallFunc_1=OnTurnFight
 
-;镜像战斗
-[MirrorAttack]
-ScriptName = Attack\MirrorAttack.py
+PacketCMD_2=0xB4
+PacketSubCMD_2=0x13
+PacketCallFunc_2=OnMainFightReq
+
+PacketCMD_3=0xB4
+PacketSubCMD_3=0x14
+PacketCallFunc_3=OnTurnFightReportView
+
+;仙树
+[PlayerTree]
+ScriptName = Player\PlayerTree.py
 Writer = hxp
 Releaser = hxp
 RegType = 0
 RegisterPackCount = 2
 
-PacketCMD_1=0xA1
-PacketSubCMD_1=0x09
-PacketCallFunc_1=OnSycnPlayerPackData
+PacketCMD_1=0xB2
+PacketSubCMD_1=0x23
+PacketCallFunc_1=OnTreeLVUP
 
-PacketCMD_2=0xB4
-PacketSubCMD_2=0x11
-PacketCallFunc_2=OnMirrorFight
+PacketCMD_2=0xB2
+PacketSubCMD_2=0x24
+PacketCallFunc_2=OnUseTreeLVUPTimeItem
 
-;福地
-[PlayerMineArea]
-ScriptName = Player\PlayerMineArea.py
+;淘金
+[PlayerGoldRush]
+ScriptName = Player\PlayerGoldRush.py
 Writer = hxp
 Releaser = hxp
 RegType = 0
 RegisterPackCount = 4
 
 PacketCMD_1=0xB0
-PacketSubCMD_1=0x30
-PacketCallFunc_1=OnMineItemPull
+PacketSubCMD_1=0x36
+PacketCallFunc_1=OnGoldRushOP
 
 PacketCMD_2=0xB0
-PacketSubCMD_2=0x31
-PacketCallFunc_2=OnMineItemRefresh
+PacketSubCMD_2=0x37
+PacketCallFunc_2=OnGoldRushUnlock
 
 PacketCMD_3=0xB0
-PacketSubCMD_3=0x32
-PacketCallFunc_3=OnMineWorkerEmploy
+PacketSubCMD_3=0x38
+PacketCallFunc_3=OnGoldRushWarehouseAward
 
 PacketCMD_4=0xB0
-PacketSubCMD_4=0x35
-PacketCallFunc_4=OnMineHouseKeeperFreeUse
+PacketSubCMD_4=0x39
+PacketCallFunc_4=OnGoldRushAutoFreeUse
 
 ;仙盟攻城战
 [PlayerActFamilyGCZ]
@@ -2089,3 +1490,58 @@
 PacketSubCMD_4=0x27
 PacketCallFunc_4=OnFamilyGCZSQ
 
+;武将
+[PlayerHero]
+ScriptName = Player\PlayerHero.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 12
+
+PacketCMD_1=0xB2
+PacketSubCMD_1=0x30
+PacketCallFunc_1=OnHeroLVUP
+
+PacketCMD_2=0xB2
+PacketSubCMD_2=0x31
+PacketCallFunc_2=OnHeroStarUP
+
+PacketCMD_3=0xB2
+PacketSubCMD_3=0x32
+PacketCallFunc_3=OnHeroBreak
+
+PacketCMD_4=0xB2
+PacketSubCMD_4=0x33
+PacketCallFunc_4=OnHeroAwake
+
+PacketCMD_5=0xB2
+PacketSubCMD_5=0x34
+PacketCallFunc_5=OnHeroAwakeSelectTalent
+
+PacketCMD_6=0xB2
+PacketSubCMD_6=0x35
+PacketCallFunc_6=OnHeroWash
+
+PacketCMD_7=0xB2
+PacketSubCMD_7=0x36
+PacketCallFunc_7=OnHeroWearSkin
+
+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
+
+PacketCMD_11=0xB2
+PacketSubCMD_11=0x39
+PacketCallFunc_11=OnHeroRebirth
+
+PacketCMD_12=0xB2
+PacketSubCMD_12=0x40
+PacketCallFunc_12=OnHeroDismiss

--
Gitblit v1.8.0