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

This commit is contained in:
hujiabin 2022-11-04 16:50:01 +08:00
commit 6cc11aa665

View File

@ -103,6 +103,7 @@ class BlockChainController extends BaseAuthedController {
myself()->_rspErr(1, 'gun not found'); myself()->_rspErr(1, 'gun not found');
return; return;
} }
} }
break; break;
default: default:
@ -125,6 +126,7 @@ class BlockChainController extends BaseAuthedController {
public function evolve721Nft() public function evolve721Nft()
{ {
error_log(json_encode($_REQUEST));
$type = getReqVal('type', ''); $type = getReqVal('type', '');
$tokenId1 = getReqVal('token_id1', ''); $tokenId1 = getReqVal('token_id1', '');
$tokenId2 = getReqVal('token_id2', ''); $tokenId2 = getReqVal('token_id2', '');
@ -279,6 +281,14 @@ class BlockChainController extends BaseAuthedController {
$specHeros = array(); $specHeros = array();
$specGuns = array(); $specGuns = array();
mt\Item::groupFragment($tokenIds, $heros, $guns, $specHeros, $specGuns); mt\Item::groupFragment($tokenIds, $heros, $guns, $specHeros, $specGuns);
error_log(json_encode(array(
$tokenIds,
$heros,
$guns,
$specHeros,
$specGuns,
json_encode($_REQUEST)
)));
if (count($tokenIds) != ( if (count($tokenIds) != (
count($heros) + count($guns) + count($specHeros) + count($specGuns) count($heros) + count($guns) + count($specHeros) + count($specGuns)
)) { )) {
@ -298,11 +308,13 @@ class BlockChainController extends BaseAuthedController {
myself()->_rspErr(101, 'token_ids paramater error'); myself()->_rspErr(101, 'token_ids paramater error');
return; return;
} }
$tokenType = Nft::HERO_TYPE;
} else if (count($guns) > 0) { } else if (count($guns) > 0) {
if (count($guns) != 8 || count($specHeros) > 0) { if (count($guns) != 8 || count($specHeros) > 0) {
myself()->_rspErr(101, 'token_ids paramater error'); myself()->_rspErr(101, 'token_ids paramater error');
return; return;
} }
$tokenType = Nft::GUN_TYPE;
} else { } else {
myself()->_rspErr(101, 'token_ids paramater error'); myself()->_rspErr(101, 'token_ids paramater error');
return; return;