From a4aa0ba476313e2ab224e8efcfd487509a6ec520 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 21 Jan 2018 02:09:20 +0900 Subject: [PATCH] =?UTF-8?q?array=20=EC=B0=B8=EC=A1=B0=20=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=20=EB=A7=88=EC=A0=80=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- twe/func.php | 18 +++++++++--------- twe/func_tournament.php | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/twe/func.php b/twe/func.php index e8336382..8f1ad94e 100644 --- a/twe/func.php +++ b/twe/func.php @@ -6802,12 +6802,12 @@ function disaster($connect) { $city = MYDB_fetch_array($cityresult); //호황 발생 도시 선택 ( 기본 3% 이므로 약 3개 도시 ) //재해 발생 도시 선택 ( 기본 6% 이므로 약 6개 도시 ) - if($isgood == 1) { $ratio = 3 + round(1.0*$city['secu']/$city[secu2]*3); } // 3 ~ 6% - else { $ratio = 6 - round(1.0*$city['secu']/$city[secu2]*3); } // 3 ~ 6% + if($isgood == 1) { $ratio = 3 + round(1.0*$city['secu']/$city['secu2']*3); } // 3 ~ 6% + else { $ratio = 6 - round(1.0*$city['secu']/$city['secu2']*3); } // 3 ~ 6% if(rand()%100+1 < $ratio) { $disastercity[count($disastercity)] = $city['city']; - $disasterratio[count($disastercity)] = 1.0 * $city['secu'] / $city[secu2]; + $disasterratio[count($disastercity)] = 1.0 * $city['secu'] / $city['secu2']; $disastername .= $city['name']." "; } } @@ -6926,13 +6926,13 @@ function disaster($connect) { $city['comm'] *= $ratio; $city['secu'] *= $ratio; $city['def'] *= $ratio; $city['wall'] *= $ratio; - if($city['pop'] > $city[pop2]) { $city['pop'] = $city[pop2]; } + if($city['pop'] > $city['pop2']) { $city['pop'] = $city['pop2']; } if($city['rate'] > 100) { $city['rate'] = 100; } - if($city['agri'] > $city[agri2]) { $city['agri'] = $city[agri2]; } - if($city['comm'] > $city[comm2]) { $city['comm'] = $city[comm2]; } - if($city['secu'] > $city[secu2]) { $city['secu'] = $city[secu2]; } - if($city['def'] > $city[def2]) { $city['def'] = $city[def2]; } - if($city['wall'] > $city[wall2]) { $city['wall'] = $city[wall2]; } + if($city['agri'] > $city['agri2']) { $city['agri'] = $city['agri2']; } + if($city['comm'] > $city['comm2']) { $city['comm'] = $city['comm2']; } + if($city['secu'] > $city['secu2']) { $city['secu'] = $city['secu2']; } + if($city['def'] > $city['def2']) { $city['def'] = $city['def2']; } + if($city['wall'] > $city['wall2']) { $city['wall'] = $city['wall2']; } $query = "update city set state='$state',pop='{$city['pop']}',rate='{$city['rate']}',agri='{$city['agri']}',comm='{$city['comm']}',secu='{$city['secu']}',def='{$city['def']}',wall='{$city['wall']}' where city='$disastercity[$i]'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/twe/func_tournament.php b/twe/func_tournament.php index 55410edf..3e3810bb 100644 --- a/twe/func_tournament.php +++ b/twe/func_tournament.php @@ -748,7 +748,7 @@ function fight($connect, $tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) { case 3: $log[count($log)] = "● {$gen1['name']}의 ".getHorseName($gen1['h'])."(이)가 갈기를 휘날립니다!"; break; } } - if($gen1[w] > 6 && ($tnmt_type == 0 || $tnmt_type == 2)) { + if($gen1['w'] > 6 && ($tnmt_type == 0 || $tnmt_type == 2)) { switch(rand()%4) { case 0: $log[count($log)] = "● {$gen1['name']}의 ".getWeapName($gen1['w'])."(이)가 번뜩입니다!"; break; case 1: $log[count($log)] = "● {$gen1['name']}의 ".getWeapName($gen1['w'])."(이)가 푸르게 빛납니다!"; break; @@ -756,7 +756,7 @@ function fight($connect, $tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) { case 3: $log[count($log)] = "● {$gen1['name']}의 손에는 ".getWeapName($gen1['w'])."(이)가 쥐어져 있습니다!"; break; } } - if($gen1[b] > 6 && ($tnmt_type == 0 || $tnmt_type == 3)) { + if($gen1['b'] > 6 && ($tnmt_type == 0 || $tnmt_type == 3)) { switch(rand()%4) { case 0: $log[count($log)] = "● {$gen1['name']}(이)가 ".getBookName($gen1['b'])."(을)를 펼쳐듭니다!"; break; case 1: $log[count($log)] = "● {$gen1['name']}(이)가 ".getBookName($gen1['b'])."(을)를 품에서 꺼냅니다!"; break; @@ -764,7 +764,7 @@ function fight($connect, $tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) { case 3: $log[count($log)] = "● {$gen1['name']}의 손에는 ".getBookName($gen1['b'])."(이)가 쥐어져 있습니다!"; break; } } - if($gen2[h] > 6 && ($tnmt_type == 0 || $tnmt_type == 1)) { + if($gen2['h'] > 6 && ($tnmt_type == 0 || $tnmt_type == 1)) { switch(rand()%4) { case 0: $log[count($log)] = "● {$gen2['name']}의 ".getHorseName($gen2['h'])."(이)가 포효합니다!"; break; case 1: $log[count($log)] = "● {$gen2['name']}의 ".getHorseName($gen2['h'])."(이)가 그 위용을 뽐냅니다!"; break; @@ -772,7 +772,7 @@ function fight($connect, $tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) { case 3: $log[count($log)] = "● {$gen2['name']}의 ".getHorseName($gen2['h'])."(이)가 갈기를 휘날립니다!"; break; } } - if($gen2[w] > 6 && ($tnmt_type == 0 || $tnmt_type == 2)) { + if($gen2['w'] > 6 && ($tnmt_type == 0 || $tnmt_type == 2)) { switch(rand()%4) { case 0: $log[count($log)] = "● {$gen2['name']}의 ".getWeapName($gen2['w'])."(이)가 번뜩입니다!"; break; case 1: $log[count($log)] = "● {$gen2['name']}의 ".getWeapName($gen2['w'])."(이)가 푸르게 빛납니다!"; break; @@ -780,7 +780,7 @@ function fight($connect, $tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) { case 3: $log[count($log)] = "● {$gen2['name']}의 손에는 ".getWeapName($gen2['w'])."(이)가 쥐어져 있습니다!"; break; } } - if($gen2[b] > 6 && ($tnmt_type == 0 || $tnmt_type == 3)) { + if($gen2['b'] > 6 && ($tnmt_type == 0 || $tnmt_type == 3)) { switch(rand()%4) { case 0: $log[count($log)] = "● {$gen2['name']}(이)가 ".getBookName($gen2['b'])."(을)를 펼쳐듭니다!"; break; case 1: $log[count($log)] = "● {$gen2['name']}(이)가 ".getBookName($gen2['b'])."(을)를 품에서 꺼냅니다!"; break;