Merge branch 'dev' of git.kingsome.cn:server/game2006api into dev

webapp/services/MissionService.php

@@ -647,13 +647,16 @@ class MissionService extends BaseService {
             {
                 //武器
                 ++$gunCount;
-                array_push(
+                $gunDb = Gun::find($id);
-                    $mission['objects'],
+                if ($gunDb) {
-                    array(
+                    array_push(
-                        'type' => $type,
+                        $mission['objects'],
-                        'id' => $id
+                        array(
-                    )
+                            'type' => $type,
-                );
+                            'id' => $id
+                        )
+                    );
+                }
             }
             break;
             case 1: