From 6174295afe9803e7f041fe3068cb738014345c73 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 23 十一月 2018 11:23:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt | 26 ++++----
db/PyMongoDataServer/PySysDB/tagStore.txt | 14 ++--
CoreServerGroup/GameServer/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 16 ++--
db/PyMongoDataServer/SysDB/tagChinItem.txt | 1
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 20 +++++-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 3
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 2
db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt | 16 ++--
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 20 +++++-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 4 +
11 files changed, 78 insertions(+), 44 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 0188e7e..3ba78ec 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,7 +1,7 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
-1 OpenServer01 [] [] 2 2 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-2 OpenServer02 [] [] 4 4 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-3 OpenServer03 [] [] 6 6 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+1 OpenServer01 [] [] 1 2 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+2 OpenServer02 [] [] 3 4 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+3 OpenServer03 [] [] 5 6 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
4 OpenServer04 [] [] 9 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
5 NationalDay [] [] 2018-9-1 2018-9-1 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
6 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
@@ -31,3 +31,17 @@
30 NationalDay06 [] [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
31 NationalDay07 [] [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
32 NationalDay08 [] [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+33 Double11 [] [] 2018-11-9 2018-11-9 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+34 Double11 [] [] 2018-11-10 2018-11-10 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+35 Double11 [] [] 2018-11-11 2018-11-11 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+36 Double11 [] [] 2018-11-12 2018-11-12 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+37 WooliesSection1 [] [] 2018-11-14 2018-11-14 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+38 WooliesSection2 [] [] 2018-11-15 2018-11-15 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+39 WooliesSection3 [] [] 2018-11-17 2018-11-17 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+40 WooliesSection4 [] [] 2018-11-18 2018-11-18 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+41 WooliesSection5 [] [] 2018-11-19 2018-11-19 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+42 WooliesSection6 [] [] 2018-11-21 2018-11-21 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+43 WooliesSection7 [] [] 2018-11-22 2018-11-22 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+44 WooliesSection8 [] [] 2018-11-23 2018-11-23 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+45 WooliesSection9 [] [] 2018-11-25 2018-11-25 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+46 WooliesSection10 [] [] 2018-11-26 2018-11-26 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index d10a9c0..5d66c17 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -69,3 +69,7 @@
CeremonyWorldLv {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
OperationAction 10 0 0 0 0
+HelpBattleCount 5 3 2 10 0
+HelpBattleRefresh 5 5 5
+HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]}
+HelpBattleCheckIn 48 3 {1:[60010], 2:[60010, 51010]}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 220f341..f0b051c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -172,7 +172,7 @@
774 108 0 0
775 109 0 0
776 110 0 0
-777 111 0 0
+777 110 0 0
778 111 0 0
779 112 0 0
780 113 0 0
diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc
index 91a2348..3505c27 100644
--- a/CoreServerGroup/GameServer/Script/ChConfig.pyc
+++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index e6e99ac..b7b82b8 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,7 +1,7 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
-1 2 2 120 50 0 [[22]] SellMail4
-2 4 4 120 50 0 [[16]] SellMail4
-3 6 6 120 50 0 [[18]] SellMail4
+1 1 2 120 50 0 [[22]] SellMail4
+2 3 4 50 0 [[16]] SellMail4
+3 5 6 50 0 [[18]] SellMail4
4 9 10 120 50 0 [[15]] SellMail4
5 2018-9-1 2018-9-1 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
6 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]]
@@ -31,3 +31,17 @@
30 2018-10-6 2018-10-6 110 0 [[11]] SellMail4
31 2018-10-7 2018-10-7 110 0 [[14]] SellMail4
32 2018-10-8 2018-10-8 110 0 [[12]] SellMail4
+33 2018-11-9 2018-11-9 120 50 0 [[22]] SellMail4 双11活动
+34 2018-11-10 2018-11-10 50 0 [[23]] SellMail4 双11活动
+35 2018-11-11 2018-11-11 50 0 [[24]] SellMail4 双11活动
+36 2018-11-12 2018-11-12 50 0 [[25]] SellMail4 双11活动
+37 2018-11-14 2018-11-14 120 50 0 [[27]] SellMail4
+38 2018-11-15 2018-11-15 50 0 [[28]] SellMail4
+39 2018-11-17 2018-11-17 120 50 0 [[29]] SellMail4
+40 2018-11-18 2018-11-18 50 0 [[30]] SellMail4
+41 2018-11-19 2018-11-19 50 0 [[31]] SellMail4
+42 2018-11-21 2018-11-21 120 50 0 [[32]] SellMail4
+43 2018-11-22 2018-11-22 50 0 [[33]] SellMail4
+44 2018-11-23 2018-11-23 50 0 [[34]] SellMail4
+45 2018-11-25 2018-11-25 120 50 0 [[35]] SellMail4
+46 2018-11-26 2018-11-26 50 0 [[36]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 1bb3b6f..352e2b5 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 330 0 0 [16,14] [3,300,30,10,[100,50]] [[101,31401002,12,3]] [(4151,2,2),(1143,1,1)]
-31140 1 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[101,31401003,24,6],[102,31403002,1,1]] [(4151,2,2),(1143,1,1)]
-31140 2 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[103,31401004,12,6],[104,31403003,1,1]] [(4151,2,2),(1143,1,1)]
-31140 3 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[105,31401005,24,6],[104,31403004,1,1]] [(4151,2,2),(1143,1,1)]
-31140 4 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[106,31401006,12,6],[104,31403005,1,1]] [(4151,2,2),(1143,1,1)]
-31140 5 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[105,31401007,24,6],[104,31403006,1,1]] [(4151,2,2),(1143,1,1)]
-31140 6 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[101,31401008,4,4],[102,31403007,1,1]] [(4151,2,2),(1143,1,1)]
-31140 7 31140 180 500 0 0 0 0 330 0 0 [16,14] [3,300,30,10,[100,50]] [[103,31401009,12,6],[104,31403008,1,1]] [(4151,2,2),(1143,1,1)]
+31140 0 31140 180 500 0 0 0 0 250 0 0 [16,14] [3,300,30,10,[100,50]] [[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,[100,50]] [[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,[100,50]] [[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,[100,50]] [[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,[100,50]] [[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,[100,50]] [[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,[100,50]] [[101,31401008,4,4],[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,[100,50]] [[103,31401009,12,6],[104,31403008,1,1]] [(5303,5,1),(5412,1,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/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 0709515..40b83de 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -15,7 +15,7 @@
PackageSortPriority 1|5|81|4|14|13|8|9|26|28|125|27|41|22|124|21|25|20|45|58|54|39|52|6|34|35|36|76|11|12|15|17|29|44|48|50|51|60|80|7|101|102|103|104|105|106|107|108|109|111|112 0 0 0 0
IceLodeSweep {31401001:10,31403001:2} 0 0 0 0
IceLodeNeedPoint 1500 31401001_50|31403001_300 0 0 0
-IceLodeCfg 50 [8,5] 200 [[16,1,1]] 3
+IceLodeCfg 25 [8,5] 125 [[5303,25,1],[5412,5,1]] 4
ClearDevilPoint 1200 {30102001:20,30102002:50,30102003:300} 0 0 0
AI197Point {"31040":[[16,34],[18,99]]}
AI198Point {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]]}
@@ -313,3 +313,4 @@
BindJadeWheelCfg 88 {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588} [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,4)],30:[(10000,9)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
BindJadeWheelNotice 150
WishingWellCfg 14400 10 8 5
+HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]}
diff --git a/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt b/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt
index c8b355b..57edf51 100644
--- a/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt
@@ -1,9 +1,9 @@
index Star LV ItemList
-0 4 [0,200] [[4151,2,2]]
-1 8 [0,200] [[4151,2,3]]
-2 12 [0,200] [[4151,2,4]]
-3 15 [0,200] [[4151,2,5]]
-0 4 [201,500] [[4151,2,6]]
-1 8 [201,500] [[4151,2,7]]
-2 12 [201,500] [[4151,2,8]]
-3 15 [201,500] [[4151,2,9]]
+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]]
+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]]
diff --git a/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt b/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
index 931c9b8..bfc8158 100644
--- a/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
@@ -2,19 +2,19 @@
201 9 1 [[102,60103001,1,1,1,1,0]]
202 10 1 [[102,60103002,1,1,1,1,0]] {"6":3925}
202 10 2 [[102,60103003,1,1,1,1,0]] {"6":9159}
-202 10 3 [[102,60103004,1,1,1,1,0]]
+202 10 3 [[102,60103004,1,1,1,1,0]] {"6":9159}
203 11 1 [[102,60103005,1,1,1,1,0]] {"6":13799}
203 11 2 [[102,60103006,1,1,1,1,0]] {"6":19367}
203 11 3 [[102,60103007,1,1,1,1,0]] {"6":26048}
203 11 4 [[102,60103008,1,1,1,1,0]] {"6":34028}
-203 11 5 [[102,60103009,1,1,1,1,0]]
+203 11 5 [[102,60103009,1,1,1,1,0]] {"6":34028}
204 12 1 [[102,60103010,1,1,1,1,0]] {"6":39077}
204 12 2 [[102,60103011,1,1,1,1,0]] {"6":44883}
204 12 3 [[102,60103012,1,1,1,1,0]] {"6":51699}
204 12 4 [[102,60103013,1,1,1,1,0]] {"6":59777}
204 12 5 [[102,60103014,1,1,1,1,0]] {"6":69118}
204 12 6 [[102,60103015,1,1,1,1,0]] {"6":80100}
-204 12 7 [[102,60103016,1,1,1,1,0]]
+204 12 7 [[102,60103016,1,1,1,1,0]] {"6":80100}
205 13 1 [[102,60103017,1,1,1,1,0]] {"6":85357}
205 13 2 [[102,60103018,1,1,1,1,0]] {"6":91365}
205 13 3 [[102,60103019,1,1,1,1,0]] {"6":98275}
@@ -23,7 +23,7 @@
205 13 6 [[102,60103022,1,1,1,1,0]] {"6":125914}
205 13 7 [[102,60103023,1,1,1,1,0]] {"6":137931}
205 13 8 [[102,60103024,1,1,1,1,0]] {"6":151901}
-205 13 9 [[102,60103025,1,1,1,1,0]]
+205 13 9 [[102,60103025,1,1,1,1,0]] {"6":151901}
206 14 1 [[102,60103026,1,1,1,1,0]] {"6":158561}
206 14 2 [[102,60103027,1,1,1,1,0]] {"6":166173}
206 14 3 [[102,60103028,1,1,1,1,0]] {"6":174926}
@@ -32,7 +32,7 @@
206 14 6 [[102,60103031,1,1,1,1,0]] {"6":209940}
206 14 7 [[102,60103032,1,1,1,1,0]] {"6":225164}
206 14 8 [[102,60103033,1,1,1,1,0]] {"6":242861}
-206 14 9 [[102,60103034,1,1,1,1,0]]
+206 14 9 [[102,60103034,1,1,1,1,0]] {"6":242861}
207 15 1 [[102,60103035,1,1,1,1,0]] {"6":251149}
207 15 2 [[102,60103036,1,1,1,1,0]] {"6":260621}
207 15 3 [[102,60103037,1,1,1,1,0]] {"6":271514}
@@ -41,7 +41,7 @@
207 15 6 [[102,60103040,1,1,1,1,0]] {"6":315085}
207 15 7 [[102,60103041,1,1,1,1,0]] {"6":334029}
207 15 8 [[102,60103042,1,1,1,1,0]] {"6":356052}
-207 15 9 [[102,60103043,1,1,1,1,0]]
+207 15 9 [[102,60103043,1,1,1,1,0]] {"6":356052}
208 16 1 [[102,60103044,1,1,1,1,0]] {"6":365582}
208 16 2 [[102,60103045,1,1,1,1,0]] {"6":376474}
208 16 3 [[102,60103046,1,1,1,1,0]] {"6":388999}
@@ -50,7 +50,7 @@
208 16 6 [[102,60103049,1,1,1,1,0]] {"6":439101}
208 16 7 [[102,60103050,1,1,1,1,0]] {"6":460885}
208 16 8 [[102,60103051,1,1,1,1,0]] {"6":486208}
-208 16 9 [[102,60103052,1,1,1,1,0]]
+208 16 9 [[102,60103052,1,1,1,1,0]] {"6":486208}
209 17 1 [[102,60103053,1,1,1,1,0]] {"6":497050}
209 17 2 [[102,60103054,1,1,1,1,0]] {"6":509441}
209 17 3 [[102,60103055,1,1,1,1,0]] {"6":523691}
@@ -59,7 +59,7 @@
209 17 6 [[102,60103058,1,1,1,1,0]] {"6":580691}
209 17 7 [[102,60103059,1,1,1,1,0]] {"6":605474}
209 17 8 [[102,60103060,1,1,1,1,0]] {"6":634284}
-209 17 9 [[102,60103061,1,1,1,1,0]]
+209 17 9 [[102,60103061,1,1,1,1,0]] {"6":634284}
210 18 1 [[102,60103062,1,1,1,1,0]] {"6":646548}
210 18 2 [[102,60103063,1,1,1,1,0]] {"6":660564}
210 18 3 [[102,60103064,1,1,1,1,0]] {"6":676682}
@@ -68,7 +68,7 @@
210 18 6 [[102,60103067,1,1,1,1,0]] {"6":741156}
210 18 7 [[102,60103068,1,1,1,1,0]] {"6":769188}
210 18 8 [[102,60103069,1,1,1,1,0]] {"6":801776}
-210 18 9 [[102,60103070,1,1,1,1,0]]
+210 18 9 [[102,60103070,1,1,1,1,0]] {"6":801776}
211 19 1 [[102,60103071,1,1,1,1,0]] {"6":815836}
211 19 2 [[102,60103072,1,1,1,1,0]] {"6":831905}
211 19 3 [[102,60103073,1,1,1,1,0]] {"6":850385}
@@ -77,7 +77,7 @@
211 19 6 [[102,60103076,1,1,1,1,0]] {"6":924304}
211 19 7 [[102,60103077,1,1,1,1,0]] {"6":956443}
211 19 8 [[102,60103078,1,1,1,1,0]] {"6":993804}
-211 19 9 [[102,60103079,1,1,1,1,0]]
+211 19 9 [[102,60103079,1,1,1,1,0]] {"6":993804}
212 20 1 [[102,60103080,1,1,1,1,0]] {"6":1010616}
212 20 2 [[102,60103081,1,1,1,1,0]] {"6":1029830}
212 20 3 [[102,60103082,1,1,1,1,0]] {"6":1051927}
@@ -86,7 +86,7 @@
212 20 6 [[102,60103085,1,1,1,1,0]] {"6":1140313}
212 20 7 [[102,60103086,1,1,1,1,0]] {"6":1178742}
212 20 8 [[102,60103087,1,1,1,1,0]] {"6":1223416}
-212 20 9 [[102,60103088,1,1,1,1,0]]
+212 20 9 [[102,60103088,1,1,1,1,0]] {"6":1223416}
213 21 1 [[102,60103089,1,1,1,1,0]] {"6":1243016}
213 21 2 [[102,60103090,1,1,1,1,0]] {"6":1265416}
213 21 3 [[102,60103091,1,1,1,1,0]] {"6":1291176}
@@ -95,7 +95,7 @@
213 21 6 [[102,60103094,1,1,1,1,0]] {"6":1394216}
213 21 7 [[102,60103095,1,1,1,1,0]] {"6":1439016}
213 21 8 [[102,60103096,1,1,1,1,0]] {"6":1491096}
-213 21 9 [[102,60103097,1,1,1,1,0]]
+213 21 9 [[102,60103097,1,1,1,1,0]] {"6":1491096}
214 22 1 [[102,60103098,1,1,1,1,0]] {"6":1513895}
214 22 2 [[102,60103099,1,1,1,1,0]] {"6":1539951}
214 22 3 [[102,60103100,1,1,1,1,0]] {"6":1569916}
@@ -104,4 +104,4 @@
214 22 6 [[102,60103103,1,1,1,1,0]] {"6":1689776}
214 22 7 [[102,60103104,1,1,1,1,0]] {"6":1741889}
214 22 8 [[102,60103105,1,1,1,1,0]] {"6":1802471}
-214 22 9 [[102,60103106,1,1,1,1,0]]
+214 22 9 [[102,60103106,1,1,1,1,0]] {"6":1802471}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index a1e8c76..96f3226 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -170,13 +170,13 @@
772 108 1 153 80 1 [[147,6,1]] 153 0 0 0 1 0 1 88 630 0 LimitGift6
773 108 1 4606 1 1 [[2213,70,1]] 4606 0 0 0 1 0 1 288 8750 0 LimitGift7
774 108 1 982 10 1 [] 982 0 0 0 1 0 1 888 2500 0 LimitGift8
-775 109 1 4681 1 1 [[4010,24,1]] 4681 0 0 0 1 0 1 588 2170 0 LimitGift6
-776 110 1 1128 1 1 [[4657,1,1]] 1128 0 0 0 1 0 1 58 350 0 LimitGift6
-777 111 1 983 10 1 [] 983 0 0 0 1 0 1 58 300 0 LimitGift6
-778 111 1 4306 2000 1 [] 4306 0 0 0 1 0 1 588 2000 0 LimitGift7
-779 112 1 4151 40 1 [[912,2,1]] 912 0 0 0 1 0 1 188 700 0 LimitGift6
-780 113 1 2213 10 1 [[4610,1,1]] 4610 0 0 0 1 0 1 58 325 0 LimitGift6
-781 113 1 982 10 1 [] 983 0 0 0 1 0 1 888 2500 0 LimitGift7
+775 109 1 4007 2 1 [[30,100,1]] 4007 0 0 0 1 0 1 88 260 0 LimitGift6
+776 110 1 1503 2 1 [[966,2,1]] 1503 0 0 0 1 0 1 88 300 0 LimitGift6
+777 110 1 153 200 1 [[5303,500,1]] 153 0 0 0 1 0 1 588 1700 0 LimitGift7
+778 111 1 912 2 1 [] 912 0 0 0 1 0 1 88 300 0 LimitGift6
+779 112 1 983 30 1 [] 983 0 0 0 1 0 1 188 900 0 LimitGift6
+780 113 1 4181 5 1 [[4182,1,1]] 4182 0 0 0 1 0 1 88 550 0 LimitGift6
+781 113 1 2346 6 1 [] 2346 0 0 0 1 0 1 588 1620 0 LimitGift7
782 114 1 4007 6 1 [[144,100,1]] 4007 0 0 0 1 0 1 188 780 0 LimitGift6
801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
802 19 0 2393 1 0 [] 0 0 0 0 0 0 1 60 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 2f3fc30..2e72ebe 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -241,6 +241,7 @@
1021 1 0 试炼找回经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 8 0 50 0 1 0 0 215 3000 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1022 1 0 魔坛秘影经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 213 2994480 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
1023 1 0 Boss争夺战经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 18 0 50 0 1 0 0 215 3000 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+1024 1 0 冰晶矿脉经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 18 0 50 0 1 0 0 215 7200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1100 1 0 兵刃 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1101 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1102 1 0 魂印 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0