战斗同步
parent
fc5cba8376
commit
fb0cee1d06
|
@ -42,13 +42,13 @@ local _fightData
|
|||
local _optionData
|
||||
|
||||
local function pairsByKeys(t)
|
||||
local a = {}
|
||||
local test.a = {}
|
||||
for n in pairs(t) do
|
||||
if n then
|
||||
a[#a+1] = n
|
||||
test.a[#test.a+1] = n
|
||||
end
|
||||
end
|
||||
table.sort(a, function( op1, op2 )
|
||||
table.sort(test.a, function( op1, op2 )
|
||||
local type1, type2 = type(op1), type(op2)
|
||||
local num1, num2 = tonumber(op1), tonumber(op2)
|
||||
|
||||
|
@ -68,7 +68,7 @@ local function pairsByKeys(t)
|
|||
local i = 0
|
||||
return function()
|
||||
i = i + 1
|
||||
return a[i], t[a[i]]
|
||||
return test.a[i], t[test.a[i]]
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -116,7 +116,7 @@ local function generateRecordFile()
|
|||
os.date("%H"),
|
||||
os.date("%M"),
|
||||
os.date("%S"))
|
||||
local file = io.open("luafight/BattleRecord/"..time..".txt", "a")
|
||||
local file = io.open("luafight/BattleRecord/"..time..".txt", "test.a")
|
||||
local record = BattleLogic.GetRecord()
|
||||
for i=1, #record do
|
||||
file:write(record[i].."\n")
|
||||
|
@ -252,17 +252,17 @@ function BattleMain.Execute(args, fightData, optionData)
|
|||
local platform
|
||||
-- linux
|
||||
if not file then
|
||||
file = io.open("../luafight/LogError/"..time..".txt", "a")
|
||||
file = io.open("../luafight/LogError/"..time..".txt", "test.a")
|
||||
platform = "Linux"
|
||||
end
|
||||
-- local window server
|
||||
if not file then
|
||||
file = io.open("luafight/LogError/"..time..".txt", "a")
|
||||
file = io.open("luafight/LogError/"..time..".txt", "test.a")
|
||||
platform = "Local Windows Server"
|
||||
end
|
||||
-- local
|
||||
if not file then
|
||||
file = io.open("LogError/"..time..".txt", "a")
|
||||
file = io.open("LogError/"..time..".txt", "test.a")
|
||||
platform = "Local"
|
||||
end
|
||||
|
||||
|
|
|
@ -45,13 +45,13 @@ local _fightData
|
|||
local _optionData
|
||||
|
||||
local function pairsByKeys(t)
|
||||
local a = {}
|
||||
local test.a = {}
|
||||
for n in pairs(t) do
|
||||
if n then
|
||||
a[#a+1] = n
|
||||
test.a[#test.a+1] = n
|
||||
end
|
||||
end
|
||||
table.sort(a, function( op1, op2 )
|
||||
table.sort(test.a, function( op1, op2 )
|
||||
local type1, type2 = type(op1), type(op2)
|
||||
local num1, num2 = tonumber(op1), tonumber(op2)
|
||||
|
||||
|
@ -71,7 +71,7 @@ local function pairsByKeys(t)
|
|||
local i = 0
|
||||
return function()
|
||||
i = i + 1
|
||||
return a[i], t[a[i]]
|
||||
return test.a[i], t[test.a[i]]
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -119,7 +119,7 @@ local function generateRecordFile()
|
|||
os.date("%H"),
|
||||
os.date("%M"),
|
||||
os.date("%S"))
|
||||
local file = io.open("luafight/BattleRecord/"..time..".txt", "a")
|
||||
local file = io.open("luafight/BattleRecord/"..time..".txt", "test.a")
|
||||
local record = BattleLogic.GetRecord()
|
||||
for i=1, #record do
|
||||
file:write(record[i].."\n")
|
||||
|
@ -258,17 +258,17 @@ function BattleMain.Execute(args, fightData, optionData)
|
|||
local platform
|
||||
-- linux
|
||||
if not file then
|
||||
file = io.open("../luafight/LogError/"..time..".txt", "a")
|
||||
file = io.open("../luafight/LogError/"..time..".txt", "test.a")
|
||||
platform = "Linux"
|
||||
end
|
||||
-- local window server
|
||||
if not file then
|
||||
file = io.open("luafight/LogError/"..time..".txt", "a")
|
||||
file = io.open("luafight/LogError/"..time..".txt", "test.a")
|
||||
platform = "Local Windows Server"
|
||||
end
|
||||
-- local
|
||||
if not file then
|
||||
file = io.open("LogError/"..time..".txt", "a")
|
||||
file = io.open("LogError/"..time..".txt", "test.a")
|
||||
platform = "Local"
|
||||
end
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ local function error( err )
|
|||
os.date("%H"),
|
||||
os.date("%M"),
|
||||
os.date("%S"))
|
||||
local file = io.open("LogError/"..time..".txt", "a")
|
||||
local file = io.open("LogError/"..time..".txt", "test.a")
|
||||
--file:write("fightData:\n"..PrintTable(_fightData).."\n")
|
||||
--file:write("optionData:\n"..PrintTable(_optionData).."\n")
|
||||
file:write("error:\n"..debug.traceback(err).."\n")
|
||||
|
@ -110,7 +110,7 @@ local function generateRecordFile()
|
|||
os.date("%H"),
|
||||
os.date("%M"),
|
||||
os.date("%S"))
|
||||
local file = io.open("BattleRecord/"..time..".txt", "a")
|
||||
local file = io.open("BattleRecord/"..time..".txt", "test.a")
|
||||
local record = BattleLogic.GetRecord()
|
||||
for i=1, #record do
|
||||
file:write(record[i].."\n")
|
||||
|
|
|
@ -6,7 +6,7 @@ local type = type
|
|||
local setmetatable = setmetatable
|
||||
|
||||
local function readonlyMT(t,k,v)
|
||||
Log("attempt to update a read-only table")
|
||||
Log("attempt to update test.a read-only table")
|
||||
end
|
||||
|
||||
local function setDefaultTable(rT, dT)
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -17,13 +17,13 @@ end
|
|||
local isLog = (true and not isMobile) or isEditor
|
||||
|
||||
local function pairsByKeys(t)
|
||||
local a = {}
|
||||
local test.a = {}
|
||||
for n in pairs(t) do
|
||||
if n then
|
||||
a[#a+1] = n
|
||||
test.a[#test.a+1] = n
|
||||
end
|
||||
end
|
||||
table.sort(a, function( op1, op2 )
|
||||
table.sort(test.a, function( op1, op2 )
|
||||
local type1, type2 = type(op1), type(op2)
|
||||
local num1, num2 = tonumber(op1), tonumber(op2)
|
||||
|
||||
|
@ -43,7 +43,7 @@ local function pairsByKeys(t)
|
|||
local i = 0
|
||||
return function()
|
||||
i = i + 1
|
||||
return a[i], t[a[i]]
|
||||
return test.a[i], t[test.a[i]]
|
||||
end
|
||||
end
|
||||
function this.PrintBattleTable(tb)
|
||||
|
@ -165,7 +165,7 @@ end
|
|||
-- 将日志写入log
|
||||
function this.WriteLogToFile()
|
||||
if not isLog then return end
|
||||
local file, platform = this.GetFile("a")
|
||||
local file, platform = this.GetFile("test.a")
|
||||
for i = 1, #this.logList do
|
||||
file:write(this.logList[i].."\n")
|
||||
end
|
||||
|
|
|
@ -9,7 +9,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--[a]回合内通过关卡
|
||||
--[test.a]回合内通过关卡
|
||||
[2]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local round,maxRound=BattleLogic.GetCurRound()
|
||||
|
@ -18,7 +18,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--上阵[a]个神将通过关卡
|
||||
--上阵[test.a]个神将通过关卡
|
||||
[3]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 end,true)
|
||||
|
@ -27,7 +27,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--[a]回合内造成[b]伤害
|
||||
--[test.a]回合内造成[b]伤害
|
||||
[4]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local v2 = condition[2]
|
||||
|
@ -43,7 +43,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--使用指定[a]系神将[b]名
|
||||
--使用指定[test.a]系神将[b]名
|
||||
[5]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local v2 = condition[2]
|
||||
|
@ -53,7 +53,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--存活[a]名
|
||||
--存活[test.a]名
|
||||
[6]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and not v:IsDead() end)
|
||||
|
@ -62,7 +62,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--不上阵[a]职能神将通过关卡
|
||||
--不上阵[test.a]职能神将通过关卡
|
||||
[7]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.professionId==v1 end,true)
|
||||
|
@ -71,7 +71,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--不上阵[a]阵营神将通过关卡
|
||||
--不上阵[test.a]阵营神将通过关卡
|
||||
[8]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.element==v1 end,true)
|
||||
|
@ -104,7 +104,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 1
|
||||
end,
|
||||
--全部上阵[a]职业神将通过关卡
|
||||
--全部上阵[test.a]职业神将通过关卡
|
||||
[11]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local list = RoleManager.QueryIncludeExile(function(v) return v.camp == 0 and v.professionId~=v1 end,true)
|
||||
|
@ -113,7 +113,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--达成[a]次斩杀
|
||||
--达成[test.a]次斩杀
|
||||
[12]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local num=HardStageEventManager.GetSeckKillNum()
|
||||
|
@ -122,7 +122,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--控制[a]类型 [b]次
|
||||
--控制[test.a]类型 [b]次
|
||||
[13]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local v2 = condition[2]
|
||||
|
@ -145,8 +145,8 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--持续伤害[a]杀死[b]人
|
||||
--a[int 0:所有 1:燃烧 2:毒死]
|
||||
--持续伤害[test.a]杀死[b]人
|
||||
--test.a[int 0:所有 1:燃烧 2:毒死]
|
||||
[14]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local v2 = condition[2]
|
||||
|
@ -167,8 +167,8 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--追击击杀[a]人,击杀[b]号位敌方(填b 就不会判断 a)
|
||||
--a[int] b[int]
|
||||
--追击击杀[test.a]人,击杀[b]号位敌方(填b 就不会判断 test.a)
|
||||
--test.a[int] b[int]
|
||||
[15]=function(condition)
|
||||
local v1 = condition[1]
|
||||
local v2 = condition[2]
|
||||
|
@ -188,7 +188,7 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--回复血量[a]次
|
||||
--回复血量[test.a]次
|
||||
[16]=function(condition)
|
||||
local v1=condition[1]
|
||||
local time=HardStageEventManager.GetAllTreatTime()
|
||||
|
@ -197,8 +197,8 @@ local _ConditionConfig = {
|
|||
end
|
||||
return 0
|
||||
end,
|
||||
--第[a]个击杀敌方[b]号位
|
||||
--a[int 0:是最后],b[int]
|
||||
--第[test.a]个击杀敌方[b]号位
|
||||
--test.a[int 0:是最后],b[int]
|
||||
[17]=function(condition)
|
||||
local v1=condition[1]
|
||||
local v2=condition[2]
|
||||
|
|
|
@ -56,8 +56,8 @@ function BattleUtil.ChooseFRow(arr)
|
|||
table.insert(tempArr, r)
|
||||
end
|
||||
end
|
||||
table.sort(tempArr, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(tempArr, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return tempArr
|
||||
end
|
||||
|
@ -69,8 +69,8 @@ function BattleUtil.ChooseBRow(arr)
|
|||
table.insert(tempArr, r)
|
||||
end
|
||||
end
|
||||
table.sort(tempArr, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(tempArr, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return tempArr
|
||||
end
|
||||
|
@ -82,8 +82,8 @@ function BattleUtil.ChooseCol(arr, col)
|
|||
table.insert(tempArr, role)
|
||||
end
|
||||
end
|
||||
table.sort(tempArr, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(tempArr, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return tempArr
|
||||
end
|
||||
|
@ -173,16 +173,16 @@ if one>two then
|
|||
end
|
||||
|
||||
|
||||
table.sort(teamArr, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(teamArr, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return teamArr
|
||||
end
|
||||
|
||||
-- 根据属性排序
|
||||
function BattleUtil.SortByProp(arr, prop, sort)
|
||||
BattleUtil.Sort(arr, function(a, b)
|
||||
local r1 = a:GetRoleData(prop)
|
||||
BattleUtil.Sort(arr, function(test.a, b)
|
||||
local r1 = test.a:GetRoleData(prop)
|
||||
local r2 = b:GetRoleData(prop)
|
||||
if sort == 1 then return r1 > r2 else return r1 < r2 end
|
||||
end)
|
||||
|
@ -190,8 +190,8 @@ function BattleUtil.SortByProp(arr, prop, sort)
|
|||
end
|
||||
-- 按百分比血量排序
|
||||
function BattleUtil.SortByHpFactor(arr, sort)
|
||||
BattleUtil.Sort(arr, function(a, b)
|
||||
local r1 = a:GetRoleData(RoleDataName.Hp) / a:GetRoleData(RoleDataName.MaxHp)
|
||||
BattleUtil.Sort(arr, function(test.a, b)
|
||||
local r1 = test.a:GetRoleData(RoleDataName.Hp) / test.a:GetRoleData(RoleDataName.MaxHp)
|
||||
local r2 = b:GetRoleData(RoleDataName.Hp) / b:GetRoleData(RoleDataName.MaxHp)
|
||||
if sort == 1 then return r1 > r2 else return r1 < r2 end
|
||||
end)
|
||||
|
@ -200,18 +200,18 @@ end
|
|||
|
||||
-- 按百分比血量排序
|
||||
function BattleUtil.SortByHpFactorAndHp(arr, sort)
|
||||
BattleUtil.Sort(arr, function(a, b)
|
||||
local r1 = a:GetRoleData(RoleDataName.Hp) / a:GetRoleData(RoleDataName.MaxHp)
|
||||
BattleUtil.Sort(arr, function(test.a, b)
|
||||
local r1 = test.a:GetRoleData(RoleDataName.Hp) / test.a:GetRoleData(RoleDataName.MaxHp)
|
||||
local r2 = b:GetRoleData(RoleDataName.Hp) / b:GetRoleData(RoleDataName.MaxHp)
|
||||
if sort == 1 then
|
||||
if r1==r2 then
|
||||
return a:GetRoleData(RoleDataName.Hp)<b:GetRoleData(RoleDataName.Hp)
|
||||
return test.a:GetRoleData(RoleDataName.Hp)<b:GetRoleData(RoleDataName.Hp)
|
||||
else
|
||||
return r1 > r2
|
||||
end
|
||||
else
|
||||
if r1==r2 then
|
||||
return a:GetRoleData(RoleDataName.Hp)<b:GetRoleData(RoleDataName.Hp)
|
||||
return test.a:GetRoleData(RoleDataName.Hp)<b:GetRoleData(RoleDataName.Hp)
|
||||
else
|
||||
return r1 < r2
|
||||
end
|
||||
|
@ -231,18 +231,18 @@ function BattleUtil.RemoveNoDeadRole(arr)
|
|||
end
|
||||
--按怒气排序
|
||||
function BattleUtil.SortByRage(arr, sort)
|
||||
BattleUtil.Sort(arr, function(a, b)
|
||||
local r1 = a.Rage
|
||||
BattleUtil.Sort(arr, function(test.a, b)
|
||||
local r1 = test.a.Rage
|
||||
local r2 = b.Rage
|
||||
if sort == 1 then
|
||||
if r1==r2 then
|
||||
return a.position>b.position
|
||||
return test.a.position>b.position
|
||||
else
|
||||
return r1 > r2
|
||||
end
|
||||
else
|
||||
if r1==r2 then
|
||||
return a.position>b.position
|
||||
return test.a.position>b.position
|
||||
else
|
||||
return r1 < r2
|
||||
end
|
||||
|
@ -414,8 +414,8 @@ function BattleUtil.ChooseTarget(role, chooseId,queryType)
|
|||
arr = RoleManager.GetArrAggroList(role, arr)
|
||||
end
|
||||
-- elseif chooseWeight == 9 then -- 展位距离
|
||||
-- BattleUtil.Sort(arr, function(a, b)
|
||||
-- local r1 = math.abs(role.position - a.position) * 10 + a.position
|
||||
-- BattleUtil.Sort(arr, function(test.a, b)
|
||||
-- local r1 = math.abs(role.position - test.a.position) * 10 + test.a.position
|
||||
-- local r2 = math.abs(role.position - b.position) * 10 + b.position
|
||||
-- if sort == 1 then return r1 > r2 else return r1 < r2 end
|
||||
-- end)
|
||||
|
@ -484,8 +484,8 @@ function BattleUtil.ChooseTarget(role, chooseId,queryType)
|
|||
end
|
||||
end
|
||||
|
||||
-- table.sort(finalArr, function(a, b)
|
||||
-- return a.position < b.position
|
||||
-- table.sort(finalArr, function(test.a, b)
|
||||
-- return test.a.position < b.position
|
||||
-- end)
|
||||
|
||||
return finalArr
|
||||
|
|
|
@ -41,8 +41,8 @@ function Monster:Init(data)
|
|||
self.skillGroupList[i] = MSkillManager.CreateMSkillGroup(self, i, data.skill[i])
|
||||
end
|
||||
if data.passivity and #data.passivity > 0 then
|
||||
table.sort(data.passivity,function(a,b)
|
||||
return a[1] < b[1]
|
||||
table.sort(data.passivity,function(test.a,b)
|
||||
return test.a[1] < b[1]
|
||||
end)
|
||||
for i = 1, #data.passivity do
|
||||
local v = data.passivity[i]
|
||||
|
|
|
@ -237,31 +237,31 @@ function this.InitListener()
|
|||
end
|
||||
end
|
||||
-- 对技能进行排序
|
||||
table.sort(firstList, function(a, b)
|
||||
table.sort(firstList, function(test.a, b)
|
||||
-- 同阵营按位置排序
|
||||
if a.owner.camp == b.owner.camp then
|
||||
if a.owner.position == b.owner.position then
|
||||
return a.id < b.id
|
||||
if test.a.owner.camp == b.owner.camp then
|
||||
if test.a.owner.position == b.owner.position then
|
||||
return test.a.id < b.id
|
||||
else
|
||||
return a.owner.position < b.owner.position
|
||||
return test.a.owner.position < b.owner.position
|
||||
end
|
||||
else
|
||||
-- 不同阵营的根据先手阵营排序
|
||||
return a.owner.camp == BattleLogic.FirstCamp
|
||||
return test.a.owner.camp == BattleLogic.FirstCamp
|
||||
end
|
||||
end)
|
||||
-- 对技能进行排序
|
||||
table.sort(sortList, function(a, b)
|
||||
table.sort(sortList, function(test.a, b)
|
||||
-- 同阵营按位置排序
|
||||
if a.owner.camp == b.owner.camp then
|
||||
if a.owner.position == b.owner.position then
|
||||
return a.id < b.id
|
||||
if test.a.owner.camp == b.owner.camp then
|
||||
if test.a.owner.position == b.owner.position then
|
||||
return test.a.id < b.id
|
||||
else
|
||||
return a.owner.position < b.owner.position
|
||||
return test.a.owner.position < b.owner.position
|
||||
end
|
||||
else
|
||||
-- 不同阵营的根据先手阵营排序
|
||||
return a.owner.camp == BattleLogic.FirstCamp
|
||||
return test.a.owner.camp == BattleLogic.FirstCamp
|
||||
end
|
||||
end)
|
||||
-- 依次加入技能管理
|
||||
|
|
|
@ -112,11 +112,11 @@ function RoleLogic:Init(uid, data, position)
|
|||
self.passiveList = {}
|
||||
if data.passivity and #data.passivity > 0 then
|
||||
--排序363类型的排在前面
|
||||
table.sort(data.passivity,function(a,b)
|
||||
if a[3]==b[3] then
|
||||
return a[1] < b[1]
|
||||
table.sort(data.passivity,function(test.a,b)
|
||||
if test.a[3]==b[3] then
|
||||
return test.a[1] < b[1]
|
||||
else
|
||||
if a[3]==363 then
|
||||
if test.a[3]==363 then
|
||||
return true
|
||||
end
|
||||
if b[3]==363 then
|
||||
|
@ -124,7 +124,7 @@ function RoleLogic:Init(uid, data, position)
|
|||
end
|
||||
end
|
||||
|
||||
return a[1] < b[1]
|
||||
return test.a[1] < b[1]
|
||||
end)
|
||||
local coverPass={}
|
||||
for i = 1, #data.passivity do
|
||||
|
|
|
@ -188,8 +188,8 @@ function RoleManager.Query(func, inCludeDeadRole)
|
|||
end
|
||||
end
|
||||
end
|
||||
table.sort(list, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(list, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return list
|
||||
end
|
||||
|
@ -206,8 +206,8 @@ function RoleManager.QueryIncludeExile(func, inCludeDeadRole)
|
|||
end
|
||||
end
|
||||
end
|
||||
table.sort(list, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(list, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return list
|
||||
end
|
||||
|
@ -224,8 +224,8 @@ function RoleManager.QueryIncludeExileNoNoDead(func, inCludeDeadRole)
|
|||
end
|
||||
end
|
||||
end
|
||||
table.sort(list, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(list, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return list
|
||||
end
|
||||
|
@ -243,8 +243,8 @@ function RoleManager.QueryNoDead(func)
|
|||
end
|
||||
end
|
||||
end
|
||||
table.sort(list, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(list, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return list
|
||||
end
|
||||
|
@ -359,8 +359,8 @@ function this.GetArrAggroList(role, arr)
|
|||
end
|
||||
end
|
||||
end
|
||||
table.sort(targetList, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(targetList, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return targetList
|
||||
end
|
||||
|
@ -441,8 +441,8 @@ function this.GetNeighbor(role, chooseType)
|
|||
end
|
||||
end
|
||||
end
|
||||
table.sort(posList, function(a, b)
|
||||
return a.position < b.position
|
||||
table.sort(posList, function(test.a, b)
|
||||
return test.a.position < b.position
|
||||
end)
|
||||
return posList
|
||||
end
|
||||
|
|
|
@ -42,8 +42,8 @@ function FightWeapon:Init(data)
|
|||
self.skillGroupList[i] = WeaponSkillManager.CreateMSkillGroup(self, i, data.skill[i])
|
||||
end
|
||||
if data.passivity and #data.passivity > 0 then
|
||||
table.sort(data.passivity,function(a,b)
|
||||
return a[1] < b[1]
|
||||
table.sort(data.passivity,function(test.a,b)
|
||||
return test.a[1] < b[1]
|
||||
end)
|
||||
for i = 1, #data.passivity do
|
||||
local v = data.passivity[i]
|
||||
|
|
|
@ -287,31 +287,31 @@ function this.InitListener()
|
|||
end
|
||||
end
|
||||
-- 对技能进行排序
|
||||
table.sort(firstList, function(a, b)
|
||||
table.sort(firstList, function(test.a, b)
|
||||
-- 同阵营按位置排序
|
||||
if a.owner.camp == b.owner.camp then
|
||||
if a.owner.position == b.owner.position then
|
||||
return a.id < b.id
|
||||
if test.a.owner.camp == b.owner.camp then
|
||||
if test.a.owner.position == b.owner.position then
|
||||
return test.a.id < b.id
|
||||
else
|
||||
return a.owner.position < b.owner.position
|
||||
return test.a.owner.position < b.owner.position
|
||||
end
|
||||
else
|
||||
-- 不同阵营的根据先手阵营排序
|
||||
return a.owner.camp == BattleLogic.FirstCamp
|
||||
return test.a.owner.camp == BattleLogic.FirstCamp
|
||||
end
|
||||
end)
|
||||
-- 对技能进行排序
|
||||
table.sort(sortList, function(a, b)
|
||||
table.sort(sortList, function(test.a, b)
|
||||
-- 同阵营按位置排序
|
||||
if a.owner.camp == b.owner.camp then
|
||||
if a.owner.position == b.owner.position then
|
||||
return a.id < b.id
|
||||
if test.a.owner.camp == b.owner.camp then
|
||||
if test.a.owner.position == b.owner.position then
|
||||
return test.a.id < b.id
|
||||
else
|
||||
return a.owner.position < b.owner.position
|
||||
return test.a.owner.position < b.owner.position
|
||||
end
|
||||
else
|
||||
-- 不同阵营的根据先手阵营排序
|
||||
return a.owner.camp == BattleLogic.FirstCamp
|
||||
return test.a.owner.camp == BattleLogic.FirstCamp
|
||||
end
|
||||
end)
|
||||
--依次加入技能管理
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
|
||||
local function pairsByKeys(t)
|
||||
local a = {}
|
||||
local test.a = {}
|
||||
for n in pairs(t) do
|
||||
if n then
|
||||
a[#a+1] = n
|
||||
test.a[#test.a+1] = n
|
||||
end
|
||||
end
|
||||
table.sort(a, function( op1, op2 )
|
||||
table.sort(test.a, function( op1, op2 )
|
||||
local type1, type2 = type(op1), type(op2)
|
||||
local num1, num2 = tonumber(op1), tonumber(op2)
|
||||
|
||||
|
@ -26,7 +26,7 @@ local function pairsByKeys(t)
|
|||
local i = 0
|
||||
return function()
|
||||
i = i + 1
|
||||
return a[i], t[a[i]]
|
||||
return test.a[i], t[test.a[i]]
|
||||
end
|
||||
end
|
||||
local function PrintTable(tb)
|
||||
|
|
|
@ -14565,7 +14565,7 @@ avliaotian.info
|
|||
woyaojipin.com
|
||||
wenxinge.info
|
||||
ttxiaoshuo.info
|
||||
a.xbbxoo.com
|
||||
test.a.xbbxoo.com
|
||||
27gan.com
|
||||
seseq.info
|
||||
18chengrenwang.com
|
||||
|
@ -14657,9 +14657,9 @@ apollophoenix.com
|
|||
allboner.com
|
||||
aisenv.com
|
||||
adamsdorm.com
|
||||
a.ygsdh.com
|
||||
a.kknnn.net
|
||||
a.94383.com
|
||||
test.a.ygsdh.com
|
||||
test.a.kknnn.net
|
||||
test.a.94383.com
|
||||
99jq.info
|
||||
991mi.net
|
||||
98renti.org
|
||||
|
@ -14754,11 +14754,11 @@ avtuo.com
|
|||
222mimi.net
|
||||
dasemei.info
|
||||
sexya.co.cc
|
||||
a.1kanmm.com
|
||||
test.a.1kanmm.com
|
||||
5ppaa.com
|
||||
crdyr.3322.org
|
||||
xinpinse.com
|
||||
a.hougong520.com
|
||||
test.a.hougong520.com
|
||||
d.hougong520.com
|
||||
hougong123.com
|
||||
hougong123.spaces.live.com
|
||||
|
@ -14857,7 +14857,7 @@ guagua.813.bname.info
|
|||
592uu.com
|
||||
semaomi.c.la
|
||||
se.gaowyt.com
|
||||
a.kkrrr.net
|
||||
test.a.kkrrr.net
|
||||
900wyt.com
|
||||
91xiezhen.com
|
||||
rimim.com
|
||||
|
@ -14869,7 +14869,7 @@ cc6.qq3q.com
|
|||
chat8.11dmc.com
|
||||
723724.com
|
||||
11xo.com
|
||||
a.45x.info
|
||||
test.a.45x.info
|
||||
mature6.com
|
||||
y6788.com
|
||||
52yiyeqing.blogbus.com
|
||||
|
@ -14974,7 +14974,7 @@ c14.171ei.com
|
|||
555yyy.info
|
||||
ye.15av.info
|
||||
28xxoo.com
|
||||
a.97liao.net
|
||||
test.a.97liao.net
|
||||
48xxoo.com
|
||||
58xxoo.com
|
||||
97bobo.com
|
||||
|
@ -15135,7 +15135,7 @@ whcryp.com
|
|||
46ai.com
|
||||
x.7xx8.com
|
||||
gaywang.com
|
||||
a.anquye.com
|
||||
test.a.anquye.com
|
||||
se.haohaob.com
|
||||
ons22.com
|
||||
48ri.com
|
||||
|
@ -15144,7 +15144,7 @@ mn12345.com
|
|||
bobo.mu2012.com
|
||||
pornslotz.com
|
||||
se.3399my.com
|
||||
a.44hu.com
|
||||
test.a.44hu.com
|
||||
bobo.gaowyt.com
|
||||
222a2.com
|
||||
yybobo.com
|
||||
|
@ -15208,7 +15208,7 @@ meivei.com
|
|||
222kk.com
|
||||
52ssss.com
|
||||
tzy588.com
|
||||
a.54271.com
|
||||
test.a.54271.com
|
||||
31bb.com
|
||||
33hhh.com
|
||||
sehse.com
|
||||
|
@ -15280,7 +15280,7 @@ v199099.cn
|
|||
8816mm.cn
|
||||
laizuoai8.cn
|
||||
nahanw.com
|
||||
a.bbzone.info
|
||||
test.a.bbzone.info
|
||||
15681999090
|
||||
13896666258
|
||||
6.danit.info
|
||||
|
@ -15376,7 +15376,7 @@ kkmmm.info
|
|||
gzxj888888.com
|
||||
13694210008
|
||||
13716140748
|
||||
a.rentise.info
|
||||
test.a.rentise.info
|
||||
999jjj.com
|
||||
300kxw.com
|
||||
selunli.info
|
||||
|
@ -15441,7 +15441,7 @@ xiao77.in
|
|||
hougong.in
|
||||
mimi.97kav.info
|
||||
70.86.2.53
|
||||
a.987kxw.com
|
||||
test.a.987kxw.com
|
||||
1141432712
|
||||
wyt750.com
|
||||
baiyun.com
|
||||
|
@ -15456,7 +15456,7 @@ dybar.info
|
|||
7kbb.com
|
||||
av.11111av.com
|
||||
wawase.com
|
||||
a.121888.in
|
||||
test.a.121888.in
|
||||
15088901960
|
||||
994795994
|
||||
9221.info
|
||||
|
@ -15502,7 +15502,7 @@ apian150.com
|
|||
67cao.com
|
||||
77kankan.com
|
||||
3kuu.info
|
||||
a.008dyy.com
|
||||
test.a.008dyy.com
|
||||
dyaaa.info
|
||||
123zy.org
|
||||
53kkk.meimeiwuyuetian.info
|
||||
|
@ -15676,7 +15676,7 @@ u356152.51xingfu.us
|
|||
13bbb.com
|
||||
94sss.com
|
||||
35580.com.cn
|
||||
a.sesefa.com
|
||||
test.a.sesefa.com
|
||||
32aaa.com
|
||||
siwacun.com
|
||||
491843581
|
||||
|
@ -15689,13 +15689,13 @@ rtysq.info
|
|||
1348199855
|
||||
bt.5555wyt.com
|
||||
ye5u.com
|
||||
a.19aaa.com
|
||||
test.a.19aaa.com
|
||||
sexhotgames.com
|
||||
hotnakedmen.com
|
||||
9496.org
|
||||
s.btrentiys.info
|
||||
ftboys.com
|
||||
a.wymfw.net
|
||||
test.a.wymfw.net
|
||||
tzdz9988.com
|
||||
45gaods.com
|
||||
gayvideotube.com
|
||||
|
@ -15772,7 +15772,7 @@ bbkxw.com
|
|||
se.80fang.com
|
||||
456rt.com
|
||||
se.987kxw.com
|
||||
a.xyxy.info
|
||||
test.a.xyxy.info
|
||||
shuangsini.info
|
||||
se97.org.ru
|
||||
54cao.info
|
||||
|
@ -15837,11 +15837,11 @@ waha123.com
|
|||
58.64.252.58
|
||||
vvvv.72mm.in
|
||||
2ppaa.com
|
||||
a.54261.com
|
||||
test.a.54261.com
|
||||
avbos.net
|
||||
segou.cz.cc
|
||||
k.8x5x.com
|
||||
a.kxccc.com
|
||||
test.a.kxccc.com
|
||||
seshequ1.takehost.com
|
||||
se.760wyt.com
|
||||
Se.20sqw.com
|
||||
|
@ -15920,7 +15920,7 @@ realgaysex.com
|
|||
rr6888.info
|
||||
purpleporno.com
|
||||
hornyvalley.com
|
||||
a.757797.com
|
||||
test.a.757797.com
|
||||
38fang.com
|
||||
bobo.3qquu.com
|
||||
7xx8.com
|
||||
|
@ -15930,7 +15930,7 @@ hannaslinks.com
|
|||
969896.com
|
||||
88wst.com
|
||||
74.86.194.115
|
||||
a.17rimm.com
|
||||
test.a.17rimm.com
|
||||
qiserenti.com
|
||||
10kxw.com
|
||||
bobo.70chun.com
|
||||
|
@ -15981,7 +15981,7 @@ nutorrent.com
|
|||
avdaren.com
|
||||
100bbb.com
|
||||
45xtv.com
|
||||
a.33ddd.info
|
||||
test.a.33ddd.info
|
||||
74.55.36.21
|
||||
64.120.178.243
|
||||
208.43.53.234
|
||||
|
@ -16001,7 +16001,7 @@ eboysstudio.com
|
|||
77qqq.info
|
||||
97kjw.info
|
||||
530b.com
|
||||
a.ysyy.info
|
||||
test.a.ysyy.info
|
||||
333lian.info
|
||||
se.sao41.com
|
||||
52xxoo.us
|
||||
|
@ -16014,7 +16014,7 @@ dasem.info
|
|||
haomm.cc
|
||||
kuqirt.com
|
||||
chuecaporn.com
|
||||
a.a096.com
|
||||
test.a.a096.com
|
||||
aijiucao.com
|
||||
62hh.com
|
||||
19aaa.us
|
||||
|
@ -16042,7 +16042,7 @@ se.77hhh.com
|
|||
977x.com
|
||||
b.19aaa.us
|
||||
se.3333se.com
|
||||
a.ww234.com
|
||||
test.a.ww234.com
|
||||
allfreegay.com
|
||||
b.055ok.com
|
||||
12gan.com
|
||||
|
@ -16118,7 +16118,7 @@ xxxymovies.com
|
|||
se333se.com
|
||||
se.878kxw.com
|
||||
mm7758.info
|
||||
a.hswzdh.info
|
||||
test.a.hswzdh.info
|
||||
ffrrr.com
|
||||
se.58gan.com
|
||||
amm6.com
|
||||
|
@ -16132,7 +16132,7 @@ ys.56xxx.info
|
|||
788jj.com
|
||||
bobo.266gao.com
|
||||
xingbense.info
|
||||
a.94382.com
|
||||
test.a.94382.com
|
||||
666526.com
|
||||
174.139.251.10
|
||||
habimi.com
|
||||
|
@ -16145,7 +16145,7 @@ dy.199s.info
|
|||
58sao.com
|
||||
aosii.com
|
||||
xl.kx444.com
|
||||
a.8x5x.com
|
||||
test.a.8x5x.com
|
||||
asian4you.com
|
||||
iliketubes.com
|
||||
rtt8.com
|
||||
|
@ -16161,7 +16161,7 @@ seees.info
|
|||
olderwomentaboo.com
|
||||
dy001.info
|
||||
331mi.net
|
||||
a.28yyy.info
|
||||
test.a.28yyy.info
|
||||
kkqqq.net
|
||||
se1se8.com
|
||||
sexofvideo.com
|
||||
|
@ -16173,7 +16173,7 @@ omrenti.com
|
|||
80xxoo.com
|
||||
77link.com
|
||||
sezgol.com
|
||||
a.123888.in
|
||||
test.a.123888.in
|
||||
97ggmm.com
|
||||
seyise.com
|
||||
19834.info
|
||||
|
@ -16189,7 +16189,7 @@ jsdy.info
|
|||
juse1.com
|
||||
e.ynnp.com
|
||||
bearlicious.com
|
||||
a.wymfw.com
|
||||
test.a.wymfw.com
|
||||
xing123.info
|
||||
3rat.com
|
||||
aisese.lookin.at
|
||||
|
@ -16298,14 +16298,14 @@ vip886.com
|
|||
lovesimi.com
|
||||
15999194485
|
||||
23men.info
|
||||
a.17cmm.org
|
||||
test.a.17cmm.org
|
||||
hswz.totalh.com
|
||||
30kxw.com
|
||||
se.644se.com
|
||||
18vip.us
|
||||
s.1717mov.com
|
||||
se.dykx.net
|
||||
a.kx59.com
|
||||
test.a.kx59.com
|
||||
97kanav.net
|
||||
98.126.191.197
|
||||
206.217.211.136
|
||||
|
@ -16333,10 +16333,10 @@ prideshare.com
|
|||
76.73.83.2
|
||||
se.667ai.com
|
||||
gachinco.com
|
||||
a.56yin.info
|
||||
test.a.56yin.info
|
||||
74.86.194.112
|
||||
sesej.info
|
||||
a.bbbus.info
|
||||
test.a.bbbus.info
|
||||
74.55.154.140
|
||||
21ses.info
|
||||
laodaw.com
|
||||
|
@ -16345,8 +16345,8 @@ chengrenbar.com
|
|||
xxxsextube.com
|
||||
gotgonzo.net
|
||||
kuzi5.com
|
||||
a.57slw.info
|
||||
a.252525.in
|
||||
test.a.57slw.info
|
||||
test.a.252525.in
|
||||
833jj.com
|
||||
hhrrr.net
|
||||
dasegege.com
|
||||
|
@ -16446,7 +16446,7 @@ se.80xxoo.com
|
|||
dy.damidy.cn
|
||||
lobstertube.com
|
||||
airenti.com
|
||||
a.44didi.com
|
||||
test.a.44didi.com
|
||||
tutuba.info
|
||||
abaev.info
|
||||
bobo.ririgan.com
|
||||
|
@ -16454,7 +16454,7 @@ nnd8.info
|
|||
sejiemei.com
|
||||
30yo.com
|
||||
174.139.5.5
|
||||
a.kx747.com
|
||||
test.a.kx747.com
|
||||
yinlaotou.com
|
||||
se.5yuese.info
|
||||
wanmm.net
|
||||
|
@ -16506,7 +16506,7 @@ larysa.bravoerotica.com
|
|||
3gese.com
|
||||
myav123.com
|
||||
jetwang.com
|
||||
a.dalu.tv
|
||||
test.a.dalu.tv
|
||||
67.220.91.2
|
||||
theync.com
|
||||
yaokanav.com
|
||||
|
@ -16520,7 +16520,7 @@ nnpe.info
|
|||
av9898.com
|
||||
ggsese.com
|
||||
99xxbb.com
|
||||
a.52seren.info
|
||||
test.a.52seren.info
|
||||
bb.56pk.info
|
||||
d.dingxiang.biz
|
||||
vporno.tv
|
||||
|
@ -16589,7 +16589,7 @@ mushroomtube.com
|
|||
kinkygonzo.com
|
||||
94svs.com
|
||||
16gan.com
|
||||
a.eeeeee.us
|
||||
test.a.eeeeee.us
|
||||
se.28se.com
|
||||
204.188.223.171
|
||||
ddppp.com
|
||||
|
@ -16627,12 +16627,12 @@ themovs.com
|
|||
xhamster.com
|
||||
topxxxgames.net
|
||||
avfunny.com
|
||||
a.slwdh.info
|
||||
test.a.slwdh.info
|
||||
5rt.info
|
||||
dyccc.info
|
||||
kanrt.com
|
||||
zxyrtys.com
|
||||
a.9i2.cc
|
||||
test.a.9i2.cc
|
||||
ffqqq.com
|
||||
206.217.214.177
|
||||
67.228.169.123
|
||||
|
@ -16678,7 +16678,7 @@ xvediox.com
|
|||
aiboyslove.com
|
||||
55fang.com
|
||||
bestialityfarmsex.com
|
||||
a.dtse.info
|
||||
test.a.dtse.info
|
||||
freebestialityporn.net
|
||||
extremezoo.net
|
||||
61cao.com
|
||||
|
@ -16930,7 +16930,7 @@ sejiushikong.info
|
|||
94xxo.com
|
||||
5566mm.info
|
||||
cngongyi.com
|
||||
a.53yyy.info
|
||||
test.a.53yyy.info
|
||||
19ccc.com
|
||||
222pp.info
|
||||
13826419279
|
||||
|
@ -16946,8 +16946,8 @@ bb151.com
|
|||
se.sao79.com
|
||||
8369.info
|
||||
hougong8.com
|
||||
a.48hhh.info
|
||||
a.38yyy.info
|
||||
test.a.48hhh.info
|
||||
test.a.38yyy.info
|
||||
sexhu.org
|
||||
80sex.info
|
||||
kkbbdy.com
|
||||
|
@ -21457,7 +21457,7 @@ tESt
|
|||
test
|
||||
TeSt
|
||||
tEST
|
||||
Test
|
||||
test.Test
|
||||
测试
|
||||
辅助程序
|
||||
运营
|
||||
|
@ -28096,7 +28096,7 @@ test
|
|||
test
|
||||
TeSt
|
||||
tEST
|
||||
Test
|
||||
test.Test
|
||||
测试
|
||||
辅助程序
|
||||
运营
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue