feat,refac: General 테이블의 벌점(갱신) 항목을 별도 테이블로 분리 #232

Merged
Hide_D merged 21 commits from general_access_log into devel 2023-07-08 18:10:54 +09:00
2 changed files with 21 additions and 8 deletions
Showing only changes of commit ea80b85b33 - Show all commits
+14 -8
View File
@@ -5,6 +5,7 @@ namespace sammo;
use DateTime;
use Ds\Set;
use sammo\Enums\AuctionType;
use sammo\Enums\GeneralAccessLogColumn;
use sammo\Enums\InheritanceKey;
use sammo\Enums\RankColumn;
@@ -998,7 +999,8 @@ function increaseRefresh($type = "", $cnt = 1)
$generalID = $session->generalID;
$userGrade = $session->userGrade;
$date = TimeUtil::now();
$dateObj = new \DateTimeImmutable();
$date = TimeUtil::format($dateObj, false);
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
@@ -1020,13 +1022,17 @@ function increaseRefresh($type = "", $cnt = 1)
$gameStor->refresh = $gameStor->refresh + $cnt; //TODO: +로 증가하는 값은 별도로 분리
$db->update('general', [
'lastrefresh' => $date,
'con' => $db->sqleval('con + %i', $cnt),
'connect' => $db->sqleval('connect + %i', $cnt),
'refcnt' => $db->sqleval('refcnt + %i', $cnt),
'refresh' => $db->sqleval('refresh + %i', $cnt)
], 'owner=%i', $userID);
$db->insertUpdate('general_access_log', [
GeneralAccessLogColumn::generalID->value => $generalID,
GeneralAccessLogColumn::userID->value => $userID,
GeneralAccessLogColumn::lastRefresh->value => $date,
GeneralAccessLogColumn::refreshTotal->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshTotal->value, $cnt),
GeneralAccessLogColumn::refresh->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refresh->value, $cnt),
], [
GeneralAccessLogColumn::lastRefresh->value => $date,
GeneralAccessLogColumn::refreshTotal->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshTotal->value, $cnt),
GeneralAccessLogColumn::refresh->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refresh->value, $cnt),
]);
$serverPath = __DIR__;
+7
View File
@@ -4,6 +4,7 @@ namespace sammo;
use Ds\Map;
use sammo\Command\GeneralCommand;
use sammo\Enums\GeneralAccessLogColumn;
use sammo\Enums\InheritanceKey;
use sammo\Enums\RankColumn;
use sammo\WarUnitTrigger as WarUnitTrigger;
@@ -792,6 +793,12 @@ class General implements iAction
'nation_id' => $updateVals['nation']
], 'general_id = %i', $generalID);
$result = true;
if($this->getNPCType() < 2){
$db->update('general_access_log', [
GeneralAccessLogColumn::nationID->value => $updateVals['nation']
], '%b = %i', GeneralAccessLogColumn::generalID->value, $generalID);
}
}
$this->flushUpdateValues();
}