From e254df06ed1996ef6a2eb0436f250a1d68a881a8 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 26 十二月 2018 10:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 2
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKSeasonOrder.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt | 2
CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt | 2
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 6 +-
db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc | 0
CoreServerGroup/GameServer/Script/PyDataManager.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 17 -----
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 6 +-
CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 2
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 12 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 2
CoreServerGroup/GameServer/Script/DataRecordPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini | 2
CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc | 0
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetCrossPK.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 4
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0
CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 4
CoreServerGroup/GameServer/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChNetSendPack.pyc | 0
CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 6 +-
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 2
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 2
CoreServerGroup/GameServer/Script/GM/GMShell.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
/dev/null | 0
CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc | 0
CoreServerGroup/GameServer/Script/EventReport.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc | 0
CoreServerGroup/GameServer/PyNetPack.ini | 52 +++++++----------
CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt | 4
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc | 0
db/PyMongoDataServer/Collections/DataServerPlayerData.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc | 0
db/PyMongoDataServer/Collections/CollectionDefine.pyc | 0
68 files changed, 62 insertions(+), 75 deletions(-)
diff --git a/CoreServerGroup/GameServer/PyNetPack.ini b/CoreServerGroup/GameServer/PyNetPack.ini
index 6317eef..2e4db7a 100644
--- a/CoreServerGroup/GameServer/PyNetPack.ini
+++ b/CoreServerGroup/GameServer/PyNetPack.ini
@@ -148,36 +148,6 @@
PacketSubCMD_2=0x08
PacketCallFunc_2=QueryFamilyActionInfo
-
-;跨服报名(上传数据)
-[MergeRegister]
-ScriptName = Player\PlayerMergeRegister.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xC0
-PacketSubCMD_1=0x11
-PacketCallFunc_1=MergeWarRegisterPack
-
-PacketCMD_2=0xC0
-PacketSubCMD_2=0x12
-PacketCallFunc_2=MergeWarAccQueryPack
-
-;跨服玩家
-[MergePlayer]
-ScriptName = Player\MergePlayer.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xC0
-PacketSubCMD_1=0x15
-PacketCallFunc_1=OnGotoMergeServer
-
-
;排行榜
[PlayerBillboard]
ScriptName = Player\PlayerBillboard.py
@@ -345,6 +315,28 @@
PacketSubCMD_4=0x04
PacketCallFunc_4=OnQueryBossInfo
+[CrossRealmPK]
+ScriptName = GameWorldLogic\CrossRealmPK.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 1
+
+PacketCMD_1=0xC0
+PacketSubCMD_1=0x01
+PacketCallFunc_1=OnViewCrossPKBillboard
+
+[CrossRealmPlayer]
+ScriptName = Player\CrossRealmPlayer.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 1
+
+PacketCMD_1=0xC0
+PacketSubCMD_1=0x02
+PacketCallFunc_1=OnViewCrossPlayerInfo
+
[PlayerXMZZ]
ScriptName = Player\PlayerXMZZ.py
Writer = xdh
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 640c8f4..ff8ae08 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -10,3 +10,5 @@
9 daxuefh18 [] [] 2018-12-5 2018-12-7 1 {0:["BossFHOpen", []]} {} 110 1
10 sdq1211 [] [] 2018-12-13 2018-12-16 1 {0:["BossFHOpen", []]} {} 110 1
11 sdq1221 [] [] 2018-12-21 2018-12-23 1 {0:["BossFHOpen", []]} {} 110 1
+12 sdq1228 [] [] 2018-12-28 2018-12-30 1 {0:["BossFHOpen", []]} {} 110 1
+13 sdq0102 [] [] 2019-1-2 2019-1-4 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 691c20e..cad1c33 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -8,3 +8,5 @@
7 DecemberExp8 [] [] 2018-12-8 2018-12-8 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
8 DecemberExp8 [] [] 2018-12-16 2018-12-16 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
9 DecemberExp23 [] [] 2018-12-23 2018-12-23 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
+10 DecemberExp30 [] [] 2018-12-30 2018-12-30 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
+11 JanuaryExp1 [] [] 2019-1-1 2019-1-1 18:00 20:00 { 0:["ExpActivity_Start", [3]]} {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]} [30, "ExpActivity_Goahead", [3]] 110 20000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index 431d439..45f3f68 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,3 +1,3 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV
-1 test1 [] [] 2018-12-19 2018-12-19 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
+1 test1 [] [] 2019-1-1 2019-1-1 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
2 test2 [] [] 7 7 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index f47dc51..4367e49 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -64,6 +64,6 @@
63 December16 [] [] 2018-12-16 2018-12-16 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
64 December17 [] [] 2018-12-17 2018-12-17 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
65 December18 [] [] 2018-12-18 2018-12-18 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-66 December22 [] [] 2018-12-22 2018-12-22 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-67 December23 [] [] 2018-12-23 2018-12-23 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-68 December26 [] [] 2018-12-26 2018-12-26 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+66 Dec27 [] [] 2018-12-27 2018-12-27 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+67 Dec31 [] [] 2018-12-31 2018-12-31 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+68 Jan2 [] [] 2019-1-2 2019-1-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index 0663c14..a932af1 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,3 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd Multiple LimitLV LimitPoint
1 opensever [] [] 6 7 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
-2 guoqing11 [] [7001,7002,7003,8002,8003,8004] 2018-10-4 2018-10-5 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
+2 Jan01 [] [] 2019-1-3 2019-1-3 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index ab11ba9..e6c261a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -40,5 +40,5 @@
39 December20 [] [] 2018-12-20 2018-12-20 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
40 December21 [] [] 2018-12-21 2018-12-21 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
41 December22 [] [] 2018-12-22 2018-12-22 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-42 December23 [] [] 2018-12-23 2018-12-23 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-43 December24 [] [] 2018-12-24 2018-12-24 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+42 Dec31 [] [] 2018-12-31 2018-12-31 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+43 Jan3 [] [] 2019-1-3 2019-1-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index 18f3289..4dd0e56 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -28,5 +28,5 @@
27 December10 [] [] 2018-12-10 2018-12-10 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
28 December11 [] [] 2018-12-11 2018-12-11 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
29 December14 [] [] 2018-12-14 2018-12-14 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-30 December20 [] [] 2018-12-20 2018-12-20 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-31 December24 [] [] 2018-12-24 2018-12-24 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+30 December29 [] [] 2018-12-29 2018-12-29 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+31 December30 [] [] 2018-12-30 2018-12-30 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index ed28656..d76cfae 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -13,3 +13,5 @@
12 sdq1220 [] [] 2018-12-20 2018-12-20 1 0 {0:["XYCOpen", []]} {} [] 110
13 sdq1224 [] [] 2018-12-24 2018-12-24 1 0 {0:["XYCOpen", []]} {} [] 110
14 sdq1226 [] [] 2018-12-26 2018-12-26 1 0 {0:["XYCOpen", []]} {} [] 110
+15 sdq1230 [] [] 2018-12-30 2018-12-30 1 0 {0:["XYCOpen", []]} {} [] 110
+16 sdq0104 [] [] 2019-1-4 2019-1-4 1 0 {0:["XYCOpen", []]} {} [] 110
diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc
index dbc7994..3939457 100644
--- a/CoreServerGroup/GameServer/Script/ChConfig.pyc
+++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/DataRecordPack.pyc b/CoreServerGroup/GameServer/Script/DataRecordPack.pyc
index 2d651fc..d5be322 100644
--- a/CoreServerGroup/GameServer/Script/DataRecordPack.pyc
+++ b/CoreServerGroup/GameServer/Script/DataRecordPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/EventReport.pyc b/CoreServerGroup/GameServer/Script/EventReport.pyc
index f66b8a8..44da1a4 100644
--- a/CoreServerGroup/GameServer/Script/EventReport.pyc
+++ b/CoreServerGroup/GameServer/Script/EventReport.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingFast.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingFast.pyc
deleted file mode 100644
index 39ffc9e..0000000
--- a/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingFast.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingGroup.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingGroup.pyc
deleted file mode 100644
index 2e63c1e..0000000
--- a/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingGroup.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/SetMergePKInfo.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/SetMergePKInfo.pyc
deleted file mode 100644
index d81c3f5..0000000
--- a/CoreServerGroup/GameServer/Script/GM/Commands/SetMergePKInfo.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GM/GMShell.pyc b/CoreServerGroup/GameServer/Script/GM/GMShell.pyc
index ac41f35..d718aeb 100644
--- a/CoreServerGroup/GameServer/Script/GM/GMShell.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/GMShell.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
index d87ada9..8ea2afc 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
index 9b5b642..417edc0 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index 0e5da49..c5dafe7 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc
index ced0c46..8f3fe59 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeBoss.pyc
deleted file mode 100644
index 69330a5..0000000
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeBoss.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc
deleted file mode 100644
index ecec5e0..0000000
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergePK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergePK.pyc
deleted file mode 100644
index 59641d7..0000000
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergePK.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc
index 2970bd3..e17db36 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index 24a330e..c5b0102 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
index 670ba25..b96a95e 100644
--- a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
index f3582d9..58fad32 100644
--- a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/MergeBroadCastRecive.pyc b/CoreServerGroup/GameServer/Script/Player/MergeBroadCastRecive.pyc
deleted file mode 100644
index 990ac9e..0000000
--- a/CoreServerGroup/GameServer/Script/Player/MergeBroadCastRecive.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/MergeChildMsg.pyc b/CoreServerGroup/GameServer/Script/Player/MergeChildMsg.pyc
deleted file mode 100644
index 80dbc5f..0000000
--- a/CoreServerGroup/GameServer/Script/Player/MergeChildMsg.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc
index 5320a60..cd021e8 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
index d0f950f..11bd1aa 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc
index 6560caf..d4b47bb 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc
index dd20299..8787b6b 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerMergeEvent.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerMergeEvent.pyc
deleted file mode 100644
index 20f99ef..0000000
--- a/CoreServerGroup/GameServer/Script/Player/PlayerMergeEvent.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerMergeRegister.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerMergeRegister.pyc
deleted file mode 100644
index ed6cd8d..0000000
--- a/CoreServerGroup/GameServer/Script/Player/PlayerMergeRegister.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index 84537f9..3c7e97d 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
index 495e6c8..734242b 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyDataManager.pyc b/CoreServerGroup/GameServer/Script/PyDataManager.pyc
index 7fbe226..ca251ff 100644
--- a/CoreServerGroup/GameServer/Script/PyDataManager.pyc
+++ b/CoreServerGroup/GameServer/Script/PyDataManager.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc b/CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc
index 32df88e..b0565be 100644
--- a/CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 1be9eb4..51cb02d 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 387a425..9f1aafe 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -583,23 +583,6 @@
PacketSubCMD_1=0x04
PacketCallFunc_1=OnExitCrossRealm
-;王者争霸
-[PlayerMergeKing]
-ScriptName = Player\PlayerMergeKing.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xC1
-PacketSubCMD_1=0x11
-PacketCallFunc_1=Client_MergeKingSupport
-
-PacketCMD_2=0xC1
-PacketSubCMD_2=0x08
-PacketCallFunc_2=Client_MergeKingWorship
-
-
;改名功能
[UpdatePlayerName]
ScriptName = Player\UpdatePlayerName.py
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 96fc365..4e01caf 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/ChNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChNetSendPack.pyc
index 967b0b4..e3600e0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc
index 02b127b..375fa70 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergeKing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergeKing.pyc
deleted file mode 100644
index 8d1e014..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergeKing.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergePKAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergePKAward.pyc
deleted file mode 100644
index 36c9713..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergePKAward.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetCrossPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetCrossPK.pyc
new file mode 100644
index 0000000..5896f92
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetCrossPK.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
index 1dee0e0..e258fab 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc
deleted file mode 100644
index 1702fb5..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeKing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeKing.pyc
deleted file mode 100644
index 946d016..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeKing.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergePK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergePK.pyc
deleted file mode 100644
index e8f9216..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergePK.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
index b837115..a8725da 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
index 7e736ef..866d730 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index f4a93de..10597b5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc
index e6c4c70..df920c1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 85b7047..40590ad 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
index 6f9a7fb..adc70d1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
index a2266e7..6e5c93f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
index 4b6b228..496a903 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeEvent.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeEvent.pyc
deleted file mode 100644
index 055399d..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeEvent.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeKing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeKing.pyc
deleted file mode 100644
index 976a24d..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeKing.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergePK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergePK.pyc
deleted file mode 100644
index 9640c01..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergePK.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc
index ab01aa9..29bc1c7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc
index 138091c..7eebbf3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc
index fc82515..7f60061 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc
index a3063aa..3392ab9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKSeasonOrder.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKSeasonOrder.pyc
new file mode 100644
index 0000000..4c93a5f
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKSeasonOrder.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeEvent.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeEvent.pyc
deleted file mode 100644
index 17142eb..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeEvent.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeKing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeKing.pyc
deleted file mode 100644
index f686b34..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeKing.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAddCnt.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAddCnt.pyc
deleted file mode 100644
index eb682e0..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAddCnt.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAward.pyc
deleted file mode 100644
index b2ab1e5..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAward.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKRecoverWinCost.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKRecoverWinCost.pyc
deleted file mode 100644
index ebd70a0..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKRecoverWinCost.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRank.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRank.pyc
deleted file mode 100644
index e5a2d8b..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRank.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRegister.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRegister.pyc
deleted file mode 100644
index dc70245..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRegister.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc
index 805cd5f..c98b65e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc
index cd277ed..42927dc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 4305bca..64f4e72 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
index 4d57e0e..3c18a20 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
index f4d8e1f..e9d6207 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini
index 14ded03..35cf95a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini
@@ -173,7 +173,7 @@
PacketSubCMD_1=0x6
PacketCallFunc_1=GameSever_PlayerCountByCountry
-[PlayerMergeWar]
+[GY_Query_CrossRealmReg]
ScriptName = Player\RemoteQuery\GY_Query_CrossRealmReg.py
Writer = hxp
Releaser = hxp
diff --git a/db/PyMongoDataServer/Collections/CollectionDefine.pyc b/db/PyMongoDataServer/Collections/CollectionDefine.pyc
index 91c30bc..ce50113 100644
--- a/db/PyMongoDataServer/Collections/CollectionDefine.pyc
+++ b/db/PyMongoDataServer/Collections/CollectionDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/Collections/DataServerPlayerData.pyc b/db/PyMongoDataServer/Collections/DataServerPlayerData.pyc
index 1015501..5ffaaf6 100644
--- a/db/PyMongoDataServer/Collections/DataServerPlayerData.pyc
+++ b/db/PyMongoDataServer/Collections/DataServerPlayerData.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
index d54780d..f1d8d3b 100644
--- a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
+++ b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index deb822c..24a2c55 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -10,3 +10,5 @@
9 2018-12-5 2018-12-7 1 110 1
10 2018-12-13 2018-12-16 1 110 1
11 2018-12-21 2018-12-23 1 110 1
+12 2018-12-28 2018-12-30 1 110 1
+13 2019-1-2 2019-1-4 1 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index 5a6e994..481b1e1 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -8,3 +8,5 @@
7 110 10000
8 110 10000
9 110 10000
+10 110 10000
+11 110 20000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index c2b6ff1..f55c47c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -64,6 +64,6 @@
63 2018-12-16 2018-12-16 110 0 [[52]] SellMail4
64 2018-12-17 2018-12-17 110 0 [[53]] SellMail4
65 2018-12-18 2018-12-18 110 0 [[54]] SellMail4
-66 2018-12-22 2018-12-22 110 0 [[55]] SellMail4
-67 2018-12-23 2018-12-23 110 0 [[56]] SellMail4
-68 2018-12-26 2018-12-26 110 0 [[57]] SellMail4
+66 2018-12-27 2018-12-27 110 0 [[55]] SellMail4
+67 2018-12-31 2018-12-31 110 0 [[56]] SellMail4
+68 2019-1-2 2019-1-2 110 0 [[57]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 7f23185..951ba29 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -40,5 +40,5 @@
39 2018-12-20 2018-12-20 120 110 0 [[120]] SellMail3
40 2018-12-21 2018-12-21 110 0 [[121]] SellMail3
41 2018-12-22 2018-12-22 110 0 [[122]] SellMail3
-42 2018-12-23 2018-12-23 110 0 [[123]] SellMail3
-43 2018-12-24 2018-12-24 110 0 [[124]] SellMail3
+42 2018-12-31 2018-12-31 110 0 [[123]] SellMail3
+43 2019-1-3 2019-1-3 110 0 [[124]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index 478460f..b901acd 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -28,5 +28,5 @@
27 2018-12-10 2018-12-10 5 0 12
28 2018-12-11 2018-12-11 5 0 13
29 2018-12-14 2018-12-14 5 0 14
-30 2018-12-20 2018-12-20 5 0 15
-31 2018-12-24 2018-12-24 5 0 16
+30 2018-12-29 2018-12-29 5 0 15
+31 2018-12-30 2018-12-30 5 0 16
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 7e1113e..834f8db 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -13,3 +13,5 @@
12 2018-12-20 2018-12-20 1 0 110 1
13 2018-12-24 2018-12-24 1 0 110 1
14 2018-12-26 2018-12-26 1 0 110 1
+15 2018-12-30 2018-12-30 1 0 110 1
+16 2019-1-4 2019-1-4 1 0 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 01f2fde..3da7170 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -53,6 +53,6 @@
2 52 25 1 [(912,1,1),(4694,1,1)] 4694 LimitGift3
4 53 130 1 [(913,1,1),(3807,10,1)] 3807 LimitGift3
4 54 130 1 [(4606,1,1),(2213,25,1)] 4606 LimitGift3
-4 55 131 1 [(4606,1,1),(2213,30,1)] 4606 LimitGift3
-4 56 150 1 [(913,1,1),(4694,10,1)] 913 LimitGift3
-2 57 27 1 [(912,1,1),(2213,10,1)] 912 LimitGift3
+2 55 24 1 [(105,10,1),(106,2,1)] 105 LimitGift3
+4 56 108 1 [(111,30,1),(112,12,1)] 111 LimitGift3
+4 57 110 1 [(913,1,1),(4694,6,1)] 913 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index a90ecd5..3171443 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -201,8 +201,8 @@
786 120 1 3807 2 1 [[912,1,1]] 3807 0 0 0 1 0 1 88 350 0 LimitGift6
787 121 1 983 20 1 [[4306,1000,1]] 983 0 0 0 1 0 1 388 1600 0 LimitGift6
788 122 1 4223 1 1 [[4151,150,1]] 4223 0 0 0 1 0 1 988 2780 0 LimitGift6
-789 123 1 111 30 1 [[112,12,1]] 111 0 0 0 1 0 1 388 1080 0 LimitGift6
-790 124 1 912 1 1 [[2213,15,1]] 912 0 0 0 1 0 1 88 337 0 LimitGift6
+789 123 1 4222 1 1 [[4151,25,1]] 4222 0 0 0 1 0 1 666 1530 0 LimitGift6
+790 124 1 4606 1 1 [[2213,50,1]] 4606 0 0 0 1 0 1 388 1625 0 LimitGift6
801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
802 19 0 2393 1 0 [] 0 0 0 0 0 0 1 60 0 0
803 19 0 2395 1 0 [] 0 0 0 0 0 0 1 60 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index cd9862d..0a43e25 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -37,9 +37,9 @@
14 6 0 {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]} AccumulatedTopUp2
14 30 1 {"1":[[4681,1,1],[5411,2,1]],"2":[[4681,1,1],[5411,2,1]],"3":[[4681,1,1],[5411,2,1]]} AccumulatedTopUp2
14 198 2 {"1":[[4680,1,1],[5411,5,1]],"2":[[4680,1,1],[5411,5,1]],"3":[[4680,1,1],[5411,5,1]]} AccumulatedTopUp2
-15 6 0 {"1":[[5303,100,1]],"2":[[5303,100,1]],"3":[[5303,100,1]]} AccumulatedTopUp2
-15 30 1 {"1":[[5412,20,1]],"2":[[5412,20,1]],"3":[[5412,20,1]]} AccumulatedTopUp2
-15 128 2 {"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]} AccumulatedTopUp2
-16 6 0 {"1":[[144,40,1]],"2":[[144,40,1]],"3":[[144,40,1]]} AccumulatedTopUp2
-16 30 1 {"1":[[153,20,1]],"2":[[153,20,1]],"3":[[153,20,1]]} AccumulatedTopUp2
-16 128 2 {"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]} AccumulatedTopUp2
+15 6 0 {"1":[[5412,1,1],[30,100,1]],"2":[[5412,1,1],[30,100,1]],"3":[[5412,1,1],[30,100,1]]} AccumulatedTopUp2
+15 30 1 {"1":[[4681,1,1],[30,100,1]],"2":[[4681,1,1],[30,100,1]],"3":[[4681,1,1],[30,100,1]]} AccumulatedTopUp2
+15 128 2 {"1":[[4680,1,1]],"2":[[4680,1,1]],"3":[[4680,1,1]]} AccumulatedTopUp2
+16 6 0 {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]} AccumulatedTopUp2
+16 30 1 {"1":[[4694,2,1],[30,100,1]],"2":[[4694,2,1],[30,100,1]],"3":[[4694,2,1],[30,100,1]]} AccumulatedTopUp2
+16 128 2 {"1":[[4694,3,1],[913,1,1]],"2":[[4694,3,1],[913,1,1]],"3":[[4694,3,1],[913,1,1]]} AccumulatedTopUp2
--
Gitblit v1.8.0