From 613a28ca025944202b23d3d94c6148747c85a071 Mon Sep 17 00:00:00 2001 From: mxj <2116869896@qq.com> Date: Mon, 13 Jul 2026 21:03:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=AF=94=E8=B5=9B=E5=88=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=88=86=E6=88=90=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/NewGroupController.lua | 25 ++ lua_probject/base_project/Game/Protocol.lua | 5 + .../MngView/GroupMngMatchFagListView.lua | 186 ++++++------ .../MngView/GroupMngMemberListView.lua | 199 ++++++------- .../MngView/GroupMngPartnerListView.lua | 267 ++++++++++-------- wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info | 8 - wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info | 3 + wb_new_ui/.objs/workspace.json | 18 +- .../NewGroup/mgr/View_GroupMatchFagList.xml | 14 +- .../NewGroup/mgr/View_GroupMemberList.xml | 4 +- .../NewGroup/mgr/View_GroupPartnerList.xml | 8 +- .../mgr/component/member/item_member.xml | 18 +- .../member/partner/item_mng_partner.xml | 11 +- .../ART/base/newgroup/ui/NewGroup_fui.bytes | Bin 363966 -> 363859 bytes 14 files changed, 396 insertions(+), 370 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 95432fd6..583f4883 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1513,4 +1513,29 @@ function M:FG_UpdatePlay(group_id, game_id, config_data, name, hpData, hpOnOff, _client:send(Protocol.WEB_FG_UPDATE_PLAY, _data, function(res) callback(res) end) +end + +function M:FG_GetUnderMembers(groupId, limit, num, tagId, callback) + local _client = ControllerManager.GroupClient + local _data = {} + _data.id = groupId + _data.limit = limit + _data.num = num + _data.tagId = tagId + _client:send(Protocol.GET_UNDER_MEMBERS, _data, function(res) + callback(res) + end) +end + +function M:FG_GetOptHp(groupId, limit, num, tagId,optType, callback) + local _client = ControllerManager.GroupClient + local _data = {} + _data.id = groupId + _data.limit = limit + _data.num = num + _data.tagId = tagId + _data.optType = optType + _client:send(Protocol.Get_Opt_Hp, _data, function(res) + callback(res) + end) end \ No newline at end of file diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index dc073a72..5f5dcae4 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -266,6 +266,11 @@ Protocol = { GET_BANK_HP = "group/get_bank_hp", --获取银行信息 TAKE_BANK_HP = "group/take_bank_hp", SAVE_BANK_HP = "group/save_bake_hp", +-------------- group-static--------------------- + GET_UNDER_MEMBERS = "group/static/get_under_members", + Get_Opt_Hp = "group/static/get_opt_hp", +-------------- group-static--------------------- +--- -------------- group-log--------------------- -- 获取奖励日志 WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua index 0f24ce8b..4de2ed1d 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua @@ -20,25 +20,21 @@ function GroupMngMatchFagListView.new(group_id) end function M:initData() - self.fag_result_data = {} self.fag_data = {} - if self._view:GetController("page").selectedIndex < 2 then - self:GetFagData(0) - else - self:GetMngFagInfo() - end + if self._view:GetController("page").selectedIndex < 2 then + self:GetFagData(0) + else + self:GetMngFagInfo() + end local group = DataManager.groups:get(self.group_id) if group.lev < 3 then - self:GetHpStatistic() + self:GetHpStatistic() end end function M:FillView() - - - self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupMatchFagList") local group = DataManager.groups:get(self.group_id) if group.lev < 3 then @@ -48,7 +44,7 @@ function M:FillView() self.lst_fag = self._view:GetChild("lst_fag") self.lst_fag:SetVirtual() self.lst_fag.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) + self:OnRenderItem(index, obj) end self.lst_fag.scrollPane.onPullUpRelease:Set(function() self:GetFagData(self.lst_fag.numItems) @@ -56,7 +52,7 @@ function M:FillView() self.lst_fag_result = self._view:GetChild("lst_fag_result") self.lst_fag_result:SetVirtual() self.lst_fag_result.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) + self:OnRenderItem(index, obj) end self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() self:GetFagData(self.lst_fag_result.numItems) @@ -64,24 +60,23 @@ function M:FillView() -- 切换页面事件，1,2页为上下分，3页是管理员总计 self._view:GetController("page").onChanged:Set(function() - if self._view:GetController("page").selectedIndex < 2 then - if self._view:GetController("search").selectedIndex == 0 then + if self._view:GetController("page").selectedIndex < 2 then + if self._view:GetController("search").selectedIndex == 0 then self.quary_id = 0 self.query_nick = "" - self.fag_data = {} - self:GetFagData(0) - else - + self.fag_data = {} + self:GetFagData(0) + else self.quary_id = 0 self.query_nick = "" - self.fag_result_data = {} - self:GetFagData(0) - end - else - self:GetMngFagInfo() - end + self.fag_result_data = {} + self:GetFagData(0) + end + else + self:GetMngFagInfo() + end end) self._view:GetChild("btn_search").onClick:Set(function() @@ -94,13 +89,14 @@ function M:FillView() self:GetFagData(0) end) self._view:GetChild("btn_back").onClick:Set(function() - self.quary_id = 0 + self.quary_id = 0 self.query_nick = "" end) - self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, function() + self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), + self._view:GetChild("btn_date2"), -308, 0, function() self:GetMngFagInfo() - end) + end) end -- 获取上下分数据 @@ -109,74 +105,82 @@ function M:GetFagData(index) qid = self.quary_id or 0 qName = self.query_nick or "" -- 重新获取数据时，清空数据列表 - if index == 0 then + if index == 0 then if qid == 0 then self.fag_data = {} else self.fag_result_data = {} end - end - ViewUtil.ShowModalWait(nil) + end + ViewUtil.ShowModalWait(nil) --type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分 - local type = self._view:GetController("page").selectedIndex + 1 + local type = self._view:GetController("page").selectedIndex + 1 local group = DataManager.groups:get(self.group_id) if group.lev == 3 then type = type + 2 end local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMngHpLog(self.group_id, index, num, type, qid, qName, function(res) - ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") - else - if res.Data.hp_logs ~= nil then - local data = res.Data.hp_logs - -- if #data == 0 then return end - local local_data = self.fag_data - local lst = self.lst_fag - if qid ~= 0 or self.query_nick ~= "" then - local_data = self.fag_result_data - lst = self.lst_fag_result - self._view:GetController("search").selectedIndex = 1 - else - self._view:GetController("search").selectedIndex = 0 - end - for i = 1, #data do - local_data[#local_data + 1] = data[i] - end - lst.numItems = #local_data + fgCtr:FG_GetOptHp( + self.group_id, + index, + 6, + -1, + 0, + function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return end - end - end) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") + else + printlog("----------------2222222222---------") + pt(res.Data ) + if res.Data.members ~= nil then + local data = res.Data.members + -- if #data == 0 then return end + local local_data = self.fag_data + local lst = self.lst_fag + if qid ~= 0 or self.query_nick ~= "" then + local_data = self.fag_result_data + lst = self.lst_fag_result + self._view:GetController("search").selectedIndex = 1 + else + self._view:GetController("search").selectedIndex = 0 + end + for i = 1, #data do + local_data[#local_data + 1] = data[i] + end + lst.numItems = #local_data + end + end + end) end -- 获取体力值统计 function M:GetHpStatistic() - -- ViewUtil.ShowModalWait(nil, "正在获取数据") - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMngHpStatistic(self.group_id, function(res) + -- ViewUtil.ShowModalWait(nil, "正在获取数据") + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetMngHpStatistic(self.group_id, function(res) -- ViewUtil.CloseModalWait() if self._is_destroy then return end - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") else - self._view:GetChild("tex_yd_cost").text = d2ad(res.Data.last_hp_cost) - self._view:GetChild("tex_td_cost").text = d2ad(res.Data.hp_cost) - self._view:GetChild("tex_add").text = d2ad(res.Data.hp_upper) - self._view:GetChild("tex_minus").text = d2ad(res.Data.hp_sub) + self._view:GetChild("tex_yd_cost").text = d2ad(res.Data.last_hp_cost) + self._view:GetChild("tex_td_cost").text = d2ad(res.Data.hp_cost) + self._view:GetChild("tex_add").text = d2ad(res.Data.hp_upper) + self._view:GetChild("tex_minus").text = d2ad(res.Data.hp_sub) end - end) + end) end -- 获取管理员总计/合伙人总计 function M:GetMngFagInfo() - ViewUtil.ShowModalWait(nil) + ViewUtil.ShowModalWait(nil) local begin_time, end_time = self.time_panel1:GetDate() local group = DataManager.groups:get(self.group_id) local type = group.lev < 3 and 1 or 2 @@ -186,44 +190,44 @@ function M:GetMngFagInfo() if self._is_destroy then return end - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败") else - local add_count = 0 - local minus_count = 0 - local lst_fag_info = self._view:GetChild("lst_mgr_data") - lst_fag_info:RemoveChildrenToPool() - for i = 1, #res.Data.infos do - local data = res.Data.infos[i] - local item = lst_fag_info:AddItemFromPool() - item:GetChild("tex_mgr").text = not data.lev and "合伙人" or (data.lev == 1 and "盟主" or "副盟主") - item:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) - item:GetChild("tex_add").text = d2ad(data.hp_upper) - item:GetChild("tex_minus").text = d2ad(data.hp_sub) - add_count = add_count + data.hp_upper - minus_count = minus_count + data.hp_sub - end - self._view:GetChild("tex_add2").text = d2ad(add_count) - self._view:GetChild("tex_minus2").text = d2ad(minus_count) + local add_count = 0 + local minus_count = 0 + local lst_fag_info = self._view:GetChild("lst_mgr_data") + lst_fag_info:RemoveChildrenToPool() + for i = 1, #res.Data.infos do + local data = res.Data.infos[i] + local item = lst_fag_info:AddItemFromPool() + item:GetChild("tex_mgr").text = not data.lev and "合伙人" or (data.lev == 1 and "盟主" or "副盟主") + item:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) + item:GetChild("tex_add").text = d2ad(data.hp_upper) + item:GetChild("tex_minus").text = d2ad(data.hp_sub) + add_count = add_count + data.hp_upper + minus_count = minus_count + data.hp_sub + end + self._view:GetChild("tex_add2").text = d2ad(add_count) + self._view:GetChild("tex_minus2").text = d2ad(minus_count) end end) end -- 填充对象 function M:OnRenderItem(index, obj) - local local_data = (self.quary_id == 0 and self.query_nick == "" ) and self.fag_data or self.fag_result_data + local local_data = (self.quary_id == 0 and self.query_nick == "") and self.fag_data or self.fag_result_data local rdata = local_data[index + 1] local num = d2ad(rdata.hp) obj:GetChild("tex_mgr_name").text = ViewUtil.stringEllipsis(rdata.m_nick) obj:GetChild("tex_mgr_id").text = rdata.mgr_id obj:GetChild("tex_obj_name").text = ViewUtil.stringEllipsis(rdata.t_nick) obj:GetChild("tex_id").text = rdata.uid - obj:GetChild("tex_num").text = num >= 0 and "+".. num or num - obj:GetController("add").selectedIndex = num >=0 and 1 or 0 + obj:GetChild("tex_num").text = num >= 0 and "+" .. num or num + obj:GetController("add").selectedIndex = num >= 0 and 1 or 0 obj:GetChild("tex_left").text = d2ad(rdata.cur_hp) - obj:GetChild("tex_reason_name_id").text = "给"..ViewUtil.stringEllipsis(rdata.t_nick).. - "(ID:"..rdata.uid..")增加\n"..num.."比赛分" - obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) + obj:GetChild("tex_reason_name_id").text = "给" .. ViewUtil.stringEllipsis(rdata.t_nick) .. + "(ID:" .. rdata.uid .. ")增加\n" .. num .. "比赛分" + obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M", rdata.time) end -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua index b8cb4224..7ab14500 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua @@ -4,8 +4,8 @@ local GroupMemberFagLogView = import('.GroupMemberFagLogView') local GroupSetPermissionView = import('.GroupSetPermissionView') local GroupBanSameTableView = import('.GroupBanSameTableView') local GroupMemberOperateView = import('.GroupMemberOperateView') -local GroupAddMemberInfoView=import('.GroupAddMemberInfoView') -local GroupSetUpTeamAlertSystemView=import('..GroupSetUpTeamAlertSystemView') +local GroupAddMemberInfoView = import('.GroupAddMemberInfoView') +local GroupSetUpTeamAlertSystemView = import('..GroupSetUpTeamAlertSystemView') local MngPermission = import('.MngPermission') @@ -20,6 +20,7 @@ function GroupMngMemberListView.new(group_id, blur_view) self.class = 'GroupMngMemberListView' self.group_id = group_id self.member_data = {} + self.total_data = {} self:FillView() return self end @@ -58,6 +59,7 @@ function M:FillView() -- 初始化成员列表 self.lst_member = self._view:GetChild('lst_member') self.lst_member:SetVirtual() + self.lst_member.itemRenderer = function(index, obj) self:OnRenderItem(index, obj) end @@ -67,18 +69,23 @@ function M:FillView() self:GetMemberData(self.lst_member.numItems) end ) - local btn_detail1 = self._view:GetChild("bth_SetUpTeamAlertSystem") + local btn_detail1 = self._view:GetChild("bth_SetUpTeamAlertSystem") -- 【新增】判断按钮是否存在 if btn_detail1 then btn_detail1.onClick:Set(function() - local gniv1 = GroupSetUpTeamAlertSystemView.new(self.group_id) - gniv1:Show() + local gniv1 = GroupSetUpTeamAlertSystemView.new(self.group_id) + gniv1:Show() end) end - --local n50=self._view:GetChild('n50') - --print(n50) - --n50.displayObject.gameObject.transform.localPosition.x=214 - --print(n50.displayObject.gameObject.transform.localPosition.x) + + + + + + --local n50=self._view:GetChild('n50') + --print(n50) + --n50.displayObject.gameObject.transform.localPosition.x=214 + --print(n50.displayObject.gameObject.transform.localPosition.x) -- 搜索玩家 local ctr_search = self._view:GetController('search') self._view:GetChild('btn_search').onClick:Set( @@ -92,10 +99,14 @@ function M:FillView() return end qid = tonumber(text) or 0 + printlog("sssssssssssssssaaaaaaaaaaaaaa", qid) + qnick = text local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_FindMember( + fgCtr:FG_GetUnderMembers( self.group_id, + 0, + 6, qid, function(res) ViewUtil.CloseModalWait() @@ -105,14 +116,14 @@ function M:FillView() if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') else - self._view:GetChild('tex_id').text = '' + ctr_search.selectedIndex = 1 local item_result = self._view:GetChild('lst_member_find') item_result:RemoveChildrenToPool() for j = 1, #res.Data.members do - local tem = item_result:AddItemFromPool() - self:FillItem(tem, res.Data.members[j], true) + local tem = item_result:AddItemFromPool() + self:FillItem(tem, res.Data.members[j], true) end end end, @@ -157,7 +168,7 @@ function M:FillView() function(response) ViewUtil.CloseModalWait() if (response.ReturnCode and response.ReturnCode == 0) then - GroupAddMemberInfoView.new(self.group_id,tonumber(self._texnum_str)):SetAddMember(response.Data) + GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data) self:ClearNumTex() --ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1) else @@ -180,9 +191,6 @@ function M:FillView() self:initData() end ) - - - end -- 快速访问 @@ -193,8 +201,6 @@ end -- 获取成员数据 function M:GetMemberData(index) - --print("11111111111111111111") - --print(debug.traceback()) local group = DataManager.groups:get(self.group_id) if index == 0 then group:clearMember() @@ -202,22 +208,38 @@ function M:GetMemberData(index) ViewUtil.ShowModalWait(nil) local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GroupMembers11( + fgCtr:FG_GetUnderMembers( self.group_id, index, 6, - false, - 1, + -1, function(res) ViewUtil.CloseModalWait() if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') else - self.member_data = group.members - self.lst_member.numItems = group.member_num + local newMembers = res.Data.members + + -- 实现先清空，后拼接逻辑 if index == 0 then - self._view:GetChild('tex_memb_num').text = res.Data.member_num - self._view:GetChild('tex_total_hp').text = d2ad(res.Data.hp_num1) + -- 第一页：清空旧数据，直接赋值新数据 + self.member_data = newMembers + else + -- 加载更多：将新数据拼接到现有数据后面 + for i = 1, #newMembers do + table.insert(self.member_data, newMembers[i]) + end + end + + self.lst_member.numItems = #self.member_data + + self.total_data = res.Data.total + local total = self.total_data[1] + if total then + local tex_name_hp = self._view:GetChild('tex_name_hp') + tex_name_hp.text = total.sumHp + local tex_total_hp = self._view:GetChild('tex_total_hp') + tex_total_hp.text = total.t_hp1 end end end @@ -225,48 +247,48 @@ function M:GetMemberData(index) end -- 修改体力值 -local function __change_fag(gid, pid, is_add, cur_hp,member, callback) - +local function __change_fag(gid, pid, is_add, cur_hp, member, callback) local gniv = GroupNumberInputView.new( - member, - function(num) - num = ad2d((is_add and num or -num)) - ViewUtil.ShowModalWait() - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_ChangeFag( - gid, - pid, - num, - - function(res1) - - ViewUtil.CloseModalWait() - -- if gniv._is_destroy then - -- return - -- end - if (res1.ReturnCode == 0) then - callback(res1.Data) - else - ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败！') + member, + function(num) + num = ad2d((is_add and num or -num)) + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_ChangeFag( + gid, + pid, + num, + + function(res1) + ViewUtil.CloseModalWait() + -- if gniv._is_destroy then + -- return + -- end + if (res1.ReturnCode == 0) then + callback(res1.Data) + else + ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败！') + end end - end - - ) - -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str - end, - is_add and 1 or 2, - cur_hp and d2ad(cur_hp) or nil - ) + + ) + -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str + end, + is_add and 1 or 2, + cur_hp and d2ad(cur_hp) or nil + ) gniv:Show() end -- 填充成员对象 function M:FillItem(obj, member, refresh) local group = DataManager.groups:get(self.group_id) + obj:GetChild('tex_name').text = ViewUtil.stringEllipsis(member.nick) obj:GetChild('btn_head').icon = 'ui://Common/Head0' ImageLoad.Load(member.portrait, obj:GetChild('btn_head')._iconObject, self.class) + -- obj.data = member.id -- 显示玩家标签，合伙人、管理员 local ctr_type = obj:GetController('type') @@ -282,29 +304,15 @@ function M:FillItem(obj, member, refresh) local tex_fag = obj:GetChild('tex_fag') tex_fag.text = d2ad(member.hp) + local tex_Safecompartment = obj:GetChild('tex_Safecompartment') + tex_Safecompartment.text = d2ad(member.bank_hp) + + local tex_Numberofsuboinates = obj:GetChild('tex_Numberofsuboinates') + tex_Numberofsuboinates.text = member.underCount + + + obj:GetChild('tex_id').text = '' .. member.uid - --obj:GetChild("tex_cost_count").text = d2ad(member.last_hp_cost) - - -- if member.online == 1 then - -- obj:GetChild('tex_last_login').text = '在线' - -- else - -- if member.last_time ~= 0 then - -- obj:GetChild('tex_last_login').text = '最近登录\n' .. os.date('%Y/%m/%d', member.last_time) - -- else - -- obj:GetChild('tex_last_login').text = '加入时间\n' .. os.date('%Y/%m/%d', member.join_time) - -- end - -- end - - - -- --上级 - -- obj:GetChild('tex_shangjiName').text=member.parentId_nick or "" - -- if member.parentId==0 then - -- obj:GetChild('tex_shangjiID').text="" - -- else - -- obj:GetChild('tex_shangjiID').text=member.parentId - -- end - - local perm_array = MngPermission.getPermData(group.permission) -- 体力值操作按钮事件 if group.lev < 3 or member.parentId == DataManager.SelfUser.account_id then @@ -320,7 +328,6 @@ function M:FillItem(obj, member, refresh) local mp = group:getMember(DataManager.SelfUser.account_id) obj:GetChild('btn_fag_add').onClick:Set( function() - if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then return end @@ -379,43 +386,11 @@ function M:FillItem(obj, member, refresh) ) end ) - - -- obj:GetChild('btn_score_detail').onClick:Set( - -- function() - -- local mflv = GroupMemberFagLogView.new(self.group_id, member) - -- 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.member_data - -- self._view:GetController('search').selectedIndex = 0 - -- else - -- self.lst_member.numItems = self.lst_member.numItems - -- if refresh then - -- self:FillItem(obj, member) - -- end - -- end - -- end - -- ) - -- mflv:Show() - -- end - -- ) - end function M:OnRenderItem(index, obj) local member = self.member_data[index + 1] - + if member then self:FillItem(obj, member) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua index 096f73f8..ca014e16 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua @@ -19,24 +19,25 @@ function GroupMngPartnerListView.new(gid, blur_view) self.group_id = gid self.blur_view = blur_view self.partner_data = {} + self.total_data = {} self:InitView() return self end function M:initData() --self._view.visible = true - self:GetPartnerData(0) + self:GetPartnerData(0) end function M:InitView() self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupPartnerList") - + -- 初始化合伙人列表 self.lst_partner = self._view:GetChild("lst_partner") - self.lst_partner:SetVirtual() + self.lst_partner:SetVirtual() self.lst_partner.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) - end + self:OnRenderItem(index, obj) + end self.lst_partner.scrollPane.onPullUpRelease:Set(function() self:GetPartnerData(self.lst_partner.numItems) end) @@ -44,14 +45,14 @@ function M:InitView() local btn_search = self._view:GetChild("btn_search") btn_search.onClick:Set(function() local text = self._view:GetChild("tex_id").text - local query_id = tonumber(text) or 0 - local query_nick = text + local query_id = tonumber(text) or 0 + local query_nick = text self._view:GetChild("tex_id").text = "" - self:QueryPartnerData(query_id, query_nick) + self:QueryPartnerData(query_id, query_nick) end) local btn_back = self._view:GetChild("btn_back") btn_back.onClick:Set(function() - self._view:GetController("search").selectedIndex = 0 + self._view:GetController("search").selectedIndex = 0 end) @@ -60,15 +61,14 @@ function M:InitView() self.tex_num = self._view:GetChild("tex_num") self:ClearNumTex() - - for i = 0 ,9 do - local obj = self._view:GetChild("btn_"..i) - obj.onClick:Add(handler(self , self.OnNumButtonAction)) + + for i = 0, 9 do + local obj = self._view:GetChild("btn_" .. i) + obj.onClick:Add(handler(self, self.OnNumButtonAction)) i = i + 1 end local btn_ok = self._view:GetChild("btn_ok") btn_ok.onClick:Set(function() - ViewUtil.ShowModalWait(nil) local qid = tonumber(self._view:GetChild("tex_num").text) if not qid then @@ -82,22 +82,21 @@ function M:InitView() if self._is_destroy then return end - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！") else - local member = res.Data if member.parentId ~= 0 and member.parentId ~= DataManager.SelfUser.account_id then ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！") - return + return end if member.partnerLev > 0 then ViewUtil.ErrorTip(res.ReturnCode, "该玩家已经是代理！") return end - - local mflv = GroupMngAddPartner.new(self.group_id, member,function () + + local mflv = GroupMngAddPartner.new(self.group_id, member, function() self:GetPartnerData(self.lst_partner.numItems) self._view:GetController("page").selectedIndex = 0 end) @@ -106,7 +105,7 @@ function M:InitView() end) end) local btn_del = self._view:GetChild("btn_del") - btn_del.onClick:Add(handler(self , self.OnNumButtonAction)) + btn_del.onClick:Add(handler(self, self.OnNumButtonAction)) end function M:ClearNumTex() @@ -116,88 +115,102 @@ function M:ClearNumTex() end function M:OnNumButtonAction(context) - local typer = string.sub(context.sender.name ,5) + local typer = string.sub(context.sender.name, 5) if typer == "del" then - if (self._currenIndex > 0) then + if (self._currenIndex > 0) then self._currenIndex = self._currenIndex - 1 - self._texnum_str = string.sub(self._texnum_str,0,self._currenIndex) + self._texnum_str = string.sub(self._texnum_str, 0, self._currenIndex) self.tex_num.text = self._texnum_str end else if (self._currenIndex < 6) then - self._currenIndex = self._currenIndex + 1 self._texnum_str = self._texnum_str .. typer self.tex_num.text = self._texnum_str - end end end - -- 获取合伙人数据 -function M:GetPartnerData(index,callback) - - local group = DataManager.groups:get(self.group_id) - if index == 0 then - self.partner_data = {} - end - ViewUtil.ShowModalWait(nil) +function M:GetPartnerData(index, callback) + local group = DataManager.groups:get(self.group_id) + if index == 0 then + self.partner_data = {} + end + ViewUtil.ShowModalWait(nil) local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetPartnerList(self.group_id, 0, index, 10, function(res) + fgCtr:FG_GetUnderMembers( + self.group_id, + index, + 6, + -1, + function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败") + else + local newMembers = res.Data.members + + -- 实现先清空，后拼接逻辑 + if index == 0 then + -- 第一页：清空旧数据，直接赋值新数据 + self.partner_data = newMembers + else + -- 加载更多：将新数据拼接到现有数据后面 + for i = 1, #newMembers do + table.insert(self.partner_data, newMembers[i]) + end + end + self.lst_partner.numItems = #self.partner_data - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败") - else - local partners = res.Data.members - for i = 1, #partners do - self.partner_data[#self.partner_data + 1] = partners[i] + self.total_data = res.Data.total + local total = self.total_data[1] + if total then + local tex_name_hp = self._view:GetChild('tex_name_hp') + tex_name_hp.text = total.sumHp + local tex_total_hp = self._view:GetChild('tex_total_hp') + tex_total_hp.text = total.t_hp1 + end end - self.lst_partner.numItems = #self.partner_data - end - end) + end) end -- 获取合伙人数据 -function M:QueryPartnerData(query_id,query_nick) - +function M:QueryPartnerData(query_id, query_nick) query_nick = query_nick or "" query_id = query_id or 0 local group = DataManager.groups:get(self.group_id) - + ViewUtil.ShowModalWait(nil) local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_QueryPartnerList(self.group_id, query_id, query_nick, function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败") else - if res.Data.members ~= nil and #res.Data.members > 0 then self._view:GetController("search").selectedIndex = 1 local lst_partner_search = self._view:GetChild("lst_partner_search") lst_partner_search:RemoveChildrenToPool() for i = 1, #res.Data.members do local tem = lst_partner_search:AddItemFromPool() - self:FillItem(tem,res.Data.members[i]) + self:FillItem(tem, res.Data.members[i]) end else ViewUtil.ErrorTip(res.ReturnCode, "找不到指定的玩家") - end + end end end) end -- 管理员权限 local MngPermissionList = { - DeleteMember = 1,-- 删除成员 - AddMember = 2,--添加成员 - SetFag = 3,--设置体力值 - BanPlaying = 4,--禁止游戏 - BanSameTable = 5--禁止同桌 + DeleteMember = 1, -- 删除成员 + AddMember = 2, --添加成员 + SetFag = 3, --设置体力值 + BanPlaying = 4, --禁止游戏 + BanSameTable = 5 --禁止同桌 } local function CheckPermission(lev, permission) if lev == 2 and not permission then @@ -221,10 +234,10 @@ local function __change_fag(gid, pid, is_add, cur_hp, callback) if (res1.ReturnCode == 0) then callback(res1.Data) else - ViewUtil.ErrorTip(res1.ReturnCode,"更改积分失败！") + ViewUtil.ErrorTip(res1.ReturnCode, "更改积分失败！") end end) - -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str + -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str end, is_add and 1 or 2, cur_hp and d2ad(cur_hp) or nil) gniv:Show() end @@ -243,7 +256,6 @@ end -- 填充合伙人对象 function M:FillItem(obj, partner) - local group = DataManager.groups:get(self.group_id) local perm_array = MngPermission.getPermData(group.permission) @@ -252,62 +264,80 @@ function M:FillItem(obj, partner) obj:GetChild("btn_head").icon = "ui://Common/Head0" ImageLoad.Load(partner.portrait, obj:GetChild("btn_head")._iconObject, self.class) -- 体力值操作按钮事件 - if group.lev == 1 or group.lev < 3 or (partner.uid ~= DataManager.SelfUser.account_id and group.partnerLev > 0) then - obj:GetController("fag").selectedIndex = 1 + -- if group.lev == 1 or group.lev < 3 or (partner.uid ~= DataManager.SelfUser.account_id and group.partnerLev > 0) then + -- obj:GetController("fag").selectedIndex = 1 + -- else + -- obj:GetController("fag").selectedIndex = 0 + -- end + + -- 显示玩家标签，合伙人、管理员 + local ctr_type = obj:GetController('type') + if partner.lev < 3 then + ctr_type.selectedIndex = partner.lev + elseif partner.partnerLev ~= 0 then + ctr_type.selectedIndex = 3 else - obj:GetController("fag").selectedIndex = 0 + ctr_type.selectedIndex = 0 end - local fgCtr = ControllerManager.GetController(NewGroupController) - local p = group:getMember(partner.uid) - local mp = group:getMember(DataManager.SelfUser.account_id) - obj:GetChild("btn_fag_add").onClick:Set(function() - if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then - return - end - __change_fag(self.group_id, partner.uid, true, nil, function(data) - local hp = data.hp - partner.hp = hp - if p then - p.hp = hp - if mp and mp ~= p then - local mhp = data.mhp - mp.hp = mhp - end - end - self.lst_partner.numItems = #self.partner_data - -- 搜索出的玩家显示 - if self._view:GetController("search").selectedIndex == 1 then - obj:GetChild("tex_fag").text = d2ad(hp) - end - end) - end) - obj:GetChild("btn_fag_minus").onClick:Set(function() - - if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then - return - end - __change_fag(self.group_id, partner.uid, false, partner.hp, function(data) - local hp = data.hp - partner.hp = hp - if p then - p.hp = hp - if mp and mp ~= p then - local mhp = data.mhp - mp.hp = mhp - end - end - self.lst_partner.numItems = #self.partner_data - -- 搜索出的玩家显示 - if self._view:GetController("search").selectedIndex == 1 then - obj:GetChild("tex_fag").text = d2ad(hp) - end - end) - end) - obj:GetChild("tex_fag").text = d2ad(partner.hp) - - obj:GetChild("tex_member_count").text = ""..partner.total + + local tex_Safecompartment = obj:GetChild('tex_Safecompartment') + tex_Safecompartment.text = d2ad(partner.bank_hp) + + + local tex_Numberofsuboinates = obj:GetChild('tex_Numberofsuboinates') + tex_Numberofsuboinates.text = partner.underCount + + + + + -- local fgCtr = ControllerManager.GetController(NewGroupController) + -- local p = group:getMember(partner.uid) + -- local mp = group:getMember(DataManager.SelfUser.account_id) + -- obj:GetChild("btn_fag_add").onClick:Set(function() + -- if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then + -- return + -- end + -- __change_fag(self.group_id, partner.uid, true, nil, function(data) + -- local hp = data.hp + -- partner.hp = hp + -- if p then + -- p.hp = hp + -- if mp and mp ~= p then + -- local mhp = data.mhp + -- mp.hp = mhp + -- end + -- end + -- self.lst_partner.numItems = #self.partner_data + -- -- 搜索出的玩家显示 + -- if self._view:GetController("search").selectedIndex == 1 then + -- obj:GetChild("tex_fag").text = d2ad(hp) + -- end + -- end) + -- end) + -- obj:GetChild("btn_fag_minus").onClick:Set(function() + -- if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then + -- return + -- end + -- __change_fag(self.group_id, partner.uid, false, partner.hp, function(data) + -- local hp = data.hp + -- partner.hp = hp + -- if p then + -- p.hp = hp + -- if mp and mp ~= p then + -- local mhp = data.mhp + -- mp.hp = mhp + -- end + -- end + -- self.lst_partner.numItems = #self.partner_data + -- -- 搜索出的玩家显示 + -- if self._view:GetController("search").selectedIndex == 1 then + -- obj:GetChild("tex_fag").text = d2ad(hp) + -- end + -- end) + -- end) + obj:GetChild("btn_percent").onClick:Set(function() @@ -328,16 +358,11 @@ function M:FillItem(obj, partner) local btnDetail = obj:GetChild("btn_detail") --btnDetail.visible = partner.total > 0 btnDetail.onClick:Set(function() - local GroupMngPartnerListView2 = GroupMngPartnerListView2.new(self.group_id,partner.uid) + local GroupMngPartnerListView2 = GroupMngPartnerListView2.new(self.group_id, partner.uid) GroupMngPartnerListView2:Show() end) - - end - - - -- 列表对象填充 function M:OnRenderItem(index, obj) local partner = self.partner_data[index + 1] @@ -346,8 +371,8 @@ end -- 显示合伙人成员列表 function M:ShowPartnerMemberList(partner_id) - local pmlv = GroupPartnerMemberListView.new(self.group_id, partner_id) - pmlv:Show() + local pmlv = GroupPartnerMemberListView.new(self.group_id, partner_id) + pmlv:Show() end -- 显示合伙人奖励 @@ -356,4 +381,4 @@ function M:ShowPartnerRewards(partner_id, partnerLev) prv:Show() end -return M \ No newline at end of file +return M diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info index d3641f96..22178475 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info @@ -1,11 +1,3 @@ { - "objectStatus": { - "n44_rpaz": { - "collapsed": true - }, - "n26_kwi0": { - "collapsed": true - } - }, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info index c70eb7f1..474187e0 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info @@ -3,6 +3,9 @@ "n136_ex3l": { "hidden": true }, + "n129_omkm": { + "hidden": true + }, "n84_kwi0": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index f69512d8..6f534d34 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,20 +2,20 @@ "libview.firstColumnWidth": 398, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://3z9lj55vjokmft", - "ui://3n2top74kpmgq4", - "ui://egnzysm7ffp36a", - "ui://ypulwxjhl9mn14", - "ui://4ismcalcndxj36", - "ui://442j0uepygxga", - "ui://niy3ldiwl9mn14" + "ui://m7iejg46kwi0hkr", + "ui://m7iejg46cioeho9", + "ui://m7iejg46tkv17ii9", + "ui://m7iejg46tkv17iia" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://niy3ldiwl9mn14", + "doc.activeDoc": "ui://m7iejg46tkv17ii9", "libview.twoColumn": false, - "libview.expandedNodes": [], + "libview.expandedNodes": [ + "m7iejg46", + "/" + ], "auxline1": true, "snapToGrid": true, "test.orientation": "landscape", diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMatchFagList.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMatchFagList.xml index 762fcb9e..3206423a 100644 --- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMatchFagList.xml +++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMatchFagList.xml @@ -1,9 +1,9 @@ - + - + @@ -40,7 +40,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -124,10 +124,10 @@ -