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

$connect 잘 가

Browse Source
This commit is contained in:
Hide_D
2020-05-10 03:39:02 +09:00
parent d7d084b57a
commit bebe535d94
13 changed files with 172 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.phan/config.php
-1
View File
@@ -21,7 +21,6 @@ return [
'file_list' => [ 'file_list' => [
'f_config/config.php', 'f_config/config.php',
'hwe/MYDB.php',
'hwe/a_bestGeneral.php', 'hwe/a_bestGeneral.php',
'hwe/a_emperior.php', 'hwe/a_emperior.php',
'hwe/a_emperior2.php', 'hwe/a_emperior2.php',
hwe/MYDB.php
-30
View File
@@ -1,30 +0,0 @@
<?php
namespace sammo;
function MYDB_query($query, $connect)
{
return mysqli_query($connect, $query);
}
function MYDB_num_rows(\mysqli_result $result) : int
{
return mysqli_num_rows($result);
}
/**
* @return mixed[]|null
*/
function MYDB_fetch_array(\mysqli_result $result)
{
return mysqli_fetch_array($result);
}
function MYDB_fetch_row(\mysqli_result $result)
{
return mysqli_fetch_row($result);
}
function MYDB_error($connect)
{
return mysqli_error($connect);
}
hwe/_admin5.php
+22 -40
View File
@@ -23,7 +23,6 @@ if ($session->userGrade < 5) {
} }
$db = DB::db(); $db = DB::db();
$connect = $db->get();
$sel = []; $sel = [];
$sel2 = []; $sel2 = [];
@@ -86,11 +85,7 @@ $sel2[$type2] = "selected";
<select name=nation size=1 style=color:white;background-color:black>"; <select name=nation size=1 style=color:white;background-color:black>";
<option value=0>재야</option>"; <option value=0>재야</option>";
<?php <?php
$query = "select nation,name,color,scout,gennum from nation order by power"; foreach ($db->query('SELECT nation,name,color,scout,gennum from nation order by power DESC') as $nation) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php " . MYDB_error($connect), "");
$count = MYDB_num_rows($result);
for ($i = 1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
echo " echo "
<option value={$nation['nation']}>{$nation['name']}</option>"; <option value={$nation['nation']}>{$nation['name']}</option>";
@@ -216,35 +211,27 @@ GROUP BY B.nation
$query .= " order by avg(B.dex5) desc"; $query .= " order by avg(B.dex5) desc";
break; break;
} }
$result = MYDB_query($query, $connect) or Error(__LINE__ . MYDB_error($connect), ""); foreach($db->query($query) as $nation){
$nationCount = MYDB_num_rows($result); $gen = $db->queryFirstRow('SELECT COUNT(*) as cnt,
for ($i = 0; $i < $nationCount; $i++) { ROUND(AVG(gold)) as avgg,
$nation = MYDB_fetch_array($result); ROUND(AVG(rice)) as avgr,
SUM(leadership) as leadership, ROUND(AVG(leadership), 1) as avgl,
ROUND(AVG(strength), 1) as avgs,
ROUND(AVG(intel), 1) as avgi,
ROUND(AVG(explevel), 1) as avge,
SUM(crew) as crew
from general where nation=%i',$nation['nation']);
$query = "select COUNT(*) as cnt, $city = $db->queryFirstRow('SELECT COUNT(*) as cnt,
ROUND(AVG(gold)) as avgg, SUM(pop) as pop, SUM(pop_max) as pop_max,
ROUND(AVG(rice)) as avgr, ROUND(SUM(pop)/SUM(pop_max)*100, 2) as rate,
SUM(leadership) as leadership, ROUND(AVG(leadership), 1) as avgl, trust,
ROUND(AVG(strength), 1) as avgs, ROUND(SUM(agri)/SUM(agri_max)*100, 2) as agri,
ROUND(AVG(intel), 1) as avgi, ROUND(SUM(comm)/SUM(comm_max)*100, 2) as comm,
ROUND(AVG(explevel), 1) as avge, ROUND(SUM(secu)/SUM(secu_max)*100, 2) as secu,
SUM(crew) as crew ROUND(SUM(wall)/SUM(wall_max)*100, 2) as wall,
from general where nation='{$nation['nation']}'"; ROUND(SUM(def)/SUM(def_max)*100, 2) as def
$genResult = MYDB_query($query, $connect) or Error(__LINE__ . MYDB_error($connect), ""); from city where nation=%i', $nation['nation']);
$gen = MYDB_fetch_array($genResult);
$query = "select COUNT(*) as cnt,
SUM(pop) as pop, SUM(pop_max) as pop_max,
ROUND(SUM(pop)/SUM(pop_max)*100, 2) as rate,
trust,
ROUND(SUM(agri)/SUM(agri_max)*100, 2) as agri,
ROUND(SUM(comm)/SUM(comm_max)*100, 2) as comm,
ROUND(SUM(secu)/SUM(secu_max)*100, 2) as secu,
ROUND(SUM(wall)/SUM(wall_max)*100, 2) as wall,
ROUND(SUM(def)/SUM(def_max)*100, 2) as def
from city where nation='{$nation['nation']}'";
$cityResult = MYDB_query($query, $connect) or Error(__LINE__ . MYDB_error($connect), "");
$city = MYDB_fetch_array($cityResult);
echo " echo "
<tr> <tr>
@@ -324,12 +311,7 @@ GROUP BY B.nation
?> ?>
</tr> </tr>
<?php <?php
$query = "select * from statistic where month=1 or no=1"; foreach($db->query('SELECT * from statistic where month=1 or no=1') as $stat){
$result = MYDB_query($query, $connect) or Error(__LINE__ . MYDB_error($connect), "");
$count = MYDB_num_rows($result);
for ($i = 0; $i < $count; $i++) {
$stat = MYDB_fetch_array($result);
echo " echo "
<tr> <tr>
<td align=center>{$stat['year']}</td> <td align=center>{$stat['year']}</td>
hwe/a_emperior2.php
-211
View File
@@ -1,211 +0,0 @@
<?php
namespace sammo;
include "lib.php";
include "func.php";
$select = Util::getReq('select', 'int', 0);
$db = DB::db();
$connect=$db->get();
increaseRefresh("왕조일람", 2);
?>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=1024" />
<title><?=UniqueConst::$serverName?>: 왕조일람</title>
<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
<?=WebUtil::printJS('js/common.js')?>
<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
<?=WebUtil::printCSS('../d_shared/common.css')?>
<?=WebUtil::printCSS('css/common.css')?>
</head>
<body>
<table align=center width=1000 class='tb_layout bg0'>
<tr><td>역 대 왕 조<br>
<input type=button value='창 닫기' onclick=window.close()><br>
</td></tr>
</table>
<?php
if ($select == 0) {
$query = "select * from emperior_table order by no desc";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$empcount = MYDB_num_rows($result);
for ($i=0; $i < $empcount; $i++) {
$emperior = MYDB_fetch_array($result);
echo "
<form action=a_emperior2.php method=post>
<table align=center width=1000 class='tb_layout bg0'>
<tr>
<td bgcolor=skyblue align=center colspan=8>
<font size=5>{$emperior['phase']}</font>
<input type=submit value='자세히'>
<input type=hidden name=select value='{$emperior['no']}'>
</td>
</tr>
<tr>
<td align=center style=color:".newColor($emperior['color'])."; bgcolor={$emperior['color']} colspan=8>
<font size=5>{$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月)</font>
</td>
</tr>
<tr>
<td id=bg1 align=center width=80>국 력</td>
<td align=center width=170>{$emperior['power']}</td>
<td id=bg1 align=center width=80>장 수</td>
<td align=center width=170>{$emperior['gennum']}</td>
<td id=bg1 align=center width=80>속 령</td>
<td align=center width=170>{$emperior['citynum']}</td>
<td id=bg1 align=center width=80>성 향</td>
<td align=center width=170>{$emperior['type']}</td>
</tr>
<tr>
<td id=bg1 align=center>황 제</td>
<td align=center>{$emperior['l12name']}</td>
<td id=bg1 align=center>승 상</td>
<td align=center>{$emperior['l11name']}</td>
<td id=bg1 align=center>위 장 군</td>
<td align=center>{$emperior['l10name']}</td>
<td id=bg1 align=center>사 공</td>
<td align=center>{$emperior['l9name']}</td>
</tr>
</table>
</form>";
}
} 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 "
<form action=a_emperior2.php method=post>
<table align=center width=1000 class='tb_layout bg0'>
<tr>
<td bgcolor=skyblue align=center colspan=6>
<font size=5>{$emperior['phase']}</font>
<input type=submit value='전체보기'>
<input type=hidden name=select value='0'>
</td>
</tr>
<tr>
<td id=bg1 width=98 align=center>국 가 수<br>(최종 / 최대)</td>
<td align=center width=398 colspan=2>{$emperior['nation_count']}</td>
<td id=bg1 width=98 align=center>장 수 수<br>(최종 / 최대)</td>
<td align=center width=398 colspan=2>{$emperior['gen_count']}</td>
</tr>
<tr>
<td id=bg1 align=center>등 장 국 가</td>
<td colspan=5>{$emperior['nation_name']}</td>
</tr>
<tr>
<td id=bg1 align=center>국가별 성향</td>
<td colspan=5>{$emperior['nation_hist']}</td>
</tr>
<tr>
<td id=bg1 align=center>장 수 성 격</td>
<td colspan=5>{$emperior['personal_hist']}</td>
</tr>
<tr>
<td id=bg1 align=center>장 수 특 기</td>
<td colspan=5>{$emperior['special_hist']}</td>
</tr>
<tr>
<td align=center style=color:".newColor($emperior['color'])."; bgcolor={$emperior['color']} colspan=6>
<font size=5>{$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月)</font>
</td>
</tr>
<tr>
<td id=bg1 width=98 align=center>국 력</td>
<td align=center width=398 colspan=2>{$emperior['power']}</td>
<td id=bg1 width=98 align=center>성 향</td>
<td align=center width=398 colspan=2>{$emperior['type']}</td>
</tr>
<tr>
<td id=bg1 width=98 align=center>장 수</td>
<td align=center width=398 colspan=2>{$emperior['gennum']}</td>
<td id=bg1 width=98 align=center>속 령</td>
<td align=center width=398 colspan=2>{$emperior['citynum']}</td>
</tr>
<tr>
<td id=bg1 align=center>총 인 구</td>
<td align=center colspan=2>{$emperior['pop']}</td>
<td id=bg1 align=center>인 구 율</td>
<td align=center colspan=2>{$emperior['poprate']}</td>
</tr>
<tr>
<td id=bg1 align=center>국 고</td>
<td align=center colspan=2>{$emperior['gold']}</td>
<td id=bg1 align=center>병 량</td>
<td align=center colspan=2>{$emperior['rice']}</td>
</tr>
<tr>
<td id=bg1 align=center>황 제</td>
<td width=64>&nbsp;</td>
<td width=332>{$emperior['l12name']}</td>
<td id=bg1 align=center>승 상</td>
<td width=64>&nbsp;</td>
<td width=332>{$emperior['l11name']}</td>
</tr>
<tr>
<td id=bg1 align=center>위 장 군</td>
<td width=64>&nbsp;</td>
<td width=332>{$emperior['l10name']}</td>
<td id=bg1 align=center>사 공</td>
<td width=64>&nbsp;</td>
<td width=332>{$emperior['l9name']}</td>
</tr>
<tr>
<td id=bg1 align=center>표 기 장 군</td>
<td width=64>&nbsp;</td>
<td width=332>{$emperior['l8name']}</td>
<td id=bg1 align=center>태 위</td>
<td width=64>&nbsp;</td>
<td width=332>{$emperior['l7name']}</td>
</tr>
<tr>
<td id=bg1 align=center>거 기 장 군</td>
<td width=64>&nbsp;</td>
<td width=332>{$emperior['l6name']}</td>
<td id=bg1 align=center>사 도</td>
<td width=64>&nbsp;</td>
<td width=332>{$emperior['l5name']}</td>
</tr>
<tr>
<td id=bg1 align=center>오 호 장 군</td>
<td colspan=5>{$emperior['tiger']}</td>
</tr>
<tr>
<td id=bg1 align=center>건 안 칠 자</td>
<td colspan=5>{$emperior['eagle']}</td>
</tr>
<tr>
<td id=bg1 align=center>장 수 들<br>(공헌도 순서)</td>
<td colspan=5>{$emperior['gen']}</td>
</tr>
<tr>
<td id=bg1 align=center>역 사 기 록</td>
<td colspan=5>".formatHistoryToHTML(Json::decode($emperior['history']))."</td>
</tr>
</table>
</form>";
}
?>
<table align=center width=1000 class='tb_layout bg0'>
<tr><td><?=closeButton()?></td></tr>
<tr><td><?=banner()?></td></tr>
</table>
</body>
</html>
hwe/b_auction.php
+2 -13
View File
@@ -13,7 +13,6 @@ $userID = Session::getUserID();
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
$connect=$db->get();
increaseRefresh("거래장", 2); increaseRefresh("거래장", 2);
@@ -79,13 +78,8 @@ if ($msg2 == "") {
<td width=148>거래종료</td> <td width=148>거래종료</td>
</tr> </tr>
<?php <?php
$query = "select * from auction where type=0 order by expire";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$count = MYDB_num_rows($result);
$chk = 0; $chk = 0;
for ($i=0; $i < $count; $i++) { foreach($db->query('SELECT * from auction where type=0 order by expire') as $auction){
$auction = MYDB_fetch_array($result);
$radio = ""; $radio = "";
$alert = ""; $alert = "";
$alert2 = ""; $alert2 = "";
@@ -172,13 +166,8 @@ for ($i=0; $i < $count; $i++) {
<td width=148>거래종료</td> <td width=148>거래종료</td>
</tr> </tr>
<?php <?php
$query = "select * from auction where type=1 order by expire";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$count = MYDB_num_rows($result);
$chk = 0; $chk = 0;
for ($i=0; $i < $count; $i++) { foreach($db->query('SELECT * from auction where type=1 order by expire') as $auction){
$auction = MYDB_fetch_array($result);
$radio = ""; $radio = "";
$alert = ""; $alert = "";
$alert2 = ""; $alert2 = "";
hwe/b_betting.php
+31 -27
View File
@@ -9,7 +9,6 @@ $userID = Session::getUserID();
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
$connect=$db->get();
increaseRefresh("베팅장", 1); increaseRefresh("베팅장", 1);
TurnExecutionHelper::executeAllCommand(); TurnExecutionHelper::executeAllCommand();
@@ -86,14 +85,15 @@ if($str3){
<tr align=center><td height=10 colspan=16></td></tr> <tr align=center><td height=10 colspan=16></td></tr>
<tr align=center> <tr align=center>
<?php <?php
$query = "select npc,name,win from tournament where grp>=60 order by grp, grp_no"; $generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); while(count($generalList) < 1){
for ($i=0; $i < 1; $i++) { $generalList[] = [
$general = MYDB_fetch_array($result)??[ 'name'=>'-',
'npc'=>0, 'npc'=>0,
'name'=>'',
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -109,20 +109,21 @@ echo "
</tr> </tr>
<tr align=center>"; <tr align=center>";
$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 = []; $cent = [];
$line = []; $line = [];
$gen = []; $gen = [];
for ($i=0; $i < 1; $i++) { for ($i=0; $i < 1; $i++) {
$cent[$i] = "<font color=white>"; $cent[$i] = "<font color=white>";
} }
for ($i=0; $i < 2; $i++) { $generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
$general = MYDB_fetch_array($result)??[ while(count($generalList) < 2){
$generalList[] = [
'name'=>'-',
'npc'=>0, 'npc'=>0,
'name'=>'',
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -157,17 +158,18 @@ echo "
</tr> </tr>
<tr align=center>"; <tr align=center>";
$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++) { for ($i=0; $i < 2; $i++) {
$cent[$i] = "<font color=white>"; $cent[$i] = "<font color=white>";
} }
for ($i=0; $i < 4; $i++) { $generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4');
$general = MYDB_fetch_array($result)??[ while(count($generalList) < 4){
$generalList[] = [
'name'=>'-',
'npc'=>0, 'npc'=>0,
'name'=>'',
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -202,17 +204,18 @@ echo "
</tr> </tr>
<tr align=center>"; <tr align=center>";
$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++) { for ($i=0; $i < 4; $i++) {
$cent[$i] = "<font color=white>"; $cent[$i] = "<font color=white>";
} }
for ($i=0; $i < 8; $i++) { $generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8');
$general = MYDB_fetch_array($result)??[ while(count($generalList) < 8){
$generalList[] = [
'name'=>'-',
'npc'=>0, 'npc'=>0,
'name'=>'',
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -247,17 +250,18 @@ echo "
</tr> </tr>
<tr align=center>"; <tr align=center>";
$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++) { for ($i=0; $i < 8; $i++) {
$cent[$i] = "<font color=white>"; $cent[$i] = "<font color=white>";
} }
for ($i=0; $i < 16; $i++) { $generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
$general = MYDB_fetch_array($result)??[ while(count($generalList) < 16){
$generalList[] = [
'name'=>'-',
'npc'=>0, 'npc'=>0,
'name'=>'',
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -456,7 +460,7 @@ foreach($tournamentType as $tournamentTypeText=>[$statTypeText,$statFunc,$rankCo
$tournamentRankerList = array_splice($tournamentRankerList, 0, 30); $tournamentRankerList = array_splice($tournamentRankerList, 0, 30);
foreach($tournamentRankerList as $rank=>$ranker){ foreach($tournamentRankerList as $rank=>$ranker){
printRow( printRow(
$rank+1, $rank,
$ranker->getNPCType(), $ranker->getNPCType(),
$ranker->getName(), $ranker->getName(),
($statFunc)($ranker), ($statFunc)($ranker),
hwe/b_currentCity.php
+4 -20
View File
@@ -12,14 +12,10 @@ $userID = Session::getUserID();
$userGrade = Session::getUserGrade(); $userGrade = Session::getUserGrade();
$db = DB::db(); $db = DB::db();
$connect=$db->get();
increaseRefresh("현재도시", 1); increaseRefresh("현재도시", 1);
$query = "select no,nation,officer_level,city from general where owner='{$userID}'"; $me = $db->queryFirstRow('SELECT no,nation,officer_level,city from general where owner=%i', $userID);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']); $myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']);
$templates = new \League\Plates\Engine('templates'); $templates = new \League\Plates\Engine('templates');
@@ -78,9 +74,7 @@ if(!$citylist){
// 재야일때는 현재 도시만 // 재야일때는 현재 도시만
$valid = 0; $valid = 0;
if($me['officer_level'] == 0) { if($me['officer_level'] == 0) {
$query = "select city,name,nation from city where city='{$me['city']}'"; $city = $db->queryFirstRow('SELECT city,name,nation from city where city=%i', $me['city']);
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($cityresult);
echo " echo "
<option value={$city['city']}"; <option value={$city['city']}";
if($city['city'] == $citylist) { echo " selected"; $valid = 1; } if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
@@ -91,12 +85,7 @@ if($me['officer_level'] == 0) {
echo "</option>"; echo "</option>";
} else { } else {
// 아국 도시들 선택 // 아국 도시들 선택
$query = "select city,name,nation from city where nation='{$me['nation']}'"; foreach($db->query('SELECT city,name,nation from city where nation=%i', $me['nation']) as $city){
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$citycount = MYDB_num_rows($cityresult);
for($i=0; $i < $citycount; $i++) {
$city = MYDB_fetch_array($cityresult);
echo " echo "
<option value={$city['city']}"; <option value={$city['city']}";
if($city['city'] == $citylist) { echo " selected"; $valid = 1; } if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
@@ -108,12 +97,7 @@ if($me['officer_level'] == 0) {
} }
// 아국 장수가 있는 타국 도시들 선택 // 아국 장수가 있는 타국 도시들 선택
$query = "select distinct A.city,B.name,B.nation from general A,city B where A.city=B.city and A.nation='{$me['nation']}' and B.nation!='{$me['nation']}'"; foreach ($db->query('SELECT distinct A.city,B.name,B.nation from general A,city B where A.city=B.city and A.nation=%i and B.nation!=%i', $me['nation'], $me['nation']) as $city){
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$citycount = MYDB_num_rows($cityresult);
for($i=0; $i < $citycount; $i++) {
$city = MYDB_fetch_array($cityresult);
echo " echo "
<option value={$city['city']}"; <option value={$city['city']}";
if($city['city'] == $citylist) { echo " selected"; $valid = 1; } if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
hwe/b_myBossInfo.php
+48 -85
View File
@@ -8,15 +8,12 @@ $session = Session::requireGameLogin()->setReadOnly();
$userID = Session::getUserID(); $userID = Session::getUserID();
$db = DB::db(); $db = DB::db();
$connect=$db->get();
increaseRefresh("인사부", 1); increaseRefresh("인사부", 1);
//훼섭 추방을 위해 갱신 //훼섭 추방을 위해 갱신
TurnExecutionHelper::executeAllCommand(); TurnExecutionHelper::executeAllCommand();
$query = "select no,nation,officer_level from general where owner='{$userID}'"; $me = $db->queryFirstRow('SELECT no,nation,officer_level from general where owner=%i', $userID);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$nationID = $me['nation']; $nationID = $me['nation'];
$meLevel = $me['officer_level']; $meLevel = $me['officer_level'];
@@ -25,6 +22,8 @@ if($meLevel == 0) {
exit(); exit();
} }
$nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nation where nation=%i', $nationID); //국가정보
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@@ -51,10 +50,6 @@ var myLevel = <?=$meLevel?>;
<?php <?php
$query = "select nation,name,level,color,chief_set from nation where nation='{$nationID}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result); //국가정보
$ambassadors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'ambassador\' AND nation = %i', $nationID); $ambassadors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'ambassador\' AND nation = %i', $nationID);
$auditors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'auditor\' AND nation = %i', $nationID); $auditors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'auditor\' AND nation = %i', $nationID);
$candidateAmbassadors = []; $candidateAmbassadors = [];
@@ -108,13 +103,13 @@ $lv = getNationChiefLevel($nation['level']);
if($meLevel >= 5) { $btn = "button"; } if($meLevel >= 5) { $btn = "button"; }
else { $btn = "hidden"; } else { $btn = "hidden"; }
$query = "select name,officer_level,picture,imgsvr,belong from general where nation='{$nationID}' and officer_level>={$lv} order by officer_level desc"; $level = Util::convertArrayToDict(
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $db->query(
$level = []; 'SELECT name,officer_level,city,picture,imgsvr,belong from general where nation=%i and officer_level>=%i order by officer_level desc',
for($i=12; $i >= $lv; $i--) { $nationID, $lv
$levels = MYDB_fetch_array($genresult); ),
$level[$levels['officer_level']] = $levels; 'officer_level'
} );
$tigers = $db->query('SELECT value, name $tigers = $db->query('SELECT value, name
@@ -179,16 +174,26 @@ for($i=12; $i >= $lv; $i-=2) {
<td width=498> <td width=498>
<?php <?php
if($meLevel >= 5){
$candidateStrength = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and strength>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
$candidateIntel = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and intel>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
$candidateAny = $db->query('SELECT no,name,officer_level,city,npc,leadership,strength,intel,killturn from general where nation=%i and officer_level!=12 order by npc,binary(name)', $nationID); //추방 때문에 조금 더 김
}
else{
$candidateStrength = [];
$candidateIntel = [];
$candidateAny = [];
}
if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) { if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) {
echo " echo "
<select id='genlist_kick' size=1 style=color:white;background-color:black;>"; <select id='genlist_kick' size=1 style=color:white;background-color:black;>";
$query = "select no,npc,name,officer_level,leadership,strength,intel,killturn from general where nation='{$nationID}' and officer_level!='12' and no!='{$me['no']}' order by npc,binary(name)"; foreach($candidateAny as $general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); if($general['no'] === $me['no']){
$gencount = MYDB_num_rows($result); continue;
}
for($i=0; $i < $gencount; $i++) {
$general = MYDB_fetch_array($result);
echo " echo "
<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} <small>({$general['leadership']}/{$general['strength']}/{$general['intel']}, {$general['killturn']}턴)</small></option>"; <option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} <small>({$general['leadership']}/{$general['strength']}/{$general['intel']}, {$general['killturn']}턴)</small></option>";
} }
@@ -198,9 +203,6 @@ if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) {
<input type=$btn id='btn_kick' value=추방>"; <input type=$btn id='btn_kick' value=추방>";
} }
$query = "select name,city from general where nation='{$nationID}' and officer_level=12";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
$officerLevelText = getOfficerLevelText(11, $nation['level']); $officerLevelText = getOfficerLevelText(11, $nation['level']);
echo " echo "
</td> </td>
@@ -211,7 +213,7 @@ echo "
<tr><td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td></tr> <tr><td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td></tr>
<tr> <tr>
<td width=98 align=right id=bg1>".getOfficerLevelText(12, $nation['level'])."</td> <td width=98 align=right id=bg1>".getOfficerLevelText(12, $nation['level'])."</td>
<td width=398>{$general['name']} 【".CityConst::byID($general['city'])->name."】</td> <td width=398>{$level[12]['name']} 【".CityConst::byID($level[12]['city'])->name."】</td>
<td width=98 align=right id=bg1>{$officerLevelText}</td> <td width=98 align=right id=bg1>{$officerLevelText}</td>
<td width=398> <td width=398>
"; ";
@@ -220,12 +222,8 @@ if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], 11)) {
echo " echo "
<select id='genlist_11' size=1 maxlength=15 style=color:white;background-color:black;> <select id='genlist_11' size=1 maxlength=15 style=color:white;background-color:black;>
<option value=0 data-officer_level='0' data-name=''>____공석____</option>"; <option value=0 data-officer_level='0' data-name=''>____공석____</option>";
$query = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' order by npc,binary(name)";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
for($i=0; $i < $gencount; $i++) { foreach($candidateAny as $general) {
$general = MYDB_fetch_array($result);
if($general['officer_level'] == 11) { if($general['officer_level'] == 11) {
echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>"; echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
} elseif($general['officer_level'] > 1) { } elseif($general['officer_level'] > 1) {
@@ -239,11 +237,8 @@ if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], 11)) {
</select> </select>
<input class='btn_appoint' type=$btn data-officer_level='11' data-officer_level_text='{$officerLevelText}' value=임명>"; <input class='btn_appoint' type=$btn data-officer_level='11' data-officer_level_text='{$officerLevelText}' value=임명>";
} else { } else {
$query = "select name,city from general where nation='{$nationID}' and officer_level='11'"; if(key_exists(11, $level)){
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); echo "{$level[11]['name']} 【".CityConst::byID($level[11]['city'])->name."】";
$general = MYDB_fetch_array($result);
if($general){
echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
} }
} }
@@ -252,14 +247,6 @@ echo "
</tr> </tr>
"; ";
$queries = [];
$queries[10] = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' and strength>='".GameConst::$chiefStatMin."' order by npc,binary(name)";
$queries[9] = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' and intel>='".GameConst::$chiefStatMin."' order by npc,binary(name)";
$queries[8] = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' and strength>='".GameConst::$chiefStatMin."' order by npc,binary(name)";
$queries[7] = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' and intel>='".GameConst::$chiefStatMin."' order by npc,binary(name)";
$queries[6] = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' and strength>='".GameConst::$chiefStatMin."' order by npc,binary(name)";
$queries[5] = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' and intel>='".GameConst::$chiefStatMin."' order by npc,binary(name)";
for($i=10; $i >= $lv; $i--) { for($i=10; $i >= $lv; $i--) {
if($i % 2 == 0) { echo "<tr>"; } if($i % 2 == 0) { echo "<tr>"; }
$officerLevelText = getOfficerLevelText($i, $nation['level']); $officerLevelText = getOfficerLevelText($i, $nation['level']);
@@ -274,12 +261,7 @@ for($i=10; $i >= $lv; $i--) {
<select id='genlist_{$i}' size=1 style=color:white;background-color:black;> <select id='genlist_{$i}' size=1 style=color:white;background-color:black;>
<option value=0 data-officer_level='0' data-name=''>____공석____</option>"; <option value=0 data-officer_level='0' data-name=''>____공석____</option>";
$query = $queries[$i]; foreach(($i%2==0?$candidateStrength:$candidateIntel) as $general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
for($k=0; $k < $gencount; $k++) {
$general = MYDB_fetch_array($result);
if($general['officer_level'] == $i) { if($general['officer_level'] == $i) {
echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>"; echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
} elseif($general['officer_level'] > 1) { } elseif($general['officer_level'] > 1) {
@@ -293,9 +275,7 @@ for($i=10; $i >= $lv; $i--) {
</select> </select>
<input class='btn_appoint' type=$btn data-officer_level='{$i}' data-officer_level_text='$officerLevelText' value=임명>"; <input class='btn_appoint' type=$btn data-officer_level='{$i}' data-officer_level_text='$officerLevelText' value=임명>";
} else { } else {
$query = "select name,city from general where nation='{$nationID}' and officer_level={$i}"; $general = $level[$i]??null;
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
if($general){ if($general){
echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】"; echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
} }
@@ -345,13 +325,12 @@ if($meLevel >= 5) {
<select id='citylist_4' size=1 style=color:white;background-color:black;> <select id='citylist_4' size=1 style=color:white;background-color:black;>
"; ";
$query = "select city,name,region from city where nation='{$nationID}' and (officer_set&(1<<4))=0 order by region,level desc,binary(name)"; // 도시 이름 목록 $cityList = $db->query('SELECT city,name,region,officer_set FROM city WHERE nation=%i ORDER BY region,level DESC,binary(name)', $nationID);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$citycount = MYDB_num_rows($result);
$region = 0; $region = 0;
for($i=0; $i < $citycount; $i++) { foreach($cityList as $city){
$city = MYDB_fetch_array($result); if(isOfficerSet($city['officer_set'], 4)){
continue;
}
if($region != $city['region']) { if($region != $city['region']) {
if($region != 0) { if($region != 0) {
@@ -371,11 +350,7 @@ if($meLevel >= 5) {
<option value=0 data-officer_level='0' data-name=''>____공석____</option> <option value=0 data-officer_level='0' data-name=''>____공석____</option>
"; ";
$query = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' and strength>='".GameConst::$chiefStatMin."' order by npc,binary(name)"; foreach($candidateStrength as $general) {
$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);
if($general['officer_level'] == 4) { if($general['officer_level'] == 4) {
echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>"; echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
} elseif($general['officer_level'] > 1) { } elseif($general['officer_level'] > 1) {
@@ -397,13 +372,11 @@ if($meLevel >= 5) {
<select id='citylist_3' size=1 style=color:white;background-color:black;> <select id='citylist_3' size=1 style=color:white;background-color:black;>
"; ";
$query = "select city,name,region from city where nation='{$nationID}' and (officer_set&(1<<3))=0 order by region,level desc,binary(name)"; // 도시 이름 목록
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$citycount = MYDB_num_rows($result);
$region = 0; $region = 0;
for($i=0; $i < $citycount; $i++) { foreach($cityList as $city){
$city = MYDB_fetch_array($result); if(isOfficerSet($city['officer_set'], 3)){
continue;
}
if($region != $city['region']) { if($region != $city['region']) {
if($region != 0) { if($region != 0) {
@@ -423,11 +396,7 @@ if($meLevel >= 5) {
<option value=0 data-officer_level='0' data-name=''>____공석____</option> <option value=0 data-officer_level='0' data-name=''>____공석____</option>
"; ";
$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)"; foreach($candidateIntel as $general) {
$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);
if($general['officer_level'] == 3) { if($general['officer_level'] == 3) {
echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>"; echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
} elseif($general['officer_level'] > 1) { } elseif($general['officer_level'] > 1) {
@@ -449,13 +418,11 @@ if($meLevel >= 5) {
<select id='citylist_2' size=1 style=color:white;background-color:black;> <select id='citylist_2' size=1 style=color:white;background-color:black;>
"; ";
$query = "select city,name,region from city where nation='{$nationID}' and (officer_set&(1<<2))=0 order by region, level desc,binary(name)"; // 도시 이름 목록
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$citycount = MYDB_num_rows($result);
$region = 0; $region = 0;
for($i=0; $i < $citycount; $i++) { foreach($cityList as $city){
$city = MYDB_fetch_array($result); if(isOfficerSet($city['officer_set'], 2)){
continue;
}
if($region != $city['region']) { if($region != $city['region']) {
if($region != 0) { if($region != 0) {
@@ -475,11 +442,7 @@ if($meLevel >= 5) {
<option value=0>____<span class='name_field'>공석</span>____</option> <option value=0>____<span class='name_field'>공석</span>____</option>
"; ";
$query = "select no,name,officer_level,city from general where nation='{$nationID}' and officer_level!='12' order by npc,binary(name)"; foreach ($candidateAny as $general) {
$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);
if($general['officer_level'] == 2) { if($general['officer_level'] == 2) {
echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>"; echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
} elseif($general['officer_level'] > 1) { } elseif($general['officer_level'] > 1) {
hwe/b_tournament.php
+37 -40
View File
@@ -9,14 +9,11 @@ $userID = Session::getUserID();
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
$connect=$db->get();
increaseRefresh("토너먼트", 1); increaseRefresh("토너먼트", 1);
TurnExecutionHelper::executeAllCommand(); TurnExecutionHelper::executeAllCommand();
$query = "select no,tournament,con,turntime from general where owner='{$userID}'"; $me = $db->queryFirstRow('select no,tournament,con,turntime from general where owner=%i', $userID);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$me = MYDB_fetch_array($result);
$admin = $gameStor->getValues(['tournament','phase','tnmt_msg','tnmt_type','develcost','tnmt_trig']); $admin = $gameStor->getValues(['tournament','phase','tnmt_msg','tnmt_type','develcost','tnmt_trig']);
@@ -158,14 +155,15 @@ echo "
<table align=center width=2000 class='bg0 mimic_flex'> <table align=center width=2000 class='bg0 mimic_flex'>
<tr align=center>"; <tr align=center>";
$query = "select npc,name,win from tournament where grp>=60 order by grp, grp_no"; $generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); while(count($generalList) < 1){
for ($i=0; $i < 1; $i++) { $generalList[] = [
$general = MYDB_fetch_array($result) ?? [ 'name'=>'-',
'name'=>'',
'npc'=>0, 'npc'=>0,
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -181,22 +179,21 @@ echo "
</tr> </tr>
<tr align=center>"; <tr align=center>";
$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 = []; $cent = [];
for ($i=0; $i < 1; $i++) { for ($i=0; $i < 1; $i++) {
$cent[$i] = "<font color=white>"; $cent[$i] = "<font color=white>";
} }
$line = []; $line = [];
$gen = []; $gen = [];
for ($i=0; $i < 2; $i++) { $generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
//FIXME: 다시 작성. null인 경우엔 어쩌려고? while(count($generalList) < 2){
$general = MYDB_fetch_array($result) ?? [ $generalList[] = [
'name'=>'', 'name'=>'-',
'npc'=>0, 'npc'=>0,
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -230,18 +227,19 @@ for ($i=0; $i < 2; $i++) {
echo " echo "
</tr> </tr>
<tr align=center>"; <tr align=center>";
$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++) { for ($i=0; $i < 2; $i++) {
$cent[$i] = "<font color=white>"; $cent[$i] = "<font color=white>";
} }
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');
'name'=>'', while(count($generalList) < 4){
$generalList[] = [
'name'=>'-',
'npc'=>0, 'npc'=>0,
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -276,17 +274,19 @@ echo "
</tr> </tr>
<tr align=center>"; <tr align=center>";
$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++) { for ($i=0; $i < 4; $i++) {
$cent[$i] = "<font color=white>"; $cent[$i] = "<font color=white>";
} }
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');
'name'=>'', while(count($generalList) < 8){
$generalList[] = [
'name'=>'-',
'npc'=>0, 'npc'=>0,
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -321,17 +321,18 @@ echo "
</tr> </tr>
<tr align=center>"; <tr align=center>";
$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++) { for ($i=0; $i < 8; $i++) {
$cent[$i] = "<font color=white>"; $cent[$i] = "<font color=white>";
} }
for ($i=0; $i < 16; $i++) { $generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
$general = MYDB_fetch_array($result) ?? [ while(count($generalList) < 16){
'name'=>'', $generalList[] = [
'name'=>'-',
'npc'=>0, 'npc'=>0,
'win'=>0 'win'=>0
]; ];
}
foreach($generalList as $i=>$general){
if ($general['name'] == "") { if ($general['name'] == "") {
$general['name'] = "-"; $general['name'] = "-";
} }
@@ -410,10 +411,8 @@ for ($i=0; $i < 8; $i++) {
<tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr> <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
<tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>"; <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
$query = "select npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$grp' order by gd desc, gl desc, seq"; $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq',$grp);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); foreach($generalList as $k=>$general) {
for ($k=1; $k <= 4; $k++) {
$general = MYDB_fetch_array($result);
printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']); printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
} }
echo " echo "
@@ -436,10 +435,8 @@ for ($i=0; $i < 8; $i++) {
<tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr> <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
<tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>"; <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
$query = "select npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$grp' order by gd desc, gl desc, seq"; $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq',$grp);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); foreach($generalList as $k=>$general) {
for ($k=1; $k <= 8; $k++) {
$general = MYDB_fetch_array($result);
printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']); printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
} }
echo " echo "
hwe/func_tournament.php
+2 -1
View File
@@ -169,6 +169,7 @@ function getTournament(int $tnmt) {
} }
function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl, $prmt) { function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl, $prmt) {
$k += 1;
if($prmt > 0) { $name = "<font color=orange>".$name."</font>"; } if($prmt > 0) { $name = "<font color=orange>".$name."</font>"; }
elseif($npc >= 2) { $name = "<font color=cyan>".$name."</font>"; } elseif($npc >= 2) { $name = "<font color=cyan>".$name."</font>"; }
elseif($npc == 1) { $name = "<font color=skyblue>".$name."</font>"; } elseif($npc == 1) { $name = "<font color=skyblue>".$name."</font>"; }
@@ -824,7 +825,7 @@ function setRefund() {
//16강자 명성 돈 //16강자 명성 돈
$cost = $gameStor->develcost; $cost = $gameStor->develcost;
$generalIDList = $db->queryFirstColumn('SELECT no FROM tournament WHERE grp<10 AND no >0'); $generalIDList = $db->queryFirstColumn('SELECT no FROM tournament WHERE grp<10 AND no > 0');
$db->update('general', [ $db->update('general', [
'gold'=>$db->sqleval('gold + %i', $cost) 'gold'=>$db->sqleval('gold + %i', $cost)
], 'no IN %li', $generalIDList); ], 'no IN %li', $generalIDList);
hwe/j_get_general_list.php
+2 -2
View File
@@ -53,7 +53,7 @@ if($gameStor->isunited){
$generalList = []; $generalList = [];
foreach($rawGeneralList as $rawGeneral){ foreach($rawGeneralList as $rawGeneral){
[$owner,$no,$picture,$imgsvr,$npc,$age,$nation,$special,$special2,$personal,$name,$ownerName,$injury,$leadership,$strength,$intel,$experience,$dedication,$officerLevel,$killturn,$connect] = $rawGeneral; [$owner,$no,$picture,$imgsvr,$npc,$age,$nation,$special,$special2,$personal,$name,$ownerName,$injury,$leadership,$strength,$intel,$experience,$dedication,$officerLevel,$killturn,$connectCnt] = $rawGeneral;
if(key_exists($owner, $ownerNameList)){ if(key_exists($owner, $ownerNameList)){
$ownerName = $ownerNameList[$owner]; $ownerName = $ownerNameList[$owner];
@@ -84,7 +84,7 @@ foreach($rawGeneralList as $rawGeneral){
getDed($dedication), getDed($dedication),
getOfficerLevelText($officerLevel, $nationArr['level']), getOfficerLevelText($officerLevel, $nationArr['level']),
$killturn, $killturn,
$connect $connectCnt
]; ];
} }
hwe/lib.php
-1
View File
@@ -19,7 +19,6 @@ $loader->addClassMap((function () {
//디버그용 매크로 //디버그용 매크로
ini_set("session.cache_expire", 10080); // minutes ini_set("session.cache_expire", 10080); // minutes
include "MYDB.php";
// 각종 변수 // 각종 변수
define('STEP_LOG', true); define('STEP_LOG', true);
hwe/sql/schema.sql
+24 -21
View File
@@ -417,27 +417,30 @@ ENGINE=Aria DEFAULT CHARSET=utf8mb4;
########################################################################### ###########################################################################
## 토너먼트 테이블 ## 토너먼트 테이블
########################################################################### ###########################################################################
create table tournament ( CREATE TABLE `tournament` (
seq int(6) not null auto_increment, `seq` INT(6) NOT NULL AUTO_INCREMENT,
no int(6) default 0, `no` INT(6) NULL DEFAULT 0,
npc int(6) default 0, `npc` INT(6) NULL DEFAULT 0,
name varchar(64) default '', `name` VARCHAR(64) NULL DEFAULT '',
w varchar(20) default 'None', `w` VARCHAR(20) NULL DEFAULT 'None',
b varchar(20) default 'None', `b` VARCHAR(20) NULL DEFAULT 'None',
h varchar(20) default 'None', `h` VARCHAR(20) NULL DEFAULT 'None',
leadership int(3) default 0, `leadership` INT(3) NULL DEFAULT 0,
strength int(3) default 0, `strength` INT(3) NULL DEFAULT 0,
intel int(3) default 0, `intel` INT(3) NULL DEFAULT 0,
lvl int(3) default 0, `lvl` INT(3) NULL DEFAULT 0,
grp int(2) default 0, `grp` INT(2) NULL DEFAULT 0,
grp_no int(2) default 0, `grp_no` INT(2) NULL DEFAULT 0,
win int(2) default 0, `win` INT(2) NULL DEFAULT 0,
draw int(2) default 0, `draw` INT(2) NULL DEFAULT 0,
lose int(2) default 0, `lose` INT(2) NULL DEFAULT 0,
gl int(2) default 0, `gl` INT(2) NULL DEFAULT 0,
prmt int(1) default 0, `prmt` INT(1) NULL DEFAULT 0,
PRIMARY KEY (seq) PRIMARY KEY (`seq`),
) ENGINE=Aria DEFAULT CHARSET=utf8mb4; INDEX `grp` (`grp`, `grp_no`)
)
COLLATE='utf8mb4_general_ci'
ENGINE=Aria;
########################################################################### ###########################################################################
## 거래 테이블 ## 거래 테이블