From 8412f1fe0a51f743dbfb59b54890574b30e78abb Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 14 九月 2018 14:32:03 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15
---
db/PyMongoDataServer/SysDB/tagChinItem.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 40 ++++++++++++++++++++--------------------
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt
index 8bd267d..f7d1aab 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt
@@ -64,7 +64,7 @@
# key支持两个格式：1-直接配，2-范围用小括号（min，max）
{
# 娲皇遗迹
- 51010:{"MaxHP":{1:1, 2:1.8, 3:2.46, 4:3}, "Def":{4:1, 3:1, 2:1, 1:1}},
+ 51010:{"MaxHP":{1:1, 2:1.4, 3:1.8, 4:2}, "Def":{4:1, 3:1, 2:1, 1:1}},
# 混乱妖域
31180:{"MaxHP":{1:1, 2:1.3, 3:1.5, 4:1.6}, "Def":{4:1, 3:1, 2:1, 1:1}},
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index c1591de..1b588e1 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -110,7 +110,7 @@
257 1 0 坐骑：百鸟之主 41 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 8888 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
258 1 0 坐骑：八宝葫芦 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
260 1 0 坐骑：地狱冥虎 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
-261 1 0 坐骑：小黄鸭 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 348 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
+261 1 0 坐骑：小黄鸭 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
289 1 0 追风 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 288 0 5 0 1 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
280 1 0 觉灵鹿 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 5 0 1 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
281 1 0 皓月狼 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 588 0 5 0 1 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -565,7 +565,7 @@
4216 1 0 灵宠：灵鲛刺客 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 100 0 1 0 0 77 27200 0 0 78 27200 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
4217 1 0 灵宠：荒古巨兽 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 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
4218 1 0 灵宠：熊猫斗士 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 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
-4219 1 0 灵宠：海牛侍卫 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 348 0 100 0 1 0 0 77 27200 0 0 78 27200 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
+4219 1 0 灵宠：海牛侍卫 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 100 0 1 0 0 77 27200 0 0 78 27200 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
4250 1 0 冰火冥魂碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 200 0 100 0 0 0 0 0 4209 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4251 1 0 九黎妖虎碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 200 0 100 0 0 0 0 0 4210 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4252 1 0 球球碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 200 0 100 0 0 0 0 0 4213 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
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 77f301a..9a43cef 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -520,26 +520,26 @@
30909017 9 0 水晶 1 0 1 1 1 0 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 10 2 1000 0 0 0 0 0 0 0 214 0 1
30909018 9 0 水晶 1 0 1 1 1 0 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 10 2 1000 0 0 0 0 0 0 0 214 0 1
30909019 9 0 敌方水晶无主化 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 22213 0 0 0 0 0 0 0 0 10 2 1000 0 0 0 0 0 0 0 214 0 1
-31003001 2 0 阵殿古猿 160 0 7026 7026 0 0 0 0 0 5895 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 23010 23012 23030 0 0 0 0 0 0 100 2 840145 0 0 0 0 5 0 0 186 1 1
-31003002 2 0 遗迹残魂 210 0 6268 6268 0 0 0 0 0 3904 0 0 0 0 0 0 0 0 2500 92871 28 0 300 2 6 23014 23030 23015 23010 0 0 0 0 0 100 2 9496347 0 0 0 0 5 0 0 186 1 1
-31003003 2 0 遗迹残魂 210 0 6268 6268 0 0 0 0 0 3904 0 0 0 0 0 0 0 0 2500 92871 28 0 300 2 6 23016 23030 23015 23010 0 0 0 0 0 100 2 9496347 0 0 0 0 5 0 0 186 1 1
-31003004 2 0 遗迹古妖 235 0 17520 17520 0 0 0 0 0 11737 0 0 0 0 0 0 0 0 2500 109510 31 0 300 2 6 23010 23017 23030 0 0 0 0 0 0 100 2 25933382 0 0 0 0 5 0 0 186 1 1
-31003005 2 0 遗迹天将 250 0 22863 22863 5783 0 0 0 0 14194 0 0 0 0 0 0 0 0 2500 125866 33 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 32175092 0 0 0 0 5 0 0 186 1 1
-31003006 2 0 遗迹天将 250 0 22863 22863 0 0 0 0 0 14194 0 0 0 0 0 0 0 0 2500 125866 33 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 28946458 0 0 0 0 5 0 0 186 1 1
-31003007 2 0 极冰守卫 265 0 35615 35615 7059 0 0 0 0 21938 0 0 0 0 0 0 0 0 2500 142222 35 0 300 2 6 23010 23021 23030 0 0 0 0 0 0 100 2 57127167 0 0 0 0 5 0 0 186 1 1
-31003008 2 0 执印龙王 300 0 49763 49763 0 0 0 0 0 26158 0 0 0 0 0 0 0 0 2500 166756 39 0 300 2 6 10016 23025 23022 23030 0 0 0 0 0 100 2 56279846 2 0 0 0 5 0 0 186 1 1
-31001001 2 0 镇守妖兵 160 0 1154 1154 0 0 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 48007 0 0 0 0 1 0 0 180 1 1
-31001002 2 0 阵守蛮兽 160 0 1154 1154 0 0 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 84013 0 0 0 0 1 0 0 180 1 1
-31001003 2 0 雪山巨猿 160 0 1154 1154 0 0 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 108017 0 0 0 0 1 0 0 180 1 1
-31001004 2 0 遗迹炎兽 180 0 1699 1699 0 0 0 0 0 477 0 0 0 0 0 0 0 0 2500 78771 26 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 116519 0 0 0 0 1 0 0 180 1 1
-31001005 2 0 遗迹巨鳄 180 0 1699 1699 0 0 0 0 0 477 0 0 0 0 0 0 0 0 2500 78771 26 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 203910 0 0 0 0 1 0 0 180 1 1
-31001006 2 0 遗迹剑魔 180 0 1699 1699 0 0 0 0 0 477 0 0 0 0 0 0 0 0 2500 78771 26 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 262169 0 0 0 0 1 0 0 180 1 1
-31001007 2 0 遗迹炎龙 180 0 1699 1699 0 0 0 0 0 477 0 0 0 0 0 0 0 0 2500 78771 26 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 436951 0 0 0 0 1 0 0 180 1 1
-31001008 2 0 遗迹树妖 235 0 2307 2307 0 0 0 0 0 436 0 0 0 0 0 0 0 0 2500 109510 31 0 0 2 6 23024 0 0 0 0 0 0 0 0 100 2 1728891 0 0 0 0 1 0 0 180 1 1
-31001009 2 0 潮汐巨兽 280 0 6228 6228 0 0 0 0 0 1295 0 0 0 0 0 0 0 0 2500 154536 37 0 300 2 6 23030 0 0 0 0 0 0 0 1 100 2 35713762 0 0 0 0 1 0 0 186 1 1
-31001010 2 0 潮汐巨兽 280 0 6228 6228 0 0 0 0 0 1295 0 0 0 0 0 0 0 0 2500 154536 37 0 300 2 6 0 0 0 0 0 0 0 0 0 100 1 17856881 0 0 0 0 1 0 0 186 1 1
-31001011 2 0 毁灭石像 265 0 10048 10048 0 0 0 0 0 5305 0 0 0 0 0 0 0 0 2500 142222 35 0 0 2 6 23020 0 0 0 0 0 0 0 0 100 0 4447786 0 0 0 0 1 0 0 180 1 1
-31001012 2 0 卫戍石像 265 0 10048 10048 0 0 0 0 0 5305 0 0 0 0 0 0 0 0 2500 142222 35 0 0 2 6 23019 0 0 0 0 0 0 0 0 100 0 4447786 0 0 0 0 1 0 0 180 1 1
+31003001 2 0 阵殿古猿 160 0 7252 7252 0 0 0 0 0 6047 0 0 0 0 0 0 0 0 2500 65329 23 0 300 2 6 23010 23012 23030 0 0 0 0 0 0 100 2 991156 0 0 0 0 5 0 0 186 1 1
+31003002 2 0 遗迹残魂 210 0 6574 6574 0 0 0 0 0 4038 0 0 0 0 0 0 0 0 2500 96443 29 0 300 2 6 23014 23030 23015 23010 0 0 0 0 0 100 2 11166627 0 0 0 0 5 0 0 186 1 1
+31003003 2 0 遗迹残魂 210 0 6574 6574 0 0 0 0 0 4038 0 0 0 0 0 0 0 0 2500 96443 29 0 300 2 6 23016 23030 23015 23010 0 0 0 0 0 100 2 11166627 0 0 0 0 5 0 0 186 1 1
+31003004 2 0 遗迹古妖 235 0 18285 18285 0 0 0 0 0 12004 0 0 0 0 0 0 0 0 2500 113646 31 0 300 2 6 23010 23017 23030 0 0 0 0 0 0 100 2 29208445 0 0 0 0 5 0 0 186 1 1
+31003005 2 0 遗迹天将 250 0 26640 26640 6062 0 0 0 0 16549 0 0 0 0 0 0 0 0 2500 130002 34 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 37372725 0 0 0 0 5 0 0 186 1 1
+31003006 2 0 遗迹天将 250 0 26640 26640 0 0 0 0 0 16549 0 0 0 0 0 0 0 0 2500 130002 34 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 33545559 0 0 0 0 5 0 0 186 1 1
+31003007 2 0 极冰守卫 265 0 38159 38159 7466 0 0 0 0 23350 0 0 0 0 0 0 0 0 2500 146358 36 0 300 2 6 23010 23021 23030 0 0 0 0 0 0 100 2 66946338 0 0 0 0 5 0 0 186 1 1
+31003008 2 0 执印龙王 300 0 56479 56479 0 0 0 0 0 29782 0 0 0 0 0 0 0 0 2500 174934 40 0 300 2 6 10016 23025 23022 23030 0 0 0 0 0 100 2 27842217 3 0 0 0 5 0 0 186 1 1
+31001001 2 0 镇守妖兵 160 0 1202 1202 0 0 0 0 0 394 0 0 0 0 0 0 0 0 2500 65329 23 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 56636 0 0 0 0 1 0 0 180 1 1
+31001002 2 0 阵守蛮兽 160 0 1202 1202 0 0 0 0 0 394 0 0 0 0 0 0 0 0 2500 65329 23 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 99114 0 0 0 0 1 0 0 180 1 1
+31001003 2 0 雪山巨猿 160 0 1202 1202 0 0 0 0 0 394 0 0 0 0 0 0 0 0 2500 65329 23 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 127434 0 0 0 0 1 0 0 180 1 1
+31001004 2 0 遗迹炎兽 180 0 1803 1803 0 0 0 0 0 502 0 0 0 0 0 0 0 0 2500 82343 26 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 132818 0 0 0 0 1 0 0 180 1 1
+31001005 2 0 遗迹巨鳄 180 0 1803 1803 0 0 0 0 0 502 0 0 0 0 0 0 0 0 2500 82343 26 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 232432 0 0 0 0 1 0 0 180 1 1
+31001006 2 0 遗迹剑魔 180 0 1803 1803 0 0 0 0 0 502 0 0 0 0 0 0 0 0 2500 82343 26 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 298840 0 0 0 0 1 0 0 180 1 1
+31001007 2 0 遗迹炎龙 180 0 1803 1803 0 0 0 0 0 502 0 0 0 0 0 0 0 0 2500 82343 26 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 498069 0 0 0 0 1 0 0 180 1 1
+31001008 2 0 遗迹树妖 235 0 2406 2406 0 0 0 0 0 438 0 0 0 0 0 0 0 0 2500 113646 31 0 0 2 6 23024 0 0 0 0 0 0 0 0 100 2 1947228 0 0 0 0 1 0 0 180 1 1
+31001009 2 0 潮汐巨兽 280 0 6604 6604 0 0 0 0 0 1343 0 0 0 0 0 0 0 0 2500 158578 38 0 300 2 6 23030 0 0 0 0 0 0 0 1 100 2 38348739 0 0 0 0 1 0 0 186 1 1
+31001010 2 0 潮汐巨兽 280 0 6604 6604 0 0 0 0 0 1343 0 0 0 0 0 0 0 0 2500 158578 38 0 300 2 6 0 0 0 0 0 0 0 0 0 100 1 19174369 0 0 0 0 1 0 0 186 1 1
+31001011 2 0 毁灭石像 265 0 10300 10300 0 0 0 0 0 5341 0 0 0 0 0 0 0 0 2500 146358 36 0 0 2 6 23020 0 0 0 0 0 0 0 0 100 0 5157570 0 0 0 0 1 0 0 180 1 1
+31001012 2 0 卫戍石像 265 0 10300 10300 0 0 0 0 0 5341 0 0 0 0 0 0 0 0 2500 146358 36 0 0 2 6 23019 0 0 0 0 0 0 0 0 100 0 5157570 0 0 0 0 1 0 0 180 1 1
30902001 2 0 皓月战神幻象 10 0 22 22 0 0 0 0 10000 26 0 0 0 0 0 0 0 0 2000 845 0 0 200 2 4 10012 10013 10009 0 0 0 0 0 0 80 2 2737 0 0 0 0 5 0 0 186 1 1
31103001 2 0 暗裔暴君幻象 20 0 29 29 0 0 0 0 10000 43 0 0 0 0 0 0 0 0 2600 2021 2 0 300 2 5 10059 10060 10061 10201 0 0 0 0 0 40 2 6012 0 0 0 0 3 0 0 186 1 1
31103002 2 0 龙血武姬幻象 35 0 64 64 0 0 0 0 10000 77 0 0 0 0 0 0 0 0 2600 4512 5 0 300 2 5 10050 10051 10052 10202 0 0 0 0 0 40 2 16119 0 0 0 0 3 0 0 186 1 1
--
Gitblit v1.8.0