From da218cfc3c5674344c86de5b53d20a5b8defe976 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Mon, 22 Nov 2021 15:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=98=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../~Lua/Modules/Hero/PropHero.lua            |  5 ++--
 .../~Lua/Modules/Net/NetManager.lua           |  6 +++-
 .../TailsManSoul/TailsManSoulManager.lua      | 28 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua
index 197854c184..d91f9075c4 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua
@@ -516,9 +516,8 @@ Hero_Prop_Func = {
 
     [Hero_Prop_Type.TailsManSou] = function(_heroData)
         local propList, conPropList, teamPropList, conTeamPropList, dePropList 
-        local SingleProVal = TailsManSoulManager.GetTailsmanPassivePower()
-        if SingleProVal and #SingleProVal > 0 then --talismanConFig.OpenSkillRules and #talismanConFig.OpenSkillRules > 0 then
-            --单体加成  --单体等级限制加成  --团体加成  --减乘
+        local SingleProVal = TailsManSoulManager.GetTailsmanPassivePower1(_heroData)
+        if SingleProVal and #SingleProVal > 0 then 
             propList, conPropList, teamPropList, conTeamPropList, dePropList = PassiveListToPropList(SingleProVal)
         end
         return propList, conPropList, teamPropList, conTeamPropList, dePropList
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index 30d575c7c4..f8064bf89a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -6084,12 +6084,16 @@ function NetManager.FaBaoSoulUpLvRequest(id,lv, func)
     data.level = lv
     local msg = data:SerializeToString()
     Network:SendMessageWithCallBack(MessageTypeProto_pb.FA_BAO_SOUL_UPLV_REQUEST, MessageTypeProto_pb.FA_BAO_SOUL_UPLV_RESPONSE, msg, function(buffer)
+        NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
         TailsManSoulManager.SetTailsmanLvById(id,lv)
         CheckRedPointStatus(RedPointType.tailsmanSoul_gold)
         CheckRedPointStatus(RedPointType.tailsmanSoul_red)
         CheckRedPointStatus(RedPointType.tailsmanSoul_whiteGold)
         HeroPropManager.SetFuncPropDirty(Func_Prop_Type.TailsManSou)
-        NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
+        local herodata = HeroManager.GetAllHeroList()
+        for k,v in pairs(herodata) do
+            HeroPropManager.SetDirtyByType(v.dynamicId, Hero_Prop_Type.TailsManSou)
+        end     
         if func then
             func(msg)
         end
diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua
index eb78eb53bc..e9cdb9f823 100644
--- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua
@@ -4,6 +4,7 @@ local trumpBook = ConfigManager.GetConfig(ConfigName.TrumpBook)
 local Trump = ConfigManager.GetConfig(ConfigName.Trump)
 local TrumpLevelupPool = ConfigManager.GetConfig(ConfigName.TrumpLevelupPool)
 local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig)
+local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
 this.TailsmanList = {}
 function this.Initialize()
 end
@@ -63,6 +64,10 @@ function this.SetTailsmanLv(data)
         this.SetTailsmanLvById(data[i].id,data[i].level)
     end
     HeroPropManager.SetFuncPropDirty(Func_Prop_Type.TailsManSou)
+    local herodata = HeroManager.GetAllHeroList()
+    for k,v in pairs(herodata) do
+        HeroPropManager.SetDirtyByType(v.dynamicId, Hero_Prop_Type.TailsManSou)
+    end   
 end
 
 --根据法宝id 获取设置等级
@@ -100,7 +105,7 @@ function this.GetTailsmanPassivePower()
     local data = {}
     for i = 1,#datas do
         for j = 1,#datas[i].skillConfig do
-            if datas[i].lv <= datas[i].skillConfig[j][1] then
+            if datas[i].lv >= datas[i].skillConfig[j][1] then
                 table.insert(data,datas[i].skillConfig[j][2])
             end 
         end
@@ -108,6 +113,27 @@ function this.GetTailsmanPassivePower()
     return data
 end
 
+function this.GetTailsmanPassivePower1(_heroData)
+    local idList = {}
+    local SingleProVal = this.GetTailsmanPassivePower()
+    if SingleProVal and #SingleProVal > 0 then --talismanConFig.OpenSkillRules and #talismanConFig.OpenSkillRules > 0 then
+        for i = 1,#SingleProVal do
+            if passiveSkillConfig[SingleProVal[i]] then
+                local config = passiveSkillConfig[SingleProVal[i]]
+                if config.FitList[1] == 0 or 
+                (config.FitList[1] == 1 and heroConfig[_heroData.tId].PropertyName == config.FitList[2]) or 
+                (config.FitList[1] == 2 and heroConfig[_heroData.tId].Profession == config.FitList[2]) then
+                    for i = 1,#config.SkillId do
+                        table.insert(idList,config.SkillId[i])
+                    end
+                end
+            end
+        end
+    end
+    return idList
+end
+
+
 function this.CheckRedData(red)
     local list = {}
     if red == RedPointType.tailsmanSoul_gold then