From a82ab37c26a528d027531d9ebf2702329ad9be65 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期六, 24 十一月 2018 11:32:04 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/PySysDB/tagChinMap.txt | 8 ++++---- db/PyMongoDataServer/PySysDB/tagSuccess.txt | 2 +- db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 2 +- db/PyMongoDataServer/SysDB/tagChinMap.txt | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt index e4ff932..3eaf48b 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt @@ -18,8 +18,8 @@ 31030 BOSS之家二层 8 0 31031 BOSS之家三层 8 0 31040 日常副本 1 0 -31080 仙界秘境 2 1 -31110 渡劫 2 0 +31080 仙界秘境 1 1 +31110 渡劫 1 0 31130 符印塔 1 0 31140 冰晶矿脉 1 0 31150 古神禁地 8 0 @@ -29,9 +29,9 @@ 31230 仙盟宴会 3 0 31240 VIP Boss 1 0 31170 守卫人皇 3 0 -51010 娲皇遗迹 2 0 +51010 娲皇遗迹 1 0 41110 法宝副本 1 0 -60010 宗门试炼 2 0 +60010 宗门试炼 1 0 31180 混乱妖域 2 0 31160 上古战场 8 0 31250 守护副本 1 0 diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt index fd61b1c..f1768c6 100644 --- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt +++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt @@ -6,7 +6,7 @@ 31080 2 2 0 0 75|60|45|30|21 21 0 0 1 0 0 31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 180 31130 0 0 0 0 75|60|45|30|16 0 0 0 1 0 0 -31140 0 2 0 0 0 0 0 0 1 0 0 +31140 10 2 0 0 0 0 0 0 1 0 0 31150 1 2 0 0 0 0 19 0 1 180 0 31170 1 2 0 0 75|60|45|30|20 0 0 0 1 0 0 31180 1 2 0 0 100|90|80|70|60 0 0 0 1 0 120 diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt index b72fb88..0b37329 100644 --- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt +++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt @@ -311,7 +311,7 @@ 824 3 1 107020 0 0 0 0 0 825 3 1 108020 0 0 0 0 0 826 3 1 109020 0 0 0 0 0 -831 30 1 10|0 0 0 0 0 0 +831 30 1 10|1 0 0 0 0 0 832 30 1 11|3 0 0 0 0 0 833 30 1 12|5 0 0 0 0 0 834 30 1 13|7 0 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt index 4b77702..33acecd 100644 --- a/db/PyMongoDataServer/SysDB/tagChinMap.txt +++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt @@ -18,8 +18,8 @@ 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 +31080 仙界秘境 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 +31110 渡劫 1 0 220000 1 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 1 1 0 5 32 @@ -29,9 +29,9 @@ 31230 仙盟宴会 1 0 930000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 31240 VIP Boss 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 31170 守卫人皇 1 0 1800000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 -51010 娲皇遗迹 1 0 0 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 +51010 娲皇遗迹 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 41110 法宝副本 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1 -60010 宗门试炼 1 0 900000 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 +60010 宗门试炼 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 31180 混乱妖域 1 0 900000 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 31160 上古战场 1 0 1200000 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2 31250 守护副本 1 0 600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 -- Gitblit v1.8.0