From 53a71ab594442e8745d89d0b17049123181db08e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 28 May 2022 23:40:06 +0800
Subject: [PATCH] 1

---
 webapp/models/Gun.php                 | 4 ++++
 webapp/services/BattleDataService.php | 9 ++++-----
 webapp/services/FormulaService.php    | 4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index e7a6f040..32c97c2e 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -7,10 +7,12 @@ require_once('mt/GunQuality.php');
 require_once('mt/Item.php');
 require_once('models/GunSkin.php');
 require_once('services/NftService.php');
+require_once('services/FormulaService.php');
 
 use mt;
 use phpcommon\SqlHelper;
 use services\NftService;
+use services\FormulaService;
 
 class Gun extends BaseModel {
 
@@ -143,6 +145,7 @@ class Gun extends BaseModel {
             'state' => $row['state'],
             'quality' => $row['quality'],
             'durability' => $row['durability'],
+            'ceg_uplimit' => 0,
             'attr' => $attr,
             'try_count' => $row['try_count'],
             'lock_type' => $lockType,
@@ -151,6 +154,7 @@ class Gun extends BaseModel {
             'unlock_time' => $unlockTime,
             'unlock_trade_time' => $row['unlock_trade_time'],
         );
+        $dto['ceg_uplimit'] = FormulaService::getWeaponPvpDailyCegUpLimit($dto);
         return $dto;
     }
 
diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index e7035393..755350dd 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -28,6 +28,7 @@ use models\Battle;
 use models\Bag;
 use models\Hero;
 use models\Gun;
+use services\FormulaService;
 
 class BattleDataService extends BaseService {
 
@@ -352,15 +353,13 @@ class BattleDataService extends BaseService {
         }
     }
 
-    private function rewardGold($heroDb)
+    private function rewardGold($heroDto)
     {
-        $heroMeta = mt\Item::get($heroDb['hero_id']);
+        $heroMeta = mt\Item::get($heroDto['hero_id']);
         if (!$heroMeta) {
             return;
         }
-        //$killMeta = mt\KillReward::get(getReqVal('kills', 0));
-        //$rankMeta = mt\RankReward::get(getReqVal('ranked', 0));
-
+        $pvpCeg = FormulaService::calcHeroPvpCeg($heroDto, $_REQUEST);
     }
 
     private function oldRewardGold($heroDb)
diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php
index 33e7d276..96a14e5e 100644
--- a/webapp/services/FormulaService.php
+++ b/webapp/services/FormulaService.php
@@ -6,6 +6,7 @@ require_once('mt/AttrHelper.php');
 require_once('mt/Item.php');
 require_once('mt/FormulaPvp.php');
 require_once('mt/HeroQuality.php');
+require_once('mt/GunQuality.php');
 
 use mt;
 
@@ -89,7 +90,8 @@ class FormulaService extends BaseService {
     {
         //ROUND((0.0111*武器NFT阶数^3-0.25974*武器NFT阶数^2+3.29292*武器NFT阶数+1.3389)+(0.0074*武器幸运值^3-0.59396*武器幸运值^2+16.7708*武器幸运值-153.964),0)+系统参数
         $sysParam = 0;
-        $lucky = 0;
+        $qualityMeta = mt\GunQuality::getByQuality($weaponDb['quality']);
+        $lucky = $qualityMeta ? $qualityMeta['lucky'] : 0;
         $upLimit = round(
             (
                 0.0111*pow($weaponDb['quality'],3) -