devel merge

2019-05-05 17:58:27 +09:00
parent 00a6e9798f e731371ab1
commit 816c2ac1c4
43 changed files with 1714 additions and 107 deletions
@@ -975,7 +975,7 @@ function updateNationState() {
            while($assemblerCnt < $maxAssemblerCnt){
                $lastAssemblerID += 1;
                $npcObj = new Scenario\NPC(
-                    999, '부대장'.$lastAssemblerID, null, $nation['nation'], null, 
+                    999, sprintf('부대장%4d',$lastAssemblerID), null, $nation['nation'], null, 
                    10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15,  '은둔', '척사'
                );
                $npcObj->npc = 5;