From 80f3dbe4044534f81ec1441bbde3182a44f93f1d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 23 Jan 2024 17:50:01 +0800
Subject: [PATCH] 1

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

diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index 3dcdcfa1..47a2935a 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -416,11 +416,11 @@ class Hero extends BaseModel {
             $pDefend = ($basicMeta['pOrigDefend'] + $pDefendAm) *
                      (1 + $pDefendRateSe) * (1 + $pDefendRateIn);
 
-            $info['defence'] = $pDefend;
+            $info['defence'] = 1 - (1 - $basicMeta['vOrigDefend']) / (1 + $pDefend / $basicMeta['pBaseDefend']);
         }
         {
             $pBlockAm = 0;
-            $pBlockAm_Add = mt\AttrHelper::getAttrVal($attr, kHAT_vAttackRateIn, 0);
+            $pBlockAm_Add = mt\AttrHelper::getAttrVal($attr, kHAT_pBlockAm, 0);
             $pBlockAm += $pBlockAm_Add;
 
             $pBlockRateSe = 0;
@@ -431,7 +431,7 @@ class Hero extends BaseModel {
             $pBlockRateIn_Add = mt\AttrHelper::getAttrVal($attr, kHAT_pBlockRateIn, 0);
             $pBlockRateIn = (1 + $pBlockRateIn) * (1 + $pBlockRateIn_Add) - 1;
 
-            $pBlock = ($basicMeta['pOrigBlock'] + $pBlockAm) * (1 + $pBlockRateSe_Add) * (1 + $pBlockRateIn);
+            $pBlock = ($basicMeta['pOrigBlock'] + $pBlockAm) * (1 + $pBlockRateSe) * (1 + $pBlockRateIn);
 
             $vBlock = 1 - (1 - $basicMeta['vOrigBlock']) / (1 + $pBlock / $basicMeta['pBaseBlock']);