From 7bc8e7e4cc411cf31215493fca70923e9e8a91cd Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 27 九月 2018 16:12:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 28 ++++++++++++++++++----------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc | 0
db/PyMongoDataServer/PySysDB/tagChests.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ReGreatMaster.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 3 ++-
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 10 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0
19 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 4d54c4b..d5bcdd2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,6 @@
CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd NotifyInfoLoop IsDayReset
-1 test1 [] 2018-8-30 2018-8-31 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 0
-2 test2 [24,30] 2018-7-13 2018-7-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 0
-3 NationalDay [] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 1
-4 NationalDay1 [24] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 0
-5 test3 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 0
+1 test1 [] 2018-8-30 2018-8-31 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+2 test2 [24,30] 2018-7-13 2018-7-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+3 NationalDay [] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 1
+4 NationalDay1 [24] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+5 test3 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 11d57a7..48392ee 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 428460a..2e13acc 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 5c5d9fc..0e8a651 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 9da8278..0cc7f26 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -809,19 +809,15 @@
Writer = hxp
Releaser = hxp
RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 2
PacketCMD_1=0xA5
-PacketSubCMD_1=0x48
-PacketCallFunc_1=OnExchangeMasterExp
+PacketSubCMD_1=0x49
+PacketCallFunc_1=OnAddMasterSkillPoint
PacketCMD_2=0xA5
-PacketSubCMD_2=0x49
-PacketCallFunc_2=OnAddMasterSkillPoint
-
-PacketCMD_3=0xA5
-PacketSubCMD_3=0x50
-PacketCallFunc_3=OnResetMasterSkill
+PacketSubCMD_2=0x50
+PacketCallFunc_2=OnResetMasterSkill
;装备洗练
[EquipWash]
@@ -1315,4 +1311,16 @@
PacketCMD_1=0xA5
PacketSubCMD_1=0x11
-PacketCallFunc_1=OnTryFirstGoldItem
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 8f64043..0fe5197 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/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 3cb75ac..392b2a9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index c2e0b17..ce94e4e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ReGreatMaster.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ReGreatMaster.pyc
index 2a53b72..fecad0d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ReGreatMaster.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ReGreatMaster.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 1d46534..4c76825 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.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 38504a0..e805726 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/PlayerBindJadeWheel.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
new file mode 100644
index 0000000..07f1ce6
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.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 d36cba6..59c9f74 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/PlayerGreatMaster.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
index 2bd2e6a..4ced240 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.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 2262399..bc57bda 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/SkillShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
index bef8fb0..65be629 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 0b92739..dbaf807 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -176,3 +176,4 @@
2386 0 0 0 1 0
2387 0 0 0 1 1
2388 0 0 0 1 1
+2389 0 0 0 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 28d88e7..6fbd8fa 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -171,5 +171,6 @@
2384 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4250,1]]] [[9000,0],[10000,1]] [4250]
2385 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1 [[10000,[223,1]]] [[9000,0],[10000,1]] [223]
2386 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4251,1]]] [[9000,0],[10000,1]] [4251]
-2387 0 8353_1 [[1500,[8202,1]],[3000,[8215,1]],[4500,[8228,1]],[6000,[8241,1]],[7500,[8254,1]],[7800,[8203,1]],[8100,[8216,1]],[8400,[8229,1]],[8700,[8242,1]],[9000,[8255,1]],[9200,[8204,1]],[9400,[8217,1]],[9600,[8230,1]],[9800,[8243,1]],[10000,[8256,1]]] 3 [[740,[8354,1]],[2221,[8205,1]],[3702,[8218,1]],[5183,[8231,1]],[6664,[8244,1]],[8145,[8257,1]],[8478,[8206,1]],[8811,[8219,1]],[9144,[8232,1]],[9477,[8245,1]],[9810,[8258,1]],[9847,[8207,1]],[9884,[8220,1]],[9921,[8233,1]],[9958,[8246,1]],[10000,[8259,1]]] 1 [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259]
+2387 0 8353_1 [[1500,[8202,1]],[3000,[8215,1]],[4500,[8228,1]],[6000,[8241,1]],[7500,[8254,1]],[7800,[8203,1]],[8100,[8216,1]],[8400,[8229,1]],[8700,[8242,1]],[9000,[8255,1]],[9200,[8204,1]],[9400,[8217,1]],[9600,[8230,1]],[9800,[8243,1]],[10000,[8256,1]]] 4 [[740,[8354,1]],[2222,[8205,1]],[3703,[8218,1]],[5185,[8231,1]],[6666,[8244,1]],[8148,[8257,1]],[8481,[8206,1]],[8814,[8219,1]],[9148,[8232,1]],[9481,[8245,1]],[9814,[8258,1]],[9851,[8207,1]],[9888,[8220,1]],[9925,[8233,1]],[9962,[8246,1]],[10000,[8259,1]]] [[7300,0],[10000,1]] [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259]
2388 0 [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]] 1
+2389 0 8353_2 [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]] 7 [[1515,[8205,1]],[3030,[8218,1]],[4545,[8231,1]],[6060,[8244,1]],[7575,[8257,1]],[7878,[8206,1]],[8181,[8219,1]],[8484,[8232,1]],[8787,[8245,1]],[9090,[8258,1]],[9121,[8207,1]],[9151,[8220,1]],[9181,[8233,1]],[9212,[8246,1]],[9242,[8259,1]],[9393,[8209,1]],[9545,[8222,1]],[9696,[8235,1]],[9848,[8248,1]],[10000,[8261,1]]] [[3400,0],[10000,1]] [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 9d5774e..ce11c3e 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -495,6 +495,7 @@
2386 1 0 九黎妖虎碎片袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2387 1 0 神兽大宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2388 1 0 神兽小宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2389 1 0 神兽祝福宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0