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 2024-04-22 16:59:09 +08:00
parent 08be834d14
commit 72612de722
4 changed files with 3 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/_common.py
View File

@ -1224,6 +1224,7 @@ class BattleSettlementMembersInfo(object):
['hero_uniid', 0, '英雄uniid'],
['hero_id', 0, '英雄itemId'],
['dead', 0, '是否已死亡'],
['dead_times', 0, '死亡次数'],
['is_mvp', 0, '是否mvp'],
['old_rank', 0, '老段位'],
['new_rank', 0, '新段位'],

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

@ -964,29 +964,6 @@ class BattleController extends BaseAuthedController {
}
public function getBattleHistory(){
$accountId = getReqVal('target_id', 0);
$room_mode = getReqVal('room_mode', 0);
$pvp_mode = getReqVal('pvp_mode', 0);
if (!$accountId){
$accountId = myself()->_getAccountId();
}
$singleList = BattleSettlement::getSingleList($accountId,$room_mode,$pvp_mode);
$historyList = BattleHistory::orderBy($singleList,'desc');
// print_r($data);die;
// $historyList = BattleHistory::orderBy(BattleHistory::getMyBattleHistoryByMode($mode),'desc');
$data = array();
foreach ($historyList as $k=>$history){
if ($k < 40){
array_push($data,BattleHistory::toDto($history));
}
}
$this->_rspData(array(
'data' => $data
));
}
public function showBattleHistory(){
$accountId = getReqVal('target_id', '');
$battleUuid = getReqVal('battle_uuid', 0);

71
webapp/controller/BoxController.class.php
View File

@ -29,76 +29,5 @@ use services\LogService;
class BoxController extends BaseAuthedController {
private $propertyChgService = null;
private $awardService = null;
public function _handlePre()
{
parent::_handlePre();
$this->propertyChgService = new services\PropertyChgService();
$this->awardService = new services\AwardService();
}
public function requestReward()
{
/*
$this->_rspData(array(
"item_list" => array(
array(
'item_id' => V_ITEM_GOLD,
'item_num' => 1000
)
)
));
$payload = '';
return;*/
$mode = 0;
{
$rawData = getReqVal('payload', '');
$customData = strstr($rawData, '|');
$customData = substr($customData, 1);
$data = json_decode($customData, true);
$mode = $data['room_mode'];
error_log($customData);
}
$item = array();
$currentMeta = \mt\ServerTaskTime::getCurrentTime();
if ($currentMeta &&
myself()->_getNowTime() >= strtotime($currentMeta['income_start_time']) &&
myself()->_getNowTime() < strtotime($currentMeta['income_end_time'])){
$hashRateService = new services\HashRateService();
$hashRateService->init();
$status = $hashRateService->getServerASKBoxMode();
switch ($status){
case \mt\ServerTask::MOBA_DROP_STATE :{
if ($mode == \services\TameBattleDataService::ROOM_MODE_MOBA){
array_push($item,array(
"item_id" => 300001,
"item_num" => 1,
));
}
}
break;
case \mt\ServerTask::PVP_DROP_STATE : {
if ($mode == \services\TameBattleDataService::ROOM_MODE_PVP){
array_push($item,array(
"item_id" => 300001,
"item_num" => 1,
));
}
}
break;
}
}
$awardService = new services\AwardService();
$propertyChgService = new services\PropertyChgService();
myself()->_addItems($item, $awardService, $propertyChgService);
$this->_rspData(array(
"item_list" => $item,
'award' => $awardService->toDto(),
'property_chg' => $propertyChgService->toDto(),
));
}
}

2
webapp/services/TameBattleDataService.php
View File

@ -566,6 +566,7 @@ class TameBattleDataService extends BaseService {
'pve_max_wave'=> getXVal($this->battleInfo,'pve_max_wave', 0),
'pve_boss_killed'=> getXVal($this->battleInfo,'pve_boss_killed', 0),
'hero_lv'=> getXVal($this->battleInfo,'hero_lv', 1),
'dead_times'=> getXVal($this->battleInfo,'dead_times', 0),
'reward' => array(),
);
BattleSettlement::addSingle($battleUuid,$roomUuid,$data);
@ -691,6 +692,7 @@ class TameBattleDataService extends BaseService {
'pve_max_wave'=> getXVal($info,'pve_max_wave', 0),
'pve_boss_killed'=> getXVal($info,'pve_boss_killed', 0),
'hero_lv'=> getXVal($info,'hero_lv', 1),
'dead_times'=> getXVal($info,'dead_times', 0),
'battle_score'=> 0,
'reward' => $rewards
);