From 0feffefa1062822b7a4b41cbb299a33b5e0a22d5 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 27 十一月 2018 21:05:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 18 +++++++++---------
db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt | 34 +++++++++++++++++-----------------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
index f96509c..1ef5067 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -1,18 +1,18 @@
DataMapID LineID FightPowerMin RobotFightPower RobotLV RobotBaseHurt RobotHPCoefficient RobotSkill
-51010 0 457100 457100 155 6589 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 1 869040 869040 180 13037 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 2 1997875 1997875 205 42482 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 3 3541349 3541349 235 115206 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 4 4697877 4697877 255 151930 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 5 7285497 7285497 275 268582 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-60010 0 349488 349488 105 4817 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-60010 1 1097812 1097812 165 18512 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-60010 2 1997875 1997875 200 42482 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 2 281011 281011 125 2807 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 5 1114154 1114154 180 11978 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 7 2520808 2520808 215 39881 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 9 4075186 4075186 240 85811 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:141}}
-31110 12 7881199 7881199 285 190245 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:142}}
-31110 15 17274907 17274907 320 441027 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:143}}
-31110 18 25874924 25874924 350 768829 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:144}}
-31110 21 34736689 34736689 380 1079908 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:145}}
+51010 0 457100 457100 155 17907 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 1 869040 869040 180 20158 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 2 1997875 1997875 205 71654 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 3 3541349 3541349 235 323861 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 4 4697877 4697877 255 427094 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 5 7285497 7285497 275 815419 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 0 349488 349488 105 7474 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 1 1097812 1097812 165 28719 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 2 1997875 1997875 200 65903 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 2 281011 281011 125 2964 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 5 1114154 1114154 180 16866 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 7 2520808 2520808 215 63173 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 9 4075186 4075186 240 135926 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:141}}
+31110 12 7881199 7881199 285 301350 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:142}}
+31110 15 17274907 17274907 320 698589 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:143}}
+31110 18 25874924 25874924 350 1217825 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:144}}
+31110 21 34736689 34736689 380 1710575 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:145}}
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 2563070..5873ddf 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -554,7 +554,7 @@
31001004 2 0 遗迹炎兽 180 0 1753 1753 0 0 0 0 0 537 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 172107 0 0 0 0 1 0 0 180 1 1
31001005 2 0 遗迹巨鳄 180 0 1753 1753 0 0 0 0 0 537 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 229476 0 0 0 0 1 0 0 180 1 1
31001006 2 0 遗迹剑魔 180 0 1753 1753 0 0 0 0 0 537 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 344216 0 0 0 0 1 0 0 180 1 1
-31001007 2 0 遗迹炎龙 180 0 1753 1753 0 0 0 0 0 537 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 573692 0 0 0 0 1 0 0 180 1 1
+31001007 2 0 遗迹炎龙 180 0 1753 1753 0 0 0 0 0 537 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 1147387 0 0 0 0 1 0 0 180 1 1
31001008 2 0 遗迹树妖 235 0 2987 2987 0 0 0 0 0 418 0 0 0 0 0 0 0 0 2500 85179 55 0 0 2 6 23024 0 0 0 0 0 0 0 0 100 2 2534567 0 0 0 0 1 0 0 180 1 1
31001009 2 0 潮汐巨兽 280 0 10515 10515 0 0 0 0 0 622 0 0 0 0 0 0 0 0 2500 122425 93 0 300 2 6 23030 0 0 0 0 0 0 0 1 100 2 47395376 0 0 0 0 1 0 0 186 1 1
31001010 2 0 潮汐巨兽 280 0 10515 10515 0 0 0 0 0 622 0 0 0 0 0 0 0 0 2500 122425 93 0 300 2 6 0 0 0 0 0 0 0 0 0 100 1 23697687 0 0 0 0 1 0 0 186 1 1
@@ -1085,16 +1085,16 @@
61203007 2 0 境界·组队 350 2 66046 66046 9241 19 0 0 10000 20279 0 0 0 0 0 0 25874924 0 2500 1554082 118 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 8912744 6 0 0 0 3 0 34 186 1 1
61203008 2 0 境界·组队 380 2 94746 94746 11694 22 0 0 10000 30639 0 0 0 0 0 0 34736689 0 2500 1729002 132 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 55287918 8 0 0 0 3 0 35 186 1 1
61303001 14 0 仙盟采集桌 1 0 1 1 1 13 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 15 2 3000 0 0 0 0 0 0 0 214 0 1
-30601001 2 0 暗影剑士 105 0 875 875 0 0 0 0 0 159 0 0 0 0 0 0 0 0 2500 37788 19 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 127196 0 0 0 0 1 0 0 1 1 1
-30601002 2 0 剑魂 105 0 840 840 0 0 0 0 0 127 0 0 0 0 0 0 0 0 2500 37788 19 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 137797 0 0 0 0 1 0 0 1 1 1
+30601001 2 0 暗影剑士 105 0 875 875 0 0 0 0 0 159 0 0 0 0 0 0 0 0 2500 37788 19 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 105997 0 0 0 0 1 0 0 1 1 1
+30601002 2 0 剑魂 105 0 840 840 0 0 0 0 0 127 0 0 0 0 0 0 0 0 2500 37788 19 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 116597 0 0 0 0 1 0 0 1 1 1
30603001 2 0 御剑尊者 105 0 2296 2296 0 0 0 0 0 1465 0 0 0 0 0 0 0 0 2500 37788 19 0 300 2 6 10041 23030 10042 0 0 0 0 0 0 15 2 1165982 0 0 0 0 5 0 0 186 1 1
-30601003 2 0 魔化哨兵 165 0 2315 2315 0 0 0 0 0 896 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 488754 0 0 0 0 1 0 0 1 1 1
-30601004 2 0 狂暴妖兵 165 0 2107 2107 0 0 0 0 0 717 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 529483 0 0 0 0 1 0 0 1 1 1
-30601005 2 0 魔界冥魂 165 0 5551 5551 0 0 0 0 0 3682 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 2443776 0 0 0 0 1 0 0 1 1 1
+30601003 2 0 魔化哨兵 165 0 2315 2315 0 0 0 0 0 896 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 407294 0 0 0 0 1 0 0 1 1 1
+30601004 2 0 狂暴妖兵 165 0 2107 2107 0 0 0 0 0 717 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 448024 0 0 0 0 1 0 0 1 1 1
+30601005 2 0 魔界冥魂 165 0 5551 5551 0 0 0 0 0 3682 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 1629183 0 0 0 0 1 0 0 1 1 1
30603002 2 0 逍遥城主 165 0 10644 10644 0 0 0 0 0 8067 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 6 10043 23030 10044 0 0 0 0 0 0 15 2 4480257 0 0 0 0 5 0 0 186 1 1
-30601006 2 0 冰霜巨蝎 200 0 3280 3280 0 0 0 0 0 1227 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 1121554 0 0 0 0 1 0 0 1 1 1
-30601007 2 0 冰川蛮兽 200 0 3115 3115 0 0 0 0 0 1089 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 1215016 0 0 0 0 1 0 0 1 1 1
-30601008 2 0 雪山巨猿 200 0 9634 9634 0 0 0 0 0 6526 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 5607772 0 0 0 0 1 0 0 1 1 1
+30601006 2 0 冰霜巨蝎 200 0 3280 3280 0 0 0 0 0 1227 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 934628 0 0 0 0 1 0 0 1 1 1
+30601007 2 0 冰川蛮兽 200 0 3115 3115 0 0 0 0 0 1089 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 1028090 0 0 0 0 1 0 0 1 1 1
+30601008 2 0 雪山巨猿 200 0 9634 9634 0 0 0 0 0 6526 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 3738513 0 0 0 0 1 0 0 1 1 1
30603003 2 0 极寒冰心 200 0 17460 17460 0 0 0 0 0 13053 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 6 10045 23030 10046 0 0 0 0 0 0 15 2 10280916 0 0 0 0 5 0 0 186 1 1
30601009 2 0 海岛巨蟹 250 0 6670 6670 0 0 0 0 0 2084 0 0 0 0 0 0 0 0 2500 97399 67 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 2343352 0 0 0 0 1 0 0 1 1 1
30601010 2 0 海妖 250 0 7093 7093 0 0 0 0 0 2363 0 0 0 0 0 0 0 0 2500 97399 67 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 3905588 0 0 0 0 1 0 0 1 1 1
--
Gitblit v1.8.0