From 7e530cff2d85f1dad180324afc3b4b7a953f3e9c Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Wed, 19 Jun 2024 15:55:41 +0800 Subject: [PATCH] 1 --- webapp/models/Hero.php | 90 +++++++++++------------------------------- 1 file changed, 23 insertions(+), 67 deletions(-) diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index fc8fafc5..bacd9e57 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -166,32 +166,7 @@ class Hero extends BaseModel { ) ); - //将NFT表的数据同步到中心化英雄表 （以后可能删除） -// if (!$row) { -// $itemMeta = mt\Item::get($nftDb['item_id']); -// if ($itemMeta) { -// self::addNftHero($itemMeta, $nftDb['token_id']); -// $row = SqlHelper::ormSelectOne( -// myself()->_getSelfMysql(), -// 't_hero', -// array( -// 'token_id' => $nftDb['token_id'], -// ) -// ); -// } -// } - if ($row) { - if (!$row['activate']) { - self::activateHero($row); - $row = SqlHelper::ormSelectOne( - myself()->_getSelfMysql(), - 't_hero', - array( - 'token_id' => $nftDb['token_id'], - ) - ); - } $row['tags'] = $nftDb['tags']; $cb($row); } @@ -199,19 +174,6 @@ class Hero extends BaseModel { } } - private static function activateHero($row){ - $itemMeta = mt\Item::get($row['hero_id']); - if (!$itemMeta) { - return; - } - - $fieldsKv = array( - 'activate' => 1, - 'activate_time' => myself()->_getNowTime(), - 'modifytime' => myself()->_getNowTime() - ); - self::updateByTokenId($row['token_id'],$fieldsKv); - } public static function listDto($row){ $attr = emptyReplace(json_decode($row['rand_attr'], true), array()); @@ -222,7 +184,7 @@ class Hero extends BaseModel { } $heroMeta = \mt\Item::get($row['hero_id']); $heroAtteMeta = \mt\EconomyAttribute::findByGrade($heroMeta['relationship'],$row['quality']); - $unsealTime = $row['unseal_time'] ? $row['unseal_time'] : $row['activate_time']; + $unsealTime = $row['unseal_time'] ? $row['unseal_time'] : $row['createtime']; $validTime = $unsealTime + 86400 * $heroAtteMeta['validTime'] ; return array( 'idx' => $row['idx'], @@ -290,7 +252,7 @@ class Hero extends BaseModel { { $heroMeta = \mt\Item::get($row['hero_id']); $heroAtteMeta = \mt\EconomyAttribute::findByGrade($heroMeta['relationship'],$row['quality']); - $unsealTime = $row['unseal_time'] ? $row['unseal_time'] : $row['activate_time']; + $unsealTime = $row['unseal_time'] ? $row['unseal_time'] : $row['createtime']; $validTime = $unsealTime + 86400 * $heroAtteMeta['validTime'] ; } @@ -610,18 +572,11 @@ class Hero extends BaseModel { } $randAttr = self::getRandAttr($heroMeta['id']) ; $attribute = \mt\EconomyAttribute::getAttribute($heroMeta['relationship'], $quality); - - { - $activate = 0; - $activate_time = 0; - $seal_type = 0; - $unseal_time = 0; -// if ($quality > 1){ -// $activate = 1; -// $activate_time = myself()->_getNowTime(); -// $seal_type = 1; -// $unseal_time = myself()->_getNowTime(); -// } + $seal_type = 0; + $unseal_time = 0; + if ($quality > 1){ + $seal_type = 1; + $unseal_time = myself()->_getNowTime(); } $fieldsKv = array( @@ -635,15 +590,12 @@ class Hero extends BaseModel { 'lock_type' => self::NO_LOCK, 'unlock_time' => 0, 'unlock_trade_time' => 0, -// 'activate' => $activate, -// 'activate_time' => $activate_time, + 'activate' => 0, 'wealth_attr' => json_encode($attribute), 'seal_type' => $seal_type, 'unseal_time' => $unseal_time, 'createtime' => myself()->_getNowTime(), 'modifytime' => myself()->_getNowTime(), - 'activate' => 1, - 'activate_time' => myself()->_getNowTime(), ); if ($accountId) { @@ -659,7 +611,7 @@ class Hero extends BaseModel { $fieldsKv ); $userInfo = myself()->_getOrmUserInfo(); - if (!$userInfo['hero_id'] && $seal_type == self::UNSEAL_STATE){ + if (!$userInfo['hero_id'] && $seal_type == self::UNSEAL_STATE){ $heroUnid = SqlHelper::getLastInsertId(myself()->_getSelfMysql()); User::Update(array( 'hero_id' => $heroUnid @@ -918,7 +870,7 @@ class Hero extends BaseModel { if ($row) { $heroMeta = \mt\Item::get($row['hero_id']); $heroAtteMeta = \mt\EconomyAttribute::findByGrade($heroMeta['relationship'],$row['quality']); - $currTime = $row['unseal_time'] ? $row['unseal_time'] : $row['activate_time']; + $currTime = $row['unseal_time'] ? $row['unseal_time'] : $row['createtime']; if ($row['seal_type'] == 0 && $currTime + 86400 * $heroAtteMeta['validTime'] > myself()->_getNowTime()){ $lucky += self::getHeroLucky($row); } @@ -930,18 +882,22 @@ class Hero extends BaseModel { public static function getAccountLuckyTemp(){ $lucky = 0; - $rows = SqlHelper::ormSelect( - myself()->_getSelfMysql(), - 't_hero', - array( - 'account_id' => myself()->_getAccountId(), - ) - ); +// $rows = SqlHelper::ormSelect( +// myself()->_getSelfMysql(), +// 't_hero', +// array( +// 'account_id' => myself()->_getAccountId(), +// ) +// ); + $rows = array(); + self::getHeroList(function ($row) use(&$rows) { + array_push($rows, $row); + }); foreach ($rows as $row) { $heroMeta = \mt\Item::get($row['hero_id']); $heroAtteMeta = \mt\EconomyAttribute::findByGrade($heroMeta['relationship'],$row['quality']); - $currTime = $row['unseal_time'] ? $row['unseal_time'] : $row['activate_time']; + $currTime = $row['unseal_time'] ? $row['unseal_time'] : $row['createtime']; if ($row['seal_type'] == 0 && $currTime + 86400 * $heroAtteMeta['validTime'] > myself()->_getNowTime()){ $lucky += self::getHeroLucky($row); } @@ -956,7 +912,7 @@ class Hero extends BaseModel { $heroMeta = \mt\Item::get($hero['hero_id']); $heroAtteMeta = \mt\EconomyAttribute::findByGrade($heroMeta['relationship'],$hero['quality']); - $currTime = $hero['unseal_time'] ? $hero['unseal_time'] : $hero['activate_time']; + $currTime = $hero['unseal_time'] ? $hero['unseal_time'] : $hero['createtime']; if ($hero['seal_type'] == 0 && $currTime + 86400 * $heroAtteMeta['validTime'] > myself()->_getNowTime()){ return true; }