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

解决冲突

Browse Source
This commit is contained in:
hujiabin 2023-03-10 14:17:17 +08:00
commit 95ed672abd
2 changed files with 69 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,11 +11,12 @@ use phpcommon\SqlHelper;
class HeroSkillController extends BaseAuthedController class HeroSkillController extends BaseAuthedController
{ {
public function getSkillList(){ public function getSkillList(){
$skillList = \mt\Skill::getPresetSkill(); // $skillList = \mt\Skill::getPresetSkill();
$list = array(); // $list = array();
foreach ($skillList as $skill){ // foreach ($skillList as $skill){
$list[] = $skill['skill_id']; // $list[] = $skill['skill_id'];
} // }
$list = array(10101,10201,10301,10401,10501);
$this->_rspData(array( $this->_rspData(array(
'data' => $list, 'data' => $list,
)); ));

64
webapp/controller/UserController.class.php
View File

@ -47,7 +47,7 @@ class UserController extends BaseAuthedController {
$userInfo = $this->_safeGetOrmUserInfo(); $userInfo = $this->_safeGetOrmUserInfo();
if (!$userInfo) { if (!$userInfo) {
$this->createNewUserV2($userName); $this->createNewUserV2($userName);
$this->_addFreeItem(); //送 50 Test_CEG $this->_addFreeItem2(); //送 50 Test_CEG
$userInfo = $this->_getOrmUserInfo(); $userInfo = $this->_getOrmUserInfo();
$this->_setV(TN_RANK_STATUS, 0, 1); $this->_setV(TN_RANK_STATUS, 0, 1);
} }
@ -65,6 +65,68 @@ class UserController extends BaseAuthedController {
$this->_incDailyV(TN_DAILY_LOGINS, 0, 1); $this->_incDailyV(TN_DAILY_LOGINS, 0, 1);
} }
private function _addFreeItem2(){
//添加芯片
$chipMeta = \mt\Item::getMetaListByType(\mt\Item::CHIP_TYPE);
$chip1 = array();
$chip2 = array();
$chip3 = array();
foreach ($chipMeta as $row){
if ($row['sub_type'] == 1){
array_push($chip1,$row);
}else if($row['sub_type'] == 2){
array_push($chip2,$row);
}else if($row['sub_type'] == 3){
array_push($chip3,$row);
}
}
for ($i=1;$i<=20;$i++){
$row1 = $chip1[array_rand($chip1)];
Chip::addChip($row1);
$row2 = $chip2[array_rand($chip2)];
Chip::addChip($row2);
$row3 = $chip3[array_rand($chip3)];
Chip::addChip($row3);
}
//添加枪械和Gold
$addItems =array();
foreach (mt\Parameter::getListValue('creator_present_items') as $itemsStr) {
list($itemId, $itemNum) = explode(':', $itemsStr);
if ($itemNum > 0) {
array_push($addItems,
array(
'item_id' => $itemId,
'item_num' => $itemNum
));
}
}
array_push($addItems,
array(
'item_id' => V_ITEM_GOLD,
'item_num' => 100000
));
array_push($addItems,
array(
'item_id' => V_ITEM_DIAMOND,
'item_num' => 100000
));
$awardService = new services\AwardService();
$propertyChgService = new services\PropertyChgService();
$this->_addItems($addItems, $awardService, $propertyChgService);
//添加英雄和皮肤
$itemIds = array(30700,30900,31000,40701,40702,40901,40902,41001);
$addItems2 =array();
foreach ($itemIds as $row){
array_push($addItems2,
array(
'item_id' => $row,
'item_num' => 1
));
}
$this->_addItems($addItems2, $awardService, $propertyChgService);
}
private function _addFreeItem(){ private function _addFreeItem(){
$chipMeta = \mt\Item::getMetaListByType(\mt\Item::CHIP_TYPE); $chipMeta = \mt\Item::getMetaListByType(\mt\Item::CHIP_TYPE);
foreach ($chipMeta as $row){ foreach ($chipMeta as $row){