diff --git a/doc/Mission.py b/doc/Mission.py index 671014f9..d5ea8df0 100644 --- a/doc/Mission.py +++ b/doc/Mission.py @@ -40,6 +40,21 @@ class Mission(object): ['mission_chg', _common.Mission(), '任务的最新信息(可能为null客户端需要做容错处理)'], ] }, + { + 'name': 'cancelOfferRewardMission', + 'desc': '撤销派遣悬赏任务', + 'group': 'Mission', + 'url': 'webapp/index.php?c=Mission&a=cancelOfferRewardMission', + 'params': [ + _common.ReqHead(), + ['mission_id', 0, '任务id'], + ], + 'response': [ + _common.RspHead(), + ['award', _common.Award(), '奖励信息'], + ['property_chg', _common.PropertyChg(), '属性变更'], + ] + }, { 'name': 'boostOfferRewardMission', 'desc': '加速悬赏任务', diff --git a/doc/_common.py b/doc/_common.py index 23919da9..fdc59231 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -83,8 +83,8 @@ class Gun(object): ['ceg_uplimit', 0, 'ceg今天获取上限'], ['!attr', [Attr()], '属性'], ['try_count', 0, '剩余体验次数 当state=1时才有意义'], - ['lock_type', 0, '0:无锁 1:升级 2:升阶'], - ['lock_time', 0, '使用锁定时间(升级或者升阶触发),单位秒,锁定期间不可战斗和做其他操作'], + ['lock_type', 0, '0:无锁 1:升级 2:升阶 3:派遣中'], + ['unlock_time', 0, '使用解锁utc时间(升级或者升阶触发),锁定期间不可战斗和做其他操作,配合lock_type使用'], ['trade_locktime', 0, '出售锁定时间(升级或者升阶完成后触发),单位秒,只锁交易,其他的操作仍可进行'], ] @@ -215,12 +215,12 @@ class Hero(object): ['pve_ceg_uplimit', 0, 'pve ceg今天获取上限'], ['!attr', [Attr()], '属性'], ['try_count', 0, '剩余体验次数 当state=1时才有意义'], - ['lock_type', 0, '0:无锁 1:升级 2:升阶'], + ['lock_type', 0, '0:无锁 1:升级 2:升阶 3:派遣中'], + ['unlock_time', 0, '使用解锁utc时间(升级或者升阶触发),锁定期间不可战斗和做其他操作,配合lock_type使用'], ['today_get_gold', 0, '今天pvp获取的ceg数量'], ['last_pve_get_ceg_time', 0, '最后一次获取pve获取ceg时间'], ['last_get_gold_time', 0, '今天pvp获取的ceg数量'], ['last_pve_get_ceg_time', 0, '最后一次获取pve获取ceg时间'], - ['unlock_time', 0, '使用解锁utc时间(升级或者升阶触发),锁定期间不可战斗和做其他操作,配合lock_type使用'], ['unlock_trade_time', 0, '出售解锁utc时间(升级或者升阶完成后触发),只锁交易,其他的操作仍可进行,和lock_type无关是独立的锁!!!'], ] diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php index 863045d6..08ee72c6 100644 --- a/webapp/controller/MissionController.class.php +++ b/webapp/controller/MissionController.class.php @@ -256,6 +256,12 @@ class MissionController extends BaseAuthedController { $this->missionService->sendOfferRewardMission($missionId, $this->propertyChgService); } + public function cancelOfferRewardMission() + { + $missionId = getReqVal('mission_id', 0); + $this->missionService->cancelOfferRewardMission($missionId, $this->propertyChgService); + } + public function boostOfferRewardMission() { $missionId = getReqVal('mission_id', 0); diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php index 21bc2d07..6ead6479 100644 --- a/webapp/models/Gun.php +++ b/webapp/models/Gun.php @@ -166,11 +166,11 @@ class Gun extends BaseModel { 'raw_pve_ceg_uplimit' => 0, 'attr' => $attr, 'try_count' => $row['try_count'], - 'lock_type' => $lockType, 'today_get_gold' => $todayGetGold, 'last_get_gold_time' => $lastGetGoldTime, 'today_pve_get_ceg' => $todayPveGetCeg, 'last_pve_get_ceg_time' => $lastPveGetCegTime, + 'lock_type' => $lockType, 'unlock_time' => $unlockTime, 'unlock_trade_time' => $row['unlock_trade_time'], ); diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php index fda1312e..04822a63 100644 --- a/webapp/services/MissionService.php +++ b/webapp/services/MissionService.php @@ -698,6 +698,17 @@ class MissionService extends BaseService { myself()->_rspOk(); } + public function cancelOfferRewardMission($missionId, $propertyChgService) + { + $this->removeOfferRewardMission($missionId); + $propertyChgService->addHeroChg(); + $propertyChgService->addGunChg(); + myself()->_rspData(array( + 'award' => $awardService->toDto(), + 'property_chg' => $propertyChgService->toDto(), + )); + } + public function boostOfferRewardMission($missionId, $awardService, $propertyChgService) { $idx = 0;