From 5ea3f569c90e2cd488c50334ede0c1ebadad149c Mon Sep 17 00:00:00 2001 From: cehua_TRX <526616766@qq.com> Date: 星期二, 25 九月 2018 17:35:53 +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 db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt | 14 +++++++------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 14 +++++++------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt index dd7f967..ac7f7db 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt @@ -20,13 +20,13 @@ 20203005 21100 5400 [1,500] 40 5 2016 100 世界BOSS 20203006 21100 6000 [1,500] 40 5 2017 100 世界BOSS 20203007 21100 6600 [1,500] 40 5 2018 100 世界BOSS -20303001 21110 3000 [1,500] 40 5 2012 100 世界BOSS -20303002 21110 3600 [1,500] 40 5 2013 100 世界BOSS -20303003 21110 4200 [1,500] 40 5 2014 100 世界BOSS -20303004 21110 4800 [1,500] 40 5 2015 100 世界BOSS -20303005 21110 5400 [1,500] 40 5 2016 100 世界BOSS -20303006 21110 6000 [1,500] 40 5 2017 100 世界BOSS -20303007 21110 6600 [1,500] 40 5 2018 100 世界BOSS +20303001 21110 3000 [1,500] 40 5 2039 100 世界BOSS +20303002 21110 3600 [1,500] 40 5 2040 100 世界BOSS +20303003 21110 4200 [1,500] 40 5 2041 100 世界BOSS +20303004 21110 4800 [1,500] 40 5 2042 100 世界BOSS +20303005 21110 5400 [1,500] 40 5 2043 100 世界BOSS +20303006 21110 6000 [1,500] 40 5 2044 100 世界BOSS +20303007 21110 6600 [1,500] 40 5 2045 100 世界BOSS 30303001 31020 900 [1,500] 40 5 2019 100 BOSS之家一层 30303002 31020 1800 [1,500] 40 5 2020 100 BOSS之家一层 30303003 31020 2700 [1,500] 40 5 2021 100 BOSS之家一层 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 1f41cce..8f64043 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/Player/PlayerEventCounter.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc index e65cbdb..415992a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc index 9797070..6a94f16 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt index e04ec78..248c329 100644 --- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt @@ -20,13 +20,13 @@ 20203005 21100 94 0 0 0 2016 20203006 21100 95 0 0 0 2017 20203007 21100 96 0 0 0 2018 -20303001 21110 90 0 0 0 2012 -20303002 21110 91 0 0 0 2013 -20303003 21110 92 0 0 0 2014 -20303004 21110 93 0 0 0 2015 -20303005 21110 94 0 0 0 2016 -20303006 21110 95 0 0 0 2017 -20303007 21110 96 0 0 0 2018 +20303001 21110 90 0 0 0 2039 +20303002 21110 91 0 0 0 2040 +20303003 21110 92 0 0 0 2041 +20303004 21110 93 0 0 0 2042 +20303005 21110 94 0 0 0 2043 +20303006 21110 95 0 0 0 2044 +20303007 21110 96 0 0 0 2045 30303001 31020 90 0 0 0 2019 30303002 31020 91 0 0 0 2020 30303003 31020 92 0 0 0 2021 -- Gitblit v1.8.0