From e7b8886a3f8fffe8958fb03a46903f9a276b8e7f Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 20 九月 2018 20:03:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 28 ++++++++++++++--------------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 9afd603..726aaf7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -46,7 +46,7 @@
KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2} 0_3|1_0|2_3 {0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}
CreateRoleMap {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}
SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25} 160
-DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109):[20302001,1,'30',2,3], (121,122,123,124):[20302002,1,'40',2,3], (131,132,133):[20302003,10,'30',30,30]} 20303001 [20302001, 20302003]
+DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'30',30,30], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'40',6,6], (161,162,163,164,165,166,167):[20302003,6,'30',42,42]} 20303001 [20302001, 20302003]
XMZZBetCfg {}
XMZZAward {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZDogFallLimit 1000
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1335329..b80a351 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -147,8 +147,8 @@
FamilyMatchSRankOneReward {215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]}
FamilyMatchDayReward [[914,1,1],[911,1,1],[2213,1,1]] 11|12 41
WingLV {"5":1,"6":2,"8":3,"10":4,"12":5}
-WingLegendAttrCount {6:1,8:1,10:2,12:2} 0 0 0
-WingLegendAttrValue {6:{30:[400,800,1200,1600],33:[200,400,600,800]},8:{30:[1600,2000,2400,2800],33:[800,1000,1200,1400]},10:{30:[2800,3200],33:[1400,1600]},12:{30:[3200,4000],33:[1600,2000]}} 0 0 0 0
+WingLegendAttrCount {5:1,6:1,8:1,10:2,12:2} 0 0 0
+WingLegendAttrValue {5:{30:[400,800],33:[200,400]},6:{30:[400,800,1200,1600],33:[200,400,600,800]},8:{30:[1600,2000,2400,2800],33:[800,1000,1200,1400]},10:{30:[2800,3200],33:[1400,1600]},12:{30:[3200,4000],33:[1600,2000]}} 0 0 0 0
WingRealmLimit 3711_1|3712_4|3713_8|3714_12|3715_16|3721_1|3722_4|3723_8|3724_12|3725_16
WingInitialWashValue [[6190,0],[7142,7],[7857,15],[8476,25],[9047,43],[10000,52]] 3711|3721
FightHappenRate 150
@@ -247,7 +247,7 @@
OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/350.0) + 0.1*pow((lv/350.0), 2) +0.15*pow((lv/350.0), 3) + 0.699*pow((lv/350.0), 4))))
BossStoneDelayTime 1500
DogzAssist 3|10 3511 2|3|4|5 1_10|2_20|3_30|4_40|5_50|6_50 8351
-DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109):[20302001,1,'30',2,3], (121,122,123,124):[20302002,1,'40',2,3], (131,132,133):[20302003,10,'30',30,30]} 20303001 [20302001, 20302003]
+DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'30',30,30], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'40',6,6], (161,162,163,164,165,166,167):[20302003,6,'30',42,42]} 20303001 [20302001, 20302003]
DogzFBCollect {20302001:1,20302002:1} {20302001:1,20302002:1}
XMZZBetCfg {}
XMZZAward {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 8af7c1d..7d66f07 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -555,20 +555,20 @@
31103010 2 0 射日神弓幻象 320 0 10186 10186 0 0 0 0 90000 17959 0 0 0 0 0 0 0 0 2600 42300 39 0 300 2 5 10074 10075 10076 0 0 0 0 0 0 40 2 40197221 0 0 0 0 3 0 0 186 1 1
31103011 2 0 琉璃伞幻象 350 0 15186 15186 0 0 0 0 90000 17959 0 0 0 0 0 0 0 0 2600 49350 45 0 300 2 5 10077 10078 10079 0 0 0 0 0 0 40 2 40197221 0 0 0 0 3 0 0 186 1 1
31203001 2 0 焚源之炬幻象 70 0 1016 1016 619 0 0 0 10000 782 0 0 0 0 0 0 59360 4 2600 9869 10 0 300 2 5 11000 11001 10300 0 0 0 0 0 0 40 2 30419 0 0 0 0 3 0 0 186 1 1
-31203002 2 0 摄魂铃幻象 100 0 1588 1588 0 0 0 0 10000 2346 0 0 0 0 0 0 116223 0 2600 40420 17 0 300 2 5 11002 11003 10301 0 0 0 0 0 0 40 2 132584 0 0 0 0 3 0 0 186 1 1
-31203003 2 0 乾云镜幻象 125 0 2967 2967 0 0 0 0 10000 4387 0 0 0 0 0 0 239403 0 2600 52640 20 0 300 2 5 11004 11005 10302 0 0 0 0 0 0 40 2 390699 0 0 0 0 3 0 0 186 1 1
-31203004 2 0 天丝琴幻象 160 0 4134 4134 0 0 0 0 10000 6177 0 0 0 0 0 0 451928 0 2600 59219 21 0 300 2 5 11006 11007 10303 0 0 0 0 0 0 40 2 927473 0 0 0 0 3 0 0 186 1 1
-31203005 2 0 九幽胄幻象 180 0 7159 7159 0 0 0 0 10000 9829 0 0 0 0 0 0 908856 0 2600 80181 26 0 300 2 5 11008 11009 10304 0 0 0 0 0 0 40 2 2021684 0 0 0 0 3 0 0 186 1 1
-31203006 2 0 碧霄剑幻象 200 0 9845 9845 3602 0 0 0 10000 13512 0 0 0 0 0 0 1300404 0 2600 91461 28 0 300 2 5 11010 11011 10305 0 0 0 0 0 0 40 2 3300291 0 0 0 0 3 0 0 186 1 1
-31203007 2 0 明心扇幻象 220 0 13149 13149 5090 0 0 0 10000 16901 0 0 0 0 0 0 1892314 0 2600 109510 31 0 300 2 5 11012 11013 10306 0 0 0 0 0 0 40 2 6730609 0 0 0 0 3 0 0 186 1 1
-31203008 2 0 混元伞幻象 240 0 21097 21097 6523 0 0 0 10000 25292 0 0 0 0 0 0 2775673 0 2600 132352 34 0 300 2 5 11014 11015 10307 0 0 0 0 0 0 40 2 12009782 0 0 0 0 3 0 0 186 1 1
-31203009 2 0 冥炎瓶幻象 260 0 29774 29774 8034 0 0 0 10000 35293 0 0 0 0 0 0 4085075 0 2600 147956 36 0 300 2 5 11016 11017 10308 0 0 0 0 0 0 40 2 21199154 0 0 0 0 3 0 0 186 1 1
-31203010 2 0 九黎神火扇幻象 280 0 40164 40164 10528 0 0 0 10000 44604 0 0 0 0 0 0 5793768 0 2600 170046 39 0 300 2 5 11018 11019 10309 0 0 0 0 0 0 40 2 34372362 0 0 0 0 3 0 0 186 1 1
-31203011 2 0 白泽灯幻象 300 0 45840 45840 12386 0 0 0 10000 52903 0 0 0 0 0 0 7501159 0 2600 185556 41 0 300 2 5 11020 11021 10310 0 0 0 0 0 0 40 2 49727710 0 0 0 0 3 0 0 186 1 1
-31203012 2 0 磐龙袍幻象 320 0 56182 56182 14795 0 0 0 10000 69106 0 0 0 0 0 0 9626940 0 2600 201160 44 0 300 2 5 11022 11023 10311 0 0 0 0 0 0 40 2 70120514 0 0 0 0 3 0 0 186 1 1
-31203013 2 0 琉心笔幻象 340 0 73517 73517 19013 0 0 0 10000 86424 0 0 0 0 0 0 12682583 0 2600 209620 46 0 300 2 5 11024 11025 10312 0 0 0 0 0 0 40 2 5336186 1 0 0 0 3 0 0 186 1 1
-31203014 2 0 招魂幡幻象 360 0 97299 97299 22573 0 0 0 10000 106870 0 0 0 0 0 0 15539497 0 2600 212722 48 0 300 2 5 11026 11027 10313 0 0 0 0 0 0 40 2 30887620 1 0 0 0 3 0 0 186 1 1
-31203015 2 0 蛊凰盏幻象 380 0 111979 111979 24535 0 0 0 10000 111973 0 0 0 0 0 0 17144335 0 2600 214696 50 0 300 2 5 11006 11007 10314 0 0 0 0 0 0 40 2 48784856 1 0 0 0 3 0 0 186 1 1
+31203002 2 0 摄魂铃幻象 100 0 1588 1588 0 0 0 0 10000 2346 0 0 0 0 0 0 113641 0 2600 40420 17 0 300 2 5 11002 11003 10301 0 0 0 0 0 0 40 2 132584 0 0 0 0 3 0 0 186 1 1
+31203003 2 0 乾云镜幻象 125 0 2873 2873 0 0 0 0 10000 4312 0 0 0 0 0 0 217528 0 2600 50101 19 0 300 2 5 11004 11005 10302 0 0 0 0 0 0 40 2 346677 0 0 0 0 3 0 0 186 1 1
+31203004 2 0 天丝琴幻象 160 0 3990 3990 0 0 0 0 10000 5990 0 0 0 0 0 0 340606 0 2600 62885 22 0 300 2 5 11006 11007 10303 0 0 0 0 0 0 40 2 572015 0 0 0 0 3 0 0 186 1 1
+31203005 2 0 九幽胄幻象 180 0 6477 6477 0 0 0 0 10000 8946 0 0 0 0 0 0 696256 0 2600 80181 26 0 300 2 5 11008 11009 10304 0 0 0 0 0 0 40 2 1194884 0 0 0 0 3 0 0 186 1 1
+31203006 2 0 碧霄剑幻象 200 0 9572 9572 3109 0 0 0 10000 12864 0 0 0 0 0 0 1193488 0 2600 97853 29 0 300 2 5 11010 11011 10305 0 0 0 0 0 0 40 2 2813417 0 0 0 0 3 0 0 186 1 1
+31203007 2 0 明心扇幻象 220 0 12448 12448 4315 0 0 0 10000 15936 0 0 0 0 0 0 1703187 0 2600 113646 31 0 300 2 5 11012 11013 10306 0 0 0 0 0 0 40 2 5599878 0 0 0 0 3 0 0 186 1 1
+31203008 2 0 混元伞幻象 240 0 19773 19773 5506 0 0 0 10000 24133 0 0 0 0 0 0 2517997 0 2600 134044 34 0 300 2 5 11014 11015 10307 0 0 0 0 0 0 40 2 9803299 0 0 0 0 3 0 0 186 1 1
+31203009 2 0 冥炎瓶幻象 260 0 27453 27453 6925 0 0 0 10000 33027 0 0 0 0 0 0 3711297 0 2600 150400 36 0 300 2 5 11016 11017 10308 0 0 0 0 0 0 40 2 17924769 0 0 0 0 3 0 0 186 1 1
+31203010 2 0 九黎神火扇幻象 280 0 40164 40164 10528 0 0 0 10000 44604 0 0 0 0 0 0 5728670 0 2600 170046 39 0 300 2 5 11018 11019 10309 0 0 0 0 0 0 40 2 34372362 0 0 0 0 3 0 0 186 1 1
+31203011 2 0 白泽灯幻象 300 0 45840 45840 12386 0 0 0 10000 52903 0 0 0 0 0 0 7416876 0 2600 185556 41 0 300 2 5 11020 11021 10310 0 0 0 0 0 0 40 2 49727710 0 0 0 0 3 0 0 186 1 1
+31203012 2 0 磐龙袍幻象 320 0 56182 56182 14795 0 0 0 10000 69106 0 0 0 0 0 0 9518772 0 2600 201160 44 0 300 2 5 11022 11023 10311 0 0 0 0 0 0 40 2 70120514 0 0 0 0 3 0 0 186 1 1
+31203013 2 0 琉心笔幻象 340 0 73517 73517 19013 0 0 0 10000 86424 0 0 0 0 0 0 12540083 0 2600 209620 46 0 300 2 5 11024 11025 10312 0 0 0 0 0 0 40 2 5336186 1 0 0 0 3 0 0 186 1 1
+31203014 2 0 招魂幡幻象 360 0 97299 97299 22573 0 0 0 10000 106870 0 0 0 0 0 0 15364896 0 2600 212722 48 0 300 2 5 11026 11027 10313 0 0 0 0 0 0 40 2 30887620 1 0 0 0 3 0 0 186 1 1
+31203015 2 0 蛊凰盏幻象 380 0 111979 111979 24535 0 0 0 10000 111973 0 0 0 0 0 0 16951702 0 2600 214696 50 0 300 2 5 11006 11007 10314 0 0 0 0 0 0 40 2 48784856 1 0 0 0 3 0 0 186 1 1
31401001 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 0 0 0 0 0 1 0 0 1 1 1
31403001 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 0 0 0 0 0 1 0 0 198 1 1
31503001 2 0 蜘蛛女皇 190 0 3658 3658 0 5 0 0 10000 4822 0 1 0 0 0 0 0 3 3000 738321 25 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 1 7584154 0 100 0 0 5 0 0 186 1 1
--
Gitblit v1.8.0