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

코드 내의 불필요한 모든 history 제거

Browse Source
This commit is contained in:
Hide_D
2018-03-02 02:02:16 +09:00
parent ea638b8221
commit bebc7580bd
16 changed files with 97 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twe/_admin2_submit.php
+1 -1
View File
@@ -70,7 +70,7 @@ switch($btn) {
sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
}
for($i=0; $i < sizeof($genlist); $i++) {
$query = "select no,leader,power,intel,history from general where no='$genlist[$i]'";
$query = "select no,leader,power,intel from general where no='$genlist[$i]'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
twe/c_myBossInfo.php
+1 -1
View File
@@ -32,7 +32,7 @@ if($btn == "임명") {
exit();
}
} elseif($btn == "추방") {
$query = "select no,name,gold,rice,nation,troop,level,history,npc,picture,imgsvr from general where no='$outlist'";
$query = "select no,name,gold,rice,nation,troop,level,npc,picture,imgsvr from general where no='$outlist'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
twe/c_vote.php
+1 -1
View File
@@ -9,7 +9,7 @@ $query = "select develcost,vote,votecomment from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,userlevel,vote,name,nation,horse,weap,book,item,npc,history from general where owner='{$_SESSION['noMember']}'";
$query = "select no,userlevel,vote,name,nation,horse,weap,book,item,npc from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/d_ally.php
+3 -3
View File
@@ -11,15 +11,15 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,history,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$query = "select no,nation,history,name from general where no='$gen'";
$query = "select no,nation,name from general where no='$gen'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$you = MYDB_fetch_array($result);
$query = "select name,surlimit,history,color from nation where nation='{$you['nation']}'";
$query = "select name,surlimit,color from nation where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$younation = MYDB_fetch_array($result);
twe/d_cancel.php
+3 -3
View File
@@ -9,15 +9,15 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,history,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$query = "select no,nation,history from general where no='$gen'";
$query = "select no,nation from general where no='$gen'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$you = MYDB_fetch_array($result);
$query = "select name,surlimit,history,color from nation where nation='{$you['nation']}'";
$query = "select name,surlimit,color from nation where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$younation = MYDB_fetch_array($result);
twe/d_cease.php
+3 -3
View File
@@ -9,15 +9,15 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,history,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$query = "select no,nation,history from general where no='$gen'";
$query = "select no,nation from general where no='$gen'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$you = MYDB_fetch_array($result);
$query = "select nation,name,surlimit,history,color from nation where nation='{$you['nation']}'";
$query = "select nation,name,surlimit,color from nation where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$younation = MYDB_fetch_array($result);
twe/d_merge.php
+3 -3
View File
@@ -9,11 +9,11 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,history,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$query = "select no,name,nation,history from general where no='$gen'";
$query = "select no,name,nation from general where no='$gen'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$you = MYDB_fetch_array($result);
@@ -25,7 +25,7 @@ $query = "select round(std(power)) as power,round(std(gennum)) as gennum from na
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$stdnation = MYDB_fetch_array($result);
$query = "select nation,name,gennum,power,surlimit,history,color from nation where nation='{$you['nation']}'";
$query = "select nation,name,gennum,power,surlimit,color from nation where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$younation = MYDB_fetch_array($result);
twe/d_scout.php
+2 -2
View File
@@ -15,11 +15,11 @@ $query = "select startyear,year,month,killturn from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,nations,level,troop,history,npc,gold,rice from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,nations,level,troop,npc,gold,rice from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$query = "select no,nation,history from general where no='$gen'";
$query = "select no,nation from general where no='$gen'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$you = MYDB_fetch_array($result);
twe/d_surrender.php
+3 -3
View File
@@ -9,15 +9,15 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,history,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$query = "select no,nation,history from general where no='$gen'";
$query = "select no,nation from general where no='$gen'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$you = MYDB_fetch_array($result);
$query = "select nation,name,power,gold,rice,surlimit,history,color from nation where nation='{$you['nation']}'";
$query = "select nation,name,power,gold,rice,surlimit,color from nation where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$younation = MYDB_fetch_array($result);
twe/func.php
+6 -7
View File
@@ -1912,7 +1912,6 @@ function addNationHistory($nation, $history) {
$nation['history'] = "{$nation['history']}{$history}<br>";
getDB()->query("update nation set history=concat(%s, history) where nation=%i",
$history.'<br>', $nation['nation']);
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
function adminMsg($connect, $skin=1) {
@@ -2802,7 +2801,7 @@ function addAge($connect) {
$admin = MYDB_fetch_array($result);
if($admin['year'] >= $admin['startyear']+3) {
$query = "select no,name,nation,leader,power,intel,history from general where specage<=age and special='0'";
$query = "select no,name,nation,leader,power,intel from general where specage<=age and special='0'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
@@ -2817,7 +2816,7 @@ function addAge($connect) {
pushGenLog($general, $log);
}
$query = "select no,name,nation,leader,power,intel,history,npc,dex0,dex10,dex20,dex30,dex40 from general where specage2<=age and special2='0'";
$query = "select no,name,nation,leader,power,intel,npc,dex0,dex10,dex20,dex30,dex40 from general where specage2<=age and special2='0'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
@@ -2962,7 +2961,7 @@ function PreprocessCommand($connect, $no) {
}
function processCommand($connect, $no) {
$query = "select npc,no,name,userlevel,picture,imgsvr,nation,nations,city,troop,injury,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,history,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
$query = "select npc,no,name,userlevel,picture,imgsvr,nation,nations,city,troop,injury,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
@@ -3026,7 +3025,7 @@ function processCommand($connect, $no) {
}
//장수정보 재로드
$query = "select npc,no,name,userlevel,picture,imgsvr,nation,nations,city,troop,injury,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,history,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
$query = "select npc,no,name,userlevel,picture,imgsvr,nation,nations,city,troop,injury,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
}
@@ -3182,7 +3181,7 @@ function updateTurntime($connect, $no) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,name2,nation,troop,age,turntime,history,killturn,level,deadyear,npc,npc_org,npcmatch,npcid from general where no='$no'";
$query = "select no,name,name2,nation,troop,age,turntime,killturn,level,deadyear,npc,npc_org,npcmatch,npcid from general where no='$no'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
@@ -3734,7 +3733,7 @@ function nextRuler($connect, $general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select nation,name,history from nation where nation='{$general['nation']}'";
$query = "select nation,name from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
twe/func_gamerule.php
+17 -15
View File
@@ -748,7 +748,7 @@ function checkWander($connect) {
$needRefresh = true;
$query = "select no,name,nation,level,history,turntime from general where nation='{$nation['nation']}' and level=12";
$query = "select no,name,nation,level,turntime from general where nation='{$nation['nation']}' and level=12";
$kingResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$king = MYDB_fetch_array($kingResult);
@@ -775,15 +775,15 @@ function checkMerge($connect) {
$dip = MYDB_fetch_array($dipresult);
// 아국군주
$query = "select no,name,history,nation from general where nation='{$dip['me']}' and level='12'";
$query = "select no,name,nation from general where nation='{$dip['me']}' and level='12'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
// 상대군주
$query = "select no,name,history,nation,makenation from general where nation='{$dip['you']}' and level='12'";
$query = "select no,name,nation,makenation from general where nation='{$dip['you']}' and level='12'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$you = MYDB_fetch_array($result);
// 모국
$query = "select nation,name,surlimit,history,totaltech from nation where nation='{$you['nation']}'";
$query = "select nation,name,surlimit,totaltech from nation where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$younation = MYDB_fetch_array($result);
// 아국
@@ -801,7 +801,7 @@ function checkMerge($connect) {
//TODO: 로그 기록에 대한 쿼리는 한번만 할 수 있다.
//피항복국 장수들 역사 기록 및 로그 전달
$query = "select no,name,nation,history from general where nation='{$you['nation']}'";
$query = "select no,name,nation from general where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
$genlog[0] = "<C>●</><D><b>{$mynation['name']}</b></>(와)과 통합에 성공했습니다.";
@@ -811,7 +811,7 @@ function checkMerge($connect) {
addHistory($gen, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$mynation['name']}</b></>과 <D><b>{$you['makenation']}</b></>로 통합에 성공");
}
//항복국 장수들 역사 기록 및 로그 전달
$query = "select no,name,nation,history from general where nation='{$me['nation']}'";
$query = "select no,name,nation from general where nation='{$me['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount2 = MYDB_num_rows($result);
$genlog[0] = "<C>●</><D><b>{$younation['name']}</b></>(와)과 통합에 성공했습니다.";
@@ -889,15 +889,15 @@ function checkSurrender($connect) {
$dip = MYDB_fetch_array($dipresult);
// 아국군주
$query = "select no,name,history,nation from general where nation='{$dip['me']}' and level='12'";
$query = "select no,name,nation from general where nation='{$dip['me']}' and level='12'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
// 상대군주
$query = "select no,name,history,nation,makenation from general where nation='{$dip['you']}' and level='12'";
$query = "select no,name,nation,makenation from general where nation='{$dip['you']}' and level='12'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$you = MYDB_fetch_array($result);
// 모국
$query = "select nation,name,surlimit,history,totaltech from nation where nation='{$you['nation']}'";
$query = "select nation,name,surlimit,totaltech from nation where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$younation = MYDB_fetch_array($result);
// 아국
@@ -914,7 +914,7 @@ function checkSurrender($connect) {
$npccount2 = MYDB_num_rows($result);
//피항복국 장수들 역사 기록 및 로그 전달
$query = "select no,name,nation,history from general where nation='{$you['nation']}'";
$query = "select no,name,nation from general where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
$genlog[0] = "<C>●</><D><b>{$mynation['name']}</b></> 합병에 성공했습니다.";
@@ -924,7 +924,7 @@ function checkSurrender($connect) {
addHistory($gen, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$mynation['name']}</b></> 합병에 성공");
}
//항복국 장수들 역사 기록 및 로그 전달
$query = "select no,name,nation,history from general where nation='{$me['nation']}'";
$query = "select no,name,nation from general where nation='{$me['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount2 = MYDB_num_rows($result);
$genlog[0] = "<C>●</><D><b>{$younation['name']}</b></>(으)로 항복하여 수도로 이동합니다.";
@@ -1002,7 +1002,7 @@ function updateNationState($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select nation,name,level,history from nation";
$query = "select nation,name,level from nation";
$nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nationcount = MYDB_num_rows($nationresult);
@@ -1203,7 +1203,7 @@ function checkEmperior($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select nation,name,history from nation where level>0";
$query = "select nation,name from nation where level>0";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
@@ -1233,7 +1233,7 @@ function checkEmperior($connect) {
CheckHall($connect, $general['no']);
}
$query = "select nation,name,type,color,gold,rice,power,gennum,history from nation where nation='{$nation['nation']}'";
$query = "select nation,name,type,color,gold,rice,power,gennum from nation where nation='{$nation['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -1329,6 +1329,8 @@ function checkEmperior($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$statGeneral = MYDB_fetch_array($result);
$nationHistory = getDB()->queryFirstField('SELECT `history` FROM `nation` WHERE `nation` = %i', $nation['nation']);
$query = "
insert into emperior (
phase,
@@ -1351,7 +1353,7 @@ function checkEmperior($connect) {
'{$level10['name']}', '{$level10['picture']}', '{$level9['name']}', '{$level9['picture']}',
'{$level8['name']}', '{$level8['picture']}', '{$level7['name']}', '{$level7['picture']}',
'{$level6['name']}', '{$level6['picture']}', '{$level5['name']}', '{$level5['picture']}',
'$tigerstr', '$eaglestr', '$gen', '{$nation['history']}'
'$tigerstr', '$eaglestr', '$gen', '{$nationHistory}'
)";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
twe/func_process.php
+46 -36
View File
@@ -3641,9 +3641,8 @@ function process_46($connect, &$general) {
$query = "update nation set name='{$general['makenation']}',color='$color',level=1,type='$type',capital='{$general['city']}' where nation='{$general['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "select nation,name,history from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
refreshNationStaticInfo();
$nation = getNationStaticInfo($general['nation']);
// 현 도시 소속지로
$query = "update city set nation='{$nation['nation']}',conflict='',conflict2='' where city='{$general['city']}'";
@@ -3658,7 +3657,7 @@ function process_46($connect, &$general) {
$exp = 1000;
$ded = 1000;
refreshNationStaticInfo();
// 성격 보정
$exp = CharExperience($exp, $general['personal']);
@@ -4077,7 +4076,7 @@ function process_52($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,level,gold,rice,surlimit,history,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,name,level,gold,rice,surlimit,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$mynation = MYDB_fetch_array($result);
@@ -4092,7 +4091,7 @@ function process_52($connect, &$general) {
if($gold < 0) { $gold = 0; }
if($rice < 0) { $rice = 0; }
$query = "select nation,name,gold,rice,surlimit,history from nation where nation='$which'";
$query = "select nation,name,gold,rice,surlimit from nation where nation='$which'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$younation = MYDB_fetch_array($result);
@@ -4247,11 +4246,11 @@ function process_54($connect, &$general) {
$command = DecodeCommand($general['turn0']);
$who = $command[1];
$query = "select no,name,nation,history from general where no='$who'";
$query = "select no,name,nation from general where no='$who'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nextruler = MYDB_fetch_array($result);
$query = "select nation,name,history from nation where nation='{$general['nation']}'";
$query = "select nation,name from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -4326,12 +4325,23 @@ function process_55($connect, &$general) {
} elseif($general['makelimit'] > 0) {
$log[count($log)] = "<C>●</>{$admin['month']}월:재야가 된지 12시간이 지나야 합니다. 거병 실패. <1>$date</>";
} else {
$query = "insert into nation (name, color, gold, rice, rate, bill, tricklimit, surlimit, type, gennum) values ('$makename', '330000', '0', '$_baserice', '20' ,'100', '36', '72', '0', '1')";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "select nation,name,history from nation where name='$makename'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
getDB()->insert('nation', [
'name'=>$makename,
'color'=>'#330000',
'gold'=>0,
'rice'=>GameConst::baserice,
'rate'=>20,
'bill'=>100,
'tricklimit'=>36,
'surlimit'=>72,
'type'=>0,
'gennum'=>1
]);
$nationID = getDB()->insertId();
refreshNationStaticInfo();
$nation = getNationStaticInfo($nationID);
$exp = 100;
$ded = 100;
@@ -4353,7 +4363,7 @@ function process_55($connect, &$general) {
addNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>{$general['name']}</>(이)가 <G><b>{$city['name']}</b></>에서 거병");
// 외교테이블 추가
refreshNationStaticInfo();
foreach(getAllNationStaticInfo() as $younation){
if($nation['nation'] == $you['nation']){
@@ -4429,7 +4439,7 @@ function process_57($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select nation,name,history from nation where nation='{$general['nation']}'";
$query = "select nation,name from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -4437,7 +4447,7 @@ function process_57($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select npc,no,name,killturn,history from general where nation='{$general['nation']}' and level='12'";
$query = "select npc,no,name,killturn from general where nation='{$general['nation']}' and level='12'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$ruler = MYDB_fetch_array($result);
@@ -4583,14 +4593,14 @@ function process_62($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,history,l{$general['level']}turn0,color from nation where nation='{$general['nation']}'";
$query = "select nation,name,l{$general['level']}turn0,color from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$command = DecodeCommand($nation["l{$general['level']}turn0"]);
$which = $command[1];
$query = "select nation,name,color,history from nation where nation='$which'";
$query = "select nation,name,color from nation where nation='$which'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$younation = MYDB_fetch_array($result);
@@ -4809,7 +4819,7 @@ function process_65($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$citycount = MYDB_num_rows($result);
$query = "select nation,capital,name,surlimit,history,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,capital,name,surlimit,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -4897,7 +4907,7 @@ function process_66($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,gold,rice,surlimit,history,l{$general['level']}term,l{$general['level']}turn0,capital,capset from nation where nation='{$general['nation']}'";
$query = "select nation,name,gold,rice,surlimit,l{$general['level']}term,l{$general['level']}turn0,capital,capset from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -4984,7 +4994,7 @@ function process_67($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,gold,rice,surlimit,history,l{$general['level']}term,l{$general['level']}turn0,capital,capset from nation where nation='{$general['nation']}'";
$query = "select nation,name,gold,rice,surlimit,l{$general['level']}term,l{$general['level']}turn0,capital,capset from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -5072,7 +5082,7 @@ function process_68($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,gold,rice,surlimit,history,l{$general['level']}term,l{$general['level']}turn0,capital,capset from nation where nation='{$general['nation']}'";
$query = "select nation,name,gold,rice,surlimit,l{$general['level']}term,l{$general['level']}turn0,capital,capset from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -5174,7 +5184,7 @@ function process_71($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,type,tricklimit,history,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -5276,7 +5286,7 @@ function process_72($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,type,tricklimit,history,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -5387,7 +5397,7 @@ function process_73($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,type,tricklimit,history,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -5398,7 +5408,7 @@ function process_73($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destcity = MYDB_fetch_array($result);
$query = "select nation,name,history from nation where nation='{$destcity['nation']}'";
$query = "select nation,name from nation where nation='{$destcity['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destnation = MYDB_fetch_array($result);
@@ -5514,7 +5524,7 @@ function process_74($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,type,tricklimit,history,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -5525,7 +5535,7 @@ function process_74($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destcity = MYDB_fetch_array($result);
$query = "select nation,name,history from nation where nation='{$destcity['nation']}'";
$query = "select nation,name from nation where nation='{$destcity['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destnation = MYDB_fetch_array($result);
@@ -5653,14 +5663,14 @@ function process_75($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,type,tricklimit,history,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$command = DecodeCommand($nation["l{$general['level']}turn0"]);
$which = $command[1];
$query = "select nation,name,history from nation where nation='$which'";
$query = "select nation,name from nation where nation='$which'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destnation = MYDB_fetch_array($result);
@@ -5775,7 +5785,7 @@ function process_76($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,type,tricklimit,history,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
@@ -5990,14 +6000,14 @@ function process_77($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,type,tricklimit,history,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$command = DecodeCommand($nation["l{$general['level']}turn0"]);
$which = $command[1];
$query = "select nation,name,history from nation where nation='$which'";
$query = "select nation,name from nation where nation='$which'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destnation = MYDB_fetch_array($result);
@@ -6114,14 +6124,14 @@ function process_78($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,name,type,tricklimit,history,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$command = DecodeCommand($nation["l{$general['level']}turn0"]);
$which = $command[1];
$query = "select nation,name,history from nation where nation='$which'";
$query = "select nation,name from nation where nation='$which'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destnation = MYDB_fetch_array($result);
@@ -6233,7 +6243,7 @@ function process_81($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($result);
$query = "select nation,colset,name,type,tricklimit,history,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$query = "select nation,colset,name,type,tricklimit,l{$general['level']}term,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
twe/func_tournament.php
+2 -2
View File
@@ -631,10 +631,10 @@ function setGift($connect, $tnmt_type, $tnmt, $phase) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//장수열전 기록
$query = "select no,history from general where no={$general['no']}";
$query = "select no from general where no={$general['no']}";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gen1 = MYDB_fetch_array($result);
$query = "select no,history from general where no={$general2['no']}";
$query = "select no from general where no={$general2['no']}";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gen2 = MYDB_fetch_array($result);
addHistory($gen1, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>{$tp}</> 대회에서 우승");
twe/join_post.php
+1 -1
View File
@@ -222,7 +222,7 @@ if($id_num) {
'special2' => $special2
]);
$me = $db->queryFirstRow("select no,name,history from general where owner= %i", $userID);
$me = $db->queryFirstRow("select no,name from general where owner= %i", $userID);
if($me['name'] == "") {
$r = rand() % 999 + 1;
twe/process_war.php
+4 -4
View File
@@ -58,11 +58,11 @@ function processWar($connect, $general, $city) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$originCity = MYDB_fetch_array($result);
$query = "select nation,level,name,history,capital,tech,type from nation where nation='{$general['nation']}'";
$query = "select nation,level,name,capital,tech,type from nation where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$query = "select nation,level,name,history,rice,capital,tech,type from nation where nation='{$city['nation']}'";
$query = "select nation,level,name,rice,capital,tech,type from nation where nation='{$city['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destnation = MYDB_fetch_array($result);
@@ -1709,7 +1709,7 @@ function ConquerCity($connect, $game, $general, $city, $nation, $destnation) {
$loseGeneralGold = 0;
$loseGeneralRice = 0;
//멸망국 장수들 역사 기록 및 로그 전달
$query = "select no,name,nation,npc,gold,rice,history from general where nation='{$city['nation']}'";
$query = "select no,name,nation,npc,gold,rice from general where nation='{$city['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
$genlog[0] = "<C>●</><D><b>{$losenation['name']}</b></>(이)가 <R>멸망</>했습니다.";
@@ -1888,7 +1888,7 @@ function ConquerCity($connect, $game, $general, $city, $nation, $destnation) {
SetNationFront($connect, $nation['nation']);
SetNationFront($connect, $destnation['nation']);
} else {
$query = "select name,nation,history from nation where nation='$conquerNation'";
$query = "select name,nation from nation where nation='$conquerNation'";
$conquerResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$conquerNationArray = MYDB_fetch_array($conquerResult);
twe/select_npc_post.php
+1 -1
View File
@@ -99,7 +99,7 @@ if($admin['npcmode'] != 1) {
";
MYDB_query($query, $connect) or Error("join_post ".MYDB_error($connect),"");
$query = "select no,name,history from general where user_id='$id'";
$query = "select no,name from general where user_id='$id'";
$result = MYDB_query($query, $connect) or Error("join_post ".MYDB_error($connect),"");
$me = MYDB_fetch_array($result);