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

feat: 나중을 위해 plock에 GAME, TOURNAMENT, ETC 사전 생성

Browse Source
This commit is contained in:
Hide_D
2022-04-25 01:02:23 +09:00
parent 889c524049
commit 1a5ba02b4a
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/_119.php
+1 -1
View File
@@ -14,7 +14,7 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
[$turntime, $tnmt_time] = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
$plock = $db->queryFirstField('SELECT plock FROM plock');
$plock = $db->queryFirstField('SELECT plock FROM plock WHERE `type` ="GAME"');
?>
<!DOCTYPE html>
<html>
hwe/func.php
+5 -4
View File
@@ -472,7 +472,8 @@ function getCommandTable(General $general)
return $result;
}
function getChiefCommandTable(General $general){
function getChiefCommandTable(General $general)
{
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
$gameStor->turnOnCache();
@@ -1121,7 +1122,7 @@ function CheckOverhead()
function isLock()
{
return DB::db()->queryFirstField("SELECT plock from plock limit 1") != 0;
return DB::db()->queryFirstField("SELECT plock from plock WHERE `type`='GAME'") != 0;
}
function tryLock(): bool
@@ -1133,7 +1134,7 @@ function tryLock(): bool
$db->update('plock', [
'plock' => 1,
'locktime' => TimeUtil::now(true)
], 'plock=0');
], 'plock=0 AND type="GAME"');
return $db->affectedRows() > 0;
}
@@ -1144,7 +1145,7 @@ function unlock(): bool
$db = DB::db();
$db->update('plock', [
'plock' => 0
], true);
], 'type="GAME"');
return $db->affectedRows() > 0;
}
hwe/index.php
+1 -1
View File
@@ -47,7 +47,7 @@ if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
], 'owner=%i', $userID);
}
$plock = boolval($db->queryFirstField('SELECT plock FROM plock LIMIT 1'));
$plock = boolval($db->queryFirstField('SELECT plock FROM plock WHERE `type`="GAME" LIMIT 1'));
$con = checkLimit($me['con']);
if ($con >= 2) {
hwe/sammo/ResetHelper.php
+10
View File
@@ -196,6 +196,16 @@ class ResetHelper{
'plock'=>1,
'locktime'=>TimeUtil::now(true)
]);
$db->insert('plock', [
'type'=>'TOURNAMENT',
'plock'=>1,
'locktime'=>TimeUtil::now(true)
]);
$db->insert('plock', [
'type'=>'ETC',
'plock'=>1,
'locktime'=>TimeUtil::now(true)
]);
$prevWinner = $db->queryFirstField('SELECT l12name FROM emperior ORDER BY `no` DESC LIMIT 1');
$serverCnt = $db->queryFirstField('SELECT count(*) FROM ng_games') + 1;
src/sammo/Session.php
+1 -1
View File
@@ -278,7 +278,7 @@ class Session
$deadTime = $nextTurn + $general['killturn'] * $turnterm;
if ($deadTime < $now && !$isUnited) {
$locked = $db->queryFirstField('SELECT plock FROM plock LIMIT 1');
$locked = $db->queryFirstField('SELECT plock FROM plock WHERE `type` = "GAME" LIMIT 1');
if (!$locked) {
if ($result !== null) {
$result = false;