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

버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-04-30 16:47:11 +09:00
parent 39ea45eb51
commit 366cba2102
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/b_betting.php
+4 -3
View File
@@ -17,8 +17,10 @@ TurnExecutionHelper::executeAllCommand();
$generalID = $session->generalID; $generalID = $session->generalID;
//NOTE: general_id만 빼기 귀찮음. //NOTE: general_id만 빼기 귀찮음.
$myBet = array_splice($db->queryFirstList('SELECT * FROM betting WHERE general_id = %i', $generalID), -16); $myBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = %i', $generalID);
$globalBet = array_splice($db->queryFirstList('SELECT * FROM betting WHERE general_id = 0'), -16); $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); $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 "<td width=70>{$gen[$i]}</td>"; echo "<td width=70>{$gen[$i]}</td>";
} }
$myBet = [];
$bet = []; $bet = [];
$gold = []; $gold = [];
hwe/func_tournament.php
+2 -1
View File
@@ -779,7 +779,8 @@ function setGift($tnmt_type, $tnmt, $phase) {
$winnerSlot = ($winnerGrp - 20) * 2 + $winnerGrpNo; $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); $globalBetTotal = array_sum($globalBet);
$rewardRate = round($globalBetTotal / max($globalBet[$winnerSlot], 1), 2); $rewardRate = round($globalBetTotal / max($globalBet[$winnerSlot], 1), 2);
hwe/j_betting.php
+2 -1
View File
@@ -34,7 +34,8 @@ if($tournament != 6) {
} }
$myGold = $db->queryFirstField('SELECT gold FROM general WHERE no = %i', $generalID); $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); $totalBet = array_sum($bets);
$oldBet = $bets[$betTarget]; $oldBet = $bets[$betTarget];
hwe/sammo/AutorunNationPolicy.php
+1 -1
View File
@@ -108,7 +108,7 @@ class AutorunNationPolicy {
//Policy Variables //Policy Variables
public $reqNationGold = 10000; public $reqNationGold = 10000;
public $reqNationRice = 10000; public $reqNationRice = 12000;
public $CombatForce = [ public $CombatForce = [
//200 => [10, 24],//troopLeader, fromCity, toCity //200 => [10, 24],//troopLeader, fromCity, toCity
//242 => [10, 24] //242 => [10, 24]
hwe/sammo/WarUnitTrigger/che_반계발동.php
+1 -1
View File
@@ -19,7 +19,7 @@ class che_반계발동 extends BaseWarUnitTrigger{
$general = $self->getGeneral(); $general = $self->getGeneral();
[$opposeMagic, $damage] = $opposeEnv['magic'][0]; [$opposeMagic, $damage] = $opposeEnv['magic'];
$josaUl = \sammo\JosaUtil::pick($opposeMagic, '을'); $josaUl = \sammo\JosaUtil::pick($opposeMagic, '을');