From b4ec4633c2ca4e57422b9ab8d0db2b2f2e32d750 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 31 一月 2019 14:19:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 18 ++------
db/PyMongoDataServer/PySysDB/tagStore.txt | 25 +++++++-----
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 6 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 6 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc | 0
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 2
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 6 +-
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 2
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 8 ----
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt | 6 +-
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 25 +++++++-----
13 files changed, 49 insertions(+), 59 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index dea4021..792d690 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -7,4 +7,4 @@
6 tast6 [] [] 2018-12-8 2018-12-8 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
7 test7 [] [] 2018-12-9 2018-12-9 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
8 test8 [] [] 2018-12-15 2018-12-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-9 20190212 [] [] 2019-2-12 2018-2-13 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+9 20190212 [] [] 2019-2-12 2019-2-13 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index bedaf44..1801314 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -54,17 +54,9 @@
53 20190131 [] [] 2019-1-31 2019-1-31 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
54 20190202 [] [] 2019-2-2 2019-2-2 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
55 20190203 [] [] 2019-2-3 2019-2-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-56 20190203 [] [] 2019-2-3 2019-2-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-57 20190203 [] [] 2019-2-3 2019-2-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
58 20190204 [] [] 2019-2-4 2019-2-4 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-59 20190204 [] [] 2019-2-4 2019-2-4 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
60 20190205 [] [] 2019-2-5 2019-2-5 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-61 20190205 [] [] 2019-2-5 2019-2-5 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
62 20190206 [] [] 2019-2-6 2019-2-6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-63 20190206 [] [] 2019-2-6 2019-2-6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
64 20190207 [] [] 2019-2-7 2019-2-7 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-65 20190207 [] [] 2019-2-7 2019-2-7 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
66 20190215 [] [] 2019-2-15 2019-2-15 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-67 20190215 [] [] 2019-2-15 2019-2-15 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
68 20190216 [] [] 2019-2-16 2019-2-16 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-69 20190216 [] [] 2019-2-16 2019-2-16 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index bfc27c8..3959e01 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -61,7 +61,7 @@
OpenServerRedPacketCnt 30
OSRSuccess [14,15,16,17,18,19,20,21,22]
OpenServerRedPacketRain 200 {"31":"OSRedpackSfx1", "32":"OSRedpackSfx2"}
-FeastRedPacket 10 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800]
+FeastRedPacket 10 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800] 1
GeTuiOffLine 您关注的封魔坛BOSS[%s LV.%s]已经复活，快前往挑战 您关注的%s的BOSS[%s LV.%s]即将复活刷新，赶快上线前往挑战 您收到来自[%s]的私聊消息，快上线回复对方 升到60级就开启离线挂机啦，角色下线也可以挂机，经验和装备一点也不落下！[再玩一会] 您关注的诛仙BOSS[%s LV.%s]已经复活，快前往挑战
BillBoardPlayerLoginNotify [[0, {1:'GeRen_liubo_232930'}],[4, {1:'GeRen_liubo_148706'}],] 100 300
BossRebornTotalPoint 2200|3300|4400|5500 26|51|101|9999
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 29d2693..192617b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -229,17 +229,20 @@
1320 135 0 0
1321 136 0 0
1322 137 0 0
-1323 138 0 0
-1324 139 0 0
-1325 140 0 0
-1326 141 0 0
-1327 142 0 0
-1328 143 0 0
-1329 144 0 0
-1330 145 0 0
-1331 146 0 0
-1332 147 0 0
-1333 148 0 0
+1323 137 0 0
+1324 137 0 0
+1325 138 0 0
+1326 138 0 0
+1327 139 0 0
+1328 139 0 0
+1329 140 0 0
+1330 140 0 0
+1331 141 0 0
+1332 141 0 0
+1333 142 0 0
+1334 142 0 0
+1335 143 0 0
+1336 143 0 0
801 19 0 0
802 19 0 0
803 19 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc
index eaf6e6d..b8e30f0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index c7e4afa..8c493d5 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -7,4 +7,4 @@
6 2018-12-8 2018-12-8 50 0 5
7 2018-12-9 2018-12-9 50 0 6
8 2018-12-15 2018-12-15 50 0 7
-9 2019-2-12 2018-2-13 50 0 8
+9 2019-2-12 2019-2-13 50 0 8
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index f9779ae..1a8086f 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -54,17 +54,9 @@
53 2019-1-31 2019-1-31 110 0 [[135]] SellMail3
54 2019-2-2 2019-2-2 110 0 [[136]] SellMail3
55 2019-2-3 2019-2-3 110 0 [[137]] SellMail3
-56 2019-2-3 2019-2-3 110 0 [[138]] SellMail3
-57 2019-2-3 2019-2-3 110 0 [[147]] SellMail3
-58 2019-2-4 2019-2-4 110 0 [[139]] SellMail3
-59 2019-2-4 2019-2-4 110 0 [[140]] SellMail3
-60 2019-2-5 2019-2-5 110 0 [[141]] SellMail3
-61 2019-2-5 2019-2-5 110 0 [[142]] SellMail3
-62 2019-2-6 2019-2-6 110 0 [[143]] SellMail3
-63 2019-2-6 2019-2-6 110 0 [[128]] SellMail3
+58 2019-2-4 2019-2-4 110 0 [[138]] SellMail3
+60 2019-2-5 2019-2-5 110 0 [[139]] SellMail3
+62 2019-2-6 2019-2-6 110 0 [[140]] SellMail3
64 2019-2-7 2019-2-7 110 0 [[141]] SellMail3
-65 2019-2-7 2019-2-7 110 0 [[148]] SellMail3
-66 2019-2-15 2019-2-15 110 0 [[144]] SellMail3
-67 2019-2-15 2019-2-15 110 0 [[128]] SellMail3
-68 2019-2-16 2019-2-16 110 0 [[145]] SellMail3
-69 2019-2-16 2019-2-16 110 0 [[146]] SellMail3
+66 2019-2-15 2019-2-15 110 0 [[142]] SellMail3
+68 2019-2-16 2019-2-16 110 0 [[143]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index 2e28f0c..ed50d71 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -27,6 +27,6 @@
31 2018-12-30 2018-12-30 5 0 16
32 2019-1-26 2019-1-26 5 0 20
33 2019-1-27 2019-1-27 5 0 21
-34 2019-2-9 2019-2-10 5 0 22
-35 2019-2-14 2019-2-14 5 0 23
-36 2019-2-17 2019-2-18 5 0 24
+34 2019-2-9 2019-2-10 5 0 24
+35 2019-2-14 2019-2-14 5 0 25
+36 2019-2-17 2019-2-18 5 0 26
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index e06e443..0eb90ea 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -67,6 +67,6 @@
5 66 200 1 [(2445,1,1)] 2445 LimitGift3
4 67 150 1 [(913,1,1),(4694,10,1)] 913 LimitGift3
2 68 35 1 [(912,1,1),(4694,4,1)] 912 LimitGift3
-8 69 400 1 [(226,1,1),(181,25,1)] 4223 LimitGift3
-5 70 180 1 [(4228,1,1),(4151,25,1)] 5800 LimitGift3
-5 71 150 1 [(5809,1,1),(5810,1,1),(5811,1,1)] 5800 LimitGift3
+8 69 400 1 [(226,1,1),(181,25,1)] 226 LimitGift3
+5 70 180 1 [(4228,1,1),(4151,25,1)] 4228 LimitGift3
+5 71 150 1 [(5809,1,1),(5810,1,1),(5811,1,1)] 5809 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 748f43f..1e11670 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -301,7 +301,7 @@
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50 5
-FeastRedPacket 10 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800]
+FeastRedPacket 10 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800] 1
PotentialSkillLearn {"50065":[15,47000],"50165":[15,47010],"50265":[15,47020],"1065":[15,47030],"50365":[15,47040],"50465":[15,47050],"50565":[15,47060],"50665":[15,47070],"50765":[15,47080],"50865":[15,47090],"51065":[15,47130],"51165":[15,47140],"55065":[15,47200],"55165":[15,47210],"55265":[15,47220],"2065":[15,47230],"55365":[15,47240],"55465":[15,47250],"55565":[15,47260],"55665":[15,47270],"55765":[15,47280],"55865":[15,47290],"56065":[15,47330],"56165":[15,47340]}
FirstGold {"1":[[6619,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]],"2":[[6620,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]]} {"1":388,"2":388} 1800
CTG 20181224
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f8338e0..334225f 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -229,17 +229,20 @@
1320 135 1 912 1 1 [[1128,1,1]] 912 0 0 0 1 0 1 88 350 0 LimitGift6
1321 136 1 110 50 1 [[112,25,1]] 110 0 0 0 1 0 1 388 1600 0 LimitGift6
1322 137 1 913 1 1 [[4694,3,1]] 913 0 0 0 1 0 1 188 800 0 LimitGift6
-1323 138 1 2453 1 1 [] 2453 0 0 0 1 0 1 388 1000 0 LimitGift7
-1324 139 1 4306 1920 1 [] 4306 0 0 0 1 0 1 388 1920 0 LimitGift6
-1325 140 1 2445 1 1 [] 2445 0 0 0 1 0 1 688 2000 0 LimitGift7
-1326 141 1 912 1 1 [[4694,2,1]] 912 0 0 0 1 0 1 88 350 0 LimitGift6
-1327 142 1 913 1 1 [[4694,10,1]] 913 0 0 0 1 0 1 388 1500 0 LimitGift7
-1328 143 1 4608 1 1 [[2213,25,1]] 4608 0 0 0 1 0 1 188 812 0 LimitGift6
-1329 144 1 2213 30 1 [] 2213 0 0 0 1 0 1 88 375 0 LimitGift6
-1330 145 1 912 2 1 [[2213,10,1]] 912 0 0 0 1 0 1 88 425 0 LimitGift6
-1331 146 1 2450 1 1 [] 2450 0 0 0 1 0 1 1588 6000 0 LimitGift6
-1332 147 1 2487 1 1 [] 2487 0 0 0 1 0 1 688 1200 0 LimitGift6
-1333 148 1 5413 40 1 [] 5413 0 0 0 1 0 1 688 1200 0 LimitGift6
+1323 137 1 2453 1 1 [] 2453 0 0 0 1 0 1 388 1000 0 LimitGift7
+1324 137 1 2487 1 1 [] 2487 0 0 0 1 0 1 688 1200 0 LimitGift8
+1325 138 1 4306 1920 1 [] 4306 0 0 0 1 0 1 388 1920 0 LimitGift6
+1326 138 2445 1 1 [] 2445 0 0 0 1 0 1 688 2000 0 LimitGift7
+1327 139 1 912 1 1 [[4694,2,1]] 912 0 0 0 1 0 1 88 350 0 LimitGift6
+1328 139 1 913 1 1 [[4694,10,1]] 913 0 0 0 1 0 1 388 1500 0 LimitGift7
+1329 140 1 4608 1 1 [[2213,25,1]] 4608 0 0 0 1 0 1 188 812 0 LimitGift6
+1330 140 1 4606 1 1 [[2213,50,1]] 4606 0 0 0 1 0 1 388 1625 0 LimitGift7
+1331 141 1 912 1 1 [[4694,2,1]] 912 0 0 0 1 0 1 88 350 0 LimitGift6
+1332 141 1 5413 40 1 [] 5413 0 0 0 1 0 1 688 1200 0 LimitGift7
+1333 142 1 2213 30 1 [] 2213 0 0 0 1 0 1 88 375 0 LimitGift6
+1334 142 1 4606 1 1 [[2213,50,1]] 4606 0 0 0 1 0 1 388 1625 0 LimitGift7
+1335 143 1 912 2 1 [[2213,10,1]] 912 0 0 0 1 0 1 88 425 0 LimitGift6
+1336 143 1 2450 1 1 [] 2450 0 0 0 1 0 1 1588 6000 0 LimitGift7
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
803 19 0 2395 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 c6c13ec..a1c7da6 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1195,7 +1195,7 @@
5503 1 0 3级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 3 3 5504 6 3440 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
5504 1 0 4级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 270 0 20 0 0 0 1 225 3 4 5505 6 6880 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
5505 1 0 5级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 810 0 50 0 0 0 1 225 3 5 5506 6 13740 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
-5506 1 0 6级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 3 6 5507 6 27480 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
+5506 1 0 6级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 3 6 0 6 27480 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
5507 1 0 7级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 7290 0 20 0 0 0 1 225 3 7 0 6 54940 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5508 1 0 8级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 21870 0 50 0 0 0 1 225 3 8 0 6 109880 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5509 1 0 9级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 65610 0 50 0 0 0 1 225 3 9 0 6 219740 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -1204,7 +1204,7 @@
5513 1 0 3级诛仙攻击宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 4 3 5514 7 172 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
5514 1 0 4级诛仙攻击宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 270 0 20 0 0 0 1 225 4 4 5515 7 344 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
5515 1 0 5级诛仙攻击宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 810 0 50 0 0 0 1 225 4 5 5516 7 687 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
-5516 1 0 6级诛仙攻击宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 4 6 5517 7 1374 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
+5516 1 0 6级诛仙攻击宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 4 6 0 7 1374 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
5517 1 0 7级诛仙攻击宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 7290 0 20 0 0 0 1 225 4 7 0 7 2747 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5518 1 0 8级诛仙攻击宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 21870 0 50 0 0 0 1 225 4 8 0 7 5494 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5519 1 0 9级诛仙攻击宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 65610 0 50 0 0 0 1 225 4 9 0 7 10987 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -1213,7 +1213,7 @@
5523 1 0 3级诛仙附伤宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 5 3 5524 35 172 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
5524 1 0 4级诛仙附伤宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 270 0 20 0 0 0 1 225 5 4 5525 35 344 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
5525 1 0 5级诛仙附伤宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 810 0 50 0 0 0 1 225 5 5 5526 35 687 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
-5526 1 0 6级诛仙附伤宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 5 6 5527 35 1374 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
+5526 1 0 6级诛仙附伤宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 5 6 0 35 1374 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
5527 1 0 7级诛仙附伤宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 7290 0 20 0 0 0 1 225 5 7 0 35 2747 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5528 1 0 8级诛仙附伤宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 21870 0 50 0 0 0 1 225 5 8 0 35 5494 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5529 1 0 9级诛仙附伤宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 65610 0 50 0 0 0 1 225 5 9 0 35 10987 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 2dead29..5eb48d4 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -727,8 +727,8 @@
46056 兽血沸腾 46055 2 2 0 12 0 16 1 0 0 0 10 0 0 3000 0 0 0 0 0 4023 2000 5000 0 18 2000 1 0 19 3000 3 0 16 3000 3 0 0 0 0 0 0 0 0 0 10000 3000 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
46060 不灭之盾 46060 1 2 0 12 0 16 1 0 0 0 10 0 0 3000 0 0 0 0 0 4023 2000 0 0 13 2000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
46061 不灭之盾 46060 2 2 0 12 0 16 1 0 0 0 10 0 0 3000 0 0 0 0 0 4023 2000 0 0 13 2500 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
-46065 不朽之力 46065 1 2 0 12 0 16 1 0 0 0 10 0 0 9000 0 0 0 0 0 4023 2000 0 0 4516 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
-46066 不朽之力 46065 2 2 0 12 0 16 1 0 0 0 10 0 0 9000 0 0 0 0 0 4023 2000 0 0 4516 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
+46065 不朽之力 46065 1 2 0 12 0 16 1 0 0 0 10 0 0 8000 0 0 0 0 0 4023 2000 0 0 4516 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
+46066 不朽之力 46065 2 2 0 12 0 16 1 0 0 0 10 0 0 8000 0 0 0 0 0 4023 2000 0 0 4516 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
46070 背水一战 46070 1 2 0 12 0 7 1 0 0 0 0 0 0 0 0 0 0 0 0 4005 5000 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
46071 背水一战 46070 2 2 0 12 0 7 1 0 0 0 0 0 0 0 0 0 0 0 0 4005 6000 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
46075 混沌之心 46075 1 2 0 12 0 16 1 0 0 0 10 0 0 3000 0 0 0 0 0 4023 10000 2000 0 77 2500 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 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
@@ -1962,7 +1962,7 @@
30457 攻其不备 30450 8 10 2 4 0 7 0 0 0 0 41 10 0 0 0 0 0 0 0 4003 4000 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21500 30400 6 0 10035 0 0 0 2 461080 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
30458 攻其不备 30450 9 10 2 4 0 7 0 0 0 0 41 10 0 0 0 0 0 0 0 4003 4500 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21500 30400 6 0 10035 0 0 0 2 518715 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
30459 攻其不备 30450 10 10 2 4 0 7 0 0 0 0 41 10 0 0 0 0 0 0 0 4003 5000 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21500 30400 6 0 10035 0 0 0 2 576350 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
-30500 终极风暴(PVP) 30500 1 1 2 4 0 16 1 0 0 0 10 0 0 10000 0 0 0 0 0 4060 10000 0 0 4052 10000 3000 0 4055 50800 5000 1 1011 1 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 21800 30450 6 0 10045 0 0 0 2 88669 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
+30500 终极风暴(PVP) 30500 1 1 2 4 0 16 1 0 0 0 10 0 0 0 0 0 0 0 0 4060 10000 0 0 4052 10000 3000 0 4055 50800 5000 1 1011 1 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 21800 30450 6 0 10045 0 0 0 2 88669 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
30550 幻炎之体 30550 1 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4022 10000 0 0 7 250 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 19396 0 0 0 0 0 0 0 4 0 30000 0 0 0 0
30551 幻炎之体 30550 2 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4022 10000 0 0 7 375 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 38792 0 0 0 0 0 0 0 4 0 30000 0 0 0 0
30552 幻炎之体 30550 3 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4022 10000 0 0 7 500 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 58188 0 0 0 0 0 0 0 4 0 30000 0 0 0 0
--
Gitblit v1.8.0