From 85e1e03a76be58f64a0580e221810603d0f4066a 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, 6 Jun 2025 01:11:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=96=B2=E5=8A=B3=E5=80=BC=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E9=97=A8=E6=A7=9B=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewGroup/MngView/GroupMngMenKangView.lua | 3 +- .../NewGroup/MngView/GroupMngPiLaoZhi.lua | 63 +++++++++++-------- .../MngView/GroupPartnerRewardsView.lua | 17 +++-- wb_new_ui/assets/NewGroup/Main_GroupInfo.xml | 20 +++--- .../assets/NewGroup/mgr/View_GroupMenKang.xml | 8 ++- 5 files changed, 63 insertions(+), 48 deletions(-) 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 d3118865..eb3191c6 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua @@ -80,7 +80,7 @@ function M:FillView() --printlog("aaaaaaaa222222222222222222222222222222") end) - local rtype = self._view:GetChild("n136") + local rtype = self._view:GetChild("btn_search") rtype.onClick:Set(function() self:GetMemberData(0) @@ -236,6 +236,7 @@ function M:GetMemberData(index) ViewUtil.ShowModalWait("正在加载预警值") for i = 1, #allmembers do local member = allmembers[i] + pt(member) if member.lev > 0 then table.insert(self.member_data, member) fgCtr:FG_GetBanMemberHB(self.group_id, member.uid, function(res) 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 2df050fe..5437cfa4 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua @@ -32,7 +32,7 @@ function GroupMngPiLaoZhi.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 @@ -200,7 +200,27 @@ function M:FillView() self._view:GetChild('btn_piLaoZhi1').onClick:Set(function() local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetRewards(self.group_id, group.owner, group.partnerLev, function(res) + fgCtr:FG_GetRewards(self.group_id, DataManager.SelfUser.account_id, group.lev, + function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人奖励失败") + else + self.rewards = res.Data.rewards + self.lst_rewards.numItems = #self.rewards + end + end) + end) + self._view:GetChild('btn_piLaoZhi2').onClick:Set(function() + self:GetMemberData(0) + end) + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetRewards(self.group_id, DataManager.SelfUser.account_id, group.lev, + function(res) ViewUtil.CloseModalWait() if self._is_destroy then return @@ -212,24 +232,6 @@ function M:FillView() self.lst_rewards.numItems = #self.rewards end end) - end) - self._view:GetChild('btn_piLaoZhi2').onClick:Set(function() - self:GetMemberData(0) - end) - - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetRewards(self.group_id, group.owner, group.partnerLev, function(res) - ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人奖励失败") - else - self.rewards = res.Data.rewards - self.lst_rewards.numItems = #self.rewards - end - end) -- self:GetMemberData(0) end @@ -267,9 +269,16 @@ function M:GetMemberData(index) if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') else - self.member_data = group.members - self.lst_member.numItems = self:GetChildNumForPage() + local members = group.members + local tempNumberList = {} + for i = 1, #members do + if members[i].lev < 3 or members[i].partnerLev ~= 0 then + table.insert(tempNumberList, members[i]) + end + end + self.member_data = tempNumberList self.page = math.ceil(#group.members / self.pageNum) + self.lst_member.numItems = self:GetChildNumForPage() self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) if index == 0 then -- self._view:GetChild('tex_memb_num').text = res.Data.member_num @@ -508,8 +517,12 @@ function M:FillItem(obj, member, refresh, index) local superBtnUp = obj:GetChild('superior_btn_up') obj:GetChild("btn_zeng").onClick:Set( function() - local prv = GroupPartnerRewardsView.new(self.group_id, member.uid, member.partnerLev) - prv:Show() + if member.uid == DataManager.SelfUser.account_id then + self._view:GetController('page').selectedIndex = 0 + else + local prv = GroupPartnerRewardsView.new(self.group_id, member.uid, member.lev) + prv:Show() + end end ) obj:GetChild("super_btn").onClick:Set( @@ -539,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.max_value + obj:GetChild('tex_lev').text = 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 1cfec3df..e72d902c 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua @@ -64,7 +64,7 @@ function M:GetRewardsData() self._view:GetChild('btn_piliang').onClick:Set(function() local gfiv = GroupNumberInputView.new(self._root_view, function(num) - local tem = num * 1000 + local tem = num local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s？", num), MsgWindow.MsgMode.OkAndCancel, nil, false) @@ -72,10 +72,9 @@ function M:GetRewardsData() local single = msg_win.btnCheck.selected and 1 or 0 local fgCtr = ControllerManager.GetController(NewGroupController) ViewUtil.ShowModalWait() - local successNum = 0 for i = 1, #rewards do - fgCtr:FG_SetRewards(self.group_id, rewards[i].pid, self.partner_lev, self.partner_id, true, - rewards[i].max_value - tem, single, + fgCtr:FG_SetRewards(self.group_id, rewards[i].pid, self.partner_lev, self.partner_id, false, + rewards[i].max_value - tem < 0 and 0 or rewards[i].max_value - tem, single, function(res) ViewUtil.CloseModalWait() if res.ReturnCode ~= 0 then @@ -90,10 +89,10 @@ function M:GetRewardsData() -- end -- self.lst_rewards.numItems = #self.rewards_data end + if i == #rewards then + self:GetRewardsData() + end end) - if i == #rewards then - self:GetRewardsData() - end end end) msg_win:Show() @@ -132,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 = d2ad(data.cur_value) - obj:GetChild("tex_rewards_max").text = d2ad(data.max_value) + obj:GetChild("tex_rewards").text = data.cur_value + obj:GetChild("tex_rewards_max").text = 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/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml index 49a849a6..1ab91411 100644 --- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml +++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml @@ -1,6 +1,6 @@ - + @@ -38,13 +38,13 @@