From 60871bca5629a5bef25b9a1bf92f24d193b1c165 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Fri, 28 Oct 2022 16:30:40 +0800
Subject: [PATCH] 1

---
 webapp/controller/UserController.class.php |  5 +++--
 webapp/services/MissionService.php         | 18 +++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index 6eaa7857..847651c9 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -705,8 +705,9 @@ class UserController extends BaseAuthedController {
             return;
         }
         $temp = explode('|',$heroMeta['normal_gift']);
-        $headList = array();
-        if ($heroMeta['normal_gift']){
+        $userInfo = $this->_getOrmUserInfo();
+        $headList = emptyReplace(json_decode($userInfo['head_list'], true), array());
+        if ($heroMeta['normal_gift'] && !in_array($heroMeta['normal_gift'],$headList)){
             array_push($headList,$heroMeta['normal_gift']);
         }
         Hero::addHero($heroMeta);
diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php
index c275323e..d22a0f7c 100644
--- a/webapp/services/MissionService.php
+++ b/webapp/services/MissionService.php
@@ -869,15 +869,15 @@ class MissionService extends BaseService {
                 'item_num' => $boost_ceg
             )
         ));
-//        $dropMeta = mt\Drop::get($missionMeta['reward']);
-//        if (!$dropMeta) {
-//            myself()->_rspErr(10, 'server internal error:' . $missionMeta['reward']);
-//            return;
-//        }
-//        myself()->_scatterDrop('mission:' . $missionId,
-//                               $dropMeta,
-//                               $awardService,
-//                               $propertyChgService);
+        $dropMeta = mt\Drop::get($missionMeta['reward']);
+        if (!$dropMeta) {
+            myself()->_rspErr(10, 'server internal error:' . $missionMeta['reward']);
+            return;
+        }
+        myself()->_scatterDrop('mission:' . $missionId,
+                               $dropMeta,
+                               $awardService,
+                               $propertyChgService);
         $this->receiveOfferRewardMission($missionId,
                                          $awardService,
                                          $propertyChgService);