diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 7ae5878ccd..9e359a104c 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index e7ee192bba..501222ef43 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -9498,6 +9498,10 @@ local passivityList = { if not skill then return end + if target ~= role then + return + end + if time==triggerTime then return end diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index feb4e7b60b..97156a6d8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -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