devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

feat: getRankVar에 RankVar가 없을 경우 기본값 지정 가능

Browse Source 
- 토너먼트 값 회수
This commit is contained in:
Hide_D
2021-12-18 17:58:20 +09:00
parent 4ed88d33b1
commit a4e8221508
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_tournament.php
+1 -1
View File
@@ -1155,7 +1155,7 @@ function setGift($tnmt_type, $tnmt, $phase)
foreach (General::createGeneralObjListFromDB(Util::squeezeFromArray($gambleResult, 'general_id'), ['gold', 'npc'], 1) as $gambler) { foreach (General::createGeneralObjListFromDB(Util::squeezeFromArray($gambleResult, 'general_id'), ['gold', 'npc'], 1) as $gambler) {
$reward = Util::round($gambleResult[$gambler->getID()]['bet'] * $rewardRate); $reward = Util::round($gambleResult[$gambler->getID()]['bet'] * $rewardRate);
$gambler->increaseVar('gold', $reward); $gambler->increaseVar('gold', $reward);
if (($gambler->getNPCType() == 0) || ($gambler->getNPCType() == 1 && $gambler->getRankVar('betgold') > 0)) { if (($gambler->getNPCType() == 0) || ($gambler->getNPCType() == 1 && $gambler->getRankVar('betgold', 0) > 0)) {
$gambler->increaseRankVar('betwingold', $reward); $gambler->increaseRankVar('betwingold', $reward);
$gambler->increaseRankVar('betwin', 1); $gambler->increaseRankVar('betwin', 1);
} }
hwe/sammo/General.php
+5 -2
View File
@@ -781,7 +781,7 @@ class General implements iAction
$this->rankVarSet[$key] = $value; $this->rankVarSet[$key] = $value;
} }
function getRankVar(string $key): int function getRankVar(string $key, $defaultValue = null): int
{ {
if (!key_exists($key, static::RANK_COLUMN)) { if (!key_exists($key, static::RANK_COLUMN)) {
throw new \InvalidArgumentException('올바르지 않은 인자 :' . $key); throw new \InvalidArgumentException('올바르지 않은 인자 :' . $key);
@@ -792,7 +792,10 @@ class General implements iAction
} }
if (!key_exists($key, $this->rankVarRead)) { if (!key_exists($key, $this->rankVarRead)) {
throw new \RuntimeException('인자가 없음 : ' . $key); if($defaultValue === null){
throw new \RuntimeException('인자가 없음 : ' . $key);
}
return $defaultValue;
} }
return $this->rankVarRead[$key]; return $this->rankVarRead[$key];