diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua index 9b81300465..67493e50f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua @@ -167,38 +167,18 @@ end function this.InitMapUserInfosData(data,mapId) local datas = {} + local index = 15 local myData = {} - for i = 1,#data do - local singleUserData = {} - singleUserData.userName = data[i].name - singleUserData.sex = data[i].gender - singleUserData.uid = data[i].uid - singleUserData.userSkin = data[i].userSkin - singleUserData.userTitle = data[i].userTitle - singleUserData.userMount = data[i].userMount - singleUserData.practiceLevel = data[i].practiceLevel or 1 - singleUserData.lv = data[i].level - singleUserData.formationId = i - singleUserData.hp = 0 - if singleUserData.uid == PlayerManager.uid then - myData = singleUserData - else - table.insert(datas,singleUserData) - end - end - - if not myData then - myData.userName = PlayerManager.nickName - myData.sex = NameManager.roleSex - myData.uid = PlayerManager.uid - myData.userSkin = PlayerManager.designation - myData.userTitle = PlayerManager.skin - myData.userMount = PlayerManager.ride - myData.practiceLevel = PracticeManager.PracticeLevel or 1 - myData.lv = PlayerManager.level - myData.formationId = 0 - myData.hp = 0 - end + myData.userName = PlayerManager.nickName + myData.sex = NameManager.roleSex + myData.uid = PlayerManager.uid + myData.userSkin = PlayerManager.designation + myData.userTitle = PlayerManager.skin + myData.userMount = PlayerManager.ride + myData.practiceLevel = PracticeManager.PracticeLevel or 1 + myData.lv = PlayerManager.level + myData.formationId = 0 + myData.hp = 0 for k,v in pairs(this.ExploreMapData[mapId].formations) do local singleUserData = {} singleUserData.userName = myData.userName @@ -210,9 +190,35 @@ function this.InitMapUserInfosData(data,mapId) singleUserData.practiceLevel = myData.practiceLevel singleUserData.lv = myData.lv singleUserData.formationId = k - singleUserData.hp = this.FormationData[k].hp + singleUserData.hp = this.FormationData[k].hp table.insert(datas,singleUserData) + index = index - 1 + if index == 0 then + break + end end + + for i = 1,#data do + if data[i].uid ~= PlayerManager.uid then + local singleUserData = {} + singleUserData.userName = data[i].name + singleUserData.sex = data[i].gender + singleUserData.uid = data[i].uid + singleUserData.userSkin = data[i].userSkin + singleUserData.userTitle = data[i].userTitle + singleUserData.userMount = data[i].userMount + singleUserData.practiceLevel = data[i].practiceLevel or 1 + singleUserData.lv = data[i].level + singleUserData.formationId = i + singleUserData.hp = 0 + table.insert(datas,singleUserData) + index = index - 1 + if index == 0 then + break + end + end + end + return datas end diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua index abd0716860..a0fe75608e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua @@ -53,7 +53,7 @@ local startUV = { } -- 允许出现的事件点的图标数量 -local iconNum = 9 +local iconNum = 20 -- 地图图标的上限值 local maxIcon = 9