Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb
This commit is contained in:
commit
a7eb363b0f
@ -68,12 +68,15 @@ class BattleBoxService {
|
|||||||
$yesterDayDropLastTime = self::getDailyPhaseDropLastTime($currPhase, $yesterDayTime);
|
$yesterDayDropLastTime = self::getDailyPhaseDropLastTime($currPhase, $yesterDayTime);
|
||||||
$yesterDayDropTotal = self::getDailyPhaseDropTotalNum($currPhase, $yesterDayTime);
|
$yesterDayDropTotal = self::getDailyPhaseDropTotalNum($currPhase, $yesterDayTime);
|
||||||
$yesterDayAllocNum = self::getDailyPhaseAllocNum($currPhase, $yesterDayTime);
|
$yesterDayAllocNum = self::getDailyPhaseAllocNum($currPhase, $yesterDayTime);
|
||||||
|
$yesterDayAlreadyAllocNum = self::getDailyPhaseAlreadyAllocNum($currPhase, $yesterDayTime);
|
||||||
error_log(json_encode(array(
|
error_log(json_encode(array(
|
||||||
'yesterDayDropLastTime' => $yesterDayDropLastTime,
|
'yesterDayDropLastTime' => $yesterDayDropLastTime,
|
||||||
'yesterDayDropTotal' => $yesterDayDropTotal,
|
'yesterDayDropTotal' => $yesterDayDropTotal,
|
||||||
'yesterDayAllocNum' => $yesterDayAllocNum,
|
'yesterDayAllocNum' => $yesterDayAllocNum,
|
||||||
|
'yesterDayAlreadyAllocNum' => $yesterDayAlreadyAllocNum,
|
||||||
'maxNum' => $maxNum,
|
'maxNum' => $maxNum,
|
||||||
)));
|
)));
|
||||||
|
$yesterDayDropTotal = max($yesterDayDropTotal, $yesterDayAlreadyAllocNum);
|
||||||
if ($yesterDayAllocNum <= 0) {
|
if ($yesterDayAllocNum <= 0) {
|
||||||
$allocableNum = $maxNum;
|
$allocableNum = $maxNum;
|
||||||
} else {
|
} else {
|
||||||
@ -97,6 +100,7 @@ class BattleBoxService {
|
|||||||
$completionDegree = $yesterDayDropTotal / $yesterDayAllocNum;
|
$completionDegree = $yesterDayDropTotal / $yesterDayAllocNum;
|
||||||
}
|
}
|
||||||
$allocableNum = min($maxNumLimit, $yesterDayAllocNum * $completionDegree);
|
$allocableNum = min($maxNumLimit, $yesterDayAllocNum * $completionDegree);
|
||||||
|
$allocableNum = max(300, $allocableNum);
|
||||||
if ($allocableNum <= 0) {
|
if ($allocableNum <= 0) {
|
||||||
$allocableNum = $yesterDayAllocNum;
|
$allocableNum = $yesterDayAllocNum;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user