From a4b4c32e174cee7ead310e87a08a1f064d356cb3 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 12 Dec 2022 11:32:28 +0800 Subject: [PATCH 1/4] ... --- webapp/controller/MarketController.class.php | 34 ++++++++++++-------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 0bbcc959..4c4c667d 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -545,20 +545,28 @@ class MarketController extends BaseController { private function getNftListByAccountAndType($account, $type, $order_method, $order_asc) { $sortByLevel = function ($a, $b) use ($order_asc) { - + return ($order_asc == 1 ? 1 : -1) * ($b['detail']['hero_lv'] - $a['detail']['hero_lv']); + }; + $sortByGunLv = function ($a, $b) use($order_asc) { + return ($order_asc == 1 ? 1 : -1) * ($b['detail']['gun_lv'] - $a['detail']['gun_lv']); + }; + $sortByTili = function ($a, $b) use($order_asc) { + return ($order_asc == 1 ? 1 : -1) * ($b['detail']['hero_tili'] - $a['detail']['hero_tili']); }; $sortByStar = function ($a, $b) use($order_asc) { - + return ($order_asc == 1 ? 1 : -1) * ($b['detail']['quality'] - $a['detail']['quality']); + }; + $sortByDurability = function ($a, $b) use($order_asc) { + return ($order_asc == 1 ? 1 : -1) * ($b['detail']['durability_max'] - $a['detail']['durability_max']); }; $sortByPower = function ($a, $b) use($order_asc) { - + return ($order_asc == 1 ? 1 : -1) * ($b['detail']['strength'] - $a['detail']['strength']); + }; + $sortByGrade = function ($a, $b) use($order_asc) { + return ($order_asc == 1 ? 1 : -1) * ($b['detail']['chip_grade'] - $a['detail']['chip_grade']); }; $sortByTokenId = function ($a, $b) use ($order_asc) { - if ($order_asc == 1) { - return $b['token_id'] - $a['token_id']; - } else { - return $a['token_id'] - $b['token_id']; - } + return ($order_asc == 1 ? 1 : -1) * ($b['token_id'] - $a['token_id']); }; $nfts = array(); switch ($type) { @@ -574,7 +582,7 @@ class MarketController extends BaseController { usort($rows, $sortByLevel); break; case 2: - usort($rows, $sortByPower); + usort($rows, $sortByTili); break; case 3: usort($rows, $sortByStar); @@ -591,10 +599,10 @@ class MarketController extends BaseController { } switch ($order_method) { case 1: - usort($rows, $sortByLevel); + usort($rows, $sortByGunLv); break; case 2: - usort($rows, $sortByPower); + usort($rows, $sortByDurability); break; case 3: usort($rows, $sortByStar); @@ -609,7 +617,7 @@ class MarketController extends BaseController { } switch ($order_method) { case 1: - usort($rows, $sortByLevel); + usort($rows, $sortByGrade); break; case 2: usort($rows, $sortByPower); @@ -718,7 +726,7 @@ class MarketController extends BaseController { $lv_filter = getReqVal('lv_filter', 15); $account = '0x9a4d9dd2bfcad659975f0f5a480625c7929e9385'; - $rows = $this->getNftListByAccountAndType($account, $type); + $rows = $this->getNftListByAccountAndType($account, $type, $order_method, $order_asc); $total = count($rows); $page_end = $start + $page_size; From 9e8b3fe729cabf9a0a9606757351c73abdf734a0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 12 Dec 2022 11:51:24 +0800 Subject: [PATCH 2/4] ... --- webapp/controller/MarketController.class.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 4c4c667d..a6c7da50 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -542,7 +542,7 @@ class MarketController extends BaseController { myself()->_rspOk(); } - private function getNftListByAccountAndType($account, $type, $order_method, $order_asc) + private function getNftListByAccountAndType($account, $type, $order_method, $order_asc, $job, $search, $lv) { $sortByLevel = function ($a, $b) use ($order_asc) { return ($order_asc == 1 ? 1 : -1) * ($b['detail']['hero_lv'] - $a['detail']['hero_lv']); @@ -576,16 +576,17 @@ class MarketController extends BaseController { $nftDb = Nft::getNft($row['token_id']); $row['info'] = Nft::toDto($nftDb); $row['detail'] = Hero::toDtoInfo(Hero::findByTokenId2($row['token_id'])); + array_push($nfts, $row); } switch ($order_method) { case 1: - usort($rows, $sortByLevel); + usort($nfts, $sortByLevel); break; case 2: - usort($rows, $sortByTili); + usort($nfts, $sortByTili); break; case 3: - usort($rows, $sortByStar); + usort($nfts, $sortByStar); break; } } @@ -596,6 +597,7 @@ class MarketController extends BaseController { $nftDb = Nft::getNft($row['token_id']); $row['info'] = Nft::toDto($nftDb); $row['detail'] = Gun::toDtoInfo(Gun::findByTokenId2($row['token_id'])); + array_push($nfts, $row); } switch ($order_method) { case 1: @@ -614,6 +616,7 @@ class MarketController extends BaseController { $rows = Nft::getNft1155List($account, $type); foreach ($rows as &$row) { $row['detail'] = Chip::toDto(Chip::getChipByTokenId($row['token_id'])); + array_push($nfts, $row); } switch ($order_method) { case 1: @@ -628,13 +631,14 @@ class MarketController extends BaseController { case 4: { $rows = Nft::getNft1155List($account, $type); usort($rows, $sortByTokenId); + $nfts = $rows; } break; default: { - $rows = array(); + } } - return $rows; + return $nfts; } public function listSellNfts() @@ -726,7 +730,7 @@ class MarketController extends BaseController { $lv_filter = getReqVal('lv_filter', 15); $account = '0x9a4d9dd2bfcad659975f0f5a480625c7929e9385'; - $rows = $this->getNftListByAccountAndType($account, $type, $order_method, $order_asc); + $rows = $this->getNftListByAccountAndType($account, $type, $order_method, $order_asc, $job_filter_array, $search_filter_array, $lv_filter); $total = count($rows); $page_end = $start + $page_size; From e1922f39042075e6b93bdc318058bf43fad3c2d4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 12 Dec 2022 13:49:53 +0800 Subject: [PATCH 3/4] ... --- webapp/controller/MarketController.class.php | 32 +++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index a6c7da50..ef1a1ee4 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -576,6 +576,11 @@ class MarketController extends BaseController { $nftDb = Nft::getNft($row['token_id']); $row['info'] = Nft::toDto($nftDb); $row['detail'] = Hero::toDtoInfo(Hero::findByTokenId2($row['token_id'])); + if (in_array($row['info']['info']['job'], $job)==false) continue; + if ($row['detail']['hero_lv']<$lv) continue; + if (count($search)>0) { + if (!(in_array($row['detail']['hero_name'], $search) || in_array($row['detail']['token_id'], $search))) continue; + } array_push($nfts, $row); } switch ($order_method) { @@ -597,17 +602,21 @@ class MarketController extends BaseController { $nftDb = Nft::getNft($row['token_id']); $row['info'] = Nft::toDto($nftDb); $row['detail'] = Gun::toDtoInfo(Gun::findByTokenId2($row['token_id'])); + if ($row['detail']['gun_lv']<$lv) continue; + if (count($search)>0) { + if (!(in_array($rwo['detail']['gun_name'], $search) || in_array($row['detail']['token_id'], $search))) continue; + } array_push($nfts, $row); } switch ($order_method) { case 1: - usort($rows, $sortByGunLv); + usort($nfts, $sortByGunLv); break; case 2: - usort($rows, $sortByDurability); + usort($nfts, $sortByDurability); break; case 3: - usort($rows, $sortByStar); + usort($nfts, $sortByStar); break; } } @@ -616,21 +625,25 @@ class MarketController extends BaseController { $rows = Nft::getNft1155List($account, $type); foreach ($rows as &$row) { $row['detail'] = Chip::toDto(Chip::getChipByTokenId($row['token_id'])); + if ($row['detail']['chip_grade']<$lv) continue; + if (count($search)>0) { + if (!(in_array($row['detail']['token_id'], $search))) continue; + } array_push($nfts, $row); } switch ($order_method) { case 1: - usort($rows, $sortByGrade); + usort($nfts, $sortByGrade); break; case 2: - usort($rows, $sortByPower); + usort($nfts, $sortByPower); break; } } break; case 4: { $rows = Nft::getNft1155List($account, $type); - usort($rows, $sortByTokenId); + usort($nfts, $sortByTokenId); $nfts = $rows; } break; @@ -726,7 +739,12 @@ class MarketController extends BaseController { $job_filters = getReqVal('job_filters', ''); $job_filter_array = explode('|', $job_filters); $search_filters = getReqVal('search_filters', ''); - $search_filter_array = explode('|', $search_filters); + if ($search_filters!='') { + $search_filter_array = explode('|', $search_filters); + } else { + $search_filter_array = array(); + } + $lv_filter = getReqVal('lv_filter', 15); $account = '0x9a4d9dd2bfcad659975f0f5a480625c7929e9385'; From bb947c6d2baf18f8a8ad547eea2eade7ba6bc25e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 12 Dec 2022 14:24:51 +0800 Subject: [PATCH 4/4] 1 --- webapp/controller/RankingController.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/webapp/controller/RankingController.class.php b/webapp/controller/RankingController.class.php index 10139fcf..606e0ce4 100644 --- a/webapp/controller/RankingController.class.php +++ b/webapp/controller/RankingController.class.php @@ -279,7 +279,6 @@ class RankingController extends BaseAuthedController { private function calcCECSeasonAward($seasonId){ $data = SeasonRanking::getDataBySeasonId($seasonId); - error_log(json_encode($data)); $rewardParamMeta = \mt\Parameter::getByName('rank_ring_reward'); $rewardParamMetaValue = $rewardParamMeta ? $rewardParamMeta['param_value'] : ''; $rewardList = explode('|',$rewardParamMetaValue);