Merge branch 'james_bc' into hjb

This commit is contained in:
aozhiwei 2023-04-08 15:26:44 +08:00
commit 02e4111a1b
2 changed files with 18 additions and 6 deletions

View File

@ -23,6 +23,7 @@ require_once('services/AwardService.php');
require_once('services/PropertyChgService.php'); require_once('services/PropertyChgService.php');
require_once('services/SeasonService.php'); require_once('services/SeasonService.php');
require_once('services/NameService.php'); require_once('services/NameService.php');
require_once('services/ChipPageService.php');
use phpcommon\SqlHelper; use phpcommon\SqlHelper;
use models\User; use models\User;
@ -52,6 +53,9 @@ class UserController extends BaseAuthedController {
$this->_addFreeItem(); //送 50 Test_CEG $this->_addFreeItem(); //送 50 Test_CEG
$userInfo = $this->_getOrmUserInfo(); $userInfo = $this->_getOrmUserInfo();
$this->_setV(TN_RANK_STATUS, 0, 1); $this->_setV(TN_RANK_STATUS, 0, 1);
//初始化芯片页
$chipPageObj = new services\ChipPageService();
$chipPageObj->init();
} }
//elo score 衰减 //elo score 衰减
$this->dampingElo($userInfo); $this->dampingElo($userInfo);

View File

@ -11,6 +11,14 @@ class ChipPageService extends BaseService
const MAX_CHIP_SLOT_NUM = 30; const MAX_CHIP_SLOT_NUM = 30;
const INIT_CHIP_PAGE_NUM = 3; const INIT_CHIP_PAGE_NUM = 3;
public function init(){
$count = ChipPage::getCount();
if (!$count){
for ($i=0;$i<self::INIT_CHIP_PAGE_NUM;$i++){
ChipPage::addChipPage();
}
}
}
public function initChipPage(){ public function initChipPage(){
$rows = SqlHelper::ormSelect( $rows = SqlHelper::ormSelect(
myself()->_getSelfMysql(), myself()->_getSelfMysql(),
@ -19,11 +27,11 @@ class ChipPageService extends BaseService
'account_id'=> myself()->_getAccountId() 'account_id'=> myself()->_getAccountId()
) )
); );
if (!$rows){ // if (!$rows){
for ($i=0;$i<self::INIT_CHIP_PAGE_NUM;$i++){ // for ($i=0;$i<self::INIT_CHIP_PAGE_NUM;$i++){
ChipPage::addChipPage(); // ChipPage::addChipPage();
} // }
} // }
if ($rows){ if ($rows){
foreach ($rows as $row){ foreach ($rows as $row){
$this->refreshSlotState($row); $this->refreshSlotState($row);
@ -31,7 +39,7 @@ class ChipPageService extends BaseService
} }
} }
private function refreshSlotState($row){ public function refreshSlotState($row){
$data = emptyReplace(json_decode($row['data'], true), array()); $data = emptyReplace(json_decode($row['data'], true), array());
$userInfo = myself()->_getOrmUserInfo(); $userInfo = myself()->_getOrmUserInfo();
foreach ($data as &$val){ foreach ($data as &$val){