Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
7f6cb1a40f
|
@ -788,7 +788,7 @@ function SetCardStars(starGrid, star,starType)
|
||||||
if starType == 3 then
|
if starType == 3 then
|
||||||
starScale = 7
|
starScale = 7
|
||||||
end
|
end
|
||||||
for i = 1, 21 do
|
for i = 1, starGrid.transform.childCount do
|
||||||
starGrid.transform:GetChild(i - 1).gameObject:SetActive(false)
|
starGrid.transform:GetChild(i - 1).gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
if star < 6 then
|
if star < 6 then
|
||||||
|
@ -1957,7 +1957,7 @@ function SubmitExtraData(context)
|
||||||
params.dataType = context.type
|
params.dataType = context.type
|
||||||
params.serverID = tonumber(PlayerManager.serverInfo.server_id)
|
params.serverID = tonumber(PlayerManager.serverInfo.server_id)
|
||||||
params.serverName = PlayerManager.serverInfo.name
|
params.serverName = PlayerManager.serverInfo.name
|
||||||
params.zoneID = tostring(PlayerManager.serverInfo.server_id)
|
params.zoneID = tostring(AppConst.OpenId)
|
||||||
params.zoneName = PlayerManager.serverInfo.name
|
params.zoneName = PlayerManager.serverInfo.name
|
||||||
params.roleID = tostring(PlayerManager.uid)
|
params.roleID = tostring(PlayerManager.uid)
|
||||||
params.roleName = PlayerManager.nickName
|
params.roleName = PlayerManager.nickName
|
||||||
|
|
|
@ -9498,6 +9498,10 @@ local passivityList = {
|
||||||
if not skill then
|
if not skill then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
if target ~= role then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
if time==triggerTime then
|
if time==triggerTime then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
@ -70,6 +70,13 @@ function this.OpenXiaoYaoMap(mapId,func)
|
||||||
table.sort(curMapData.cell,function(a,b)
|
table.sort(curMapData.cell,function(a,b)
|
||||||
return a.cellIndex < b.cellIndex
|
return a.cellIndex < b.cellIndex
|
||||||
end)
|
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
|
end
|
||||||
this.fightBossIndex = 0
|
this.fightBossIndex = 0
|
||||||
this.GetHeroIndex = 0
|
this.GetHeroIndex = 0
|
||||||
|
|
Loading…
Reference in New Issue