This commit is contained in:
aozhiwei 2024-11-05 16:53:46 +08:00
parent ec61d9f753
commit 1fca42b393
3 changed files with 12 additions and 1 deletions

View File

@ -767,6 +767,7 @@ class BattleController extends BaseAuthedController {
public function getNormalBattleData() public function getNormalBattleData()
{ {
error_log(json_encode($_REQUEST));
$version = getReqVal('version', 0); $version = getReqVal('version', 0);
$ignoreAndroid = false; $ignoreAndroid = false;
if ($version < 1) { if ($version < 1) {

View File

@ -49,6 +49,16 @@ class CircuitTime {
return null; return null;
} }
public static function getCurrentBattleStage(){
foreach (self::getCircuitAll(self::STAGE_SEASON_TYPE) as $meta){
if (myself()->_getNowTime() >= strtotime($meta['start_time']) &&
myself()->_getNowTime() <= strtotime($meta['end_time']) + 60 * 30) {
return $meta;
}
}
return null;
}
public static function getNextStage($season){ public static function getNextStage($season){
$next = array(); $next = array();
foreach (self::getListBySeason($season) as $meta){ foreach (self::getListBySeason($season) as $meta){

View File

@ -133,7 +133,7 @@ class RoomBattleDataService extends BaseService {
//巡回模式排位分计算 //巡回模式排位分计算
if ($this->mapMode == mt\MapMode::CIRCUIT_MODE){ if ($this->mapMode == mt\MapMode::CIRCUIT_MODE){
$circuitMeta = mt\CircuitTime::getCurrentCircuit(); $circuitMeta = mt\CircuitTime::getCurrentCircuit();
$circuitStageMeta = mt\CircuitTime::getCurrentStage(); $circuitStageMeta = mt\CircuitTime::getCurrentBattleStage();
if ($circuitMeta && $circuitStageMeta){ if ($circuitMeta && $circuitStageMeta){
$minScore = mt\Parameter::getVal('circuit_rank_score_min',0); $minScore = mt\Parameter::getVal('circuit_rank_score_min',0);
$multConstant = mt\Parameter::getVal('circuit_score_mult_constant',1); $multConstant = mt\Parameter::getVal('circuit_score_mult_constant',1);