JSON -> Json
- 대체 왜 어떤 파일에는 에러가 나지 않았는가
This commit is contained in:
+2
-2
@@ -1054,10 +1054,10 @@ function increaseRefresh($type = "", $cnt = 1)
|
||||
'ip' => $ip,
|
||||
'date' => $date,
|
||||
'path' => "refresh",
|
||||
'arg' => JSON::encode([
|
||||
'arg' => Json::encode([
|
||||
'type' => $type,
|
||||
]),
|
||||
'aux' => JSON::encode([
|
||||
'aux' => Json::encode([
|
||||
'generalID' => $generalID,
|
||||
'generalName' => $session->generalName,
|
||||
'userName' => $session->userName,
|
||||
|
||||
@@ -213,7 +213,7 @@ function _setGeneralCommand(GeneralCommand $command, array $turnList):void {
|
||||
|
||||
$db->update('general_turn', [
|
||||
'action'=>$commandName,
|
||||
'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
|
||||
'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
|
||||
'brief'=>$brief
|
||||
], 'general_id = %i AND turn_idx IN %li', $generalID, $turnList);
|
||||
}
|
||||
@@ -233,7 +233,7 @@ function _setNationCommand(NationCommand $command, array $turnList):void {
|
||||
|
||||
$db->update('nation_turn', [
|
||||
'action'=>$commandName,
|
||||
'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
|
||||
'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
|
||||
'brief'=>$brief
|
||||
], 'nation_id = %i AND officer_level = %i AND turn_idx IN %li', $nationID, $officerLevel, $turnList);
|
||||
}
|
||||
|
||||
@@ -899,7 +899,7 @@ function checkEmperior()
|
||||
'tiger' => $tigerstr,
|
||||
'eagle' => $eaglestr,
|
||||
'gen' => $gen,
|
||||
'history' => JSON::encode($nationHistory),
|
||||
'history' => Json::encode($nationHistory),
|
||||
'aux' => $statGeneral['aux']
|
||||
]);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ if(!$member){
|
||||
}
|
||||
|
||||
$userNick = $member['name'];
|
||||
$memberPenalty = JSON::decode($member['penalty'] ?? '{}');
|
||||
$memberPenalty = Json::decode($member['penalty'] ?? '{}');
|
||||
$penalty = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
|
||||
|
||||
$pickResult = $db->queryFirstField('SELECT pick_result FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
|
||||
|
||||
@@ -155,7 +155,7 @@ class Join extends \sammo\BaseAPI
|
||||
return "잘못된 접근입니다!!!";
|
||||
}
|
||||
|
||||
$memberPenalty = JSON::decode($member['penalty'] ?? "{}");
|
||||
$memberPenalty = Json::decode($member['penalty'] ?? "{}");
|
||||
$penalty = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
|
||||
|
||||
$db = DB::db();
|
||||
|
||||
@@ -172,7 +172,7 @@ class SendMessage extends \sammo\BaseAPI
|
||||
return '장수가 없습니다.';
|
||||
}
|
||||
|
||||
$penalty = JSON::decode($me['penalty'] ?? '{}');
|
||||
$penalty = Json::decode($me['penalty'] ?? '{}');
|
||||
|
||||
$limitState = checkLimit($me['refresh_score']);
|
||||
if ($limitState >= 2) {
|
||||
|
||||
@@ -313,7 +313,7 @@ class GeneralList extends \sammo\BaseAPI
|
||||
foreach ($rawGeneralList as $rawGeneral) {
|
||||
//General 생성?
|
||||
if (key_exists('aux', $rawGeneral)) {
|
||||
$rawGeneral['aux'] = \sammo\JSON::decode($rawGeneral['aux']);
|
||||
$rawGeneral['aux'] = \sammo\Json::decode($rawGeneral['aux']);
|
||||
}
|
||||
|
||||
$item = [];
|
||||
|
||||
Reference in New Issue
Block a user