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

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

Browse Source
This commit is contained in:
hujiabin 2023-09-05 13:47:45 +08:00
commit d36d23a7a2
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webapp/controller/NftController.class.php
View File

@ -53,6 +53,15 @@ class NftController extends BaseAuthedController
case Nft::HONOR1_TYPE : {
array_push($listInfo,$info);
}
break;
case Nft::GENESIS_TYPE : {
array_push($listInfo,$info);
}
break;
case Nft::PLANET_TYPE : {
array_push($listInfo,$info);
}
break;
}
}
}
@ -132,4 +141,4 @@ class NftController extends BaseAuthedController
));
}
}
}

2
webapp/models/DynData.php
View File

@ -63,7 +63,7 @@ class DynData extends BaseModel {
public static function incVEx($accountId, $x, $y, $val)
{
$oldVal = self::getVEx($x, $y);
$oldVal = self::getVEx($accountId, $x, $y);
SqlHelper::upsert
(myself()->_getMysql($accountId),
't_dyndata',

7
webapp/models/Nft.php
View File

@ -13,7 +13,6 @@ use mt;
use phpcommon\SqlHelper;
use phpcommon;
class Nft extends BaseModel
{
@ -24,7 +23,7 @@ class Nft extends BaseModel
const BLIND_BOX_TYPE = 4;
const FRAGMENT_TYPE = 5; //碎片
const HONOR1_TYPE = 6; //荣誉
const GENESIS_TYPE = 7; //
const GENESIS_TYPE = 7; //创世徽章
const PLANET_TYPE = 8; //星球
const RING_TYPE = 19; //戒指
@ -430,7 +429,9 @@ class Nft extends BaseModel
self::BLIND_BOX_TYPE,
self::FRAGMENT_TYPE,
self::HONOR1_TYPE,
self::RING_TYPE
self::RING_TYPE,
self::GENESIS_TYPE,
self::PLANET_TYPE
));
}

2
webapp/models/Staking.php
View File

@ -41,7 +41,7 @@ class Staking extends BaseModel {
public static function all($address)
{
if (SERVER_ENV != _ONLINE) {
myself()->_setTimeOffset(3600 * 24 * 31);
myself()->_setTimeOffset(3600 * 24 * 360 * 2);
}
$result = array();
$rows = SqlHelper::ormSelect(