From b7f1d942e791cdbb1ab15074b796707b9309691b Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Mon, 24 Jul 2023 18:47:38 +0800 Subject: [PATCH 1/3] 1 --- webapp/controller/RestApiController.class.php | 8 ++++---- webapp/services/FormulaService.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/controller/RestApiController.class.php b/webapp/controller/RestApiController.class.php index a4376bbe..25e83803 100644 --- a/webapp/controller/RestApiController.class.php +++ b/webapp/controller/RestApiController.class.php @@ -58,7 +58,7 @@ class RestApiController extends BaseController { ); array_push($info['attributes'],array( "trait_type" => "level", - "value" => $heroDb['hero_lv'], + "value" => intval($heroDb['hero_lv']), "max_value" => 15, )); $randAttr = emptyReplace(json_decode($heroDb['rand_attr'], true), array()); @@ -67,21 +67,21 @@ class RestApiController extends BaseController { case kHAT_Hp : { array_push($info['attributes'],array( "trait_type" => "Hp", - "value" => $attr['val'], + "value" => intval($attr['val']), )); } break; case kHAT_Atk : { array_push($info['attributes'],array( "trait_type" => "Atk", - "value" => $attr['val'], + "value" => intval($attr['val']), )); } break; case kHAT_Def : { array_push($info['attributes'],array( "trait_type" => "Def", - "value" => $attr['val'], + "value" => intval($attr['val']), )); } } diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php index 57578681..17a796f5 100644 --- a/webapp/services/FormulaService.php +++ b/webapp/services/FormulaService.php @@ -339,7 +339,7 @@ class FormulaService extends BaseService { public static function calcBattleAfterRankScore($userDb,$params,$winningPro){ /**一个玩家的赛后积分 = 赛前积分+K*(胜负率-总胜率)+2K*(表现分-段位要求的及格分)*/ //胜负率=1-(排名-1)/(最大排名-1) - $ranked = getXVal($params, 'ranked'); + $ranked = getXVal($params, 'pvp_personal_rank'); $teamRank = getXVal($params, 'pvp_team_rank'); $meta1 = mt\Parameter::getByName('rank_order_max'); $maxRanked = $meta1 ? $meta1['param_value'] : 40; //************** parameter 参数表获取 ************ From 83b9ee3b08bb2c4c0bc1c3f6e66d41e3edf0e59e Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Mon, 24 Jul 2023 19:00:56 +0800 Subject: [PATCH 2/3] 1 --- webapp/services/callback/MintNftHero.php | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/webapp/services/callback/MintNftHero.php b/webapp/services/callback/MintNftHero.php index 6bd5dbe8..b840eb0e 100644 --- a/webapp/services/callback/MintNftHero.php +++ b/webapp/services/callback/MintNftHero.php @@ -57,6 +57,24 @@ class MintNftHero die; } error_log("MintNftHero-------------------".json_encode($_REQUEST)); + if (!$this->verifyNftTokenId($tokenId)){ + error_log("The token id does not exist"); + echo json_encode(array( + 'errcode' => 1, + 'errmsg' => "tokenId error", + )); + die; + } + if ($this->verifyHeroTokenId($tokenId)){ + error_log("An existing token"); + echo json_encode(array( + 'errcode' => 1, + 'errmsg' => "tokenId error", + )); + die; + } + + $this->internalAddHero($tokenId,$itemId,$quality); echo json_encode(array( 'errcode' => 0, @@ -64,6 +82,34 @@ class MintNftHero )); } + private function verifyNftTokenId($tokenId){ + $row = SqlHelper::ormSelectOne( + myself()->_getMarketMysql(''), + 't_nft', + array( + 'token_id' => $tokenId + ) + ); + if ($row){ + return true; + } + return false; + } + + private function verifyHeroTokenId($tokenId){ + $row = SqlHelper::ormSelectOne( + myself()->_getMysql(''), + 't_hero', + array( + 'token_id' => $tokenId + ) + ); + if ($row){ + return true; + } + return false; + } + private function internalAddHero($tokenId,$itemId,$quality) { From ff0c6d9ee88752d623cfb2637dfe18bb348d2bcd Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 24 Jul 2023 19:35:20 +0800 Subject: [PATCH 3/3] 1 --- webapp/services/callback/MintNftHero.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/services/callback/MintNftHero.php b/webapp/services/callback/MintNftHero.php index b840eb0e..5d58c324 100644 --- a/webapp/services/callback/MintNftHero.php +++ b/webapp/services/callback/MintNftHero.php @@ -28,7 +28,7 @@ class MintNftHero $tokenId = getReqVal('tokenId', ''); if (!$tokenId){ echo json_encode(array( - 'errcode' => 1, + 'errcode' => 2, 'errmsg' => "tokenId empty", )); die; @@ -37,7 +37,7 @@ class MintNftHero $itemMeta = Item::get($itemId); if (!$itemMeta || $itemMeta['type'] != Item::HERO_TYPE){ echo json_encode(array( - 'errcode' => 1, + 'errcode' => 2, 'errmsg' => "itemId error", )); die; @@ -51,7 +51,7 @@ class MintNftHero self::TYPE_5, ))){ echo json_encode(array( - 'errcode' => 1, + 'errcode' => 2, 'errmsg' => "quality error", )); die; @@ -60,7 +60,7 @@ class MintNftHero if (!$this->verifyNftTokenId($tokenId)){ error_log("The token id does not exist"); echo json_encode(array( - 'errcode' => 1, + 'errcode' => 2, 'errmsg' => "tokenId error", )); die; @@ -75,7 +75,7 @@ class MintNftHero } - $this->internalAddHero($tokenId,$itemId,$quality); + // // $this->internalAddHero($tokenId,$itemId,$quality); echo json_encode(array( 'errcode' => 0, 'errmsg' => "callback success", @@ -181,4 +181,4 @@ class MintNftHero return $attr; } -} \ No newline at end of file +}