Merge branch 'james_bc' of git.kingsome.cn:server/game2006api into james_bc

This commit is contained in:
hujiabin 2022-11-17 16:43:36 +08:00
commit 8a961190cd
2 changed files with 32 additions and 1 deletions

View File

@ -10,6 +10,7 @@ define('V_ITEM_DIAMOND', 10002); //钻石
define('V_ITEM_EXP', 10003); //经验 define('V_ITEM_EXP', 10003); //经验
define('V_ITEM_ACTIVE', 10004); //活跃度 define('V_ITEM_ACTIVE', 10004); //活跃度
define('V_ITEM_BCEG', 10010); //BCEG define('V_ITEM_BCEG', 10010); //BCEG
define('V_ITEM_REVIVE_COIN', 140001); //复活币
define('TN_BEGIN', 8001); define('TN_BEGIN', 8001);
define('TN_ACTIVE', 8002); define('TN_ACTIVE', 8002);
@ -39,7 +40,7 @@ define('TN_DAILY_PVP_BATTLE_TIMES', 9008);
define('TN_DAILY_PVP_GET_FRAGMENT_NUM', 9009); define('TN_DAILY_PVP_GET_FRAGMENT_NUM', 9009);
define('TN_DAILY_PVE_LAST_GET_FRAGMENT_BATTLE', 9010); define('TN_DAILY_PVE_LAST_GET_FRAGMENT_BATTLE', 9010);
define('TN_DAILY_RANK_BATTLE_TIMES', 9011); define('TN_DAILY_RANK_BATTLE_TIMES', 9011);
define('TN_DAILY_END', 9009); define('TN_DAILY_END', 9011);
define('TN_WEEKLY_BEGIN', 10001); define('TN_WEEKLY_BEGIN', 10001);
define('TN_WEEKLY_ACTIVE', 10002); define('TN_WEEKLY_ACTIVE', 10002);

View File

@ -3,6 +3,7 @@
require_once('models/Hero.php'); require_once('models/Hero.php');
require_once('models/Gun.php'); require_once('models/Gun.php');
require_once('models/Chip.php'); require_once('models/Chip.php');
require_once('models/Bag.php');
require_once('models/BattleHistory.php'); require_once('models/BattleHistory.php');
require_once('services/BattleDataService.php'); require_once('services/BattleDataService.php');
require_once('services/FormulaService.php'); require_once('services/FormulaService.php');
@ -11,6 +12,7 @@ require_once('mt/RankSeason.php');
use phpcommon\SqlHelper; use phpcommon\SqlHelper;
use models\Hero; use models\Hero;
use models\Gun; use models\Gun;
use models\Bag;
use models\BattleHistory; use models\BattleHistory;
class BattleController extends BaseAuthedController { class BattleController extends BaseAuthedController {
@ -125,6 +127,7 @@ class BattleController extends BaseAuthedController {
$data = array( $data = array(
'members' => array() 'members' => array()
); );
$currSeason = mt\RankSeason::getCurrentSeason();
foreach ($members as $member) { foreach ($members as $member) {
$info = array( $info = array(
'account_id' => $member['account_id'], 'account_id' => $member['account_id'],
@ -172,6 +175,16 @@ class BattleController extends BaseAuthedController {
array_push($data['members'], $info); array_push($data['members'], $info);
} }
{
$itemDb = Bag::find(V_ITEM_REVIVE_COIN);
$data['revive_coin'] = $itemDb && $itemDb['item_num'] > 0 ? $itemDb['item_num'] : 0;
}
{
$data['match_mode'] = 0;
if ($currSeason && myself()->_getV(TN_RANK_STATUS, 0 ) != 1){
$data['match_mode'] = 1;
}
}
// $attr = Hero::getChipAttr($info['hero_dto']['chip_ids']); // $attr = Hero::getChipAttr($info['hero_dto']['chip_ids']);
myself()->_rspData($data); myself()->_rspData($data);
} }
@ -189,4 +202,21 @@ class BattleController extends BaseAuthedController {
'data' => $data 'data' => $data
)); ));
} }
public function decReviveCoin()
{
$num = getReqVal('num', 1);
$itemDb = Bag::find(V_ITEM_REVIVE_COIN);
if (!$itemDb || $itemDb['item_num'] < $num) {
myself()->_rspErr(1, 'not enought item');
return;
}
Bag::decItem(V_ITEM_REVIVE_COIN, $num);
$itemDb = Bag::find(V_ITEM_REVIVE_COIN);
$reviveCoin = $itemDb && $itemDb['item_num'] > 0 ? $itemDb['item_num'] : 0;
myself()->_rspData(array(
'revive_coin' => $reviveCoin
));
}
} }