From 9f05e8b36d54ec6db3dbe912481376716168aa72 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 21 Sep 2022 11:03:09 +0800 Subject: [PATCH 1/3] 1 --- webapp/controller/BattleController.class.php | 9 ++++----- webapp/services/BattleDataService.php | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php index 800d650a..af22e6d1 100644 --- a/webapp/controller/BattleController.class.php +++ b/webapp/controller/BattleController.class.php @@ -38,11 +38,10 @@ class BattleController extends BaseAuthedController { 'modifytime' => $this->_getNowTime(), ) ); - $this->_rspData($battleDataService->getReward()); - } - - public function battleReportNew() - { + error_log(json_encode($battleDataService->getReward())); + $this->_rspData(array( + 'reward' => $battleDataService->getReward() + )); } public function getBattleData() diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php index db0e6eac..28c8d614 100644 --- a/webapp/services/BattleDataService.php +++ b/webapp/services/BattleDataService.php @@ -70,6 +70,7 @@ class BattleDataService extends BaseService { 'ceg_uplimit' => 0, 'obtain_ceg' => 0, ), + 'total_ceg' => 0, 'items' => array() ); private $rankActivityService = null; @@ -620,14 +621,17 @@ class BattleDataService extends BaseService { if ($heroPvpCeg > 0) { $heroPvpCeg = Hero::gainGoldPvp($this->heroDto, $heroPvpCeg); $this->reward['hero']['obtain_ceg'] = $this->heroDto['current_pvp_get_ceg'] + $heroPvpCeg; + $this->reward['total_ceg'] += $heroPvpCeg; } if ($weaponPvpCeg1 > 0) { $weaponPvpCeg1 = Gun::gainGoldPvp($this->weapon1Dto, $weaponPvpCeg1); $this->reward['weapon1']['obtain_ceg'] = $this->weapon1Dto['current_pvp_get_ceg'] + $weaponPvpCeg1; + $this->reward['total_ceg'] += $weaponPvpCeg1; } if ($weaponPvpCeg2 > 0) { $weaponPvpCeg2 = Gun::gainGoldPvp($this->weapon1Dto, $weaponPvpCeg2); $this->reward['weapon2']['obtain_ceg'] = $this->weapon2Dto['current_pvp_get_ceg'] + $weaponPvpCeg2; + $this->reward['total_ceg'] += $weaponPvpCeg2; } error_log(json_encode(array( 'new_heroPvpCeg' => $heroPvpCeg, From d70dd0593252c3438545e62d4764ccf7ad5eadc0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 21 Sep 2022 11:05:06 +0800 Subject: [PATCH 2/3] 1 --- server/game2006service/tasks/factory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/game2006service/tasks/factory.js b/server/game2006service/tasks/factory.js index 67fa349a..adf60be2 100644 --- a/server/game2006service/tasks/factory.js +++ b/server/game2006service/tasks/factory.js @@ -2,4 +2,4 @@ function init() { } -expors.init = init; +exports.init = init; From 7967e2eed6b27080d851c8410bd0fe40f396d2f9 Mon Sep 17 00:00:00 2001 From: hujiabin Date: Wed, 21 Sep 2022 11:10:29 +0800 Subject: [PATCH 3/3] 1 --- doc/_common.py | 2 ++ sql/gamedb.sql | 1 + webapp/controller/UserController.class.php | 3 +++ webapp/models/User.php | 2 ++ webapp/services/BattleDataService.php | 1 + 5 files changed, 9 insertions(+) diff --git a/doc/_common.py b/doc/_common.py index 9641ca5e..dc78e3b8 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -192,6 +192,8 @@ class UserDetailInfo(object): ['hero_id', 0, '当前使用的英雄ID'], ['current_rank', 0, '当前段位'], ['history_best_rank', 0, '历史最高段位'], + ['current_rank_score', 0, '当前赛季排位分'], + ['history_best_rank_score', 0, '历史最高赛季排位分'], ['like_count', 0, '点赞次数'], ['!history_seasons', [UserHisSeason()], '历史打过的赛季列表'], ] diff --git a/sql/gamedb.sql b/sql/gamedb.sql index e14de11b..52fe301a 100644 --- a/sql/gamedb.sql +++ b/sql/gamedb.sql @@ -39,6 +39,7 @@ CREATE TABLE `t_user` ( `rank` int(11) NOT NULL DEFAULT '0' COMMENT '段位', `history_best_rank` int(11) NOT NULL DEFAULT '0' COMMENT '历史最高段位', `score` int(11) NOT NULL DEFAULT '0' COMMENT '积分', + `history_best_score` int(11) NOT NULL DEFAULT '0' COMMENT '历史最高积分', `gold` bigint NOT NULL DEFAULT '0' COMMENT '金币', `diamond` bigint NOT NULL DEFAULT '0' COMMENT '钻石', `hero_id` int(11) NOT NULL DEFAULT '0' COMMENT '当前上阵英雄id', diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index 44bff372..cb7b7e47 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -212,6 +212,7 @@ class UserController extends BaseAuthedController { 'rank' => $initRankMeta ? $initRankMeta['rank'] : 1, 'history_best_rank' => $initRankMeta ? $initRankMeta['rank'] : 1, 'score' => $initRankMeta ? $initRankMeta['min_score'] : 0, + 'history_best_score' => $initRankMeta ? $initRankMeta['min_score'] : 0, 'head_id' => $headId, 'hero_id' => $heroId, 'last_season_id' => $currSeasonMeta ? $currSeasonMeta['id'] : 0, @@ -472,6 +473,8 @@ class UserController extends BaseAuthedController { } $userDto = User::info($userDb); $userDto['current_rank'] = $userDb['rank']; + $userDto['current_rank_score'] = $userDb['score']; + $userDto['history_best_rank_score'] = $userDb['history_best_score']; $userDto['history_seasons'] = array(); $seasonDbs = Season::getHistorySeasons($targetId); foreach ($seasonDbs as $seasonDb) { diff --git a/webapp/models/User.php b/webapp/models/User.php index 41ef87f2..424a3e6b 100644 --- a/webapp/models/User.php +++ b/webapp/models/User.php @@ -38,6 +38,7 @@ class User extends BaseModel { 'rank' => $row['rank'], 'history_best_rank' => $row['history_best_rank'], 'score' => $row['score'], + 'history_best_score' => $row['history_best_score'], 'gold' => $row['gold'], 'diamond' => $row['diamond'], 'hero_id' => $row['hero_id'], @@ -66,6 +67,7 @@ class User extends BaseModel { 'rank' => $row['rank'], 'history_best_rank' => $row['history_best_rank'], 'score' => $row['score'], + 'history_best_score' => $row['history_best_score'], 'gold' => $row['gold'], 'diamond' => $row['diamond'], 'hero_id' => $row['hero_id'], diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php index db0e6eac..103fd9f1 100644 --- a/webapp/services/BattleDataService.php +++ b/webapp/services/BattleDataService.php @@ -335,6 +335,7 @@ class BattleDataService extends BaseService { 'rank' => $newRank, 'score' => $newScore, 'history_best_rank' => max($userInfo['rank'], $newRank), + 'history_best_score' => max($userInfo['score'], $newScore), 'score_modifytime' => myself()->_getNowTime(), 'best_rank_modifytime' => $newRank > $userInfo['rank'] ? myself()->_getNowTime() : $userInfo['best_rank_modifytime'],