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

dev_chengFeng
张彪 2022-02-08 14:07:03 +08:00
commit 7f6cb1a40f
3 changed files with 13 additions and 2 deletions

View File

@ -788,7 +788,7 @@ function SetCardStars(starGrid, star,starType)
if starType == 3 then
starScale = 7
end
for i = 1, 21 do
for i = 1, starGrid.transform.childCount do
starGrid.transform:GetChild(i - 1).gameObject:SetActive(false)
end
if star < 6 then
@ -1957,7 +1957,7 @@ function SubmitExtraData(context)
params.dataType = context.type
params.serverID = tonumber(PlayerManager.serverInfo.server_id)
params.serverName = PlayerManager.serverInfo.name
params.zoneID = tostring(PlayerManager.serverInfo.server_id)
params.zoneID = tostring(AppConst.OpenId)
params.zoneName = PlayerManager.serverInfo.name
params.roleID = tostring(PlayerManager.uid)
params.roleName = PlayerManager.nickName

View File

@ -9498,6 +9498,10 @@ local passivityList = {
if not skill then
return
end
if target ~= role then
return
end
if time==triggerTime then
return
end

View File

@ -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