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 88a64b07..e57e6b88 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua @@ -272,34 +272,34 @@ function M:init(url) -- end end -- 禁止同桌 - -- if group.lev < 3 then - -- local btn_ban_table = lst_mng:AddItemFromPool() - -- btn_ban_table.icon = "ui://NewGroup/mng_ban_table" - -- btn_ban_table.onClick:Set(function() - -- if not CheckPermission(group.lev, perm_array[MngPermissionList.BanSameTable]) then - -- return - -- end - -- ViewUtil.ShowModalWait() - -- fgCtr:FG_GetBanTable(self.group_id, member.uid, function(res) - -- ViewUtil.CloseModalWait() - -- if res.ReturnCode == 0 then - -- local btv = GroupBanSameTableView.new(self.blur_view, self.group_id, member.uid, res.Data) - -- btv:Show() - -- else - -- ViewUtil.ErrorTip(res.ReturnCode,"获取禁止同桌列表失败！") - -- end - -- end) - -- end) - -- end - -- 合伙人设置 临时从禁止同桌修改 - if true then + if group.lev < 3 then local btn_ban_table = lst_mng:AddItemFromPool() btn_ban_table.icon = "ui://NewGroup/mng_ban_table" btn_ban_table.onClick:Set(function() - local prv = GroupPartnerRewardsView.new(self.group_id, member.uid, member.partnerLev) - prv:Show() + if not CheckPermission(group.lev, perm_array[MngPermissionList.BanSameTable]) then + return + end + ViewUtil.ShowModalWait() + fgCtr:FG_GetBanTable(self.group_id, member.uid, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local btv = GroupBanSameTableView.new(self.blur_view, self.group_id, member.uid, res.Data) + btv:Show() + else + ViewUtil.ErrorTip(res.ReturnCode, "获取禁止同桌列表失败！") + end + end) end) end + -- -- 合伙人设置 临时从禁止同桌修改 + -- if true then + -- local btn_ban_table = lst_mng:AddItemFromPool() + -- btn_ban_table.icon = "ui://NewGroup/mng_ban_table" + -- btn_ban_table.onClick:Set(function() + -- local prv = GroupPartnerRewardsView.new(self.group_id, member.uid, member.partnerLev) + -- prv:Show() + -- end) + -- end if group.lev == 1 and member.lev > 1 and member.partnerLev > 0 and member.uid ~= DataManager.SelfUser.account_id then 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 eb3191c6..7f5c028e 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua @@ -30,7 +30,7 @@ function GroupMngMenKangView.new(group_id, blur_view) self.curGroup = DataManager.groups:get(self.group_id) self.member_data = {} self.online = 2 - self.stype = 2 + self.stype = 1 self:FillView() return self end 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 5437cfa4..71052117 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua @@ -552,7 +552,7 @@ end function M:FillItem2(obj, group, member, refresh, index) obj:GetChild('tex_childId').text = group:getPlayName(member.pid) - obj:GetChild('tex_lev').text = member.cur_value + obj:GetChild('tex_lev').text = d2ad(member.cur_value) end function M:OnRenderItem(index, obj) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua index e72d902c..4b144efb 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua @@ -131,8 +131,8 @@ function M:OnRenderRewardsItem(index, obj) --printlog("aaaaaaaaaaaaaaaaaaaaa ",__showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1)) obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data .xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1) - obj:GetChild("tex_rewards").text = data.cur_value - obj:GetChild("tex_rewards_max").text = data.max_value + obj:GetChild("tex_rewards").text = d2ad(data.cur_value) + obj:GetChild("tex_rewards_max").text = d2ad(data.max_value) obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value, data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1) local play_name = group:getPlayName(data.pid) diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 8e55e9fc..112cab31 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -10,6 +10,7 @@ "doc.openedDocs": [ "ui://2d9xdj6zfn7fao", "ui://m7iejg4610snh5j", + "ui://m7iejg46imp57ih2", "ui://m7iejg46ilon7i9l", "ui://m7iejg46ilon7i9m", "ui://0khx14are0py2", @@ -18,6 +19,7 @@ "ui://m7iejg46z3847i6m", "ui://m7iejg46kwi0hk0", "ui://m7iejg46imp57igy", + "ui://m7iejg46imp57ih3", "ui://m7iejg46hsbhhjn", "ui://m7iejg46l679hwn", "ui://m7iejg46l679hws", @@ -31,11 +33,15 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://2d9xdj6zfn7fao", + "doc.activeDoc": "ui://m7iejg46imp57igy", "libview.twoColumn": false, "libview.expandedNodes": [ "0khx14ar", - "/" + "/", + "m7iejg46", + "/", + "m7iejg46", + "/mgr/" ], "auxline1": true, "snapToGrid": true,