From bf2ed0c4274ea6d30cbee55abbd8a6cd9795be2a Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期三, 16 一月 2019 22:57:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
index d9196dc..e41bdee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
@@ -148,6 +148,14 @@
 ClassName = DB_PushRecharge
 FuncName = PushRecharge
 
+[CrossPlayerData]
+ScriptName = Player\CrossPlayerData.py
+Writer = alee
+Releaser = alee
+RegType = 1
+ClassName = DM_MergePlayerData
+FuncName = OnMergePlayerData
+
 ;;;;;;;;;;;;;;;;;;;;;;类初始化
 [InitNPC]
 ScriptName = NPC\ChNPC.py
@@ -491,7 +499,7 @@
 Writer = Mark
 Releaser = Mark
 RegType = 0
-RegisterPackCount = 6
+RegisterPackCount = 7
 
 PacketCMD_1=0x2
 PacketSubCMD_1=0x7
@@ -519,6 +527,10 @@
 PacketSubCMD_6=0x9
 PacketCallFunc_6=TalkPrivate
 
+PacketCMD_7=0x2
+PacketSubCMD_7=0x8
+PacketCallFunc_7=TalkCountry
+
 
 ;战斗
 [Battle]

--
Gitblit v1.8.0