diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 0f5c70d5..6a39d9cf 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -1248,18 +1248,18 @@ function M:InitView(url) -- self:__loadLastData() --设置门槛和提成放置外面 - self._view:GetChild('btn_menkan').onClick:Set(function() - -- if not self.mng_view_menkan then - self.mng_view_menkan = GroupMngMenKangView.new(self.curGroup.id) - -- end - self.mng_view_menkan:Show() - end) - self._view:GetChild('btn_pilaozhi').onClick:Set(function() - -- if not self.mng_view_pilao then - self.mng_view_pilao = GroupMngPiLaoZhi.new(self.curGroup.id) - -- end - self.mng_view_pilao:Show() - end) + -- self._view:GetChild('btn_menkan').onClick:Set(function() + -- -- if not self.mng_view_menkan then + -- self.mng_view_menkan = GroupMngMenKangView.new(self.curGroup.id) + -- -- end + -- self.mng_view_menkan:Show() + -- end) + -- self._view:GetChild('btn_pilaozhi').onClick:Set(function() + -- -- if not self.mng_view_pilao then + -- self.mng_view_pilao = GroupMngPiLaoZhi.new(self.curGroup.id) + -- -- end + -- self.mng_view_pilao:Show() + -- end) self._view:GetChild('btn_gerenxinxi').onClick:Set(function() -- if not self.mng_view_Player then self.mng_view_Player = GroupShowMemberInfoView.new(self.curGroup.id, self.curGroup) 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 5f71808c..381ea524 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua @@ -8,7 +8,8 @@ local GroupSetMemberInfoDiaoduView = import('.GroupSetMemberInfoDiaoduView') local GroupPartnerBanPlaysView = import(".GroupPartnerBanPlaysView") local GroupPartnerRewardsView = import(".GroupPartnerRewardsView") local GourpIDPasswordAlone = import(".GourpIDPasswordAlone") - +local GroupMngMenKangView = import(".GroupMngMenKangView") +local GroupMngPiLaoZhi = import(".GroupMngPiLaoZhi") -- 牌友圈成员体力值记录 local GroupMemberOperateView = {} @@ -135,7 +136,7 @@ function M:init(url) end) end end) - end, 0,{com = "ui://NewGroup/Win_AddFriend"}) + end, 0, { com = "ui://NewGroup/Win_AddFriend" }) gniv:Show() end) local vipbtn = self._view:GetChild("btn_vip") @@ -273,15 +274,16 @@ function M:init(url) -- end end - --解除绑定 + --解除绑定 if group.lev == 1 then local btn_disbing = lst_mng:AddItemFromPool() btn_disbing.icon = "ui://NewGroup/mng_disbing" btn_disbing.onClick:Set(function() - local msg_tip = MsgWindow.new(self._root_view, string.format("是否要取消用户【%s(%d)】?",member.nick,member.uid), MsgWindow.MsgMode.OkAndCancel) + local msg_tip = MsgWindow.new(self._root_view, string.format("是否要取消用户【%s(%d)】?", member.nick, member.uid), + MsgWindow.MsgMode.OkAndCancel) msg_tip.onOk:Add(function(...) ViewUtil.ShowModalWait() - fgCtr:FG_Reset_Lock(self.group_id, member.uid,0, function(res) + fgCtr:FG_Reset_Lock(self.group_id, member.uid, 0, function(res) ViewUtil.CloseModalWait() if self._is_destroy then return @@ -436,6 +438,21 @@ function M:init(url) local mflv = GroupMemberFagLogView.new(self.group_id, member) mflv:Show() end) + if (group.lev >= 1) then + local btn_mng_gerenxinxi = lst_mng:AddItemFromPool() + btn_mng_gerenxinxi.icon = "ui://NewGroup/mng_menkan" + btn_mng_gerenxinxi.onClick:Set(function() + local mflv1 = GroupMngMenKangView.new(self.group_id) + mflv1:Show() + end) + local btn_mng_pilaozhi = lst_mng:AddItemFromPool() + btn_mng_pilaozhi.icon = "ui://NewGroup/mng_pilaozhi" + btn_mng_pilaozhi.onClick:Set(function() + local mflv2 = GroupMngPiLaoZhi.new(self.group_id, member) + mflv2:Show() + end) + end + if group.lev == 1 and group.type == 2 then local btn_move = lst_mng:AddItemFromPool() @@ -469,7 +486,7 @@ function M:init(url) self:MovePartner(parent_id, member, self._view) end end) - end, 0,{com = "ui://NewGroup/Win_AddFriend"}) + end, 0, { com = "ui://NewGroup/Win_AddFriend" }) gniv:Show() end) end @@ -552,8 +569,6 @@ function M:init(url) IDPasswordAlone:Show() end) end - - end function M:MovePartner(parent_id, member, obj) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua index 0ee1a7c7..8578c639 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua @@ -3,7 +3,7 @@ local GroupNumberInputView = import('.GroupNumberInputView') local GroupMemberFagLogView = import('.GroupMemberFagLogView') local GroupSetPermissionView = import('.GroupSetPermissionView') local GroupBanSameTableView = import('.GroupBanSameTableView') -local GroupMemberOperateView = import('.GroupMemberOperateView') +--local GroupMemberOperateView = import('.GroupMemberOperateView') local GroupAddMemberInfoView = import('.GroupAddMemberInfoView') local GroupStatMember = import('.GroupStatMember') local GroupMngFagPackView = import('../GroupMngFagPackView') @@ -470,34 +470,34 @@ function M:FillItem(obj, member, refresh, index) end ) - obj:GetChild('btn_operate').onClick:Set( - function() - local mflv = - GroupMemberOperateView.new( - self.group_id, - member, - function(delete) - if delete ~= nil and delete == true then - local group = DataManager.groups:get(self.group_id) - self.member_data = group.members - print('btn_operate') - self.lst_member.numItems = self:GetChildNumForPage() - self._view:GetController('search').selectedIndex = 0 - else - print('btn_operate') - self.lst_member.numItems = self:GetChildNumForPage() - if refresh then - self:FillItem(obj, member) - end - end - end, - function() - self:GetMemberData(0) - end - ) - mflv:Show() - end - ) + -- obj:GetChild('btn_operate').onClick:Set( + -- function() + -- local mflv = + -- GroupMemberOperateView.new( + -- self.group_id, + -- member, + -- function(delete) + -- if delete ~= nil and delete == true then + -- local group = DataManager.groups:get(self.group_id) + -- self.member_data = group.members + -- print('btn_operate') + -- self.lst_member.numItems = self:GetChildNumForPage() + -- self._view:GetController('search').selectedIndex = 0 + -- else + -- print('btn_operate') + -- self.lst_member.numItems = self:GetChildNumForPage() + -- if refresh then + -- self:FillItem(obj, member) + -- end + -- end + -- end, + -- function() + -- self:GetMemberData(0) + -- end + -- ) + -- mflv:Show() + -- end + -- ) local btnBxx = obj:GetChild('btn_bxx') btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua index 79f39f31..04d5bdff 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua @@ -3,7 +3,7 @@ local GroupNumberInputView = import('.GroupNumberInputView') local GroupMemberFagLogView = import('.GroupMemberFagLogView') local GroupSetPermissionView = import('.GroupSetPermissionView') local GroupBanSameTableView = import('.GroupBanSameTableView') -local GroupMemberOperateView = import('.GroupMemberOperateView') +--local GroupMemberOperateView = import('.GroupMemberOperateView') local GroupAddMemberInfoView = import('.GroupAddMemberInfoView') local GroupStatMember = import('.GroupStatMember') local GroupMngFagPackView = import('../GroupMngFagPackView') @@ -479,32 +479,32 @@ function M:FillItem(obj, member, refresh, index) end ) - obj:GetChild('btn_operate').onClick:Set( - function() - local mflv = - GroupMemberOperateView.new( - self.group_id, - member, - function(delete) - if delete ~= nil and delete == true then - local group = DataManager.groups:get(self.group_id) - self.member_data = group.members - self.lst_member.numItems = self:GetChildNumForPage() - self._view:GetController('search').selectedIndex = 0 - else - self.lst_member.numItems = self:GetChildNumForPage() - if refresh then - self:FillItem(obj, member) - end - end - end, - function() - self:GetMemberData(0) - end - ) - mflv:Show() - end - ) + -- obj:GetChild('btn_operate').onClick:Set( + -- function() + -- local mflv = + -- GroupMemberOperateView.new( + -- self.group_id, + -- member, + -- function(delete) + -- if delete ~= nil and delete == true then + -- local group = DataManager.groups:get(self.group_id) + -- self.member_data = group.members + -- self.lst_member.numItems = self:GetChildNumForPage() + -- self._view:GetController('search').selectedIndex = 0 + -- else + -- self.lst_member.numItems = self:GetChildNumForPage() + -- if refresh then + -- self:FillItem(obj, member) + -- end + -- end + -- end, + -- function() + -- self:GetMemberData(0) + -- end + -- ) + -- mflv:Show() + -- end + -- ) local btnBxx = obj:GetChild('btn_bxx') btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index c701c3d6..6962b375 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -1,19 +1,22 @@ { "objectStatus": { + "n240_n6w8": { + "hidden": true + }, "n294_ik9v": { "collapsed": true }, - "n259_imp5": { - "collapsed": true - }, - "n78_i7lq": { - "hidden": true - }, "n251_ilon": { "hidden": true }, + "n78_i7lq": { + "hidden": true + }, "n290_ik9v": { "hidden": true + }, + "n260_imp5": { + "hidden": true } }, "fitScreen": "FitSize" diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 8ae26e55..54986157 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,18 +2,14 @@ "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://8onu6pxjremn35", - "ui://8onu6pxjremn3m", - "ui://8onu6pxjremn3v", - "ui://8onu6pxjremn3r", - "ui://8onu6pxjremn42", - "ui://mzvoz9udm1i335", - "ui://mzvoz9udm1i33m" + "ui://m7iejg4610snh5j", + "ui://m7iejg46imp57ih3", + "ui://m7iejg46tqi8hwa" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://8onu6pxjremn35", + "doc.activeDoc": "ui://m7iejg4610snh5j", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -24,64 +20,22 @@ "/font/font_gameTableName/", "27vd145b", "/images/", - "8onu6pxj", - "/", - "8onu6pxj", - "/component/", - "8onu6pxj", - "/component/epcwhzHECHIMui/", - "1utjt0r2", - "/", - "1utjt0r2", - "/component/", - "1utjt0r2", - "/component/clearing/", - "1utjt0r2", - "/component/clearing/image/", - "mzvoz9ud", - "/", - "mzvoz9ud", - "/component/", - "mzvoz9ud", - "/component/EPCDWHZMui/", - "mzvoz9ud", - "/component/clearing/", - "mzvoz9ud", - "/component/clearing/image/", - "mzvoz9ud", - "/component/clearing/images/", - "8wph7p8n", - "/", - "8wph7p8n", - "/image/", "2d9xdj6z", "/", - "2d9xdj6z", - "/images/", - "2d9xdj6z", - "/images/LobbyMui/", - "v0j9abjy", - "/", - "v0j9abjy", - "/images/", - "v0j9abjy", - "/images/cards/", - "v0j9abjy", - "/images/cards/1/", - "v0j9abjy", - "/images/cards/2/", - "lkq9ne9s", - "/", - "lkq9ne9s", - "/buttons/", - "lkq9ne9s", - "/component/", - "lkq9ne9s", - "/image/", - "lkq9ne9s", - "/images/", "m7iejg46", - "/" + "/", + "m7iejg46", + "/component/", + "m7iejg46", + "/component/Lst_info/", + "m7iejg46", + "/component/Lst_info/room_info/", + "m7iejg46", + "/mgr/", + "m7iejg46", + "/mgr/imgs/", + "m7iejg46", + "/mgr/imgs/member/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml index 565ef3ee..cfb07666 100644 --- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml +++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + @@ -90,7 +90,7 @@ -