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