From 568f131f2d72724718a042401fb64178fe187b62 Mon Sep 17 00:00:00 2001
From: CeHua_TRX <526616766@qq.com>
Date: 星期四, 06 十二月 2018 20:26:20 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
---
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 2
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 16 ++++----
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 10 ++--
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 8 ++--
db/PyMongoDataServer/SysDB/tagChinItem.txt | 14 +++---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc | 0
db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt | 4 +-
db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt | 24 ++++++------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc | 0
db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt | 4 +-
11 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
index f476d4a..1da0af3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc
index a8eedc2..4b79e2a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
index fa3c42c..37cdf7a 100644
--- a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
@@ -5,7 +5,7 @@
12 4610 1 345 [[9500,4692,1],[500,4681,1]] 4
21 4608 1 345 [[6500,4660,1],[2000,200,1],[1500,4680,1]] 4
22 4608 1 518 [[7000,4661,1],[1500,201,1],[1500,4680,1]] 5
-31 4606 1 345 [[9200,4183,1],[800,4206,1]] 4
-32 4606 1 518 [[9500,4185,1],[500,253,1]] 5
+31 4606 1 345 [[6000,4183,1],[4000,4254,1]] 4
+32 4606 1 518 [[6000,4185,1],[4000,225,1]] 5
41 4607 1 746 [[8400,4688,1],[800,4676,1],[800,4677,1]] 6
51 4622 1 160 [[3778,4737,1],[3022,4670,1],[1500,4675,1],[1500,4674,1],[200,4682,1]] 2
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index e4d6bfe..cf8661f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -35,14 +35,14 @@
41110 23 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103010,1,1,1,1,0]]
41110 24 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,3,300,10] [[101,31103011,1,1,1,1,0]]
31080 0 31080 82 500 0 0 0 0 0 0 0 [20,18] [5,180,10]
-31140 0 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[101,31401002,12,3]] [(5303,5,1),(5412,1,1)]
-31140 1 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[101,31401003,24,6],[102,31403002,1,1]] [(5303,5,1),(5412,1,1)]
-31140 2 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[103,31401004,12,6],[104,31403003,1,1]] [(5303,5,1),(5412,1,1)]
-31140 3 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[105,31401005,24,6],[104,31403004,1,1]] [(5303,5,1),(5412,1,1)]
-31140 4 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[106,31401006,12,6],[104,31403005,1,1]] [(5303,5,1),(5412,1,1)]
-31140 5 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[105,31401007,24,6],[104,31403006,1,1]] [(5303,5,1),(5412,1,1)]
-31140 6 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[101,31401008,4,1],[102,31403007,1,1]] [(5303,5,1),(5412,1,1)]
-31140 7 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[103,31401009,12,6],[104,31403008,1,1]] [(5303,5,1),(5412,1,1)]
+31140 0 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[101,31401002,12,3]] [(5303,10,1)]
+31140 1 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[101,31401003,24,6],[102,31403002,1,1]] [(5303,10,1)]
+31140 2 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[103,31401004,12,6],[104,31403003,1,1]] [(5303,10,1)]
+31140 3 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[105,31401005,24,6],[104,31403004,1,1]] [(5303,10,1)]
+31140 4 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[106,31401006,12,6],[104,31403005,1,1]] [(5303,10,1)]
+31140 5 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[105,31401007,24,6],[104,31403006,1,1]] [(5303,10,1)]
+31140 6 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[101,31401008,4,1],[102,31403007,1,1]] [(5303,10,1)]
+31140 7 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[180,60]] [[103,31401009,12,6],[104,31403008,1,1]] [(5303,10,1)]
31150 0 31150 0 0 0 4007 1|2|2|3|3|4 80 0 0 0 [132,45] [30,12]
31170 0 31170 110 0 0 0 0 0 0 0 0 [76,15] [(26,33000,33000)]
31180 0 31180 110 500 0 0 0 0 0 0 0 [112,24] [5,600,15, [340,260,200,150]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index d6171c7..46f5bc3 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -14,13 +14,13 @@
4 13 50 1 [(30,310,1),(2389,1,1)] 2389 LimitGift3
4 14 50 1 [(2213,10,1),(2389,1,1)] 2389 LimitGift3
8 15 400 1 [(262,1,1),(181,45,1)] 262 LimitGift3
-4 16 60 1 [(4215,1,1),(4151,15,1)] 4215 LimitGift3
+3 16 50 1 [(4215,1,1),(4151,15,1)] 4215 LimitGift3
5 17 180 1 [(7002,1,1),(195,1,1)] 7002 LimitGift3
-5 18 150 1 [(263,1,1),(181,30,1)] 263 LimitGift3
-5 19 150 1 [(4220,1,1),(4151,25,1)] 4220 LimitGift3
+5 18 180 1 [(263,1,1),(181,30,1)] 263 LimitGift3
+5 19 180 1 [(4220,1,1),(4151,25,1)] 4220 LimitGift3
4 20 80 1 [(913,1,1),(181,30,1)] 913 LimitGift3
-8 21 260 1 [(4214,1,1),(4151,50,1)] 4214 LimitGift3
-3 22 60 1 [(265,1,1),(181,15,1)] 265 LimitGift3
+8 21 400 1 [(4214,1,1),(4151,50,1)] 4214 LimitGift3
+3 22 50 1 [(265,1,1),(181,15,1)] 265 LimitGift3
2 23 25 1 [(2213,20,1)] 2213 LimitGift3
2 24 27 1 [(3514,1,1)] 3514 LimitGift3
2 25 27 1 [(4694,9,1)] 4694 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 91f417c..c5ff6e7 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -209,7 +209,7 @@
XjmjFirstEnter [5000, 25, 911] 350000
XjmjAddHarm 20 20061
AlchemyNotify 3 4716 4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729
-SpecialAlchemy {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]},106:{8:[[1,4732,1]],35:[[1,4732,1]]},107:{10:[[1,4733,1]],35:[[1,4733,1]]},108:{12:[[1,4742,1]],35:[[1,4742,1]]}} {1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]}} {4206:1,253:1} 4254|225
+SpecialAlchemy {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]},106:{8:[[1,4732,1]],35:[[1,4732,1]]},107:{10:[[1,4733,1]],35:[[1,4733,1]]},108:{12:[[1,4742,1]],35:[[1,4742,1]]}} {1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]},31:{1:[[80,4254,1],[20,4183,1]],3:[[80,4254,1],[20,4183,1]]},32:{1:[[80,225,1],[20,4185,1]],3:[[80,225,1],[20,4185,1]]}} {4206:1,253:1} 4254|225
GodAlchemy [[800,4706,1],[1600,4707,1],[3200,4708,1],[1600,4709,1],[800,4710,1],[400,4711,1],[3200,4712,1],[1600,4713,1],[800,4714,1],[400,4715,1],[1600,4716,1],[3200,4717,1],[1600,4718,1],[800,4719,1],[400,4720,1],[3200,4721,1],[1600,4722,1],[800,4723,1],[400,4724,1],[1600,4725,1],[800,4726,1],[400,4727,1],[800,4728,1],[400,4729,1],[145,4730,1],[94,4731,1],[53,4732,1],[11,4733,1],[533,4740,1],[5,4742,1],[200,4780,1],[200,4781,1],[200,4782,1],[200,4783,1],[200,4784,1],[200,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1]] 20 1
TreasureUpRateItem 101|105|106|107|104|102|109|110 4601|4602|4603|4604|4605
ClientFightEnable 1 0 0 0 0
@@ -283,11 +283,11 @@
VIPInvest {"1":[1,280],"2":[281,350],"3":[351,1000]} 3
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]}
+TreasureSet {0:10,1:10} {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373,4428,4433,4438,4443],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374,4429,4434,4439,4444],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375,4430,4435,4440,4445]}
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(min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))+max(curLuck-999,0),10000) [3, 30] 1000
+TreasureSet22 min(min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))+max(curLuck-999,0),10000) [2, 20] 1000
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50 5
diff --git a/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt b/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt
index 57edf51..5c8d79f 100644
--- a/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt
@@ -2,8 +2,8 @@
0 4 [0,200] [[1024,1,1]]
1 8 [0,200] [[101,1,1]]
2 12 [0,200] [[5303,30,1]]
-3 15 [0,200] [[5303,30,1]]
+3 15 [0,200] [[5412,5,1]]
0 4 [201,500] [[1024,1,1]]
1 8 [201,500] [[101,1,1]]
2 12 [201,500] [[5303,30,1]]
-3 15 [201,500] [[5303,30,1]]
+3 15 [201,500] [[5412,5,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
index 7e80dbd..75f247f 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
@@ -1,13 +1,13 @@
RangListType Condition Gift
-2 15 {"1":[[1801,1],[181,10],[101,10]],"2":[[1801,1],[181,10],[101,10]],"3":[[1801,1],[181,10],[101,10]]}
-2 10 {"1":[[1801,1],[181,5],[101,5]],"2":[[1801,1],[181,5],[101,5]],"3":[[1801,1],[181,5],[101,5]]}
-8 40 {"1":[[1905,1],[4151,10],[101,10]],"2":[[1905,1],[4151,10],[101,10]],"3":[[1905,1],[4151,10],[101,10]]}
-8 30 {"1":[[1905,1],[4151,5],[101,5]],"2":[[1905,1],[4151,5],[101,5]],"3":[[1905,1],[4151,5],[101,5]]}
-10 9 {"1":[[1900,1],[3502,1],[3512,1]],"2":[[1900,1],[3502,1],[3512,1]],"3":[[1900,1],[3502,1],[3512,1]]}
-10 6 {"1":[[1900,1],[3501,2],[3511,2]],"2":[[1900,1],[3501,2],[3511,2]],"3":[[1900,1],[3501,2],[3511,2]]}
-3 190 {"1":[[1901,1],[181,10],[4303,2]],"2":[[1901,1],[181,10],[4303,2]],"3":[[1901,1],[181,10],[4303,2]]}
-3 180 {"1":[[1901,1],[181,5],[4303,1]],"2":[[1901,1],[181,5],[4303,1]],"3":[[1901,1],[181,5],[4303,1]]}
-7 6 {"1":[[1803,1],[3502,1],[3512,1]],"2":[[1803,1],[3502,1],[3512,1]],"3":[[1803,1],[3502,1],[3512,1]]}
-7 5 {"1":[[1803,1],[3501,2],[3511,2]],"2":[[1803,1],[3501,2],[3511,2]],"3":[[1803,1],[3501,2],[3511,2]]}
-6 1000000 {"1":[[1802,1],[4151,10],[4303,2]],"2":[[1802,1],[4151,10],[4303,2]],"3":[[1802,1],[4151,10],[4303,2]]}
-6 800000 {"1":[[1802,1],[4151,5],[4303,1]],"2":[[1802,1],[4151,5],[4303,1]],"3":[[1802,1],[4151,5],[4303,1]]}
+2 15 {"1":[[181,10],[101,10]],"2":[[181,10],[101,10]],"3":[[181,10],[101,10]]}
+2 10 {"1":[[181,5],[101,5]],"2":[[181,5],[101,5]],"3":[[181,5],[101,5]]}
+8 40 {"1":[[4151,10],[101,10]],"2":[[4151,10],[101,10]],"3":[[4151,10],[101,10]]}
+8 30 {"1":[[4151,5],[101,5]],"2":[[4151,5],[101,5]],"3":[[4151,5],[101,5]]}
+10 9 {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
+10 6 {"1":[[3501,2],[3511,2]],"2":[[3501,2],[3511,2]],"3":[[3501,2],[3511,2]]}
+3 190 {"1":[[181,10],[4303,2]],"2":[[181,10],[4303,2]],"3":[[181,10],[4303,2]]}
+3 180 {"1":[[181,5],[4303,1]],"2":[[181,5],[4303,1]],"3":[[181,5],[4303,1]]}
+7 6 {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
+7 5 {"1":[[3501,2],[3511,2]],"2":[[3501,2],[3511,2]],"3":[[3501,2],[3511,2]]}
+6 1000000 {"1":[[4151,10],[4303,2]],"2":[[4151,10],[4303,2]],"3":[[4151,10],[4303,2]]}
+6 800000 {"1":[[4151,5],[4303,1]],"2":[[4151,5],[4303,1]],"3":[[4151,5],[4303,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index fba95d4..536bf5f 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -1,7 +1,7 @@
ID RelatedID CanBackTimes NormalCostJade VipCostJade JadeReward CostCopper CopperReward
1 0 0 5 0 {"exp":"tjgExp"} 0 {"exp":"tjgExp*80/100"}
2 1 0 2 0 {"exp":"1080*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"} 0 {"exp":"864*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
-3 2 0 10 0 {"exp":"1440*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5412,"ItemCount":"1"},{"ItemID":5303,"ItemCount":"5"}]} 0 {"exp":"1152*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"5"}]}
+3 2 0 10 0 {"exp":"1440*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]} 0 {"exp":"1152*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]}
4 3 0 15 0 {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]} 0 {"exp":"14400*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
5 5 0 15 30 {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]} 0 {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
6 6 1 15 50 {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]} 0 {"exp":"17280*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index c3d540c..a538297 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -4,7 +4,7 @@
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,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(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,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(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,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(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
+2 0 {"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,5],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4385,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [] {} [(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,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,5],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4360,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [] {} [(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,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,5],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,4],"12":[4380,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [] {} [(1,1),(1914,2),(2014,3),(2054,4),(2104,5),(4104,6),(4154,7),(4164,8),(4664,9),(5164,10),(7077,11),(7087,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,5],"7":[4430,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,4],"12":[4440,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [] {} [(1,1),(1914,2),(2014,3),(2054,4),(2104,5),(4104,6),(4154,7),(4164,8),(4664,9),(5164,10),(7077,11),(7087,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 553a97d..478cc59 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1256,13 +1256,13 @@
9020 4 1 绝版魔杖 101 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 20560 0 1 0 0 0 0 67 497 0 0 68 923 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 5 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
9021 1 1 绝版长枪 101 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 25560 0 1 0 0 0 0 67 473 0 0 68 878 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 5 2 0 0 0 3 0 0 0 0 0 0 1800 0 0 0 0 0 0 0
9022 1 1 绝版魔杖 101 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 20560 0 1 0 0 0 0 67 497 0 0 68 923 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 5 2 0 0 0 3 0 0 0 0 0 0 1800 0 0 0 0 0 0 0
-9051 5 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 1548 0 0 0 0 67 0 0 0 68 0 0 0 11 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-9062 6 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 3688 0 0 0 0 67 0 0 0 68 0 0 0 11 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-9073 7 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 2000 0 7472 0 0 0 0 67 0 0 0 68 0 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-9074 7 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 2500 0 7472 0 0 0 0 67 0 0 0 68 0 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 1 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
-9075 8 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10000 0 7472 0 0 0 0 67 0 0 0 68 0 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 2 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
-9077 9 0 仙器玉佩 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 30000 0 15136 0 0 0 0 67 0 0 0 68 0 0 0 11 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 5 2 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
-9078 10 0 仙器玉佩 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100000 0 15136 0 0 0 0 67 0 0 0 68 0 0 0 11 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 5 3 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
+9051 5 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 500 0 1548 0 0 0 0 67 162 0 0 68 300 0 0 11 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+9062 6 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1000 0 3688 0 0 0 0 67 365 0 0 68 677 0 0 11 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+9073 7 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 2000 0 7472 0 0 0 0 67 594 0 0 68 1102 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+9074 7 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 2500 0 7472 0 0 0 0 67 594 0 0 68 1102 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 1 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
+9075 8 0 仙器玉佩 109 9 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10000 0 7472 0 0 0 0 67 751 0 0 68 1395 0 0 11 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 4 2 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
+9077 9 0 仙器玉佩 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 30000 0 15136 0 0 0 0 67 1238 0 0 68 2300 0 0 11 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 5 2 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
+9078 10 0 仙器玉佩 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100000 0 15136 0 0 0 0 67 1442 0 0 68 2678 0 0 11 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 0 5 3 0 0 0 0 0 0 0 0 0 0 0 0 405 0 0 0 0 0
9995 0 0 GM法师帽子 103 3 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 5 0 47 0 0 0 0 6 999999 0 0 8 999999 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0
9996 0 0 GM之翼 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 50000 0 0 19 800 0 0 23 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
9997 0 0 GM仙器 109 9 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 200 0 1548 0 0 0 0 67 0 0 0 68 0 0 0 11 15000 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