From 2cf22a8315db0644ed3b28747e09dbe5a40bea7f Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 08 十一月 2018 19:31:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt | 10
db/PyMongoDataServer/PySysDB/tagStore.txt | 30 +++--
db/PyMongoDataServer/SysDB/tagChinItem.txt | 1
db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt | 5
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
db/PyMongoDataServer/PySysDB/tagWishingWell.txt | 260 +++++++++++++++++++++---------------------
db/PyMongoDataServer/PySysDB/tagChests.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 1
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 14 +-
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 6 +
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 14 +-
13 files changed, 180 insertions(+), 164 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index e48989f..e054d30 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,13 +1,13 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
1 OpenServer [] 2 2 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
2 OpenServer [] 3 3 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-3
-4 OpenServer [] 5 5 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-5 OpenServer [] 6 6 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-6 OpenServer [] 9 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-7
-8 NationalDay [] 2018-9-1 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
-9 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
+3 OpenServer [] 5 5 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+4 OpenServer [] 6 6 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+5 OpenServer [] 9 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+6 NationalDay [] 2018-9-1 2018-9-1 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
+7 NationalDay [(1,10), (100, 110), 120] 2018-9-2 2018-9-2 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
+8 NationalDay [] 2018-9-3 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
+9 NationalDay [(1,10), (100, 110), 120] 2018-9-4 2018-9-4 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
10 1OpenServer01 [7001] 2018-9-7 2018-9-7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
11 1OpenServer02 [7001] 2018-9-9 2018-9-9 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
12 1OpenServer03 [7001] 2018-9-11 2018-9-11 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 3d7f672..de6c012 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -138,6 +138,12 @@
712 15 0 0
713 15 0 0
714 15 0 0
+715 15 0 0
+716 15 0 0
+717 15 0 0
+718 15 0 0
+719 15 0 0
+720 15 0 0
751 101 0 0
752 101 0 0
753 101 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index b774f8f..830865a 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/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
index 98b4127..d324efd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index d09a552..8b5554e 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,13 +1,13 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
1 2 2 120 50 0 [[22]] SellMail4
2 3 3 0 50 0 [[16]] SellMail4
-3
-4 5 5 120 50 0 [[18]] SellMail4
-5 6 6 0 50 0 [[19]] SellMail4
-6 9 10 120 50 0 [[15]] SellMail4
-7
-8 2018-9-1 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
-9 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+3 5 5 120 50 0 [[18]] SellMail4
+4 6 6 0 50 0 [[19]] SellMail4
+5 9 10 120 50 0 [[15]] SellMail4
+6 2018-9-1 2018-9-1 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
+7 2018-9-2 2018-9-2 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+8 2018-9-3 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
+9 2018-9-4 2018-9-4 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
10 2018-9-7 2018-9-7 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
11 2018-9-9 2018-9-9 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
12 2018-9-11 2018-9-11 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 9633c76..a170fcd 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -198,3 +198,4 @@
2408 0 0 0 1 1
2409 0 0 0 1 1
2410 0 0 0 1 1
+2411 0 0 0 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 1b561de..238b695 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -195,3 +195,4 @@
2408 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] [[7000,0],[10000,1]] [4622]
2409 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] [[8000,0],[10000,1]] [4622]
2410 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] [[9000,0],[10000,1]] [4622]
+2411 0 181_300
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
index b17fc34..0a3ac25 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
@@ -32,7 +32,7 @@
4 5 2 87214 65410 143903 35975 125755 114323 8442 26164 8030 1000 65 613 51445 50 0 0 47095 25151 15090 39246 35321 87214 100604 1050 1050
4 5 3 140310 105233 231511 57877 202207 183824 11623 42093 11059 1150 105 1160 82721 57 0 0 75767 40441 24264 63139 56825 140310 161765 1200 1300
5 1 0 5010 3758 8266 2066 7079 6436 1592 1503 1516 400 11 106 2896 20 0 0 2705 1415 849 2254 2029 5010 5663 450 465
-5 2 0 8451 6338 13944 3486 10386 9442 2373 2535 1558 475 15 146 4248 23 0 0 4563 2077 1246 3803 3422 8451 8309 525 545
+5 2 0 8451 6338 13944 3486 10386 9442 2373 2535 1558 475 15 146 4248 23 0 0 4563 2077 1246 3803 3422 84510 8309 525 545
5 3 0 11848 8886 19549 4887 14452 13138 2710 3554 1942 540 20 185 5912 27 0 0 6398 2890 1734 5331 4798 11848 11561 590 610
5 3 1 17132 12849 28267 7066 20935 19032 3092 5139 2508 600 24 226 8564 30 0 0 9251 4187 2512 7709 6938 17132 16748 650 650
5 4 1 50790 38092 83803 20950 55863 50785 5082 15237 4747 800 42 391 22853 40 0 0 27426 11172 6703 22855 20569 50790 44691 850 750
@@ -41,7 +41,7 @@
5 5 3 192443 144332 317530 79382 278472 253156 19798 57732 17328 1300 143 1672 113920 65 0 0 103919 55694 33416 86599 77939 192443 222777 1350 1425
6 1 0 8842 6631 14589 3647 10735 9759 2401 2652 1565 485 16 151 4391 24 0 0 4774 2147 1288 3979 3581 8842 8588 535 535
6 2 0 13623 10217 22477 5619 17379 15799 2901 4087 2221 570 22 205 7109 28 0 0 7356 3475 2085 6130 5517 13623 13903 620 610
-6 3 0 30861 23146 50920 12730 34292 31175 3864 9258 3208 670 30 279 14028 33 0 0 16665 6858 4115 13887 12498 30861 27434 720 680
+6 3 0 30861 23146 50920 12730 34292 31175 3864 9258 3208 670 30 279 14028 33 0 0 16665 6858 4115 13887 12498 60861 27434 720 680
6 3 1 50790 38092 83803 20950 55863 50785 5082 15237 4747 800 42 391 22853 40 0 0 27426 11172 6703 22855 20569 50790 44691 850 750
6 4 1 87214 65410 143903 35975 125755 114323 8442 26164 8030 1000 65 613 51445 50 0 0 47095 25151 15090 39246 35321 87214 100604 1050 950
6 4 2 140310 105233 231511 57877 202207 183824 11623 42093 11059 1150 105 1160 82721 57 0 0 75767 40441 24264 63139 56825 140310 161765 1200 1050
@@ -102,3 +102,4 @@
12 5 2 1788595 1341446 2951181 737795 2524976 2295433 199282 536578 547932 2750 748 10128 1032944 137 0 0 965841 504995 302997 804867 724380 1788595 2019981 2800 2400
12 5 3 1892664 1419498 3122895 780723 2921689 2656081 78943 567799 705266 3000 895 12301 1195236 150 0 0 1022038 584337 350602 851698 766528 1892664 2337351 3050 2750
12 6 3 2271196 1703397 3747473 936868 3506026 3187297 94731 681358 846319 3600 1074 14761 1434283 180 0 0 1226445 701204 420722 1022037 919833 2271196 2804821 3660 3660
+13 5 3 2271196 1703397 3747473 936868 3506026 3187297 94731 681358 846319 3600 1074 14761 1434283 180 0 0 1226445 701204 420722 1022037 919833 2271196 2804821 3660 3660
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 80cb0d2..e505fdb 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -233,7 +233,7 @@
MunekadoTrialStarTime {0:[[20],[40],[40,80,60,60]],1:[[20],[35],[30],[40,80,60,60]],2:[[20],[35],[30],[60,60,60,60]],3:[[25],[40],[80,80,80,80]],4:[[50],[50],[120,30,30,30]],5:[[50],[50],[120,30,30,30]]}
MunekadoLockLimit 5
ChaosDemonCfg [[(31801001,10)],[(31801004,10)],[(31803001,1)]] [101,102,103,104,105]
-ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,2,1),(1137,1,1)]}
+ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]}
ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 20 [200,600,1200,2000,3200,4800]
ElderBattlefieldPoint 500 500
ElderBattlefieldSys ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6'] 20 10
diff --git a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
index 20a7665..d0e72e6 100644
--- a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
@@ -1,17 +1,17 @@
FuncId Award
1 {"1":[[1,1]],"2":[[1,1]],"3":[[1,1]]}
-76 {"1":[[1,1]],"2":[[1,1]],"3":[[1,1]]}
+76
9 {"1":[[4302,3]],"2":[[4302,3]],"3":[[4302,3]]}
6 {"1":[[4151,2]],"2":[[4151,2]],"3":[[4151,2]]}
8 {"1":[[181,5]],"2":[[181,5]],"3":[[181,5]]}
-12 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-88 {"1":[[1130,5]],"2":[[1130,5]],"3":[[1130,5]]}
+12
+88
143 {"1":[[2211,5]],"2":[[2211,5]],"3":[[2211,5]]}
82 {"1":[[145,1]],"2":[[145,1]],"3":[[145,1]]}
-97 {"1":[[952,1]],"2":[[952,1]],"3":[[952,1]]}
+97
91 {"1":[[5303,10]],"2":[[5303,10]],"3":[[5303,10]]}
36 {"1":[[5012,10]],"2":[[5022,10]],"3":[[5012,10]]}
-145 {"1":[[106,1]],"2":[[106,1]],"3":[[106,1]]}
+145
93 {"1":[[5410,1]],"2":[[5410,1]],"3":[[5410,1]]}
138 {"1":[[8353,2]],"2":[[8353,2]],"3":[[8353,2]]}
28 {"1":[[966,1]],"2":[[966,1]],"3":[[966,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 9af9c31..f52bc71 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -124,20 +124,26 @@
651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 0 1 188 500 0 Bargaingift1
652 14 0 4208 1 1 [[4151,50,1],[5,1,1],[913,1,1]] 4208 0 0 0 1 0 1 388 1200 0 Bargaingift2
653 14 0 255 1 1 [[196,1,1],[181,80,1],[913,1,1]] 255 0 0 0 1 0 1 1088 2780 0 Bargaingift3
-701 15 0 912 1 1 [[142,300,1]] 142 0 0 106 1 0 1 188 600 1 OpenTakePreferential1
+701 15 0 1128 2 1 [[2213,30,1]] 1128 0 0 106 1 0 1 38 575 1 OpenTakePreferential1
702 15 0 982 10 1 [] 982 0 0 106 1 0 1 888 2500 1 OpenTakePreferential2
-703 15 0 2343 1 1 [] 2343 0 0 106 1 0 1 188 500 2 OpenTakePreferential1
-704 15 0 2344 2 1 [] 2344 0 0 106 1 0 1 888 2400 2 OpenTakePreferential2
-705 15 0 6 1 1 [[143,100,1]] 143 0 0 106 1 0 1 188 600 3 OpenTakePreferential1
-706 15 0 9062 1 1 [[6,3,1]] 9062 0 0 106 1 0 1 888 2700 3 OpenTakePreferential2
-707 15 0 3514 2 1 [[3504,2,1]] 3514 0 0 106 1 0 1 188 1080 4 OpenTakePreferential1
+703 15 0 2343 1 1 [] 2343 0 0 106 1 0 1 38 500 2 OpenTakePreferential1
+704 15 0 2411 1 1 [] 2411 0 0 106 1 0 1 688 3000 2 OpenTakePreferential2
+705 15 0 1128 2 1 [[2213,30,1]] 1128 0 0 106 1 0 1 38 575 3 OpenTakePreferential1
+706 15 0 9062 1 1 [[983,20,1]] 9062 0 0 106 1 0 1 688 2600 3 OpenTakePreferential2
+707 15 0 3514 1 1 [[3504,1,1]] 3514 0 0 106 1 0 1 38 540 4 OpenTakePreferential1
708 15 0 3516 1 1 [[3506,1,1]] 3516 0 0 106 1 0 1 888 4860 4 OpenTakePreferential2
-709 15 0 913 1 1 [[4694,3,1]] 913 0 0 106 1 0 1 188 800 5 OpenTakePreferential1
-710 15 0 1002 2 1 [[30,2000,1]] 30 0 0 106 1 0 1 888 3000 5 OpenTakePreferential2
-711 15 0 2213 40 1 [[1502,4,1]] 2213 0 0 106 1 0 1 188 700 6 OpenTakePreferential1
-712 15 0 2213 150 1 [[4680,1,1]] 4680 0 0 106 1 0 1 888 2625 6 OpenTakePreferential2
-713 15 0 2213 40 1 [[5303,200,1]] 2213 0 0 106 1 0 1 188 700 7 OpenTakePreferential1
-714 15 0 4186 1 1 [[2390,1,1]] 4186 0 0 106 1 0 1 888 2550 7 OpenTakePreferential2
+709 15 0 913 1 1 [[4694,1,1]] 913 0 0 106 1 0 1 38 600 5 OpenTakePreferential1
+710 15 0 1003 2 1 [[30,2000,1]] 30 0 0 106 1 0 1 688 3000 5 OpenTakePreferential2
+711 15 0 2213 30 1 [[4610,1,1]] 4610 0 0 106 1 0 1 38 575 6 OpenTakePreferential1
+712 15 0 2213 150 1 [[4606,1,1]] 4606 0 0 106 1 0 1 688 2875 6 OpenTakePreferential2
+713 15 0 195 1 1 [[5303,150,1]] 195 0 0 106 1 0 1 38 450 7 OpenTakePreferential1
+714 15 0 4186 1 1 [[5006,5,1]] 4186 0 0 106 1 0 1 688 3200 7 OpenTakePreferential2
+715 15 0 4608 1 1 [[2213,15,1]] 4608 0 0 106 1 0 1 38 680 8 OpenTakePreferential1
+716 15 0 982 10 1 [] 982 0 0 106 1 0 1 888 2500 8 OpenTakePreferential2
+717 15 0 153 38 1 [[147,6,1]] 153 0 0 106 1 0 1 38 630 9 OpenTakePreferential1
+718 15 0 2213 150 1 [[4606,1,1]] 4606 0 0 106 1 0 1 688 2875 9 OpenTakePreferential2
+719 15 0 2389 3 1 [] 2389 0 0 106 1 0 1 38 540 10 OpenTakePreferential1
+720 15 0 2390 3 1 [[8354,50,1]] 2390 0 0 106 1 0 1 688 2800 10 OpenTakePreferential2
751 101 1 4694 1 1 [[141,300,1]] 4694 0 0 0 1 0 1 88 400 0 LimitGift6
752 101 1 4183 1 1 [[147,6,1]] 4183 0 0 0 1 0 1 288 850 0 LimitGift7
753 101 1 4606 1 1 [[143,300,1]] 4606 0 0 0 1 0 1 688 1600 0 LimitGift8
diff --git a/db/PyMongoDataServer/PySysDB/tagWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagWishingWell.txt
index d85d0f4..34f1fe6 100644
--- a/db/PyMongoDataServer/PySysDB/tagWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagWishingWell.txt
@@ -249,133 +249,133 @@
1 0 [201,250] 911 3 1 183 6003
1 0 [201,250] 912 1 1 116 6004
1 0 [201,250] 1002 1 1 16 6005
-1 1 [251,300] 11 1 1 303 6101
-1 1 [251,300] 16 1 1 95 6102
-1 1 [251,300] 13 1 1 76 6103
-1 1 [251,300] 14 1 1 24 6104
-1 1 [251,300] 19 1 1 19 6105
-1 1 [251,300] 8352 1 1 303 6201
-1 1 [251,300] 8352 2 1 242 6202
-1 1 [251,300] 8352 3 1 194 6203
-1 1 [251,300] 8352 4 1 151 6204
-1 1 [251,300] 8353 8 1 47 6205
-1 1 [251,300] 4304 2 1 303 6301
-1 1 [251,300] 4304 4 1 242 6302
-1 1 [251,300] 4304 2 1 194 6303
-1 1 [251,300] 4305 3 1 151 6304
-1 1 [251,300] 4305 8 1 47 6305
-1 1 [251,300] 3501 1 1 303 6401
-1 1 [251,300] 3502 1 1 242 6402
-1 1 [251,300] 3504 1 1 76 6403
-1 1 [251,300] 3505 1 1 49 6404
-1 1 [251,300] 3506 1 1 39 6405
-1 1 [251,300] 3511 1 1 303 6501
-1 1 [251,300] 3512 1 1 242 6502
-1 1 [251,300] 3514 1 1 76 6503
-1 1 [251,300] 3515 1 1 49 6504
-1 1 [251,300] 3516 1 1 39 6505
-1 1 [251,300] 4151 2 1 303 6601
-1 1 [251,300] 4151 4 1 242 6602
-1 1 [251,300] 4151 6 1 194 6603
-1 1 [251,300] 4151 15 1 59 6604
-1 1 [251,300] 4151 40 1 47 6605
-1 1 [251,300] 181 2 1 303 6701
-1 1 [251,300] 181 4 1 242 6702
-1 1 [251,300] 181 6 1 194 6703
-1 1 [251,300] 181 15 1 59 6704
-1 1 [251,300] 181 40 1 47 6705
-1 1 [251,300] 197 1 1 303 6801
-1 1 [251,300] 197 1 1 95 6802
-1 1 [251,300] 198 1 1 76 6803
-1 1 [251,300] 198 1 1 49 6804
-1 1 [251,300] 199 1 1 39 6805
-1 1 [251,300] 2211 10 1 303 6901
-1 1 [251,300] 2319 1 1 95 6902
-1 1 [251,300] 2326 1 1 76 6903
-1 1 [251,300] 4608 1 1 9 6904
-1 1 [251,300] 4606 1 1 4 6905
-1 1 [251,300] 149 1 1 303 7001
-1 1 [251,300] 151 1 1 242 7002
-1 1 [251,300] 154 1 1 194 7003
-1 1 [251,300] 147 1 1 151 7004
-1 1 [251,300] 155 1 1 47 7005
-1 1 [251,300] 143 10 1 303 7101
-1 1 [251,300] 143 20 1 242 7102
-1 1 [251,300] 144 20 1 194 7103
-1 1 [251,300] 144 60 1 59 7104
-1 1 [251,300] 153 60 1 47 7105
-1 1 [251,300] 5303 10 1 303 7201
-1 1 [251,300] 5303 20 1 242 7202
-1 1 [251,300] 5303 40 1 194 7203
-1 1 [251,300] 5303 120 1 59 7204
-1 1 [251,300] 5303 200 1 39 7205
-1 1 [251,300] 911 1 1 303 7301
-1 1 [251,300] 911 2 1 242 7302
-1 1 [251,300] 911 3 1 194 7303
-1 1 [251,300] 912 1 1 59 7304
-1 1 [251,300] 1003 1 1 9 7305
-1 0 [251,300] 11 1 1 248 7401
-1 0 [251,300] 16 1 1 190 7402
-1 0 [251,300] 13 1 1 152 7403
-1 0 [251,300] 14 1 1 41 7404
-1 0 [251,300] 19 1 1 32 7405
-1 0 [251,300] 8352 1 1 248 7501
-1 0 [251,300] 8352 2 1 199 7502
-1 0 [251,300] 8352 3 1 159 7503
-1 0 [251,300] 8352 4 1 124 7504
-1 0 [251,300] 8353 8 1 95 7505
-1 0 [251,300] 4304 2 1 248 7601
-1 0 [251,300] 4304 4 1 199 7602
-1 0 [251,300] 4304 2 1 159 7603
-1 0 [251,300] 4305 3 1 124 7604
-1 0 [251,300] 4305 8 1 95 7605
-1 0 [251,300] 3501 1 1 248 7701
-1 0 [251,300] 3502 1 1 199 7702
-1 0 [251,300] 3504 1 1 152 7703
-1 0 [251,300] 3505 1 1 82 7704
-1 0 [251,300] 3506 1 1 65 7705
-1 0 [251,300] 3511 1 1 248 7801
-1 0 [251,300] 3512 1 1 199 7802
-1 0 [251,300] 3514 1 1 152 7803
-1 0 [251,300] 3515 1 1 82 7804
-1 0 [251,300] 3516 1 1 65 7805
-1 0 [251,300] 4151 2 1 248 7901
-1 0 [251,300] 4151 4 1 199 7902
-1 0 [251,300] 4151 6 1 159 7903
-1 0 [251,300] 4151 15 1 119 7904
-1 0 [251,300] 4151 40 1 95 7905
-1 0 [251,300] 181 2 1 248 8001
-1 0 [251,300] 181 4 1 199 8002
-1 0 [251,300] 181 6 1 159 8003
-1 0 [251,300] 181 15 1 119 8004
-1 0 [251,300] 181 40 1 95 8005
-1 0 [251,300] 197 1 1 248 8101
-1 0 [251,300] 197 1 1 190 8102
-1 0 [251,300] 198 1 1 152 8103
-1 0 [251,300] 198 1 1 82 8104
-1 0 [251,300] 199 1 1 65 8105
-1 0 [251,300] 2211 10 1 248 8201
-1 0 [251,300] 2319 1 1 190 8202
-1 0 [251,300] 2326 1 1 152 8203
-1 0 [251,300] 4608 1 1 16 8204
-1 0 [251,300] 4606 1 1 8 8205
-1 0 [251,300] 149 1 1 248 8301
-1 0 [251,300] 151 1 1 199 8302
-1 0 [251,300] 154 1 1 159 8303
-1 0 [251,300] 147 1 1 124 8304
-1 0 [251,300] 155 1 1 95 8305
-1 0 [251,300] 143 10 1 248 8401
-1 0 [251,300] 143 20 1 199 8402
-1 0 [251,300] 144 20 1 159 8403
-1 0 [251,300] 144 60 1 119 8404
-1 0 [251,300] 153 60 1 95 8405
-1 0 [251,300] 5303 10 1 248 8501
-1 0 [251,300] 5303 20 1 199 8502
-1 0 [251,300] 5303 40 1 159 8503
-1 0 [251,300] 5303 120 1 119 8504
-1 0 [251,300] 5303 200 1 65 8505
-1 0 [251,300] 911 1 1 248 8601
-1 0 [251,300] 911 2 1 199 8602
-1 0 [251,300] 911 3 1 159 8603
-1 0 [251,300] 912 1 1 119 8604
-1 0 [251,300] 1003 1 1 16 8605
+1 1 [251,800] 11 1 1 303 6101
+1 1 [251,800] 16 1 1 95 6102
+1 1 [251,800] 13 1 1 76 6103
+1 1 [251,800] 14 1 1 24 6104
+1 1 [251,800] 19 1 1 19 6105
+1 1 [251,800] 8352 1 1 303 6201
+1 1 [251,800] 8352 2 1 242 6202
+1 1 [251,800] 8352 3 1 194 6203
+1 1 [251,800] 8352 4 1 151 6204
+1 1 [251,800] 8353 8 1 47 6205
+1 1 [251,800] 4304 2 1 303 6301
+1 1 [251,800] 4304 4 1 242 6302
+1 1 [251,800] 4304 2 1 194 6303
+1 1 [251,800] 4305 3 1 151 6304
+1 1 [251,800] 4305 8 1 47 6305
+1 1 [251,800] 3501 1 1 303 6401
+1 1 [251,800] 3502 1 1 242 6402
+1 1 [251,800] 3504 1 1 76 6403
+1 1 [251,800] 3505 1 1 49 6404
+1 1 [251,800] 3506 1 1 39 6405
+1 1 [251,800] 3511 1 1 303 6501
+1 1 [251,800] 3512 1 1 242 6502
+1 1 [251,800] 3514 1 1 76 6503
+1 1 [251,800] 3515 1 1 49 6504
+1 1 [251,800] 3516 1 1 39 6505
+1 1 [251,800] 4151 2 1 303 6601
+1 1 [251,800] 4151 4 1 242 6602
+1 1 [251,800] 4151 6 1 194 6603
+1 1 [251,800] 4151 15 1 59 6604
+1 1 [251,800] 4151 40 1 47 6605
+1 1 [251,800] 181 2 1 303 6701
+1 1 [251,800] 181 4 1 242 6702
+1 1 [251,800] 181 6 1 194 6703
+1 1 [251,800] 181 15 1 59 6704
+1 1 [251,800] 181 40 1 47 6705
+1 1 [251,800] 197 1 1 303 6801
+1 1 [251,800] 197 1 1 95 6802
+1 1 [251,800] 198 1 1 76 6803
+1 1 [251,800] 198 1 1 49 6804
+1 1 [251,800] 199 1 1 39 6805
+1 1 [251,800] 2211 10 1 303 6901
+1 1 [251,800] 2319 1 1 95 6902
+1 1 [251,800] 2326 1 1 76 6903
+1 1 [251,800] 4608 1 1 9 6904
+1 1 [251,800] 4606 1 1 4 6905
+1 1 [251,800] 149 1 1 303 7001
+1 1 [251,800] 151 1 1 242 7002
+1 1 [251,800] 154 1 1 194 7003
+1 1 [251,800] 147 1 1 151 7004
+1 1 [251,800] 155 1 1 47 7005
+1 1 [251,800] 143 10 1 303 7101
+1 1 [251,800] 143 20 1 242 7102
+1 1 [251,800] 144 20 1 194 7103
+1 1 [251,800] 144 60 1 59 7104
+1 1 [251,800] 153 60 1 47 7105
+1 1 [251,800] 5303 10 1 303 7201
+1 1 [251,800] 5303 20 1 242 7202
+1 1 [251,800] 5303 40 1 194 7203
+1 1 [251,800] 5303 120 1 59 7204
+1 1 [251,800] 5303 200 1 39 7205
+1 1 [251,800] 911 1 1 303 7301
+1 1 [251,800] 911 2 1 242 7302
+1 1 [251,800] 911 3 1 194 7303
+1 1 [251,800] 912 1 1 59 7304
+1 1 [251,800] 1003 1 1 9 7305
+1 0 [251,800] 11 1 1 248 7401
+1 0 [251,800] 16 1 1 190 7402
+1 0 [251,800] 13 1 1 152 7403
+1 0 [251,800] 14 1 1 41 7404
+1 0 [251,800] 19 1 1 32 7405
+1 0 [251,800] 8352 1 1 248 7501
+1 0 [251,800] 8352 2 1 199 7502
+1 0 [251,800] 8352 3 1 159 7503
+1 0 [251,800] 8352 4 1 124 7504
+1 0 [251,800] 8353 8 1 95 7505
+1 0 [251,800] 4304 2 1 248 7601
+1 0 [251,800] 4304 4 1 199 7602
+1 0 [251,800] 4304 2 1 159 7603
+1 0 [251,800] 4305 3 1 124 7604
+1 0 [251,800] 4305 8 1 95 7605
+1 0 [251,800] 3501 1 1 248 7701
+1 0 [251,800] 3502 1 1 199 7702
+1 0 [251,800] 3504 1 1 152 7703
+1 0 [251,800] 3505 1 1 82 7704
+1 0 [251,800] 3506 1 1 65 7705
+1 0 [251,800] 3511 1 1 248 7801
+1 0 [251,800] 3512 1 1 199 7802
+1 0 [251,800] 3514 1 1 152 7803
+1 0 [251,800] 3515 1 1 82 7804
+1 0 [251,800] 3516 1 1 65 7805
+1 0 [251,800] 4151 2 1 248 7901
+1 0 [251,800] 4151 4 1 199 7902
+1 0 [251,800] 4151 6 1 159 7903
+1 0 [251,800] 4151 15 1 119 7904
+1 0 [251,800] 4151 40 1 95 7905
+1 0 [251,800] 181 2 1 248 8001
+1 0 [251,800] 181 4 1 199 8002
+1 0 [251,800] 181 6 1 159 8003
+1 0 [251,800] 181 15 1 119 8004
+1 0 [251,800] 181 40 1 95 8005
+1 0 [251,800] 197 1 1 248 8101
+1 0 [251,800] 197 1 1 190 8102
+1 0 [251,800] 198 1 1 152 8103
+1 0 [251,800] 198 1 1 82 8104
+1 0 [251,800] 199 1 1 65 8105
+1 0 [251,800] 2211 10 1 248 8201
+1 0 [251,800] 2319 1 1 190 8202
+1 0 [251,800] 2326 1 1 152 8203
+1 0 [251,800] 4608 1 1 16 8204
+1 0 [251,800] 4606 1 1 8 8205
+1 0 [251,800] 149 1 1 248 8301
+1 0 [251,800] 151 1 1 199 8302
+1 0 [251,800] 154 1 1 159 8303
+1 0 [251,800] 147 1 1 124 8304
+1 0 [251,800] 155 1 1 95 8305
+1 0 [251,800] 143 10 1 248 8401
+1 0 [251,800] 143 20 1 199 8402
+1 0 [251,800] 144 20 1 159 8403
+1 0 [251,800] 144 60 1 119 8404
+1 0 [251,800] 153 60 1 95 8405
+1 0 [251,800] 5303 10 1 248 8501
+1 0 [251,800] 5303 20 1 199 8502
+1 0 [251,800] 5303 40 1 159 8503
+1 0 [251,800] 5303 120 1 119 8504
+1 0 [251,800] 5303 200 1 65 8505
+1 0 [251,800] 911 1 1 248 8601
+1 0 [251,800] 911 2 1 199 8602
+1 0 [251,800] 911 3 1 159 8603
+1 0 [251,800] 912 1 1 119 8604
+1 0 [251,800] 1003 1 1 16 8605
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index b984835..0ae1cb9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -537,6 +537,7 @@
2408 1 0 B级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 418 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
2409 1 0 C级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 468 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 518 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 1000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
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