From bb35ed4780d741d431c4e9a6c939aff6ca7c5585 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 28 九月 2018 22:54:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 1
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 2
db/PyMongoDataServer/PySysDB/tagAlchemy.txt | 10 +-
db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt | 96 ++++++++++++++++----------------
db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 2
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 6 +-
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 2
db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt | 8 +-
8 files changed, 66 insertions(+), 61 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index c1e3bd5..c0b06ce 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,2 +1,4 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime NotifyInfoStart NotifyInfoEnd LimitLV AddExpRate
1 OpenServer [] 6 6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+2 NationalDay [] 2018-10-3 2018-10-3 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+3 NationalDay [] 2018-10-7 2018-10-7 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index e6701b0..5a988cb 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -1,2 +1,4 @@
CfgID LimitLV AddExpRate
1 110 10000
+2 110 10000
+3 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagAlchemy.txt b/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
index b8f39b6..1f5492b 100644
--- a/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
@@ -1,7 +1,7 @@
AlchemyID MaterialAll AlchemyEXP AlchemyItem SpecialItem AlchemyIUp BlastFurnaceLV
101 4611_1|4613_1|4612_1|4614_1|4615_1 50 [[10000,4706,1]] [] 1
-102 4611_2|4613_1|4612_2|4614_1|4615_1 84 [[5000,4707,1],[5000,4716,1]] 1 [] 2
-103 4611_2|4613_2|4612_2|4614_2|4615_2 144 [[4682,4712,1],[1603,4708,1],[1667,4717,1],[1923,4721,1],[125,4740,1]] 2|11 [] 3
-104 4611_3|4613_3|4612_3|4614_3|4615_3 260 [[3657,4713,1],[1294,4709,1],[1333,4718,1],[1552,4722,1],[1940,4725,1],[24,4656,1],[24,4657,1],[24,4664,1],[24,4669,1],[24,4670,1],[24,4674,1],[24,4675,1],[56,4730,1]] 12|21|31 [] 4
-105 4611_4|4613_4|4612_4|4614_4|4615_4 415 [[3305,4714,1],[1180,4710,1],[1111,4719,1],[1416,4723,1],[1573,4726,1],[1180,4728,1],[42,4670,1],[42,4671,1],[42,4685,1],[42,4686,1],[67,4731,1]] 22|32 [] 5
-106 4611_5|4613_5|4612_5|4614_5|4615_5 622 [[3162,4715,1],[1193,4711,1],[1111,4720,1],[1432,4724,1],[1491,4727,1],[1193,4729,1],[42,4654,1],[42,4705,1],[125,4732,1],[125,4733,1],[42,4694,1],[42,4695,1]] 41 [] 6
+102 4611_2|4613_2|4612_2|4614_2|4615_2 84 [[5000,4707,1],[5000,4716,1]] 1 [] 2
+103 4611_3|4613_3|4612_3|4614_3|4615_3 144 [[4682,4712,1],[1603,4708,1],[1667,4717,1],[1923,4721,1],[125,4740,1]] 2|11 [] 3
+104 4611_4|4613_4|4612_4|4614_4|4615_4 260 [[3657,4713,1],[1294,4709,1],[1333,4718,1],[1552,4722,1],[1940,4725,1],[24,4656,1],[24,4657,1],[24,4664,1],[24,4669,1],[24,4670,1],[24,4674,1],[24,4675,1],[56,4730,1]] 12|21|31 [] 4
+105 4611_5|4613_5|4612_5|4614_5|4615_5 415 [[3305,4714,1],[1180,4710,1],[1111,4719,1],[1416,4723,1],[1573,4726,1],[1180,4728,1],[42,4670,1],[42,4671,1],[42,4685,1],[42,4686,1],[67,4731,1]] 22|32 [] 5
+106 4611_6|4613_6|4612_6|4614_6|4615_6 622 [[3162,4715,1],[1193,4711,1],[1111,4720,1],[1432,4724,1],[1491,4727,1],[1193,4729,1],[42,4654,1],[42,4705,1],[125,4732,1],[125,4733,1],[42,4694,1],[42,4695,1]] 41 [] 6
diff --git a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
index 6a95f9b..da2c2d3 100644
--- a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
@@ -1,8 +1,8 @@
ID SpecialMaterialD SpecialMateriaNUM AlchemyEXP AlchemyItem BlastFurnaceLV
-1 4609 1 134 [[9000,4655,1],[1000,1128,1]] 2
-2 4609 1 194 [[9000,4691,1],[1000,1128,1]] 3
-11 4610 1 244 [[9000,4687,1],[1000,4681,1]] 3
-12 4610 1 359 [[9000,4692,1],[1000,4681,1]] 4
+1 4609 1 134 [[9500,4655,1],[500,1128,1]] 2
+2 4609 1 194 [[9500,4691,1],[500,1128,1]] 3
+11 4610 1 244 [[9500,4687,1],[500,4681,1]] 3
+12 4610 1 359 [[9500,4692,1],[500,4681,1]] 4
21 4608 1 509 [[6500,4660,1],[2000,200,1],[1500,4680,1]] 4
22 4608 1 665 [[7000,4661,1],[1500,201,1],[1500,4680,1]] 5
31 4606 1 759 [[9200,4183,1],[800,4206,1]] 4
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index f6a255a..476d397 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -105,15 +105,15 @@
2311 0 [[380,[10621,1]],[760,[10622,1]],[1140,[10623,1]],[1520,[10624,1]],[1900,[10625,1]],[2280,[10626,1]],[2660,[10627,1]],[2755,[10631,1]],[2850,[10632,1]],[2945,[10633,1]],[3040,[10634,1]],[3135,[10635,1]],[3230,[10636,1]],[3325,[10637,1]],[3372,[10641,1]],[3419,[10642,1]],[3466,[10643,1]],[3513,[10644,1]],[3560,[10645,1]],[3607,[10646,1]],[3654,[10647,1]],[4560,[10611,1]],[5466,[10612,1]],[6372,[10613,1]],[7278,[10614,1]],[8184,[10615,1]],[9090,[10616,1]],[10000,[10617,1]]] 6 [[285,[10651,1]],[570,[10652,1]],[855,[10653,1]],[1140,[10654,1]],[1425,[10655,1]],[1710,[10656,1]],[1995,[10657,1]],[2052,[10671,1]],[2109,[10672,1]],[2166,[10673,1]],[2223,[10674,1]],[2280,[10675,1]],[2337,[10676,1]],[2394,[10677,1]],[10000,[0,0]]] 1 [[10621,20621,30621],[10622,20622,30622],[10623,20623,30623],[10624,20624,30624],[10625,20625,30625],[10626,20626,30626],[10627,20627,30627],[10631,20631,30631],[10632,20632,30632],[10633,20633,30633],[10634,20634,30634],[10635,20635,30635],[10636,20636,30636],[10637,20637,30637],[10641,20641,30641],[10642,20642,30642],[10643,20643,30643],[10644,20644,30644],[10645,20645,30645],[10646,20646,30646],[10647,20647,30647],[10611,20611,30611],[10612,20612,30612],[10613,20613,30613],[10614,20614,30614],[10615,20615,30615],[10616,20616,30616],[10617,20617,30617],[10651,20651,30651],[10652,20652,30652],[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10671,20671,30671],[10672,20672,30672],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]] [10651,10652,10653,10654,10655,10656,10657,20651,20652,20653,20654,20655,20656,20657,30651,30652,30653,30654,30655,30656,30657,10671,10672,10673,10674,10675,10676,10677,20671,20672,20673,20674,20675,20676,20677,30671,30672,30673,30674,30675,30676,30677]
2312 0 [[457,[10621,1]],[914,[10622,1]],[1371,[10623,1]],[1828,[10624,1]],[2285,[10625,1]],[2742,[10626,1]],[3199,[10627,1]],[3313,[10631,1]],[3427,[10632,1]],[3541,[10633,1]],[3655,[10634,1]],[3769,[10635,1]],[3883,[10636,1]],[3997,[10637,1]],[4054,[10641,1]],[4111,[10642,1]],[4168,[10643,1]],[4225,[10644,1]],[4282,[10645,1]],[4339,[10646,1]],[4396,[10647,1]],[5196,[10611,1]],[5996,[10612,1]],[6796,[10613,1]],[7596,[10614,1]],[8396,[10615,1]],[9196,[10616,1]],[10000,[10617,1]]] 10 [[571,[10651,1]],[1142,[10652,1]],[1713,[10653,1]],[2284,[10654,1]],[2855,[10655,1]],[3426,[10656,1]],[3997,[10657,1]],[4111,[10671,1]],[4225,[10672,1]],[4339,[10673,1]],[4453,[10674,1]],[4567,[10675,1]],[4681,[10676,1]],[4795,[10677,1]],[10000,[0,0]]] 1 [[10621,20621,30621],[10622,20622,30622],[10623,20623,30623],[10624,20624,30624],[10625,20625,30625],[10626,20626,30626],[10627,20627,30627],[10631,20631,30631],[10632,20632,30632],[10633,20633,30633],[10634,20634,30634],[10635,20635,30635],[10636,20636,30636],[10637,20637,30637],[10641,20641,30641],[10642,20642,30642],[10643,20643,30643],[10644,20644,30644],[10645,20645,30645],[10646,20646,30646],[10647,20647,30647],[10611,20611,30611],[10612,20612,30612],[10613,20613,30613],[10614,20614,30614],[10615,20615,30615],[10616,20616,30616],[10617,20617,30617],[10651,20651,30651],[10652,20652,30652],[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10671,20671,30671],[10672,20672,30672],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]] [10651,10652,10653,10654,10655,10656,10657,20651,20652,20653,20654,20655,20656,20657,30651,30652,30653,30654,30655,30656,30657,10671,10672,10673,10674,10675,10676,10677,20671,20672,20673,20674,20675,20676,20677,30671,30672,30673,30674,30675,30676,30677]
2317 0 109_5|106_5|103_5
-2318 0 4611_2|4612_2|4613_1|4614_1|4615_1
-2319 0 4609_1|4611_2|4612_2|4613_1|4614_1|4615_1
+2318 0 4611_2|4612_2|4613_2|4614_2|4615_2
+2319 0 4609_1|4611_2|4612_2|4613_2|4614_2|4615_2
2320 0 4611_5|4612_5|4613_5|4614_5|4615_5
2321 0 4611_1|4612_1|4613_1|4614_1|4615_1
2322 0 4611_1|4612_1|4613_1|4614_1|4615_1 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 2
2323 0 4611_1|4612_1|4613_1|4614_1|4615_1 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] [[5000,3],[10000,4]]
2324 0 4611_2|4612_2|4613_2|4614_2|4615_2
2325 0 181_10
-2326 0 4610_1|4611_2|4612_2|4613_2|4614_2|4615_2
+2326 0 4610_1|4611_3|4612_3|4613_3|4614_3|4615_3
2327 0 3502_2|3512_2
2328 0 3504_2|3514_2
2329 0 5012_20 [[5012,5022]]
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt b/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
index 81a2ec7..53a6665 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
@@ -7,30 +7,30 @@
2 1 6 0 1 6|18 26171|250 2 7|20 1308|250 3 6|7|18 26171|1308|500
2 1 7 0 1 6|18 41599|250 2 7|20 2080|250 3 6|7|18 41599|2080|500
2 1 8 0 1 6|18 66349|250 2 7|20 3317|250 3 6|7|18 66349|3317|500
-1 1 1 1 2 7|18 103|500 3 6|18|51 4100|500|400 5 7|19 103|300
-1 1 2 1 2 7|18 284|500 3 6|18|51 11346|500|400 5 7|19 284|300
-1 1 3 1 2 7|18 497|500 3 6|18|51 19874|500|400 5 7|19 497|300
-1 1 4 1 2 7|18 766|500 3 6|18|51 30616|500|400 5 7|19 766|300
-1 1 5 1 2 7|18 1134|500 3 6|18|51 45333|500|400 5 7|19 1134|300
-1 1 6 1 2 7|18 1705|500 3 6|18|51 68193|500|400 5 7|19 1705|300
-1 1 7 1 2 7|18 2570|500 3 6|18|51 102773|500|400 5 7|19 2570|300
-1 1 8 1 2 7|18 3928|500 3 6|18|51 157112|500|400 5 7|19 3928|300
-1 1 1 2 2 7|18 103|500 3 6|18|51 4100|500|400 5 7|19 103|300
-1 1 2 2 2 7|18 284|500 3 6|18|51 11346|500|400 5 7|19 284|300
-1 1 3 2 2 7|18 497|500 3 6|18|51 19874|500|400 5 7|19 497|300
-1 1 4 2 2 7|18 766|500 3 6|18|51 30616|500|400 5 7|19 766|300
-1 1 5 2 2 7|18 1134|500 3 6|18|51 45333|500|400 5 7|19 1134|300
-1 1 6 2 2 7|18 1705|500 3 6|18|51 68193|500|400 5 7|19 1705|300
-1 1 7 2 2 7|18 2570|500 3 6|18|51 102773|500|400 5 7|19 2570|300
-1 1 8 2 2 7|18 3928|500 3 6|18|51 157112|500|400 5 7|19 3928|300
-1 1 1 3 2 7|18 103|500 3 6|18|51 4100|500|400 5 7|19 103|300
-1 1 2 3 2 7|18 284|500 3 6|18|51 11346|500|400 5 7|19 284|300
-1 1 3 3 2 7|18 497|500 3 6|18|51 19874|500|400 5 7|19 497|300
-1 1 4 3 2 7|18 766|500 3 6|18|51 30616|500|400 5 7|19 766|300
-1 1 5 3 2 7|18 1134|500 3 6|18|51 45333|500|400 5 7|19 1134|300
-1 1 6 3 2 7|18 1705|500 3 6|18|51 68193|500|400 5 7|19 1705|300
-1 1 7 3 2 7|18 2570|500 3 6|18|51 102773|500|400 5 7|19 2570|300
-1 1 8 3 2 7|18 3928|500 3 6|18|51 157112|500|400 5 7|19 3928|300
+1 1 1 1 2 7|18 612|750 3 6|18|20 24480|750|400 5 7|19 612|450
+1 1 2 1 2 7|18 977|750 3 6|18|20 39078|750|400 5 7|19 977|450
+1 1 3 1 2 7|18 1379|750 3 6|18|20 55160|750|400 5 7|19 1379|450
+1 1 4 1 2 7|18 1841|750 3 6|18|20 73640|750|400 5 7|19 1841|450
+1 1 5 1 2 7|18 2336|750 3 6|18|20 93436|750|400 5 7|19 2336|450
+1 1 6 1 2 7|18 2908|750 3 6|18|20 116296|750|400 5 7|19 2908|450
+1 1 7 1 2 7|18 3776|750 3 6|18|20 151029|750|400 5 7|19 3776|450
+1 1 8 1 2 7|18 5141|750 3 6|18|20 205618|750|400 5 7|19 5141|450
+1 1 1 2 2 7|18 612|750 3 6|18|20 24480|750|400 5 7|19 612|450
+1 1 2 2 2 7|18 977|750 3 6|18|20 39078|750|400 5 7|19 977|450
+1 1 3 2 2 7|18 1379|750 3 6|18|20 55160|750|400 5 7|19 1379|450
+1 1 4 2 2 7|18 1841|750 3 6|18|20 73640|750|400 5 7|19 1841|450
+1 1 5 2 2 7|18 2336|750 3 6|18|20 93436|750|400 5 7|19 2336|450
+1 1 6 2 2 7|18 2908|750 3 6|18|20 116296|750|400 5 7|19 2908|450
+1 1 7 2 2 7|18 3776|750 3 6|18|20 151029|750|400 5 7|19 3776|450
+1 1 8 2 2 7|18 5141|750 3 6|18|20 205618|750|400 5 7|19 5141|450
+1 1 1 3 2 7|18 612|750 3 6|18|20 24480|750|400 5 7|19 612|450
+1 1 2 3 2 7|18 977|750 3 6|18|20 39078|750|400 5 7|19 977|450
+1 1 3 3 2 7|18 1379|750 3 6|18|20 55160|750|400 5 7|19 1379|450
+1 1 4 3 2 7|18 1841|750 3 6|18|20 73640|750|400 5 7|19 1841|450
+1 1 5 3 2 7|18 2336|750 3 6|18|20 93436|750|400 5 7|19 2336|450
+1 1 6 3 2 7|18 2908|750 3 6|18|20 116296|750|400 5 7|19 2908|450
+1 1 7 3 2 7|18 3776|750 3 6|18|20 151029|750|400 5 7|19 3776|450
+1 1 8 3 2 7|18 5141|750 3 6|18|20 205618|750|400 5 7|19 5141|450
2 2 1 0 1 6|18 6216|500 2 7|20 311|500 3 6|7|18 6216|311|1000
2 2 2 0 1 6|18 14133|500 2 7|20 706|500 3 6|7|18 14133|706|1000
2 2 3 0 1 6|18 21633|500 2 7|20 1081|500 3 6|7|18 21633|1081|1000
@@ -39,27 +39,27 @@
2 2 6 0 1 6|18 84942|500 2 7|20 4247|500 3 6|7|18 84942|4247|1000
2 2 7 0 1 6|18 135399|500 2 7|20 6770|500 3 6|7|18 135399|6770|1000
2 2 8 0 1 6|18 216399|500 2 7|20 10820|500 3 6|7|18 216399|10820|1000
-1 2 1 1 2 7|18 154|750 3 6|18|51 6150|750|500 5 7|19 154|450
-1 2 2 1 2 7|18 426|750 3 6|18|51 17019|750|500 5 7|19 426|450
-1 2 3 1 2 7|18 746|750 3 6|18|51 29811|750|500 5 7|19 746|450
-1 2 4 1 2 7|18 1149|750 3 6|18|51 45924|750|500 5 7|19 1149|450
-1 2 5 1 2 7|18 1701|750 3 6|18|51 68000|750|500 5 7|19 1701|450
-1 2 6 1 2 7|18 2558|750 3 6|18|51 102290|750|500 5 7|19 2558|450
-1 2 7 1 2 7|18 3855|750 3 6|18|51 154160|750|500 5 7|19 3855|450
-1 2 8 1 2 7|18 5892|750 3 6|18|51 235668|750|500 5 7|19 5892|450
-1 2 1 2 2 7|18 154|750 3 6|18|51 6150|750|500 5 7|19 154|450
-1 2 2 2 2 7|18 426|750 3 6|18|51 17019|750|500 5 7|19 426|450
-1 2 3 2 2 7|18 746|750 3 6|18|51 29811|750|500 5 7|19 746|450
-1 2 4 2 2 7|18 1149|750 3 6|18|51 45924|750|500 5 7|19 1149|450
-1 2 5 2 2 7|18 1701|750 3 6|18|51 68000|750|500 5 7|19 1701|450
-1 2 6 2 2 7|18 2558|750 3 6|18|51 102290|750|500 5 7|19 2558|450
-1 2 7 2 2 7|18 3855|750 3 6|18|51 154160|750|500 5 7|19 3855|450
-1 2 8 2 2 7|18 5892|750 3 6|18|51 235668|750|500 5 7|19 5892|450
-1 2 1 3 2 7|18 154|750 3 6|18|51 6150|750|500 5 7|19 154|450
-1 2 2 3 2 7|18 426|750 3 6|18|51 17019|750|500 5 7|19 426|450
-1 2 3 3 2 7|18 746|750 3 6|18|51 29811|750|500 5 7|19 746|450
-1 2 4 3 2 7|18 1149|750 3 6|18|51 45924|750|500 5 7|19 1149|450
-1 2 5 3 2 7|18 1701|750 3 6|18|51 68000|750|500 5 7|19 1701|450
-1 2 6 3 2 7|18 2558|750 3 6|18|51 102290|750|500 5 7|19 2558|450
-1 2 7 3 2 7|18 3855|750 3 6|18|51 154160|750|500 5 7|19 3855|450
-1 2 8 3 2 7|18 5892|750 3 6|18|51 235668|750|500 5 7|19 5892|450
+1 2 1 1 2 7|18 918|1000 3 6|18|20 36720|1000|600 5 7|19 918|600
+1 2 2 1 2 7|18 1466|1000 3 6|18|20 58617|1000|600 5 7|19 1466|600
+1 2 3 1 2 7|18 2069|1000 3 6|18|20 82740|1000|600 5 7|19 2069|600
+1 2 4 1 2 7|18 2762|1000 3 6|18|20 110460|1000|600 5 7|19 2762|600
+1 2 5 1 2 7|18 3504|1000 3 6|18|20 140154|1000|600 5 7|19 3504|600
+1 2 6 1 2 7|18 4362|1000 3 6|18|20 174444|1000|600 5 7|19 4362|600
+1 2 7 1 2 7|18 5664|1000 3 6|18|20 226544|1000|600 5 7|19 5664|600
+1 2 8 1 2 7|18 7711|1000 3 6|18|20 308427|1000|600 5 7|19 7711|600
+1 2 1 2 2 7|18 918|1000 3 6|18|20 36720|1000|600 5 7|19 918|600
+1 2 2 2 2 7|18 1466|1000 3 6|18|20 58617|1000|600 5 7|19 1466|600
+1 2 3 2 2 7|18 2069|1000 3 6|18|20 82740|1000|600 5 7|19 2069|600
+1 2 4 2 2 7|18 2762|1000 3 6|18|20 110460|1000|600 5 7|19 2762|600
+1 2 5 2 2 7|18 3504|1000 3 6|18|20 140154|1000|600 5 7|19 3504|600
+1 2 6 2 2 7|18 4362|1000 3 6|18|20 174444|1000|600 5 7|19 4362|600
+1 2 7 2 2 7|18 5664|1000 3 6|18|20 226544|1000|600 5 7|19 5664|600
+1 2 8 2 2 7|18 7711|1000 3 6|18|20 308427|1000|600 5 7|19 7711|600
+1 2 1 3 2 7|18 918|1000 3 6|18|20 36720|1000|600 5 7|19 918|600
+1 2 2 3 2 7|18 1466|1000 3 6|18|20 58617|1000|600 5 7|19 1466|600
+1 2 3 3 2 7|18 2069|1000 3 6|18|20 82740|1000|600 5 7|19 2069|600
+1 2 4 3 2 7|18 2762|1000 3 6|18|20 110460|1000|600 5 7|19 2762|600
+1 2 5 3 2 7|18 3504|1000 3 6|18|20 140154|1000|600 5 7|19 3504|600
+1 2 6 3 2 7|18 4362|1000 3 6|18|20 174444|1000|600 5 7|19 4362|600
+1 2 7 3 2 7|18 5664|1000 3 6|18|20 226544|1000|600 5 7|19 5664|600
+1 2 8 3 2 7|18 7711|1000 3 6|18|20 308427|1000|600 5 7|19 7711|600
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index 510c50f..1d78433 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -16,4 +16,4 @@
50106309 5 GetPet14 4217 1 1000 1 50 6 48440|48445|48450 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 14400
50106310 4 GetPet15 4218 1 1000 1 40 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 7200
50106311 3 GetPet16 4219 1 1000 1 30 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396
-50106312 3 GetPet17 4220 1 1000 1 30 6 48470|48475|48480 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
+50106312 3 GetPet17 4220 1 1000 1 30 6 48470|48475|48480 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2448
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index fcd6055..f200f6c 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -28,6 +28,7 @@
64 2 0 2050 1 0 [] 0 0 0 0 0 1 50 0 0
65 2 0 982 1 0 [] 0 0 0 0 0 1 250 0 0
66 2 0 983 1 0 [] 0 0 0 0 0 1 30 0 0
+67 2 0 953 1 0 [] 0 0 0 0 0 1 500 0 0
101 3 0 181 1 0 [] 0 0 0 0 0 1 10 0 0
103 3 0 3501 1 0 [] 0 0 0 0 0 1 10 0 0
104 3 0 3511 1 0 [] 0 0 0 0 0 1 10 0 0
--
Gitblit v1.8.0