From cd00a28621cd65ff2cd34d542da3628b7961f57b Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 3 Jun 2024 17:39:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=A9=BF=E6=88=B4=E6=B3=95?= =?UTF-8?q?=E7=9B=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 33b4ccf984945f3d0128a7e33abdc498281847fd) --- .../~Lua/Modules/DynamicActivity/DynamicActivityManager.lua | 2 +- .../ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 65bf5a43ce..6edb30a1c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -705,7 +705,7 @@ function this.IsQualifiled(id) local serverOpenTime = PlayerManager.GetServerOpenTime() local openDay = math.ceil(math.max(0, GetTimeStamp() - serverOpenTime)/(60*60*24))--当前是开服第几天 -- LogError("当前是开服第几天了:"..openDay) - return openDay >= v.OpenRules[2] + return openDay >= openRule[2] end return qualifiled end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua index e7f64ce699..9f42237310 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua @@ -634,7 +634,7 @@ function this.GetOneKeyUpFaXiangByType(_hero) for i, v in pairs(allTreasures) do if v.faXiangConfig.Type==0 and (v.faXiangConfig.Profession==0 or v.faXiangConfig.Profession==_hero.heroConfig.Profession) - and CheckListIsContainValue1(v.faXiangConfig.Job,_hero.heroConfig.Job) and v.upHeroDid=="" then + and (CheckListIsContainValue1(v.faXiangConfig.Job,_hero.heroConfig.Job) or CheckListIsContainValue1(v.faXiangConfig.Job,0)) and v.upHeroDid=="" then local power=this.CalculateEquipWarForce(v) --LogError("power=========="..power) --table.insert(yinList,v) @@ -647,7 +647,7 @@ function this.GetOneKeyUpFaXiangByType(_hero) for i, v in pairs(allTreasures) do if v.faXiangConfig.Type==1 and (v.faXiangConfig.Profession==0 or v.faXiangConfig.Profession==_hero.heroConfig.Profession) - and CheckListIsContainValue1(v.faXiangConfig.Job,_hero.heroConfig.Job) and v.upHeroDid=="" then + and (CheckListIsContainValue1(v.faXiangConfig.Job,_hero.heroConfig.Job) or CheckListIsContainValue1(v.faXiangConfig.Job,0)) and v.upHeroDid=="" then local power=this.CalculateEquipWarForce(v) -- LogError("power=========="..power) --table.insert(yinList,v)