devel merge

2019-05-05 17:58:27 +09:00
parent 00a6e9798f e731371ab1
commit 816c2ac1c4
43 changed files with 1714 additions and 107 deletions
@@ -302,6 +302,7 @@ for($j=0; $j < $gencount; $j++) {
    
    $generalsFormat[] = [
        'ourGeneral'=>$ourGeneral,
+        'iconPath'=>GetImageURL($general['imgsvr']).'/'.$general['picture'],
        'isNPC'=>$isNPC,
        'wounded'=>$wounded,
        'name'=>$name,