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

버그 수정

Browse Source
This commit is contained in:
Hide_D
2019-04-28 01:54:44 +09:00
parent d398f903f8
commit 723150b755
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_command.php
+6 -6
View File
@@ -44,7 +44,7 @@ function pushGeneralCommand(int $generalID, int $turnCnt=1){
'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxTurn),
'action'=>'휴식',
'arg'=>'{}'
], 'general_id=%i AND turn_idx >= %i', $generalID, GameConst::$maxTurn);
], 'general_id=%i AND turn_idx >= %i ORDER BY turn_idx ASC', $generalID, GameConst::$maxTurn);
}
function pullGeneralCommand(int $generalID, int $turnCnt=1){
@@ -67,7 +67,7 @@ function pullGeneralCommand(int $generalID, int $turnCnt=1){
], 'general_id=%i AND turn_idx < %i', $generalID, $turnCnt);
$db->update('general_turn', [
'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt)
], 'general_id=%i', $generalID);
], 'general_id=%i ORDER BY turn_idx ASC', $generalID);
}
function pushNationCommand(int $nationID, int $level, int $turnCnt=1){
@@ -89,14 +89,14 @@ function pushNationCommand(int $nationID, int $level, int $turnCnt=1){
$db = DB::db();
$db->update('general_turn', [
$db->update('nation_turn', [
'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt)
], 'nation_id=%i AND level=%i', $nationID, $level);
$db->update('general_turn', [
$db->update('nation_turn', [
'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxChiefTurn),
'action'=>'휴식',
'arg'=>'{}'
], 'nation_id=%i AND level=%i AND turn_idx >= %i', $nationID, $level, GameConst::$maxChiefTurn);
], 'nation_id=%i AND level=%i AND turn_idx >= %i ORDER BY turn_idx ASC', $nationID, $level, GameConst::$maxChiefTurn);
}
function pullNationCommand(int $nationID, int $level, int $turnCnt=1){
@@ -125,7 +125,7 @@ function pullNationCommand(int $nationID, int $level, int $turnCnt=1){
], 'nation_id=%i AND level=%i AND turn_idx < %i', $nationID, $level, $turnCnt);
$db->update('nation_turn', [
'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt)
], 'nation_id=%i AND level=%i', $nationID, $level);
], 'nation_id=%i AND level=%i ORDER BY turn_idx ASC', $nationID, $level);
}
function _setGeneralCommand(int $generalID, array $turnList, string $command, ?array $arg = null) {