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

2022-06-06 09:52:38 +08:00 · 2022-06-06 09:52:38 +08:00 · df33034667
commit df33034667
parent b55e5b13df 0bc3f6075b
1 changed files with 10 additions and 7 deletions
--- a/webapp/services/MissionService.php
+++ b/webapp/services/MissionService.php
@ -647,13 +647,16 @@ class MissionService extends BaseService {
            {
                //武器
                ++$gunCount;
-                array_push(
-                    $mission['objects'],
-                    array(
-                        'type' => $type,
-                        'id' => $id
-                    )
-                );
+                $gunDb = Gun::find($id);
+                if ($gunDb) {
+                    array_push(
+                        $mission['objects'],
+                        array(
+                            'type' => $type,
+                            'id' => $id
+                        )
+                    );
+                }
            }
            break;
            case 1: