From 8c2c55f7444a91db4b4b5da57af67df1638c578e Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期一, 26 十一月 2018 17:00:18 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc | 0 db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 2 +- db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1 + CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1 + 4 files changed, 3 insertions(+), 1 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt index 3379e48..48f5113 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt @@ -100,3 +100,4 @@ 148 205 0 0 149 280 0 0 150 75 0 0 +151 105 0 0 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc index bc7170d..9142736 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt index 30b30b5..685488e 100644 --- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt +++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt @@ -20,7 +20,7 @@ 19 1 11 80 1 15 0 21 1 13 80 1 10 0 22 1 14 0 1 20 0 -23 1 15 151 1 0 0 +23 1 15 151 1 10 10 24 1 16 23 1 20 40 25 2 31240 22 1 30 0 26 2 31150 92 1 30 0 diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt index c8ad544..a474a27 100644 --- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt +++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt @@ -100,3 +100,4 @@ 148 205 0 0 0 0 149 280 0 0 0 0 150 75 0 0 0 0 +151 105 0 0 0 0 -- Gitblit v1.8.0