devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests 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
f_install/templates/RootDB.orig.php
+1 -1
View File
@@ -30,7 +30,7 @@ class RootDB
self::$uDB = new \MeekroDB(self::$host, self::$user, self::$password, self::$dbName, self::$port, self::$encoding); self::$uDB = new \MeekroDB(self::$host, self::$user, self::$password, self::$dbName, self::$port, self::$encoding);
self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true; self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
self::$uDB->error_handler= function(){}; self::$uDB->error_handler= false;
self::$uDB->throw_exception_on_error = true; self::$uDB->throw_exception_on_error = true;
self::$uDB->throw_exception_on_nonsql_error = true; self::$uDB->throw_exception_on_nonsql_error = true;
} }
hwe/d_setting/DB.orig.php
+1 -1
View File
@@ -28,7 +28,7 @@ class DB{
self::$uDB = new \MeekroDB(self::$host,self::$user,self::$password,self::$dbName,self::$port,self::$encoding); self::$uDB = new \MeekroDB(self::$host,self::$user,self::$password,self::$dbName,self::$port,self::$encoding);
self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true; self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
self::$uDB->error_handler= function(){}; self::$uDB->error_handler= false;
self::$uDB->throw_exception_on_error = true; self::$uDB->throw_exception_on_error = true;
self::$uDB->throw_exception_on_nonsql_error = true; self::$uDB->throw_exception_on_nonsql_error = true;
} }
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), 'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxTurn),
'action'=>'휴식', 'action'=>'휴식',
'arg'=>'{}' '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){ 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); ], 'general_id=%i AND turn_idx < %i', $generalID, $turnCnt);
$db->update('general_turn', [ $db->update('general_turn', [
'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt) '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){ 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 = DB::db();
$db->update('general_turn', [ $db->update('nation_turn', [
'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt) 'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt)
], 'nation_id=%i AND level=%i', $nationID, $level); ], '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), 'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxChiefTurn),
'action'=>'휴식', 'action'=>'휴식',
'arg'=>'{}' '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){ 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); ], 'nation_id=%i AND level=%i AND turn_idx < %i', $nationID, $level, $turnCnt);
$db->update('nation_turn', [ $db->update('nation_turn', [
'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt) '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) { function _setGeneralCommand(int $generalID, array $turnList, string $command, ?array $arg = null) {
hwe/sammo/Command/General/che_거병.php
+4 -1
View File
@@ -119,7 +119,10 @@ class che_거병 extends Command\GeneralCommand{
'term'=>0, 'term'=>0,
]; ];
} }
$db->insert('diplomacy', $diplomacyInit); if($diplomacyInit){
$db->insert('diplomacy', $diplomacyInit);
}
$turnRows = []; $turnRows = [];
hwe/sammo/ResetHelper.php
+3 -1
View File
@@ -113,6 +113,7 @@ class ResetHelper{
} }
(KVStorage::getStorage($db, 'game_env'))->resetValues(); (KVStorage::getStorage($db, 'game_env'))->resetValues();
(KVStorage::getStorage($db, 'nation_env'))->resetValues();
return [ return [
'result'=>true, 'result'=>true,
@@ -238,7 +239,8 @@ class ResetHelper{
'extended_general'=>$extend, 'extended_general'=>$extend,
'fiction'=>$fiction, 'fiction'=>$fiction,
'tnmt_trig'=>$tournament_trig, 'tnmt_trig'=>$tournament_trig,
'prev_winner'=>$prevWinner 'prev_winner'=>$prevWinner,
'tournament'=>0,
]; ];
foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){ foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){