diff --git a/hwe/b_betting.php b/hwe/b_betting.php index ab9acdca..d02e4ca0 100644 --- a/hwe/b_betting.php +++ b/hwe/b_betting.php @@ -17,8 +17,10 @@ TurnExecutionHelper::executeAllCommand(); $generalID = $session->generalID; //NOTE: general_id만 빼기 귀찮음. -$myBet = array_splice($db->queryFirstList('SELECT * FROM betting WHERE general_id = %i', $generalID), -16); -$globalBet = array_splice($db->queryFirstList('SELECT * FROM betting WHERE general_id = 0'), -16); +$myBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = %i', $generalID); +$myBet = array_splice($myBet, -16); +$globalBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = 0'); +$globalBet = array_splice($globalBet, -16); $me = $db->queryFirstRow('SELECT no,tournament,con,turntime from general where owner=%i', $userID); @@ -286,7 +288,6 @@ for ($i=0; $i < 16; $i++) { echo "{$gen[$i]}"; } -$myBet = []; $bet = []; $gold = []; diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php index dffac605..f4918bdf 100644 --- a/hwe/func_tournament.php +++ b/hwe/func_tournament.php @@ -779,7 +779,8 @@ function setGift($tnmt_type, $tnmt, $phase) { $winnerSlot = ($winnerGrp - 20) * 2 + $winnerGrpNo; //당첨칸에 베팅한 사람들만 - $globalBet = array_splice($db->queryFirstList('SELECT * FROM betting WHERE general_id = 0'), -16); + $globalBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = 0'); + $globalBet = array_splice($globalBet, -16); $globalBetTotal = array_sum($globalBet); $rewardRate = round($globalBetTotal / max($globalBet[$winnerSlot], 1), 2); diff --git a/hwe/j_betting.php b/hwe/j_betting.php index 464407e9..da4439b8 100644 --- a/hwe/j_betting.php +++ b/hwe/j_betting.php @@ -34,7 +34,8 @@ if($tournament != 6) { } $myGold = $db->queryFirstField('SELECT gold FROM general WHERE no = %i', $generalID); -$bets = array_splice($db->queryFirstList('SELECT * FROM betting WHERE general_id = %i', $generalID), -16); +$bets = $db->queryFirstList('SELECT * FROM betting WHERE general_id = %i', $generalID); +$bets = array_splice($bets, -16); $totalBet = array_sum($bets); $oldBet = $bets[$betTarget]; diff --git a/hwe/sammo/AutorunNationPolicy.php b/hwe/sammo/AutorunNationPolicy.php index 99f2f2f6..d1d73902 100644 --- a/hwe/sammo/AutorunNationPolicy.php +++ b/hwe/sammo/AutorunNationPolicy.php @@ -108,7 +108,7 @@ class AutorunNationPolicy { //Policy Variables public $reqNationGold = 10000; - public $reqNationRice = 10000; + public $reqNationRice = 12000; public $CombatForce = [ //200 => [10, 24],//troopLeader, fromCity, toCity //242 => [10, 24] diff --git a/hwe/sammo/WarUnitTrigger/che_반계발동.php b/hwe/sammo/WarUnitTrigger/che_반계발동.php index 2f4ef77a..5cee38a0 100644 --- a/hwe/sammo/WarUnitTrigger/che_반계발동.php +++ b/hwe/sammo/WarUnitTrigger/che_반계발동.php @@ -19,7 +19,7 @@ class che_반계발동 extends BaseWarUnitTrigger{ $general = $self->getGeneral(); - [$opposeMagic, $damage] = $opposeEnv['magic'][0]; + [$opposeMagic, $damage] = $opposeEnv['magic']; $josaUl = \sammo\JosaUtil::pick($opposeMagic, '을');