From 7f4988d6cfea4cedc499df1f304a664cf05b4bc8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 5 Aug 2024 17:02:36 +0800
Subject: [PATCH] 1

---
 doc/_common.py         |  1 +
 webapp/models/Hero.php | 25 +++++++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/doc/_common.py b/doc/_common.py
index f286b17d..e96a7932 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -289,6 +289,7 @@ class Hero(object):
             ['tags', '', '1：Gen状态'],
             ['!avatarInfo', [AvatarInfo()], '装饰信息'],
             ['ability', Ability(), '属性'],
+            ['ability_addition', Ability(), '属性-加成'],
             ['lucky', 0, '幸运值'],
             ['wealth', 0, '财富值'],
             ['seal_type', 0, '0:未封存 1：已封存'],
diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index f90dd9be..88c3bd39 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -280,6 +280,8 @@ class Hero extends BaseModel {
             $validTime = $unsealTime + 86400 * $heroAtteMeta['validTime'] ;
 
         }
+        $baseAbility = self::abilityInfo($row);
+        $addAbility = self::abilityInfoAddition($baseAbility, $row);
         $dto = array(
             'idx' => $row['idx'],
             'token_id' => $row['token_id'],
@@ -308,7 +310,8 @@ class Hero extends BaseModel {
             'is_select' => $isSelect,
             'lucky' => self::getHeroLucky($row),
             'wealth' => self::getHeroWealth($row),
-            'ability' => self::abilityInfo($row),
+            'ability' => $baseAbility,
+            'ability_addition' => $addAbility,
             'seal_type' =>  $row['seal_type'],
             'unseal_time' => $row['unseal_time'],
             'valid_lefttime' =>  max(0,
@@ -428,7 +431,7 @@ class Hero extends BaseModel {
         return $avatarInfos;
     }
 
-    public static function abilityInfo($row ){
+    public static function abilityInfoAddition($baseAbility, $row){
         $info = array(
             'hp' => 0,
             'attack' => 0,
@@ -436,8 +439,18 @@ class Hero extends BaseModel {
             'block' => 0,
             'critical' => 0
         );
-        $attr = array();
-        $basicMeta = mt\BattleBasicAttribute::get($row['hero_id']);
+        return $info;
+    }
+
+    public static function calcAbility($heroId, $attr) {
+        $info = array(
+            'hp' => 0,
+            'attack' => 0,
+            'defence' => 0,
+            'block' => 0,
+            'critical' => 0
+        );
+        $basicMeta = mt\BattleBasicAttribute::get($heroId);
         if (!$basicMeta) {
             return $info;
         }
@@ -562,6 +575,10 @@ class Hero extends BaseModel {
         return $info;
     }
 
+    public static function abilityInfo($row){
+        return self::calcAbility($row['hero_id'], array());
+    }
+
     public static function addFreeHero($heroMeta)
     {
         return self::internalAddHero(