diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php index 3ca4dcfe..9755c82b 100644 --- a/webapp/controller/BaseAuthedController.class.php +++ b/webapp/controller/BaseAuthedController.class.php @@ -857,7 +857,7 @@ class BaseAuthedController extends BaseController { $sign = getReqVal('__sign', ''); $postData = file_get_contents('php://input'); if (intval($timeStamp) < myself()->_getNowTime() - 20 || - intval($timeStamp) < myself()->_getNowTime() + 10) { + intval($timeStamp) > myself()->_getNowTime() + 10) { error_log('safeApiVerify timestamp error:' . $timeStamp . ' nowTime:' . myself()->_getNowTime()); myself()->_rspErr(1007, "sign error1"); die(); diff --git a/webapp/controller/OutAppNftController.class.php b/webapp/controller/OutAppNftController.class.php index ec49b865..5a264112 100644 --- a/webapp/controller/OutAppNftController.class.php +++ b/webapp/controller/OutAppNftController.class.php @@ -329,7 +329,12 @@ class OutAppNftController extends BaseController { $info['name'] = $heroMeta['name']; $info['item_id'] = $heroMeta['id']; $info['type'] = $nftDb['token_type']; - $info['image'] = 'https://res2.counterfire.games/nft/meta/' . $heroMeta['id'] . '_' . $this->getRealHeroQuality($heroDb) . '.gif'; + //$info['image'] = 'https://res2.counterfire.games/nft/meta/' . $heroMeta['id'] . '_' . $this->getRealHeroQuality($heroDb) . '.gif'; + if (($nftDb['token_type']) == Nft::GCARD_HERO_TYPE) { + $info['image'] = 'https://res2.counterfire.games/nft/video/normal/' . $heroMeta['id'] . '_' . $this->getRealHeroQuality($heroDb) . '.mp4'; + } else { + $info['image'] = 'https://res2.counterfire.games/nft/video/genesis/' . $heroMeta['id'] . '_' . $this->getRealHeroQuality($heroDb) . '.mp4'; + } $info['detail']['quality'] = $this->getRealHeroQuality($heroDb); $info['detail']['max_mining_days'] = $heroAtteMeta['validTime']; $info['detail']['wealth'] = floor($wealth * (1+$wealth_rate)); diff --git a/webapp/models/Recharge.php b/webapp/models/Recharge.php index 51ba0017..a0102b91 100644 --- a/webapp/models/Recharge.php +++ b/webapp/models/Recharge.php @@ -13,7 +13,7 @@ class Recharge $orderId = BuyRecord::genOrderId ( GAME_ID, - phpcommon\BC_FUNC_CREATION, + 1, myself()->_getNowTime(), myself()->_getAddress() ); diff --git a/webapp/mt/Recharge.php b/webapp/mt/Recharge.php index a90beb63..af2a3610 100644 --- a/webapp/mt/Recharge.php +++ b/webapp/mt/Recharge.php @@ -6,6 +6,11 @@ use phpcommon; class Recharge { + public static function get($id) + { + return array_key_exists($id, self::getMetaList()) ? self::getMetaList()[$id] : null; + } + public static function traverseMeta($cb) { foreach (self::getMetaList() as $meta) {