diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php index 9a1af795..9e824cb0 100644 --- a/webapp/controller/MissionController.class.php +++ b/webapp/controller/MissionController.class.php @@ -9,6 +9,8 @@ require_once('models/User.php'); require_once('models/DynData.php'); require_once('models/Mission.php'); require_once('models/Season.php'); +require_once('models/Hero.php'); +require_once('models/Gun.php'); require_once('services/AwardService.php'); require_once('services/PropertyChgService.php'); @@ -20,6 +22,8 @@ use models\User; use models\DynData; use models\Mission; use models\Season; +use models\Hero; +use models\Gun; class MissionController extends BaseAuthedController { @@ -117,11 +121,13 @@ class MissionController extends BaseAuthedController { } if (mt\Task::isOfferRewardMission($missionMeta)) { $this->commitOfferRewardMission($missionMeta); + error_log(1); return; } // if ($missionMeta['type'] == mt\Task::DAILY_MISSON_TYPE && $missionMeta['subtype'] == mt\Task::WEAKLY_ACTIVE_VALUE_MISSON_SUBTYPE) { + error_log(2); return; } // @@ -166,7 +172,13 @@ class MissionController extends BaseAuthedController { return; } $gold = ($cegUpLimit * 0.1) / $count; + error_log(json_encode(array( + 'cegUpLimit' => $cegUpLimit, + 'count' => $count, + 'ceg' => $gold + ))); myself()->_addVirtualItem(V_ITEM_GOLD, round($gold)); + $this->awardService->addItem(V_ITEM_GOLD, round($gold)); } Mission::add($missionId); $missionDb = Mission::find($missionId); diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php index 8b298e0c..21bc2d07 100644 --- a/webapp/models/Gun.php +++ b/webapp/models/Gun.php @@ -83,7 +83,7 @@ class Gun extends BaseModel { public static function getRawPveCegUpLimit() { $cegUpLimit = 0; - Hero::getGunList(function ($row) use(&$cegUpLimit) { + self::getGunList(function ($row) use(&$cegUpLimit) { $gunDto = self::toDto($row); $cegUpLimit += $gunDto['raw_pve_ceg_uplimit']; }); diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index 96e5c156..f35a6158 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -71,7 +71,7 @@ class Hero extends BaseModel { public static function getRawPveCegUpLimit() { $cegUpLimit = 0; - Hero::getHeroList(function ($row) use(&$cegUpLimit) { + self::getHeroList(function ($row) use(&$cegUpLimit) { $heroDto = self::toDto($row); $cegUpLimit += $heroDto['raw_pve_ceg_uplimit']; }); diff --git a/webapp/services/AwardService.php b/webapp/services/AwardService.php index 7496a09b..ea7d0b9f 100644 --- a/webapp/services/AwardService.php +++ b/webapp/services/AwardService.php @@ -8,6 +8,12 @@ class AwardService extends BaseService { public function addItem($itemId, $itemNum) { + foreach ($this->items as &$item){ + if ($item['item_id'] == $itemId) { + $item['item_num'] += $itemNum; + return; + } + } array_push($this->items, array( 'item_id' => $itemId, 'item_num' => $itemNum diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php index 887b2747..215c8e02 100644 --- a/webapp/services/MissionService.php +++ b/webapp/services/MissionService.php @@ -425,6 +425,7 @@ class MissionService extends BaseService { if (!$handled) { error_log(json_encode($missionDto)); } + //$missionDto['state'] = Mission::RECEIVEABLE_STATE; return $missionDto; }