단순 국가 정보를 받아올 때 query하지 않고 저장된 값을 쓰도록 변경

This commit is contained in:
2018-02-24 17:41:04 +09:00
parent b28603d16f
commit 2cd7d525a4
23 changed files with 57 additions and 153 deletions
+1 -5
View File
@@ -66,12 +66,8 @@ $sel[$type] = "selected";
<td align=center id=bg1>비 고</td>
</tr>
<?php
$query = "select nation,name,color from nation";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nationcount = MYDB_num_rows($result);
for($i=0; $i < $nationcount; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
$nationName[$nation['nation']] = $nation['name'];
$nationColor[$nation['nation']] = $nation['color'];
}
+1 -6
View File
@@ -46,12 +46,7 @@ if(isset($btn) && $btn == "NPC 보기") {
$sel = "npc<2";
}
$query = "select nation,name,color from nation";
$nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nationcount = MYDB_num_rows($nationresult);
for($i=0; $i < $nationcount; $i++) {
$nation = MYDB_fetch_array($nationresult);
foreach(getAllNationStaticInfo() as $nation){
$nationName[$nation['nation']] = $nation['name'];
$nationColor[$nation['nation']] = $nation['color'];
}
+1 -6
View File
@@ -58,13 +58,8 @@ if(!isset($type) || $type == 0) {
</td></tr>
</table>
<?php
$query = "select nation,name,level from nation";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$nationname[0] = "-";
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
$nationname[$nation['nation']] = $nation['name'];
$nationlevel[$nation['nation']] = $nation['level'];
}
+1 -6
View File
@@ -37,13 +37,8 @@ $sel[$type] = "selected";
</td></tr>
</table>
<?php
$query = "select nation,name from nation";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$nationname[0] = "-";
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
$nationname[$nation['nation']] = $nation['name'];
}
+1 -6
View File
@@ -216,12 +216,7 @@ $query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($genresult);
$query = "select nation,level,name from nation"; // 국가 이름 목록
$nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nationcount = MYDB_num_rows($nationresult);
for($i=0; $i < $nationcount; $i++) {
$nation = MYDB_fetch_array($nationresult);
foreach(getAllNationStaticInfo() as $nation){
$nationname[$nation['nation']] = $nation['name'];
$nationlevel[$nation['nation']] = $nation['level'];
}
+11 -4
View File
@@ -142,7 +142,7 @@ function getGeneralName($forceExit=false)
/**
* nationID를 이용하여 국가의 '어지간해선' 변경되지 않는 정보(이름, 색, 성향, 규모, 수도)를 반환해줌
*
* @param int|null $nationID 국가 코드
* @param int|null $nationID 국가 코드, -1인 경우 전체, null인 경우 수행하지 않음
* @param bool $forceRefresh 강제 갱신 여부
*
* @return array|null nationID에 해당하는 국가가 있을 경우 array 반환. 그외의 경우 null
@@ -160,9 +160,9 @@ function getNationStaticInfo($nationID, $forceRefresh=false)
}
if($nationList === null){
$nationList = ArrayToDict(
getDB()->query("select nation, name, color, type, level, capital from nation"),
"nation");
$nationAll = getDB()->query("select nation, name, color, type, level, capital from nation");
$nationList = ArrayToDict($nationAll, "nation");
$nationList[-1] = $nationAll;
}
if(isset($nationList[$nationID])){
@@ -178,6 +178,13 @@ function refreshNationStaticInfo(){
getNationStaticInfo(null, true);
}
/**
* getNationStaticInfo(-1) 의 단축형
*/
function getAllNationStaticInfo(){
return getNationStaticInfo(-1);
}
function GetImageURL($imgsvr) {
global $image, $image1;
if($imgsvr == 0) {
+12 -17
View File
@@ -666,12 +666,10 @@ group by A.nation
$dipCount = MYDB_num_rows($result);
for($i=0; $i < $dipCount; $i++) {
$dip = MYDB_fetch_array($result);
$query = "select name from nation where nation='{$dip['me']}' or nation='{$dip['you']}'";
$nationResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($nationResult);
$name1 = $nation['name'];
$nation = MYDB_fetch_array($nationResult);
$name2 = $nation['name'];
$nation1 = getNationStaticInfo($dip['me']);
$name1 = $nation1['name'];
$nation2 = getNationStaticInfo($dip['you']);
$name2 = $nation2['name'];
$history[count($history)] = "<C>●</>{$admin['year']}{$admin['month']}월:<R><b>【개전】</b></><D><b>$name1</b></>(와)과 <D><b>$name2</b></>(이)가 <R>전쟁</>을 시작합니다.";
}
//휴전국 로그
@@ -684,12 +682,10 @@ group by A.nation
//양측 기간 모두 0이 되는 상황이면 휴전
if($dip['term1'] <= 1 && $dip['term2'] <= 1) {
$query = "select name from nation where nation='{$dip['me']}' or nation='{$dip['you']}'";
$nationResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($nationResult);
$name1 = $nation['name'];
$nation = MYDB_fetch_array($nationResult);
$name2 = $nation['name'];
$nation1 = getNationStaticInfo($dip['me']);
$name1 = $nation1['name'];
$nation2 = getNationStaticInfo($dip['you']);
$name2 = $nation2['name'];
$history[count($history)] = "<C>●</>{$admin['year']}{$admin['month']}월:<R><b>【휴전】</b></><D><b>$name1</b></>(와)과 <D><b>$name2</b></>(이)가 <S>휴전</>합니다.";
//기한 되면 휴전으로
$query = "update diplomacy set state='2',term='0' where (me='{$dip['me']}' and you='{$dip['you']}') or (me='{$dip['you']}' and you='{$dip['me']}')";
@@ -726,11 +722,10 @@ group by A.nation
// 시스템 거래건 등록
registerAuction($connect);
//전방설정
$query = "select nation from nation where level>0";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
if($nation['level'] <= 0){
continue;
}
SetNationFront($connect, $nation['nation']);
}
}
+2 -4
View File
@@ -220,7 +220,7 @@ function getMailboxList(){
}
$nations = [];
foreach ($db->query('select nation, name, color from nation') as $nation) {
foreach (getAllNationStaticInfo() as $nation) {
$nations[$nation['nation']] = $nation;
}
$nations[0] = [
@@ -262,9 +262,7 @@ function genList($connect) {
$you = MYDB_fetch_array($result);
}
$query = "select nation,color,name from nation where nation='{$me['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($me['nation']);
echo "
<select name=genlist size=1 style=color:white;background-color:black;font-size:13>
+9 -27
View File
@@ -176,9 +176,7 @@ function process_1($connect, &$general, $type) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($general['nation']);
$lbonus = setLeadershipBonus($general, $nation['level']);
@@ -365,9 +363,7 @@ function process_4($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($general['nation']);
$lbonus = setLeadershipBonus($general, $nation['level']);
@@ -457,9 +453,7 @@ function process_5($connect, &$general, $type) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($general['nation']);
$lbonus = setLeadershipBonus($general, $nation['level']);
@@ -551,9 +545,7 @@ function process_7($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($general['nation']);
$lbonus = setLeadershipBonus($general, $nation['level']);
@@ -642,9 +634,7 @@ function process_8($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($general['nation']);
$lbonus = setLeadershipBonus($general, $nation['level']);
@@ -736,9 +726,7 @@ function process_9($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($general['nation']);
$lbonus = setLeadershipBonus($general, $nation['level']);
@@ -1005,9 +993,7 @@ function process_13($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select level from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($general['nation']);
$lbonus = setLeadershipBonus($general, $nation['level']);
@@ -2418,9 +2404,7 @@ function process_32($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destcity = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($general['nation']);
$query = "select nation,supply from city where city='{$general['city']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2548,9 +2532,7 @@ function process_33($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$mynation = MYDB_fetch_array($result);
$mynation = getNationStaticInfo($general['nation']);
$query = "select nation,supply from city where city='{$general['city']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+5 -9
View File
@@ -210,9 +210,7 @@ function getGoldIncome($connect, $nationNo, $rate, $admin_rate, $type) {
$level2[$gen['no']] = $gen['city'];
}
$query = "select capital,level from nation where nation='$nationNo'"; // 수도
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($cityresult);
$nation = getNationStaticInfo($nationNo);
$query = "select * from city where nation='$nationNo' and supply='1'"; // 도시 목록
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -249,13 +247,11 @@ function getGoldIncome($connect, $nationNo, $rate, $admin_rate, $type) {
}
function processDeadIncome($connect, $admin_rate) {
$query = "select nation,type from nation where level>0"; // 도시 가진 국가
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nationCount = MYDB_num_rows($result);
for($i=0; $i < $nationCount; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
if($nation['level'] <= 0){
continue;
}
$income = getDeadIncome($connect, $nation['nation'], $nation['type'], $admin_rate);
// 단기수입 금만적용
+1 -3
View File
@@ -1602,9 +1602,7 @@ function addConflict($connect, $city, $nationnum, $mykillnum) {
if($nationlist[$i] == $nationnum) break;
}
if($i != 0 && $i == count($nationlist)) { // 두번째 나라부터 분쟁 가담 메시지 출력
$query = "select name from nation where nation='$nationnum'";
$result = MYDB_query($query, $connect) or Error("addConflict ".MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nation = getNationStaticInfo($nationnum);
$history[count($history)] = "<C>●</>{$game['year']}{$game['month']}월:<M><b>【분쟁】</b></><D><b>{$nation['name']}</b></>(이)가 <G><b>{$city['name']}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.";
pushHistory($connect, $history);
+1 -5
View File
@@ -776,11 +776,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -878,11 +878,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -878,11 +878,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -1161,11 +1161,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -1681,11 +1681,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -1729,11 +1729,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -1263,11 +1263,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -975,11 +975,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -1021,11 +1021,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -1072,11 +1072,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -924,11 +924,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}
+1 -5
View File
@@ -849,11 +849,7 @@ MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update city set pop=pop2*0.7,agri=agri2*0.7,comm=comm2*0.7,secu=secu2*0.7,rate=80 where nation=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//전방설정
$query = "select nation from nation";
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=0; $i < $count; $i++) {
$nation = MYDB_fetch_array($result);
foreach(getAllNationStaticInfo() as $nation){
SetNationFront($connect, $nation['nation']);
}