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

storage의 isunited 변수 문제

Browse Source
This commit is contained in:
Hide_D
2018-06-14 01:49:15 +09:00
parent fff6b4e155
commit 40a953aed5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+4 -4
View File
@@ -1540,7 +1540,7 @@ function checkTurn() {
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', 진입');
//천통시에는 동결
if($gameStor->isUnited == 2) {
if($gameStor->isunited == 2) {
$db->update('plock', ['plock'=>1], true);
return;
}
@@ -1901,7 +1901,7 @@ function updateTurntime($no) {
$alllog = [];
$log = [];
$admin = $gameStor->getValues(['year', 'month', 'isUnited', 'turnterm']);
$admin = $gameStor->getValues(['year', 'month', 'isunited', 'turnterm']);
$query = "select no,name,name2,nation,troop,age,turntime,killturn,level,deadyear,npc,npc_org,affinity,npcid from general where no='$no'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1920,7 +1920,7 @@ function updateTurntime($no) {
$alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name2']}</>{$josaYi} <Y>{$general['name']}</>의 육체에서 <S>유체이탈</>합니다!";
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
if($admin['isUnited'] == 0) {
if($admin['isunited'] == 0) {
CheckHall($no);
}
} else {
@@ -2039,7 +2039,7 @@ function updateTurntime($no) {
}
if($general['age'] >= 80 && $general['npc'] == 0) {
if($admin['isUnited'] == 0) {
if($admin['isunited'] == 0) {
CheckHall($no);
}
hwe/func_gamerule.php
+3 -3
View File
@@ -1100,13 +1100,13 @@ function checkEmperior() {
$gameStor = KVStorage::getStorage($db, 'game_env');
$connect=$db->get();
$admin = $gameStor->getValues(['year', 'month', 'isUnited']);
$admin = $gameStor->getValues(['year', 'month', 'isunited']);
$query = "select nation,name from nation where level>0";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
if($count == 1 && $admin['isUnited'] == 0) {
if($count == 1 && $admin['isunited'] == 0) {
$nation = MYDB_fetch_array($result);
$query = "select city from city where nation='{$nation['nation']}'";
@@ -1123,7 +1123,7 @@ function checkEmperior() {
pushNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일");
$gameStor->isUnited = 2;
$gameStor->isunited = 2;
$gameStor->conlimit = $gameStor->conlimit*100;
$query = "select no from general where npc<2 and age>=45";
src/sammo/Session.php
+1 -1
View File
@@ -244,7 +244,7 @@ class Session
}
$turnterm = $gameStor->turnterm;
$isUnited = $gameStor->isUnited != 0;
$isUnited = $gameStor->isunited != 0;
$generalID = $general['no'];
$generalName = $general['name'];