diff --git a/doc/Circuit.py b/doc/Circuit.py index 05999ce0..33f9e1ff 100644 --- a/doc/Circuit.py +++ b/doc/Circuit.py @@ -29,7 +29,7 @@ class Circuit(object): 'response': [ _common.RspHead(), ['!rank_list', [rankingInfo()], '榜信息'], - ['my_rank', rankingInfo(), '我的信息'], + ['my_rank', rankingInfo(), '个人榜信息'], ] } ] @@ -57,4 +57,5 @@ class rankingInfo(object): ['head_frame', 0, '头像框'], ['ranking', 0, '排名'], ['score', 0, '积分'], + ['cec', 0, 'cec(个人榜信息才有)'], ] \ No newline at end of file diff --git a/doc/Other.py b/doc/Other.py index 344c629d..3ca31ba7 100644 --- a/doc/Other.py +++ b/doc/Other.py @@ -83,6 +83,7 @@ class Other(object): ['id',0,'mapMode配置id'], ['stage_state',0,'阶段开始状态 0:未开 1:已开,id=7(巡回模式)才有'], ['next_star_time',0,'下个阶段开始时间,id=7(巡回模式)才有'], + ['next_end_time',0,'下个阶段结束时间,id=7(巡回模式)才有'], ['state',0,'开启状态 0:未开 1:已开,特殊模式才有(见mapMode配置表)'], ['daily_open_time',0,'每天开始时间1,特殊模式才有(见mapMode配置表)'], ['daily_end_time',0,'每天结束时间1,特殊模式才有(见mapMode配置表)'], diff --git a/webapp/controller/CircuitController.class.php b/webapp/controller/CircuitController.class.php index c0b0a07c..03f4316c 100644 --- a/webapp/controller/CircuitController.class.php +++ b/webapp/controller/CircuitController.class.php @@ -5,10 +5,14 @@ require_once('mt/CircuitTime.php'); require_once('mt/CircuitReward.php'); require_once('models/Circuit.php'); require_once('models/User.php'); +require_once('models/Hero.php'); +require_once('models/HeroSkin.php'); use models\Circuit; use models\User; +use models\Hero; +use models\HeroSkin; use phpcommon\SqlHelper; class CircuitController extends BaseAuthedController { private $redis_key_circuit_ranking = 'circuit_ranking'; @@ -57,6 +61,9 @@ class CircuitController extends BaseAuthedController { $rankingList = array(); foreach ($data as $k=>$row){ $userDb = User::find($row['account_id']); + $heroDb = Hero::findByAccountId($userDb['account_id'],$userDb['hero_id']); + $skinDb = HeroSkin::find($heroDb['skin_id']); + $skinId = $skinDb ? $skinDb['skin_id']:0; $ranking = $k+1; $rewardWeight = \mt\CircuitReward::getRewardWeight($ranking); if ($userDb){ @@ -65,6 +72,7 @@ class CircuitController extends BaseAuthedController { 'name' => utf8_encode($userDb['name']), 'head_id' => $userDb['head_id'], 'head_frame' => $userDb['head_frame'], + 'skinId' => $skinId, 'ranking' => $ranking, 'weight' => $rewardWeight, 'score' => $row['cumulative_score'], diff --git a/webapp/controller/OtherController.class.php b/webapp/controller/OtherController.class.php index e1882e8f..1723c0d4 100644 --- a/webapp/controller/OtherController.class.php +++ b/webapp/controller/OtherController.class.php @@ -346,16 +346,7 @@ class OtherController extends BaseAuthedController { $temp = array( 'id' => $modeMeta['id'] ); - if ($modeMeta['limit_time'] == 3){ - $circuitStageMeta = mt\CircuitTime::getCurrentStage(); - if($circuitStageMeta){ - $temp['stage_state'] = 1; - }else{ - $temp['stage_state'] = 0; - $nextStageMeta = mt\CircuitTime::getNextStage($circuitTimeMeta['circuit_season']); - $temp['next_star_time'] = strtotime($nextStageMeta['start_time']); - } - } + if ($modeMeta['daily_open_time']){ $dailyOpenTimeOffset = myself()->_getDaySecondsOffset(strtotime("2024-6-22 ".$modeMeta['daily_open_time'])); @@ -380,7 +371,18 @@ class OtherController extends BaseAuthedController { $temp['state'] = 1; } } - + if ($modeMeta['limit_time'] == 3){ + $circuitStageMeta = mt\CircuitTime::getCurrentStage(); + if($circuitStageMeta){ + $temp['stage_state'] = 1; + }else{ + $temp['stage_state'] = 0; + $temp['state'] = 0; + $nextStageMeta = mt\CircuitTime::getNextStage($circuitTimeMeta['circuit_season']); + $temp['next_star_time'] = strtotime($nextStageMeta['start_time']); + $temp['next_end_time'] = strtotime($nextStageMeta['end_time']); + } + } $isOpen = mt\MapMode::isOpen($modeMeta);