From 9bdb8aa28bed0df97b9b2b44bbd1752f877f8b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Fri, 4 Jul 2025 21:16:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=91=98=E7=8A=B6=E6=80=81=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/View/Family/FamilyAllNumbers.lua | 29 +++++++++++-- .../Game/View/Family/FamilyNumberDetail.lua | 40 ++++++++++-------- .../NumberDetail/Component/btn_band.xml | 8 +++- .../NumberList/Component/c_numberChild.xml | 22 ++++++---- .../NumberList/Image/Rectangle 259-1.png | Bin 0 -> 49798 bytes .../Family/NumberList/Image/Rectangle 259.png | Bin 0 -> 52492 bytes .../assets/Family/NumberList/Image/禁玩.png | Bin 0 -> 2184 bytes wb_new_ui/assets/Family/package.xml | 3 ++ .../ART/base/Family/ui/Family_atlas0.png | Bin 4494298 -> 4458263 bytes .../ART/base/Family/ui/Family_atlas0_1.png | Bin 2074980 -> 2195894 bytes .../ART/base/Family/ui/Family_atlas0_2.png | Bin 496046 -> 733377 bytes .../ART/base/Family/ui/Family_atlas0_3.png | Bin 1510716 -> 1283458 bytes .../ART/base/Family/ui/Family_fui.bytes | Bin 112238 -> 112807 bytes 13 files changed, 72 insertions(+), 30 deletions(-) create mode 100644 wb_new_ui/assets/Family/NumberList/Image/Rectangle 259-1.png create mode 100644 wb_new_ui/assets/Family/NumberList/Image/Rectangle 259.png create mode 100644 wb_new_ui/assets/Family/NumberList/Image/禁玩.png diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua index 691b827b..f481c7d7 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -54,7 +54,6 @@ end function M:FillList(numbers) local fgCtr = ControllerManager.GetController(NewGroupController) - self._viewList_allNumbers:SetVirtual() self.familyType.selectedIndex = 4 self.lastType = 1 @@ -65,7 +64,7 @@ function M:FillList(numbers) obj:GetChild('name').text = numbers[i].nick obj:GetChild('id').text = string.format("ID:%s", numbers[i].uid) - if numbers[i].tag == "" then + if numbers[i].tag == "" then obj:GetChild("remark").text = "备注：无" else obj:GetChild("remark").text = numbers[i].tag @@ -78,11 +77,16 @@ function M:FillList(numbers) fgCtr:FG_FindMember(self._group.id, numbers[i].uid, function(res) local familyNumberDetail = FamilyNumberDetail.new(self._group.id, self._group.lev, res) familyNumberDetail:SetTickCallback(handler(self, self.TickNumberCallback)) + familyNumberDetail:SetRefrenCallback(handler(self, self.RefrenMemberCallback)) familyNumberDetail:Show() end) end) end - self._viewList_allNumbers.numItems = #numbers + if self._viewList_allNumbers.numItems == #numbers then + self._viewList_allNumbers:RefreshVirtualList() + else + self._viewList_allNumbers.numItems = #numbers + end end function M:TickNumberCallback(res) @@ -93,4 +97,23 @@ function M:TickNumberCallback(res) end end +function M:RefrenMemberCallback() + local numbers = self._group.members + local fgCtr = ControllerManager.GetController(NewGroupController) + if #numbers == 0 then + fgCtr:FG_GroupMembers(self._group.id, 0, self._group.total_member_num, false, 1, function(res) + numbers = self._group.members + -- print("==========================res.Data.members") + ViewUtil:CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败") + else + self:FillList(numbers) + end + end) + else + self:FillList(numbers) + end +end + return M diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua index 92944515..91fec340 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua @@ -19,25 +19,25 @@ function M:init(url, lev, res) local fgCtr = ControllerManager.GetController(NewGroupController) BaseWindow.init(self, url) - print("res.Data.members[1]") - pt(res.Data.members[1]) - local info = res.Data.members[1] - local flag_assistant = info.lev == 2 and 1 or 0 - local flag_band = info.ban - local MJScore = info.mj_score - local PKScore = info.pk_score - local remark = info.tag - local icon_url = info.portrait + -- print("res.Data.members[1]") + -- pt(res.Data.members[1]) + local info = res.Data.members[1] + local flag_assistant = info.lev == 2 and 1 or 0 + local flag_band = info.ban + local MJScore = info.mj_score + local PKScore = info.pk_score + local remark = info.tag + local icon_url = info.portrait - self._view:GetChild('name').text = string.format("%s(%s)", info.nick, info.uid) - self._view:GetChild('text_allRounds').text = info.total_round - self._view:GetChild('text_joinTime').text = os.date('%Y-%m-%d %H:%M', info.join_time) - self._view:GetChild('text_score_majiang').text = MJScore - self._view:GetChild('text_score_poker').text = PKScore + self._view:GetChild('name').text = string.format("%s(%s)", info.nick, info.uid) + self._view:GetChild('text_allRounds').text = info.total_round + self._view:GetChild('text_joinTime').text = os.date('%Y-%m-%d %H:%M', info.join_time) + self._view:GetChild('text_score_majiang').text = MJScore + self._view:GetChild('text_score_poker').text = PKScore ImageLoad.Load(icon_url, self._view:GetChild('btn_head'):GetChild('icon')) - if remark == "" then + if remark == "" then self._view:GetChild("tex_remark").text = "备注：无" else self._view:GetChild("tex_remark").text = remark @@ -51,7 +51,7 @@ function M:init(url, lev, res) self._view:GetChild('btn_changeMJScore').onClick:Set(function() ViewUtil.ShowOneInput("修改麻将进入限制分", function(text) - print("lingmeng修改扑克进入限制分", text) + -- print("lingmeng修改扑克进入限制分", text) fgCtr:FG_SetJoinScore(self.groupId, info.uid, tonumber(text), MJScore, function(res) if res.ReturnCode ~= 0 then ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode) @@ -65,7 +65,7 @@ function M:init(url, lev, res) self._view:GetChild('btn_changePokerScore').onClick:Set(function() ViewUtil.ShowOneInput("修改扑克进入限制分", function(text) - print("lingmeng修改扑克进入限制分", text) + -- print("lingmeng修改扑克进入限制分", text) fgCtr:FG_SetJoinScore(self.groupId, info.uid, MJScore, tonumber(text), function(res) if res.ReturnCode ~= 0 then ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode) @@ -91,6 +91,7 @@ function M:init(url, lev, res) if res.ReturnCode == 0 then flag_band = 1 - flag_band self._view:GetChild('btn_band'):GetController('band').selectedIndex = flag_band + self._callback_refren() else ViewUtil.ShowOneChooose("设置进房权限失败") end @@ -114,6 +115,7 @@ function M:init(url, lev, res) flag_assistant = 1 - flag_assistant self._view:GetChild('btn_assistant'):GetController('isAssistant').selectedIndex = flag_assistant + self._callback_refren() else ViewUtil.ShowOneChooose("设置助理失败") end @@ -126,4 +128,8 @@ function M:SetTickCallback(callback) self._callback_tick = callback end +function M:SetRefrenCallback(callback) + self._callback_refren = callback +end + return M diff --git a/wb_new_ui/assets/Family/NumberDetail/Component/btn_band.xml b/wb_new_ui/assets/Family/NumberDetail/Component/btn_band.xml index 02a46c0b..999092a3 100644 --- a/wb_new_ui/assets/Family/NumberDetail/Component/btn_band.xml +++ b/wb_new_ui/assets/Family/NumberDetail/Component/btn_band.xml @@ -1,11 +1,15 @@ - + + + + + -