From c0dfd427912ed667802f64f7fd28978a003aa3b6 Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 2 Mar 2018 00:05:37 +0900 Subject: [PATCH] =?UTF-8?q?pushHistory=EC=97=90=20DB=20connect=EA=B0=80=20?= =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9C=BC?= =?UTF-8?q?=EB=AF=80=EB=A1=9C=20=EC=9D=B8=EC=9E=90=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- twe/_admin1_submit.php | 4 ++-- twe/d_ally.php | 2 +- twe/d_cancel.php | 2 +- twe/d_cease.php | 2 +- twe/d_merge.php | 2 +- twe/d_scout.php | 2 +- twe/d_surrender.php | 2 +- twe/event_1.php | 2 +- twe/event_2.php | 2 +- twe/event_3.php | 2 +- twe/event_4.php | 2 +- twe/func.php | 9 +++++---- twe/func_auction.php | 4 ++-- twe/func_gamerule.php | 12 ++++++------ twe/func_process.php | 42 ++++++++++++++++++++--------------------- twe/func_time_event.php | 8 ++++---- twe/func_tournament.php | 4 ++-- twe/join_post.php | 2 +- twe/process_war.php | 10 +++++----- twe/scenario_1.php | 2 +- twe/scenario_10.php | 2 +- twe/scenario_11.php | 2 +- twe/scenario_12.php | 2 +- twe/scenario_2.php | 2 +- twe/scenario_20.php | 2 +- twe/scenario_21.php | 2 +- twe/scenario_22.php | 2 +- twe/scenario_23.php | 2 +- twe/scenario_24.php | 2 +- twe/scenario_25.php | 2 +- twe/scenario_26.php | 2 +- twe/scenario_27.php | 2 +- twe/scenario_28.php | 2 +- twe/scenario_3.php | 2 +- twe/scenario_4.php | 2 +- twe/scenario_5.php | 2 +- twe/scenario_6.php | 2 +- twe/scenario_7.php | 2 +- twe/scenario_8.php | 2 +- twe/scenario_9.php | 2 +- 40 files changed, 79 insertions(+), 78 deletions(-) diff --git a/twe/_admin1_submit.php b/twe/_admin1_submit.php index 8da670af..0c7f046c 100644 --- a/twe/_admin1_submit.php +++ b/twe/_admin1_submit.php @@ -30,7 +30,7 @@ switch($btn) { $lognum = $admin['historyindex'] + 1; if($lognum >= 29) { $lognum = 0; } $history[0] = "★{$log}"; - pushHistory($connect, $history); + pushHistory($history); break; case "변경1": $query = "update game set starttime='$starttime' where no='1'"; @@ -102,7 +102,7 @@ switch($btn) { } } $history[count($history)] = "★턴시간이 $btn으로 변경됩니다."; - pushHistory($connect, $history); + pushHistory($history); break; case "변경6": $query = "update game set att0='$att0',def0='$def0',spd0='$spd0',avd0='$avd0',ric0='$ric0',cst0='$cst0' where no='1'"; diff --git a/twe/d_ally.php b/twe/d_ally.php index 7d67ef7c..aae6951d 100644 --- a/twe/d_ally.php +++ b/twe/d_ally.php @@ -112,7 +112,7 @@ if($ok == "수락") { pushGenLog($me, $mylog); pushGenLog($you, $youlog); //pushAllLog($alllog); -//pushHistory($connect, $history); +//pushHistory($history); echo ""; diff --git a/twe/d_cancel.php b/twe/d_cancel.php index d98a6f41..e07bc2ac 100644 --- a/twe/d_cancel.php +++ b/twe/d_cancel.php @@ -91,7 +91,7 @@ if($ok == "수락") { pushGenLog($me, $mylog); pushGenLog($you, $youlog); pushAllLog($alllog); -pushHistory($connect, $history); +pushHistory($history); echo ""; diff --git a/twe/d_cease.php b/twe/d_cease.php index 796b4376..ea15742f 100644 --- a/twe/d_cease.php +++ b/twe/d_cease.php @@ -96,7 +96,7 @@ if($ok == "수락") { pushGenLog($me, $mylog); pushGenLog($you, $youlog); pushAllLog($alllog); -pushHistory($connect, $history); +pushHistory($history); echo ""; diff --git a/twe/d_merge.php b/twe/d_merge.php index 4b2e6cfc..9fe61deb 100644 --- a/twe/d_merge.php +++ b/twe/d_merge.php @@ -130,7 +130,7 @@ if($ok == "수락") { pushGenLog($me, $mylog); pushGenLog($you, $youlog); pushAllLog($alllog); -pushHistory($connect, $history); +pushHistory($history); echo ""; diff --git a/twe/d_scout.php b/twe/d_scout.php index 63e5b04a..1e261e38 100644 --- a/twe/d_scout.php +++ b/twe/d_scout.php @@ -162,7 +162,7 @@ if($ok == "수락" && $me['level'] < 12 && $nation['level'] > 0 && $nation['scou pushGenLog($me, $mylog); pushGenLog($you, $youlog); pushAllLog($alllog); -pushHistory($connect, $history); +pushHistory($history); echo ""; diff --git a/twe/d_surrender.php b/twe/d_surrender.php index 8f524d9a..4851e972 100644 --- a/twe/d_surrender.php +++ b/twe/d_surrender.php @@ -120,7 +120,7 @@ if($ok == "수락") { pushGenLog($me, $mylog); pushGenLog($you, $youlog); pushAllLog($alllog); -pushHistory($connect, $history); +pushHistory($history); echo ""; diff --git a/twe/event_1.php b/twe/event_1.php index cc84f1c4..da0856d2 100644 --- a/twe/event_1.php +++ b/twe/event_1.php @@ -197,7 +197,7 @@ MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【이벤트】각지의 이민족들이 궐기합니다!"; $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【이벤트】중원의 전 국가에 선전포고 합니다!"; $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【이벤트】이민족의 기세는 그 누구도 막을 수 없을듯 합니다!"; -pushHistory($connect, $history); +pushHistory($history); refreshNationStaticInfo(); diff --git a/twe/event_2.php b/twe/event_2.php index 71dff514..54ba25f9 100644 --- a/twe/event_2.php +++ b/twe/event_2.php @@ -201,7 +201,7 @@ MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【이벤트】각지의 오랑캐들이 궐기합니다!"; $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【이벤트】중원의 전 국가에 선전포고 합니다!"; $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【이벤트】그러나 중원의 영웅들이라면 막아낼 수도 있을법 해 보입니다!"; -pushHistory($connect, $history); +pushHistory($history); refreshNationStaticInfo(); diff --git a/twe/event_3.php b/twe/event_3.php index bc3b9a1f..edbcab68 100644 --- a/twe/event_3.php +++ b/twe/event_3.php @@ -62,7 +62,7 @@ for($k=1; $k <= 200; $k++) { //////////////////////////이벤트/////////////////////////////////////////////// $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【이벤트】각지에서 인재들이 등장합니다!"; $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【이벤트】중원 통일에 보탬이 될듯 합니다!"; -pushHistory($connect, $history); +pushHistory($history); echo ""; diff --git a/twe/event_4.php b/twe/event_4.php index 7c03d64d..ed252d7f 100644 --- a/twe/event_4.php +++ b/twe/event_4.php @@ -93,7 +93,7 @@ $log[0] = "●{$admin['month']}월:ⓝ유기체가 천하에 이름 pushAllLog($log); $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【이벤트】NPC 유기체가 등장합니다. 의병장과 NPC들의 지능 개선을 위해 NPC 두뇌를 체험합니다. 크게 신경쓰진 마세요."; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo './';//TODO:debug all and replace diff --git a/twe/func.php b/twe/func.php index ecc7792a..b7feca4b 100644 --- a/twe/func.php +++ b/twe/func.php @@ -16,6 +16,7 @@ require_once 'func_time_event.php'; require_once('func_template.php'); require_once('func_message.php'); require_once('func_map.php'); +require_once('func_diplomacy.php'); /** * 0.0~1.0 사이의 랜덤 float @@ -1763,7 +1764,7 @@ function pushAllLog($log) { } } -function pushHistory($connect, $history) { +function pushHistory($history) { $size = count($history); if($size > 0) { $fp = fopen("logs/_history.txt", "a"); @@ -3575,7 +3576,7 @@ function uniqueItem($connect, $general, $log, $vote=0) { break; } pushAllLog($alllog); - pushHistory($connect, $history); + pushHistory($history); } } return $log; @@ -3729,7 +3730,7 @@ function deleteNation($connect, $general) { $query = "delete from diplomacy where me='{$general['nation']}' or you='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - pushHistory($connect, $history); + pushHistory($history); refreshNationStaticInfo(); } @@ -3794,7 +3795,7 @@ function nextRuler($connect, $general) { $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【유지】{$nextruler['name']}(이)가 {$nation['name']}의 유지를 이어 받았습니다"; - pushHistory($connect, $history); + pushHistory($history); $nation = addNationHistory($connect, $nation, "●{$admin['year']}년 {$admin['month']}월:【유지】{$nextruler['name']}(이)가 {$nation['name']}의 유지를 이어 받음."); // 장수 삭제 및 부대처리는 checkTurn에서 } diff --git a/twe/func_auction.php b/twe/func_auction.php index 39588adb..56cb0d91 100644 --- a/twe/func_auction.php +++ b/twe/func_auction.php @@ -91,7 +91,7 @@ function registerAuction($connect) { $alllog[0] = "●{$admin['month']}월:".GetStuffName($stuff)."(이)가 거래장에 등장했습니다!"; $history[0] = "●{$admin['year']}년 {$admin['month']}월:【암시장】ⓝ암시장상인(이)가 ".GetStuffName($stuff)."(을)를 판다는 소문이 돌고 있습니다!"; pushAllLog($alllog); - pushHistory($connect, $history); + pushHistory($history); } } */ @@ -214,7 +214,7 @@ function processAuction($connect) { $alllog[0] = "●{$admin['month']}월:{$auction['name2']}(이)가 ".GetStuffName($auction['stuff'])."(을)를 구매했습니다!"; $history[0] = "●{$admin['year']}년 {$admin['month']}월:【암시장】{$auction['name2']}(이)가 ".GetStuffName($auction['stuff'])."(을)를 구매했습니다!"; pushAllLog($alllog); - pushHistory($connect, $history); + pushHistory($history); } pushGenLog($trader, $traderLog); pushGenLog($bidder, $bidderLog); diff --git a/twe/func_gamerule.php b/twe/func_gamerule.php index 140bd349..04d6f204 100644 --- a/twe/func_gamerule.php +++ b/twe/func_gamerule.php @@ -472,7 +472,7 @@ function preUpdateMonthly($connect) { $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【고립】{$city['name']}(이)가 보급이 끊겨 미지배 도시가 되었습니다."; } - pushHistory($connect, $history); + pushHistory($history); //민심30이하 공백지 처리 $query = "update city set nation='0',gen1='0',gen2='0',gen3='0',conflict='',conflict2='',term=0,front=0 where rate<='30' and supply='0'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -694,7 +694,7 @@ group by A.nation MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } } - pushHistory($connect, $history); + pushHistory($history); //사상자 초기화 $query = "update diplomacy set dead=0"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -867,7 +867,7 @@ function checkMerge($connect) { pushGenLog($me, $mylog); pushGenLog($you, $youlog); - pushHistory($connect, $history); + pushHistory($history); unset($mylog); unset($youlog); unset($history); @@ -987,7 +987,7 @@ function checkSurrender($connect) { pushGenLog($me, $mylog); pushGenLog($you, $youlog); - pushHistory($connect, $history); + pushHistory($history); unset($mylog); unset($youlog); unset($history); @@ -1071,7 +1071,7 @@ function updateNationState($connect) { $query = "update nation set tech=totaltech/'$gencount',gennum='$gennum' where nation='{$nation['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } - pushHistory($connect, $history); + pushHistory($history); } function checkStatistic($connect) { @@ -1356,7 +1356,7 @@ function checkEmperior($connect) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $history[count($history)] = "●{$admin['year']}년 {$admin['month']}월:【통일】{$nation['name']}(이)가 전토를 통일하였습니다."; - pushHistory($connect, $history); + pushHistory($history); //연감 월결산 LogHistory(); diff --git a/twe/func_process.php b/twe/func_process.php index 00eba11c..4a13efcb 100644 --- a/twe/func_process.php +++ b/twe/func_process.php @@ -1406,7 +1406,7 @@ function process_22($connect, &$general) { // 성격 보정 $exp = CharExperience($exp, $general['personal']); $ded = CharDedication($ded, $general['personal']); - + sendScoutMsg([ 'id' => $general['no'], 'nation_id' => util::array_get($general['nation'], 0) @@ -3671,7 +3671,7 @@ function process_46($connect, &$general) { $log = uniqueItem($connect, $general, $log, 3); } - pushHistory($connect, $history); + pushHistory($history); pushAllLog($alllog); pushGenLog($general, $log); } @@ -3729,7 +3729,7 @@ function process_47($connect, &$general) { $query = "update diplomacy set state='2',term='0' where me='{$general['nation']}' or you='{$general['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - pushHistory($connect, $history); + pushHistory($history); refreshNationStaticInfo(); } @@ -4167,7 +4167,7 @@ function process_52($connect, &$general) { // $log = checkAbility($connect, $general, $log); } - pushHistory($connect, $history); + pushHistory($history); pushGenLog($general, $log); } @@ -4293,7 +4293,7 @@ function process_54($connect, &$general) { } pushGenLog($general, $log); pushGenLog($nextruler, $youlog); - pushHistory($connect, $history); + pushHistory($history); } function process_55($connect, &$general) { @@ -4367,7 +4367,7 @@ function process_55($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } } - pushHistory($connect, $history); + pushHistory($history); pushAllLog($alllog); pushGenLog($general, $log); } @@ -4482,7 +4482,7 @@ function process_57($connect, &$general) { pushGenLog($general, $log); pushGenLog($ruler, $youlog); pushAllLog($alllog); - pushHistory($connect, $history); + pushHistory($history); } function process_61($connect, &$general) { @@ -4659,7 +4659,7 @@ function process_62($connect, &$general) { PushMsg(3, $younation['nation'], $general['picture'], $general['imgsvr'], "{$general['name']}:{$nation['name']}▶", $nation['color'], $younation['name'], $younation['color'], $youmsg); } - pushHistory($connect, $history); + pushHistory($history); pushAllLog($alllog); pushGenLog($general, $log); } @@ -4877,7 +4877,7 @@ function process_65($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } - pushHistory($connect, $history); + pushHistory($history); pushAllLog($alllog); pushGenLog($general, $log); } @@ -4964,7 +4964,7 @@ function process_66($connect, &$general) { refreshNationStaticInfo(); } - pushHistory($connect, $history); + pushHistory($history); pushAllLog($alllog); pushGenLog($general, $log); } @@ -5052,7 +5052,7 @@ function process_67($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } - pushHistory($connect, $history); + pushHistory($history); pushAllLog($alllog); pushGenLog($general, $log); } @@ -5154,7 +5154,7 @@ function process_68($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } - pushHistory($connect, $history); + pushHistory($history); pushAllLog($alllog); pushGenLog($general, $log); } @@ -5255,7 +5255,7 @@ function process_71($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } -// pushHistory($connect, $history); +// pushHistory($history); // pushAllLog($alllog); pushTrickLog($connect, $tricklog); pushGenLog($general, $log); @@ -5366,7 +5366,7 @@ function process_72($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } -// pushHistory($connect, $history); +// pushHistory($history); // pushAllLog($alllog); pushTrickLog($connect, $tricklog); pushGenLog($general, $log); @@ -5493,7 +5493,7 @@ function process_73($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } -// pushHistory($connect, $history); +// pushHistory($history); // pushAllLog($alllog); pushTrickLog($connect, $tricklog); pushGenLog($general, $log); @@ -5632,7 +5632,7 @@ function process_74($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } -// pushHistory($connect, $history); +// pushHistory($history); // pushAllLog($alllog); pushTrickLog($connect, $tricklog); pushGenLog($general, $log); @@ -5754,7 +5754,7 @@ function process_75($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } -// pushHistory($connect, $history); +// pushHistory($history); // pushAllLog($alllog); pushTrickLog($connect, $tricklog); pushGenLog($general, $log); @@ -5969,7 +5969,7 @@ function process_76($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } -// pushHistory($connect, $history); +// pushHistory($history); // pushAllLog($alllog); pushTrickLog($connect, $tricklog); pushGenLog($general, $log); @@ -6093,7 +6093,7 @@ function process_77($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } -// pushHistory($connect, $history); +// pushHistory($history); // pushAllLog($alllog); pushTrickLog($connect, $tricklog); pushGenLog($general, $log); @@ -6214,7 +6214,7 @@ function process_78($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } -// pushHistory($connect, $history); +// pushHistory($history); // pushAllLog($alllog); pushTrickLog($connect, $tricklog); pushGenLog($general, $log); @@ -6283,7 +6283,7 @@ function process_81($connect, &$general) { refreshNationStaticInfo(); } - pushHistory($connect, $history); + pushHistory($history); pushAllLog($alllog); pushGenLog($general, $log); } diff --git a/twe/func_time_event.php b/twe/func_time_event.php index 8aa4c0ca..1d6473f3 100644 --- a/twe/func_time_event.php +++ b/twe/func_time_event.php @@ -37,7 +37,7 @@ function processSpring($connect) { $admin = MYDB_fetch_array($result); $history[0] = "★{$admin['year']}년 {$admin['month']}월: 모두들 즐거운 게임 하고 계신가요? ^^ 삼국일보 애독해 주시고, 훼접은 삼가주세요~"; - pushHistory($connect, $history); + pushHistory($history); } function processGoldIncome($connect) { @@ -111,7 +111,7 @@ function processGoldIncome($connect) { } $history[0] = "●{$admin['year']}년 {$admin['month']}월:【지급】봄이 되어 봉록에 따라 자금이 지급됩니다."; - pushHistory($connect, $history); + pushHistory($history); pushAdminLog($connect, $adminLog); } @@ -405,7 +405,7 @@ function processRiceIncome($connect) { } $history[0] = "●{$admin['year']}년 {$admin['month']}월:【지급】가을이 되어 봉록에 따라 군량이 지급됩니다."; - pushHistory($connect, $history); + pushHistory($history); pushAdminLog($connect, $adminLog); } @@ -680,5 +680,5 @@ function disaster($connect) { } } - pushHistory($connect, $disaster); + pushHistory($disaster); } diff --git a/twe/func_tournament.php b/twe/func_tournament.php index 03a5e082..e9814e8e 100644 --- a/twe/func_tournament.php +++ b/twe/func_tournament.php @@ -274,7 +274,7 @@ function startTournament($connect, $auto, $type) { case 2: $history[0] = "◆{$admin['year']}년 {$admin['month']}월: 일기토 대회가 개최됩니다! 천하의 용사들을 모집하고 있습니다!"; break; case 3: $history[0] = "◆{$admin['year']}년 {$admin['month']}월: 설전 대회가 개최됩니다! 천하의 책사들을 모집하고 있습니다!"; break; } - pushHistory($connect, $history); + pushHistory($history); } function fillLowGenAll($connect) { @@ -644,7 +644,7 @@ function setGift($connect, $tnmt_type, $tnmt, $phase) { $cost2 = $admin['develcost'] * 12; $history[0] = "◆{$admin['year']}년 {$admin['month']}월: {$tp} 대회에서 {$general['name']}(이)가 우승, {$general2['name']}(이)가 준우승을 차지하여 천하에 이름을 떨칩니다!"; $history[1] = "◆{$admin['year']}년 {$admin['month']}월: {$tp} 대회의 우승자에게는 {$cost}, 준우승자에겐 {$cost2}의 상금과 약간의 명성이 주어집니다!"; - pushHistory($connect, $history); + pushHistory($history); for($i=0; $i < count($genNo); $i++) { $general['no'] = $genNo[$i]; diff --git a/twe/join_post.php b/twe/join_post.php index 1dcf6b66..132fe275 100644 --- a/twe/join_post.php +++ b/twe/join_post.php @@ -236,7 +236,7 @@ if($id_num) { $log[1] = "●{$admin['month']}월:".getGenSpecial($special2)." 특기를 가진 천재의 등장으로 온 천하가 떠들썩합니다."; $history[0] = "●{$admin['year']}년 {$admin['month']}월:【천재】{$cityname['name']}에 천재가 등장했습니다."; - pushHistory($connect, $history); + pushHistory($history); } else { $log[0] = "●{$admin['month']}월:{$cityname['name']}에서 {$me['name']}(이)라는 호걸이 천하에 이름을 알립니다."; } diff --git a/twe/process_war.php b/twe/process_war.php index da6d0986..58f0db0b 100644 --- a/twe/process_war.php +++ b/twe/process_war.php @@ -112,7 +112,7 @@ function processWar($connect, $general, $city) { $history[count($history)] = "●{$game['year']}년 {$game['month']}월:【패퇴】{$destnation['name']}(이)가 병량 부족으로 {$city['name']}(을)를 뺏기고 말았습니다."; pushGenLog($general, $log); pushAllLog($alllog); - pushHistory($connect, $history); + pushHistory($history); unset($log); unset($alllog); unset($history); @@ -481,7 +481,7 @@ function processWar($connect, $general, $city) { pushBatLog($general, $batlog); pushBatRes($general, $batres); pushAllLog($alllog); - pushHistory($connect, $history); + pushHistory($history); unset($log); unset($batlog); unset($batres); @@ -1494,7 +1494,7 @@ function processWar($connect, $general, $city) { pushBatLog($general, $batlog); pushBatRes($general, $batres); pushAllLog($alllog); - pushHistory($connect, $history); + pushHistory($history); return $deadAmount; } @@ -1605,7 +1605,7 @@ function addConflict($connect, $city, $nationnum, $mykillnum) { $nation = getNationStaticInfo($nationnum); $history[count($history)] = "●{$game['year']}년 {$game['month']}월:【분쟁】{$nation['name']}(이)가 {$city['name']} 공략에 가담하여 분쟁이 발생하고 있습니다."; - pushHistory($connect, $history); + pushHistory($history); } $nationlist[$i] = $nationnum; @@ -1914,6 +1914,6 @@ function ConquerCity($connect, $game, $general, $city, $nation, $destnation) { pushGenLog($general, $log); pushAllLog($alllog); - pushHistory($connect, $history); + pushHistory($history); } diff --git a/twe/scenario_1.php b/twe/scenario_1.php index 1a7694a7..05079deb 100644 --- a/twe/scenario_1.php +++ b/twe/scenario_1.php @@ -785,7 +785,7 @@ foreach(getAllNationStaticInfo() as $nation){ //////////////////////////이벤트/////////////////////////////////////////////// $history[count($history)] = "●184년 1월:【역사모드1】황건적의 난"; $history[count($history)] = "●184년 1월:【황건적】전국 각지에서 황건적이 들고 일어서고 있습니다."; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_10.php b/twe/scenario_10.php index ed502b39..3cd3508b 100644 --- a/twe/scenario_10.php +++ b/twe/scenario_10.php @@ -890,7 +890,7 @@ $history[count($history)] = "●225년 1월:【이벤트】location.replace('install3_ok.php');"; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_11.php b/twe/scenario_11.php index 6bf09a95..1ced7d45 100644 --- a/twe/scenario_11.php +++ b/twe/scenario_11.php @@ -889,7 +889,7 @@ $history[count($history)] = "●228년 1월:【역사모드11】 $history[count($history)] = "●228년 1월:【이벤트】오의 손권은 국력을 비축하며 웅크리고 있습니다."; $history[count($history)] = "●228년 1월:【이벤트】촉의 제갈량은 출사표를 내고 북벌에 나섭니다!"; $history[count($history)] = "●228년 1월:【이벤트】위의 조예는 이에 맞서 사마의를 보냅니다!"; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_12.php b/twe/scenario_12.php index 7370d429..963d780e 100644 --- a/twe/scenario_12.php +++ b/twe/scenario_12.php @@ -1173,7 +1173,7 @@ $history[count($history)] = "●191년 1월:【시나리오】●191년 1월:【시나리오】낙양은 손견과 결탁한 원술이 차지합니다!"; $history[count($history)] = "●191년 1월:【시나리오】기주에는 조조와 의기투합한 원소가 힘을 비축합니다!"; $history[count($history)] = "●191년 1월:【시나리오】병주에는 유비가 합세한 공손찬이 위용을 뽐냅니다!"; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_2.php b/twe/scenario_2.php index 925a4639..c39997a7 100644 --- a/twe/scenario_2.php +++ b/twe/scenario_2.php @@ -1703,7 +1703,7 @@ $history[count($history)] = "●190년 1월:【연합】location.replace('install3_ok.php');"; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_20.php b/twe/scenario_20.php index 6c0b6de2..cd2d6ca2 100644 --- a/twe/scenario_20.php +++ b/twe/scenario_20.php @@ -742,7 +742,7 @@ RegGeneral($connect,1,1,$fiction,$turnterm,$startyear,$year,1678, 22, "희지 //////////////////////////이벤트/////////////////////////////////////////////// $history[count($history)] = "●180년 1월:【가상모드1】영웅 난무"; $history[count($history)] = "●180년 1월:【이벤트】당대의 대표 세력들이 등장합니다."; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_21.php b/twe/scenario_21.php index 9e3f674e..68861dab 100644 --- a/twe/scenario_21.php +++ b/twe/scenario_21.php @@ -770,7 +770,7 @@ RegCity($connect, 3, "성도", 1); //////////////////////////이벤트/////////////////////////////////////////////// $history[count($history)] = "●180년 1월:【가상모드1】영웅 집결"; $history[count($history)] = "●180년 1월:【이벤트】당대의 대표 세력들이 등장합니다."; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_22.php b/twe/scenario_22.php index 3858bf60..1ad26e35 100644 --- a/twe/scenario_22.php +++ b/twe/scenario_22.php @@ -111,7 +111,7 @@ RegGeneral2($connect,$admin['turnterm'],$gencount, "후랴", 56, 79, 20," //////////////////////////이벤트/////////////////////////////////////////////// $history[count($history)] = "●179년 1월:【가상모드2】훼신 집결"; $history[count($history)] = "●179년 1월:【이벤트】삼모전 역대 훼신들이 등장합니다."; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_23.php b/twe/scenario_23.php index 34292ba4..5cb7536b 100644 --- a/twe/scenario_23.php +++ b/twe/scenario_23.php @@ -746,7 +746,7 @@ RegGeneral($connect,1,1,$fiction,$turnterm,$startyear,$year,1678, 22, "희지 $history[count($history)] = "●180년 1월:【가상모드3】영웅 시대"; $history[count($history)] = "●180년 1월:【이벤트】출연 가능한 모든 장수들이 재야로 등장하는 가상 시나리오."; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_24.php b/twe/scenario_24.php index fa24b9d8..fede79fb 100644 --- a/twe/scenario_24.php +++ b/twe/scenario_24.php @@ -243,7 +243,7 @@ RegCity($connect, 2, "양양", 1); //////////////////////////이벤트/////////////////////////////////////////////// $history[count($history)] = "●180년 1월:【가상모드4】결사항전"; $history[count($history)] = "●180년 1월:【이벤트】오랑캐에 맞서 버텨내야 합니다!"; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_25.php b/twe/scenario_25.php index 9f2c5487..b5ac591e 100644 --- a/twe/scenario_25.php +++ b/twe/scenario_25.php @@ -312,7 +312,7 @@ RegGeneral($connect,1,1,$fiction,$turnterm,$startyear,$year,1247, 72, "황 $history[count($history)] = "●180년 1월:【가상모드5】영웅독존"; $history[count($history)] = "●180년 1월:【이벤트】진정한 영웅들만이 재야로 등장하는 가상 시나리오."; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_26.php b/twe/scenario_26.php index b1f3e1ff..c467a315 100644 --- a/twe/scenario_26.php +++ b/twe/scenario_26.php @@ -309,7 +309,7 @@ RegGeneral($connect,1,1,$fiction,$turnterm,$startyear,$year,1244, 147, "후 $history[count($history)] = "●180년 1월:【가상모드6】무풍지대"; $history[count($history)] = "●180년 1월:【이벤트】영웅은 없다! 오직 내가 영웅일 뿐이다!"; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_27.php b/twe/scenario_27.php index 1c6d4bde..5d47ac4c 100644 --- a/twe/scenario_27.php +++ b/twe/scenario_27.php @@ -587,7 +587,7 @@ RegGeneral($connect,1,1,$fiction,$turnterm,$startyear,$year,1395, 0, " $history[count($history)] = "●180년 1월:【가상모드7】가요대잔치"; $history[count($history)] = "●180년 1월:【이벤트】올해의 가요대상은!"; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_28.php b/twe/scenario_28.php index 936d50e0..8c11bc0e 100644 --- a/twe/scenario_28.php +++ b/twe/scenario_28.php @@ -416,7 +416,7 @@ RegGeneral($connect,1,1,$fiction,$turnterm,$startyear,$year,8229, 110, "지크 $history[count($history)] = "●180년 1월:【가상모드8】확산성 밀리언 아서"; $history[count($history)] = "●180년 1월:【이벤트】삼모전에 확밀아가 빙의됩니다!"; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_3.php b/twe/scenario_3.php index c8bbb379..be485dc8 100644 --- a/twe/scenario_3.php +++ b/twe/scenario_3.php @@ -1744,7 +1744,7 @@ $history[count($history)] = "●194년 1월:【이벤트】location.replace('install3_ok.php');"; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_4.php b/twe/scenario_4.php index bcc8c982..14df0f2a 100644 --- a/twe/scenario_4.php +++ b/twe/scenario_4.php @@ -1281,7 +1281,7 @@ $history[count($history)] = "●196년 1월:【이벤트】location.replace('install3_ok.php');"; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_5.php b/twe/scenario_5.php index 5a912246..58570eeb 100644 --- a/twe/scenario_5.php +++ b/twe/scenario_5.php @@ -987,7 +987,7 @@ $history[count($history)] = "●200년 1월:【이벤트】location.replace('install3_ok.php');"; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_6.php b/twe/scenario_6.php index d0a51bc4..cde3f363 100644 --- a/twe/scenario_6.php +++ b/twe/scenario_6.php @@ -1033,7 +1033,7 @@ $history[count($history)] = "●202년 1월:【이벤트】location.replace('install3_ok.php');"; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_7.php b/twe/scenario_7.php index 3997604f..e6d41915 100644 --- a/twe/scenario_7.php +++ b/twe/scenario_7.php @@ -1085,7 +1085,7 @@ $history[count($history)] = "●207년 1월:【이벤트】location.replace('install3_ok.php');"; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_8.php b/twe/scenario_8.php index 4d53b4e7..82e2d201 100644 --- a/twe/scenario_8.php +++ b/twe/scenario_8.php @@ -937,7 +937,7 @@ $history[count($history)] = "●213년 1월:【이벤트】 $history[count($history)] = "●213년 1월:【이벤트】유장은 장로에 맞서기 위해 유비에게 도움을 청합니다."; $history[count($history)] = "●213년 1월:【이벤트】일이 여의치 않은 유비는 등을 돌려 익주를 차지하려합니다."; $history[count($history)] = "●213년 1월:【이벤트】형주에 일었던 피바람은 익주에서 다시 불어오고 있습니다."; -pushHistory($connect, $history); +pushHistory($history); //echo ""; echo 'install3_ok.php';//TODO:debug all and replace diff --git a/twe/scenario_9.php b/twe/scenario_9.php index 71b0b743..79cdfe3b 100644 --- a/twe/scenario_9.php +++ b/twe/scenario_9.php @@ -861,7 +861,7 @@ $history[count($history)] = "●219년 1월:【이벤트】location.replace('install3_ok.php');"; echo 'install3_ok.php';//TODO:debug all and replace