diff --git a/.phan/config.php b/.phan/config.php index 1426f847..c27746b0 100644 --- a/.phan/config.php +++ b/.phan/config.php @@ -21,7 +21,6 @@ return [ 'file_list' => [ 'f_config/config.php', - 'hwe/MYDB.php', 'hwe/a_bestGeneral.php', 'hwe/a_emperior.php', 'hwe/a_emperior2.php', diff --git a/hwe/MYDB.php b/hwe/MYDB.php deleted file mode 100644 index cfbd49b5..00000000 --- a/hwe/MYDB.php +++ /dev/null @@ -1,30 +0,0 @@ -userGrade < 5) { } $db = DB::db(); -$connect = $db->get(); $sel = []; $sel2 = []; @@ -86,11 +85,7 @@ $sel2[$type2] = "selected";
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {$emperior['phase']} - - -
- {$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月) -
국 력{$emperior['power']}장 수{$emperior['gennum']}속 령{$emperior['citynum']}성 향{$emperior['type']}
황 제{$emperior['l12name']}승 상{$emperior['l11name']}위 장 군{$emperior['l10name']}사 공{$emperior['l9name']}
-"; - } -} else { - $query = "select * from emperior_table where no='$select'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $emperior = MYDB_fetch_array($result); - - echo " -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {$emperior['phase']} - - -
국 가 수
(최종 / 최대)		{$emperior['nation_count']}장 수 수
(최종 / 최대)		{$emperior['gen_count']}
등 장 국 가{$emperior['nation_name']}
국가별 성향{$emperior['nation_hist']}
장 수 성 격{$emperior['personal_hist']}
장 수 특 기{$emperior['special_hist']}
- {$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月) -
국 력{$emperior['power']}성 향{$emperior['type']}
장 수{$emperior['gennum']}속 령{$emperior['citynum']}
총 인 구{$emperior['pop']}인 구 율{$emperior['poprate']}
국 고{$emperior['gold']}병 량{$emperior['rice']}
황 제 {$emperior['l12name']}승 상 {$emperior['l11name']}
위 장 군 {$emperior['l10name']}사 공 {$emperior['l9name']}
표 기 장 군 {$emperior['l8name']}태 위 {$emperior['l7name']}
거 기 장 군 {$emperior['l6name']}사 도 {$emperior['l5name']}
오 호 장 군{$emperior['tiger']}
건 안 칠 자{$emperior['eagle']}
장 수 들
(공헌도 순서)		{$emperior['gen']}
역 사 기 록".formatHistoryToHTML(Json::decode($emperior['history']))."
-
"; -} -?> - - - - -
- - - diff --git a/hwe/b_auction.php b/hwe/b_auction.php index f903862c..1fc32498 100644 --- a/hwe/b_auction.php +++ b/hwe/b_auction.php @@ -13,7 +13,6 @@ $userID = Session::getUserID(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); increaseRefresh("거래장", 2); @@ -79,13 +78,8 @@ if ($msg2 == "") { 거래종료 query('SELECT * from auction where type=0 order by expire') as $auction){ $radio = ""; $alert = ""; $alert2 = ""; @@ -172,13 +166,8 @@ for ($i=0; $i < $count; $i++) { 거래종료 query('SELECT * from auction where type=1 order by expire') as $auction){ $radio = ""; $alert = ""; $alert2 = ""; diff --git a/hwe/b_betting.php b/hwe/b_betting.php index e2663c84..2ed4ebe3 100644 --- a/hwe/b_betting.php +++ b/hwe/b_betting.php @@ -9,7 +9,6 @@ $userID = Session::getUserID(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); increaseRefresh("베팅장", 1); TurnExecutionHelper::executeAllCommand(); @@ -86,14 +85,15 @@ if($str3){ =60 order by grp, grp_no"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); -for ($i=0; $i < 1; $i++) { - $general = MYDB_fetch_array($result)??[ +$generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1'); +while(count($generalList) < 1){ + $generalList[] = [ + 'name'=>'-', 'npc'=>0, - 'name'=>'', 'win'=>0 ]; +} +foreach($generalList as $i=>$general){ if ($general['name'] == "") { $general['name'] = "-"; } @@ -109,20 +109,21 @@ echo " "; -$query = "select npc,name,win from tournament where grp>=50 order by grp, grp_no"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $cent = []; $line = []; $gen = []; for ($i=0; $i < 1; $i++) { $cent[$i] = ""; } -for ($i=0; $i < 2; $i++) { - $general = MYDB_fetch_array($result)??[ +$generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2'); +while(count($generalList) < 2){ + $generalList[] = [ + 'name'=>'-', 'npc'=>0, - 'name'=>'', 'win'=>0 ]; +} +foreach($generalList as $i=>$general){ if ($general['name'] == "") { $general['name'] = "-"; } @@ -157,17 +158,18 @@ echo " "; -$query = "select npc,name,win from tournament where grp>=40 order by grp, grp_no"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); for ($i=0; $i < 2; $i++) { $cent[$i] = ""; } -for ($i=0; $i < 4; $i++) { - $general = MYDB_fetch_array($result)??[ +$generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4'); +while(count($generalList) < 4){ + $generalList[] = [ + 'name'=>'-', 'npc'=>0, - 'name'=>'', 'win'=>0 ]; +} +foreach($generalList as $i=>$general){ if ($general['name'] == "") { $general['name'] = "-"; } @@ -202,17 +204,18 @@ echo " "; -$query = "select npc,name,win from tournament where grp>=30 order by grp, grp_no"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); for ($i=0; $i < 4; $i++) { $cent[$i] = ""; } -for ($i=0; $i < 8; $i++) { - $general = MYDB_fetch_array($result)??[ +$generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8'); +while(count($generalList) < 8){ + $generalList[] = [ + 'name'=>'-', 'npc'=>0, - 'name'=>'', 'win'=>0 ]; +} +foreach($generalList as $i=>$general){ if ($general['name'] == "") { $general['name'] = "-"; } @@ -247,17 +250,18 @@ echo " "; -$query = "select npc,name,win from tournament where grp>=20 order by grp, grp_no"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); for ($i=0; $i < 8; $i++) { $cent[$i] = ""; } -for ($i=0; $i < 16; $i++) { - $general = MYDB_fetch_array($result)??[ +$generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16'); +while(count($generalList) < 16){ + $generalList[] = [ + 'name'=>'-', 'npc'=>0, - 'name'=>'', 'win'=>0 ]; +} +foreach($generalList as $i=>$general){ if ($general['name'] == "") { $general['name'] = "-"; } @@ -456,7 +460,7 @@ foreach($tournamentType as $tournamentTypeText=>[$statTypeText,$statFunc,$rankCo $tournamentRankerList = array_splice($tournamentRankerList, 0, 30); foreach($tournamentRankerList as $rank=>$ranker){ printRow( - $rank+1, + $rank, $ranker->getNPCType(), $ranker->getName(), ($statFunc)($ranker), diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php index 59b38cc8..770aad53 100644 --- a/hwe/b_currentCity.php +++ b/hwe/b_currentCity.php @@ -12,14 +12,10 @@ $userID = Session::getUserID(); $userGrade = Session::getUserGrade(); $db = DB::db(); -$connect=$db->get(); increaseRefresh("현재도시", 1); -$query = "select no,nation,officer_level,city from general where owner='{$userID}'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -$me = MYDB_fetch_array($result); - +$me = $db->queryFirstRow('SELECT no,nation,officer_level,city from general where owner=%i', $userID); $myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']); $templates = new \League\Plates\Engine('templates'); @@ -78,9 +74,7 @@ if(!$citylist){ // 재야일때는 현재 도시만 $valid = 0; if($me['officer_level'] == 0) { - $query = "select city,name,nation from city where city='{$me['city']}'"; - $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $city = MYDB_fetch_array($cityresult); + $city = $db->queryFirstRow('SELECT city,name,nation from city where city=%i', $me['city']); echo " "; - $query = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' and intel>='".GameConst::$chiefStatMin."' order by npc,binary(name)"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $count = MYDB_num_rows($result); - for($i=0; $i < $count; $i++) { - $general = MYDB_fetch_array($result); + foreach($candidateIntel as $general) { if($general['officer_level'] == 3) { echo ""; } elseif($general['officer_level'] > 1) { @@ -449,13 +418,11 @@ if($meLevel >= 5) {