server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
hujiabin 2024-09-19 16:35:31 +08:00
parent 976d490bd2
commit 07a2915bec
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/Circuit.py
View File

@ -29,7 +29,7 @@ class Circuit(object):
'response': [ 'response': [
_common.RspHead(), _common.RspHead(),
['!rank_list', [rankingInfo()], '榜信息'], ['!rank_list', [rankingInfo()], '榜信息'],
['my_rank', rankingInfo(), '我的信息'], ['my_rank', rankingInfo(), '个人榜信息'],
] ]
} }
] ]
@ -57,4 +57,5 @@ class rankingInfo(object):
['head_frame', 0, '头像框'], ['head_frame', 0, '头像框'],
['ranking', 0, '排名'], ['ranking', 0, '排名'],
['score', 0, '积分'], ['score', 0, '积分'],
['cec', 0, 'cec(个人榜信息才有)'],
] ]

1
doc/Other.py
View File

@ -83,6 +83,7 @@ class Other(object):
['id',0,'mapMode配置id'], ['id',0,'mapMode配置id'],
['stage_state',0,'阶段开始状态 0:未开 1:已开,id=7(巡回模式)才有'], ['stage_state',0,'阶段开始状态 0:未开 1:已开,id=7(巡回模式)才有'],
['next_star_time',0,'下个阶段开始时间,id=7(巡回模式)才有'], ['next_star_time',0,'下个阶段开始时间,id=7(巡回模式)才有'],
['next_end_time',0,'下个阶段结束时间,id=7(巡回模式)才有'],
['state',0,'开启状态 0:未开 1:已开,特殊模式才有(见mapMode配置表)'], ['state',0,'开启状态 0:未开 1:已开,特殊模式才有(见mapMode配置表)'],
['daily_open_time',0,'每天开始时间1,特殊模式才有(见mapMode配置表)'], ['daily_open_time',0,'每天开始时间1,特殊模式才有(见mapMode配置表)'],
['daily_end_time',0,'每天结束时间1,特殊模式才有(见mapMode配置表)'], ['daily_end_time',0,'每天结束时间1,特殊模式才有(见mapMode配置表)'],

8
webapp/controller/CircuitController.class.php
View File

@ -5,10 +5,14 @@ require_once('mt/CircuitTime.php');
require_once('mt/CircuitReward.php'); require_once('mt/CircuitReward.php');
require_once('models/Circuit.php'); require_once('models/Circuit.php');
require_once('models/User.php'); require_once('models/User.php');
require_once('models/Hero.php');
require_once('models/HeroSkin.php');
use models\Circuit; use models\Circuit;
use models\User; use models\User;
use models\Hero;
use models\HeroSkin;
use phpcommon\SqlHelper; use phpcommon\SqlHelper;
class CircuitController extends BaseAuthedController { class CircuitController extends BaseAuthedController {
private $redis_key_circuit_ranking = 'circuit_ranking'; private $redis_key_circuit_ranking = 'circuit_ranking';
@ -57,6 +61,9 @@ class CircuitController extends BaseAuthedController {
$rankingList = array(); $rankingList = array();
foreach ($data as $k=>$row){ foreach ($data as $k=>$row){
$userDb = User::find($row['account_id']); $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; $ranking = $k+1;
$rewardWeight = \mt\CircuitReward::getRewardWeight($ranking); $rewardWeight = \mt\CircuitReward::getRewardWeight($ranking);
if ($userDb){ if ($userDb){
@ -65,6 +72,7 @@ class CircuitController extends BaseAuthedController {
'name' => utf8_encode($userDb['name']), 'name' => utf8_encode($userDb['name']),
'head_id' => $userDb['head_id'], 'head_id' => $userDb['head_id'],
'head_frame' => $userDb['head_frame'], 'head_frame' => $userDb['head_frame'],
'skinId' => $skinId,
'ranking' => $ranking, 'ranking' => $ranking,
'weight' => $rewardWeight, 'weight' => $rewardWeight,
'score' => $row['cumulative_score'], 'score' => $row['cumulative_score'],

24
webapp/controller/OtherController.class.php
View File

@ -346,16 +346,7 @@ class OtherController extends BaseAuthedController {
$temp = array( $temp = array(
'id' => $modeMeta['id'] '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']){ if ($modeMeta['daily_open_time']){
$dailyOpenTimeOffset = myself()->_getDaySecondsOffset(strtotime("2024-6-22 ".$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; $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); $isOpen = mt\MapMode::isOpen($modeMeta);