v0.10.1까지 merge

This commit is contained in:
2019-04-07 23:35:54 +09:00
46 changed files with 482 additions and 228 deletions
+13 -13
View File
@@ -490,7 +490,7 @@ function command_22($turn, $command) {
}
foreach(getAllNationStaticInfo() as $nation){
echo "<option style=color:{$nation['color']}>【 {$nation['name']} 】</option>";
echo "<option style='color:{$nation['color']}'>【 {$nation['name']} 】</option>";
$query = "select no,name,npc from general where nation='{$nation['nation']}' and level!='12' and npc<2 order by npc,binary(name)";
$genresult = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
@@ -1492,9 +1492,9 @@ function command_51($turn, $command) {
$nation = MYDB_fetch_array($result);
if($myNation['power'] <= $nation['power'] * 3 || !isNeighbor($me['nation'], $nation['nation'])) {
echo "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='color:{$nation['color']};background-color:red;' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
} else {
echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='color:{$nation['color']}' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
}
echo "
@@ -1545,7 +1545,7 @@ function command_52($turn, $command) {
foreach(getAllNationStaticInfo() as $nation) {
echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='color:{$nation['color']}' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -1636,9 +1636,9 @@ function command_53($turn, $command) {
$nation = MYDB_fetch_array($result);
if(($myNation['power']+$nation['power'])/2 > $cond1 || ($myNation['gennum']+$nation['gennum'])/2 > $cond2 || !isNeighbor($me['nation'], $nation['nation'])) {
echo "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='color:{$nation['color']};background-color:red;' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
} else {
echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='color:{$nation['color']}' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
}
@@ -1754,7 +1754,7 @@ function command_61($turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='background-color:$color;color:{$nation['color']};' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -1846,7 +1846,7 @@ function command_62($turn, $command) {
case 6: $color = "black"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='background-color:$color;color:{$nation['color']};' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -1907,7 +1907,7 @@ function command_63($turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "red"; break;
}
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='background-color:$color;color:{$nation['color']};' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -1968,7 +1968,7 @@ function command_64($turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='background-color:$color;color:{$nation['color']};' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -2316,7 +2316,7 @@ function command_75($turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='background-color:$color;color:{$nation['color']};' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -2378,7 +2378,7 @@ function command_77($turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='background-color:$color;color:{$nation['color']};' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -2440,7 +2440,7 @@ function command_78($turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
echo "<option style='background-color:$color;color:{$nation['color']};' value='{$nation['nation']}'>【 {$nation['name']} 】</option>";
}
echo "
</select>