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-25 05:28:43 +09:00
parent 4e7529ae44
commit 6b54797aec
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/b_battleCenter.php
+5 -5
View File
@@ -82,13 +82,13 @@ if ($btn == '정렬하기') {
[$queryTypeText, $reqArgType, $comp] = $queryMap[$reqQueryType]; [$queryTypeText, $reqArgType, $comp] = $queryMap[$reqQueryType];
if($reqArgType===0){ if($reqArgType===0){
$generalBasicList = $db->query('SELECT no, name, npc, turntime FROM general WHERE nation = %i', $nationID); $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level FROM general WHERE nation = %i', $nationID);
} }
else if($reqArgType===1){ else if($reqArgType===1){
$generalBasicList = $db->query('SELECT no, name, npc, turntime, %b FROM general WHERE nation = %i', $reqQueryType, $nationID); $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, %b FROM general WHERE nation = %i', $reqQueryType, $nationID);
} }
else if($reqArgType===2){ else if($reqArgType===2){
$generalBasicList = $db->query('SELECT no, name, npc, turntime, value as %b $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, value as %b
FROM general LEFT JOIN rank_data FROM general LEFT JOIN rank_data
ON general.no = rank_data.general_id ON general.no = rank_data.general_id
WHERE rank_data.type = %b AND general.nation = %i', WHERE rank_data.type = %b AND general.nation = %i',
@@ -99,7 +99,7 @@ else if($reqArgType===3){
$generalBasicList = array_map(function($arr){ $generalBasicList = array_map(function($arr){
$arr['aux'] = Json::decode($arr['aux']); $arr['aux'] = Json::decode($arr['aux']);
return $arr; return $arr;
}, $db->query('SELECT no, name, npc, turntime, aux FROM general WHERE nation = %i', $nationID)); }, $db->query('SELECT no, name, npc, turntime, officer_level, aux FROM general WHERE nation = %i', $nationID));
} }
else{ else{
throw new \sammo\MustNotBeReachedException(); throw new \sammo\MustNotBeReachedException();
@@ -145,7 +145,7 @@ $showGeneral = General::createGeneralObjFromDB($gen);
대상장수 : 대상장수 :
<select name=gen size=1> <select name=gen size=1>
<?php foreach($generalBasicList as $general): ?> <?php foreach($generalBasicList as $general): ?>
<option <?=$gen==$general['no']?'selected':''?> value='<?=$general['no']?>'><?=$general['name']?> (<?=substr($general['turntime'], 14, 5)?>)</option> <option <?=$gen==$general['no']?'selected':''?> value='<?=$general['no']?>'><?=$general['officer_level']>4?"*{$general['name']}*":$general['name']?> (<?=substr($general['turntime'], 14, 5)?>)</option>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
<input type=submit name=btn value='조회하기'> <input type=submit name=btn value='조회하기'>
hwe/sammo/Command/General/che_군량매매.php
+1 -1
View File
@@ -148,7 +148,7 @@ class che_군량매매 extends Command\GeneralCommand{
} }
$general->increaseVar($buyKey, $buyAmount); $general->increaseVar($buyKey, $buyAmount);
$general->increaseVarWithLimit($sellKey, $sellAmount, 0); $general->increaseVarWithLimit($sellKey, -$sellAmount, 0);
$db->update('nation', [ $db->update('nation', [
'gold'=>$db->sqleval('gold + %i', $tax) 'gold'=>$db->sqleval('gold + %i', $tax)