From c97ac41e7af9d44af492038f4d4d0d6f11ae296a Mon Sep 17 00:00:00 2001 From: hujiabin Date: Fri, 10 Mar 2023 11:48:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=B5=A0=E9=80=81=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/controller/UserController.class.php | 61 +++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index e6e2ea1e..fad5f9fb 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -6,6 +6,7 @@ require_once('models/Season.php'); require_once('models/Nft.php'); require_once('models/Gun.php'); require_once('models/UserSeasonRing.php'); +require_once('models/Chip.php'); require_once('mt/Parameter.php'); require_once('mt/Drop.php'); @@ -28,6 +29,7 @@ use models\Hero; use models\Gun; use models\Season; use models\Nft; +use models\Chip; use models\UserSeasonRing; class UserController extends BaseAuthedController { @@ -45,7 +47,7 @@ class UserController extends BaseAuthedController { $userInfo = $this->_safeGetOrmUserInfo(); if (!$userInfo) { $this->createNewUserV2($userName); - $this->_addFreeItem(); //送 50 Test_CEG + $this->_addFreeItem2(); //送 50 Test_CEG $userInfo = $this->_getOrmUserInfo(); $this->_setV(TN_RANK_STATUS, 0, 1); } @@ -62,6 +64,63 @@ class UserController extends BaseAuthedController { )); $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 + )); + $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 addFragmentBox(){ $items = array( From 5d7a2744f2dc6ed22c539ca69669f30db249f3f7 Mon Sep 17 00:00:00 2001 From: hujiabin Date: Fri, 10 Mar 2023 13:32:48 +0800 Subject: [PATCH 2/3] 1 --- webapp/controller/UserController.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index fad5f9fb..8de514ee 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -105,6 +105,11 @@ class UserController extends BaseAuthedController { '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); From b180b12339be1bd4d558eb7db2228562b00e1b9f Mon Sep 17 00:00:00 2001 From: hujiabin Date: Fri, 10 Mar 2023 14:08:18 +0800 Subject: [PATCH 3/3] 1 --- webapp/controller/BattleController.class.php | 7 +++++++ webapp/controller/HeroSkillController.class.php | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php index ea38c468..96eb297f 100644 --- a/webapp/controller/BattleController.class.php +++ b/webapp/controller/BattleController.class.php @@ -212,6 +212,7 @@ class BattleController extends BaseAuthedController { 'hero_dto' => '', 'weapon_dto1' => '', 'weapon_dto2' => '', + 'level' =>$userDb['level'], 'is_valid_battle' => 0, //'payload' => json_encode($member['cmjoin']), @@ -228,6 +229,12 @@ class BattleController extends BaseAuthedController { if ($heroDb) { $info['is_valid_battle'] = 1; $info['hero_dto'] = Hero::toDto($heroDb); + {//选用皮肤id + $skinDb = HeroSkin::findBx($heroDb['hero_id']); + if ($skinDb){ + $info['hero_dto']['skin_id'] = $skinDb['skin_id']; + } + } } else { $info['errcode'] = 51; $info['errmsg'] = 'paramater error'; diff --git a/webapp/controller/HeroSkillController.class.php b/webapp/controller/HeroSkillController.class.php index c9cee0b5..470eb453 100644 --- a/webapp/controller/HeroSkillController.class.php +++ b/webapp/controller/HeroSkillController.class.php @@ -11,11 +11,12 @@ use phpcommon\SqlHelper; class HeroSkillController extends BaseAuthedController { public function getSkillList(){ - $skillList = \mt\Skill::getPresetSkill(); - $list = array(); - foreach ($skillList as $skill){ - $list[] = $skill['skill_id']; - } +// $skillList = \mt\Skill::getPresetSkill(); +// $list = array(); +// foreach ($skillList as $skill){ +// $list[] = $skill['skill_id']; +// } + $list = array(10101,10201,10301,10401,10501); $this->_rspData(array( 'data' => $list, ));