From 463994df4204000653dc687f93a80890ce2d7a24 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 8 Apr 2018 12:56:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=95=EC=A0=81=20=EB=B6=84=EC=84=9D=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EB=B0=98=EC=98=81.=20=20global=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EB=AA=87=EB=AA=87=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/_119.php | 6 +- hwe/_admin1.php | 14 +- hwe/_admin2_submit.php | 4 + hwe/_admin5.php | 54 ++-- hwe/_admin6.php | 10 +- hwe/_admin7.php | 10 +- hwe/_admin8.php | 2 +- hwe/_simul.php | 660 +++++++++++++++++++++-------------------- hwe/a_bestGeneral.php | 10 +- hwe/a_genList.php | 2 +- hwe/a_hallOfFame.php | 2 +- hwe/a_npcList.php | 16 +- hwe/b_chiefcenter.php | 6 +- hwe/b_diplomacy.php | 4 +- hwe/b_myPage.php | 4 +- hwe/commandlist.php | 1 - hwe/func.php | 10 +- hwe/func_template.php | 4 - hwe/index.php | 4 +- hwe/lib.php | 4 - hwe/processing.php | 7 +- 21 files changed, 428 insertions(+), 406 deletions(-) diff --git a/hwe/_119.php b/hwe/_119.php index bb3d26a7..e283489c 100644 --- a/hwe/_119.php +++ b/hwe/_119.php @@ -43,10 +43,10 @@ $plock = MYDB_fetch_array($result);
- 시간조정 : 최종갱신 :
- 시간조정 : 토너먼트 :
+ 시간조정 : 최종갱신 :
+ 시간조정 : 토너먼트 :
봉급지급 :
- 락 풀 기 : 현재 : 0?"동결중":"가동중";?>
+ 락 풀 기 : 현재 : 0?"동결중":"가동중"?>
diff --git a/hwe/_admin1.php b/hwe/_admin1.php index 1a65ba48..f735b3f6 100644 --- a/hwe/_admin1.php +++ b/hwe/_admin1.php @@ -44,32 +44,32 @@ $admin = getAdmin();
- + - + - + - + - + - + - + diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php index 1efa8eb3..45947fdc 100644 --- a/hwe/_admin2_submit.php +++ b/hwe/_admin2_submit.php @@ -3,6 +3,10 @@ namespace sammo; include "lib.php"; include "func.php"; + + +$weap = Util::getReq('weap', 'int'); + //로그인 검사 $session = Session::requireLogin()->loginGame(); diff --git a/hwe/_admin5.php b/hwe/_admin5.php index 035e6c0a..35919788 100644 --- a/hwe/_admin5.php +++ b/hwe/_admin5.php @@ -3,6 +3,10 @@ namespace sammo; include "lib.php"; include "func.php"; + +$type = Util::getReq('type', 'int', 0); +$type2 = Util::getReq('type2', 'int', 0); + //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); @@ -54,33 +58,33 @@ $admin = MYDB_fetch_array($result); diff --git a/hwe/_admin7.php b/hwe/_admin7.php index 4c1373d0..05d8f0b4 100644 --- a/hwe/_admin7.php +++ b/hwe/_admin7.php @@ -6,7 +6,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -if($session->userGrade() < 5) { +if($session->userGrade < 5) { echo " @@ -51,10 +51,10 @@ $sel[$type] = "selected"; 정렬순서 : 대상장수 : diff --git a/hwe/_admin8.php b/hwe/_admin8.php index 5ab701b7..2627df51 100644 --- a/hwe/_admin8.php +++ b/hwe/_admin8.php @@ -6,7 +6,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -if($session->userGrade() < 5) { +if($session->userGrade < 5) { echo " diff --git a/hwe/_simul.php b/hwe/_simul.php index a0085736..8d060bd7 100644 --- a/hwe/_simul.php +++ b/hwe/_simul.php @@ -10,8 +10,18 @@ $userID = Session::getUserID(); //로그인 검사 $isgen = Util::getReq('isgen'); + +$leader1 = Util::getReq('leader1', 'int', 0); +$power1 = Util::getReq('power1', 'int', 0); +$intel1 = Util::getReq('intel1', 'int', 0); +$type1 = Util::getReq('type1', 'int', 0); +$crew1 = Util::getReq('crew1', 'int', 0); +$train1 = Util::getReq('train1', 'int', 0); +$atmos1 = Util::getReq('atmos1', 'int', 0); +$level1 = Util::getReq('level1', 'int', 0); +$explevel1 = Util::getReq('explevel1', 'int', 0); $tech1 = Util::getReq('tech1', 'int', 0); -$tech2 = Util::getReq('tech2', 'int', 0); + $dex10 = Util::getReq('dex10', 'int', 0); $dex110 = Util::getReq('dex110', 'int', 0); $dex120 = Util::getReq('dex120', 'int', 0); @@ -24,6 +34,17 @@ $dx120 = array_fill(0, 20, ''); $dx130 = array_fill(0, 20, ''); $dx140 = array_fill(0, 20, ''); +$leader2 = Util::getReq('leader2', 'int', 0); +$power2 = Util::getReq('power2', 'int', 0); +$intel2 = Util::getReq('intel2', 'int', 0); +$type2 = Util::getReq('type2', 'int', 0); +$crew2 = Util::getReq('crew2', 'int', 0); +$train2 = Util::getReq('train2', 'int', 0); +$atmos2 = Util::getReq('atmos2', 'int', 0); +$level2 = Util::getReq('level2', 'int', 0); +$explevel2 = Util::getReq('explevel2', 'int', 0); +$tech2 = Util::getReq('tech2', 'int', 0); + $dex20 = Util::getReq('dex20', 'int', 0); $dex210 = Util::getReq('dex210', 'int', 0); $dex220 = Util::getReq('dex220', 'int', 0); @@ -36,6 +57,11 @@ $dx220 = array_fill(0, 20, ''); $dx230 = array_fill(0, 20, ''); $dx240 = array_fill(0, 20, ''); +$def = Util::getReq('def', 'int', 0); +$wall = Util::getReq('wall', 'int', 0); +$atmos3 = Util::getReq('atmos3', 'int', 0); +$train3 = Util::getReq('train3', 'int', 0); + $sellevel1 = array_fill(0, 13, ''); $sel1 = array_fill(0,44, ''); $tch1 = array_fill(0,11, ''); @@ -1104,10 +1130,8 @@ switch($dex240) { 전투시뮬레이션 @@ -1123,180 +1147,180 @@ input { background-color:black;color:white; } - - + + - - + + - - + + - - + + - + - - - + + + - - - + + + - - - + + + @@ -1304,224 +1328,224 @@ input { background-color:black;color:white; } @@ -1530,11 +1554,11 @@ input { background-color:black;color:white; } - + diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php index e8cd2935..0fd7f450 100644 --- a/hwe/a_bestGeneral.php +++ b/hwe/a_bestGeneral.php @@ -126,18 +126,18 @@ for($i=0; $i < 21; $i++) { $name[$k] = "-"; $nation[$k] = "-"; $data[$k] = "-"; - $color[$k] = $_basecolor4; + $color[$k] = GameConst::$basecolor4; $pic[$k] = ""; } } else { $name[$k] = "???"; $nation[$k] = "???"; $data[$k] = $gen['data']; - $color[$k] = $_basecolor4; + $color[$k] = GameConst::$basecolor4; $gen['imgsvr'] = 0; $pic[$k] = "9999.jpg"; } - if($color[$k] == "") $color[$k] = $_basecolor4; + if($color[$k] == "") $color[$k] = GameConst::$basecolor4; if($nation[$k] == "") $nation[$k] = " "; if($pic[$k] == "") { echo ""; @@ -222,7 +222,7 @@ for($i=0; $i < 4; $i++) { $color[$k] = ""; $pic[$k] = ""; } - if($color[$k] == "") $color[$k] = $_basecolor4; + if($color[$k] == "") $color[$k] = GameConst::$basecolor4; if($nation[$k] == "") $nation[$k] = " "; if($pic[$k] == "") { echo ""; @@ -270,7 +270,7 @@ for($i=0; $i < 4; $i++) { $color[$k] = ""; $pic[$k] = ""; } - if($color[$k] == "") $color[$k] = $_basecolor4; + if($color[$k] == "") $color[$k] = GameConst::$basecolor4; if($nation[$k] == "") $nation[$k] = " "; if($pic[$k] == "") { echo ""; diff --git a/hwe/a_genList.php b/hwe/a_genList.php index 19360623..a347e066 100644 --- a/hwe/a_genList.php +++ b/hwe/a_genList.php @@ -35,7 +35,7 @@ if(!isset($type) || $type == 0) { 장수일람 - + diff --git a/hwe/a_hallOfFame.php b/hwe/a_hallOfFame.php index 06650a8a..3cd471bc 100644 --- a/hwe/a_hallOfFame.php +++ b/hwe/a_hallOfFame.php @@ -64,7 +64,7 @@ for($i=0; $i < 21; $i++) { $data[$k] = $gen['data']; $color[$k] = $gen['color']; $pic[$k] = $gen['picture']; - if($color[$k] == "") $color[$k] = $_basecolor4; + if($color[$k] == "") $color[$k] = GameConst::$basecolor4; if($nation[$k] == "") $nation[$k] = " "; /* if($pic[$k] == "") { diff --git a/hwe/a_npcList.php b/hwe/a_npcList.php index 8e560b1a..228494e5 100644 --- a/hwe/a_npcList.php +++ b/hwe/a_npcList.php @@ -30,14 +30,14 @@ $sel[$type] = "selected"; diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php index 2f640a57..84144882 100644 --- a/hwe/b_chiefcenter.php +++ b/hwe/b_chiefcenter.php @@ -157,11 +157,11 @@ for($k=0; $k < 2; $k++) { echo ""; + echo ""; } } diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php index cd719f84..ff5402ac 100644 --- a/hwe/b_diplomacy.php +++ b/hwe/b_diplomacy.php @@ -84,7 +84,7 @@ $(function(){ - "; + "; if($nationcount != 0) { $width = floor(888 / $nationcount); @@ -133,7 +133,7 @@ for($i=0; $i < $nationcount; $i++) { } } - if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation']) { $backcolor = "style=background-color:$_basecolor3;"; } + if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation']) { $backcolor = "style=background-color:".GameConst::$basecolor3.";"; } else { $backcolor = ""; } echo " diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index 779699a2..749f1974 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -86,11 +86,11 @@ function go(type) { >○(훈사60) >× 】

