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-07-06 21:42:50 +08:00
parent 508ba7aff0
commit 20e46c17c8
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webapp/controller/BattleController.class.php
View File

@ -273,9 +273,11 @@ class BattleController extends BaseAuthedController {
$chipPageDb = ChipPage::find($userPresetInfo['presetInfo']['chip_page']); $chipPageDb = ChipPage::find($userPresetInfo['presetInfo']['chip_page']);
$info['chip_page'] = ChipPage::toDtoBattle($chipPageDb); $info['chip_page'] = ChipPage::toDtoBattle($chipPageDb);
$battleDb = Battle::find($account_id); $battleDb = Battle::find($account_id);
$battleData = json_decode($battleDb['battle_data'], true); if ($battleDb){
$seasonBattleData = isset($battleData) ? getXVal($battleData, 'data', array()) : array(); $battleData = json_decode($battleDb['battle_data'], true);
$info['battle_times'] = getXVal($seasonBattleData, 'total_battle_times', 0); $seasonBattleData = isset($battleData) ? getXVal($battleData, 'data', array()) : array();
$info['battle_times'] = getXVal($seasonBattleData, 'total_battle_times', 0);
}
}else{ }else{
$info['errcode'] = 51; $info['errcode'] = 51;
@ -294,16 +296,16 @@ class BattleController extends BaseAuthedController {
} }
} }
{ // {
for ($i = 1; $i <= 2; ++$i) { // for ($i = 1; $i <= 2; ++$i) {
if (isset($info['weapon_uuid' . $i])) { // if (isset($info['weapon_uuid' . $i])) {
$gunDb = Gun::findByAccountId($account_id, $info['weapon_uuid' . $i]); // $gunDb = Gun::findByAccountId($account_id, $info['weapon_uuid' . $i]);
if ($gunDb) { // if ($gunDb) {
$info['weapon_dto' . $i] = Gun::toDto($gunDb); // $info['weapon_dto' . $i] = Gun::toDto($gunDb);
} // }
} // }
} // }
} // }
{ {
$itemDb = Bag::findEx($account_id, V_ITEM_REVIVE_COIN); $itemDb = Bag::findEx($account_id, V_ITEM_REVIVE_COIN);

3
webapp/services/AwardService.php
View File

@ -17,6 +17,9 @@ class AwardService extends BaseService {
} }
} }
$itemMeta = Item::get($itemId); $itemMeta = Item::get($itemId);
if (!$itemMeta){
return;
}
if (!in_array( if (!in_array(
$itemMeta['type'],array( $itemMeta['type'],array(
Item::RANDOM_BOX_TYPE, Item::RANDOM_BOX_TYPE,