From e7be43384afa43d08943edbe5f550444bed090e2 Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期三, 10 十月 2018 22:08:38 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 34 +++++++++++++++++----------------- CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc | 0 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt index f9377ca..78c9378 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt @@ -49,23 +49,23 @@ 31503007 31150 3300 [1,500] 40 5 2037 100 古神禁地 31503008 31150 3600 [1,500] 40 5 2038 100 古神禁地 31503009 31150 4200 [1,500] 40 5 2039 100 古神禁地 -60203004 52010 int(60/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [85,120] 40 5 0 100 封魔坛 -60203005 52010 int(60/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [85,120] 40 5 0 100 封魔坛 -60203006 52010 int(120/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [110,140] 40 5 0 100 封魔坛 -60203007 52010 int(180/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [130,160] 40 5 0 100 封魔坛 -60203008 52010 int(210/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [155,185] 40 5 0 100 封魔坛 -60203009 52010 int(240/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [180,210] 40 5 0 100 封魔坛 -60203010 52010 int(270/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [205,235] 40 5 0 100 封魔坛 -60203011 52010 int(330/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [230,260] 40 5 0 100 封魔坛 -60203012 52010 int(390/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [255,285] 40 5 0 100 封魔坛 -60203013 52010 int(420/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [280,310] 40 5 0 100 封魔坛 -60203014 52010 int(450/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [305,335] 40 5 0 100 封魔坛 -60203015 52010 int(480/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [330,360] 40 5 0 100 封魔坛 -60203016 52010 int(510/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [355,385] 40 5 0 100 封魔坛 -60203017 52010 int(540/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [380,410] 40 5 0 100 封魔坛 -60203018 52010 int(570/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [405,435] 40 5 0 100 封魔坛 -60203019 52010 int(600/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [430,460] 40 5 0 100 封魔坛 -60203020 52010 int(600/(1+(min(max(onlineCnt,3),33)-3)*0.033)) [455,485] 40 5 0 100 封魔坛 +60203004 52010 int(60-min(max(onlineCnt-2,0),48)*0.8333-min(max(onlineCnt-50,0),700)*0.0143-min(max(onlineCnt-750,0),750)*0.0044-min(max(onlineCnt-1500,0),1000)*0.0017) [85,120] 40 5 0 100 封魔坛 +60203005 52010 int(60-min(max(onlineCnt-2,0),48)*0.8333-min(max(onlineCnt-50,0),700)*0.0143-min(max(onlineCnt-750,0),750)*0.0044-min(max(onlineCnt-1500,0),1000)*0.0017) [85,120] 40 5 0 100 封魔坛 +60203006 52010 int(120-min(max(onlineCnt-2,0),48)*1.875-min(max(onlineCnt-50,0),700)*0.0214-min(max(onlineCnt-750,0),750)*0.0067-min(max(onlineCnt-1500,0),1000)*0.0025) [110,140] 40 5 0 100 封魔坛 +60203007 52010 int(180-min(max(onlineCnt-2,0),48)*3-min(max(onlineCnt-50,0),700)*0.0257-min(max(onlineCnt-750,0),750)*0.008-min(max(onlineCnt-1500,0),1000)*0.003) [130,160] 40 5 0 100 封魔坛 +60203008 52010 int(240-min(max(onlineCnt-2,0),173)*0.742-min(max(onlineCnt-175,0),350)*0.2126-min(max(onlineCnt-525,0),525)*0.0354-min(max(onlineCnt-1050,0),700)*0.0106) [155,185] 40 5 0 100 封魔坛 +60203009 52010 int(300-min(max(yesterdayCnt-51,0),124)*1.5233-min(max(yesterdayCnt-175,0),350)*0.2116-min(max(yesterdayCnt-525,0),525)*0.0353-min(max(yesterdayCnt-1050,0),700)*0.0106) [180,210] 40 5 0 100 封魔坛 +60203010 52010 int(360-min(max(yesterdayCnt-43,0),82)*2.4814-min(max(yesterdayCnt-125,0),250)*0.4174-min(max(yesterdayCnt-375,0),375)*0.0696-min(max(yesterdayCnt-750,0),500)*0.0209) [205,235] 40 5 0 100 封魔坛 +60203011 52010 int(420-min(max(yesterdayCnt-37,0),53)*3.8607-min(max(yesterdayCnt-90,0),180)*0.7977-min(max(yesterdayCnt-270,0),270)*0.133-min(max(yesterdayCnt-540,0),360)*0.0399) [230,260] 40 5 0 100 封魔坛 +60203012 52010 int(480-min(max(yesterdayCnt-32,0),43)*5.1288-min(max(yesterdayCnt-75,0),150)*1.1532-min(max(yesterdayCnt-225,0),225)*0.1922-min(max(yesterdayCnt-450,0),300)*0.0577) [255,285] 40 5 0 100 封魔坛 +60203013 52010 int(600-min(max(yesterdayCnt-25,0),15)*8-min(max(yesterdayCnt-40,0),80)*4-min(max(yesterdayCnt-120,0),120)*0.6667-min(max(yesterdayCnt-240,0),160)*0.2) [280,310] 40 5 0 100 封魔坛 +60203014 52010 int(720-min(max(yesterdayCnt-21,0),9)*7.2727-min(max(yesterdayCnt-30,0),60)*7.2727-min(max(yesterdayCnt-90,0),90)*1.2121-min(max(yesterdayCnt-180,0),120)*0.3636) [305,335] 40 5 0 100 封魔坛 +60203015 52010 int(750-min(max(yesterdayCnt-20,0),5)*0-min(max(yesterdayCnt-25,0),50)*10-min(max(yesterdayCnt-75,0),75)*1.6667-min(max(yesterdayCnt-150,0),100)*0.5) [330,360] 40 5 0 100 封魔坛 +60203016 52010 int(780-min(max(yesterdayCnt-19,0),6)*0-min(max(yesterdayCnt-25,0),50)*10.4-min(max(yesterdayCnt-75,0),75)*1.7333-min(max(yesterdayCnt-150,0),100)*0.52) [355,385] 40 5 0 100 封魔坛 +60203017 52010 int(840-min(max(yesterdayCnt-18,0),2)*0-min(max(yesterdayCnt-20,0),40)*14-min(max(yesterdayCnt-60,0),60)*2.3333-min(max(yesterdayCnt-120,0),80)*0.7) [380,410] 40 5 0 100 封魔坛 +60203018 52010 int(900-min(max(yesterdayCnt-17,0),3)*0-min(max(yesterdayCnt-20,0),40)*15-min(max(yesterdayCnt-60,0),60)*2.5-min(max(yesterdayCnt-120,0),80)*0.75) [405,435] 40 5 0 100 封魔坛 +60203019 52010 int(990-min(max(yesterdayCnt-15,0),5)*0-min(max(yesterdayCnt-20,0),40)*16.5-min(max(yesterdayCnt-60,0),60)*2.75-min(max(yesterdayCnt-120,0),80)*0.825) [430,460] 40 5 0 100 封魔坛 +60203020 52010 int(1080-min(max(yesterdayCnt-14,0),6)*0-min(max(yesterdayCnt-20,0),40)*18-min(max(yesterdayCnt-60,0),60)*3-min(max(yesterdayCnt-120,0),80)*0.9) [455,485] 40 5 0 100 封魔坛 50103001 10010 0 [] 0 0 0 0 骑宠争夺 50103002 10020 0 [] 0 0 0 0 骑宠争夺 50103003 10030 0 [] 0 0 0 0 骑宠争夺 diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc index 490a619..fa210ec 100644 --- a/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc +++ b/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index d267d86..d6b5801 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.pyc index cfc1f6e..45a5fd7 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFB.pyc Binary files differ diff --git a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc index dbe464c..e65def5 100644 --- a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc +++ b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc Binary files differ -- Gitblit v1.8.0