From 2037e9b6af0e6d84021b59cabd8a034a5dafd651 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 27 Jan 2018 06:18:07 +0900 Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i_other/help.php | 2 +- twe/d_scout.php | 6 ++++++ twe/func.php | 10 +++++++++- twe/func_process.php | 3 +++ twe/process_war.php | 4 ++++ twe/processing.php | 7 +++++-- 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/i_other/help.php b/i_other/help.php index 9b11f46d..8e3e85bf 100644 --- a/i_other/help.php +++ b/i_other/help.php @@ -730,7 +730,7 @@ if($category == 0) { 　☞소집해제: 현재 소유중인 병사를 해체하고 주민으로 돌려보냅니다.
　---------- 인 사 ----------
　☞　　이동: 인접 도시로 이동합니다.
-　☞　　등용: 재야나 타국의 장수를 등용합니다. 서신은 개인메세지로 도착하며 상대 장수가 수락,거절을 하게 됩니다.
+　 　☞　　집합: 현재 도시로 부대원들을 집합합니다. 부대장만 가능합니다.
　☞　　귀환: 태수, 군사, 시중인 경우 자신의 도시로 귀환합니다.
　☞　　임관: 국가에 사관을 합니다. 대상 국가의 군주가 있는 장소로 바로 이동합니다. 재야만 가능합니다.
diff --git a/twe/d_scout.php b/twe/d_scout.php index 95160cc6..cb60b92e 100644 --- a/twe/d_scout.php +++ b/twe/d_scout.php @@ -1,7 +1,13 @@ location.replace('msglist.php');"); + include "lib.php"; include "func.php"; //로그인 검사 + CheckLogin(1); $connect = dbConn(); diff --git a/twe/func.php b/twe/func.php index fe11774f..e00ae639 100644 --- a/twe/func.php +++ b/twe/func.php @@ -1438,6 +1438,7 @@ function getTurn($connect, $general, $type, $font=1) { $str[$i] = "【{$city['name']}】(으)로 이동"; break; case 22: //등용 + //TODO:등용장 재디자인 $double = $command[1]; $query = "select name from general where no='$double'"; @@ -2299,11 +2300,15 @@ function commandTable($connect) { } else { addCommand("인재탐색(랜덤경험, 자금$develcost)", 29, 0); } + //TODO:등용장 재 디자인 + //xxx:등용장 일단 끔 + /* if($me['level'] >= 1 && $city['supply'] != 0) { addCommand("등용(자금{$develcost5}+장수가치)", 22); } else { addCommand("등용(자금{$develcost5}+장수가치)", 22, 0); } + */ if($me['no'] == $troop['no'] && $citycount > 0 && $city['supply'] != 0 && $city['nation'] == $me['nation']) { addCommand("집합(통솔경험)", 26); } else { @@ -5474,7 +5479,7 @@ function processCommand($connect, $no) { case 17: process_17($connect, $general); break; //소집해제 case 21: process_21($connect, $general); break; //이동 - case 22: process_22($connect, $general); break; //등용 + //case 22: process_22($connect, $general); break; //등용 //TODO:등용장 재 디자인 case 25: process_25($connect, $general); break; //임관 case 26: process_26($connect, $general); break; //집합 case 28: process_28($connect, $general); break; //귀환 @@ -7205,6 +7210,9 @@ function getRandTurn2($term) { } function ScoutMsg($connect, $genNum, $nationName, $who, $msgIndex) { + return; + //TODO: 등용장 재 디자인. + //xxx: 일단 껐음 // 상대에게 발송 $msgIndex++; if($msgIndex >= 10) { $msgIndex = 0; } diff --git a/twe/func_process.php b/twe/func_process.php index 7a9fe355..019e12f0 100644 --- a/twe/func_process.php +++ b/twe/func_process.php @@ -1319,6 +1319,9 @@ function process_21($connect, &$general) { } function process_22($connect, &$general) { + return; + //TODO: 등용장 재 디자인 + //xxx: 일단 등용장 끔 $log = array(); $alllog = array(); $date = substr($general['turntime'],11,5); diff --git a/twe/process_war.php b/twe/process_war.php index 11188a94..905a145f 100644 --- a/twe/process_war.php +++ b/twe/process_war.php @@ -1666,6 +1666,9 @@ function ConquerCity($connect, $game, $general, $city, $nation, $destnation) { $loseGeneralGold += $loseGold; $loseGeneralRice += $loseRice; + /* + //TODO:등용장 재디자인 + //xxx: 일단 끔 //모두 등용장 발부 if($nation['name'] == "강족" || $nation['name'] == "저족" || $nation['name'] == "흉노족" || $nation['name'] == "남만족" || $nation['name'] == "산월족" || $nation['name'] == "오환족" @@ -1674,6 +1677,7 @@ function ConquerCity($connect, $game, $general, $city, $nation, $destnation) { } elseif(rand() % 100 < 50) { ScoutMsg($connect, $ruler['no'], $nation['name'], $gen['no'], $gen['msgindex']); } + */ //NPC인 경우 10% 확률로 임관(엔장, 인재, 의병) if($gen['npc'] >= 2 && $gen['npc'] <= 4 && rand() % 100 < 10) { diff --git a/twe/processing.php b/twe/processing.php index 4a1ce5a4..2fd01070 100644 --- a/twe/processing.php +++ b/twe/processing.php @@ -43,12 +43,12 @@ switch($commandtype) { case 12: command_12($connect, $turn, 12); break; //모병 case 13: command_Single($connect, $turn, 13); break; //훈련 case 14: command_Single($connect, $turn, 14); break; //사기진작 - case 15: command_Single($connect, $turn, 0); break; //전투태세 + //case 15: command_Single($connect, $turn, 0); break; //전투태세 case 16: command_16($connect, $turn, 16); break; //전쟁 case 17: command_Single($connect, $turn, 17); break; //소집해제 case 21: command_21($connect, $turn, 21); break; //이동 - case 22: command_22($connect, $turn, 22); break; //등용 + //case 22: command_22($connect, $turn, 22); break; //등용 //TODO:등용장 재 디자인 case 23: command_23($connect, $turn, 23); break; //포상 case 24: command_24($connect, $turn, 24); break; //몰수 case 25: command_25($connect, $turn, 25); break; //임관 @@ -102,6 +102,8 @@ switch($commandtype) { case 78: command_78($connect, $turn, 78); break; //급습 case 81: command_81($connect, $turn, 81); break; //국기변경 case 99: command_99($connect, $turn); break; //수뇌부 휴식 + + default:command_Single($connect, $turn, 0); break; //휴식 } function starter($name, $type=0) { @@ -1189,6 +1191,7 @@ function command_21($connect, $turn, $command) { } function command_22($connect, $turn, $command) { + die('비활성화됨');//TODO:등용장 대 디자인 starter("등용"); $query = "select nation from general where user_id='{$_SESSION['p_id']}'";