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

버그 수정

Browse Source
This commit is contained in:
Hide_D
2019-09-21 01:38:29 +09:00
parent 7bebbe3a16
commit 45ed63ffe3
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+13 -6
View File
@@ -1618,10 +1618,13 @@ function checkTurn() {
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand'); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand');
PreprocessCommand($general['no']); PreprocessCommand($general['no']);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI'); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
$reduce_turn = false;
if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) { processAI($general['no']); } // npc AI 처리 if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) {
processAI($general['no']);
$reduce_turn = true;
} // npc AI 처리
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand'); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand');
processCommand($general['no']); processCommand($general['no'], $reduce_turn);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand'); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand');
updateCommand($general['no']); updateCommand($general['no']);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime'); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime');
@@ -1733,12 +1736,16 @@ function checkTurn() {
//if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이후 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})"; //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이후 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})";
//if(PROCESS_LOG) pushProcessLog($processlog); //if(PROCESS_LOG) pushProcessLog($processlog);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
if($general['npc'] >= 2) { processAI($general['no']); } // npc AI 처리
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand'); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand');
PreprocessCommand($general['no']); PreprocessCommand($general['no']);
$reduce_turn = false;
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) {
processAI($general['no']);
$reduce_turn = true;
} // npc AI 처리
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand'); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand');
processCommand($general['no']); processCommand($general['no'], $reduce_turn);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand'); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand');
updateCommand($general['no']); updateCommand($general['no']);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime'); //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime');
hwe/func_command.php
+3 -1
View File
@@ -483,7 +483,7 @@ function getCoreTurn($nation, $level) {
} }
function processCommand($no) { function processCommand($no, $reduceTurn) {
$session = Session::getInstance(); $session = Session::getInstance();
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -561,6 +561,8 @@ function processCommand($no) {
$newKillturn = $general['killturn'] - 1; $newKillturn = $general['killturn'] - 1;
} elseif($command[0] == 0) { } elseif($command[0] == 0) {
$newKillturn = $general['killturn'] - 1; $newKillturn = $general['killturn'] - 1;
} elseif($reduceTurn = true){
$newKillturn = $general['killturn'] - 1;
} else { } else {
$newKillturn = $killturn; $newKillturn = $killturn;
} }
hwe/func_npc.php
-3
View File
@@ -274,7 +274,6 @@ function processAI($no) {
} }
$query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,train,atmos,troop,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'"; $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,train,atmos,troop,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
$result = MYDB_query($query, $connect) or Error("processAI01 ".MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error("processAI01 ".MYDB_error($connect),"");
$general = MYDB_fetch_array($result); $general = MYDB_fetch_array($result);
@@ -321,7 +320,6 @@ function processAI($no) {
} }
$autorun_user = $admin['autorun_user']; $autorun_user = $admin['autorun_user'];
if($general['npc'] < 2){ if($general['npc'] < 2){
$autorun_limit_minutes = $autorun_user['limit_minutes']??0; $autorun_limit_minutes = $autorun_user['limit_minutes']??0;
if(!$autorun_limit_minutes){ if(!$autorun_limit_minutes){
@@ -343,7 +341,6 @@ function processAI($no) {
$allowedAction = new AIAllowedAction($general['npc'], $autorun_user['options']??[]); $allowedAction = new AIAllowedAction($general['npc'], $autorun_user['options']??[]);
$query = "select city,region,nation,level,path,rate,gen1,gen2,gen3,pop,supply,front from city where city='{$general['city']}'"; $query = "select city,region,nation,level,path,rate,gen1,gen2,gen3,pop,supply,front from city where city='{$general['city']}'";
$result = MYDB_query($query, $connect) or Error("processAI02 ".MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error("processAI02 ".MYDB_error($connect),"");
$city = MYDB_fetch_array($result); $city = MYDB_fetch_array($result);
hwe/j_install.php
+1 -1
View File
@@ -132,7 +132,7 @@ if($autorun_user_minutes < 0){
$autorun_user = $autorun_user_minutes?[ $autorun_user = $autorun_user_minutes?[
'limit_minutes'=>$autorun_user_minutes, 'limit_minutes'=>$autorun_user_minutes,
'option'=>$autorun_user_options 'options'=>$autorun_user_options
]:null; ]:null;
if($reserve_open){ if($reserve_open){