From 142750dab76f784361b542b9e17492a1af740e5f Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期一, 28 一月 2019 15:38:57 +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 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerNewFairyCeremony.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 34 +++++++++++++++++----------------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc | 0 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt index cf4322c..a55126e 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt @@ -19,8 +19,8 @@ 20203006 21100 int(6000*(1-0.023*min(max(yesterdayCnt-15,0),35))) [340,370] 40 5 2017 100 世界BOSS 10903001 10090 int(6000*(1-0.027*min(max(yesterdayCnt-5,0),25))) [380,450] 40 5 2048 100 世界BOSS 20203007 21100 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [385,415] 40 5 2018 100 世界BOSS -11003001 10100 int(7200*(1-0.027*min(max(yesterdayCnt-5,0),25))) [430,500] 40 5 2047 100 世界BOSS -11103001 10110 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [430,500] 40 5 2049 100 世界BOSS +11003001 10100 int(7200*(1-0.032*min(max(yesterdayCnt-5,0),25))) [430,500] 40 5 2047 100 世界BOSS +11103001 10110 int(7800*(1-0.04*min(max(yesterdayCnt-5,0),20))) [480,550] 40 5 2049 100 世界BOSS 20303001 21110 3000 [1,500] 40 5 2040 100 异兽之地 20303002 21110 3600 [1,500] 40 5 2041 100 异兽之地 20303003 21110 4200 [1,500] 40 5 2042 100 异兽之地 @@ -28,13 +28,13 @@ 20303005 21110 5400 [1,500] 40 5 2044 100 异兽之地 20303006 21110 6000 [1,500] 40 5 2045 100 异兽之地 20303007 21110 6600 [1,500] 40 5 2046 100 异兽之地 -20403001 21310 3000 [1,500] 40 5 2054 100 古舰战场 -20403002 21310 3600 [1,500] 40 5 2055 100 古舰战场 -20403003 21310 4200 [1,500] 40 5 2056 100 古舰战场 -20403004 21310 4800 [1,500] 40 5 2057 100 古舰战场 -20403005 21310 5400 [1,500] 40 5 2058 100 古舰战场 -20403006 21310 6000 [1,500] 40 5 2059 100 古舰战场 -20403007 21310 6600 [1,500] 40 5 2060 100 古舰战场 +20403001 21310 int(6800*(1-0.032*min(max(yesterdayCnt-5,0),25))) [390,420] 40 5 2054 100 古舰战场 +20403002 21310 int(7000*(1-0.032*min(max(yesterdayCnt-5,0),25))) [425,455] 40 5 2055 100 古舰战场 +20403003 21310 int(7400*(1-0.033*min(max(yesterdayCnt-5,0),20))) [435,465] 40 5 2056 100 古舰战场 +20403004 21310 int(7600*(1-0.033*min(max(yesterdayCnt-5,0),20))) [475,505] 40 5 2057 100 古舰战场 +20403005 21310 int(8000*(1-0.044*min(max(yesterdayCnt-5,0),15))) [485,515] 40 5 2058 100 古舰战场 +20403006 21310 int(8200*(1-0.044*min(max(yesterdayCnt-5,0),15))) [525,555] 40 5 2059 100 古舰战场 +20403007 21310 int(8400*(1-0.044*min(max(yesterdayCnt-5,0),15))) [535,565] 40 5 2060 100 古舰战场 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之家一层 @@ -47,14 +47,14 @@ 30303010 31030 4500 [1,500] 40 5 2028 100 BOSS之家二层 30303011 31030 5400 [1,500] 40 5 2029 100 BOSS之家二层 30303012 31030 6300 [1,500] 40 5 2030 100 BOSS之家二层 -30303013 31031 3600 [1,500] 40 5 2050 100 BOSS之家三层 -30303014 31031 4500 [1,500] 40 5 2051 100 BOSS之家三层 -30303015 31031 5400 [1,500] 40 5 2052 100 BOSS之家三层 -30303016 31031 6300 [1,500] 40 5 2053 100 BOSS之家三层 -30303017 31360 3000 [1,500] 40 5 2050 100 BOSS之家四层 -30303018 31360 3000 [1,500] 40 5 2051 100 BOSS之家四层 -30303019 31360 3000 [1,500] 40 5 2052 100 BOSS之家四层 -30303020 31360 3000 [1,500] 40 5 2053 100 BOSS之家四层 +30303013 31031 5600 [1,500] 40 5 2050 100 BOSS之家三层 +30303014 31031 5800 [1,500] 40 5 2051 100 BOSS之家三层 +30303015 31031 6700 [1,500] 40 5 2052 100 BOSS之家三层 +30303016 31031 7000 [1,500] 40 5 2053 100 BOSS之家三层 +30303017 31360 6000 [1,500] 40 5 2050 100 BOSS之家四层 +30303018 31360 6500 [1,500] 40 5 2051 100 BOSS之家四层 +30303019 31360 6700 [1,500] 40 5 2052 100 BOSS之家四层 +30303020 31360 7200 [1,500] 40 5 2053 100 BOSS之家四层 31503001 31150 1350 [1,500] 40 5 2031 100 古神禁地 31503002 31150 1700 [1,500] 40 5 2032 100 古神禁地 31503003 31150 2150 [1,500] 40 5 2033 100 古神禁地 diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerNewFairyCeremony.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerNewFairyCeremony.pyc index 319ed32..ba937f8 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerNewFairyCeremony.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerNewFairyCeremony.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 ab78253..5d2c592 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/DataRecordPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc index 52f4b49..fef5f03 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc index 752677c..9572297 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.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 ad2bb71..ed12bd7 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/PlayerFeastWeekParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.pyc new file mode 100644 index 0000000..5a39112 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.pyc index e1d4e63..6f766c3 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc index 5f6a652..d91e710 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc Binary files differ -- Gitblit v1.8.0