diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 0ecf51d2..938491e1 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -201,7 +201,7 @@ local function __fillRoomItem(self, index, item, room) else room_item.tex_round.text = room.status >= -1 and string.format('%s/%s', room.round, room.times) or "" end - + local name = __getLayerName(self, room.pid) room_item.tex_gamename.text = name room_item.tex_limit.text = str @@ -2092,10 +2092,10 @@ function M:Destroy() self.mng_view4:Destroy() end if self.mng_view_invite then - self.mng_view_invite:Dispose() + self.mng_view_invite:Destroy() end if self.mng_view_hp then - self.mng_view_hp:Dispose() + self.mng_view_hp:Destroy() end DataManager.SelfUser.cur_group = nil if self._tw_notice then diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua index 0e6c74e4..f5e81015 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -235,14 +235,14 @@ function M:GetMemberData(index) ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') else self.all_member_data = group.members - self.member_data = self.all_member_data - -- self.member_data = {} - -- for i = 1, #self.all_member_data do - -- local number = self.all_member_data[i] - -- if number.uid == DataManager.SelfUser.account_id or number.parentId == DataManager.SelfUser.account_id then - -- table.insert(self.member_data, number) - -- end - -- end + -- self.member_data = self.all_member_data + self.member_data = {} + for i = 1, #self.all_member_data do + local number = self.all_member_data[i] + if number.uid == DataManager.SelfUser.account_id or number.parentId == DataManager.SelfUser.account_id then + table.insert(self.member_data, number) + end + end self.page = math.ceil(#self.member_data / self.pageNum) self.lst_member.numItems = self:GetChildNumForPage() self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index d5fcf377..df48d804 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -15,10 +15,16 @@ "ui://m7iejg46irlqi02", "ui://m7iejg46imp57ih2", "ui://m7iejg46ilon7i9l", + "ui://m7iejg46iaes7idc", + "ui://m7iejg46iaes7idk", + "ui://m7iejg46iaes7idb", + "ui://m7iejg46iaes7idj", "ui://m7iejg46ilon7i9m", "ui://0khx14are0py2", "ui://m7iejg46ilon7ia2", "ui://m7iejg46ilon7ias", + "ui://m7iejg46ilon7ibc", + "ui://m7iejg46imp57ihp", "ui://m7iejg46z3847i6m", "ui://m7iejg46kwi0hk0", "ui://m7iejg46imp57igy", @@ -36,14 +42,26 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg4610snh5j", + "doc.activeDoc": "ui://m7iejg46imp57ihp", "libview.twoColumn": false, "libview.expandedNodes": [ + "27vd145b", + "/", + "27vd145b", + "/buttons/", "0khx14ar", "/", "m7iejg46", "/", "m7iejg46", + "/component/", + "m7iejg46", + "/component/Lst_room/", + "m7iejg46", + "/images/", + "m7iejg46", + "/images/allNumber/", + "m7iejg46", "/mgr/" ], "auxline1": true,