This commit is contained in:
hujiabin 2023-03-16 20:32:32 +08:00
parent b0ac08083e
commit b56b2792c1
3 changed files with 15 additions and 11 deletions

View File

@ -43,6 +43,7 @@ define('TN_DAILY_RANK_BATTLE_TIMES', 9011);
define('TN_DAILY_END', 9011); define('TN_DAILY_END', 9011);
define('TN_DAILY_PVE_GET_HERO_FRAGMENT_NUM', 9012); define('TN_DAILY_PVE_GET_HERO_FRAGMENT_NUM', 9012);
define('TN_DAILY_PVE_GET_GUN_FRAGMENT_NUM', 9013); define('TN_DAILY_PVE_GET_GUN_FRAGMENT_NUM', 9013);
define('TN_DAILY_COMPLETE_TASK_NUM', 9014);
define('TN_WEEKLY_BEGIN', 10001); define('TN_WEEKLY_BEGIN', 10001);
define('TN_WEEKLY_ACTIVE', 10002); define('TN_WEEKLY_ACTIVE', 10002);

View File

@ -84,22 +84,23 @@ class MissionController extends BaseAuthedController {
array_push($missionDtoList1, $missionDto); array_push($missionDtoList1, $missionDto);
} else { } else {
array_push($missionDtoList2, $missionDto); array_push($missionDtoList2, $missionDto);
if ($missionDto['state'] == Mission::NOT_FINISHED_STATE) { // if ($missionDto['state'] == Mission::NOT_FINISHED_STATE) {
$notFinishedCount++; // $notFinishedCount++;
} // }
if ($missionMeta['condition'] == mt\Task::FINISHED_ALL_DAILY_MISSION_COND) { // if ($missionMeta['condition'] == mt\Task::FINISHED_ALL_DAILY_MISSION_COND) {
$specMissionDto = &$missionDto; // $specMissionDto &= $missionDto;
} // }
} }
} else { } else {
array_push($missionDtoList1, $missionDto); array_push($missionDtoList1, $missionDto);
} }
} }
if ($specMissionDto && // if ($specMissionDto &&
$specMissionDto['state'] == Mission::NOT_FINISHED_STATE && // $specMissionDto['state'] == Mission::NOT_FINISHED_STATE &&
$notFinishedCount <= 1) { // $notFinishedCount <= 1) {
$specMissionDto['state'] = Mission::RECEIVEABLE_STATE; //// $specMissionDto['state'] = Mission::RECEIVEABLE_STATE;
} // $specMissionDto['state'] = 9636;
// }
$this->_rspData(array( $this->_rspData(array(
'current_active_value' => min($this->_getV(TN_ACTIVE, 0), mt\Parameter::getVal('max_activity', 0)), 'current_active_value' => min($this->_getV(TN_ACTIVE, 0), mt\Parameter::getVal('max_activity', 0)),
'max_active_value' => mt\Parameter::getVal('max_activity', 0), 'max_active_value' => mt\Parameter::getVal('max_activity', 0),
@ -161,6 +162,7 @@ class MissionController extends BaseAuthedController {
$missionDb = Mission::find($missionId); $missionDb = Mission::find($missionId);
$missionDto = $this->missionService->getMissionDto( $missionDto = $this->missionService->getMissionDto(
$this->userInfo, $this->seasonDb, $missionDb, $missionMeta); $this->userInfo, $this->seasonDb, $missionDb, $missionMeta);
$this->_incDailyV(TN_DAILY_COMPLETE_TASK_NUM, 0, 1);
$this->propertyChgService->addHeroChg(); $this->propertyChgService->addHeroChg();
$this->propertyChgService->addGunChg(); $this->propertyChgService->addGunChg();
$this->_rspData(array( $this->_rspData(array(

View File

@ -344,6 +344,7 @@ class MissionService extends BaseService {
case mt\Task::FINISHED_ALL_DAILY_MISSION_COND: case mt\Task::FINISHED_ALL_DAILY_MISSION_COND:
{ {
//完成所有每日任务 //完成所有每日任务
$missionDto['current'] = myself()->_getDailyV(TN_DAILY_COMPLETE_TASK_NUM, 0);
} }
break; break;
case mt\Task::SHOP_BUY_TIMES_COND: case mt\Task::SHOP_BUY_TIMES_COND: