From e17ed8ad8472fd1b5922a7118b520d569115048c Mon Sep 17 00:00:00 2001 From: FPGA Date: Tue, 15 Jul 2025 17:16:08 +0800 Subject: [PATCH] 715 --- .../MngView/GroupMemberOperateView.lua | 4 +- .../MngView/GroupMngMemberListView1.lua | 4 +- wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info | 3 ++ wb_new_ui/assets/NewGroup/Win_bxx.xml | 18 +++---- .../mgr/component/fagpack/btn_export_info.xml | 4 +- .../mgr/component/fagpack/btn_import_info.xml | 2 +- .../mgr/component/member/item_member1.xml | 44 +++++++++--------- .../assets/NewGroup/mgr/imgs/fagpack/tqmx.png | Bin 7828 -> 9518 bytes .../assets/NewGroup/mgr/imgs/fagpack/x.png | Bin 6915 -> 10269 bytes 9 files changed, 41 insertions(+), 38 deletions(-) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua index eb562179..1c73a61f 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua @@ -359,7 +359,7 @@ function M:init(url) end - if ((group.lev < 3 and member.parentId == 0) or (group.type == 2 and member.parentId == DataManager.SelfUser.account_id)) and member.partnerLev == 0 and member.lev == 3 then + if ((group.lev < 3 and member.parentId == 0) or (group.type == 2 and member.parentId == DataManager.SelfUser.account_id)) then local btn_set_partner = lst_mng:AddItemFromPool() local pic = member.partnerLev == 0 and "mng_set_partner" or "mng_del_partner" btn_set_partner.icon = "ui://NewGroup/" .. pic @@ -406,7 +406,7 @@ function M:init(url) mflv:Show() end) - if group.lev == 1 and member.partnerLev > 0 and group.type == 2 then + if group.lev == 1 and group.type == 2 then local btn_move = lst_mng:AddItemFromPool() btn_move.icon = "ui://NewGroup/mng_move" btn_move.onClick:Set(function() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua index 6ff39d04..28ac99df 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua @@ -448,8 +448,8 @@ function M:FillItem(obj, member, refresh) ) local btnBxx = obj:GetChild('btn_bxx') - btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and - not (DataManager.SelfUser.account_id == member.uid) + -- btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and + -- not (DataManager.SelfUser.account_id == member.uid) --btnBxx.visible = not (DataManager.SelfUser.account_id == member.uid) obj:GetChild('btn_bxx').onClick:Set( function() diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info index b1901376..e8f61f56 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info @@ -15,6 +15,9 @@ "n44_rpaz": { "collapsed": true }, + "n68_z384": { + "hidden": true + }, "n72_mtk5": { "hidden": true }, diff --git a/wb_new_ui/assets/NewGroup/Win_bxx.xml b/wb_new_ui/assets/NewGroup/Win_bxx.xml index 1e751387..6537f2cd 100644 --- a/wb_new_ui/assets/NewGroup/Win_bxx.xml +++ b/wb_new_ui/assets/NewGroup/Win_bxx.xml @@ -1,7 +1,7 @@ - - + + @@ -17,22 +17,22 @@ - + - + - - + +