From 5e55111e78e6046fc5b1ef5fd1b224977c5cfd40 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Sat, 8 Oct 2022 16:29:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=82=AC=E8=B5=8F=E8=B7=9F?=
 =?UTF-8?q?=E6=96=B0=E8=8B=B1=E9=9B=84=E6=9E=AA=E6=A2=B0=E7=9A=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/controller/MissionController.class.php |  4 ++--
 webapp/services/FormulaService.php            | 15 +++++++++++++++
 webapp/services/MissionService.php            |  6 +++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php
index 8b7d4f7b..8733c232 100644
--- a/webapp/controller/MissionController.class.php
+++ b/webapp/controller/MissionController.class.php
@@ -156,7 +156,7 @@ class MissionController extends BaseAuthedController {
             $this->_rspErr(10, 'server internal error:' . $missionMeta['reward']);
             return;
         }
-        $this->_scatterDrop('mission:' . $missionId, $dropMeta, $this->awardService, $this->propertyChgService);
+        $this->_scatterDrop('mission:' . $missionId, $dropMeta, $this->awardService, $this->propertyChgService);print_r($missionDto);die;
         $this->procSpecMissionCommit($missionDto, $missionMeta);
         Mission::add($missionId);
         $missionDb = Mission::find($missionId);
@@ -200,7 +200,7 @@ class MissionController extends BaseAuthedController {
         if ($specMissionDto &&
             $specMissionDto['state'] == Mission::NOT_FINISHED_STATE &&
             $notFinishedCount <= 1) {
-            $specMissionDto['state'] == Mission::RECEIVEABLE_STATE;
+            $specMissionDto['state'] = Mission::RECEIVEABLE_STATE;
             array_push($missionDtoList, $missionDto);
         }
         foreach ($missionDtoList as $missionDto) {
diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php
index be0db997..b9f6f012 100644
--- a/webapp/services/FormulaService.php
+++ b/webapp/services/FormulaService.php
@@ -341,6 +341,14 @@ class FormulaService extends BaseService {
         return  self::Hero_Max_CEG($heroDb)*0.35;
     }
 
+    //英雄悬赏收益上限
+    public static function getHeroMissionDailyCegUpLimit($heroDb)
+    {
+        //Hero_Max_CEG *05%
+        return  self::Hero_Max_CEG($heroDb)*0.05;
+    }
+
+
     //每天枪械NFT获得CEG上限值
     public static function Weapon_Max_CEG($weaponDb){
         //Weapon_Max_CEG=((SIGN(武器NFT阶数=1)*Weapon_NFT_Maximum_Durability+SIGN(武器NFT阶数>1)*Weapon_Fixed_Durability)*Weapon_DA_Value*GAC_D_Value+Weapon_NFT_Maximum_Durability*Weapon_Chip_DA_Value*Weapon_Chip_GAC_PS_Value)*10*CEG_Discount_Rate
@@ -362,6 +370,13 @@ class FormulaService extends BaseService {
         return  self::Weapon_Max_CEG($weaponDb)*0.35;
     }
 
+    //枪械悬赏收益上限
+    public static function getWeaponMissionDailyCegUpLimit($weaponDb)
+    {
+        //Weapon_Max_CEG *5%
+        return  self::Weapon_Max_CEG($weaponDb)*0.05;
+    }
+
     //CEG动态指数定义公式：
     public static function CEG_Dynamic_Index(){
         //CEG_Dynamic_Index=ROUND(2/(1+EXP(-(CEG_Dynamic_Price/CEG_Base_Price)* CEG_Parameter+ CEG_Parameter)),2)
diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php
index 0b3c7a85..33e88e18 100644
--- a/webapp/services/MissionService.php
+++ b/webapp/services/MissionService.php
@@ -755,8 +755,12 @@ class MissionService extends BaseService {
         error_log(json_encode($mission));
         $this->offerRewartdMission['missions'][$idx] = $mission;
         $this->saveOfferRewardMission();
+        $propertyChgService->addHeroChg();
+        $propertyChgService->addGunChg();
         error_log(json_encode($this->offerRewartdMission));
-        myself()->_rspOk();
+        myself()->_rspData([
+            'property_chg' => $propertyChgService->toDto(),
+        ]);
     }
 
     public function offerRewardMissionPreview($missionId)