This commit is contained in:
hujiabin 2024-04-23 14:40:23 +08:00
parent f9dcec7c49
commit bd2536995e
3 changed files with 7 additions and 4 deletions

View File

@ -278,9 +278,10 @@ class HeroController extends BaseAuthedController {
$validTime = $unsealTime + 86400 * $heroAtteMeta['validTime'] ;
$valid_lefttime = max(0, $validTime - myself()->_getNowTime()) + ($heroNextQualityAtteMeta['validTime'] - $heroAtteMeta['validTime']) * 86400;
$attribute = \mt\EconomyAttribute::getAttribute($heroMeta['relationship'], $heroDb['quality'] + 1);
$unseal_time_new = $valid_lefttime + myself()->_getNowTime() - 86400 * $heroNextQualityAtteMeta['validTime'];
Hero::update($heroUniId, array(
'quality' => $heroDb['quality'] + 1,
'unseal_time' => $valid_lefttime + myself()->_getNowTime(),
'unseal_time' => $unseal_time_new,
'wealth_attr' => json_encode($attribute),
));
$propertyChgService->addHeroChg();

View File

@ -205,6 +205,7 @@ class RoomBattleDataService extends BaseService {
$computeParam = mt\Parameter::getVal('economy_account_compute_K',0);
$computeMaxEffect = mt\Parameter::getVal('economy_account_compute_E',0);
$gold = $gold * ($totalCompute / ($totalCompute + $computeParam) * $computeMaxEffect + 1);
$compute = ($totalCompute / ($totalCompute + $computeParam) * $computeMaxEffect + 1);
}
if ($userDb['account_id'] == "6513_2006_ZsmnBnmQYcJ4XElLOmqTDBRySOrE66Kj"){
error_log("BattleRewardsInfo:".json_encode(array(
@ -224,7 +225,7 @@ class RoomBattleDataService extends BaseService {
'*wealth*' => (1 + $wealthE * (Hero::getHeroWealth($heroDb) / (Hero::getHeroWealth($heroDb) + $wealthK))),
'lastCompute' => isset($lastCompute) ? $lastCompute : '空',
'currentCompute' => isset($currentCompute) ? $currentCompute : '空',
'*compute*' =>$currentPeriod ? $totalCompute / ($totalCompute + $computeParam) * $computeMaxEffect + 1 : '算力系统关闭',
'*compute*' => isset($compute) ? $compute : '算力系统关闭',
'finalGold' => floor($gold)
)));
}

View File

@ -1329,7 +1329,7 @@ class TameBattleDataService extends BaseService {
}
//服务器大事件任务统计
$server_task_state = GlobalData::getServerTaskStatus();
// $server_task_state = GlobalData::getServerTaskStatus();
$currentServerTask = mt\ServerTaskTime::getCurrentTime();
if (!isset($serverTaskData['data'])) {
$serverTaskData['data'] = array(
@ -1391,7 +1391,8 @@ class TameBattleDataService extends BaseService {
break;
default:{}
}
if (! $server_task_state && $currentServerTask &&
// if (! $server_task_state && $currentServerTask &&
if ( $currentServerTask &&
myself()->_getNowTime() > strtotime($currentServerTask['obtain_start_time']) &&
myself()->_getNowTime() < strtotime($currentServerTask['obtain_end_time'])) {
$this->applyEx($serverTaskData['data']);