From c80c35e77c6df8189c5161ae3235d54e52bf00e7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 22 Sep 2022 14:16:15 +0800
Subject: [PATCH] 1

---
 webapp/services/BattleDataService.php | 12 ++++++------
 webapp/services/FormulaService.php    | 13 +++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index 42e32c25..e668b11e 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -622,17 +622,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['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['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['weapon2']['obtain_ceg'] = '' . ($this->weapon2Dto['current_pvp_get_ceg'] + $weaponPvpCeg2);
             $this->reward['total_ceg'] += $weaponPvpCeg2;
         }
         error_log(json_encode(array(
@@ -679,15 +679,15 @@ class BattleDataService extends BaseService {
         )));
         if ($heroPveCeg > 0) {
             $heroPveCeg = Hero::gainGoldPve($this->heroDto, $heroPveCeg);
-            $this->reward['hero']['obtain_ceg'] = $this->heroDto['current_pve_get_ceg'] + $heroPveCeg;
+            $this->reward['hero']['obtain_ceg'] = '' . ($this->heroDto['current_pve_get_ceg'] + $heroPveCeg);
         }
         if ($weaponPveCeg1 > 0) {
             $weaponPveCeg1 = Gun::gainGoldPve($this->weapon1Dto, $weaponPveCeg1);
-            $this->reward['weapon1']['obtain_ceg'] = $this->weapon1Dto['current_pve_get_ceg'] + $weaponPveCeg1;
+            $this->reward['weapon1']['obtain_ceg'] = '' . ($this->weapon1Dto['current_pve_get_ceg'] + $weaponPveCeg1);
         }
         if ($weaponPveCeg2 > 0) {
             $weaponPveCeg2 = Gun::gainGoldPve($this->weapon1Dto, $weaponPveCeg2);
-            $this->reward['weapon2']['obtain_ceg'] = $this->weapon2Dto['current_pve_get_ceg'] + $weaponPveCeg2;
+            $this->reward['weapon2']['obtain_ceg'] = '' . ($this->weapon2Dto['current_pve_get_ceg'] + $weaponPveCeg2);
         }
         error_log(json_encode(array(
             'new_heroPveCeg' => $heroPveCeg,
diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php
index bf031b22..0dc85b4e 100644
--- a/webapp/services/FormulaService.php
+++ b/webapp/services/FormulaService.php
@@ -53,6 +53,15 @@ class FormulaService extends BaseService {
              (0.8 - ($instanceRank - 1) * 0.25 + $bossReward * 0.2) *
              1/10;
 
+        error_log(json_encode(array(
+            'upLimit' => $upLimit,
+            'heroQuality' => $heroQuality,
+            'instanceLevel' => $instanceLevel,
+            'instanceRank' => $instanceRank,
+            'bossReward' => $bossReward,
+            'ceg' => $ceg
+        )));
+
         return cegFormat($ceg);
     }
 
@@ -87,7 +96,7 @@ class FormulaService extends BaseService {
         return cegFormat($ceg);
     }
 
-    public static function calcWeaponPveCeg($weaponDb, $instanceLevel, $instanceRank, $bossReward)
+    public static function calcWeaponPveCeg($weaponDto, $instanceLevel, $instanceRank, $bossReward)
     {
         $upLimit = $weaponDto['pve_ceg_uplimit'];
         $weaponQuality = $weaponDto['quality'];
@@ -97,7 +106,7 @@ class FormulaService extends BaseService {
              (0.8 - ($instanceRank - 1) * 0.25 + $bossReward * 0.2) *
              1/10;
 
-        return cegFormat(ceg);
+        return cegFormat($ceg);
     }
 
     public static function calcHeroFragmentProbabilityPvp($params,