diff --git a/hwe/j_select_npc.php b/hwe/j_select_npc.php index e77ebda4..88ddcc71 100644 --- a/hwe/j_select_npc.php +++ b/hwe/j_select_npc.php @@ -1,6 +1,8 @@ update('general', [ 'owner'=>$userID, 'aux'=>Json::encode($genAux) ], 'owner <= 0 AND npc = 2 AND no = %i', $pick); +$db->insertIgnore('general_access_log', [ + GeneralAccessLogColumn::generalID->value => $generalID, + GeneralAccessLogColumn::userID->value => $userID, + GeneralAccessLogColumn::lastRefresh->value => $now, +]); if(!$db->affectedRows()){ Json::die([ diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php index 1980238a..96599797 100644 --- a/hwe/sammo/General.php +++ b/hwe/sammo/General.php @@ -678,6 +678,7 @@ class General implements iAction $db->delete('general', 'no=%i', $generalID); $db->delete('general_turn', 'general_id=%i', $generalID); $db->delete('rank_data', 'general_id=%i', $generalID); + $db->delete('general_access_log', 'general_id=%i', $generalID); $this->updatedVar = []; $db->update('nation', [ diff --git a/hwe/sammo/TurnExecutionHelper.php b/hwe/sammo/TurnExecutionHelper.php index 5621ce2b..ca17ad71 100644 --- a/hwe/sammo/TurnExecutionHelper.php +++ b/hwe/sammo/TurnExecutionHelper.php @@ -196,6 +196,8 @@ class TurnExecutionHelper $general->setVar('owner', 0); $general->setVar('defence_train', 80); $general->setVar('owner_name', null); + + $db->delete('general_access_log', 'general_id=%i', $generalID); } else { $general->applyDB($db); $general->kill($db); diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql index ba20a63b..70f29443 100644 --- a/hwe/sql/schema.sql +++ b/hwe/sql/schema.sql @@ -11,8 +11,6 @@ CREATE TABLE `general` ( `bornyear` INT(3) NULL DEFAULT '180', `deadyear` INT(3) NULL DEFAULT '300', `newmsg` INT(1) NULL DEFAULT '0', - `con` INT(6) NOT NULL DEFAULT '0', - `connect` INT(6) NOT NULL DEFAULT '0', `picture` VARCHAR(40) NOT NULL, `imgsvr` INT(1) NOT NULL DEFAULT '0', `name` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_bin',