From afe23a772319a8f34fd0b3ab8f6d1031158948b0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 27 May 2022 15:26:28 +0800
Subject: [PATCH] 1

---
 doc/_common.py                        | 2 ++
 webapp/models/Hero.php                | 4 ++++
 webapp/services/BattleDataService.php | 8 +++++---
 webapp/services/FormulaService.php    | 5 +++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/doc/_common.py b/doc/_common.py
index c63e863d..cdab4ad5 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -80,6 +80,7 @@ class Gun(object):
             ['gun_lv', 0, '枪等级'],
             ['quality', 0, '品阶'],
             ['durability', 0, '耐久'],
+            ['ceg_uplimit', 0, 'ceg今天获取上限'],
             ['!attr', [Attr()], '属性'],
             ['try_count', 0, '剩余体验次数 当state=1时才有意义'],
             ['lock_type', 0, '0:无锁 1:升级 2:升阶'],
@@ -210,6 +211,7 @@ class Hero(object):
             ['quality', 0, '品阶'],
             ['skill_lv1', 0, '必杀技等级'],
             ['skill_lv2', 0, '躲避技能等级'],
+            ['ceg_uplimit', 0, 'ceg今天获取上限'],
             ['!attr', [Attr()], '属性'],
             ['try_count', 0, '剩余体验次数 当state=1时才有意义'],
             ['lock_type', 0, '0:无锁 1:升级 2:升阶'],
diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index 356572de..3a29d307 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -9,11 +9,13 @@ require_once('mt/AttrHelper.php');
 require_once('mt/Item.php');
 require_once('models/HeroSkin.php');
 require_once('services/NftService.php');
+require_once('services/FormulaService.php');
 
 use mt;
 use phpcommon;
 use phpcommon\SqlHelper;
 use services\NftService;
+use services\FormulaService;
 
 class Hero extends BaseModel {
 
@@ -135,6 +137,7 @@ class Hero extends BaseModel {
             'quality' => $row['quality'],
             'skill_lv1' => $row['skill_lv1'],
             'skill_lv2' => $row['skill_lv2'],
+            'ceg_uplimit' => 0,
             'attr' => $attr,
             'try_count' => $row['try_count'],
             'lock_type' => $lockType,
@@ -143,6 +146,7 @@ class Hero extends BaseModel {
             'unlock_time' => $unlockTime,
             'unlock_trade_time' => $row['unlock_trade_time'],
         );
+        $dto['ceg_uplimit'] = FormulaService::getHeroPvpDailyCegUpLimit($dto);
         return $dto;
     }
 
diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index 400d5da2..e7035393 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -19,6 +19,7 @@ require_once('models/Hero.php');
 require_once('models/Gun.php');
 
 require_once('services/RankActivityService.php');
+require_once('services/FormulaService.php');
 
 use mt;
 use phpcommon\SqlHelper;
@@ -51,7 +52,7 @@ class BattleDataService extends BaseService {
             return;
             }*/
         $this->rankActivityService->updateBattleData();
-        //$this->rewardGold($heroDb);
+        $this->rewardGold($heroDb);
         error_log('updateBattleData2');
         $this->currSeasonMeta = mt\Season::getCurrentSeason();
         if (!$this->currSeasonMeta) {
@@ -357,8 +358,9 @@ class BattleDataService extends BaseService {
         if (!$heroMeta) {
             return;
         }
-        $killMeta = mt\KillReward::get(getReqVal('kills', 0));
-        $rankMeta = mt\RankReward::get(getReqVal('ranked', 0));
+        //$killMeta = mt\KillReward::get(getReqVal('kills', 0));
+        //$rankMeta = mt\RankReward::get(getReqVal('ranked', 0));
+
     }
 
     private function oldRewardGold($heroDb)
diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php
index 96d6b0ff..e3cf2809 100644
--- a/webapp/services/FormulaService.php
+++ b/webapp/services/FormulaService.php
@@ -2,6 +2,7 @@
 
 namespace services;
 
+require_once('mt/AttrHelper.php');
 require_once('mt/Item.php');
 require_once('mt/FormulaPvp.php');
 
@@ -13,7 +14,7 @@ class FormulaService extends BaseService {
     {
         //ROUND((0.0402*角色NFT阶数^3-0.9459*角色NFT阶数^2+11.9664*角色NFT阶数+4.01892)+(0.0268*角色幸运值^3-2.15712*角色幸运值^2+60.944*角色幸运值-560.24),0)+系统参数
         $sysParam = 0;
-        $lucky = 0;
+        $lucky = mt\AttrHelper::getAbsVal($heroDb['attr'], kHAT_LUCKY);
         $upLimit = round(
             (
                 0.0402*pow($heroDb['quality'],3) -
@@ -35,7 +36,7 @@ class FormulaService extends BaseService {
     {
         //ROUND((0.0938*角色NFT阶数^3-2.2071*角色NFT阶数^2+27.9216*角色NFT阶数+9.3776)+(0.0625*角色幸运值^3-5.0334*角色幸运值^2+142.2028*角色幸运值-1307.2268),0)+系统参数
         $sysParam = 0;
-        $lucky = 0;
+        $lucky = mt\AttrHelper::getAbsVal($heroDb['attr'], kHAT_LUCKY);
         $upLimit = round(
             (
                 0.0938*pow($heroDb['quality'],3) -