devel merge

2019-05-05 17:58:27 +09:00
parent 00a6e9798f e731371ab1
commit 816c2ac1c4
43 changed files with 1714 additions and 107 deletions
@@ -20,7 +20,7 @@
    data-general-nation="<?=$nation?>"
    data-general-nation-name="<?=$nationName?>"
 >
-    <td height="64"></td>
+    <td height="64"><img class='generalIcon' width='64' height='64' src='<?=$iconPath?>'></td>
    <td><?=$nameText?></td>
    <td><?=$leadershipText?><?=$leadershipBonusText?></td>
    <td><?=$powerText?></td>