-      name=btn style=background-color:;color:white;width:160;height:30;font-size:13px; value=설정저장>
+      name=btn style=background-color:;color:white;width:160;height:30;font-size:13px; value=설정저장>
    ∞설정저장은 이달중 회 남았습니다.

    휴 가 신 청
-     ;color:white;width:160;height:30;font-size:13px; value=휴가신청 onclick='go(0)'> +     ;color:white;width:160;height:30;font-size:13px; value=휴가신청 onclick='go(0)'> diff --git a/hwe/commandlist.php b/hwe/commandlist.php index c71863d2..0dc0bfe0 100644 --- a/hwe/commandlist.php +++ b/hwe/commandlist.php @@ -65,7 +65,6 @@ function myclock() { myCommandList(); function myCommandList() { - global $_basecolor, $_basecolor2, $_basecolor3; global $images; $db = DB::db(); diff --git a/hwe/func.php b/hwe/func.php index 36c2267b..51d2502e 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -117,7 +117,7 @@ function getRandGenName() { function cityInfo() { - global $_basecolor, $_basecolor2, $images; + global $images; $db = DB::db(); $connect=$db->get(); @@ -232,7 +232,7 @@ function cityInfo() { } function myNationInfo() { - global $_basecolor, $_basecolor2, $images; + global $images; $db = DB::db(); $connect=$db->get(); @@ -749,7 +749,7 @@ function myInfo() { } function generalInfo($no) { - global $_basecolor, $_basecolor2, $image, $images; + global $image, $images; $db = DB::db(); $connect=$db->get(); @@ -940,7 +940,7 @@ function myInfo2() { } function generalInfo2($no) { - global $_basecolor, $_basecolor2, $image, $images, $_dexLimit; + global $image, $images, $_dexLimit; $db = DB::db(); $connect=$db->get(); @@ -1127,7 +1127,7 @@ function PushMsg($type, $nation, $picture, $imgsvr, $from, $fromcolor, $to, $toc } function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) { - global $_basecolor2, $_basecolor4, $images; + global $images; $db = DB::db(); $connect=$db->get(); diff --git a/hwe/func_template.php b/hwe/func_template.php index 4b3f4204..2303b24c 100644 --- a/hwe/func_template.php +++ b/hwe/func_template.php @@ -66,8 +66,6 @@ function CoreTurnTable() { function allButton() { - - global $_basecolor2; $npcmode = DB::db()->queryFirstField("select npcmode from game limit 1"); if($npcmode == 1) { $site = "a_npcList.php"; @@ -87,8 +85,6 @@ function allButton() { function commandButton() { - global $_basecolor, $_basecolor2; - $session = Session::getInstance(); $userID = Session::getUserID(); $generalID = $session->generalID; diff --git a/hwe/index.php b/hwe/index.php index 916988bc..c623e485 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -217,13 +217,13 @@ if($session->userGrade >= 5) { - ;color:white;width:50;font-size:13px; value='반복' onclick='refreshing(this, 2,0)'>;color:white;width:80;font-size:13px; value='▼미루기' onclick='refreshing(this, 2,1)'>;color:white;width:80;font-size:13px; value='▲당기기' onclick='refreshing(this, 2,2)'> + ;color:white;width:50;font-size:13px; value='반복' onclick='refreshing(this, 2,0)'>;color:white;width:80;font-size:13px; value='▼미루기' onclick='refreshing(this, 2,1)'>;color:white;width:80;font-size:13px; value='▲당기기' onclick='refreshing(this, 2,2)'> diff --git a/hwe/lib.php b/hwe/lib.php index a8e89898..6773d59d 100644 --- a/hwe/lib.php +++ b/hwe/lib.php @@ -60,10 +60,6 @@ $_firingpower = 400; // 계략시 수치 감소량($_firingbase ~ $_firingpower) $x_goodgenleader = 65; // 명장,지장에 사용될 통솔 제한 $x_goodgenpower = 65; // 명장에 사용될 무력 제한 $x_goodgenintel = 65; // 지장에 사용될 지력 제한 -$_basecolor = "000044"; // 기본 배경색깔 푸른색 -$_basecolor2 = "225500"; // 기본 배경색깔 초록색 -$_basecolor3 = "660000"; // 기본 배경색깔 붉은색 -$_basecolor4 = "330000"; // 기본 배경색깔 검붉은색 $_taxrate = 0.01; // 군량 매매시 세율 //$images = "http://115.68.28.99/images"; //$image = "http://115.68.28.99/image"; diff --git a/hwe/processing.php b/hwe/processing.php index 9e97960d..a61b987e 100644 --- a/hwe/processing.php +++ b/hwe/processing.php @@ -111,7 +111,6 @@ switch($commandtype) { function starter($name, $type=0) { //FIXME: 장기적으로 template로 변경해야함. - global $_basecolor2, $_basecolor4; global $images; echo ' @@ -239,7 +238,7 @@ function command_11($turn, $command) { $connect=$db->get(); $userID = Session::getUserID(); - global $_basecolor, $_basecolor2, $images, $image; + global $images, $image; starter("징병"); $query = "select * from game limit 1"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); @@ -448,7 +447,7 @@ function command_12($turn, $command) { $connect=$db->get(); $userID = Session::getUserID(); - global $_basecolor, $_basecolor2, $images, $image; + global $images, $image; starter("모병"); $query = "select * from game limit 1"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); @@ -1000,7 +999,7 @@ function command_24($turn, $command) { } function command_25($turn, $command) { - global $_basecolor2, $_basecolor4, $images; + global $images; $db = DB::db(); $connect=$db->get();
운영자메세지'>'>
중원정세추가
시작시간변경'>'> 현재도시훈사
최대 장수>> 최대 국가>>
현재 수입률%%
시작 년도'>'> 최근 갱신 시간  
정렬순서 : diff --git a/hwe/_admin6.php b/hwe/_admin6.php index d7e0bcfc..e7812699 100644 --- a/hwe/_admin6.php +++ b/hwe/_admin6.php @@ -46,11 +46,11 @@ $sel[$type] = "selected";
접 속 정 보
정렬순서 :
관직 관직 -
Lv >Lv >Lv >Lv > -
통솔 >통솔 >통솔 >통솔 > -
무력 >무력 >무력 >무력 > -
지력 >지력 >지력 >지력 > -
병종 병종 성벽 >성벽 >
병력 >병력 >수비 >병력 >병력 >수비 >
훈련 >훈련 >훈련 >훈련 >훈련 >훈련 >
사기 >사기 >사기 >사기 >사기 >사기 >
기술 기술 -
보 궁 기 귀 차 보 궁 기 귀 차 -- - ';?> + '?> - ';?> + '?>
@@ -1606,7 +1630,7 @@ function printSimul($game, $i) { $ric = $game["ric{$i}"]; echo "
".getTypename($i)."".GameUnitConst::byId($i)->name." $att $def $spd   
빙 의 일 람
정렬순서 :
"; echo CoreTurnTable(); echo " - - + +
"; CoreCommandTable(); - echo "
  
- ;color:white;width:110;font-size:13px; value='실 행' onclick='refreshing(this, 3,form2)'>;color:white;width:110;font-size:13px; value='갱 신' onclick='refreshing(this, 0,0)'>;color:white;width:160;font-size:13px; value='로그아웃' onclick=location.replace('logout_process.php')>
+ ;color:white;width:110;font-size:13px; value='실 행' onclick='refreshing(this, 3,form2)'>;color:white;width:110;font-size:13px; value='갱 신' onclick='refreshing(this, 0,0)'>;color:white;width:160;font-size:13px; value='로그아웃' onclick=location.replace('logout_process.php')>