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)