From 0fb7d383ae9b5ca703fb602c12cac6e327a89ee4 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 27 十一月 2018 15:00:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 14 ++--
db/PyMongoDataServer/PySysDB/tagStore.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 3 +
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 89 ++++++++++++++++++++++++-----
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 3 +
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc | 0
db/PyMongoDataServer/PySysDB/tagAttrFruit.txt | 2
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 22 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0
14 files changed, 101 insertions(+), 40 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index aa1be21..df512ac 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -13,7 +13,7 @@
CreatRolePoint2 2_12|3_19|4_15|5_51 0 0 0 0
CreatRolePoint3 2_52|3_20|4_13|5_12 0 0 0 0
PlayerMaxLV 500 0 0 0 0
-RealmFBHelpAward ["RealmFBHelp",3,[(101,3,1)]]
+RealmFBHelpAward ["RealmFBHelp",3,[(101,1,1)]]
RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
RealmFBHelpLimit 10
GlobalDropCD {3802:100,3803:2880,3804:4320,3805:86400,9051:1440,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160,5408:1440} {50103001:{1:[0,{4202:1,4253:2,4151:10},[]]},50103002:{1:[0,{250:1,224:2,181:20},[]]},50103003:{1:[0,{4213:1,4252:2,4151:20},[]]},50103004:{1:[0,{222:3,181:50},[]]},50103005:{1:[0,{4250:3,4151:50},[]]}} 0 0 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 48f5113..cc8168d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -101,3 +101,6 @@
149 280 0 0
150 75 0 0
151 105 0 0
+152 110 0 0
+153 110 0 0
+154 110 0 0
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
index 0fce39d..de7ee34 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 68a3092..37a2639 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/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
index 0a92076..51c876d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
index b76fba2..91ce63e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
index 499f15e..762fb4d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index 545d270..5265e67 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -20,7 +20,7 @@
194 1 60 100
195 1 60 100
196 1 10 100
-197 1 500 100
+197 1 999 100
198 1 300 100
199 1 100 100
200 1 10 500
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index a474a27..c89a70a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -101,3 +101,6 @@
149 280 0 0 0 0
150 75 0 0 0 0
151 105 0 0 0 0
+152 110 0 0 0 0
+153 110 0 0 0 0
+154 110 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index cc0a4f6..ac44a30 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -99,18 +99,18 @@
50103005 1 3 1 372500 10000 0 8000 2 9900 50 1 0 0 1020 0
50103006 1 3 1 419000 10000 0 8000 2 9900 50 1 0 0 947 0
50103007 1 3 1 465600 10000 0 8000 2 9900 50 1 0 0 874 0
-31401002 0 2 0 3100 10000 0 8000 3 9900 50 24 0 0 0 0
-31403002 0 2 0 7100 10000 0 8000 3 9900 50 1 0 0 50 0
+31401002 0 2 0 2900 10000 0 8000 3 9900 50 24 0 0 0 0
+31403002 0 2 0 6600 10000 0 8000 3 9900 50 1 0 0 50 0
31401003 0 2 0 800 10000 0 8000 3 9900 50 24 0 0 0 0
-31403003 0 2 0 6600 10000 0 8000 3 9900 50 1 0 0 50 0
-31401004 0 2 0 600 10000 1000 8000 3 9900 50 12 0 0 0 0
+31403003 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
+31401004 0 2 0 800 10000 1000 8000 3 9900 50 12 0 0 0 0
31403004 0 2 0 6900 10000 0 8000 3 9900 50 1 0 0 50 0
31401005 0 2 0 2500 10000 0 8000 3 9900 50 12 0 0 0 0
31403005 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
31401006 0 2 0 800 10000 0 8000 3 9900 50 12 0 0 0 0
-31403006 0 2 0 3000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401007 0 2 0 3500 10000 0 8000 3 9900 50 12 0 0 0 0
+31403006 0 2 0 2400 10000 0 8000 3 9900 50 1 0 0 50 0
+31401007 0 2 0 1900 10000 0 8000 3 9900 50 12 0 0 0 0
31403007 0 2 0 6500 10000 0 8000 3 9900 50 1 0 0 50 0
31401008 0 2 0 600 10000 0 8000 3 9900 50 12 0 0 0 0
31403008 0 2 0 2000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401009 0 2 0 3000 10000 0 8000 3 9900 50 12 0 0 0 0
+31401009 0 2 0 2800 10000 0 8000 3 9900 50 12 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 132fbde..e085af7 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -20,17 +20,24 @@
lxj.3000 226114725 3000 109 0
lxj.1 226114725 1 110 0
snqxz.ios.6 424064855 6 0 2
+snqxz.ios.18 424064855 18 0 3
snqxz.ios.30 424064855 30 0 4
snqxz.ios.68 424064855 68 0 5
snqxz.ios.98 424064855 98 0 6
snqxz.ios.128 424064855 128 0 7
snqxz.ios.168 424064855 168 0 8
+snqxz.ios.198 424064855 198 0 9
+snqxz.ios.jbch 424064855 18 111 0
+snqxz.ios.ntlc 424064855 30 112 0
+snqxz.ios.jszq 424064855 98 113 0
sn.android.6 226114725 6 0 2
+sn.android.18 226114725 18 0 3
sn.android.30 226114725 30 0 4
sn.android.68 226114725 68 0 5
sn.android.98 226114725 98 0 6
sn.android.128 226114725 128 0 7
sn.android.168 226114725 168 0 8
+sn.android.198 226114725 198 0 9
sn.android.jbch 226114725 18 111 0
sn.android.ntlc 226114725 30 112 0
sn.android.jszq 226114725 98 113 0
@@ -44,11 +51,16 @@
lxj.648 508021130 648 108 0
lxj.1 508021130 1 110 0
lxj.ios.6 508021130 6 0 2
+lxj.ios.18 508021130 18 0 3
lxj.ios.30 508021130 30 0 4
lxj.ios.68 508021130 68 0 5
lxj.ios.98 508021130 98 0 6
lxj.ios.128 508021130 128 0 7
lxj.ios.168 508021130 168 0 8
+lxj.ios.198 508021130 198 0 9
+lxj.ios.jbch 508021130 18 111 0
+lxj.ios.ntlc 508021130 30 112 0
+lxj.ios.jszq 508021130 98 113 0
lxj.18 813015059 18 101 0
lxj.10 813015059 10 102 0
lxj.30 813015059 30 103 0
@@ -60,11 +72,13 @@
lxj.3000 813015059 3000 109 0
lxj.1 813015059 1 110 0
lxj.android.6 813015059 6 0 2
+lxj.android.18 813015059 18 0 3
lxj.android.30 813015059 30 0 4
lxj.android.68 813015059 68 0 5
lxj.android.98 813015059 98 0 6
lxj.android.128 813015059 128 0 7
lxj.android.168 813015059 168 0 8
+lxj.android.198 813015059 198 0 9
lxj.android.jbch 813015059 18 111 0
lxj.android.ntlc 813015059 30 112 0
lxj.android.jszq 813015059 98 113 0
@@ -79,11 +93,13 @@
snxxz.3000 822055139 3000 109 0
snxxz.1 822055139 1 110 0
snxxz.android.6 822055139 6 0 2
+snxxz.android.18 822055139 18 0 3
snxxz.android.30 822055139 30 0 4
snxxz.android.68 822055139 68 0 5
snxxz.android.98 822055139 98 0 6
snxxz.android.128 822055139 128 0 7
snxxz.android.168 822055139 168 0 8
+snxxz.android.198 822055139 198 0 9
snxxz.android.jbch 822055139 18 111 0
snxxz.android.ntlc 822055139 30 112 0
snxxz.android.jszq 822055139 98 113 0
@@ -97,11 +113,16 @@
snxxz.648 828115704 648 108 0
snxxz.1 828115704 1 110 0
snxxz.ios.6 828115704 6 0 2
+snxxz.ios.18 828115704 18 0 3
snxxz.ios.30 828115704 30 0 4
snxxz.ios.68 828115704 68 0 5
snxxz.ios.98 828115704 98 0 6
snxxz.ios.128 828115704 128 0 7
snxxz.ios.168 828115704 168 0 8
+snxxz.ios.198 828115704 198 0 9
+snxxz.ios.jbch 828115704 18 111 0
+snxxz.ios.ntlc 828115704 30 112 0
+snxxz.ios.jszq 828115704 98 113 0
575 mrgame 18 101 0
576 mrgame 10 102 0
577 mrgame 30 103 0
@@ -113,13 +134,16 @@
583 mrgame 3000 109 0
584 mrgame 1 110 0
570 mrgame 6 0 2
+1098 mrgame 18 0 3
571 mrgame 30 0 4
572 mrgame 68 0 5
+1099 mrgame 98 0 6
573 mrgame 128 0 7
574 mrgame 168 0 8
-585 mrgame 18 111 0
-586 mrgame 30 112 0
-587 mrgame 98 113 0
+1100 mrgame 198 0 9
+1101 mrgame 18 111 0
+1102 mrgame 30 112 0
+1103 mrgame 98 113 0
sgsbl.18 815035927 18 101 0
sgsbl.6 815035927 6 2 0
sgsbl.30 815035927 30 103 0
@@ -131,10 +155,16 @@
sgsbl.1 815035927 1 110 0
sgsbl.0.1 815035927 0.1 210 0
sgsbl.ios.6 815035927 6 0 2
+sgsbl.ios.18 815035927 18 0 3
sgsbl.ios.30 815035927 30 0 4
sgsbl.ios.68 815035927 68 0 5
+sgsbl.ios.98 815035927 98 0 6
sgsbl.ios.128 815035927 128 0 7
sgsbl.ios.168 815035927 168 0 8
+sgsbl.ios.198 815035927 198 0 9
+sgsbl.ios.jbch 815035927 18 111 0
+sgsbl.ios.ntlc 815035927 30 112 0
+sgsbl.ios.jszq 815035927 98 113 0
test.18 test 18 101 0
test.10 test 10 102 0
test.30 test 30 103 0
@@ -146,10 +176,13 @@
test.3000 test 3000 109 0
test.1 test 1 110 0
test.libao.6 test 6 0 2
+test.libao.18 test 18 0 3
test.libao.30 test 30 0 4
test.libao.68 test 68 0 5
+test.libao.98 test 98 0 6
test.libao.128 test 128 0 7
test.libao.168 test 168 0 8
+test.libao.198 test 198 0 9
test.libao.jbch test 18 111 0
test.libao.ntlc test 30 112 0
test.libao.jszq test 98 113 0
@@ -164,10 +197,13 @@
xj.3000 spxjgame 3000 109 0
xj.1 spxjgame 1 110 0
xj.android.6 spxjgame 6 0 2
+xj.android.18 spxjgame 18 0 3
xj.android.30 spxjgame 30 0 4
xj.android.68 spxjgame 68 0 5
+xj.android.98 spxjgame 98 0 6
xj.android.128 spxjgame 128 0 7
xj.android.168 spxjgame 168 0 8
+xj.android.198 spxjgame 198 0 9
xj.android.jbch spxjgame 18 111 0
xj.android.ntlc spxjgame 30 112 0
xj.android.jszq spxjgame 98 113 0
@@ -181,10 +217,16 @@
jkjk.0648 mrgameios 648 108 0
jkjk.1 mrgameios 1 110 0
jkjk.6 mrgameios 6 0 2
+jkjk.18 mrgameios 18 0 3
jkjk.30 mrgameios 30 0 4
jkjk.68 mrgameios 68 0 5
+jkjk.98 mrgameios 98 0 6
jkjk.128 mrgameios 128 0 7
jkjk.168 mrgameios 168 0 8
+jkjk.198 mrgameios 198 0 9
+jkjk.jbch mrgameios 18 111 0
+jkjk.ntlc mrgameios 30 112 0
+jkjk.jszq mrgameios 98 113 0
com.price18.xylb spyxxjios 18 101 0
com.price6.xyxz spyxxjios 6 2 0
com.price30.xyxz spyxxjios 30 103 0
@@ -195,10 +237,16 @@
com.price648.xyxz spyxxjios 648 108 0
com.price1.xj spyxxjios 1 110 0
com.price6.xylb spyxxjios 6 0 2
+com.price18.xylb spyxxjios 18 0 3
com.price30.xylb spyxxjios 30 0 4
com.price68.xylb spyxxjios 68 0 5
+com.price98.xylb spyxxjios 98 0 6
com.price128.xylb spyxxjios 128 0 7
com.price168.xylb spyxxjios 168 0 8
+com.price198.xylb spyxxjios 198 0 9
+com.price18.ynjplb spyxxjios 18 111 0
+com.price30.ynjplb spyxxjios 30 112 0
+com.price98.ynjplb spyxxjios 98 113 0
jisu.18 jisugame 18 101 0
jisu.10 jisugame 10 102 0
jisu.30 jisugame 30 103 0
@@ -210,10 +258,13 @@
jisu.3000 jisugame 3000 109 0
jisu.1 jisugame 1 110 0
jisu.android.6 jisugame 6 0 2
+jisu.android.18 jisugame 18 0 3
jisu.android.30 jisugame 30 0 4
jisu.android.68 jisugame 68 0 5
+jisu.android.98 jisugame 98 0 6
jisu.android.128 jisugame 128 0 7
jisu.android.168 jisugame 168 0 8
+jisu.android.198 jisugame 198 0 9
jisu.android.jbch jisugame 18 111 0
jisu.android.ntlc jisugame 30 112 0
jisu.android.jszq jisugame 98 113 0
@@ -227,10 +278,16 @@
com.snjjxios.08 jisugameios 648 108 0
com.snjjxios.14 jisugameios 1 110 0
com.snjjxios.09 jisugameios 6 0 2
+com.snjjxios.15 jisugameios 18 0 3
com.snjjxios.10 jisugameios 30 0 4
com.snjjxios.11 jisugameios 68 0 5
+com.snjjxios.16 jisugameios 98 0 6
com.snjjxios.12 jisugameios 128 0 7
com.snjjxios.13 jisugameios 168 0 8
+com.snjjxios.17 jisugameios 198 0 9
+com.snjjxios.18 jisugameios 18 111 0
+com.snjjxios.19 jisugameios 30 112 0
+com.snjjxios.20 jisugameios 98 113 0
wx.snqxz.18 424064855 18 201 0
wx.snqxz.6 424064855 6 202 0
wx.snqxz.30 424064855 30 203 0
@@ -249,20 +306,6 @@
wx.sgsbl.328 815035927 328 207 0
wx.sgsbl.648 815035927 648 208 0
wx.sgsbl.01 815035927 0.1 211 0
-com.price18.snxzlb spyxxzios 18 101 0
-com.price6.snxz spyxxzios 6 2 0
-com.price30.snxz spyxxzios 30 103 0
-com.price98.snxz spyxxzios 98 104 0
-com.price128.snxz spyxxzios 128 105 0
-com.price198.snxz spyxxzios 198 106 0
-com.price328.snxz spyxxzios 328 107 0
-com.price648.snxz spyxxzios 648 108 0
-com.price1.snxz spyxxzios 1 110 0
-com.price6.snxzlb spyxxzios 6 0 2
-com.price30.snxzlb spyxxzios 30 0 4
-com.price68.snxzlb spyxxzios 68 0 5
-com.price128.snxzlb spyxxzios 128 0 7
-com.price168.snxzlb spyxxzios 168 0 8
com.snyjjpg.01 jisusnyjjios 18 101 0
com.snyjjpg.02 jisusnyjjios 6 2 0
com.snyjjpg.03 jisusnyjjios 30 103 0
@@ -273,10 +316,16 @@
com.snyjjpg.08 jisusnyjjios 648 108 0
com.snyjjpg.test1 jisusnyjjios 1 110 0
com.snyjjpg.09 jisusnyjjios 6 0 2
+com.snyjjpg.14 jisusnyjjios 18 0 3
com.snyjjpg.10 jisusnyjjios 30 0 4
com.snyjjpg.11 jisusnyjjios 68 0 5
+com.snyjjpg.15 jisusnyjjios 98 0 6
com.snyjjpg.12 jisusnyjjios 128 0 7
com.snyjjpg.13 jisusnyjjios 168 0 8
+com.snyjjpg.16 jisusnyjjios 198 0 9
+com.snyjjpg.17 jisusnyjjios 18 111 0
+com.snyjjpg.18 jisusnyjjios 30 112 0
+com.snyjjpg.19 jisusnyjjios 98 113 0
mbxml.18 1030013326 18 101 0
mbxml.6 1030013326 6 2 0
mbxml.30 1030013326 30 103 0
@@ -287,7 +336,13 @@
mbxml.648 1030013326 648 108 0
mbxml.ios.test1 1030013326 1 110 0
mbxml.ios.6 1030013326 6 0 2
+mbxml.ios.18 1030013326 18 0 3
mbxml.ios.30 1030013326 30 0 4
mbxml.ios.68 1030013326 68 0 5
+mbxml.ios.98 1030013326 98 0 6
mbxml.ios.128 1030013326 128 0 7
mbxml.ios.168 1030013326 168 0 8
+mbxml.ios.198 1030013326 198 0 9
+mbxml.ios.ch18 1030013326 18 111 0
+mbxml.ios.ch30 1030013326 30 112 0
+mbxml.ios.ch98 1030013326 98 113 0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index cc952b5..a6863d4 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -212,13 +212,13 @@
1014 201 2 4609 2 1 [] 4609 0 0 0 1 999 1 50 200 0 FlashRushToBuy2 FlashToSnapUp
1015 202 2 4607 2 1 [] 4607 0 0 0 1 2 1 999 4000 0 FlashRushToBuy2 FlashToSnapUp
1016 202 2 7002 1 0 [] 7002 0 0 0 1 3 1 680 1800 0 FlashRushToBuy2 FlashToSnapUp
-1017 202 2 5202 1 1 [] 5202 0 0 0 1 3 1 20 50 0 FlashRushToBuy2 FlashToSnapUp
+1017 202 2 5006 1 1 [] 5006 0 0 0 1 3 1 20 50 0 FlashRushToBuy2 FlashToSnapUp
1018 202 2 196 1 1 [] 196 0 0 0 1 5 1 200 800 0 FlashRushToBuy2 FlashToSnapUp
1019 202 2 195 5 1 [] 195 0 0 0 1 10 1 300 1500 0 FlashRushToBuy2 FlashToSnapUp
1020 202 2 4610 1 1 [] 4610 0 0 0 1 999 1 60 200 0 FlashRushToBuy2 FlashToSnapUp
1021 202 2 5410 3 1 [] 5410 0 0 0 1 999 1 88 150 0 FlashRushToBuy2 FlashToSnapUp
1022 203 2 5409 2 1 [] 5409 0 0 0 1 1 1 8888 25000 0 FlashRushToBuy2 FlashToSnapUp
-1023 203 2 5202 2 1 [] 5202 0 0 0 1 1 1 60 100 0 FlashRushToBuy2 FlashToSnapUp
+1023 203 2 5006 2 1 [] 5006 0 0 0 1 1 1 60 100 0 FlashRushToBuy2 FlashToSnapUp
1024 203 2 2390 5 1 [] 2390 0 0 0 1 1 1 1800 3000 0 FlashRushToBuy2 FlashToSnapUp
1025 203 2 4680 1 1 [] 4680 0 0 0 1 20 1 200 750 0 FlashRushToBuy2 FlashToSnapUp
1026 203 2 2390 1 1 [] 2390 0 0 0 1 5 1 300 600 0 FlashRushToBuy2 FlashToSnapUp
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index f5ab109..94d02c8 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -687,7 +687,7 @@
31401006 2 0 深渊刺客 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
31401007 2 0 海马勇士 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
31401008 2 0 花精灵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 30 23045 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
-31401009 2 0 毒牙 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 180 1 1
+31401009 2 0 毒牙 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
31403002 2 0 冰晶巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 3 0 0 198 1 1
31403003 2 0 巨石之力 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23041 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 3 0 0 186 1 1
31403004 2 0 深海龙王 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23042 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 3 0 0 186 1 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 3cd400b..21e3bf4 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -621,7 +621,7 @@
23030 境界压制 23030 1 1 0 11 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105019 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 10000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23041 冰晶矿脉3层加防 23041 1 1 0 0 0 5 0 0 6 200 140 9 0 1800000 0 0 0 0 0 13 100000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 5000 0 10 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 10000 0 10 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23043 冰晶矿脉减少攻击 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 4 0 10 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
23044 冰晶矿脉增加攻击 23044 1 1 0 0 0 5 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 3 0 10 8000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 300000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 30 0 0 0 0 0 0 0 1000 200 0 5 2103 31403007 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 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
@@ -730,16 +730,16 @@
48110 气吞山河 48110 1 1 0 7 0 7 1 0 0 0 0 0 0 30000 0 0 0 0 0 4032 610 0 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 0 0 0 0 0 0 0 0 2 3500 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48120 无量真言 48120 1 1 0 7 0 7 1 0 0 0 0 0 0 30000 0 0 0 0 0 4032 610 0 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 0 0 0 0 0 0 0 0 2 4000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48130 蝶舞飞花 48130 1 1 0 7 0 7 1 0 0 0 0 0 0 30000 0 0 0 0 0 4032 610 0 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 0 0 0 0 0 0 0 0 2 4500 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48040 神光护体 48040 1 1 0 7 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4004 2000 0 0 807 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 3500 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48045 金甲御敌 48045 1 1 0 7 0 7 1 0 0 0 10 0 0 30000 0 0 0 0 0 4065 1 1000 2000 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 0 0 0 0 0 0 0 0 2 4000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48050 须弥真界 48050 1 1 0 7 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4023 10000 0 0 802 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 4500 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48055 长空之撼 48055 1 1 0 7 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4004 2000 0 0 520 9 2000 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3500 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48060 锋芒之威 48060 1 1 0 7 0 7 1 0 0 0 10 0 0 30000 0 0 0 0 0 4066 2 1000 2000 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 0 0 0 0 0 0 0 0 2 4000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48065 鏖战之意 48065 1 1 0 7 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4004 10000 0 0 4502 4000 48066 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 4500 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48066 眩晕 48066 1 1 0 0 0 14 3 0 0 0 41 10 0 0 0 0 0 0 0 4012 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2500 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 3 511 511 3 2 0 0 0 0 0 0
-48070 清风化气 48070 1 1 0 7 0 7 1 0 30 0 0 0 0 30000 0 0 0 0 0 14 0 0 0 4067 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3500 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48075 般若无间 48075 1 1 0 7 0 18 1 0 0 0 41 0 0 30000 0 0 0 0 0 4067 5000 0 0 4012 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 3 511 511 3 2 0 0 0 0 0 0
-48080 万世不竭 48080 1 1 0 7 0 7 1 0 8 0 10 0 0 30000 0 0 0 0 0 1000 5000 0 5 4067 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 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+48040 神光护体 48040 1 1 0 7 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4004 10000 0 0 807 500 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 5436 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48045 金甲御敌 48045 1 1 0 7 0 7 1 0 0 0 10 0 0 30000 0 0 0 0 0 4065 1 20 2000 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 0 0 0 0 0 0 0 0 2 13656 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48050 须弥真界 48050 1 1 0 7 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4023 10000 0 0 802 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 68499 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48055 长空之撼 48055 1 1 0 7 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4004 10000 0 0 520 9 500 9 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 8134 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48060 锋芒之威 48060 1 1 0 7 0 7 1 0 0 0 10 0 0 30000 0 0 0 0 0 4066 2 20 2000 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 0 0 0 0 0 0 0 0 2 20493 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48065 鏖战之意 48065 1 1 0 7 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4023 10000 0 0 4502 4000 48066 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 102756 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48066 眩晕 48066 1 1 0 0 0 14 3 0 0 0 41 10 0 0 0 0 0 0 0 4012 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 3 511 511 3 2 0 0 0 0 0 0
+48070 清风化气 48070 1 1 0 7 0 7 1 0 30 0 10 0 0 30000 0 0 0 0 0 0 0 0 0 4067 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 13300 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48075 般若无间 48075 1 1 0 7 0 18 1 0 0 0 41 0 0 30000 0 0 0 0 0 4067 5000 0 0 4012 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 32728 0 0 0 3 511 511 3 2 0 0 0 0 0 0
+48080 万世不竭 48080 1 1 0 7 0 7 1 0 8 0 10 0 0 30000 0 0 0 0 0 1000 4000 0 1 4067 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 0 0 0 0 0 0 0 0 2 163507 0 0 0 0 0 0 0 2 0 0 0 0 0 0
48200 道法 48200 1 1 0 6 0 20 0 0 0 0 111 0 0 0 0 0 0 0 0 500 1200 50 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 0 0 0 0 0 0 0 0 2 1178 0 0 0 0 0 0 0 4 0 0 0 0 0 0
48205 强击 48205 1 1 0 6 0 1 2 0 2 8 81 9 0 500 0 0 0 0 0 1010 10000 0 0 1200 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2945 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48210 风雷之变 48210 1 1 0 6 0 5 0 0 0 0 111 0 0 45000 0 0 0 0 0 2102 5000 0 0 2004 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 500 0 0 0 0 0 0 0 0 0 0 0 0 2 10307 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0