Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb

This commit is contained in:
hujiabin 2024-07-04 15:13:44 +08:00
commit 44419cfc77
3 changed files with 7 additions and 3 deletions

View File

@ -319,8 +319,6 @@ class OutAppNftController extends BaseController {
$info['detail']['max_mining_days'] = $heroAtteMeta['validTime']; $info['detail']['max_mining_days'] = $heroAtteMeta['validTime'];
$info['detail']['wealth'] = floor($wealth * (1+$wealth_rate)); $info['detail']['wealth'] = floor($wealth * (1+$wealth_rate));
$info['detail']['lucky'] = floor($lucky * (1+$lucky_rate)); $info['detail']['lucky'] = floor($lucky * (1+$lucky_rate));
$info['detail']['wealth'] = '';
$info['detail']['lucky'] = '';
$info['detail']['hp'] = $heroAbility['hp']; $info['detail']['hp'] = $heroAbility['hp'];
$info['detail']['atk'] = $heroAbility['attack']; $info['detail']['atk'] = $heroAbility['attack'];
$info['detail']['def'] = $heroAbility['defence']; $info['detail']['def'] = $heroAbility['defence'];

View File

@ -128,6 +128,7 @@ class Nft extends BaseModel
array_push($nftList, $row); array_push($nftList, $row);
} }
); );
error_log(json_encode($nftList));
return $nftList; return $nftList;
} }

View File

@ -84,7 +84,12 @@ class NftService extends BaseService {
self::loadNft($openId, $name); self::loadNft($openId, $name);
$nftHash = getXVal(self::$userData[$openId], $name . 'Hash', array()); $nftHash = getXVal(self::$userData[$openId], $name . 'Hash', array());
$nftDb = getXVal($nftHash, $tokenId); $nftDb = getXVal($nftHash, $tokenId);
return $nftDb && $nftDb['owner_address'] == $openId; //return $nftDb && $nftDb['owner_address'] == $openId;
if (empty($nftDb)) {
return null;
}
return $nftDb['owner_address'] == LOCK_CONTRACT_ADDRESS &&
$nftDb['last_lock_address'] == $openId;
} }
private static function loadNft($openId, $name) private static function loadNft($openId, $name)