From c4d09e242159eec1eb88a97286d9a60c97e6c7c8 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 24 十一月 2018 18:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagCTG.txt | 58 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt | 35 +++++
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 16 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 4
db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt | 13 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 46 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc | 0
db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 9 +
db/PyMongoDataServer/PySysDB/tagNPCShow.txt | 26 ++--
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 24 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt | 45 +++---
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 10
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 8
db/PyMongoDataServer/PySysDB/tagGodWeapon.txt | 18 +-
db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 4
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 1
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
25 files changed, 188 insertions(+), 131 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
index 8342571..577a4b0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
@@ -1,22 +1,23 @@
-DataMapID OpenServerDay OpenTime CanEnterTime NotifyInfo
-31020 0 {} 0 {}
-31040 0 {} 0 {}
-31090 0 {} 0 {}
-41110 0 {} 0 {}
-31080 0 {} 0 {}
-31110 0 {} 0 {}
-31130 0 {} 0 {}
-31140 0 {} 0 {}
-31150 0 {} 0 {}
-31170 3 {"2":[[21,00]],"4":[[21,00]],"6":[[21,00]]} 30 {}
-31180 0 {"1":[[20,30]],"3":[[20,30]],"5":[[20,30]]} 30 {}
-31190 0 {} 0 {}
-31210 0 {} 0 {}
-31230 0 {"2":[[20,30]],"4":[[20,30]],"6":[[20,30]]} 15 {}
-31240 0 {} 0 {}
-40000 0 {"1":[[20,0]],"3":[[20,0]],"5":[[20,0]]} 30 {-5:["FB_liubo_54470", [5]], -3:["FB_liubo_54470", [3]], -1:["FB_liubo_54470", [1]]}
-51010 0 {} 0 {}
-60010 0 {} 0 {}
-31160 0 {"1":[[20,0]],"3":[[20,0]],"5":[[20,0]]} 30 {}
-31250 0 {} 0 {}
-52010 0 {} 0 {}
+DataMapID HelpPoint
+31020 0
+31040 0
+31090 0
+41110 0
+31080 0
+31110 50
+31130 0
+31140 0
+31150 0
+31170 0
+31180 120
+31190 0
+31210 0
+31220 0
+31230 0
+31240 0
+51010 30
+60010 25
+31160 0
+31250 0
+52010 0
+31010 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
new file mode 100644
index 0000000..1a518c4
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
@@ -0,0 +1,35 @@
+VIPPrivilege VIP0 VIP1 VIP2 VIP3 VIP4 VIP5 VIP6 VIP7 VIP8 VIP9 VIP10 VIP11 VIP12 VIP13 VIP14 VIP15
+1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+2 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
+3 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
+4 2000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+5 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+6 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+7 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+8 0 0 0 0 0 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000
+9 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+11 0 0 0 0 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000
+12 0 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000
+13 3 4 5 6 10 11 12 15 16 17 20 20 22 24 26 28
+14 2 3 4 5 8 9 10 13 14 15 20 16 18 20 22 24
+15 0 0 0 2 3 4 4 5 6 7 8 9 10 11 12 12
+16 0 0 1 1 1 2 2 2 3 3 4 5 6 6 6 6
+17 1 1 2 2 3 3 4 4 4 4 4 4 4 4 4 4
+18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2
+19 0 0 1 1 3 3 5 5 7 7 9 11 11 13 13 15
+20 0 0 0 0 1 1 1 2 2 2 2 3 3 3 3 3
+21 1 1 1 1 2 2 3 3 3 3 3 3 3 3 3 3
+22 0 0 0 0 0 1 1 1 1 1 2 2 2 2 2 2
+23 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
+24 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+25 2 3 4 5 6 7 8 10 12 14 16 18 20 22 24 25
+26 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+27 0 0 1 2 2 3 3 4 4 4 4 5 5 5 5 5
+28 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+29 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+30 0 1 1 2 2 3 5 7 10 12 15 15 15 15 15 15
+31 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+32 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+33 0 0 0 500 500 500 500 1000 1000 1000 1000 1000 1000 1000 1000 1000
+34 0 0 0 5000 5000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index bf78a5d..9c2f838 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index 3cfc31a..015cd6b 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.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 90ba154..f46382e 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/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index f85c917..22c6d2a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
index 9ecc3b3..ff651dd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.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 531eb4a..a0f9fa4 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/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
index 84b026c..6c2fc9d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
index b0f0137..105bf46 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
index a9b78fa..e99c9e5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index 7316e69..1abdd16 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -1,29 +1,29 @@
-RecordID DailyBuyCount GainGold GainGoldPaper FirstGoldPaperPrize GainItemList
-101 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-102 0 100 10 100 []
-103 0 300 30 300 []
-104 0 980 100 980 []
-105 0 1280 138 1280 []
-106 0 1980 248 1980 []
-107 0 3280 468 3280 []
-108 0 6480 1088 6480 []
-109 0 30000 5888 0 []
-110 0 10 1 0 []
-111 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]]
-112 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]
-113 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]]
-2 0 60 6 60 []
-201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-202 0 60 6 60 []
-203 0 300 30 300 []
-204 0 980 100 980 []
-205 0 1280 138 1280 []
-206 0 1980 248 1980 []
-207 0 3280 468 3280 []
-208 0 6480 1088 6480 []
-209 0 30000 5888 0 []
-210 0 1 0 0 []
-211 0 1 0 0 []
-212 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]]
-213 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]
-214 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]]
+RecordID DailyBuyCount GainGold GainGoldPaper FirstGoldPaperPrize GainItemList NotifyMark
+101 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
+102 0 100 10 100 []
+103 0 300 30 300 []
+104 0 980 100 980 []
+105 0 1280 138 1280 []
+106 0 1980 248 1980 []
+107 0 3280 468 3280 []
+108 0 6480 1088 6480 []
+109 0 30000 5888 0 []
+110 0 10 1 0 []
+111 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1
+112 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]] Bargaingift2
+113 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]] Bargaingift3
+2 0 60 6 60 []
+201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
+202 0 60 6 60 []
+203 0 300 30 300 []
+204 0 980 100 980 []
+205 0 1280 138 1280 []
+206 0 1980 248 1980 []
+207 0 3280 468 3280 []
+208 0 6480 1088 6480 []
+209 0 30000 5888 0 []
+210 0 1 0 0 []
+211 0 1 0 0 []
+212 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1
+213 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]] Bargaingift2
+214 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]] Bargaingift3
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 373ef7f..3654a30 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -198,3 +198,4 @@
2411 0 181_300
4008 4011_5
4009 4011_5
+2412 [[5000,[3503,1]],[10000,[3513,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index 2b05443..5cf8991 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -1,23 +1,23 @@
-DataMapID DayTimes DayReKind WeekTimes WeekReKind RewardRate BuyTimesID ExtraTimesID MWPrivilegeID GuardPick OfflineTime HelpPoint
-31020 0 0 0 0 0 0 0 0 1 180 0
-31040 0 0 0 0 0 0 0 0 0 0 0
-31090 0 0 0 0 0 0 0 0 0 0 0
-41110 0 0 0 0 0 0 0 0 0 0 0
-31080 2 2 0 0 75|60|45|30|21 21 0 0 1 0 0
-31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 0
-31130 0 0 0 0 75|60|45|30|16 0 0 0 1 0 0
-31140 10 2 0 0 0 0 0 0 1 0 0
-31150 1 2 0 0 0 0 19 0 1 180 0
-31170 1 2 0 0 75|60|45|30|20 0 0 0 1 0 0
-31180 1 2 0 0 100|90|80|70|60 0 0 0 1 0 120
-31190 2 2 0 0 75|60|45|30|18 17 0 0 1 0 0
-31210 0 0 0 0 0 0 0 0 0 0 0
-31220 2 2 0 0 0 0 0 0 0 0 0
-31230 1 2 0 0 0 0 0 0 0 0 0
-31240 0 2 0 0 0 0 15 0 1 0 0
-51010 2 2 0 0 100|80|70|60|40 29 0 0 1 0 0
-60010 3 2 0 0 75|60|45|30|21 0 0 0 1 0 0
-31160 1 2 0 0 0 0 0 0 1 0 0
-31250 0 0 0 0 0 0 0 0 0 0 0
-52010 5 2 0 0 0 25 0 0 1 180 0
-31010 3 2 0 0 0 0 0 0 0 180 0
+DataMapID DayTimes DayReKind WeekTimes WeekReKind RewardRate BuyTimesID ExtraTimesID MWPrivilegeID GuardPick OfflineTime FBPoint HelpPoint DayHelpCountMax
+31020 0 0 0 0 0 0 0 0 1 180 0 0 0
+31040 0 0 0 0 0 0 0 0 0 0 0 0 0
+31090 0 0 0 0 0 0 0 0 0 0 0 0 0
+41110 0 0 0 0 0 0 0 0 0 0 0 0 0
+31080 2 2 0 0 75|60|45|30|21 21 0 0 1 0 0 0 0
+31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 100 50 0
+31130 0 0 0 0 75|60|45|30|16 0 0 0 1 0 0 0 0
+31140 0 2 0 0 0 0 0 0 1 0 0 0 0
+31150 1 2 0 0 0 0 19 0 1 180 0 0 0
+31170 1 2 0 0 75|60|45|30|20 0 0 0 1 0 0 0 0
+31180 1 2 0 0 100|90|80|70|60 0 0 0 1 0 120 120 1
+31190 2 2 0 0 75|60|45|30|18 17 0 0 1 0 0 0 0
+31210 0 0 0 0 0 0 0 0 0 0 0 0 0
+31220 2 2 0 0 0 0 0 0 0 0 0 0 0
+31230 1 2 0 0 0 0 0 0 0 0 0 0 0
+31240 0 2 0 0 0 0 15 0 1 0 0 0 0
+51010 2 2 0 0 100|80|70|60|40 29 0 0 1 0 60 30 0
+60010 3 2 0 0 75|60|45|30|21 0 0 0 1 0 50 25 0
+31160 1 2 0 0 0 0 0 0 1 0 0 0 0
+31250 0 0 0 0 0 0 0 0 0 0 0 0 0
+52010 5 2 0 0 0 25 0 0 1 180 0 0 0
+31010 3 2 0 0 0 0 0 0 0 180 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index a91bd14..c9933c1 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -55,17 +55,17 @@
31220 0 31220 110 0 0 0 0 0 0 0 0 [12,23]
31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [900,[30,20,10,9,8,7,6,5,4,3,2,1]]
31240 0 31240 0 0 0 4010 2 80 0 0 0 [32,16] [3,1800,15,101]
-51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [5,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [60,30,30,30,30] [793536, [141,45]]
-51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [5,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [60,30,30,30,30] [831840, [141,36], [142,6]]
-51010 2 51010 155 500 0 0 0 0 0 0 0 [126,9,3] [5,360,10] [{5101031:1, 5101032:1}] [60,30,30,30,30] [1017600, [141,13], [142,18], [143,5]]
-51010 3 51010 155 500 0 0 0 0 0 0 0 [30,62,3] [5,360,10] [{5101041:0, 5101042:1}] [60,30,30,30,30] [1169280, [142,24], [143,8]]
-51010 4 51010 155 500 0 0 0 0 0 0 0 [84,63,3] [5,360,10] [{5101051:1, 5101052:0}] [60,30,30,30,30] [1404720, [142,9], [143,15], [144,6]]
-51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [5,360,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [60,30,30,30,30] [1666080, [143,18], [144,9]]
-51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [5,360,10] [{5101071:1, 5101072:0}] [60,30,30,30,30] [1953360, [144,15]]
-51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [5,360,10] [{5101081:1}] [60,30,30,30,30] [2265840, [153,15]]
-60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [5,1800,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
-60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [5,1800,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
-60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [5,1800,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
+51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [3,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [60,30,30,30,30] [793536, [141,45]]
+51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [3,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [60,30,30,30,30] [831840, [141,36], [142,6]]
+51010 2 51010 155 500 0 0 0 0 0 0 0 [126,9,3] [3,360,10] [{5101031:1, 5101032:1}] [60,30,30,30,30] [1017600, [141,13], [142,18], [143,5]]
+51010 3 51010 155 500 0 0 0 0 0 0 0 [30,62,3] [3,360,10] [{5101041:0, 5101042:1}] [60,30,30,30,30] [1169280, [142,24], [143,8]]
+51010 4 51010 155 500 0 0 0 0 0 0 0 [84,63,3] [3,360,10] [{5101051:1, 5101052:0}] [60,30,30,30,30] [1404720, [142,9], [143,15], [144,6]]
+51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [3,360,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [60,30,30,30,30] [1666080, [143,18], [144,9]]
+51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [3,360,10] [{5101071:1, 5101072:0}] [60,30,30,30,30] [1953360, [144,15]]
+51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [3,360,10] [{5101081:1}] [60,30,30,30,30] [2265840, [153,15]]
+60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [3,1800,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
+60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [3,1800,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
+60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [3,1800,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
31160 0 31160 110 230 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311601,311603] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
31160 1 31160 231 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311604,311605] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311606,311607] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
@@ -92,5 +92,5 @@
52010 19 52010 455 0 0 0 0 0 0 0 0 [17,19,8] 10
31130 0 31130 0 500 0 0 0 0 0 0 0 [29,12] [3,180,10,10] 101
31110 0 31110 80 500 0 0 0 0 0 0 0 [19,13,3] [3, 180, 10, [210, 180, 150, 120], [51,13]] 101
-31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [5, 180, 10, [360, 245, 185, 125], [51,13]] 102
+31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [3, 180, 10, [360, 245, 185, 125], [51,13]] 102
31210 0 31210 0 500 0 0 0 0 0 0 0 [12,6,3] [10, 3600, 60, [1800, 900, 600, 300]] [101,30903001]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 8f85f9f..7487aed 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -104,7 +104,7 @@
GodWeaponSys {1:'GetGodWeapon',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon2'}
GodLv {1:[50,150,200,250,325,500,650],2:[50,150,200,250,325,500,650],3:[50,150,200,250,325,500,650]}
GodMagicExp {"1":[10,10],"2":[15,15],"4":[25,25]}
-MagicExterior {"1":4399,"2":43999,"3":439999,"4":436999}
+MagicExterior {"1":0,"2":0,"3":0,"4":100386}
WorldLvExpRate int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000) 0 0 0 0
EquipSuitLimit 4 2 3 0 0
EquipSuitColorStar {"1":[4,1],"2":[5,2]} 2
@@ -285,10 +285,10 @@
GoldInvestLVLimit 300
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|4011|951|956|4501|4502
TreasureSet {0:10,1:10} {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}
-TreasureSet11 [1, 10] [250, 2000] [[982,1], [982, 10]] [0, 0] [10, 100]
-TreasureSet21 max(baseRate,int(min(curLuck,30)*2+min(max(curLuck-30,0),10)*4+min(max(curLuck-40,0),20)*10)) [1, 10] 1000
+TreasureSet11 [1, 10] [80, 640] [[982,1], [982, 10]] [0, 0] [4, 40]
+TreasureSet21 max(baseRate,min(int(min(curLuck,300)*0.2+min(max(curLuck-300,0),100)*0.4+min(max(curLuck-400,0),200)*1)+max(curLuck-999,0),10000)) [10, 100] 1000
TreasureSet12 [1, 10] [30, 240] [[983,1], [983, 10]] [1440, 0] [2, 20]
-TreasureSet22 min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
+TreasureSet22 min(min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))+max(curLuck-999,0),10000) [3, 30] 1000
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50 5
diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
index 1e13615..d7d290d 100644
--- a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
+++ b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
@@ -48,7 +48,7 @@
1 47 15 6 60395 0
1 48 15 6 61681 0
1 49 15 6 62975 0
-1 50 16 6 64276 48040
+1 50 16 6 64276 48040 GetMagicSkill5
1 51 16 6 65584 0
1 52 16 6 66899 0
1 53 16 6 68221 0
@@ -198,7 +198,7 @@
1 197 50 6 291413 0
1 198 50 6 293059 0
1 199 50 6 294706 0
-1 200 50 6 296353 48045
+1 200 50 6 296353 48045 GetMagicSkill6
1 201 54 6 298002 0
1 202 58 6 299652 0
1 203 62 6 301303 0
@@ -323,7 +323,7 @@
1 322 251 6 604138 0
1 323 251 6 607044 0
1 324 251 6 609951 0
-1 325 251 6 612859 48050
+1 325 251 6 612859 48050 GetMagicSkill7
1 326 253 6 615767 0
1 327 255 6 618677 0
1 328 256 6 621588 0
@@ -698,7 +698,7 @@
2 47 25 7 4130 0
2 48 25 7 4193 0
2 49 25 7 4257 0
-2 50 25 7 4320 48055
+2 50 25 7 4320 48055 GetMagicSkill8
2 51 25 7 4384 0
2 52 25 7 4448 0
2 53 25 7 4512 0
@@ -848,7 +848,7 @@
2 197 79 7 14269 0
2 198 80 7 14341 0
2 199 80 7 14413 0
-2 200 80 7 14484 48060
+2 200 80 7 14484 48060 GetMagicSkill9
2 201 86 7 14556 0
2 202 91 7 14628 0
2 203 97 7 14700 0
@@ -973,7 +973,7 @@
2 322 380 7 33101 0
2 323 381 7 33279 0
2 324 381 7 33458 0
-2 325 381 7 33637 48065
+2 325 381 7 33637 48065 GetMagicSkill10
2 326 384 7 33815 0
2 327 386 7 33994 0
2 328 389 7 34173 0
@@ -1749,7 +1749,7 @@
4 47 39 73|74 243|8000 0
4 48 40 73|74 247|8000 0
4 49 40 73|74 251|8000 0
-4 50 40 73|74 255|8000 48070
+4 50 40 73|74 255|8000 48070 GetMagicSkill11
4 51 40 73|74 260|8000 0
4 52 40 73|74 264|8000 0
4 53 41 73|74 268|8000 0
@@ -1899,7 +1899,7 @@
4 197 134 73|74 955|8000 0
4 198 135 73|74 960|8000 0
4 199 136 73|74 966|8000 0
-4 200 136 73|74 971|8000 48075
+4 200 136 73|74 971|8000 48075 GetMagicSkill12
4 201 145 73|74 976|8000 0
4 202 154 73|74 982|8000 0
4 203 163 73|74 988|8000 0
@@ -2024,7 +2024,7 @@
4 322 636 73|74 3053|8000 0
4 323 637 73|74 3073|8000 0
4 324 638 73|74 3093|8000 0
-4 325 638 73|74 3113|8000 48080
+4 325 638 73|74 3113|8000 48080 GetMagicSkill13
4 326 642 73|74 3133|8000 0
4 327 646 73|74 3153|8000 0
4 328 651 73|74 3174|8000 0
diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
new file mode 100644
index 0000000..fbff04f
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
@@ -0,0 +1,13 @@
+type level notifycode
+1 150 GetMagicEffect4
+1 250 GetMagicEffect5
+1 500 GetMagicEffect6
+2 150 GetMagicEffect7
+2 250 GetMagicEffect8
+2 500 GetMagicEffect9
+3 150 GetMagicEffect1
+3 250 GetMagicEffect2
+3 500 GetMagicEffect3
+4 150 GetMagicEffect10
+4 250 GetMagicEffect11
+4 500 GetMagicEffect12
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index 71fdd9e..0337c3c 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -212,9 +212,12 @@
214 0 6616 0 9013|9014 3 0 0 0 10000 0 0 0 EquipComposeSuccess4 1
215 0 6617 0 9015|9016 3 0 0 0 10000 0 0 0 EquipComposeSuccess5 1
216 0 6618 0 9015|9016 3 0 0 0 10000 0 0 0 EquipComposeSuccess5 1
-217 0 9075 0 9074 3 0 0 0 10000 0 0 0 EquipComposeSuccess6 1
-218 0 9077 0 9075 3 5305 10 0 10000 0 0 0 EquipComposeSuccess1 1
-219 0 9078 0 9077 3 5306 20 0 10000 0 0 0 EquipComposeSuccess2 1
+244 0 9062 0 9051 5 0 0 0 10000 0 0 0 XianComposeSucces1 1
+245 0 9073 0 9062 4 0 0 0 10000 0 0 0 XianComposeSucces2 1
+246 0 9074 0 9073 4 0 0 0 10000 0 0 0 XianComposeSucces3 1
+217 0 9075 0 9074 3 0 0 0 10000 0 0 0 XianComposeSucces4 1
+218 0 9077 0 9075 3 5305 10 0 10000 0 0 0 XianComposeSucces5 1
+219 0 9078 0 9077 3 5306 20 0 10000 0 0 0 XianComposeSucces6 1
220 0 3502 0 0 0 3501 3 0 10000 0 0 0 0 1
221 0 3503 0 0 0 3502 3 0 10000 0 0 0 0 1
222 0 3504 0 0 0 3503 3 0 10000 0 0 0 0 1
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCShow.txt b/db/PyMongoDataServer/PySysDB/tagNPCShow.txt
index 720e749..cada177 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCShow.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCShow.txt
@@ -18,22 +18,22 @@
31103004 41110 4 9300 0 2
30902001 41110 0 6500 0 2
31103005 41110 5 8750 0 2
-31203011 41110 19 6200 0 2
-31203009 41110 17 7200 0 2
+31203079 41110 19 6200 0 2
+31203061 41110 17 7200 0 2
31103008 41110 8 7500 0 2
31103006 41110 6 7000 0 2
-31203006 41110 14 7150 0 2
-31203004 41110 12 7200 0 2
-31203005 41110 13 8150 0 2
+31203034 41110 14 7150 0 2
+31203016 41110 12 7200 0 2
+31203025 41110 13 8150 0 2
31103007 41110 7 8000 0 2
31203001 41110 9 7200 0 2
-31203002 41110 10 10250 0 2
-31203003 41110 11 9150 0 2
-31203007 41110 15 7000 0 2
-31203008 41110 16 6500 0 2
-31203010 41110 18 7500 0 2
-31203014 41110 22 8000 0 2
-31203012 41110 20 6150 0 2
-31203013 41110 21 6020 0 2
+31203004 41110 10 10250 0 2
+31203009 41110 11 9150 0 2
+31203043 41110 15 7000 0 2
+31203052 41110 16 6500 0 2
+31203070 41110 18 7500 0 2
+31203106 41110 22 8000 0 2
+31203088 41110 20 6150 0 2
+31203097 41110 21 6020 0 2
31103010 41110 23 9100 0 2
31103011 41110 24 8100 0 2
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index af80174..c87a941 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -102,15 +102,15 @@
31401002 0 2 0 2000 10000 0 8000 3 9900 50 24 0 0 0 0
31403002 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0
31401003 0 2 0 800 10000 0 8000 3 9900 50 24 0 0 0 0
-31403003 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401004 0 2 0 800 10000 1000 8000 3 9900 50 12 0 0 0 0
+31403003 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0
+31401004 0 2 0 600 10000 1000 8000 3 9900 50 12 0 0 0 0
31403004 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
31401005 0 2 0 1500 10000 0 8000 3 9900 50 12 0 0 0 0
-31403005 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401006 0 2 0 800 10000 0 8000 3 9900 50 12 0 0 0 0
+31403005 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0
+31401006 0 2 0 600 10000 0 8000 3 9900 50 12 0 0 0 0
31403006 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
31401007 0 2 0 1000 10000 0 8000 3 9900 50 12 0 0 0 0
31403007 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0
31401008 0 2 0 500 10000 0 8000 3 9900 50 12 0 0 0 0
-31403008 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
+31403008 0 2 0 5800 10000 0 8000 3 9900 50 1 0 0 50 0
31401009 0 2 0 1500 10000 0 8000 3 9900 50 12 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 96f3226..4ee2f0e 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -27,7 +27,7 @@
62 0 0 4004 1 0 [] 0 0 0 180 0 0 1 20 0 0
63 2 0 957 1 0 [] 0 0 0 0 0 0 1 50 0 0
64 2 0 2050 1 0 [] 0 0 0 0 0 0 1 50 0 0
-65 2 0 982 1 0 [] 0 0 0 0 0 0 1 250 0 0
+65 2 0 982 1 0 [] 0 0 0 0 0 0 1 80 0 0
66 2 0 983 1 0 [] 0 0 0 0 0 0 1 30 0 0
67 2 0 953 1 0 [] 0 0 0 0 0 0 1 500 0 0
68 2 0 947 1 0 [] 0 0 0 0 0 0 1 1000 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index aafd394..ed9d575 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,8 +1,10 @@
TreasureType MinLV GridItemInfo JobItemList GridItemRateListFree FreeGridItemRateList2 FreeGridItemRateList3 GridItemRateList1 GridItemRateList2 GridItemRateList3 LuckyGridNum
-1 0 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2342,1],"5":[2347,1],"6":[2346,1],"7":[7,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
-1 180 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2342,1],"5":[5303,300],"6":[2346,1],"7":[3807,2],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
-1 260 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2342,1],"5":[5303,300],"6":[2346,1],"7":[3807,2],"8":[2390,1],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
-2 0 {"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,12],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4385,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(8000,14),(9500,9),(10000,8)] {1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(5000,8),(7500,5),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
-2 200 {"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,12],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4365,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(8000,14),(9500,9),(10000,8)] {1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(5000,8),(7500,5),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
-2 250 {"1":[4425,1],"2":[4359,1],"3":[4335,1],"4":[4369,1],"5":[4360,1],"6":[4303,16],"7":[4349,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,12],"12":[4350,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(8000,14),(9500,9),(10000,8)] {1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(5000,8),(7500,5),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
-2 300 {"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4380,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(8000,14),(9500,9),(10000,8)] {1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]} [(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)] [(5000,8),(7500,7),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+1 0 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[5,1],"8":[4610,1],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 180 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[4610,1],"8":[5412,40],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 230 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[5412,30],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 260 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 300 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,3],"10":[4609,1],"11":[107,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+2 0 {"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,12],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4385,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 200 {"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,12],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4360,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 250 {"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4380,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 300 {"1":[4425,1],"2":[4429,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4430,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4440,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index 5dc470c..1a518c4 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -13,7 +13,7 @@
12 0 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000
13 3 4 5 6 10 11 12 15 16 17 20 20 22 24 26 28
14 2 3 4 5 8 9 10 13 14 15 20 16 18 20 22 24
-15 0 0 0 1 2 2 3 3 4 4 4 9 10 11 12 12
+15 0 0 0 2 3 4 4 5 6 7 8 9 10 11 12 12
16 0 0 1 1 1 2 2 2 3 3 4 5 6 6 6 6
17 1 1 2 2 3 3 4 4 4 4 4 4 4 4 4 4
18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2
@@ -31,3 +31,5 @@
30 0 1 1 2 2 3 5 7 10 12 15 15 15 15 15 15
31 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
32 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+33 0 0 0 500 500 500 500 1000 1000 1000 1000 1000 1000 1000 1000 1000
+34 0 0 0 5000 5000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index f8e1ffc..72bd535 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -199,7 +199,7 @@
979 1 0 钻石充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3000 0 50 0 1 0 0 228 300 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
980 1 0 白金充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1000 0 50 0 1 0 0 228 100 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
981 1 0 黄金充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 228 50 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
-982 1 0 极品寻宝令 16 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 248 0 50 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
+982 1 0 极品寻宝令 16 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 80 0 50 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
983 1 0 符印寻宝令 16 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 30 0 50 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
984 1 0 中型等级经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 3 0 50 0 1 0 0 215 1000 400 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
985 1 0 VIP体验卡 80 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1 0 50 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
@@ -543,7 +543,7 @@
2409 1 0 C级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 110 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
2410 1 0 D级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 100 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
2411 1 0 坐骑丹奢华礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 3000 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
-2412 1 0 3级随机宝石 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 2430 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
+2412 1 0 3级随机宝石 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 90 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
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