diff --git a/webapp/controller/NftController.class.php b/webapp/controller/NftController.class.php index 1022d11e..15708e55 100644 --- a/webapp/controller/NftController.class.php +++ b/webapp/controller/NftController.class.php @@ -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 )); } -} \ No newline at end of file +} diff --git a/webapp/models/DynData.php b/webapp/models/DynData.php index 60e09205..d9fcebad 100644 --- a/webapp/models/DynData.php +++ b/webapp/models/DynData.php @@ -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', diff --git a/webapp/models/Nft.php b/webapp/models/Nft.php index 5f99fc6c..afd46c67 100644 --- a/webapp/models/Nft.php +++ b/webapp/models/Nft.php @@ -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 )); } diff --git a/webapp/models/Staking.php b/webapp/models/Staking.php index a47a7c24..a01c19d9 100644 --- a/webapp/models/Staking.php +++ b/webapp/models/Staking.php @@ -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(