devel merge

This commit is contained in:
Hide_D committed 2019-05-05 17:58:27 +09:00
commit ae02bbcce7
43 files changed
+1714 -107

No files matched your search

+1
View File
@@ -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,