diff --git a/lua_probject/base_project/Game/View/Common/BaseWindow.lua b/lua_probject/base_project/Game/View/Common/BaseWindow.lua index e44489b0..ac29122c 100644 --- a/lua_probject/base_project/Game/View/Common/BaseWindow.lua +++ b/lua_probject/base_project/Game/View/Common/BaseWindow.lua @@ -58,7 +58,7 @@ function M:init(url) local contentPane = self._root_view:GetChild("contentPane") local ctr_hide_bg = self._root_view:GetController("hide_bg") if self._anim_pop ~= 0 then - ctr_hide_bg.selectedIndex = 1 + ctr_hide_bg.selectedIndex = 0 PopPanel = contentPane:GetChild("PopPanel") else ctr_hide_bg.selectedIndex = 0 @@ -84,6 +84,8 @@ function M:init(url) if self._full then local offset = get_offset(self._full_offset) + self._root_view.height = GRoot.inst.height + self._root_view.width = GRoot.inst.width if self._anim_pop == 0 then self._view:AddRelation(contentPane, RelationType.Size) contentPane:AddChild(self._view) diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 8b1007ea..84c6282e 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -7,6 +7,7 @@ local RoomItem = import('.RoomItem') local FGInvitedMsgView = import('.FGInvitedMsgView') local GroupMemberFagLogView = import('./MngView/GroupMemberFagLogView') local GroupMngGameListView = import(".MngView/GroupMngGameListView") +local GroupMngGroupSkin = import(".MngView/GroupMngGroupSkin") local GroupMngFagPackView = import('.GroupMngFagPackView') local GroupMailView = import('.GroupMailView') local GroupSelectPlayView = import('.GroupSelectPlayView') @@ -36,6 +37,8 @@ function GroupInfoView.new(curGroup, fg_info, root_view, groupMainView) -- (是否置顶) self.pinnedPlays = {} + --具体牌桌的ui显示 + local desktopCategorization = 0 self._full = true self._get_data = false @@ -662,7 +665,7 @@ function M:InitRoomInfoView() -- score = score >= 0 and '+' .. score or score -- item:GetController('nega').selectedIndex = p.score >= 0 and 0 or 1 -- item:GetChild('tex_score').text = score - + item:GetChild('tex_score').visible = false ImageLoad.Load(p.portrait, item:GetChild('btn_head')._iconObject, self.class) end @@ -1061,6 +1064,8 @@ end function M:InitView(url) BaseView.InitView(self, url) self._full_offset = false + -- 初始化桌面分类索引，默认为 0 + self.desktopCategorization = self.desktopCategorization or 0 -- __showBG(self._view) -- local btndel = self._view:GetChild("btn_del") @@ -1239,6 +1244,7 @@ function M:InitView(url) self.lst_room = self._view:GetChild('lst_room') self.lst_room:SetVirtual() self.lst_room.itemRenderer = function(index, item) + __fillRoomItem(self, index, item) end self.lst_room.itemProvider = function(index) @@ -1251,9 +1257,35 @@ function M:InitView(url) if not room then return end - -- pt(self.curGroup:getPlay(room.pid)) - -- return ROOM_ITEM[(self.curGroup:getPlay(room.pid).gameId%10)%6+1 ] - return ROOM_ITEM[self.curGroup:getPlay(room.pid).gameType or 1] + -- 获取原始的游戏类型 + local play = self.curGroup:getPlay(room.pid) + local originalGameType = 1 -- 默认值 + if play and play.gameType then + originalGameType = play.gameType + elseif room.color then + -- 如果获取不到 play，尝试使用 room.color 作为备选（根据你原有的逻辑） + originalGameType = room.color + end + + -- 【新增逻辑】：根据 zmIndex (desktopCategorization) 调整 gameType + local zmIndex = self.desktopCategorization or 0 + local finalGameType = originalGameType + + if zmIndex == 1 then + -- 如果是 zmIndex 1，则 gameType + 3 + finalGameType = originalGameType + 3 + else + -- 如果是 zmIndex 0 (或其他)，保持原样 (+0) + finalGameType = originalGameType + 0 + end + -- 返回对应的 UI 资源路径 + -- 注意：请确保 ROOM_ITEM 表中定义了 index 为 finalGameType 的资源 + if ROOM_ITEM[finalGameType] then + return ROOM_ITEM[finalGameType] + else + -- 如果超出范围，返回默认的第一个或最后一个，防止报错 + return ROOM_ITEM[1] + end end self.lst_room.fairyBatching = true @@ -1430,7 +1462,49 @@ function M:InitView(url) end ) end - +-- [新增开始] 处理 btn_guaibi_jiaru 按钮，用于刷新当前牌友圈详情 + local btn_guaibi_jiaru = self._view:GetChild('btn_guaibi_jiaru') + if btn_guaibi_jiaru then + btn_guaibi_jiaru.visible = true -- 确保按钮可见 + + btn_guaibi_jiaru.onClick:Set(function() + -- 显示等待提示 + ViewUtil.ShowModalWait(self._root_view, "刷新牌友圈中...") + + -- 调用控制器获取最新圈子数据 + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupList(function(res) + ViewUtil.CloseModalWait() + + if self._is_destroy then + return + end + + if res.ReturnCode == 0 then + -- 1. 刷新嵌入的 GroupMainView 列表（如果存在） + if self._groupMainView_to_embed and self._groupMainView_to_embed.FillData then + pcall(function() + self._groupMainView_to_embed:FillData() + end) + end + + -- 2. 刷新当前详情页的数据 (可选，取决于“刷新当前牌友圈”的具体定义) + -- 如果只是刷新列表，上面的步骤就够了。 + -- 如果需要刷新当前圈子的房间/玩法信息，可以调用: + self:__loadGroupData() + -- 或者更轻量级的刷新: + -- self:_evtUpdatePlay() + + -- 这里假设主要是刷新列表展示，如需刷新详情可取消下面注释 + -- self:__loadGroupData() + + ViewUtil.ErrorTip(0, "刷新成功") + else + ViewUtil.ErrorTip(res.ReturnCode, '刷新牌友圈失败!') + end + end) + end) + end -- local btn_cancel = self._view:GetChild('node_matching'):GetChild('btn_cancel') -- btn_cancel.onClick:Set( -- function() @@ -1487,6 +1561,41 @@ function M:InitView(url) self._view.visible = false end +-- 全局函数，供 GroupMngGroupSkin 调用 +function UpdateGroupBackground(bgIndex, zmIndex) + local curView = DataManager.SelfUser.cur_group + if curView and curView.class == 'GroupInfoView' then + -- 1. 保存状态到实例变量，方便弹窗读取 + curView.currentBgIndex = bgIndex + local oldZmIndex = curView.desktopCategorization + curView.desktopCategorization = zmIndex + + -- 2. 保存到本地 + PlayerPrefs.SetInt("group_bg_" .. curView.curGroup.id, bgIndex) + PlayerPrefs.SetInt("group_desk_" .. curView.curGroup.id, zmIndex) + -- 如果 zmIndex 发生了变化，需要刷新房间列表以应用新的 itemProvider 逻辑 + if oldZmIndex ~= zmIndex then + if curView.lst_room then + curView.lst_room:RefreshVirtualList() -- 强制刷新列表 UI + end + end + if curView._view and not curView._view.isDisposed then + local bgComponent = curView._view:GetChild("bg_anchor") + if bgComponent then + if bgIndex == 0 then + bgComponent.icon = 'ui://NewGroup/FriendsandFamilyCircle' + elseif bgIndex == 1 then + bgComponent.icon = 'ui://NewGroup/FriendsandFamilyCircle1' + elseif bgIndex == 2 then + bgComponent.icon = 'ui://NewGroup/FriendsandFamilyCircle2' + else + bgComponent.icon = 'ui://NewGroup/FriendsandFamilyCircle3' + end + end + end + end +end + function M:Reconnect() self:__loadGroupData() end @@ -1956,6 +2065,16 @@ function M:__refreshManager() -- self:SetRoomListVisible(false) end ) + local btn_stat = self._view:GetChild('bth_match') + btn_stat.onClick:Set( + function() + if not self.mng_view5 then + self.mng_view5 = GroupManagerView.new(self._root_view, self.curGroup.id, 6) + end + -- self:SetRoomListVisible(false) + self.mng_view5:Show() + end + ) local btn_play = self._view:GetChild('btn_play') @@ -1964,6 +2083,11 @@ function M:__refreshManager() gl_view:Show() -- self:SetRoomListVisible(false) end) + local bth_skin = self._view:GetChild('bth_skin') + bth_skin.onClick:Set(function() + local gl_view_skin = GroupMngGroupSkin.new(self.curGroup.id) + gl_view_skin:Show() + end) local bth_record = self._view:GetChild('bth_record') bth_record.onClick:Set(function() local gl_bth_record = GroupMngPersonStatAloneView.new(self.curGroup.id) @@ -2428,6 +2552,9 @@ function M:Destroy() end if self.mng_view4 then self.mng_view4:Destroy() + end + if self.mng_view5 then + self.mng_view5:Destroy() end DataManager.SelfUser.cur_group = nil if self._tw_notice then 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 7736aacb..f951c1b8 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua @@ -204,31 +204,31 @@ function M:init(url) local pic = member.ban == 1 and "mng_del_ban" or "mng_ban" btn_ban.icon = "ui://NewGroup/" .. pic btn_ban.onClick:Set(function() - -- if not CheckPermission(group.lev, perm_array[MngPermissionList.BanPlaying]) then - -- return - -- end + if not CheckPermission(group.lev, perm_array[MngPermissionList.BanPlaying]) then + return + end - -- local str = member.ban == 1 and "确定恢复娱乐吗？" or "确定禁止娱乐吗？" - -- local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) - -- _curren_msg.onOk:Add(function() - -- ViewUtil.ShowModalWait() - -- local val = 1 - member.ban - -- fgCtr:FG_BanMember(self.group_id, member.uid, val, 1, function(res1) - -- if self._is_destroy then - -- return - -- end - -- ViewUtil.CloseModalWait() - -- if res1.ReturnCode == 0 then - -- member.ban = val - -- pic = member.ban == 1 and "mng_del_ban" or "mng_ban" - -- btn_ban.icon = "ui://NewGroup/" .. pic - -- self.callBack() - -- else - -- ViewUtil.ErrorTip(res1.ReturnCode,"禁止娱乐失败！") - -- end - -- end) - -- end) - -- _curren_msg:Show() + local str = member.ban == 1 and "确定恢复进房吗？" or "确定禁止进房吗？" + local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) + _curren_msg.onOk:Add(function() + ViewUtil.ShowModalWait() + local val = 1 - member.ban + fgCtr:FG_BanMember(self.group_id, member.uid, val, 1, function(res1) + if self._is_destroy then + return + end + ViewUtil.CloseModalWait() + if res1.ReturnCode == 0 then + member.ban = val + pic = member.ban == 1 and "mng_del_ban" or "mng_ban" + btn_ban.icon = "ui://NewGroup/" .. pic + self.callBack() + else + ViewUtil.ErrorTip(res1.ReturnCode,"禁止进房失败！") + end + end) + end) + _curren_msg:Show() end) end @@ -272,49 +272,49 @@ 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 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 group.lev == 1 and member.lev > 1 and member.partnerLev >0 and member.uid ~= DataManager.SelfUser.account_id then - --if false then - local btn_set_mng = lst_mng:AddItemFromPool() - btn_set_mng.icon = "ui://NewGroup/zhengzu" - btn_set_mng.onClick:Set( - function() - ViewUtil.ShowModalWait() - fgCtr:FG_GetBanMemberHB(self.group_id, member.uid, function(res) - ViewUtil.CloseModalWait() - --pt(res) - if res.ReturnCode == 0 then - local diaoduView=GroupSetMemberInfoDiaoduView.new(self.group_id, member.uid) - diaoduView:SetCurrentState(res.Data.group_black+1,res.Data) - else - ViewUtil.ErrorTip(res.ReturnCode,"获取整组调度失败！") - end + -- if group.lev == 1 and member.lev > 1 and member.partnerLev >0 and member.uid ~= DataManager.SelfUser.account_id then + -- --if false then + -- local btn_set_mng = lst_mng:AddItemFromPool() + -- btn_set_mng.icon = "ui://NewGroup/zhengzu" + -- btn_set_mng.onClick:Set( + -- function() + -- ViewUtil.ShowModalWait() + -- fgCtr:FG_GetBanMemberHB(self.group_id, member.uid, function(res) + -- ViewUtil.CloseModalWait() + -- --pt(res) + -- if res.ReturnCode == 0 then + -- local diaoduView=GroupSetMemberInfoDiaoduView.new(self.group_id, member.uid) + -- diaoduView:SetCurrentState(res.Data.group_black+1,res.Data) + -- else + -- ViewUtil.ErrorTip(res.ReturnCode,"获取整组调度失败！") + -- end - end) + -- end) - end) + -- end) - end + -- end @@ -325,7 +325,7 @@ function M:init(url) local pic = member.lev == 2 and "mng_del_mng" or "mng_set_mng" btn_set_mng.icon = "ui://NewGroup/" .. pic btn_set_mng.onClick:Set(function() - local str = member.lev == 3 and "确定设置玩家为副盟主吗？" or "确定取消玩家副盟主身份吗？" + local str = member.lev == 3 and "确定设置玩家为管理吗？" or "确定取消玩家管理吗？" local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) _curren_msg.onOk:Add(function() ViewUtil.ShowModalWait() @@ -345,7 +345,7 @@ function M:init(url) end self:Destroy() else - ViewUtil.ErrorTip(res1.ReturnCode,"设置副群主失败！") + ViewUtil.ErrorTip(res1.ReturnCode,"设置管理失败！") end end) end) @@ -385,58 +385,58 @@ function M:init(url) end) end - if group.lev == 1 and member.lev > 1 and member.partnerLev > 0 then - local btn_set_permission = lst_mng:AddItemFromPool() - btn_set_permission.icon = "ui://NewGroup/mng_set_permission" - btn_set_permission.onClick:Set(function() - local gspv = GroupSetPermissionView.new(self.blur_view, self.group_id, member) - gspv:Show() - end) - end + -- if group.lev == 1 and member.lev > 1 and member.partnerLev > 0 then + -- local btn_set_permission = lst_mng:AddItemFromPool() + -- btn_set_permission.icon = "ui://NewGroup/mng_set_permission" + -- btn_set_permission.onClick:Set(function() + -- local gspv = GroupSetPermissionView.new(self.blur_view, self.group_id, member) + -- gspv:Show() + -- end) + -- end - local btn_fag_info = lst_mng:AddItemFromPool() - btn_fag_info.icon = "ui://NewGroup/mng_fag" - btn_fag_info.onClick:Set(function() - local mflv = GroupMemberFagLogView.new(self.group_id, member) - mflv:Show() - end) + -- local btn_fag_info = lst_mng:AddItemFromPool() + -- btn_fag_info.icon = "ui://NewGroup/mng_fag" + -- btn_fag_info.onClick:Set(function() + -- local mflv = GroupMemberFagLogView.new(self.group_id, member) + -- mflv:Show() + -- end) - if group.lev == 1 and member.partnerLev > 0 and group.type == 2 then - local btn_move = lst_mng:AddItemFromPool() - btn_move.icon = "ui://NewGroup/mng_move" - btn_move.onClick:Set(function() - local gniv = GroupNumberInputView.new(nil, function(num) - local parent_id = tonumber(num) - if parent_id == member.parentId then - ViewUtil.ErrorTip(nil, "已经在该合伙人名下") - return - elseif parent_id == member.id then - ViewUtil.ErrorTip(nil, "目标的上级不能是自己") - return - elseif parent_id == DataManager.SelfUser.account_id then - self:MovePartner(parent_id, member, self._view) - return - end - ViewUtil.ShowModalWait() - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_FindMember(self.group_id, parent_id, function(res) - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.CloseModalWait() - ViewUtil.ErrorTip(res.ReturnCode, "找不到成员") - elseif res.Data.partnerLev == 0 then - ViewUtil.CloseModalWait() - ViewUtil.ErrorTip(res.ReturnCode, "目标不是合伙人") - else - self:MovePartner(parent_id, member, self._view) - end - end) - end, 0, nil, "ui://NewGroup/Win_AddFriend") - gniv:Show() - end) - end + -- if group.lev == 1 and member.partnerLev > 0 and group.type == 2 then + -- local btn_move = lst_mng:AddItemFromPool() + -- btn_move.icon = "ui://NewGroup/mng_move" + -- btn_move.onClick:Set(function() + -- local gniv = GroupNumberInputView.new(nil, function(num) + -- local parent_id = tonumber(num) + -- if parent_id == member.parentId then + -- ViewUtil.ErrorTip(nil, "已经在该合伙人名下") + -- return + -- elseif parent_id == member.id then + -- ViewUtil.ErrorTip(nil, "目标的上级不能是自己") + -- return + -- elseif parent_id == DataManager.SelfUser.account_id then + -- self:MovePartner(parent_id, member, self._view) + -- return + -- end + -- ViewUtil.ShowModalWait() + -- local fgCtr = ControllerManager.GetController(NewGroupController) + -- fgCtr:FG_FindMember(self.group_id, parent_id, function(res) + -- if self._is_destroy then + -- return + -- end + -- if res.ReturnCode ~= 0 then + -- ViewUtil.CloseModalWait() + -- ViewUtil.ErrorTip(res.ReturnCode, "找不到成员") + -- elseif res.Data.partnerLev == 0 then + -- ViewUtil.CloseModalWait() + -- ViewUtil.ErrorTip(res.ReturnCode, "目标不是合伙人") + -- else + -- self:MovePartner(parent_id, member, self._view) + -- end + -- end) + -- end, 0, nil, "ui://NewGroup/Win_AddFriend") + -- gniv:Show() + -- end) + -- end if member.parentId == DataManager.SelfUser.account_id then local btn_set_tag = lst_mng:AddItemFromPool() @@ -451,42 +451,42 @@ function M:init(url) end) end - if group.lev == 1 then - local btn_banplays = lst_mng:AddItemFromPool() - btn_banplays.icon = "ui://NewGroup/mng_ban_plays" - btn_banplays.onClick:Set(function() - local banplays = GroupPartnerBanPlaysView.new(self.group_id,member.uid) - banplays:Show() - end) - end + -- if group.lev == 1 then + -- local btn_banplays = lst_mng:AddItemFromPool() + -- btn_banplays.icon = "ui://NewGroup/mng_ban_plays" + -- btn_banplays.onClick:Set(function() + -- local banplays = GroupPartnerBanPlaysView.new(self.group_id,member.uid) + -- banplays:Show() + -- end) + -- end - if group.lev == 1 then - local btn_qiangzhi = lst_mng:AddItemFromPool() - btn_qiangzhi.icon = "ui://NewGroup/mng_qiangzhi" - btn_qiangzhi.onClick:Set(function() - local msg_tip = MsgWindow.new(self._root_view,"确定全部提取吗?", MsgWindow.MsgMode.OnlyOk) - msg_tip.onOk:Add(function( ... ) - ViewUtil.ShowModalWait() - fgCtr:FG_TakeHp1(self.group_id, member.uid, function(res) - ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "提取失败") - else - ViewUtil.ErrorTip(res.ReturnCode, "提取成功") - self:Destroy() - if self.callBack1 then - self.callBack1() - end - end - end) - msg_tip:Close() - end) - msg_tip:Show() - end) - end + -- if group.lev == 1 then + -- local btn_qiangzhi = lst_mng:AddItemFromPool() + -- btn_qiangzhi.icon = "ui://NewGroup/mng_qiangzhi" + -- btn_qiangzhi.onClick:Set(function() + -- local msg_tip = MsgWindow.new(self._root_view,"确定全部提取吗?", MsgWindow.MsgMode.OnlyOk) + -- msg_tip.onOk:Add(function( ... ) + -- ViewUtil.ShowModalWait() + -- fgCtr:FG_TakeHp1(self.group_id, member.uid, function(res) + -- ViewUtil.CloseModalWait() + -- if self._is_destroy then + -- return + -- end + -- if res.ReturnCode ~= 0 then + -- ViewUtil.ErrorTip(res.ReturnCode, "提取失败") + -- else + -- ViewUtil.ErrorTip(res.ReturnCode, "提取成功") + -- self:Destroy() + -- if self.callBack1 then + -- self.callBack1() + -- end + -- end + -- end) + -- msg_tip:Close() + -- end) + -- msg_tip:Show() + -- end) + -- end end function M:MovePartner(parent_id, member, obj) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiftPointsFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiftPointsFagListView.lua new file mode 100644 index 00000000..a863677f --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiftPointsFagListView.lua @@ -0,0 +1,227 @@ +--牌友圈体力值记录 +local TimeSettingPanel = import(".TimeSettingPanel") +local GroupMngGiftPointsFagListView = {} + +local M = GroupMngGiftPointsFagListView + +function GroupMngGiftPointsFagListView.new(group_id) + local self = M + self.class = "GroupMngGiftPointsFagListView" + self.group_id = group_id + -- 体力值数据 + self.fag_data = {} + -- 体力值查询结果 + self.fag_result_data = {} + -- 查询id + self.quary_id = 0 + self.query_nick = "" + self:FillView() + return self +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 + local group = DataManager.groups:get(self.group_id) + if group.lev < 3 then + self:GetHpStatistic() + end +end + +function M:FillView() + + + + self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupGiftPointsFagList") + local group = DataManager.groups:get(self.group_id) + if group.lev < 3 then + self._view:GetController("mng").selectedIndex = 1 + end + -- 初始化列表 + self.lst_fag = self._view:GetChild("lst_fag") + self.lst_fag:SetVirtual() + self.lst_fag.itemRenderer = function(index, obj) + self:OnRenderItem(index, obj) + end + self.lst_fag.scrollPane.onPullUpRelease:Set(function() + self:GetFagData(self.lst_fag.numItems) + end) + 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) + end + self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() + self:GetFagData(self.lst_fag_result.numItems) + end) + + -- 切换页面事件，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 + self.quary_id = 0 + self.query_nick = "" + + 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 + end) + + self._view:GetChild("btn_search").onClick:Set(function() + local qid = self._view:GetChild("tex_id").text + qid = tonumber(qid) + self.quary_id = qid or 0 + self.query_nick = self._view:GetChild("tex_id").text or "" + self.fag_result_data = {} + self._view:GetChild("tex_id").text = "" + self:GetFagData(0) + end) + self._view:GetChild("btn_back").onClick:Set(function() + 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:GetMngFagInfo() + end) +end + +-- 获取上下分数据 +local num = 8 +function M:GetFagData(index) + qid = self.quary_id or 0 + qName = self.query_nick or "" + -- 重新获取数据时，清空数据列表 + if index == 0 then + if qid == 0 then + self.fag_data = {} + else + self.fag_result_data = {} + end + end + ViewUtil.ShowModalWait(nil) + + --type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分 + 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 + end + end + end) +end + +-- 获取体力值统计 +function M:GetHpStatistic() + -- 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 + 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) + end + end) +end + +-- 获取管理员总计/合伙人总计 +function M:GetMngFagInfo() + 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 + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetMngHpInfo(self.group_id, type, begin_time, end_time, function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + 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) + 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 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_left").text = d2ad(rdata.cur_hp) + obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) +end + +return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua new file mode 100644 index 00000000..3faa8cb6 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua @@ -0,0 +1,225 @@ +--牌友圈体力值记录 +local TimeSettingPanel = import(".TimeSettingPanel") +local GroupMngGiveFagListView = {} + +local M = GroupMngGiveFagListView + +function GroupMngGiveFagListView.new(group_id) + local self = M + self.class = "GroupMngGiveFagListView" + self.group_id = group_id + -- 体力值数据 + self.fag_data = {} + -- 体力值查询结果 + self.fag_result_data = {} + -- 查询id + self.quary_id = 0 + self.query_nick = "" + self:FillView() + return self +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 + local group = DataManager.groups:get(self.group_id) + if group.lev < 3 then + self:GetHpStatistic() + end +end + +function M:FillView() + + self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupGiveFagList") + local group = DataManager.groups:get(self.group_id) + if group.lev < 3 then + self._view:GetController("mng").selectedIndex = 1 + end + -- 初始化列表 + self.lst_fag = self._view:GetChild("lst_fag") + self.lst_fag:SetVirtual() + self.lst_fag.itemRenderer = function(index, obj) + self:OnRenderItem(index, obj) + end + self.lst_fag.scrollPane.onPullUpRelease:Set(function() + self:GetFagData(self.lst_fag.numItems) + end) + 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) + end + self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() + self:GetFagData(self.lst_fag_result.numItems) + end) + + -- 切换页面事件，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 + self.quary_id = 0 + self.query_nick = "" + + 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 + end) + + self._view:GetChild("btn_search").onClick:Set(function() + local qid = self._view:GetChild("tex_id").text + qid = tonumber(qid) + self.quary_id = qid or 0 + self.query_nick = self._view:GetChild("tex_id").text or "" + self.fag_result_data = {} + self._view:GetChild("tex_id").text = "" + self:GetFagData(0) + end) + self._view:GetChild("btn_back").onClick:Set(function() + 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:GetMngFagInfo() + end) +end + +-- 获取上下分数据 +local num = 8 +function M:GetFagData(index) + qid = self.quary_id or 0 + qName = self.query_nick or "" + -- 重新获取数据时，清空数据列表 + if index == 0 then + if qid == 0 then + self.fag_data = {} + else + self.fag_result_data = {} + end + end + ViewUtil.ShowModalWait(nil) + + --type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分 + 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 + end + end + end) +end + +-- 获取体力值统计 +function M:GetHpStatistic() + -- 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 + 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) + end + end) +end + +-- 获取管理员总计/合伙人总计 +function M:GetMngFagInfo() + 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 + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetMngHpInfo(self.group_id, type, begin_time, end_time, function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + 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) + 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 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_left").text = d2ad(rdata.cur_hp) + obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) +end + +return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGroupSkin.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGroupSkin.lua new file mode 100644 index 00000000..a8cdcfa3 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGroupSkin.lua @@ -0,0 +1,146 @@ +local GroupMngGroupSkin = {} + +local M = GroupMngGroupSkin + +function GroupMngGroupSkin.new(gid) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "GroupMngGroupSkin" + self.group_id = gid + self._close_destroy = true + self._anim_pop = 2 + self._full = true + + -- 标记是否已保存 + self._is_saved = false + + self:init("ui://NewGroup/View_GroupSkin") + self:InitView() + return self +end + +function M:InitView() + local btn_save = self._view:GetChild("btn_skin_baocun") + if btn_save then + btn_save.onClick:Set(function() + self:EditPlay() + self._is_saved = true -- 标记为已保存 + self:Destroy() + end) + end + + -- 单个预览按钮，同时切换背景和桌面 + local btn_preview = self._view:GetChild("btn_skin_preview") + if btn_preview then + btn_preview.onClick:Set(function() + self:PreviewNextAll() + end) + end + + -- 先恢复之前的状态 + self:RestoreState() + + -- 2.记录当前的初始索引，用于取消时回滚 + local ctr_bg = self._view:GetController("bifu_beijing") + local ctr_desk = self._view:GetController("bifu_zhuomian") + + self._init_bg_index = ctr_bg and ctr_bg.selectedIndex or 0 + self._init_desk_index = ctr_desk and ctr_desk.selectedIndex or 0 +end + +-- 同时预览下一个背景和桌面 +function M:PreviewNextAll() + local ctr_hide_bg = self._view:GetController("bifu_beijing") + if not ctr_hide_bg then + return + end + local bifu_zhuomian = self._view:GetController("bifu_zhuomian") + if not bifu_zhuomian then + return + end + + -- 2. 实时通知主界面预览效果 + if UpdateGroupBackground then + UpdateGroupBackground(ctr_hide_bg.selectedIndex, bifu_zhuomian.selectedIndex) + end +end + +-- 恢复背景 and 桌面的选中状态 +function M:RestoreState() + local ctr_bg = self._view:GetController("bifu_beijing") + local ctr_desk = self._view:GetController("bifu_zhuomian") + + if not ctr_bg or not ctr_desk then return end + + local curView = DataManager.SelfUser.cur_group + + local savedBgIndex = 0 + local savedZmIndex = 0 + + if curView and curView.class == 'GroupInfoView' then + savedBgIndex = curView.currentBgIndex or 0 + savedZmIndex = curView.desktopCategorization or 0 + else + savedBgIndex = PlayerPrefs.GetInt("group_bg_" .. self.group_id, 0) + savedZmIndex = PlayerPrefs.GetInt("group_desk_" .. self.group_id, 0) + end + + if savedBgIndex < ctr_bg.pageCount then + ctr_bg.selectedIndex = savedBgIndex + end + + if savedZmIndex < ctr_desk.pageCount then + ctr_desk.selectedIndex = savedZmIndex + end +end + +-- 点击按钮更换背景和桌面 +function M:EditPlay() + local ctr_hide_bg = self._view:GetController("bifu_beijing") + if not ctr_hide_bg then + return + end + local bifu_zhuomian = self._view:GetController("bifu_zhuomian") + if not bifu_zhuomian then + return + end + + local bgIndex = ctr_hide_bg.selectedIndex + local zmIndex = bifu_zhuomian.selectedIndex + + -- 通知主界面 更新实际背景 + if UpdateGroupBackground then + UpdateGroupBackground(bgIndex, zmIndex) + end + + -- 保存到本地 + PlayerPrefs.SetInt("group_bg_" .. self.group_id, bgIndex) + PlayerPrefs.SetInt("group_desk_" .. self.group_id, zmIndex) +end + +-- 重写 Destroy 方法，处理取消时的回滚 +function M:Destroy() + -- 如果没有保存，则恢复主界面到打开弹窗前的状态 + if not self._is_saved then + -- 获取记录的初始状态 + local initBg = self._init_bg_index or 0 + local initDesk = self._init_desk_index or 0 + + -- 通知主界面回滚（传入初始索引，主界面会变回原来的样子） + if UpdateGroupBackground then + UpdateGroupBackground(initBg, initDesk) + end + + -- 可选：如果主界面有对应的变量，也回滚内存中的值，防止不一致 + local curView = DataManager.SelfUser.cur_group + if curView and curView.class == 'GroupInfoView' then + curView.currentBgIndex = initBg + curView.desktopCategorization = initDesk + end + end + + -- 调用父类的 Destroy + BaseWindow.Destroy(self) +end + +return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua new file mode 100644 index 00000000..ba61c6ce --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua @@ -0,0 +1,227 @@ +--牌友圈体力值记录 +local TimeSettingPanel = import(".TimeSettingPanel") +local GroupMngMatchFagListView = {} + +local M = GroupMngMatchFagListView + +function GroupMngMatchFagListView.new(group_id) + local self = M + self.class = "GroupMngMatchFagListView" + self.group_id = group_id + -- 体力值数据 + self.fag_data = {} + -- 体力值查询结果 + self.fag_result_data = {} + -- 查询id + self.quary_id = 0 + self.query_nick = "" + self:FillView() + return self +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 + local group = DataManager.groups:get(self.group_id) + if group.lev < 3 then + 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 + self._view:GetController("mng").selectedIndex = 1 + end + -- 初始化列表 + self.lst_fag = self._view:GetChild("lst_fag") + self.lst_fag:SetVirtual() + self.lst_fag.itemRenderer = function(index, obj) + self:OnRenderItem(index, obj) + end + self.lst_fag.scrollPane.onPullUpRelease:Set(function() + self:GetFagData(self.lst_fag.numItems) + end) + 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) + end + self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() + self:GetFagData(self.lst_fag_result.numItems) + end) + + -- 切换页面事件，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 + self.quary_id = 0 + self.query_nick = "" + + 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 + end) + + self._view:GetChild("btn_search").onClick:Set(function() + local qid = self._view:GetChild("tex_id").text + qid = tonumber(qid) + self.quary_id = qid or 0 + self.query_nick = self._view:GetChild("tex_id").text or "" + self.fag_result_data = {} + self._view:GetChild("tex_id").text = "" + self:GetFagData(0) + end) + self._view:GetChild("btn_back").onClick:Set(function() + 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:GetMngFagInfo() + end) +end + +-- 获取上下分数据 +local num = 8 +function M:GetFagData(index) + qid = self.quary_id or 0 + qName = self.query_nick or "" + -- 重新获取数据时，清空数据列表 + if index == 0 then + if qid == 0 then + self.fag_data = {} + else + self.fag_result_data = {} + end + end + ViewUtil.ShowModalWait(nil) + + --type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分 + 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 + end + end + end) +end + +-- 获取体力值统计 +function M:GetHpStatistic() + -- 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 + 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) + end + end) +end + +-- 获取管理员总计/合伙人总计 +function M:GetMngFagInfo() + 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 + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetMngHpInfo(self.group_id, type, begin_time, end_time, function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + 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) + 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 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_left").text = d2ad(rdata.cur_hp) + obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) +end + +return M \ No newline at end of file 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 d92c4ee6..a62238df 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua @@ -220,6 +220,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + printlog("修改体力值==》》》",pid) local gniv = GroupNumberInputView.new( nil, @@ -275,24 +276,24 @@ function M:FillItem(obj, member, refresh) 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 + -- 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 + -- --上级 + -- 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) @@ -303,13 +304,14 @@ function M:FillItem(obj, member, refresh) obj:GetController('fag').selectedIndex = 0 end - obj:GetChild("btn_tag").title = member.score + --obj:GetChild("btn_tag").title = member.score local fgCtr = ControllerManager.GetController(NewGroupController) local p = group:getMember(member.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 @@ -367,77 +369,37 @@ 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_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 - ) + -- 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 + -- ) - obj:GetChild("super_btn").onClick:Set( - function() - ViewUtil.ShowModalWait(nil) - local text = member.uid - local qid, qnick - if text == "" then - ViewUtil.CloseModalWait() - ViewUtil.ErrorTip(nil, '输入不能为空') - return - end - qid = tonumber(text) or 0 - qnick = tostring(text) - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_FindMember( - self.group_id, - qid, - function(res) - ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') - else - self._view:GetChild('tex_id').text = '' - self._view:GetController('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) - end - end - end, - qnick, - 1 - ) - end - ) end function M:OnRenderItem(index, obj) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView2.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView2.lua new file mode 100644 index 00000000..f8d54c87 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView2.lua @@ -0,0 +1,505 @@ +-- 牌友圈成员列表 +local GroupNumberInputView = import('.GroupNumberInputView') +local GroupMemberFagLogView = import('.GroupMemberFagLogView') +local GroupSetPermissionView = import('.GroupSetPermissionView') +local GroupBanSameTableView = import('.GroupBanSameTableView') +local GroupMemberOperateView = import('.GroupMemberOperateView') +local GroupAddMemberInfoView=import('.GroupAddMemberInfoView') + + +local MngPermission = import('.MngPermission') + +local GroupMngMemberListView2 = {} + +local M = GroupMngMemberListView2 + +local gid +function GroupMngMemberListView2.new(group_id, blur_view) + local self = M + self.class = 'GroupMngMemberListView2' + self.group_id = group_id + self.member_data = {} + self:FillView() + return self +end + +function M:initData() + if self._view:GetController('page').selectedIndex == 0 then + self:GetMemberData(0) + elseif self._view:GetController('page').selectedIndex == 1 then + self:GetJoinsData() + end +end + +-- 管理员权限 +local MngPermissionList = { + DeleteMember = 1, + -- 删除成员 + AddMember = 2, + --添加成员 + SetFag = 3, + --设置体力值 + BanPlaying = 4, + --禁止游戏 + BanSameTable = 5 + --禁止同桌 +} +local function CheckPermission(lev, permission) + if lev == 2 and not permission then + ViewUtil.ErrorTip(nil, '您无权操作！如有需要请联系盟主。', 1) + return false + end + return true +end + +function M:FillView() + self._view = UIPackage.CreateObjectFromURL('ui://NewGroup/View_GroupMemberList2') + -- 初始化成员列表 + self.lst_member = self._view:GetChild('lst_member') + self.lst_member:SetVirtual() + self.lst_member.itemRenderer = function(index, obj) + self:OnRenderItem(index, obj) + end + self.lst_member.scrollPane.onPullUpRelease:Set( + function() + --print("aaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbb ",self.lst_member.numItems) + self:GetMemberData(self.lst_member.numItems) + end + ) + + --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( + function() + ViewUtil.ShowModalWait(nil) + local text = self._view:GetChild('tex_id').text + local qid, qnick + if text == "" then + ViewUtil.CloseModalWait() + ViewUtil.ErrorTip(nil, '输入不能为空') + return + end + qid = tonumber(text) or 0 + qnick = text + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_FindMember( + self.group_id, + qid, + function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + 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) + end + end + end, + qnick + ) + end + ) + local btn_back = self._view:GetChild('btn_back') + btn_back.onClick:Set( + function() + self.lst_member.numItems = #self.member_data + end + ) + + local group = DataManager.groups:get(self.group_id) + local perm_array = MngPermission.getPermData(group.permission) + + self.tex_num = self._view:GetChild('tex_num') + self:ClearNumTex() + + local cnt = self._view.numChildren - 1 + + 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() + if not CheckPermission(group.lev, perm_array[2]) then + return + end + if self._texnum_str == '' then + return + end + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:GetAddMember( + self.group_id, + tonumber(self._texnum_str), + function(response) + printlog("响应获取添加玩家==》》》") + pt(response) + ViewUtil.CloseModalWait() + if (response.ReturnCode and response.ReturnCode == 0) then + GroupAddMemberInfoView.new(self.group_id,tonumber(self._texnum_str)):SetAddMember(response.Data) + self:ClearNumTex() + --ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1) + else + ViewUtil.ErrorTip(123456, '获取玩家失败') + end + end + ) + end + ) + local btn_del = self._view:GetChild('btn_del') + btn_del.onClick:Add(handler(self, self.OnNumButtonAction)) + + local ctr_mng = self._view:GetController('mng') + if group.lev < 3 then + ctr_mng.selectedIndex = 1 + end + local ctr_page = self._view:GetController('page') + ctr_page.onChanged:Set( + function() + self:initData() + end + ) + + + +end + +-- 快速访问 +function M:navigation() + self._view:GetController('page').selectedIndex = 2 + self:initData() +end + +-- 获取成员数据 +function M:GetMemberData(index) + --print("11111111111111111111") + --print(debug.traceback()) + local group = DataManager.groups:get(self.group_id) + if index == 0 then + group:clearMember() + end + + ViewUtil.ShowModalWait(nil) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupMembers11( + self.group_id, + index, + 6, + false, + 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 + 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) + end + end + end + ) +end + +-- 修改体力值 +local function __change_fag(gid, pid, is_add, cur_hp, callback) + printlog("修改体力值==》》》",pid) + local gniv = + GroupNumberInputView.new( + nil, + 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 + ) + -- 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') + if member.lev < 3 then + ctr_type.selectedIndex = member.lev + elseif member.partnerLev ~= 0 then + ctr_type.selectedIndex = 3 + else + ctr_type.selectedIndex = 0 + end + + -- 体力值数据 + local tex_fag = obj:GetChild('tex_fag') + tex_fag.text = d2ad(member.hp) + + 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 + obj:GetController('fag').selectedIndex = 1 + else + obj:GetController('fag').selectedIndex = 0 + end + + --obj:GetChild("btn_tag").title = member.score + + local fgCtr = ControllerManager.GetController(NewGroupController) + local p = group:getMember(member.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, + member.uid, + true, + nil, + function(data) + local hp = data.hp + member.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_member.numItems = #self.member_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, + member.uid, + false, + member.hp, + function(data) + local hp = data.hp + member.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_member.numItems = #self.member_data + -- 搜索出的玩家显示 + if self._view:GetController('search').selectedIndex == 1 then + obj:GetChild('tex_fag').text = d2ad(hp) + end + end + ) + 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 +end + +--获取申请列表 +function M:GetJoinsData() + local group = DataManager.groups:get(self.group_id) + if group.joins > 0 then + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupJoins( + self.group_id, + function(res) + ViewUtil.CloseModalWait() + if (res.ReturnCode == 0) then + local joins = res.Data.joins + group.joins = #joins + if #joins == 0 then + group.update_joins = true + end + self:FillJoinList(joins) + else + ViewUtil.ErrorTip(res.ReturnCode, '获取申请列表失败！') + self:FillJoinList({}) + end + end + ) + else + self:FillJoinList({}) + end +end + +--填充申请 +function M:FillJoinList(data) + local lst_joins = self._view:GetChild('lst_joins') + lst_joins:RemoveChildrenToPool() + for i = 1, #data do + local item = lst_joins:AddItemFromPool() + item:GetChild('tex_name').text = ViewUtil.stringEllipsis(data[i].nick) + item:GetChild('tex_id').text = data[i].id + local btn_head = item:GetChild('btn_head') + ImageLoad.Load(data[i].portrait, btn_head._iconObject) + item:GetChild('btn_yes').onClick:Set( + function() + self:VerifyPlayerJoin(data[i].id, true) + end + ) + item:GetChild('btn_no').onClick:Set( + function() + self:VerifyPlayerJoin(data[i].id, false) + end + ) + end +end + +function M:VerifyPlayerJoin(id, allow) + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupVerifyJoin( + self.group_id, + id, + allow, + function(res) + ViewUtil.CloseModalWait() + if (res.ReturnCode == 0) then + self:GetJoinsData() + else + ViewUtil.ErrorTip(res.ReturnCode, '操作申请失败') + end + end + ) +end + +function M:OnNumButtonAction(context) + local typer = string.sub(context.sender.name, 5) + if typer == 'del' then + if (self._currenIndex > 0) then + self._currenIndex = self._currenIndex - 1 + 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:ClearNumTex() + self._texnum_str = '' + self._currenIndex = 0 + self.tex_num.text = self._texnum_str +end + +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua new file mode 100644 index 00000000..1ae4cb4b --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua @@ -0,0 +1,227 @@ +--牌友圈体力值记录 +local TimeSettingPanel = import(".TimeSettingPanel") +local GroupMngShufflingStatisticsFagListView = {} + +local M = GroupMngShufflingStatisticsFagListView + +function GroupMngShufflingStatisticsFagListView.new(group_id) + local self = M + self.class = "GroupMngShufflingStatisticsFagListView" + self.group_id = group_id + -- 体力值数据 + self.fag_data = {} + -- 体力值查询结果 + self.fag_result_data = {} + -- 查询id + self.quary_id = 0 + self.query_nick = "" + self:FillView() + return self +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 + local group = DataManager.groups:get(self.group_id) + if group.lev < 3 then + self:GetHpStatistic() + end +end + +function M:FillView() + + + + self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupShufflingStatisticsFagList") + local group = DataManager.groups:get(self.group_id) + if group.lev < 3 then + self._view:GetController("mng").selectedIndex = 1 + end + -- 初始化列表 + self.lst_fag = self._view:GetChild("lst_fag") + self.lst_fag:SetVirtual() + self.lst_fag.itemRenderer = function(index, obj) + self:OnRenderItem(index, obj) + end + self.lst_fag.scrollPane.onPullUpRelease:Set(function() + self:GetFagData(self.lst_fag.numItems) + end) + 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) + end + self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() + self:GetFagData(self.lst_fag_result.numItems) + end) + + -- 切换页面事件，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 + self.quary_id = 0 + self.query_nick = "" + + 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 + end) + + self._view:GetChild("btn_search").onClick:Set(function() + local qid = self._view:GetChild("tex_id").text + qid = tonumber(qid) + self.quary_id = qid or 0 + self.query_nick = self._view:GetChild("tex_id").text or "" + self.fag_result_data = {} + self._view:GetChild("tex_id").text = "" + self:GetFagData(0) + end) + self._view:GetChild("btn_back").onClick:Set(function() + 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:GetMngFagInfo() + end) +end + +-- 获取上下分数据 +local num = 8 +function M:GetFagData(index) + qid = self.quary_id or 0 + qName = self.query_nick or "" + -- 重新获取数据时，清空数据列表 + if index == 0 then + if qid == 0 then + self.fag_data = {} + else + self.fag_result_data = {} + end + end + ViewUtil.ShowModalWait(nil) + + --type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分 + 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 + end + end + end) +end + +-- 获取体力值统计 +function M:GetHpStatistic() + -- 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 + 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) + end + end) +end + +-- 获取管理员总计/合伙人总计 +function M:GetMngFagInfo() + 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 + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetMngHpInfo(self.group_id, type, begin_time, end_time, function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + 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) + 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 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_left").text = d2ad(rdata.cur_hp) + obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) +end + +return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupNumberInputView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupNumberInputView.lua index d82ffd6a..9503fe61 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupNumberInputView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupNumberInputView.lua @@ -19,9 +19,9 @@ local InputType = Other = 4, } -function GroupNumberInputView.new(blur_view,callback,itype,fag,com) - setmetatable(M, {__index = BaseWindow}) - local self = setmetatable({}, {__index = M}) +function GroupNumberInputView.new(blur_view, callback, itype, fag, com) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) self.class = "GroupNumberInputView" self._currenIndex = 0 self._close_destroy = true @@ -38,48 +38,47 @@ function GroupNumberInputView.new(blur_view,callback,itype,fag,com) end function M:init(url) - BaseWindow.init(self,url) + BaseWindow.init(self, url) self.tex_num = self._view:GetChild("tex_num") self:ClearNumTex() - local cnt = self._view.numChildren - 1 - - for i = 0 , 10 do - local obj = self._view:GetChild("btn_"..i) + + for i = 0, 10 do + local obj = self._view:GetChild("btn_" .. i) if obj then - obj.onClick:Set(handler(self , self.OnNumButtonAction)) + obj.onClick:Set(handler(self, self.OnNumButtonAction)) end i = i + 1 end local btn_ok = self._view:GetChild("btn_ok") btn_ok.onClick:Set(function() - if self._currenIndex <1 then + if self._currenIndex < 1 then return end self:Destroy() if self._callback then self._callback(tonumber(self._texnum_str)) - end + end end) local btn_del = self._view:GetChild("btn_del") - btn_del.onClick:Set(handler(self , self.OnNumButtonAction)) + btn_del.onClick:Set(handler(self, self.OnNumButtonAction)) local btn_c = self._view:GetChild("btn_c") if btn_c then btn_c.onClick:Set(handler(self, self.OnNumButtonAction)) end end function M:OnNumButtonAction(context) - local typer = string.sub(context.sender.name ,5) + local typer = string.sub(context.sender.name, 5) if typer == KEY_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 elseif typer == KEY_CLEAR then -- local msg = "你确定要减少" .. self._fag .. "体力值吗？" -- local _curren_msg = MsgWindow.new(self._view, msg, MsgWindow.MsgMode.OkAndCancel,"ui://NewGroup/MessageBox") - -- _curren_msg.onOk:Add(function() + -- _curren_msg.onOk:Add(function() -- self._callback(self._fag) -- self:Destroy() -- end) @@ -104,7 +103,6 @@ function M:OnNumButtonAction(context) self._currenIndex = self._currenIndex + 1 self._texnum_str = self._texnum_str .. context.sender.title self.tex_num.text = self._texnum_str - end end end @@ -115,4 +113,4 @@ function M:ClearNumTex() self.tex_num.text = self._texnum_str end -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua index 901c7d52..bc1bc6c6 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua @@ -3,6 +3,7 @@ local GroupMngFagListView = import(".GroupMngFagListView") local GroupMngGameListView = import(".GroupMngGameListView") local GroupMngMemberListView = import(".GroupMngMemberListView") local GroupMngMemberListView1 = import(".GroupMngMemberListView1") +local GroupMngMemberListView2 = import(".GroupMngMemberListView2") local GroupMngAddMemberView = import(".GroupMngAddMemberView") local GroupMngRankView = import(".GroupMngRankView") local GroupMngRoomStatView = import(".GroupMngRoomStatView") @@ -17,6 +18,10 @@ local GroupMngPartnerStatView = import(".GroupMngPartnerStatView") local GroupMngMemberInfoView = import(".GroupMngMemberInfoView") local GroupMngXingYunStatView = import(".GroupMngXingYunStatView") local GroupMngZuanShiStatView = import(".GroupMngZuanShiStatView") +local GroupMngMatchFagListView = import(".GroupMngMatchFagListView") +local GroupMngGiftPointsFagListView = import(".GroupMngGiftPointsFagListView") +local GroupMngShufflingStatisticsFagListView = import(".GroupMngShufflingStatisticsFagListView") +local GroupMngGiveFagListView = import(".GroupMngGiveFagListView") local MngPageConfig = {} -- 界面配置表 @@ -47,6 +52,12 @@ MngPageConfig.PageList = { {id = 24, title = "局数统计", view = GroupMngZuanShiStatView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 25, title = "座位分明细", view = GroupMngFagListView, refresh = true, clear_image = false,anchorOffset = 300}, {id = 26, title = "每日统计", view = GroupMngPlayStatView, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 27, title = "比赛分管理", view = GroupMngMemberListView, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 28, title = "比赛分分成", view = GroupMngMemberListView2, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 29, title = "比赛分明细", view = GroupMngMatchFagListView, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 30, title = "赠送分明细", view = GroupMngGiftPointsFagListView, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 31, title = "洗牌统计", view = GroupMngShufflingStatisticsFagListView, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 32, title = "赠送统计", view = GroupMngGiveFagListView, refresh = true, clear_image = true,anchorOffset = 300}, } -- Config定义不同职位的人，通过不同按钮进入显示的内容 @@ -95,12 +106,18 @@ MngPageConfig.Config = { -- 合伙人 {}, }, - + --成员 { {20,21,5}, {20,21,5}, {20,21,5}, }, + --比赛 + { + {27,28,29,30,31,32}, + {27,28,29,30,31,32}, + {27,28,29,30,31,32}, + }, } return MngPageConfig diff --git a/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info b/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info index b8ada2cf..212f8d9a 100644 --- a/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info +++ b/wb_new_ui/.objs/metas/1hl55dqm/c4r115.info @@ -1,22 +1,55 @@ { "objectStatus": { - "n101_gsb6": { + "n162_c4r1": { + "hidden": true + }, + "n58_iqv0": { "hidden": true }, "n90_nip5": { "hidden": true }, - "n162_c4r1": { - "hidden": true - }, "n108_xhvg": { "hidden": true }, + "n132_t038": { + "collapsed": true + }, + "n239_ozsy": { + "collapsed": true + }, + "n235_ug6y": { + "collapsed": true + }, + "n55_v38k": { + "collapsed": true + }, + "n224_rjio": { + "collapsed": true + }, + "n101_gsb6": { + "hidden": true + }, + "n231_ttbr": { + "collapsed": true + }, + "n89_se1s": { + "collapsed": true + }, + "n129_t038": { + "collapsed": true + }, "n52_v38k": { "hidden": true }, - "n58_iqv0": { - "hidden": true + "n160_c4r1": { + "collapsed": true + }, + "n155_c4r1": { + "collapsed": true + }, + "n217_rjio": { + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info b/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info index 693b24af..5c8a1aab 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info @@ -1,18 +1,21 @@ { "objectStatus": { - "n14_naup": { - "hidden": true - }, - "n13_naup": { - "hidden": true - }, "n17_nld2": { "hidden": true }, + "n8_naup": { + "hidden": true + }, "n22_cvc8": { "hidden": true }, - "n8_naup": { + "n13_naup": { + "hidden": true + }, + "n31_ca44": { + "hidden": true + }, + "n14_naup": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/e5q7hu2.info b/wb_new_ui/.objs/metas/m7iejg46/e5q7hu2.info index 00d0a03f..7d3b04cb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/e5q7hu2.info +++ b/wb_new_ui/.objs/metas/m7iejg46/e5q7hu2.info @@ -1,10 +1,24 @@ { "objectStatus": { - "n15_jjon": { + "n8_e5q7": { + "hidden": true + }, + "n10_e5q7": { + "hidden": true + }, + "n14_e5q7": { "hidden": true }, "n16_isix": { "hidden": true + }, + "n7_e5q7": { + "hidden": true + }, + "n9_e5q7": { + "hidden": true, + "collapsed": true } - } + }, + "adaptiveTest": true } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/e5q7hu9.info b/wb_new_ui/.objs/metas/m7iejg46/e5q7hu9.info new file mode 100644 index 00000000..c71d2dba --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/e5q7hu9.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n3_e5q7": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info index 8ed36320..48877098 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info @@ -4,10 +4,6 @@ "hidden": true, "collapsed": true }, - "n94_kwi0": { - "hidden": true, - "collapsed": true - }, "n129_omkm": { "hidden": true }, @@ -18,16 +14,17 @@ "n140_ex3l": { "collapsed": true }, - "n60_kwi0": { - "collapsed": true - }, - "n73_kwi0": { + "n94_kwi0": { "hidden": true, "collapsed": true }, "n64_kwi0": { "hidden": true }, + "n73_kwi0": { + "hidden": true, + "collapsed": true + }, "n65_kwi0": { "hidden": true, "collapsed": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info index 447d2543..dd0a7da9 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkr.info @@ -1,9 +1,23 @@ { "objectStatus": { + "n22_cioe": { + "hidden": true + }, + "n21_cioe": { + "hidden": true + }, + "n33_rpaz": { + "hidden": true + }, + "n7_kwi0": { + "collapsed": true + }, + "n131_jawz": { + "hidden": true + }, "n94_ocx0": { "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info index 29e41957..d3641f96 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info @@ -1,12 +1,11 @@ { "objectStatus": { - "n58_ocx0": { - "hidden": true + "n44_rpaz": { + "collapsed": true }, - "n57_ocx0": { - "hidden": true + "n26_kwi0": { + "collapsed": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i80.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i80.info index a7afb294..09eb47af 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i80.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i80.info @@ -1,34 +1,13 @@ { "objectStatus": { - "n118_l7wn": { - "hidden": true + "n120_l7wn": { + "collapsed": true }, - "n112_l7wn": { - "hidden": true + "n128_tkv1": { + "collapsed": true }, - "n117_l7wn": { - "hidden": true - }, - "n114_l7wn": { - "hidden": true - }, - "n113_l7wn": { - "hidden": true - }, - "n116_l7wn": { - "hidden": true - }, - "n119_l7wn": { - "hidden": true - }, - "n115_l7wn": { - "hidden": true - }, - "n111_l7wn": { - "hidden": true - }, - "n110_l7wn": { - "hidden": true + "n132_tkv1": { + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info index 1d9f8a41..8ccf73d6 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info @@ -1,34 +1,16 @@ { "objectStatus": { - "n112_l7wn": { - "hidden": true + "n151_tkv1": { + "collapsed": true }, - "n115_l7wn": { - "hidden": true + "n140_tkv1": { + "collapsed": true }, - "n117_l7wn": { - "hidden": true + "n144_tkv1": { + "collapsed": true }, - "n114_l7wn": { - "hidden": true - }, - "n113_l7wn": { - "hidden": true - }, - "n116_l7wn": { - "hidden": true - }, - "n118_l7wn": { - "hidden": true - }, - "n111_l7wn": { - "hidden": true - }, - "n122_jawz": { - "hidden": true - }, - "n119_l7wn": { - "hidden": true + "n147_tkv1": { + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info index cf05517a..366989bf 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info +++ b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info @@ -1,10 +1,28 @@ { "objectStatus": { - "n108_vyn3": { - "hidden": true + "n48_e5q7": { + "collapsed": true + }, + "n27_kwi0": { + "collapsed": true + }, + "n23_kwi0": { + "collapsed": true + }, + "n37_utix": { + "collapsed": true }, "n104_vyn3": { "hidden": true + }, + "n92_jj65": { + "collapsed": true + }, + "n69_f8lb": { + "collapsed": true + }, + "n108_vyn3": { + "hidden": true } }, "fitScreen": "FitSize" diff --git a/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info b/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info index 9fec2107..9427c87b 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info @@ -1,9 +1,7 @@ { "objectStatus": { - "n60_nld2": { - "hidden": true - }, "n24_ewd0": { + "hidden": true, "collapsed": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/s8rw7ihg.info b/wb_new_ui/.objs/metas/m7iejg46/s8rw7ihg.info new file mode 100644 index 00000000..14b5dc9c --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/s8rw7ihg.info @@ -0,0 +1,5 @@ +{ + "designImages": [ + "n13" + ] +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/taski05.info b/wb_new_ui/.objs/metas/m7iejg46/taski05.info index 50cb05b9..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/taski05.info +++ b/wb_new_ui/.objs/metas/m7iejg46/taski05.info @@ -1,10 +1 @@ -{ - "objectStatus": { - "n80_s98c": { - "hidden": true - }, - "n79_s98c": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info new file mode 100644 index 00000000..89a3a89d --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n131_jawz": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii6.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii6.info new file mode 100644 index 00000000..6dc824b1 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii6.info @@ -0,0 +1,8 @@ +{ + "objectStatus": { + "n47_rpaz": { + "hidden": true, + "collapsed": true + } + } +} \ 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 new file mode 100644 index 00000000..b22e354e --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info @@ -0,0 +1,26 @@ +{ + "objectStatus": { + "n108_p747": { + "hidden": true + }, + "n144_ex3l": { + "hidden": true + }, + "n136_ex3l": { + "hidden": true + }, + "n140_ex3l": { + "hidden": true + }, + "n65_kwi0": { + "hidden": true + }, + "n84_kwi0": { + "hidden": true + }, + "n117_sbng": { + "hidden": true + } + }, + "adaptiveTest": true +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17iia.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17iia.info new file mode 100644 index 00000000..da5224d5 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17iia.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n39_giw8": { + "hidden": true + }, + "n42_ee9s": { + "hidden": true + }, + "n38_giw8": { + "hidden": true + }, + "n43_ee9s": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17iic.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17iic.info new file mode 100644 index 00000000..43b0ae9c --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17iic.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n136_ex3l": { + "hidden": true + }, + "n84_kwi0": { + "hidden": true + }, + "n108_p747": { + "hidden": true + }, + "n65_kwi0": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17iie.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17iie.info new file mode 100644 index 00000000..43b0ae9c --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17iie.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n136_ex3l": { + "hidden": true + }, + "n84_kwi0": { + "hidden": true + }, + "n108_p747": { + "hidden": true + }, + "n65_kwi0": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17iif.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17iif.info new file mode 100644 index 00000000..43b0ae9c --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17iif.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n136_ex3l": { + "hidden": true + }, + "n84_kwi0": { + "hidden": true + }, + "n108_p747": { + "hidden": true + }, + "n65_kwi0": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info new file mode 100644 index 00000000..43b0ae9c --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n136_ex3l": { + "hidden": true + }, + "n84_kwi0": { + "hidden": true + }, + "n108_p747": { + "hidden": true + }, + "n65_kwi0": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17iii.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17iii.info new file mode 100644 index 00000000..ab040c86 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17iii.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n44_rpaz": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info index 43e6be11..f8cdcfd2 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info @@ -1,43 +1,40 @@ { "objectStatus": { - "n59_ovii": { - "hidden": true - }, - "n72_mtk5": { - "hidden": true - }, "n60_ovii": { "hidden": true }, - "n24_kwi0": { - "hidden": true - }, - "n26_kwi0": { - "hidden": true - }, - "n51_t1hq": { - "collapsed": true - }, - "n1_kwi0": { - "hidden": true - }, - "n68_z384": { - "hidden": true - }, "n47_rpaz": { "hidden": true }, - "n2_kwi0": { + "n70_k5m9": { "hidden": true }, "n65_et16": { "hidden": true }, - "n70_k5m9": { + "n59_ovii": { "hidden": true }, "n69_z384": { "hidden": true + }, + "n68_z384": { + "hidden": true + }, + "n1_kwi0": { + "hidden": true + }, + "n72_mtk5": { + "hidden": true + }, + "n2_kwi0": { + "hidden": true + }, + "n26_kwi0": { + "hidden": true + }, + "n24_kwi0": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 42881306..5e603905 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,17 +1,18 @@ { - "libview.firstColumnWidth": 384, + "libview.firstColumnWidth": 398, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46l679hws", - "ui://m7iejg46hsbhhjn", - "ui://m7iejg46g6sw7i79", - "ui://m7iejg46jgh8hwv", - "ui://m7iejg46kwi0hk0" + "ui://m7iejg4610snh5j", + "ui://m7iejg46kwi0hkb", + "ui://2d9xdj6z75efcz", + "ui://1hl55dqmc4r115", + "ui://27vd145bh1uu3i", + "ui://27vd145br0qx7i5y" ], - "test.device": "iPad Pro", + "test.device": "Huawei Mate20", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46kwi0hk0", + "doc.activeDoc": "ui://m7iejg46kwi0hkb", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -19,19 +20,19 @@ "27vd145b", "/component/", "27vd145b", + "/component/create_room/", + "27vd145b", + "/component/create_room/COMMui/", + "27vd145b", "/component/head/", - "m7iejg46", + "27vd145b", + "/images/", + "27vd145b", + "/images/ComxiantangMui/", + "1hl55dqm", "/", "m7iejg46", - "/component/", - "m7iejg46", - "/component/Btn/", - "m7iejg46", - "/component/Btn/date_set/", - "m7iejg46", - "/component/Lst_info/", - "m7iejg46", - "/component/nav/", + "/", "m7iejg46", "/images/", "m7iejg46", @@ -41,11 +42,15 @@ "m7iejg46", "/mgr/component/", "m7iejg46", + "/mgr/component/member/", + "m7iejg46", "/mgr/component/record/", "m7iejg46", "/mgr/imgs/", "m7iejg46", - "/mgr/imgs/member/" + "/mgr/imgs/member/", + "x3mp2cn6", + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml b/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml index e2a1b598..66abcd49 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml @@ -1,6 +1,6 @@ - + @@ -11,5 +11,5 @@ -