From 78831a30de4240359b5c8eaec0001cca7a393279 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 3 Jun 2022 16:15:53 +0800
Subject: [PATCH] 1

---
 doc/_common.py         | 5 +++++
 webapp/models/Gun.php  | 4 +++-
 webapp/models/Hero.php | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/_common.py b/doc/_common.py
index cdab4ad5..23919da9 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -212,9 +212,14 @@ class Hero(object):
             ['skill_lv1', 0, '必杀技等级'],
             ['skill_lv2', 0, '躲避技能等级'],
             ['ceg_uplimit', 0, 'ceg今天获取上限'],
+            ['pve_ceg_uplimit', 0, 'pve ceg今天获取上限'],
             ['!attr', [Attr()], '属性'],
             ['try_count', 0, '剩余体验次数 当state=1时才有意义'],
             ['lock_type', 0, '0:无锁 1:升级 2:升阶'],
+            ['today_get_gold', 0, '今天pvp获取的ceg数量'],
+            ['last_pve_get_ceg_time', 0, '最后一次获取pve获取ceg时间'],
+            ['last_get_gold_time', 0, '今天pvp获取的ceg数量'],
+            ['last_pve_get_ceg_time', 0, '最后一次获取pve获取ceg时间'],
             ['unlock_time', 0, '使用解锁utc时间(升级或者升阶触发),锁定期间不可战斗和做其他操作,配合lock_type使用'],
             ['unlock_trade_time', 0, '出售解锁utc时间(升级或者升阶完成后触发),只锁交易，其他的操作仍可进行，和lock_type无关是独立的锁!!!'],
         ]
diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index 0ccb6a80..776a2124 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -159,13 +159,15 @@ class Gun extends BaseModel {
             'lock_type' => $lockType,
             'today_get_gold' => $todayGetGold,
             'last_get_gold_time' => $lastGetGoldTime,
+            'today_pve_get_ceg' => $todayPveGetCeg,
+            'last_pve_get_ceg_time' => $lastPveGetCegTime,
             'unlock_time' => $unlockTime,
             'unlock_trade_time' => $row['unlock_trade_time'],
         );
         $dto['ceg_uplimit'] = FormulaService::getWeaponPvpDailyCegUpLimit($dto);
         $dto['raw_pve_ceg_uplimit'] =
                                     FormulaService::getWeaponPveDailyCegUpLimit($dto);
-        $dto['pve_ceg_uplimit'] = round($dto['pve_ceg_uplimit'] * 0.9);
+        $dto['pve_ceg_uplimit'] = round($dto['raw_pve_ceg_uplimit'] * 0.9);
         return $dto;
     }
 
diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index 732d747c..bfae7274 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -160,7 +160,7 @@ class Hero extends BaseModel {
         $dto['ceg_uplimit'] = FormulaService::getHeroPvpDailyCegUpLimit($dto);
         $dto['raw_pve_ceg_uplimit'] =
                                     FormulaService::getHeroPveDailyCegUpLimit($dto);
-        $dto['pve_ceg_uplimit'] = round($dto['pve_ceg_uplimit'] * 0.9);
+        $dto['pve_ceg_uplimit'] = round($dto['raw_pve_ceg_uplimit'] * 0.9);
         return $dto;
     }