From 96c0f854e7000c9a45e82fb3d2b69e9a8845ee33 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期一, 27 八月 2018 20:06:35 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 6 ++++++ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 6 ++++++ ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt | 8 ++++---- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index d1282eb..49514bb 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -808,6 +808,12 @@ 30601014 魂灵 260 30601015 魔剑 265 30603006 玄界冰魔 320 +50103001 魔坛巨熊 20 +50103002 魔坛巨猿 40 +50103003 魔坛牙刃 70 +50103004 魔坛左翼 85 +50103005 魔坛右翼 85 +50103006 魔坛龙王 110 50104001 乾坤熊猫 100 50104002 暗裔暴君 100 50104003 龙血武姬 100 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt index 6e82ed7..fbf7c49 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt @@ -1,7 +1,7 @@ -Map001_Sjz 10010 神诀宗 10010 0 0 0 10 1 -Map002_Yg 10020 影谷 10020 0 0 0 10 1 -Map003_Yjsz 10030 御剑山庄 10030 0 0 0 10 1 -Map004_Xyc 10040 逍遥城 10040 0 0 0 20 1 +Map001_Sjz 10010 神诀宗 10010 0 0 0 11 1 +Map002_Yg 10020 影谷 10020 0 0 0 11 1 +Map003_Yjsz 10030 御剑山庄 10030 0 0 0 11 1 +Map004_Xyc 10040 逍遥城 10040 0 0 0 21 1 Map005_Bfhl 10050 冰封回廊 10050 0 0 0 5 1 Map006_Mld 10060 秘灵岛 10060 0 0 0 5 1 Map007_Jyzk 10070 极炎之窟 10070 0 0 0 5 1 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index e6ce425..9eed070 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/GameLogic_QueenRelics.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc index a950334..a58cc8e 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 2721ee6..141d2e0 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -808,6 +808,12 @@ 30601014 2 0 魂灵 260 0 4811 4811 0 9 0 0 0 1400 0 0 0 0 0 0 0 0 2000 370110 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8032498 0 0 0 0 1 0 0 1 1 1 30601015 2 0 魔剑 265 0 4970 4970 0 9 0 0 0 1400 0 0 0 0 0 0 0 0 2000 376753 35 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8607219 0 0 0 0 1 0 0 1 1 1 30603006 2 0 玄界冰魔 320 0 10459 10459 7847 9 0 0 10000 3290 0 0 0 0 0 0 0 0 2000 455520 41 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 90414255 1 0 0 0 5 0 0 186 1 1 +50103001 18 0 魔坛巨熊 20 2 54 54 0 0 0 0 10000 63 0 7 0 0 0 0 0 0 2500 87307 3 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 31000000 41 0 0 0 5 0 0 186 1 1 +50103002 18 0 魔坛巨猿 40 2 200 200 0 0 0 0 10000 67 0 7 0 0 0 0 0 0 2500 147095 6 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 68850000 82 0 0 0 5 0 0 186 1 1 +50103003 18 0 魔坛牙刃 70 2 330 330 0 0 0 0 10000 130 0 7 0 0 0 0 0 0 2500 209729 9 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 7892980 234 0 0 0 5 0 0 186 1 1 +50103004 18 0 魔坛左翼 85 2 489 489 0 1 0 0 10000 143 0 7 0 0 0 0 0 0 2500 279006 12 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 47626349 517 0 0 0 5 0 0 186 1 1 +50103005 18 0 魔坛右翼 85 2 565 565 0 1 0 0 10000 208 0 7 0 0 0 0 0 0 2500 353028 14 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 21584929 672 0 0 0 5 0 0 186 1 1 +50103006 18 0 魔坛龙王 110 2 1400 1400 0 2 0 0 10000 242 0 7 0 0 0 0 0 0 2500 453622 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 63565856 1025 0 0 0 5 0 0 186 1 1 50104001 0 1 乾坤熊猫 100 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 50104002 0 1 暗裔暴君 100 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 50104003 0 1 龙血武姬 100 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 -- Gitblit v1.8.0