server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
hujiabin 2022-12-13 15:36:10 +08:00
commit 023a43e50e
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Market.py
View File

@ -315,7 +315,7 @@ class Market(object):
['page_size', 0, '分页大小'],
['order_method', 0, '排序方式 0:默认排序(当前指向1) 1:上架时间 2:价格 3:星级质量 4:等级 5:能量值 6:生命值 7:攻击力 8:防御力'],
['order_asc', 0, '排序方向, 0:从小到大 1:从大到小'],
['type', 0, '物品类型 1:英雄 2:武器 3:芯片'],
['type', 0, '物品类型 1:英雄 2:武器 3:芯片 5:碎片'],
['job_filters', '', '职业过滤(用|分割)'],
['search_filters', '', '搜索过滤(用|分割)'],
['lv_filter', 0, '等级过滤'],
@ -341,7 +341,7 @@ class Market(object):
['page_size', 0, '分页大小'],
['order_method', 0, '排序方式 0:默认排序(当前指向1) 1:等级 2:能量值 3:星级 4:tokenid'],
['order_asc', 0, '排序方向, 0:从小到大 1:从大到小'],
['type', 0, '物品类型 1:英雄 2:武器 3:芯片'],
['type', 0, '物品类型 1:英雄 2:武器 3:芯片 5:碎片'],
['job_filters', '', '职业过滤(用|分割)'],
['search_filters', '', '搜索过滤(用|分割)'],
['lv_filter', 0, '等级过滤'],

37
webapp/controller/MarketController.class.php
View File

@ -161,7 +161,6 @@ class MarketController extends BaseController {
$originalPrice * $goodsMeta['discount'] : $originalPrice;
$discountPrice .= MarketService::PRICE_PAD;
error_log('price:' . $price . ' discountPrice:' . $discountPrice);
if (!$discountPrice || strcmp($price, $discountPrice) != 0) {
myself()->_rspErr(500, 'price error');
return;
@ -570,10 +569,10 @@ class MarketController extends BaseController {
};
$nfts = array();
switch ($type) {
case 1: {
case Nft::HERO_TYPE: {
$rows = Nft::getNftListByType($account, $type);
foreach ($rows as &$row) {
$nftDb = Nft::getNft($row['token_id']);
$nftDb = Nft::findNftByOwner($account, $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;
@ -590,16 +589,16 @@ class MarketController extends BaseController {
case 2:
usort($nfts, $sortByTili);
break;
case 3:
case 3:
usort($nfts, $sortByStar);
break;
}
}
break;
case 2: {
case Nft::EQUIP_TYPE: {
$rows = Nft::getNftListByType($account, $type);
foreach ($rows as &$row) {
$nftDb = Nft::getNft($row['token_id']);
$nftDb = Nft::findNftByOwner($account, $row['token_id']);
$row['info'] = Nft::toDto($nftDb);
$row['detail'] = Gun::toDtoInfo(Gun::findByTokenId2($row['token_id']));
if ($row['detail']['gun_lv']<$lv) continue;
@ -621,7 +620,7 @@ class MarketController extends BaseController {
}
}
break;
case 3: {
case Nft::CHIP_TYPE: {
$rows = Nft::getNft1155List($account, $type);
foreach ($rows as &$row) {
$row['detail'] = Chip::toDto(Chip::getChipByTokenId($row['token_id']));
@ -641,7 +640,7 @@ class MarketController extends BaseController {
}
}
break;
case 4: {
case Nft::FRAGMENT_TYPE: {
$rows = Nft::getNft1155List($account, $type);
usort($nfts, $sortByTokenId);
$nfts = $rows;
@ -691,9 +690,10 @@ class MarketController extends BaseController {
}
$nfts = array();
for ($x = $start; $x < $page_end; $x++) {
$row = $rows[$x];
$nftDb = Nft::getNft($row['token_id']);
$nftDb = Nft::findNftByOwner($row['owner_address'], $row['token_id']);
if (!$nftDb) {
myself()->_rspErr(1, 'nft not exists');
return;
@ -702,16 +702,16 @@ class MarketController extends BaseController {
$t = $row['token_type'];
switch($t) {
case 1: {
case Nft::HERO_TYPE: {
$row['detail'] = Hero::toDtoInfo(Hero::findByTokenId2($row['token_id']));
} break;
case 2: {
case Nft::EQUIP_TYPE: {
$row['detail'] = Gun::toDtoInfo(Gun::findByTokenId2($row['token_id']));
} break;
case 3: {
case Nft::CHIP_TYPE: {
$row['detail'] = Chip::toDto(Chip::getChipByTokenId($row['token_id']));
} break;
case 4: {
case Nft::FRAGMENT_TYPE: {
} break;
default: {
@ -790,20 +790,14 @@ class MarketController extends BaseController {
$conn = myself()->_getMysql('');
$nft = Nft::getNft($nft_token);
error_log("sellMyNft ntfDetail token=".json_encode($nft));
$nft = Nft::findNftByOwner($account, $nft_token);
$nftDetail = Nft::toDto($nft);
error_log('sellMyNft ntfDetail null'.json_encode($nftDetail));
if ($nftDetail==null) {
// error_log('sellMyNft ntfDetail null'.$nftDetail."token=".$nft);
}
// echo json_encode($nftDetail), json_encode($nft);
$r = SqlHelper::insert(
$conn,
't_market_store',
array(
'token_id' => $nft_token,
'owner_address' => $nftDetail['owner_address'],
'token_type' => $nftDetail['type'],
'createtime' => myself()->_getNowTime(),
'modifytime' => myself()->_getNowTime(),
@ -814,7 +808,6 @@ class MarketController extends BaseController {
'c_id' => $nftDetail['item_id'],
)
);
echo json_encode($r);
$this->_rspOk();
}

2
webapp/models/Nft.php
View File

@ -124,7 +124,7 @@ class Nft extends BaseModel {
$sql = "select * from t_nft1155 where owner_address=:owner_address and token_id>10000000 and balance>0";
};
break;
case 4:{
case 5:{
$sql = "select * from t_nft1155 where owner_address=:owner_address and token_id<10000000 and balance>0";
};
break;