From befb9e40238b97fe83c2ff2c742369139be249fe Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期三, 13 二月 2019 15:35:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 2689b26..519b771 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -343,7 +343,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 19
+RegisterPackCount = 20
 
 PacketCMD_1 = 0xA5
 PacketSubCMD_1 = 0x04
@@ -365,9 +365,9 @@
 PacketSubCMD_5=0x26
 PacketCallFunc_5=QueryFamilyArrestAwardReceiveState
 
-PacketCMD_6 = 0xAF
-PacketSubCMD_6 = 0x02
-PacketCallFunc_6 = GiveMixServerCampaignAward
+PacketCMD_6=
+PacketSubCMD_6=
+PacketCallFunc_6=
 
 PacketCMD_7=0xA2
 PacketSubCMD_7=0x13
@@ -420,6 +420,10 @@
 PacketCMD_19=0xA1
 PacketSubCMD_19=0x08
 PacketCallFunc_19=OnRefreshMainServerRole
+
+PacketCMD_20=0xA2
+PacketSubCMD_20=0x31
+PacketCallFunc_20=OnClientStartCustomScene
 
 ;购买相关的
 [BuySomething]
@@ -570,7 +574,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 4
 
 PacketCMD_1=0xC1
 PacketSubCMD_1=0x01
@@ -583,6 +587,10 @@
 PacketCMD_3=0xC1
 PacketSubCMD_3=0x03
 PacketCallFunc_3=OnCrossRealmPKGetAward
+
+PacketCMD_4=0xC1
+PacketSubCMD_4=0x08
+PacketCallFunc_4=OnCrossRealmPKRobotOver
 
 ;跨服玩家
 [CrossRealmPlayer]
@@ -784,18 +792,6 @@
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x42
 PacketCallFunc_1=OnGetSuccessAward
-
-;合服登陆豪礼
-[PlayerMixTheDayLoginAward]
-ScriptName = Player\PlayerMixLoginDayAward.py
-Writer = ljd
-Releaser = ljd
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1 = 0xAF
-PacketSubCMD_1 = 0x01
-PacketCallFunc_1 = GetMixLoginDayAward
 
 ;节日登陆奖励
 [PlayerFestivalLogin]
@@ -1446,4 +1442,16 @@
 
 PacketCMD_3=0xA5
 PacketSubCMD_3=0x1C
-PacketCallFunc_3=OnGatherSoulCompound
\ No newline at end of file
+PacketCallFunc_3=OnGatherSoulCompound
+
+;幸运鉴宝
+[PlayerLuckyTreasure]
+ScriptName = Player\PlayerLuckyTreasure.py
+Writer = xdh
+Releaser = xdh
+RegType = 0
+RegisterPackCount = 1
+
+PacketCMD_1=0xAA
+PacketSubCMD_1=0x08
+PacketCallFunc_1=OnStartLuckyTreasure
\ No newline at end of file

--
Gitblit v1.8.0