diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php
index e3cf2809..33e7d276 100644
--- a/webapp/services/FormulaService.php
+++ b/webapp/services/FormulaService.php
@@ -5,6 +5,7 @@ namespace services;
 require_once('mt/AttrHelper.php');
 require_once('mt/Item.php');
 require_once('mt/FormulaPvp.php');
+require_once('mt/HeroQuality.php');
 
 use mt;
 
@@ -14,7 +15,8 @@ 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 = mt\AttrHelper::getAbsVal($heroDb['attr'], kHAT_LUCKY);
+        $qualityMeta = mt\HeroQuality::getByQuality($heroDb['quality']);
+        $lucky = $qualityMeta ? $qualityMeta['lucky'] : 0;
         $upLimit = round(
             (
                 0.0402*pow($heroDb['quality'],3) -
@@ -54,10 +56,10 @@ class FormulaService extends BaseService {
         return $upLimit;
     }
 
-    public static function calcHeroPvpCeg($heroDb, $params)
+    public static function calcHeroPvpCeg($heroDto, $params)
     {
         //PVP角色NFT每日获得极限*(50%*[每局排名TopX%对应比例]+25%*[每局PK人数排名TopX%对应比例]+15%*[每局英雄属性排名TopX%对应比例]+5%*[每局武器属性排名TopX%对应比例]+5%*[每局存活时间排名TopX%对应比例])
-        $upLimit = getXVal($params, 'uplimit');
+        $upLimit = $heroDto['ceg_uplimit'];
         $rankedTopX= getXVal($params, 'ranked_topx');
         $killsTopX = getXVal($params, 'kills_topx');
         $heroTopX = getXVal($params, 'hero_topx');