From 4b8deb4a83058367d0213c7c33243d269448d46a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 4 Sep 2024 11:50:07 +0800
Subject: [PATCH] 1

---
 webapp/models/Hero.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index c8af5564..5b3d4ac7 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -461,7 +461,7 @@ class Hero extends BaseModel {
     }
 
     public static function abilityInfoAddition($baseAbility, $row){
-        $attr = array();
+        $attr = emptyReplace(json_decode($row['rand_attr'], true), array());
         $chipPageDb = ChipPage::find($row['idx']);
         if ($row['quality'] > 1 && $chipPageDb) {
             $data = emptyReplace(json_decode($chipPageDb['data'], true), array());
@@ -469,6 +469,8 @@ class Hero extends BaseModel {
                 $chipDb = Chip::find($value['chip_id']);
                 if (!empty($chipDb)) {
                     self::mergeAttr($attr, emptyReplace(json_decode($chipDb['rand_attr'], true), array()));
+                } else {
+
                 }
             }
         }
@@ -551,7 +553,7 @@ class Hero extends BaseModel {
         {
             $pAttackAm = 0;
             $pAttackAm_Add = mt\AttrHelper::getAttrVal($attr, kHAT_pAttackAm, 0);
-            $pAttackAm += $pAttackAm;
+            $pAttackAm += $pAttackAm_Add;
 
             $pAttackRateSe = 0;
             $pAttackRateSe_Add = mt\AttrHelper::getAttrVal($attr, kHAT_pAttackRateSe, 0);
@@ -640,7 +642,8 @@ class Hero extends BaseModel {
     }
 
     public static function abilityInfo($row){
-        return self::calcAbility($row['hero_id'], array());
+        $attr = emptyReplace(json_decode($row['rand_attr'], true), array());
+        return self::calcAbility($row['hero_id'], $attr);
     }
 
     public static function addFreeHero($heroMeta)