From d3c2b45a746a4c839e04055683b88371a4ac57ec Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 29 八月 2018 15:43:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagHorseUp.txt | 140 +++++++++++--------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetXunbao.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 16 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6
db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
db/PyMongoDataServer/PySysDB/tagPetClassCost.txt | 220 +++++++++++++++---------------
db/PyMongoDataServer/PySysDB/tagHorse.txt | 2
db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 4
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 2
13 files changed, 206 insertions(+), 186 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 7de657a..7eb2bd0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,5 +1,5 @@
CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd LimitLV IsDayReset TemplateIDList
-1 test1 [24] 2018-7-23 2018-7-25 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ExpActivity_Close", [2]]} 50 1 1|2|3
+1 test1 [] 2018-8-30 2018-8-31 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ExpActivity_Close", [2]]} 50 0 1
2 test2 [24,30] 2018-7-13 2018-7-15 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ExpActivity_Close", [2]]} 50 1 3
3 NationalDay [24] 2018-10-1 2018-10-3 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ExpActivity_Close", [2]]} 50 1 1|2|3
4 NationalDay1 [24] 2018-10-9 2018-10-15 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ExpActivity_Close", [2]]} 50 1 1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index eeaa703..88b7501 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index db46aa7..3949800 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/GM/Commands/SetXunbao.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetXunbao.pyc
index 171d9cb..ace0e1a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetXunbao.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetXunbao.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 72819f5..88d25cc 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/PlayerTreasure.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
index 00c8aa4..53c1807 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index d257896..e59cc46 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -2,7 +2,7 @@
1 128 0 [(912,1,1)] ConsumptionRebate3
1 588 1 [(4184,1,1),(14,2,1),(3807,1,1)] ConsumptionRebate3
1 1588 2 [(51,1,1),(143,50,1),(4151,30,1)] ConsumptionRebate3
-1 5000 3 [(3515,1,1),(3505,1,1),(106,8,1),(03,8,1)] ConsumptionRebate2
+1 5000 3 [(3515,1,1),(3505,1,1),(106,8,1),(103,8,1)] ConsumptionRebate2
2 500 0 [(4651,10,1),(4652,10,1)]
2 1000 1 [(4651,20,1),(4652,20,1)]
2 2000 2 [(4651,30,1),(4652,30,1)] ConsumptionRebate3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 0dd92ab..caf7b83 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -261,11 +261,11 @@
VIPInvest {"1":[1,280],"2":[281,350],"3":[351,1000]} 4
GoldInvestLVLimit 300
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502
-TreasureSet 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]}
+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] [248, 1984] [[982,1], [982, 8]] [0, 0] [10, 100]
-TreasureSet21 max(baseRate,min(curLuck,30)*0.001+min(max(curLuck-30,0),10)*0.002+min(max(curLuck-40,0),20)*0.005) [1, 10] 1000
+TreasureSet21 max(baseRate,int(min(curLuck,30)*10+min(max(curLuck-30,0),10)*20+min(max(curLuck-40,0),20)*50)) [1, 10] 1000
TreasureSet12 [1, 10] [98, 784] [[983,1], [983, 8]] [1440, 0] [5, 50]
-TreasureSet22 min(0.05,baseRate+curLuck/300.0*(0.01-baseRate)*max(1,curLuck/100.0)) [1, 10] 1000
+TreasureSet22 min(500,int(baseRate+curLuck/300.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50
diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index 9fb393b..f834450 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -9,4 +9,4 @@
304 286 256 1 1 40 1 4 5716 GetMount6
402 287 257 1 1 50 1 5 31996 GetMount10
305 290 260 1 1 40 1 4 13968 GetMount7
-306 288 258 1 1 40 1 4 21168 GetMount8
+306 288 258 1 1 50 1 5 21168 GetMount8
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index e406b84..70fd289 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -19,26 +19,36 @@
100 18 337 6|7|23 4769|238|20 0
100 19 366 6|7|23 5129|256|20 0
100 20 0 6|7|23 5499|274|20 49010
-101 1 185 6|7|23 698|34|20 0
-101 2 200 6|7|23 994|49|20 0
-101 3 218 6|7|23 1306|65|20 0
-101 4 236 6|7|23 1633|81|20 49015
-101 5 256 6|7|23 1976|98|20 0
-101 6 277 6|7|23 2335|116|20 0
-101 7 299 6|7|23 2720|136|20 0
-101 8 323 6|7|23 3131|156|20 0
-101 9 348 6|7|23 3571|178|20 0
-101 10 375 6|7|23 4039|201|20 49020
-101 11 402 6|7|23 4538|226|20 0
-101 12 431 6|7|23 5060|253|20 0
-101 13 461 6|7|23 5606|280|20 0
-101 14 493 6|7|23 6175|308|20 0
-101 15 526 6|7|23 6766|338|20 0
-101 16 560 6|7|23 7379|368|20 0
-101 17 596 6|7|23 8014|400|20 0
-101 18 633 6|7|23 8669|433|20 0
-101 19 681 6|7|23 9344|467|20 0
-101 20 0 6|7|23 10038|501|20 49025
+101 1 185 6|7|23 698|34|40 0
+101 2 200 6|7|23 994|49|40 0
+101 3 218 6|7|23 1306|65|40 0
+101 4 236 6|7|23 1633|81|40 49015
+101 5 256 6|7|23 1976|98|40 0
+101 6 277 6|7|23 2335|116|40 0
+101 7 299 6|7|23 2720|136|40 0
+101 8 323 6|7|23 3131|156|40 0
+101 9 348 6|7|23 3571|178|40 0
+101 10 375 6|7|23 4039|201|40 49020
+101 11 402 6|7|23 4538|226|40 0
+101 12 431 6|7|23 5060|253|40 0
+101 13 461 6|7|23 5606|280|40 0
+101 14 493 6|7|23 6175|308|40 0
+101 15 526 6|7|23 6766|338|40 0
+101 16 560 6|7|23 7379|368|40 0
+101 17 596 6|7|23 8014|400|40 0
+101 18 633 6|7|23 8669|433|40 0
+101 19 671 6|7|23 9344|467|40 0
+101 20 1421 6|7|23 10038|501|40 49025
+101 21 1503 6|7|23 10749|537|40 0
+101 22 1587 6|7|23 11481|574|40 0
+101 23 1674 6|7|23 12235|611|40 0
+101 24 1763 6|7|23 13009|650|40 0
+101 25 1855 6|7|23 13803|690|40 0
+101 26 1950 6|7|23 14615|730|40 0
+101 27 2047 6|7|23 15444|772|40 0
+101 28 2147 6|7|23 16288|814|40 0
+101 29 2263 6|7|23 17147|857|40 0
+101 30 0 6|7|23 18019|900|40 0
201 1 370 6|7|23 1058|52|40 0
201 2 401 6|7|23 1650|82|40 0
201 3 436 6|7|23 2273|113|40 0
@@ -369,43 +379,53 @@
305 38 15096 6|7|23 121468|6073|60 0
305 39 15699 6|7|23 126224|6311|60 0
305 40 0 6|7|23 131047|6552|60 0
-306 1 1945 6|7|23 10584|529|60 0
-306 2 2111 6|7|23 12140|607|60 0
-306 3 2291 6|7|23 13776|688|60 0
-306 4 2486 6|7|23 15495|774|60 49150
-306 5 2694 6|7|23 17297|864|60 0
-306 6 2915 6|7|23 19183|959|60 0
-306 7 3151 6|7|23 21204|1060|60 0
-306 8 3400 6|7|23 23366|1168|60 0
-306 9 3663 6|7|23 25675|1283|60 0
-306 10 3940 6|7|23 28137|1406|60 49155
-306 11 4231 6|7|23 30757|1537|60 0
-306 12 4535 6|7|23 33501|1675|60 0
-306 13 4853 6|7|23 36368|1818|60 0
-306 14 5185 6|7|23 39355|1967|60 0
-306 15 5531 6|7|23 42462|2123|60 0
-306 16 5891 6|7|23 45684|2284|60 0
-306 17 6264 6|7|23 49018|2450|60 0
-306 18 6651 6|7|23 52461|2623|60 0
-306 19 7052 6|7|23 56006|2800|60 0
-306 20 7467 6|7|23 59649|2982|60 49160 MountUpLv10
-306 21 7896 6|7|23 63383|3169|60 0
-306 22 8338 6|7|23 67232|3361|60 0
-306 23 8794 6|7|23 71193|3559|60 0
-306 24 9264 6|7|23 75260|3763|60 0
-306 25 9748 6|7|23 79429|3971|60 0
-306 26 10245 6|7|23 83694|4184|60 0
-306 27 10756 6|7|23 88048|4402|60 0
-306 28 11281 6|7|23 92486|4624|60 0
-306 29 11820 6|7|23 96998|4849|60 0
-306 30 12373 6|7|23 101579|5078|60 0
-306 31 12939 6|7|23 106219|5310|60 0
-306 32 13519 6|7|23 110974|5548|60 0
-306 33 14113 6|7|23 115841|5792|60 0
-306 34 14721 6|7|23 120816|6040|60 0
-306 35 15342 6|7|23 125895|6294|60 0
-306 36 15978 6|7|23 131073|6553|60 0
-306 37 16627 6|7|23 136346|6817|60 0
-306 38 17290 6|7|23 141709|7085|60 0
-306 39 18000 6|7|23 147155|7357|60 0
-306 40 0 6|7|23 152680|7634|60 0
+306 1 1945 6|7|23 10584|529|80 0
+306 2 2111 6|7|23 12140|607|80 0
+306 3 2291 6|7|23 13776|688|80 0
+306 4 2486 6|7|23 15495|774|80 49150
+306 5 2694 6|7|23 17297|864|80 0
+306 6 2915 6|7|23 19183|959|80 0
+306 7 3151 6|7|23 21204|1060|80 0
+306 8 3400 6|7|23 23366|1168|80 0
+306 9 3663 6|7|23 25675|1283|80 0
+306 10 3940 6|7|23 28137|1406|80 49155
+306 11 4231 6|7|23 30757|1537|80 0
+306 12 4535 6|7|23 33501|1675|80 0
+306 13 4853 6|7|23 36368|1818|80 0
+306 14 5185 6|7|23 39355|1967|80 0
+306 15 5531 6|7|23 42462|2123|80 0
+306 16 5891 6|7|23 45684|2284|80 0
+306 17 6264 6|7|23 49018|2450|80 0
+306 18 6651 6|7|23 52461|2623|80 0
+306 19 7052 6|7|23 56006|2800|80 0
+306 20 7467 6|7|23 59649|2982|80 49160 MountUpLv10
+306 21 7896 6|7|23 63383|3169|80 0
+306 22 8338 6|7|23 67232|3361|80 0
+306 23 8794 6|7|23 71193|3559|80 0
+306 24 9264 6|7|23 75260|3763|80 0
+306 25 9748 6|7|23 79429|3971|80 0
+306 26 10245 6|7|23 83694|4184|80 0
+306 27 10756 6|7|23 88048|4402|80 0
+306 28 11281 6|7|23 92486|4624|80 0
+306 29 11820 6|7|23 96998|4849|80 0
+306 30 12373 6|7|23 101579|5078|80 0
+306 31 12939 6|7|23 106219|5310|80 0
+306 32 13519 6|7|23 110974|5548|80 0
+306 33 14113 6|7|23 115841|5792|80 0
+306 34 14721 6|7|23 120816|6040|80 0
+306 35 15342 6|7|23 125895|6294|80 0
+306 36 15978 6|7|23 131073|6553|80 0
+306 37 16627 6|7|23 136346|6817|80 0
+306 38 17290 6|7|23 141709|7085|80 0
+306 39 17966 6|7|23 147155|7357|80 0
+306 40 18657 6|7|23 152680|7634|80 0
+306 41 19361 6|7|23 158277|7913|80 0
+306 42 20079 6|7|23 164086|8204|80 0
+306 43 20811 6|7|23 170109|8505|80 0
+306 44 21557 6|7|23 176353|8817|80 0
+306 45 22316 6|7|23 182820|9141|80 0
+306 46 23089 6|7|23 189515|9475|80 0
+306 47 23876 6|7|23 196442|9822|80 0
+306 48 24677 6|7|23 203605|10180|80 0
+306 49 25511 6|7|23 211008|10550|80 0
+306 50 0 6|7|23 218656|10932|80 0
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index 805581f..840df3b 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -309,46 +309,46 @@
50106103 28 5726 8803
50106103 29 6080 9295
50106103 30 0 9793
-50106303 1 1234 1324
-50106303 2 1339 1497
-50106303 3 1454 1681
-50106303 4 1577 1878
-50106303 5 1709 2087
-50106303 6 1850 2309
-50106303 7 1999 2546
-50106303 8 2157 2798
-50106303 9 2324 3065
-50106303 10 2500 3349
-50106303 11 2684 3649
-50106303 12 2877 3968
-50106303 13 3079 4308
-50106303 14 3290 4668
-50106303 15 3509 5050
-50106303 16 3738 5454
-50106303 17 3975 5880
-50106303 18 4220 6329
-50106303 19 4475 6802
-50106303 20 4738 7298
-50106303 21 5010 7820
-50106303 22 5290 8356
-50106303 23 5580 8906
-50106303 24 5878 9470
-50106303 25 6185 10046
-50106303 26 6500 10633
-50106303 27 6825 11231
-50106303 28 7158 11839
-50106303 29 7500 12454
-50106303 30 7850 13077
-50106303 31 8210 13705
-50106303 32 8578 14345
-50106303 33 8955 14997
-50106303 34 9341 15660
-50106303 35 9735 16333
-50106303 36 10138 17014
-50106303 37 10550 17704
-50106303 38 10970 18400
-50106303 39 11419 19102
-50106303 40 0 19809
+50106303 1 1451 1324
+50106303 2 1575 1527
+50106303 3 1710 1744
+50106303 4 1855 1975
+50106303 5 2010 2221
+50106303 6 2175 2482
+50106303 7 2351 2761
+50106303 8 2537 3057
+50106303 9 2733 3372
+50106303 10 2940 3705
+50106303 11 3157 4058
+50106303 12 3384 4434
+50106303 13 3621 4833
+50106303 14 3869 5257
+50106303 15 4127 5706
+50106303 16 4396 6180
+50106303 17 4674 6682
+50106303 18 4963 7210
+50106303 19 5262 7766
+50106303 20 5572 8350
+50106303 21 5892 8963
+50106303 22 6222 9593
+50106303 23 6562 10240
+50106303 24 6913 10903
+50106303 25 7273 11581
+50106303 26 7645 12272
+50106303 27 8026 12975
+50106303 28 8418 13689
+50106303 29 8820 14413
+50106303 30 9232 15145
+50106303 31 9655 15884
+50106303 32 10088 16637
+50106303 33 10531 17404
+50106303 34 10985 18183
+50106303 35 11448 18974
+50106303 36 11922 19776
+50106303 37 12407 20586
+50106303 38 12901 21405
+50106303 39 13498 22231
+50106303 40 0 23062
50106304 1 2468 2479
50106304 2 2679 2825
50106304 3 2908 3193
@@ -399,73 +399,73 @@
50106304 48 31316 52374
50106304 49 32392 54252
50106304 50 0 56194
-50106306 1 1234 1324
-50106306 2 1339 1497
-50106306 3 1454 1681
-50106306 4 1577 1878
-50106306 5 1709 2087
-50106306 6 1850 2309
-50106306 7 1999 2546
-50106306 8 2157 2798
-50106306 9 2324 3065
-50106306 10 2500 3349
-50106306 11 2684 3649
-50106306 12 2877 3968
-50106306 13 3079 4308
-50106306 14 3290 4668
-50106306 15 3509 5050
-50106306 16 3738 5454
-50106306 17 3975 5880
-50106306 18 4220 6329
-50106306 19 4475 6802
-50106306 20 4738 7298
-50106306 21 5010 7820
-50106306 22 5290 8356
-50106306 23 5580 8906
-50106306 24 5878 9470
-50106306 25 6185 10046
-50106306 26 6500 10633
-50106306 27 6825 11231
-50106306 28 7158 11839
-50106306 29 7500 12454
-50106306 30 7850 13077
-50106306 31 8210 13705
-50106306 32 8578 14345
-50106306 33 8955 14997
-50106306 34 9341 15660
-50106306 35 9735 16333
-50106306 36 10138 17014
-50106306 37 10550 17704
-50106306 38 10970 18400
-50106306 39 11419 19102
-50106306 40 0 19809
-50106305 1 2468 2479
-50106305 2 2679 2825
-50106305 3 2908 3193
-50106305 4 3154 3586
-50106305 5 3418 4004
-50106305 6 3700 4448
-50106305 7 3999 4922
-50106305 8 4315 5426
-50106305 9 4649 5961
-50106305 10 5000 6528
-50106305 11 5369 7128
-50106305 12 5755 7767
-50106305 13 6159 8446
-50106305 14 6581 9167
-50106305 15 7019 9931
-50106305 16 7476 10738
-50106305 17 7950 11590
-50106305 18 8441 12489
-50106305 19 8950 13434
-50106305 20 9476 14427
-50106305 21 10020 15470
-50106305 22 10581 16542
-50106305 23 11160 17643
-50106305 24 11756 18770
-50106305 25 12370 19922
-50106305 26 13001 21097
-50106305 27 13650 22293
-50106305 28 14316 23508
-50106305 29 15000 24740
-50106305 30 15701 25985
+50106305 1 493 247
+50106305 2 535 385
+50106305 3 581 533
+50106305 4 630 690
+50106305 5 683 857
+50106305 6 740 1035
+50106305 7 799 1224
+50106305 8 863 1426
+50106305 9 929 1640
+50106305 10 1000 1867
+50106305 11 1073 2107
+50106305 12 1151 2362
+50106305 13 1231 2634
+50106305 14 1316 2922
+50106305 15 1403 3228
+50106305 16 1573 3551
+50106305 17 1766 3892
+50106305 18 1986 4251
+50106305 19 2237 4629
+50106305 20 2527 5026
+50106305 21 2004 5443
+50106305 22 2227 5872
+50106305 23 2480 6313
+50106305 24 2766 6763
+50106305 25 3092 7224
+50106305 26 3467 7694
+50106305 27 2730 8173
+50106305 28 3014 8659
+50106305 29 3304 9151
+50106305 30 0 9649
+50106306 1 1480 460
+50106306 2 1607 668
+50106306 3 1745 889
+50106306 4 1892 1124
+50106306 5 2051 1375
+50106306 6 2220 1642
+50106306 7 2399 1926
+50106306 8 2589 2228
+50106306 9 2789 2549
+50106306 10 3000 2890
+50106306 11 3221 3250
+50106306 12 3453 3633
+50106306 13 3695 4041
+50106306 14 3948 4473
+50106306 15 4211 4931
+50106306 16 4485 5416
+50106306 17 4770 5927
+50106306 18 5064 6466
+50106306 19 5370 7033
+50106306 20 5685 7629
+50106306 21 6012 8255
+50106306 22 6349 8898
+50106306 23 6696 9558
+50106306 24 7054 10235
+50106306 25 7422 10926
+50106306 26 7801 11631
+50106306 27 8190 12349
+50106306 28 8590 13078
+50106306 29 9000 13817
+50106306 30 9421 14564
+50106306 31 9852 15317
+50106306 32 10294 16086
+50106306 33 10746 16868
+50106306 34 11209 17663
+50106306 35 11682 18470
+50106306 36 12166 19288
+50106306 37 12660 20115
+50106306 38 13165 20951
+50106306 39 13717 21794
+50106306 40 0 22642
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index ce8dc02..0246bf4 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -10,5 +10,5 @@
50106302 5 GetPet9 4207 1 1000 1 50 6 48305|48310|48315 4|10|20 ['PetUpLv','PetUpLv','PetUpLv5'] 31996
50106303 4 GetPet6 4209 1 1000 1 40 6 48335|48340|48345 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 13248
50106304 5 GetPet10 4210 1 1000 1 50 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv6'] 24796
-50106305 3 GetPet11 4213 1 1000 1 30 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 24796
-50106306 4 GetPet12 4214 1 1000 1 40 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 24796
+50106305 3 GetPet11 4213 1 1000 1 30 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2470
+50106306 4 GetPet12 4214 1 1000 1 40 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 4608
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index 7fe6859..c0822be 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,8 +1,8 @@
-TreasureType MinLV GridItemInfo JobItemList GridItemRateListFree GridItemRateList1 GridItemRateList2 GridItemRateList3 LuckyGridNum
-1 0 {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"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)] [(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)]} 1
-1 200 {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[2329,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)] [(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)]} 1
-1 250 {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[5303,500],"6":[2346,1],"7":[2329,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)] [(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)]} 1
-2 0 {"1":[4425,1],"2":[4394,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4385,1],"8":[2332,1],"9":[4334,1],"10":[4384,1],"11":[4304,20],"12":[4395,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
-2 200 {"1":[4425,1],"2":[4354,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4365,1],"8":[2332,1],"9":[4334,1],"10":[4364,1],"11":[4304,20],"12":[4355,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
-2 250 {"1":[4425,1],"2":[4359,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4390,1],"8":[2332,1],"9":[4334,1],"10":[4389,1],"11":[4304,20],"12":[4360,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
-2 300 {"1":[4425,1],"2":[4379,1],"3":[4370,1],"4":[4369,1],"5":[4400,1],"6":[4368,1],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4374,1],"11":[4304,20],"12":[4405,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
+TreasureType MinLV GridItemInfo JobItemList GridItemRateListFree FreeGridItemRateList2 FreeGridItemRateList3 GridItemRateList1 GridItemRateList2 GridItemRateList3 LuckyGridNum
+1 0 {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"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)]} 1
+1 200 {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[2329,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)]} 1
+1 250 {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[5303,500],"6":[2346,1],"7":[2329,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)]} 1
+2 0 {"1":[4425,1],"2":[4394,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4385,1],"8":[2332,1],"9":[4334,1],"10":[4384,1],"11":[4304,20],"12":[4395,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(1000,2),(7000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
+2 200 {"1":[4425,1],"2":[4354,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4365,1],"8":[2332,1],"9":[4334,1],"10":[4364,1],"11":[4304,20],"12":[4355,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(1000,2),(7000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
+2 250 {"1":[4425,1],"2":[4359,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4390,1],"8":[2332,1],"9":[4334,1],"10":[4389,1],"11":[4304,20],"12":[4360,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(1000,2),(7000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
+2 300 {"1":[4425,1],"2":[4379,1],"3":[4370,1],"4":[4369,1],"5":[4400,1],"6":[4368,1],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4374,1],"11":[4304,20],"12":[4405,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(1000,2),(7000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
--
Gitblit v1.8.0