From 0dc2d7b8a8e6f4af5a2061dc9c79e1a2c7059643 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 18 十二月 2018 15:16:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map134_Yams.col | 0
CoreServerGroup/GameServer/PySysDB/tagChinMap.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagFBLine.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 5 +++++
db/PyMongoDataServer/SysDB/tagBornRefresh.txt | 1 +
db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 1 +
db/PyMongoDataServer/SysDB/tagChinMap.txt | 1 +
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 1 +
db/PyMongoDataServer/SysDB/tagNPCRefresh.txt | 17 +++++++++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt | 1 +
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 5 +++++
CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt | 1 +
13 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
index 7f52f32..8b75119 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
@@ -38,3 +38,4 @@
52010 封魔坛 8 0
52020 封魔坛 1 0
32010 跨服竞技场 3 0
+31340 幽暗迷森 1 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 2be79f3..b279839 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -767,6 +767,11 @@
32502001 笼子 100
32503001 强盗首领 32
32504001 幼龙 100
+33409001 普通守卫1 41
+33409002 普通守卫2 41
+33409003 建造点 1
+33402001 小怪 1
+33403001 BOSS 1
60103001 妖兵 30
60103002 机关幻兽 40
60103003 符塔狂豹 50
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
index c6a11d8..eb95480 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
@@ -21,3 +21,4 @@
31250 0
52010 0
31010 0
+31340 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
index c09cb00..19568eb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
@@ -94,3 +94,4 @@
31110 0 31110
31110 1 31110
31210 0 31210
+31340 0 31340
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map134_Yams.col b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map134_Yams.col
new file mode 100644
index 0000000..e43e6ac
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map134_Yams.col
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
index 083f212..846df57 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
@@ -36,3 +36,4 @@
Map301_Fmt 52020 封魔坛 52020 0 0 0 100 1
Map122_Xmls 31220 仙盟联赛 31220 0 0 0 30 1
Map010_Mzgc 10100 魔之古城 10100 0 0 0 10 1
+Map134_Yams 31340 幽暗迷森 31340 0 0 0 10 1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
index 1512ed2..45b6021 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
@@ -37,4 +37,5 @@
Map130_Kzly_21110 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map011_Hgdg_10110 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map010_Mzgc_10100 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
+Map134_Yams_31340 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map133_Bzjsc_31031 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
\ No newline at end of file
diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index 6220120..6bfcabf 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -21,3 +21,4 @@
31250 0 0 0 0 0 0 0 0 0 0 0 0 0
52010 5 2 0 0 0 25 0 0 1 180 0 0 0
31010 3 2 0 0 0 0 0 0 0 180 0 0 0
+31340 2 2 0 0 0 0 0 0 1 180 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 460cdf2..2a4edc4 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -94,3 +94,4 @@
31110 0 31110 80 500 0 0 0 0 0 0 0 [19,13,3] [3, 180, 10, [210, 180, 150, 120], [51,13]] 101
31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [3, 180, 10, [360, 245, 185, 125], [51,13]] 102
31210 0 31210 0 500 0 0 0 0 0 0 0 [12,6,3] [10, 3600, 60, [1800, 900, 600, 300]] [101,30903001]
+31340 0 31340 300 0 0 0 0 0 0 0 0 [23,29,3] [1800,10,33409003,16,102,5000,{33409001:8,33409002:8},33403001,40,101,5,10] [[33401001,33401001,33401001],[33401001,33401001,33401001],[33401001,33401001,33401001,33401001]]
diff --git a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
index 8f7ceb8..82ced1f 100644
--- a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
@@ -34,3 +34,4 @@
100988 31030 55 14 2 0
105295 10100 60 18 1 0
108493 31031 97 42 1 0
+108588 31340 23 29 1 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 0360f30..f2f1770 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -38,3 +38,4 @@
52010 封魔坛 1 0 900000 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
52020 封魔坛 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
32010 跨服竞技场 1 0 3600000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
+31340 幽暗迷森 1 0 3600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index a10001b..c88d3bf 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -767,6 +767,11 @@
32502001 2 0 笼子 100 0 1 1 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 2000 939508 0 0 300 2 6 0 0 0 0 0 0 0 0 1 10 2 3000 0 0 0 0 1 0 0 201 1 1
32503001 2 0 强盗首领 32 0 131 131 0 0 0 0 10000 55 0 0 0 0 0 0 0 0 2000 1033458 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 9517 0 0 0 0 3 0 0 1 1 1
32504001 0 0 幼龙 100 0 119707 2542 59281 0 0 0 10000 39555 0 0 0 0 0 0 0 0 2000 1136803 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 10 0 0 0 0 0 0 0 200 1 1
+33409001 2 0 普通守卫1 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 49 1 1
+33409002 2 0 普通守卫2 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 49 1 1
+33409003 9 0 建造点 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 3 0 0 0 0 0 0 214 0 1
+33402001 2 0 小怪 1 2 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 4 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 0 1 0 0 197 1 1
+33403001 2 0 BOSS 1 2 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 4 23010 0 0 0 0 0 0 0 0 10 2 3 3 0 0 0 1 0 0 197 1 1
60103001 2 0 妖兵 30 0 71 71 0 0 0 0 0 48 0 0 0 0 0 0 19888 101 800 19888 8 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 10640 0 0 0 0 3 0 0 180 1 1
60103002 2 0 机关幻兽 40 0 89 89 0 0 0 0 0 52 0 0 0 0 0 0 20112 101 800 20112 10 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 13300 0 0 0 0 3 0 0 180 1 1
60103003 2 0 符塔狂豹 50 0 103 103 0 0 0 0 0 83 0 0 0 0 0 0 22454 101 800 22454 11 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 14069 0 0 0 0 3 0 0 180 1 1
diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
index 90683a4..bace131 100644
--- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
@@ -695,8 +695,18 @@
68425 0 60010 0 [243,95,6,15] 1 1 0 0 0 0 1 5 5 0 129
68426 0 60010 0 [239,129,1,15] 1 1 0 0 0 0 1 5 5 0 130
108569 0 31140 0 [16,15,1,20] 1 1 0 0 0 0 1 5 5 0 102
+108576 0 31340 0 [27,38,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108577 0 31340 0 [33,32,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108578 0 31340 0 [12,25,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108579 0 31340 0 [19,25,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108580 0 31340 0 [27,25,0,15] 1 1 0 0 0 0 1 5 5 0 102
80253 10901004 10090 0 [74,92,0,15] 1 1 0 3000 0 0 1 5 5 0 0
+108581 0 31340 0 [33,25,0,15] 1 1 0 0 0 0 1 5 5 0 102
18735 10702001 10070 0 [56,183,1,15] 1 1 0 2500 0 0 1 5 5 0 0
+108582 0 31340 0 [19,19,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108583 0 31340 0 [27,19,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108584 0 31340 0 [39,25,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108585 0 31340 0 [39,32,0,15] 1 1 0 0 0 0 1 5 5 0 102
27800 10601004 10060 0 [11,99,1,15] 1 1 0 2500 0 0 1 5 5 0 0
18905 10701004 10070 0 [61,110,1,15] 1 1 0 2500 0 0 1 5 5 0 0
18907 10701005 10070 0 [108,148,1,15] 1 1 0 2500 0 0 1 5 5 0 0
@@ -1219,6 +1229,11 @@
92492 0 21110 0 [100,18,0,9] 1 1 0 0 0 0 1 5 5 0 124
92493 0 21110 0 [112,21,0,9] 1 1 0 0 0 0 1 5 5 0 125
105497 11001005 10100 0 [56,138,1,15] 1 1 0 2500 0 0 1 5 5 0 0
+108570 0 31340 0 [5,29,0,15] 1 1 0 0 0 0 1 5 5 0 101
+108571 0 31340 0 [12,32,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108573 0 31340 0 [19,32,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108574 0 31340 0 [19,38,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108575 0 31340 0 [27,32,0,15] 1 1 0 0 0 0 1 5 5 0 102
76135 10201001 10020 0 [198,39,1,10] 1 1 0 1800 0 0 1 5 5 0 0
76137 10201004 10020 0 [160,113,1,15] 1 1 0 1800 0 0 1 5 5 0 0
13304 10501003 10050 0 [14,48,1,16] 1 1 0 2500 0 0 1 5 5 0 0
@@ -1426,6 +1441,8 @@
13346 10502001 10050 0 [107,71,1,16] 1 1 0 2500 0 0 1 5 5 0 0
13348 10501004 10050 0 [40,85,1,12] 1 1 0 2500 0 0 1 5 5 0 0
13350 10501003 10050 0 [22,49,1,12] 1 1 0 2500 0 0 1 5 5 0 0
+108586 0 31340 0 [19,13,0,15] 1 1 0 0 0 0 1 5 5 0 102
+108587 0 31340 0 [27,13,0,15] 1 1 0 0 0 0 1 5 5 0 102
90040 11104012 10110 0 [31,9,0,15] 1 1 0 0 0 0 1 5 5 0 0
34561 10801002 10080 0 [114,105,1,15] 1 1 0 2500 0 0 1 5 5 0 0
34562 10801002 10080 0 [116,106,1,15] 1 1 0 2500 0 0 1 5 5 0 0
--
Gitblit v1.8.0