From 1f0d7a97bf066406686b2bd7e2ecd50ae36209bd Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 6 Jun 2022 13:00:45 +0800 Subject: [PATCH] 1 --- webapp/models/Gun.php | 2 +- webapp/models/Hero.php | 5 +++-- webapp/services/MissionService.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php index 39684e03..6ee65e9d 100644 --- a/webapp/models/Gun.php +++ b/webapp/models/Gun.php @@ -174,7 +174,7 @@ class Gun extends BaseModel { 'lock_type' => $lockType, 'unlock_time' => $unlockTime, 'unlock_lefttime' => max(0, - $unlockTime - myself()->_getNowDaySeconds()), + $unlockTime - myself()->_getNowTime()), 'unlock_trade_time' => $row['unlock_trade_time'], ); $dto['ceg_uplimit'] = FormulaService::getWeaponPvpDailyCegUpLimit($dto); diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index 56e4c1a5..6fdda780 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -50,7 +50,7 @@ class Hero extends BaseModel { $row['hero_uniid'] = $row['idx']; if ($row['account_id'] != $accountId) { $openId = phpcommon\extractOpenId($accountId); - if (!NftService::isHeroOwner($opneId, $row['token_id'])) { + if (!NftService::isHeroOwner($openId, $row['token_id'])) { $row = null; } } @@ -120,6 +120,7 @@ class Hero extends BaseModel { public static function toDto($row) { + error_log(json_encode($row)); $attr = emptyReplace(json_decode($row['rand_attr'], true), array()); $lockType = 0; $unlockTime = 0; @@ -163,7 +164,7 @@ class Hero extends BaseModel { 'lock_type' => $lockType, 'unlock_time' => $unlockTime, 'unlock_lefttime' => max(0, - $unlockTime - myself()->_getNowDaySeconds()), + $unlockTime - myself()->_getNowTime()), 'today_get_gold' => $todayGetGold, 'last_get_gold_time' => $lastGetGoldTime, 'today_pve_get_ceg' => $todayPveGetCeg, diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php index f3e78221..b8ab24fe 100644 --- a/webapp/services/MissionService.php +++ b/webapp/services/MissionService.php @@ -600,7 +600,7 @@ class MissionService extends BaseService { foreach ($this->offerRewartdMission['missions'] as $mission) { if ($mission['mission_id'] == $missionDto['mission_id']) { if ($mission['sendtime'] > 0) { - $leftTime = max(0, ($mission['sendtime'] + $missionMeta['time'] + 1000)-myself()->_getNowTime()); + $leftTime = max(0, ($mission['sendtime'] + $missionMeta['time'])-myself()->_getNowTime()); $missionDto['lefttime'] = $leftTime; if ($leftTime <= 0) { $missionDto['state'] = 0;