From 9b4777443370dcfea5455637ec8202ec16daec77 Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期三, 23 一月 2019 14:26:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 16 ++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 3 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 6 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagZhuXianEquipDecompose.txt | 9 ++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt | 8 ----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 2 -
db/PyMongoDataServer/PySysDB/tagChests.txt | 4 ++
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 12 +++---
CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt | 11 ++---
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 3 +
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 2 -
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt | 11 ++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
23 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index c2587da..071b6eb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -7,5 +7,3 @@
6 tast6 [] [] 2018-12-8 2018-12-8 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
7 test7 [] [] 2018-12-9 2018-12-9 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
8 test8 [] [] 2018-12-15 2018-12-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-9 test9 [] [] 2019-1-26 2019-1-26 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-10 test10 [] [] 2019-1-27 2019-1-27 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index 4dd0e56..a00d55b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -6,13 +6,8 @@
5 OpenServer5 [] [] 5 5 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
6 OpenServer6 [] [] 6 6 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
7 OpenServer7 [] [] 7 7 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-8 OpenServer8 [] [] 8 8 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-9 OpenServer9 [] [] 9 9 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-10 OpenServer10 [] [] 10 10 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-11 OpenServer11 [] [] 11 11 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-12 OpenServer12 [] [] 12 12 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-13 OpenServer13 [] [] 13 13 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-14 OpenServer14 [] [] 14 14 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+8 OpenServer8 [] [] 8 9 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+12 OpenServer12 [] [] 12 13 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
15 New1 [] [] 2018-11-16 2018-11-16 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
16 New2 [] [] 2018-11-17 2018-11-17 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
17 New3 [] [] 2018-11-18 2018-11-18 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
@@ -30,3 +25,5 @@
29 December14 [] [] 2018-12-14 2018-12-14 {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
+32 test9 [] [] 2019-1-26 2019-1-26 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+33 test10 [] [] 2019-1-27 2019-1-27 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 9595e9f..d464665 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 ff09909..5b187e8 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc
index 7918c04..7908446 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 885c20d..2689b26 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1350,7 +1350,7 @@
Writer = hxp
Releaser = hxp
RegType = 0
-RegisterPackCount = 2
+RegisterPackCount = 3
PacketCMD_1=0xA3
PacketSubCMD_1=0x30
@@ -1360,6 +1360,10 @@
PacketSubCMD_2=0x31
PacketCallFunc_2=OnUnEquipZhuXianItem
+PacketCMD_3=0xA3
+PacketSubCMD_3=0x32
+PacketCallFunc_3=OnZhuXianEquipDecompose
+
;个推
[PlayerGeTui]
ScriptName = Player\PlayerGeTui.py
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 0453052..1cde8d5 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 1567e50..6d02ac7 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 3ddc28b..9a97620 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/Event/EventSrc/Operate_EquipStone.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc
index 3fda2ee..4dc88f0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.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 87d45d2..785b5c4 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/Item/EquipZhuXian.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc
index 56f4129..8ae5989 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index 145bbc9..db84b34 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.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 14c9e7c..13e1555 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/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index 021ef15..f17763c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -7,5 +7,3 @@
6 2018-12-8 2018-12-8 50 0 5
7 2018-12-9 2018-12-9 50 0 6
8 2018-12-15 2018-12-15 50 0 7
-9 2019-1-26 2019-1-26 50 0 8
-10 2019-1-27 2019-1-27 50 0 9
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index fc4c6c1..adeb271 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -6,13 +6,8 @@
5 5 5 5 0 3
6 6 6 5 0 3
7 7 7 5 0 4
-8 8 8 5 0 4
-9 9 9 5 0 17
-10 10 10 5 0 17
-11 11 11 5 0 18
-12 12 12 5 0 18
-13 13 13 5 0 19
-14 14 14 5 0 19
+8 8 9 5 0 22
+12 12 13 5 0 23
15 2018-11-16 2018-11-16 5 0 5
16 2018-11-17 2018-11-17 5 0 5
17 2018-11-18 2018-11-18 5 0 5
@@ -30,3 +25,5 @@
29 2018-12-14 2018-12-14 5 0 14
30 2018-12-29 2018-12-29 5 0 15
31 2018-12-30 2018-12-30 5 0 16
+32 2019-1-26 2019-1-26 5 0 20
+33 2019-1-27 2019-1-27 5 0 21
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 1bb69ac..f8e870a 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -234,3 +234,7 @@
2442 0 0 0 1 1
2443 0 0 0 0 1
2444 0 0 0 0 1
+2445 0 0 0 0 1
+2446 0 0 0 0 1
+2447 0 0 0 0 1
+2448 0 0 0 0 1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 9a74cf9..05aa639 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -232,3 +232,6 @@
2443 7205_1|7210_1|7215_1|7220_1|7225_1|7230_1|7235_1|7240_1|7245_1|7250_1|7255_1|7260_1
2444 4320_1|4315_1|4335_1|4395_1|4385_1|4365_1|4355_1|4350_1|4360_1|4390_1|4380_1|4375_1 4320_1|4315_1|4335_1|4395_1|4385_1|4365_1|4355_1|4350_1|4360_1|4390_1|4380_1|4375_1
2445 8211_1|8224_1|8237_1|8250_1|8263_1
+2446 8209_1|8222_1|8248_1|8232_1|8258_1
+2447 8209_1|8219_1|8245_1|8232_1|8258_1
+2448 8206_1|8219_1|8245_1|8232_1|8258_1
diff --git a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index da85ca9..d53bf19 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -22,11 +22,3 @@
6 300 1 [(4610,1,1),(2213,20,1)] ConsumptionRebate2
7 100 0 [(108,5,1),(197,2,1)] ConsumptionRebate3
7 300 1 [(109,2,1),(197,3,1)] ConsumptionRebate2
-8 100 0 [(101,20,1),(2213,6,1)] ConsumptionRebate3
-8 500 1 [(5801,1,1),(912,1,1),(110,20,1)] ConsumptionRebate3
-8 2000 2 [(5800,1,1),(4010,2,1),(4694,10,1),(2213,10,1)] ConsumptionRebate3
-8 6000 3 [(5802,1,1),(4010,2,1),(913,10,1),(2213,10,1)] ConsumptionRebate2
-9 100 0 [(104,20,1),(2213,6,1)] ConsumptionRebate3
-9 500 1 [(5801,1,1),(912,1,1),(110,20,1)] ConsumptionRebate3
-9 2000 2 [(5800,1,1),(4010,2,1),(4694,10,1),(2213,10,1)] ConsumptionRebate3
-9 6000 3 [(5802,1,1),(4010,2,1),(913,10,1),(2213,10,1)] ConsumptionRebate2
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 4a84414..47ba111 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -49,3 +49,19 @@
18 30 1 {"1":[[5411,3,1],[5303,100,1],[4306,50,1],[4007,2,1]],"2":[[5411,3,1],[5303,100,1],[4306,50,1],[4007,2,1]],"3":[[5411,3,1],[5303,100,1],[4306,50,1],[4007,2,1]]} AccumulatedTopUp2
19 6 0 {"1":[[5410,1,1],[181,5,1],[802,1,1]],"2":[[5410,1,1],[181,5,1],[802,1,1]],"3":[[5410,1,1],[181,5,1],[802,1,1]]} AccumulatedTopUp2
19 30 1 {"1":[[1128,1,1],[5412,20,1],[4306,50,1],[4010,2,1]],"2":[[1128,1,1],[5412,20,1],[4306,50,1],[4010,2,1]],"3":[[1128,1,1],[5412,20,1],[4306,50,1],[4010,2,1]]} AccumulatedTopUp2
+20 100 0 {"1":[[101,20,1],[2213,6,1]],"2":[[101,20,1],[2213,6,1]],"3":[[101,20,1],[2213,6,1]]} AccumulatedTopUp2
+20 500 1 {"1":[[5801,1,1],[912,1,1],[110,20,1]],"2":[[5801,1,1],[912,1,1],[110,20,1]],"3":[[5801,1,1],[912,1,1],[110,20,1]]} AccumulatedTopUp2
+20 2000 2 {"1":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]],"2":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]],"3":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]]} AccumulatedTopUp2
+20 6000 3 {"1":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]],"2":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]],"3":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]]} AccumulatedTopUp2
+21 100 0 {"1":[[104,20,1],[2213,6,1]],"2":[[104,20,1],[2213,6,1]],"3":[[104,20,1],[2213,6,1]]} AccumulatedTopUp2
+21 500 1 {"1":[[5801,1,1],[912,1,1],[110,20,1]],"2":[[5801,1,1],[912,1,1],[110,20,1]],"3":[[5801,1,1],[912,1,1],[110,20,1]]} AccumulatedTopUp2
+21 2000 2 {"1":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]],"2":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]],"3":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]]} AccumulatedTopUp2
+21 6000 3 {"1":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]],"2":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]],"3":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]]} AccumulatedTopUp2
+22 300 0 {"1":[[4610,1,1],[881,1,1],[4151,10,1]],"2":[[4610,1,1],[881,1,1],[4151,10,1]],"3":[[4610,1,1],[881,1,1],[4151,10,1]]} AccumulatedTopUp2
+22 1000 1 {"1":[[4608,1,1],[5410,3,1],[912,2,1]],"2":[[4608,1,1],[5410,3,1],[912,2,1]],"3":[[4608,1,1],[5410,3,1],[912,2,1]]} AccumulatedTopUp2
+22 3000 2 {"1":[[4606,1,1],[5411,3,1],[4694,5,1]],"2":[[4606,1,1],[5411,3,1],[4694,5,1]],"3":[[4606,1,1],[5411,3,1],[4694,5,1]]} AccumulatedTopUp2
+22 5000 3 {"1":[[63,1,1],[193,1,1],[913,1,1],[4010,4,1]],"2":[[63,1,1],[193,1,1],[913,1,1],[4010,4,1]],"3":[[63,1,1],[193,1,1],[913,1,1],[4010,4,1]]} AccumulatedTopUp2
+23 300 0 {"1":[[5801,1,1],[881,1,1],[181,10,1]],"2":[[5801,1,1],[881,1,1],[181,10,1]],"3":[[5801,1,1],[881,1,1],[181,10,1]]} AccumulatedTopUp2
+23 1000 1 {"1":[[5800,1,1],[5411,5,1],[912,2,1]],"2":[[5800,1,1],[5411,5,1],[912,2,1]],"3":[[5800,1,1],[5411,5,1],[912,2,1]]} AccumulatedTopUp2
+23 3000 2 {"1":[[5802,1,1],[2390,1,1],[5411,5,1]],"2":[[5802,1,1],[2390,1,1],[5411,5,1]],"3":[[5802,1,1],[2390,1,1],[5411,5,1]]} AccumulatedTopUp2
+23 5000 3 {"1":[[64,1,1],[4183,1,1],[913,1,1],[4010,4,1]],"2":[[64,1,1],[4183,1,1],[913,1,1],[4010,4,1]],"3":[[64,1,1],[4183,1,1],[913,1,1],[4010,4,1]]} AccumulatedTopUp2
diff --git a/db/PyMongoDataServer/PySysDB/tagZhuXianEquipDecompose.txt b/db/PyMongoDataServer/PySysDB/tagZhuXianEquipDecompose.txt
new file mode 100644
index 0000000..4b93559
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagZhuXianEquipDecompose.txt
@@ -0,0 +1,9 @@
+ClassLV DecomposeInfo
+1 {5413:[(2000,0),(3000,1),(10000,2)],5414:[(2000,0),(3000,1),(10000,2)]}
+2 {5413:[(2000,0),(3000,1),(10000,2)],5414:[(2000,0),(3000,1),(10000,2)]}
+3 {5413:[(2000,0),(3000,1),(10000,2)],5414:[(2000,0),(3000,1),(10000,2)]}
+5 {5413:[(2000,0),(3000,1),(10000,2)],5414:[(2000,0),(3000,1),(10000,2)]}
+6 {5413:[(2000,0),(3000,1),(10000,2)],5414:[(2000,0),(3000,1),(10000,2)]}
+7 {5413:[(2000,0),(3000,1),(10000,2)],5414:[(2000,0),(3000,1),(10000,2)]}
+8 {5413:[(2000,0),(3000,1),(10000,2)],5414:[(2000,0),(3000,1),(10000,2)]}
+9 {5413:[(2000,0),(3000,1),(10000,2)],5414:[(2000,0),(3000,1),(10000,2)]}
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index bd49cd3..49764a5 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -693,6 +693,9 @@
2443 1 0 红色选择宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 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
2444 1 0 红色符印宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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
2445 1 0 红色神兽装备随机宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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
+2446 1 0 蛮牛激活宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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
+2447 1 0 猿猴激活宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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
+2448 1 0 天狗激活宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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
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 600 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 840 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 1080 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
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 59e8d1b..29c2ec9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -691,14 +691,14 @@
23107 复仇之刃（8层） 23100 8 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 8000 3 0 10 8000 3 0 7 8000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0
23108 复仇之刃（9层） 23100 9 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 9000 3 0 10 9000 3 0 7 9000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0
23109 复仇之刃（10层） 23100 10 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 10000 3 0 10 10000 3 0 7 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0
-45000 诛仙一击 45000 1 1 2 13 0 20 0 0 0 0 0 0 0 1000 0 0 0 0 0 200 1000 1 0 201 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-45001 唯快不破 45001 1 1 2 13 0 16 1 0 0 0 10 0 0 1000 0 0 0 0 0 17 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 500 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+45000 诛仙一击 45000 1 1 2 13 0 20 0 0 0 0 0 0 0 1000 0 0 0 0 0 131 1000 1 0 132 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+45001 唯快不破 45001 1 1 2 13 0 16 1 0 0 0 10 0 0 1000 0 0 0 0 0 4004 500 0 0 17 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45002 终极斩杀 45002 1 1 2 13 0 7 1 0 0 0 0 0 0 1000 0 0 0 0 0 4069 2500 2500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 7000 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-45100 诛仙一击 45100 1 1 4 13 0 20 0 0 0 0 0 0 0 1000 0 0 0 0 0 200 1000 1 0 201 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-45101 唯快不破 45101 1 1 4 13 0 16 1 0 0 0 10 0 0 1000 0 0 0 0 0 17 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 500 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+45100 诛仙一击 45100 1 1 4 13 0 20 0 0 0 0 0 0 0 1000 0 0 0 0 0 131 1000 1 0 132 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+45101 唯快不破 45101 1 1 4 13 0 16 1 0 0 0 10 0 0 1000 0 0 0 0 0 4004 500 0 0 17 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45102 终极斩杀 45102 1 1 4 13 0 7 1 0 0 0 0 0 0 1000 0 0 0 0 0 4069 2500 2500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 7000 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-45200 诛仙一击 45200 1 1 8 13 0 20 0 0 0 0 0 0 0 1000 0 0 0 0 0 200 1000 1 0 201 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-45201 唯快不破 45201 1 1 8 13 0 16 1 0 0 0 10 0 0 1000 0 0 0 0 0 17 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 500 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+45200 诛仙一击 45200 1 1 8 13 0 20 0 0 0 0 0 0 0 1000 0 0 0 0 0 131 1000 1 0 132 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+45201 唯快不破 45201 1 1 8 13 0 16 1 0 0 0 10 0 0 1000 0 0 0 0 0 4004 500 0 0 17 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45202 终极斩杀 45202 1 1 8 13 0 7 1 0 0 0 0 0 0 1000 0 0 0 0 0 4069 2500 2500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 7000 0 0 0 0 0 0 0 4 0 0 0 0 0 0
46000 强健之体 46000 1 2 0 12 0 23 0 0 0 0 0 0 0 0 0 0 0 0 0 551 1800 7 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 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
46001 强健之体 46001 2 2 0 12 0 23 0 0 0 0 0 0 0 0 0 0 0 0 0 551 2500 7 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 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
--
Gitblit v1.8.0