From 9f05e8b36d54ec6db3dbe912481376716168aa72 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 21 Sep 2022 11:03:09 +0800
Subject: [PATCH] 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,