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

1

Browse Source
This commit is contained in:
hujiabin 2023-11-06 17:07:25 +08:00
parent 855c07b379
commit 5113f30ec4
4 changed files with 78 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ComputingPower.py
View File

@ -107,10 +107,10 @@ class ComputingPower(object):
] ]
}, },
{ {
'name': 'exchangeUplimitNew', 'name': 'exchangeCrystalInfo',
'desc': '晶体兑换上限', 'desc': '晶体兑换信息',
'group': 'ComputingPower', 'group': 'ComputingPower',
'url': 'webapp/index.php?c=ComputingPower&a=exchangeUplimitNew', 'url': 'webapp/index.php?c=ComputingPower&a=exchangeCrystalInfo',
'params': [ 'params': [
_common.ReqHead(), _common.ReqHead(),
], ],

9
webapp/controller/ComputingPowerController.class.php
View File

@ -351,7 +351,7 @@ class ComputingPowerController extends BaseAuthedController
)); ));
} }
public function exchangeUplimitNew(){ public function exchangeCrystalInfo(){
$hashRateService = new \services\HashRateService(); $hashRateService = new \services\HashRateService();
$crystalInfo = $hashRateService->getCrystalValue(); $crystalInfo = $hashRateService->getCrystalValue();
$this->_rspData(array( $this->_rspData(array(
@ -460,8 +460,11 @@ class ComputingPowerController extends BaseAuthedController
} }
public function test(){ public function test(){
print_r(\mt\HashRateTask::getMetaList()); $hashRateService = new \services\HashRateService();
$crystalInfo = $hashRateService->getCrystalValue();
$this->_rspData(array(
'crystalInfo' => $crystalInfo
));
} }

3
webapp/models/CrystalRecord.php
View File

@ -12,7 +12,8 @@ class CrystalRecord extends BaseModel
myself()->_getSelfMysql(), myself()->_getSelfMysql(),
't_crystal_exchange_record', 't_crystal_exchange_record',
array( array(
'account_id'=>myself()->_getAccountId() 'account_id'=>myself()->_getAccountId(),
'item_id'=>ComputingPower::CRYSTAL_NEW,
), ),
function ($row) use($cb) { function ($row) use($cb) {
$cb($row); $cb($row);

4
webapp/services/HashRateService.php
View File

@ -167,8 +167,10 @@ class HashRateService extends BaseService
$hashRateDb = HashRateTask::findByTaskIdOrSeason($metaTask['id'],$seasonMeta['id']); $hashRateDb = HashRateTask::findByTaskIdOrSeason($metaTask['id'],$seasonMeta['id']);
$userDb = myself()->_safeGetOrmUserInfo(); $userDb = myself()->_safeGetOrmUserInfo();
$rankMeta = Rank::getRankById($userDb['rank']); $rankMeta = Rank::getRankById($userDb['rank']);
if ($rankMeta['rank_order2'] > $hashRateDb['record_total']){ //
if ($hashRateDb && $rankMeta['rank_order2'] > $hashRateDb['record_total']){
$finalVal = ($rankMeta['rank_order2'] - $hashRateDb['claim_total']) * $metaTask['reward']; $finalVal = ($rankMeta['rank_order2'] - $hashRateDb['claim_total']) * $metaTask['reward'];
} }
} else { } else {
$hashRateDb = HashRateTask::findByTaskId($metaTask['id']); $hashRateDb = HashRateTask::findByTaskId($metaTask['id']);