Compare commits

...
2 changed files with 4 additions and 4 deletions
@@ -70,13 +70,13 @@ class ResetTurnTime extends \sammo\BaseAPI
UniqueConst::$hiddenSeed, UniqueConst::$hiddenSeed,
'ResetTurnTime', 'ResetTurnTime',
$userID, $userID,
$general->getTurnTime() $general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTime()
))); )));
$afterTurn = $rng->nextFloat1() * $turnTerm * 60; $afterTurn = $rng->nextFloat1() * $turnTerm * 60;
$userLogger = new UserLogger($userID); $userLogger = new UserLogger($userID);
$userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾸어 다음 턴부터 %02d:%02d 적용", intdiv(Util::toInt($afterTurn), 60), $afterTurn % 60), "inheritPoint"); $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾸어 다다음 턴부터 %02d:%02d 적용", intdiv(Util::toInt($afterTurn), 60), $afterTurn % 60), "inheritPoint");
$userLogger->flush(); $userLogger->flush();
$general->setAuxVar('inheritResetTurnTime', $nextLevel); $general->setAuxVar('inheritResetTurnTime', $nextLevel);
+2 -2
View File
@@ -806,7 +806,7 @@ class General extends GeneralBase implements iAction
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
$value = $iObj->onCalcStat($this, $statName, $value, $aux); $value = $iObj->onCalcStat($general, $statName, $value, $aux);
} }
return $value; return $value;
} }
@@ -819,7 +819,7 @@ class General extends GeneralBase implements iAction
continue; continue;
} }
/** @var iAction $iObj */ /** @var iAction $iObj */
$value = $iObj->onCalcOpposeStat($this, $statName, $value, $aux); $value = $iObj->onCalcOpposeStat($general, $statName, $value, $aux);
} }
return $value; return $value;
} }