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

Merge branch 'hjb' into james

Browse Source
This commit is contained in:
aozhiwei 2022-10-20 14:22:15 +08:00
commit 9fafa8de97
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,7 @@ class BattleController extends BaseAuthedController {
public function getBattleDataNew() public function getBattleDataNew()
{ {
error_log(json_encode($_REQUEST));
$members = json_decode(getReqVal('members', ''), true); $members = json_decode(getReqVal('members', ''), true);
$data = array( $data = array(
'members' => array() 'members' => array()
@ -128,8 +129,8 @@ class BattleController extends BaseAuthedController {
'account_id' => $member['account_id'], 'account_id' => $member['account_id'],
'session_id' => $member['session_id'], 'session_id' => $member['session_id'],
'hero_uniid' => $member['hero_uniid'], 'hero_uniid' => $member['hero_uniid'],
'weapon_uniid1' => $member['weapon_uniid1'], 'weapon_uuid1' => $member['weapon_uuid1'],
'weapon_uniid2' => $member['weapon_uniid2'], 'weapon_uuid2' => $member['weapon_uuid2'],
'battle_uuid' => $member['battle_uuid'], 'battle_uuid' => $member['battle_uuid'],
'hero_dto' => '', 'hero_dto' => '',
'weapon_dto1' => '', 'weapon_dto1' => '',
@ -157,9 +158,9 @@ class BattleController extends BaseAuthedController {
} }
{ {
for ($i = 1; $i <= 2; ++$i) { for ($i = 1; $i <= 2; ++$i) {
if (isset($member['weapon_uniid' . $i])) { if (isset($member['weapon_uuid' . $i])) {
$gunDb = Gun::findByAccountId($member['account_id'], $gunDb = Gun::findByAccountId($member['account_id'],
$member['weapon_uniid' . $i]); $member['weapon_uuid' . $i]);
if ($gunDb) { if ($gunDb) {
$info['weapon_dto' . $i] = Gun::toDto($gunDb); $info['weapon_dto' . $i] = Gun::toDto($gunDb);
} }