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

성벽 공격시 '국가'를 구해오는 과정에서 공백지를 고려하지 않은 부분 수정

Browse Source
This commit is contained in:
Hide_D
2018-04-12 04:16:02 +09:00
parent 6881b531d7
commit cd8ec0687f
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_history.php
+3
View File
@@ -129,6 +129,9 @@ function getBatLogRecent(int $no, int $count) {
//DB-based //DB-based
function pushNationHistory($nation, $history) { function pushNationHistory($nation, $history) {
if(!$nation || !$nation['nation']){
return;
}
DB::db()->query("UPDATE nation set history=concat(%s, history) where nation=%i", DB::db()->query("UPDATE nation set history=concat(%s, history) where nation=%i",
$history.'<br>', $nation['nation']); $history.'<br>', $nation['nation']);
} }
hwe/process_war.php
+13 -3
View File
@@ -86,7 +86,13 @@ function processWar($general, $city) {
$query = "select nation,level,name,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),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destnation = MYDB_fetch_array($result); $destnation = MYDB_fetch_array($result) ?: [
'nation'=>0,
'level'=>0,
'rice'=>2000,
'type'=>0,
'tech'=>0
];
//장수수 구함 //장수수 구함
$query = "select no from general where nation='{$general['nation']}'"; $query = "select no from general where nation='{$general['nation']}'";
@@ -463,8 +469,12 @@ function processWar($general, $city) {
// 죽은수 기술로 누적 // 죽은수 기술로 누적
$num = Util::round($mykillnum * 0.01); $num = Util::round($mykillnum * 0.01);
// 국가보정 // 국가보정
if($destnation['type'] == 3 || $destnation['type'] == 13) { $num *= 1.1; } if($destnation['type'] == 3 || $destnation['type'] == 13){
if($destnation['type'] == 5 || $destnation['type'] == 6 || $destnation['type'] == 7 || $destnation['type'] == 8 || $destnation['type'] == 12) { $num *= 0.9; } $num *= 1.1;
}
if($destnation['type'] == 5 || $destnation['type'] == 6 || $destnation['type'] == 7 || $destnation['type'] == 8 || $destnation['type'] == 12) {
$num *= 0.9;
}
// 부드러운 기술 제한 // 부드러운 기술 제한
if(TechLimit($game['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); } if(TechLimit($game['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); }
$query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$destgencount' where nation='{$destnation['nation']}'"; $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$destgencount' where nation='{$destnation['nation']}'";