Merge branch 'china/dev' into china/test
commit
ce75407f1a
|
|
@ -9498,6 +9498,10 @@ local passivityList = {
|
|||
if not skill then
|
||||
return
|
||||
end
|
||||
if target ~= role then
|
||||
return
|
||||
end
|
||||
|
||||
if time==triggerTime then
|
||||
return
|
||||
end
|
||||
|
|
|
|||
|
|
@ -70,6 +70,13 @@ function this.OpenXiaoYaoMap(mapId,func)
|
|||
table.sort(curMapData.cell,function(a,b)
|
||||
return a.cellIndex < b.cellIndex
|
||||
end)
|
||||
|
||||
-- local str = "{"
|
||||
-- for k, v in ipairs(curMapData.cell) do
|
||||
-- str = str ..string.format("{cellId=%s,pointId=%s,cellIndex=%s,rewardId=%s},", v.cellId, v.pointId, v.cellIndex, v.rewardId)
|
||||
-- end
|
||||
-- str = str .."}"
|
||||
-- LogError(str)
|
||||
end
|
||||
this.fightBossIndex = 0
|
||||
this.GetHeroIndex = 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue