From d7e766509bacf81814eff3a051a3d79baaafb387 Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Tue, 5 Aug 2025 21:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E6=A1=86=E3=80=81=E6=88=90=E5=91=98?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=81=E4=BA=B2=E5=8F=8B=E5=9C=88=E6=A0=87?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base_project/Game/View/FGAssistView.lua | 80 +++++++++++++++--- .../base_project/Game/View/FamilyView.lua | 2 +- wb_new_ui/assets/Family/Main.xml | 8 +- wb_new_ui/assets/Family/package.xml | 2 +- .../ART/base/Family/ui/Family_fui.bytes | Bin 121502 -> 121496 bytes 5 files changed, 76 insertions(+), 16 deletions(-) diff --git a/lua_probject/base_project/Game/View/FGAssistView.lua b/lua_probject/base_project/Game/View/FGAssistView.lua index 84146684..27f727e4 100644 --- a/lua_probject/base_project/Game/View/FGAssistView.lua +++ b/lua_probject/base_project/Game/View/FGAssistView.lua @@ -6,6 +6,52 @@ local FGAssistView = {} local M = FGAssistView setmetatable(M, { __index = BaseWindow }) +local function SortMembers(Members) + + for _,player in pairs(Members) do + if player.uid == DataManager.SelfUser.account_id then + Members[_] = nil + end + end + + -- ↓↓↓排序 + local re = {} + local online = {} + local playing = {} + local offline = {} + + for _, player in pairs(Members) do + -- 在线 绿色状态 + if player.online == 1 and player.playing ~= "startPlaying" then + online[#online + 1] = player + end + + -- 在线游戏中 红色状态 + if player.online == 1 and player.playing == "startPlaying" then + playing[#playing + 1] = player + end + + -- 离线 + if player.online == 0 then + offline[#offline + 1] = player + end + end + + for _, player in pairs(online) do + re[#re + 1] = player + end + + for _, player in pairs(playing) do + re[#re + 1] = player + end + + for _, player in pairs(offline) do + re[#re + 1] = player + end + + return re +end + function FGAssistView.new(blur_view, group_id, callback) local self = setmetatable({}, { __index = M }) self.class = "FGAssistView" @@ -81,7 +127,7 @@ function M:ReFalsh(...) end end - self._data_number = group.members + self._data_number = SortMembers(group.members) --group.members self.lst_player.numItems = #group.members end @@ -89,12 +135,22 @@ function M:PlayerRenderer(index, obj) local i = index + 1 obj:GetChild('tex_name').text = self._data_number[i].nick local btn_invite = obj:GetChild('btn_invite') - btn_invite:GetController('online').selectedIndex = self._data_number[i].uid == - DataManager.SelfUser.account_id and 0 or self._data_number[i].online - local state = self._data_number[i].online - if self._data_number[i].playing == "startPlaying" then - state = 2 + + btn_invite:GetController('online').selectedIndex = 0 + if self._data_number[i].uid ~= DataManager.SelfUser.account_id and self._data_number[i].online == 1 and self._data_number[i].playing == "stopPlaying" then + btn_invite:GetController('online').selectedIndex = 1 end + + --btn_invite:GetController('online').selectedIndex = self._data_number[i].uid == DataManager.SelfUser.account_id and 0 or self._data_number[i].online + local state = 0 + if self._data_number[i].online == 1 and self._data_number[i].playing == "startPlaying" then + state = 2 + elseif self._data_number[i].online == 1 and self._data_number[i].playing == "stopPlaying" then + state = 1 + elseif self._data_number[i].online == 0 then + state = 0 + end + obj:GetController('type').selectedIndex = state local loader = obj:GetChild("btn_head"):GetChild("icon") ImageLoad.Load(self._data_number[i].portrait, loader) @@ -157,13 +213,17 @@ function M:GetOnlinePlayersshow(fgCtr, group, index) if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败") else - self._data_number = group.members - self.lst_player.numItems = #group.members + --self._data_number = group.members + --self.lst_player.numItems = #group.members + self._data_number = SortMembers(group.members) + self.lst_player.numItems = #self._data_number end end) else - self._data_number = group.members - self.lst_player.numItems = #group.members + --self._data_number = group.members + --self.lst_player.numItems = #group.members + self._data_number = SortMembers(group.members) + self.lst_player.numItems = #self._data_number end pt(self._data_number) end diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 6c2f92fe..03e96b93 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -795,7 +795,7 @@ function M:ConnetFamily(index, groups, isCreate) obj.text = Utils.TextOmit(group.name, 6, "...") obj.onClick:Add(function() if group.id == self._group.id then - ViewUtil.ShowBannerOnScreenCenter("已在家族中") + --ViewUtil.ShowBannerOnScreenCenter("已在家族中") return end diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 567d0b0f..2e78cdb1 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -23,16 +23,16 @@ - + - + - + - + diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml index b3a42afe..4963b2a4 100644 --- a/wb_new_ui/assets/Family/package.xml +++ b/wb_new_ui/assets/Family/package.xml @@ -112,7 +112,7 @@ - + diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index 84a9f1eca1d3c46d6cde2b270c575206cc7231ed..7edcaa09d743dbf4b3f52a89eeb4a3f5c8c197c9 100644 GIT binary patch delta 113 zcmbQYm3_um_6;8|GqLbbeqb&&`N9>B$)Z=3xmp+)7^E42#GUDUv5b;Han{KRS3()5 zK~-sSv+x6DC4fp8k4-;d&L}ha!4rYW26MSKTVGwUfpORNJFSchjk!3V?Ar9Szx(N& Lj_tiW83h#qWX>#L delta 89 zcmV-f0H*(#wFjQH2e9$ems3Om9g_~!DwhOZ0V9*p)CH4Z)K!;(T>%@D(9|lITtxvV vli=hKlQ5kMvpdzGumP*L+=T(5GY}8ty0Ybui{+e%=7^Bxk(jrKxd9O&57;UG