Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-10-29 18:45:56 +08:00
commit 4a764de122
1 changed files with 7 additions and 7 deletions

View File

@ -21,7 +21,7 @@ local _ConditionConfig = {
--上阵[a]个神将通过关卡
[3]=function(condition)
local v1 = condition[1]
local list = RoleManager.Query(function(v) return v.camp == 0 end,true)
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 end,true)
if BattleUtil.LengthOfTable(list)<=v1 then
return 1
end
@ -47,7 +47,7 @@ local _ConditionConfig = {
[5]=function(condition)
local v1 = condition[1]
local v2 = condition[2]
local list = RoleManager.Query(function(v) return v.camp == 0 and v.element==v1 end,true)
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.element==v1 end,true)
if BattleUtil.LengthOfTable(list)>=v2 then
return 1
end
@ -56,7 +56,7 @@ local _ConditionConfig = {
--存活[a]名
[6]=function(condition)
local v1 = condition[1]
local list = RoleManager.Query(function(v) return v.camp == 0 and not v:IsDead() end)
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and not v:IsDead() end)
if BattleUtil.LengthOfTable(list)>=v1 then
return 1
end
@ -65,7 +65,7 @@ local _ConditionConfig = {
--不上阵[a]职能神将通过关卡
[7]=function(condition)
local v1 = condition[1]
local list = RoleManager.Query(function(v) return v.camp == 0 and v.professionId==v1 end,true)
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.professionId==v1 end,true)
if BattleUtil.LengthOfTable(list)==0 then
return 1
end
@ -74,7 +74,7 @@ local _ConditionConfig = {
--不上阵[a]阵营神将通过关卡
[8]=function(condition)
local v1 = condition[1]
local list = RoleManager.Query(function(v) return v.camp == 0 and v.element==v1 end,true)
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.element==v1 end,true)
if BattleUtil.LengthOfTable(list)==0 then
return 1
end
@ -83,7 +83,7 @@ local _ConditionConfig = {
--佩戴xxxid被动通过关卡
[9]=function(condition)
local v1 = condition[1]
local list = RoleManager.Query(function(v) return v.camp == 0 end,true)
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 end,true)
if not list or #list==0 then
return 0
end
@ -107,7 +107,7 @@ local _ConditionConfig = {
--全部上阵[a]职业神将通过关卡
[11]=function(condition)
local v1 = condition[1]
local list = RoleManager.Query(function(v) return v.camp == 0 and v.professionId~=v1 end,true)
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.professionId~=v1 end,true)
if BattleUtil.LengthOfTable(list)==0 then
return 1
end