From 14db632938c50bb7d4c2467c06def40ccd2dc01b Mon Sep 17 00:00:00 2001
From: wangzhenxing <1545929779@qq.com>
Date: Wed, 9 Aug 2023 17:57:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=AE=9D=E7=89=A9=20?=
 =?UTF-8?q?=E6=A0=91=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=B1=9E=E6=80=A7=3D=3D=3D?=
 =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E6=88=98=E6=96=97?=
 =?UTF-8?q?=E5=8A=9B=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../~Lua/Modules/Hero/HeroManager.lua         | 33 +++++++++++--------
 .../~Lua/Modules/Hero/PropHero.lua            | 28 ++++++++--------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
index 0cdf880f8b..2deac70ae9 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
@@ -1451,20 +1451,21 @@ local function CalculateEquipTreaSureAddVal(_heroId)
                             end
                         end
                         --神应属性
-                        local tLv = curEuipTreaSureData.treeLv
-                        if
-                        configInfo.PoolID == curEuipTreaSureConfig.GodHoodPool and configInfo.Type == 3 and
-                            configInfo.Level == tLv
-                        then
-                            for j = 1, SacredTreeManager.CulAttri(curEuipTreaSureData) do
-                                if addAllProVal[configInfo.Property[j][1]] then
-                                    addAllProVal[configInfo.Property[j][1]] =
-                                        addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2]
-                                else
-                                    addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2]
-                                end
-                            end
-                        end
+                        --屏蔽宝物树加成的属性 2023/08/09
+                        -- local tLv = curEuipTreaSureData.treeLv
+                        -- if
+                        -- configInfo.PoolID == curEuipTreaSureConfig.GodHoodPool and configInfo.Type == 3 and
+                        --     configInfo.Level == tLv
+                        -- then
+                        --     for j = 1, SacredTreeManager.CulAttri(curEuipTreaSureData) do
+                        --         if addAllProVal[configInfo.Property[j][1]] then
+                        --             addAllProVal[configInfo.Property[j][1]] =
+                        --                 addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2]
+                        --         else
+                        --             addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2]
+                        --         end
+                        --     end
+                        -- end
                     end
                     if #curHeroData.jewels > 1 then
                         --取 强化 精炼 最小值
@@ -1543,6 +1544,10 @@ local function CalculateEquipTreaSureAddVal(_heroId)
             end
         end
     end
+    LogError("11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111")
+    for k, v in pairs(addAllProVal) do
+        LogError("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111宝物  k====="..k.."     v=="..v)
+    end
     return addAllProVal
 end
 
diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua
index fa34e0231b..70c710f7bb 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua
@@ -249,19 +249,20 @@ Hero_Prop_Func = {
                     end
                 end
                 --神应属性
-                if
-                configInfo.PoolID == curEuipTreaSureConfig.GodHoodPool and configInfo.Type == 3 and
-                    configInfo.Level == curEuipTreaSureData.treeLv
-                then
-                    for j = 1, SacredTreeManager.CulAttri(curEuipTreaSureData) do
-                        if addAllProVal[configInfo.Property[j][1]] then
-                            addAllProVal[configInfo.Property[j][1]] =
-                                addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2]
-                        else
-                            addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2]
-                        end
-                    end
-                end
+                --屏蔽宝物树加成的属性 2023/08/09
+                -- if
+                -- configInfo.PoolID == curEuipTreaSureConfig.GodHoodPool and configInfo.Type == 3 and
+                --     configInfo.Level == curEuipTreaSureData.treeLv
+                -- then
+                --     for j = 1, SacredTreeManager.CulAttri(curEuipTreaSureData) do
+                --         if addAllProVal[configInfo.Property[j][1]] then
+                --             addAllProVal[configInfo.Property[j][1]] =
+                --                 addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2]
+                --         else
+                --             addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2]
+                --         end
+                --     end
+                -- end
             end
             if #_heroData.treasureList > 1 then
                 --取 强化 精炼 最小值
@@ -474,6 +475,7 @@ Hero_Prop_Func = {
                end
            end
         end
+        
         addAllProVal[HeroProType.WarPower] = allSoulPrintAddWarPowerVal
         return addAllProVal, conPropList, teamPropList, conTeamPropList, dePropList
     end,