From bdce20937c0ed6fa505c5d6acdaf97b75c6c5a94 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期六, 24 十一月 2018 10:07:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinMap.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc | 0
db/PyMongoDataServer/SysDB/tagChinMap.txt | 4 ++--
6 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
index d6df32a..e4ff932 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
@@ -16,6 +16,7 @@
31010 仙魔之争 1 0
31020 BOSS之家一层 8 0
31030 BOSS之家二层 8 0
+31031 BOSS之家三层 8 0
31040 日常副本 1 0
31080 仙界秘境 2 1
31110 渡劫 2 0
@@ -36,4 +37,3 @@
31250 守护副本 1 0
52010 封魔坛 8 0
52020 封魔坛 1 0
-31031 BOSS之家三层 8 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
index ea8be3a..758afdb 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index faa45db..7453de8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
index 2792443..e2e76a9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c36d2a2..aa41abc 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -316,3 +316,4 @@
HelpBattleCall 5 3 2 10 5
HelpBattleRefresh 5 5 5
HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]}
+HelpBattleRobot 50105026
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 251a553..4b77702 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -16,12 +16,13 @@
31010 仙魔之争 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
31020 BOSS之家一层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 5 35
31030 BOSS之家二层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 5 35
+31031 BOSS之家三层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 5 35
31040 日常副本 1 0 360000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31080 仙界秘境 1 0 900000 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31110 渡劫 1 0 220000 2 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1
31130 符印塔 1 0 0 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1
31140 冰晶矿脉 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
-31150 古神禁地 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 5 32
+31150 古神禁地 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 1 1 0 5 32
31190 麒麟之府 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 35
31210 仙盟BOSS 1 0 3600000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31220 仙盟联赛 1 0 3600000 4 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 5 32
@@ -36,4 +37,3 @@
31250 守护副本 1 0 600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
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
-31031 BOSS之家三层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 5 35
--
Gitblit v1.8.0