diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 76873339..b9035061 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -981,7 +981,7 @@ function M:InitView(url) self._view:GetChild('tex_name').text = self.curGroup.name self._view:GetChild('tex_tableNum').text = string.format("进行:%d桌", self.curGroup.room_num) - self._view:GetChild('tex_hp').text = DataManager.SelfUser.diamo + -- self._view:GetChild('tex_hp').text = DataManager.SelfUser.diamo print("lingmenginitgroup", self.curGroup.id, self.curGroup.name) -- self._view:GetChild('tex_p_name').text = ViewUtil.stringEllipsis(DataManager.SelfUser.nick_name) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua index b0972386..fc9c92ea 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua @@ -1,12 +1,12 @@ -- 牌友圈成员体力值记录 -local TimeSettingPanel = import("Game.View.NewGroup.MngView.TimeSettingPanel") +local TimeSettingPanel = import("Game.View.NewGroup.MngView.TimeSettingPanelTog") local GroupMemberFagLogView = {} local M = GroupMemberFagLogView function GroupMemberFagLogView.new(group_id, member, not_manager) - setmetatable(M, {__index = BaseWindow}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) self.class = "GroupMemberFagLogView" self._close_destroy = true -- self._blur_view = blur_view @@ -15,7 +15,7 @@ function GroupMemberFagLogView.new(group_id, member, not_manager) self._full = true self._animation = false self.group_id = group_id - self.hp_log = {} + self.hp_log = {} self.daily_count = {} self.not_manager = not_manager self._full = true @@ -25,7 +25,7 @@ function GroupMemberFagLogView.new(group_id, member, not_manager) end function M:init(url) - BaseWindow.init(self,url) + BaseWindow.init(self, url) local btn_close = self._view:GetChild("btn_close") btn_close.onClick:Set(function() @@ -33,26 +33,25 @@ function M:init(url) end) for i = 1, 8 do - local tem = math.pow(2, i - 1) - local btn_filter = self._view:GetChild("btn_filter" .. tem) - if btn_filter then - btn_filter.onClick:Set(function() - self.hp_log = {} + local tem = math.pow(2, i - 1) + local btn_filter = self._view:GetChild("btn_filter" .. tem) + if btn_filter then + btn_filter.onClick:Set(function() + self.hp_log = {} self.m_index = 0 - self.lst_fag.numItems = 0 - self:GetData(0) - end) - end + self.lst_fag.numItems = 0 + self:GetData(0) + end) + end end self.lst_fag = self._view:GetChild("lst_fag") - self.lst_fag:SetVirtual() + self.lst_fag:SetVirtual() self.lst_fag.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) - end + self:OnRenderItem(index, obj) + end self.lst_fag.scrollPane.onPullUpRelease:Set(function() - self:GetData(self.lst_fag.numItems+self.m_index) - + self:GetData(self.lst_fag.numItems + self.m_index) end) if not self.not_manager then self._view:GetController("manager").selectedIndex = 1 @@ -66,7 +65,7 @@ function M:init(url) self.lst_daily_count:SetVirtual() self.lst_daily_count.itemRenderer = function(index, obj) self:OnRenderDailyItem(index, obj) - end + end self.ctr_index = self._view:GetController("index") self.ctr_index.onChanged:Set(function() @@ -75,36 +74,36 @@ function M:init(url) end end) - self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0, function() + self.hp_log = {} + self.lst_fag.numItems = 0 + self.m_index = 0 + self.begin_time, self.end_time = self.time_panel:GetDate() + self:GetData(0) + end) self.begin_time, self.end_time = self.time_panel:GetDate() - self._view:GetChild("btn_search").onClick:Set(function() - self.hp_log = {} - self.lst_fag.numItems = 0 - self.m_index = 0 - self.begin_time, self.end_time = self.time_panel:GetDate() - self:GetData(0) - end) self:GetData(0) end -- 获取过滤值,根据多选框计算 function M:GetFilter() - local filter = 0 + local filter = 0 for i = 1, 8 do - local tem = math.pow(2, i - 1) + local tem = math.pow(2, i - 1) --print("aaaaaaaaaaaaaaaaaaaaaaaa ",tem) - local btn_filter = self._view:GetChild("btn_filter" .. tem) - if btn_filter and btn_filter.selected then - filter = filter + tem - end + local btn_filter = self._view:GetChild("btn_filter" .. tem) + if btn_filter and btn_filter.selected then + filter = filter + tem + end end return filter end -- 显示原因文本 local function __getReason(data) - -- return "玩家操作" + -- return "玩家操作" local s_nick = string.utf8sub(data.m_nick, 6) if data.reason == 6 then return data.info @@ -121,14 +120,14 @@ local function __getReason(data) return string.format("[color=#FF6600]%s[/color](%s) %s", s_nick, data.mgr_id, "操作减少") -- return "每日提取" elseif data.reason == 12 then - return "推广奖励" + return "推广奖励" elseif data.reason == 13 then if data.hp < 0 then return string.format("转账给 [color=#FF6600]%s(%s)[/color]", s_nick, data.mgr_id) else return string.format("收到 [color=#FF6600]%s(%s)[/color] 转账", s_nick, data.mgr_id) - end - elseif data.reason == 14 then + end + elseif data.reason == 14 then return "提取能量包" elseif data.reason == 15 then return "" @@ -146,97 +145,98 @@ end -- 获取体力值详情数据 function M:GetData(index) - local filter = self:GetFilter() - if filter == 0 then return end - ViewUtil.ShowModalWait() + local filter = self:GetFilter() + if filter == 0 then return end + ViewUtil.ShowModalWait() local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMemberHpLog(self.group_id, self.member.uid, index, 6, filter, self.begin_time, self.end_time, function(res) - if self._is_destroy then - return - end - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败") - else - local data = res.Data.hp_logs - if #data == 0 then return end - -- print("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") - -- pt(data) - -- pt(self.member) - for i = 1, #data do - self.hp_log[#self.hp_log + 1] = data[i] + fgCtr:FG_GetMemberHpLog(self.group_id, self.member.uid, index, 6, filter, self.begin_time, self.end_time, + function(res) + if self._is_destroy then + return end - --self:GuoLv(data) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败") + else + local data = res.Data.hp_logs + if #data == 0 then return end + -- print("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") + -- pt(data) + -- pt(self.member) + for i = 1, #data do + self.hp_log[#self.hp_log + 1] = data[i] + end + --self:GuoLv(data) - self.lst_fag.numItems = #self.hp_log - end - end) + self.lst_fag.numItems = #self.hp_log + end + end) end function M:GuoLv(data) - if self.member.lev == 1 then + if self.member.lev == 1 then local m_data_other = {} local m_data_my = {} - for i=1,#data do + for i = 1, #data do if self.member.uid ~= data[i].mgr_id then - table.insert(m_data_other,data[i]) + table.insert(m_data_other, data[i]) else - table.insert(m_data_my,data[i]) + table.insert(m_data_my, data[i]) end end -- printlog("比较计算=========m_data_my>>>",#m_data_my) -- printlog("比较计算=========m_data_other>>>",#m_data_other) - - if #m_data_my>0 and #m_data_other==0 then + + if #m_data_my > 0 and #m_data_other == 0 then for i = 1, #m_data_my do - self.hp_log[#self.hp_log + 1] = m_data_my[i] + self.hp_log[#self.hp_log + 1] = m_data_my[i] end self.m_index = #data - #m_data_my + self.m_index else for i = 1, #m_data_other do - self.hp_log[#self.hp_log + 1] = m_data_other[i] + self.hp_log[#self.hp_log + 1] = m_data_other[i] end self.m_index = #data - #m_data_other + self.m_index - end + end else local m_data_other = {} local m_data_my = {} - - for i=1,#data do + + for i = 1, #data do if self.member.uid ~= data[i].mgr_id then - table.insert(m_data_other,data[i]) + table.insert(m_data_other, data[i]) end end -- printlog("比较计算11=========m_data_my>>>",#m_data_my) -- printlog("比较计算11=========m_data_other>>>",#m_data_other) - + for i = 1, #m_data_other do self.hp_log[#self.hp_log + 1] = m_data_other[i] end self.m_index = #data - #m_data_other + self.m_index end - end local function fillItem(data, obj) local num = d2ad(data.hp) obj:GetChild("tex_num").text = num >= 0 and ('+' .. num) or num - obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",data.time) - obj:GetChild("tex_reason").text = __getReason(data) + obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M", data.time) + obj:GetChild("tex_reason").text = __getReason(data) end -- 填充体力值详情对象 function M:OnRenderItem(index, obj) local data = self.hp_log[index + 1] obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(self.member.nick) + obj:GetChild("tex_id").text = string.format("ID:%s", ViewUtil.stringEllipsis(self.member.uid)) local num = d2ad(data.hp) obj:GetChild("tex_num").text = num >= 0 and ('+' .. num) or num obj:GetController("add").selectedIndex = num >= 0 and 1 or 0 obj:GetChild("tex_fag").text = d2ad(data.cur_hp) obj:GetChild("tex_reason").text = __getReason(data) - obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",data.time) + obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M", data.time) local btn_head = obj:GetChild("btn_head") btn_head.icon = "ui://Common/Head0" ImageLoad.Load(self.member.portrait, btn_head._iconObject) @@ -261,7 +261,7 @@ function M:OnRenderItem(index, obj) local item = lst:AddItemFromPool() fillItem(data.detail[i], item) end - obj.height =95 * (#data.detail+1) + obj.height = 95 * (#data.detail + 1) self.lst_fag:RefreshVirtualList() self.lst_fag:ScrollToView(index) else @@ -272,7 +272,7 @@ function M:OnRenderItem(index, obj) return end ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败") else data.detail = res.Data.hp_logs @@ -281,7 +281,7 @@ function M:OnRenderItem(index, obj) local item = lst:AddItemFromPool() fillItem(data.detail[i], item) end - obj.height =95 * (#data.detail+1) + obj.height = 95 * (#data.detail + 1) self.lst_fag:RefreshVirtualList() self.lst_fag:ScrollToView(index) end @@ -299,7 +299,7 @@ function M:GetDailyData() return end ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败") else self.daily_count = res.Data.list @@ -311,9 +311,9 @@ end -- 填充日统计对象 function M:OnRenderDailyItem(index, obj) local data = self.daily_count[#self.daily_count - index] - obj:GetChild("tex_date").text = os.date("%Y-%m-%d",data.time) + obj:GetChild("tex_date").text = os.date("%Y-%m-%d", data.time) local num = d2ad(data.num) obj:GetChild("tex_num").text = num >= 0 and ('+' .. num) or num end -return M \ No newline at end of file +return M 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 4a383a22..1c74707d 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua @@ -4,22 +4,24 @@ local GroupSetPermissionView = import(".GroupSetPermissionView") local GroupBanSameTableView = import(".GroupBanSameTableView") local MngPermission = import(".MngPermission") local GroupSetTagView = import("../GroupSetTagView") -local GroupSetMemberInfoDiaoduView=import('.GroupSetMemberInfoDiaoduView') +local GroupSetMemberInfoDiaoduView = import('.GroupSetMemberInfoDiaoduView') local GroupPartnerBanPlaysView = import(".GroupPartnerBanPlaysView") +local GroupPartnerRewardsView = import(".GroupPartnerRewardsView") + -- 牌友圈成员体力值记录 local GroupMemberOperateView = {} local M = GroupMemberOperateView -function GroupMemberOperateView.new(group_id, member, callBack,callBack1) - setmetatable(M, {__index = BaseWindow}) - local self = setmetatable({}, {__index = M}) +function GroupMemberOperateView.new(group_id, member, callBack, callBack1) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) self.class = "GroupMemberOperateView" self._close_destroy = true -- self._blur_view = blur_view - --print("GroupMemberOperateView==============") - --pt(member) + --print("GroupMemberOperateView==============") + --pt(member) self.member = member self.group_id = group_id self.callBack = callBack @@ -30,11 +32,11 @@ 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) @@ -46,13 +48,13 @@ local function CheckPermission(lev, permission) end function M:init(url) - BaseWindow.init(self,url) + BaseWindow.init(self, url) local member = self.member - local group = DataManager.groups:get(self.group_id) - --print("DataManager.groups:get(self.group_id)") - --pt(group) - local perm_array = MngPermission.getPermData(group.permission) + local group = DataManager.groups:get(self.group_id) + --print("DataManager.groups:get(self.group_id)") + --pt(group) + local perm_array = MngPermission.getPermData(group.permission) local btn_close = self._view:GetChild("btn_close") btn_close.onClick:Set(function() @@ -102,10 +104,9 @@ function M:init(url) ctr_superior.selectedIndex = 0 self._view:GetChild("tex_superior_id").text = "" end - + local fgCtr = ControllerManager.GetController(NewGroupController) self._view:GetChild("btn_deploy").onClick:Set(function() - local gniv = GroupNumberInputView.new(nil, function(num) ViewUtil.ShowModalWait() local parent_id = tonumber(num) @@ -113,7 +114,7 @@ function M:init(url) if self._is_destroy then return end - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.CloseModalWait() ViewUtil.ErrorTip(res.ReturnCode, "找不到成员") elseif res.Data.partnerLev == 0 then @@ -125,10 +126,10 @@ function M:init(url) if (res1.ReturnCode == 0) then member.parentId = parent_id self._view:GetChild("tex_superior_id").text = parent_id - ctr_superior.selectedIndex = 1 - ViewUtil.ShowBannerOnScreenCenter("调配玩家成功") + ctr_superior.selectedIndex = 1 + ViewUtil.ShowBannerOnScreenCenter("调配玩家成功") else - ViewUtil.ErrorTip(res1.ReturnCode,"调配玩家失败") + ViewUtil.ErrorTip(res1.ReturnCode, "调配玩家失败") end end) end @@ -138,14 +139,14 @@ function M:init(url) end) local vipbtn = self._view:GetChild("btn_vip") if vipbtn ~= nil then - if (group.lev < member.lev) or (group.lev == 3 and group.partnerLev > 0 and member.uid ~= DataManager.SelfUser.account_id) or (group.lev < 3 and member.uid == DataManager.SelfUser.account_id ) then + if (group.lev < member.lev) or (group.lev == 3 and group.partnerLev > 0 and member.uid ~= DataManager.SelfUser.account_id) or (group.lev < 3 and member.uid == DataManager.SelfUser.account_id) then vipbtn.visible = true vipbtn.selected = member.isvip == 1 and true or false vipbtn.onClick:Set(function() local selected = vipbtn.selected and 1 or 0 fgCtr:FG_GroupSetVip(self.group_id, member.uid, selected, function(res1) if self._is_destroy then - return + return end ViewUtil.CloseModalWait() if res1.ReturnCode == 0 then @@ -153,7 +154,7 @@ function M:init(url) self.callBack() else vipbtn.selected = not vipbtn.selected - ViewUtil.ErrorTip(res1.ReturnCode,"设置vip失败") + ViewUtil.ErrorTip(res1.ReturnCode, "设置vip失败") end end) end) @@ -161,25 +162,25 @@ function M:init(url) vipbtn.visible = false end end - - -- 管理功能列表 + + -- 管理功能列表 local lst_mng = self._view:GetChild("lst_mng") lst_mng:RemoveChildrenToPool() -- 删除按钮 local option = group.option or 0 - if (group.partnerLev > 0 and member.uid ~= DataManager.SelfUser.account_id and bit:_and(option,1) == 1) or group.lev < member.lev then + if (group.partnerLev > 0 and member.uid ~= DataManager.SelfUser.account_id and bit:_and(option, 1) == 1) or group.lev < member.lev then local btn_del = lst_mng:AddItemFromPool() btn_del.icon = "ui://NewGroup/mng_del" btn_del.onClick:Set(function() - if not CheckPermission(group.lev, perm_array[MngPermissionList.DeleteMember]) then + if not CheckPermission(group.lev, perm_array[MngPermissionList.DeleteMember]) then return end local _curren_msg = MsgWindow.new(nil, "确定删除该成员吗？", MsgWindow.MsgMode.OkAndCancel) - _curren_msg.onOk:Add(function() + _curren_msg.onOk:Add(function() ViewUtil.ShowModalWait() fgCtr:FG_GroupRemoveMember(self.group_id, member.uid, function(res1) if self._is_destroy then - return + return end ViewUtil.CloseModalWait() if res1.ReturnCode == 0 then @@ -187,136 +188,141 @@ function M:init(url) ViewUtil.ShowBannerOnScreenCenter("已成功删除玩家") self:Destroy() else - ViewUtil.ErrorTip(res1.ReturnCode,"删除成员失败") + ViewUtil.ErrorTip(res1.ReturnCode, "删除成员失败") end end) end) _curren_msg:Show() - end) end -- 禁止游戏 - -- + -- if (group.lev < member.lev) or (group.lev == 3 and group.partnerLev > 0 and member.uid ~= DataManager.SelfUser.account_id) then - --if group.lev == 1 and member.lev > 1 and member.partnerLev >0 and member.uid ~= DataManager.SelfUser.account_id then + --if group.lev == 1 and member.lev > 1 and member.partnerLev >0 and member.uid ~= DataManager.SelfUser.account_id then local btn_ban = lst_mng:AddItemFromPool() local pic = member.ban == 1 and "mng_del_ban" or "mng_ban" - btn_ban.icon = "ui://NewGroup/" .. pic + btn_ban.icon = "ui://NewGroup/" .. pic btn_ban.onClick:Set(function() - if not CheckPermission(group.lev, perm_array[MngPermissionList.BanPlaying]) then + 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() + _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 + 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() + btn_ban.icon = "ui://NewGroup/" .. pic + self.callBack() else - ViewUtil.ErrorTip(res1.ReturnCode,"禁止娱乐失败！") + ViewUtil.ErrorTip(res1.ReturnCode, "禁止娱乐失败！") end end) end) _curren_msg:Show() end) end - - --print("group.type=====================") - --print(group.type) - --pt(group) + + --print("group.type=====================") + --print(group.type) + --pt(group) if member.partnerLev > 0 and group.type == 2 and member.uid ~= DataManager.SelfUser.account_id then local btn_ban = lst_mng:AddItemFromPool() local pic = member.group_ban == 1 and "mng_del_ban_group" or "mng_ban_group" - btn_ban.icon = "ui://NewGroup/" .. pic + btn_ban.icon = "ui://NewGroup/" .. pic --printlog("jefe member.partnerLev",member.partnerLev) --if member.partnerLev==1 then - btn_ban.onClick:Set(function() - -- if not CheckPermission(group.lev, perm_array[MngPermissionList.BanPlaying]) then - -- return - -- end + btn_ban.onClick:Set(function() + -- if not CheckPermission(group.lev, perm_array[MngPermissionList.BanPlaying]) then + -- return + -- end - local str = member.group_ban == 1 and "确定恢复该合伙人整组娱乐吗？" or "确定禁止该合伙人整组娱乐吗？" - local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) - _curren_msg.onOk:Add(function() - ViewUtil.ShowModalWait() - local val = member.group_ban == 1 and 0 or 1 - fgCtr:FG_BanMember(self.group_id, member.uid, val, 2, function(res1) - if self._is_destroy then - return - end - ViewUtil.CloseModalWait() - if res1.ReturnCode == 0 then - member.group_ban = val - pic = member.group_ban == 1 and "mng_del_ban_group" or "mng_ban_group" - btn_ban.icon = "ui://NewGroup/" .. pic - self.callBack() - else - ViewUtil.ErrorTip(res1.ReturnCode,val == 1 and "禁止整组娱乐失败！" or "恢复整组娱乐失败！") - end - end) + local str = member.group_ban == 1 and "确定恢复该合伙人整组娱乐吗？" or "确定禁止该合伙人整组娱乐吗？" + local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) + _curren_msg.onOk:Add(function() + ViewUtil.ShowModalWait() + local val = member.group_ban == 1 and 0 or 1 + fgCtr:FG_BanMember(self.group_id, member.uid, val, 2, function(res1) + if self._is_destroy then + return + end + ViewUtil.CloseModalWait() + if res1.ReturnCode == 0 then + member.group_ban = val + pic = member.group_ban == 1 and "mng_del_ban_group" or "mng_ban_group" + btn_ban.icon = "ui://NewGroup/" .. pic + self.callBack() + else + ViewUtil.ErrorTip(res1.ReturnCode, val == 1 and "禁止整组娱乐失败！" or "恢复整组娱乐失败！") + end end) - _curren_msg:Show() end) - -- end + _curren_msg:Show() + 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 < 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) + local prv = GroupPartnerRewardsView.new(self.group_id, member.uid, member.partnerLev) + prv:Show() end) end - - if group.lev == 1 and member.lev > 1 and member.partnerLev >0 and member.uid ~= DataManager.SelfUser.account_id then - --if false then + + 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 - - + 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 + + -- 设置管理员 if group.lev == 1 and member.lev > 1 and member.partnerLev >= 0 then @@ -326,12 +332,12 @@ function M:init(url) btn_set_mng.onClick:Set(function() local str = member.lev == 3 and "确定设置玩家为副盟主吗？" or "确定取消玩家副盟主身份吗？" local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) - _curren_msg.onOk:Add(function() + _curren_msg.onOk:Add(function() ViewUtil.ShowModalWait() local val = 4 - member.lev fgCtr:FG_SetManager(self.group_id, member.uid, val, function(res1) if self._is_destroy then - return + return end ViewUtil.CloseModalWait() if res1.ReturnCode == 0 then @@ -344,28 +350,28 @@ function M:init(url) end self:Destroy() else - ViewUtil.ErrorTip(res1.ReturnCode,"设置副群主失败！") + ViewUtil.ErrorTip(res1.ReturnCode, "设置副群主失败！") end end) end) _curren_msg:Show() end) end - - + + if ((group.lev < 3 and member.parentId == 0) or (group.type == 2 and member.parentId == DataManager.SelfUser.account_id)) and member.partnerLev == 0 and member.lev == 3 then - local btn_set_partner = lst_mng:AddItemFromPool() + local btn_set_partner = lst_mng:AddItemFromPool() local pic = member.partnerLev == 0 and "mng_set_partner" or "mng_del_partner" btn_set_partner.icon = "ui://NewGroup/" .. pic btn_set_partner.onClick:Set(function() local str = member.partnerLev == 0 and "确定设置玩家为合伙人吗？" or "确定取消玩家合伙人身份吗？" local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel) - _curren_msg.onOk:Add(function() + _curren_msg.onOk:Add(function() ViewUtil.ShowModalWait() local val = member.partnerLev > 0 and 2 or 1 fgCtr:FG_SetPartner(self.group_id, member.uid, val, function(res1) if self._is_destroy then - return + return end ViewUtil.CloseModalWait() if res1.ReturnCode == 0 then @@ -376,7 +382,7 @@ function M:init(url) self:Destroy() else - ViewUtil.ErrorTip(res1.ReturnCode,"设置合伙人失败失败！") + ViewUtil.ErrorTip(res1.ReturnCode, "设置合伙人失败失败！") end end) end) @@ -384,7 +390,7 @@ function M:init(url) end) end - if ((group.lev < 3 and member.parentId == 0) or (group.type == 2 and member.parentId == DataManager.SelfUser.account_id)) and member.partnerLev == 0 and member.lev == 2 then + if ((group.lev < 3 and member.parentId == 0) or (group.type == 2 and member.parentId == DataManager.SelfUser.account_id)) and member.partnerLev == 0 and member.lev == 2 then local btn_set_permission = lst_mng:AddItemFromPool() btn_set_permission.icon = "ui://NewGroup/mng_set_permission" btn_set_permission.onClick:Set(function() @@ -405,35 +411,35 @@ function M:init(url) 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 + 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 - 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() + 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 @@ -454,7 +460,7 @@ function M:init(url) 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) + local banplays = GroupPartnerBanPlaysView.new(self.group_id, member.uid) banplays:Show() end) end @@ -463,32 +469,32 @@ function M:init(url) 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() + 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 + 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 - 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 end) + msg_tip:Close() + end) msg_tip:Show() end) end end -function M:MovePartner(parent_id, member, obj) +function M:MovePartner(parent_id, member, obj) local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_MovePartner(self.group_id, member.uid, parent_id, function(res1) ViewUtil.CloseModalWait() @@ -496,13 +502,12 @@ function M:MovePartner(parent_id, member, obj) member.parentId = parent_id member.partnerLev = res1.Data.partnerLev obj:GetChild("tex_superior_id").text = parent_id - obj:GetController("show_superior").selectedIndex = 1 - ViewUtil.ShowBannerOnScreenCenter("转移成功") + obj:GetController("show_superior").selectedIndex = 1 + ViewUtil.ShowBannerOnScreenCenter("转移成功") else - ViewUtil.ErrorTip(res1.ReturnCode,"转移失败") + ViewUtil.ErrorTip(res1.ReturnCode, "转移失败") end end) end - -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua index 43eb97fd..49e5972e 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua @@ -1,5 +1,5 @@ --牌友圈体力值记录 -local TimeSettingPanel = import(".TimeSettingPanel") +local TimeSettingPanel = import(".TimeSettingPanelTog") local GroupMngFagListView = {} local M = GroupMngFagListView @@ -20,25 +20,21 @@ function GroupMngFagListView.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_GroupFagList") 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,17 +105,17 @@ 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 @@ -130,7 +126,7 @@ function M:GetFagData(index) if self._is_destroy then return end - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") else if res.Data.hp_logs ~= nil then @@ -151,32 +147,32 @@ function M:GetFagData(index) lst.numItems = #local_data end 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,42 +182,42 @@ 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_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) + 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/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua index 4515c129..eeaf6344 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -13,7 +13,10 @@ local MngPermission = import('.MngPermission') local GroupMngMemberHpListView = { numberMap = { {}, {} }, - backTable = {} + backTable = {}, + pageNum = 4, + start = 1, + page = 1 } local M = GroupMngMemberHpListView @@ -91,12 +94,12 @@ function M:FillView() self.lst_member.itemRenderer = function(index, obj) self:OnRenderItem(index, obj) end - self.lst_member.scrollPane.onPullUpRelease:Set( - function() - --printlog("aaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbb ",self.lst_member.numItems) - self:GetMemberData(self.lst_member.numItems) - end - ) + -- self.lst_member.scrollPane.onPullUpRelease:Set( + -- function() + -- --printlog("aaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbb ",self.lst_member.numItems) + -- self:GetMemberData(self.lst_member.numItems) + -- end + -- ) -- 初始化搜索成员列表 self.lst_member_find = self._view:GetChild('lst_member_find') @@ -160,7 +163,7 @@ function M:FillView() self.lst_member_find.numItems = #tempTable else self._ctr_search.selectedIndex = 0 - self.lst_member.numItems = #self.member_data + self.lst_member.numItems = self:GetChildNumForPage() end end ) @@ -168,6 +171,25 @@ function M:FillView() local group = DataManager.groups:get(self.group_id) local perm_array = MngPermission.getPermData(group.permission) + self._view:GetChild('btn_less').onClick:Set(function() + if self.start >= 2 then + self.start = self.start - 1 + self.lst_member.numItems = self:GetChildNumForPage() + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) + else + ViewUtil.ErrorMsg(self._view, nil, "当前页数不能减少") + end + end) + self._view:GetChild('btn_add').onClick:Set(function() + if self.start < self.page then + self.start = self.start + 1 + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) + self.lst_member.numItems = self:GetChildNumForPage() + else + ViewUtil.ErrorMsg(self._view, nil, "当前页数不能增加") + end + end) + self:GetMemberData(0) end @@ -206,7 +228,9 @@ function M:GetMemberData(index) ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') else self.member_data = group.members - self.lst_member.numItems = group.member_num + self.lst_member.numItems = self:GetChildNumForPage() + self.page = math.ceil(#group.members / self.pageNum) + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) if index == 0 then -- self._view:GetChild('tex_memb_num').text = res.Data.member_num -- self._view:GetChild('tex_total_hp').text = d2ad(res.Data.hp_num1+res.Data.otherHp) @@ -345,7 +369,7 @@ function M:FillItem(obj, member, refresh, index) mp.hp = mhp end end - self.lst_member.numItems = #self.member_data + self.lst_member.numItems = self:GetChildNumForPage() -- 搜索出的玩家显示 if self._view:GetController('search').selectedIndex == 1 then obj:GetChild('tex_fag').text = d2ad(hp) @@ -374,7 +398,7 @@ function M:FillItem(obj, member, refresh, index) mp.hp = mhp end end - self.lst_member.numItems = #self.member_data + self.lst_member.numItems = self:GetChildNumForPage() -- 搜索出的玩家显示 if self._view:GetController('search').selectedIndex == 1 then obj:GetChild('tex_fag').text = d2ad(hp) @@ -401,10 +425,10 @@ function M:FillItem(obj, member, refresh, index) 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.lst_member.numItems = self:GetChildNumForPage() self._view:GetController('search').selectedIndex = 0 else - self.lst_member.numItems = self.lst_member.numItems + self.lst_member.numItems = self:GetChildNumForPage() if refresh then self:FillItem(obj, member) end @@ -492,7 +516,7 @@ end function M:OnRenderItem(index, obj) --printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww ",index) - local member = self.member_data[index + 1] + local member = self.member_data[(self.start - 1) * self.page + index + 1] if member then self:FillItem(obj, member, false, index + 1) end @@ -600,4 +624,12 @@ function M:ClearNumTex() self.tex_num.text = self._texnum_str end +function M:GetChildNumForPage() + local numberNum = #self.member_data + if self.start * self.pageNum > numberNum then + return numberNum - (self.start - 1) * self.pageNum + end + return self.pageNum +end + return M 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 0455ec2e..bc5da61f 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua @@ -25,18 +25,18 @@ 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 +44,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 +60,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 +81,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 +104,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 +114,80 @@ 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) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败") else - local partners = res.Data.members - for i = 1, #partners do + local partners = res.Data.members + for i = 1, #partners do self.partner_data[#self.partner_data + 1] = partners[i] 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 +211,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 +233,6 @@ end -- 填充合伙人对象 function M:FillItem(obj, partner) - local group = DataManager.groups:get(self.group_id) local perm_array = MngPermission.getPermData(group.permission) @@ -252,7 +241,7 @@ 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 + 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 @@ -262,7 +251,7 @@ function M:FillItem(obj, partner) 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 + if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then return end __change_fag(self.group_id, partner.uid, true, nil, function(data) @@ -283,8 +272,7 @@ function M:FillItem(obj, partner) end) end) obj:GetChild("btn_fag_minus").onClick:Set(function() - - if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then + if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then return end __change_fag(self.group_id, partner.uid, false, partner.hp, function(data) @@ -306,8 +294,8 @@ function M:FillItem(obj, partner) end) obj:GetChild("tex_fag").text = d2ad(partner.hp) - - obj:GetChild("tex_member_count").text = ""..partner.total + + obj:GetChild("tex_member_count").text = "" .. partner.total obj:GetChild("btn_percent").onClick:Set(function() @@ -326,18 +314,13 @@ function M:FillItem(obj, partner) end) local btnDetail = obj:GetChild("btn_detail") - btnDetail.visible = partner.total > 0 + -- 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 +329,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 +339,4 @@ function M:ShowPartnerRewards(partner_id, partnerLev) prv:Show() end -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatView.lua index e83121a9..ae1bb0da 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatView.lua @@ -1,4 +1,4 @@ -local TimeSettingPanel = import(".TimeSettingPanel") +local TimeSettingPanel = import(".TimeSettingPanelTog") -- 开桌统计 local GroupMngPersonStatView = {} @@ -23,21 +23,28 @@ function M:InitView() self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupPersonStat") self.lst_record = self._view:GetChild("lst_record") - self.lst_record:SetVirtual() + self.lst_record:SetVirtual() self.lst_record.itemRenderer = function(index, obj) self:OnRenderRecordItem(index, obj) end self.lst_record.scrollPane.onPullUpRelease:Set(function() self:GetRecordData(self.lst_record.numItems) end) - - self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) + + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0, function() + self.record_data = {} + self.lst_record.numItems = 0 + + self.begin_time, self.end_time = self.time_panel:GetDate() + self:GetRecordData(0) + end) self.begin_time, self.end_time = self.time_panel:GetDate() local ctr_page = self._view:GetController("type") ctr_page.onChanged:Set(function() self.record_data = {} self.lst_record.numItems = 0 - self.begin_time = nil + self.begin_time = nil self.end_time = nil self:GetRecordData(0) end) @@ -52,9 +59,8 @@ function M:InitView() end function M:GetRecordData(index) - ViewUtil.ShowModalWait() - + local time_type = self._view:GetController("type").selectedIndex if self.begin_time ~= nil and self.end_time ~= nil then @@ -62,13 +68,13 @@ function M:GetRecordData(index) end local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetGroupPersonRecord(self.group_id, GetPlatform(), DataManager.SelfUser.account_id, time_type, self.begin_time, self.end_time, index, 6, function(res) - + fgCtr:FG_GetGroupPersonRecord(self.group_id, GetPlatform(), DataManager.SelfUser.account_id, time_type, + self.begin_time, self.end_time, index, 6, function(res) if self._is_destroy then return end ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败") else local records = res.Data.records @@ -77,15 +83,16 @@ function M:GetRecordData(index) end self.lst_record.numItems = #self.record_data - printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333",res.Data.total_round," ",res.Data.valid_round) + printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333", res.Data.total_round, + " ", res.Data.valid_round) pt(res.Data) if index == 0 then --self._view:GetChild("tex_num1").text = ""..res.Data.total --self._view:GetChild("tex_num3").text = ""..d2ad(res.Data.consume) self._view:GetChild("tex_winner_count").text = res.Data.total_round self._view:GetChild("tex_valid_count").text = res.Data.valid_round / 100 - - self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.total_win) + + self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.total_win) end end end) @@ -96,7 +103,7 @@ function M:FillRecordItem(data, obj) local room_id = data.room_id local create_time = data.create_time local room_type_str = data.game_info.name - local time =tonumber(create_time) + local time = tonumber(create_time) local room_time_str = os.date("%Y-%m-%d %H:%M:%S", time) local totalScore = json.decode(data.totalScore) local hpOnOff = data.hpOnOff @@ -114,21 +121,21 @@ function M:FillRecordItem(data, obj) player_list[i].house = 0 player_list[i].nick = p.nick end - local play_name = DataManager.groups:get(self.group_id):getPlayName(data.groupPid) + local play_name = DataManager.groups:get(self.group_id):getPlayName(data.groupPid) obj:GetChild("tex_time").text = room_time_str - obj:GetChild("tex_roomid").text = room_id - obj:GetChild("tex_times").text = d2ad(data.hp_times).."倍" + obj:GetChild("tex_roomid").text = room_id + obj:GetChild("tex_times").text = d2ad(data.hp_times) .. "倍" obj:GetChild("tex_game").text = play_name local lst_total = obj:GetChild("lst_total") lst_total:RemoveChildrenToPool() local ids = {} - for j=1,#totalScore do + for j = 1, #totalScore do local titem = lst_total:AddItemFromPool() local trdata = totalScore[j] titem:GetChild("tex_name").text = ViewUtil.stringEllipsis(trdata.nick) - titem:GetChild("tex_id").text = "ID:"..trdata.accId - table.insert( ids, trdata.accId ) + titem:GetChild("tex_id").text = "ID:" .. trdata.accId + table.insert(ids, trdata.accId) local score = trdata.score if trdata.hp == nil then @@ -138,7 +145,7 @@ function M:FillRecordItem(data, obj) else score = d2ad(trdata.hp) end - + titem:GetChild("tex_score").text = score if score >= 0 then @@ -156,23 +163,22 @@ function M:FillRecordItem(data, obj) obj:GetChild("btn_screenshot").onClick:Set(function() self:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType) - end) + end) obj:GetChild("btn_share").onClick:Set(function() ShareChatRoom(room_id, tostring(os.time()), data.round, room_type_str, self.group_id, player_list) - end) + end) obj.onClick:Set(function() - self:OnShowRecordInfo(data,ids) - end) + self:OnShowRecordInfo(data, ids) + end) end function M:OnRenderRecordItem(index, obj) local data = self.record_data[index + 1] - self:FillRecordItem(data, obj) + self:FillRecordItem(data, obj) end - -function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType) +function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType) ViewUtil.ShowModalWait(self._view, "正在分享...") UIPackage.AddPackage("base/rank/ui/Rank") local result_view = UIPackage.CreateObjectFromURL("ui://Rank/ResultView") @@ -195,15 +201,15 @@ function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, end item:GetChild("score").text = score if score < 0 then item:GetController("di").selectedIndex = 1 end - if p.portrait and p.portrait ~= "" then - ImageLoad.Load(p.portrait, item:GetChild("n9")._iconObject, self.class, function( ... ) - load_head_num = load_head_num - 1 - end) + if p.portrait and p.portrait ~= "" then + ImageLoad.Load(p.portrait, item:GetChild("n9")._iconObject, self.class, function(...) + load_head_num = load_head_num - 1 + end) else load_head_num = load_head_num - 1 end end - coroutine.start(function ( ... ) + coroutine.start(function(...) local left_time = 4 while (true) do if load_head_num == 0 or left_time == 0 then @@ -221,7 +227,7 @@ function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, end) end -function M:OnShowRecordInfo(rdata,ids) +function M:OnShowRecordInfo(rdata, ids) local ctr_record = self._view:GetController("record") ctr_record.selectedIndex = 1 @@ -233,26 +239,26 @@ function M:OnShowRecordInfo(rdata,ids) local playback_id = rdata.military_id local hpOnOff = rdata.hpOnOff local hpType = rdata.game_info.hpType - for i = 1,round_count do + for i = 1, round_count do local item = lst_recordInfo:AddItemFromPool() item:GetChild("tex_num").text = tostring(i) - local play_name = DataManager.groups:get(self.group_id):getPlayName(rdata.groupPid) + local play_name = DataManager.groups:get(self.group_id):getPlayName(rdata.groupPid) item:GetChild("tex_game").text = play_name - item:GetChild("tex_roomid").text = rdata.room_id + item:GetChild("tex_roomid").text = rdata.room_id - item:GetChild("tex_times").text = d2ad(rdata.hp_times).."倍" + item:GetChild("tex_times").text = d2ad(rdata.hp_times) .. "倍" - local round_score_str = rdata["round_"..i] + local round_score_str = rdata["round_" .. i] local round_score_item = json.decode(round_score_str) local lst_total = item:GetChild("lst_total") lst_total:RemoveChildrenToPool() - for k=1,#round_score_item do + for k = 1, #round_score_item do local titem = lst_total:AddItemFromPool() local trdata = round_score_item[k] titem:GetChild("tex_name").text = ViewUtil.stringEllipsis(trdata.nick) - titem:GetChild("tex_id").text = "ID:".. ids[k] + titem:GetChild("tex_id").text = "ID:" .. ids[k] local score = trdata.score if trdata.hp == nil then @@ -263,7 +269,7 @@ function M:OnShowRecordInfo(rdata,ids) score = d2ad(trdata.hp) end - + titem:GetChild("tex_score").text = score end @@ -272,11 +278,11 @@ function M:OnShowRecordInfo(rdata,ids) else item:GetController("person_num").selectedIndex = 0 end - local btn_play =item:GetChild("btn_play") + local btn_play = item:GetChild("btn_play") btn_play.onClick:Set(function() local group = DataManager.groups:get(self.group_id) if DataManager.SelfUser.playback[playback_id] ~= nil and DataManager.SelfUser.playback[playback_id][i] ~= nil then - local room = ExtendManager.GetExtendConfig(game_id):NewRoom() + local room = ExtendManager.GetExtendConfig(game_id):NewRoom() DataManager.CurrenRoom = room room.lev = group.lev room.game_id = game_id @@ -296,7 +302,7 @@ function M:OnShowRecordInfo(rdata,ids) _data["military_id"] = playback_id _data["round"] = tostring(i) local loddyCtr1 = ControllerManager.GetController(LoddyController) - loddyCtr1:RequestPlayBack(_data,function(code,data) + loddyCtr1:RequestPlayBack(_data, function(code, data) ViewUtil.CloseModalWait() if code == 0 then if DataManager.SelfUser.playback[playback_id] ~= nil then @@ -324,7 +330,7 @@ function M:OnShowRecordInfo(rdata,ids) end function M:GenaratePlayBack(id, game_id, ...) - local tem =nil + local tem = nil local dview_class = nil if not dview_class then local exconfig = ExtendManager.GetExtendConfig(game_id) @@ -333,11 +339,11 @@ function M:GenaratePlayBack(id, game_id, ...) if not dview_class then return end - local arg = {...} + local arg = { ... } tem = dview_class.new(...) tem.Id = id tem:Show() return tem end -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua index 81024764..73b42674 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua @@ -1,5 +1,5 @@ -- 开桌统计 -local TimeSettingPanel = import(".TimeSettingPanel") +local TimeSettingPanel = import(".TimeSettingPanelTog") local GroupMngPlayStatView = {} local M = GroupMngPlayStatView @@ -13,63 +13,66 @@ function GroupMngPlayStatView.new(gid) end function M:initData() - self:GetConsumeStatData() end function M:InitView() self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupPlayStat") - - self.consume_stat = {} --消耗统计 + + self.consume_stat = {} --消耗统计 self.lst_consume_stat = self._view:GetChild("lst_consume_stat") - self.lst_consume_stat:SetVirtual() + self.lst_consume_stat:SetVirtual() self.lst_consume_stat.itemRenderer = function(index, obj) - self:OnRenderConsumeItem(index, obj) - end + self:OnRenderConsumeItem(index, obj) + end self._view:GetChild("btn_search").onClick:Set(function() self.consume_stat = {} self.lst_consume_stat.numItems = 0 - self:GetConsumeStatData() + self:GetConsumeStatData() end) - self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0, function() + self.consume_stat = {} + self.lst_consume_stat.numItems = 0 + self:GetConsumeStatData() + end) end -function M:GetConsumeStatData() - ViewUtil.ShowModalWait() +function M:GetConsumeStatData() + ViewUtil.ShowModalWait() local begin_time, end_time = self.time_panel:GetDate() local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetConsumeStat(self.group_id,begin_time,end_time, function(res) + fgCtr:FG_GetConsumeStat(self.group_id, begin_time, end_time, function(res) if self._is_destroy then return end - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取统计数据失败") else self.consume_stat = res.Data.cosume_logs local top = #self.consume_stat + 1 - self.consume_stat[top] = {round=0,valid=0,no_valid=0,diamo_cost=0,pid=0} + self.consume_stat[top] = { round = 0, valid = 0, no_valid = 0, diamo_cost = 0, pid = 0 } - for i = 1,#self.consume_stat - 1 do - self.consume_stat[top].round = (self.consume_stat[top].round + self.consume_stat[i].round) - self.consume_stat[top].valid = (self.consume_stat[top].valid + self.consume_stat[i].valid) - self.consume_stat[top].no_valid = (self.consume_stat[top].no_valid + self.consume_stat[i].no_valid) - self.consume_stat[top].diamo_cost = (self.consume_stat[top].diamo_cost + self.consume_stat[i].diamo_cost) + for i = 1, #self.consume_stat - 1 do + self.consume_stat[top].round = (self.consume_stat[top].round + self.consume_stat[i].round) + self.consume_stat[top].valid = (self.consume_stat[top].valid + self.consume_stat[i].valid) + self.consume_stat[top].no_valid = (self.consume_stat[top].no_valid + self.consume_stat[i].no_valid) + self.consume_stat[top].diamo_cost = (self.consume_stat[top].diamo_cost + self.consume_stat[i].diamo_cost) end - self.lst_consume_stat.numItems = #self.consume_stat - + self.lst_consume_stat.numItems = #self.consume_stat end end) end function M:OnRenderConsumeItem(index, obj) local ci = index + 1 - local data = self.consume_stat[ci] + local data = self.consume_stat[ci] local play = DataManager.groups:get(self.group_id):getPlay(data.pid) obj:GetChild("title").text = play and play.name or "总计" @@ -86,4 +89,4 @@ function M:OnRenderConsumeItem(index, obj) obj:GetChild("tex_diamond").text = data.diamo_cost / 100 end -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRankView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRankView.lua index de4c1adb..b06e2686 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRankView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRankView.lua @@ -1,5 +1,5 @@ -- 牌友圈排行界面 -local TimeSettingPanel = import(".TimeSettingPanel") +local TimeSettingPanel = import(".TimeSettingPanelTog") local GroupMngRankView = {} @@ -22,19 +22,19 @@ end -- 初始化数据 function M:initData() - self.rank_data = {} - self.round_data = {} + self.rank_data = {} + self.round_data = {} self.win_data = {} - self.lst_rank.numItems = 0 - self.lst_round.numItems = 0 - local page = self._view:GetController("page").selectedIndex - if page == 0 then - self:GetRankData(0) - elseif page == 1 then - self:GetRoundData() + self.lst_rank.numItems = 0 + self.lst_round.numItems = 0 + local page = self._view:GetController("page").selectedIndex + if page == 0 then + self:GetRankData(0) + elseif page == 1 then + self:GetRoundData() elseif page == 2 then self:GetWinRankData(0) - end + end end -- 快速访问 @@ -57,53 +57,52 @@ function M:FillView() self.win_data = {} self._view:GetChild("btn_search").onClick:Set(function() self:clearRankData() - self:GetRankData(#self.rank_data) + self:GetRankData(#self.rank_data) end) self._view:GetChild("btn_search1").onClick:Set(function() self:clearRankData() - self:GetWinRankData(#self.win_data) end) self.lst_rank = self._view:GetChild("lst_rank") - self.lst_rank:SetVirtual() + self.lst_rank:SetVirtual() self.lst_rank.itemRenderer = function(index, obj) - self:OnRenderRankItem(index, obj) - end + self:OnRenderRankItem(index, obj) + end self.lst_rank.scrollPane.onPullUpRelease:Set(function() self:GetRankData(self.lst_rank.numItems) end) self.lst_round = self._view:GetChild("lst_round") self.lst_round:SetVirtual() self.lst_round.itemRenderer = function(index, obj) - self:OnRenderRoundItem(index, obj) + self:OnRenderRoundItem(index, obj) end - + self.lst_winrank = self._view:GetChild("lst_winrank") - self.lst_winrank:SetVirtual() + self.lst_winrank:SetVirtual() self.lst_winrank.itemRenderer = function(index, obj) - self:OnRenderWinRankItem(index, obj) - end + self:OnRenderWinRankItem(index, obj) + end self.lst_winrank.scrollPane.onPullUpRelease:Set(function() self:GetWinRankData(self.lst_winrank.numItems) end) - local ctr_page = self._view:GetController("page") - ctr_page.onChanged:Set(function() - if ctr_page.selectedIndex == 0 then + local ctr_page = self._view:GetController("page") + ctr_page.onChanged:Set(function() + if ctr_page.selectedIndex == 0 then self.rank_data = {} self.lst_rank.numItems = 0 - self:GetRankData(0) + self:GetRankData(0) elseif ctr_page.selectedIndex == 1 then - self:GetRoundData() + self:GetRoundData() else self.win_data = {} self.lst_winrank.numItems = 0 - self:GetWinRankData(0) - end - end) + self:GetWinRankData(0) + end + end) local items = {} local values = {} @@ -111,97 +110,105 @@ function M:FillView() table.insert(values, "0") local group = DataManager.groups:get(self.group_id) if #group.playList > 0 then - for i = 1, #group.playList do - local play = group.playList[i] - table.insert(items, play.name) - table.insert(values, tostring(play.id)) - end - end + for i = 1, #group.playList do + local play = group.playList[i] + table.insert(items, play.name) + table.insert(values, tostring(play.id)) + end + end local cb_play = self._view:GetChild("cb_play") cb_play.items = items cb_play.values = values cb_play.selectedIndex = 0 - + self._view:GetChild("cb_play").onChanged:Set(function() - self.rank_data = {} - self.round_data = {} + self.rank_data = {} + self.round_data = {} self.win_data = {} - self.lst_rank.numItems = 0 - self.lst_round.numItems = 0 + self.lst_rank.numItems = 0 + self.lst_round.numItems = 0 self.lst_winrank.numItems = 0 - if ctr_page.selectedIndex == 0 then - self:GetRankData(0) + if ctr_page.selectedIndex == 0 then + self:GetRankData(0) elseif ctr_page.selectedIndex == 1 then - self:GetRoundData() + self:GetRoundData() else self:GetWinRankData(0) end end) - self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) - self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btndate1"), self._view:GetChild("btndate2"), -308, 0) + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0, function() + self:clearRankData() + self:GetRankData(#self.rank_data) + end) + self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btndate1"), self._view:GetChild("btndate2"), + -308, 0, function() + self:clearRankData() + self:GetWinRankData(#self.win_data) + end) end -function M:GetRankData(index) - ViewUtil.ShowModalWait() - local begin_time, end_time = self.time_panel:GetDate() - local pid = tonumber(self._view:GetChild("cb_play").value) +function M:GetRankData(index) + ViewUtil.ShowModalWait() + local begin_time, end_time = self.time_panel:GetDate() + local pid = tonumber(self._view:GetChild("cb_play").value) local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMemberRank(self.group_id, pid, index, 6, begin_time, end_time, nil,function(res) + fgCtr:FG_GetMemberRank(self.group_id, pid, index, 6, begin_time, end_time, nil, function(res) if self._is_destroy then return end - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败") else - local ranks = res.Data.ranks - if #ranks == 0 then return end - for i = 1, #ranks do - self.rank_data[#self.rank_data + 1] = ranks[i] - end - self.lst_rank.numItems = #self.rank_data - self.zongren.text = "总人数:"..res.Data.allActiveNum + local ranks = res.Data.ranks + if #ranks == 0 then return end + for i = 1, #ranks do + self.rank_data[#self.rank_data + 1] = ranks[i] + end + self.lst_rank.numItems = #self.rank_data + self.zongren.text = "总人数:" .. res.Data.allActiveNum end end) end -function M:GetWinRankData(index) - ViewUtil.ShowModalWait() - local begin_time, end_time = self.time_panel1:GetDate() - local pid = tonumber(self._view:GetChild("cb_play").value) +function M:GetWinRankData(index) + ViewUtil.ShowModalWait() + local begin_time, end_time = self.time_panel1:GetDate() + local pid = tonumber(self._view:GetChild("cb_play").value) local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMemberRank(self.group_id, pid, index, 6, begin_time, end_time, 1,function(res) + fgCtr:FG_GetMemberRank(self.group_id, pid, index, 6, begin_time, end_time, 1, function(res) if self._is_destroy then return end - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取总输赢排名信息失败") else - local ranks = res.Data.ranks - if #ranks == 0 then return end - for i = 1, #ranks do - self.win_data[#self.win_data + 1] = ranks[i] - end + local ranks = res.Data.ranks + if #ranks == 0 then return end + for i = 1, #ranks do + self.win_data[#self.win_data + 1] = ranks[i] + end -- table.sort(self.win_data,function (a,b) -- return a.win > b.win -- end) - self.lst_winrank.numItems = #self.win_data - self.zongren.text = "总人数:"..res.Data.allActiveNum + self.lst_winrank.numItems = #self.win_data + self.zongren.text = "总人数:" .. res.Data.allActiveNum end end) end function M:OnRenderRankItem(index, obj) - local tem = index + 1 - local data = self.rank_data[tem] - if tem < 4 then - obj:GetController("order").selectedIndex = tem - else + local tem = index + 1 + local data = self.rank_data[tem] + if tem < 4 then + obj:GetController("order").selectedIndex = tem + else obj:GetController("order").selectedIndex = 0 - obj:GetChild("tex_order").text = tem - end + obj:GetChild("tex_order").text = tem + end local group = DataManager.groups:get(self.group_id) local str_nick = ViewUtil.stringEllipsis(data.nick) if group.lev ~= 3 then @@ -214,14 +221,14 @@ function M:OnRenderRankItem(index, obj) end function M:OnRenderWinRankItem(index, obj) - local tem = index + 1 - local data = self.win_data[tem] - if tem < 4 then - obj:GetController("order").selectedIndex = tem - else + local tem = index + 1 + local data = self.win_data[tem] + if tem < 4 then + obj:GetController("order").selectedIndex = tem + else obj:GetController("order").selectedIndex = 0 - obj:GetChild("tex_order").text = tem - end + obj:GetChild("tex_order").text = tem + end local group = DataManager.groups:get(self.group_id) local str_nick = ViewUtil.stringEllipsis(data.nick) if group.lev ~= 3 then @@ -233,29 +240,29 @@ function M:OnRenderWinRankItem(index, obj) obj:GetChild("tex_round").text = data.round end -function M:GetRoundData() - ViewUtil.ShowModalWait() - local pid = tonumber(self._view:GetChild("cb_play").value) +function M:GetRoundData() + ViewUtil.ShowModalWait() + local pid = tonumber(self._view:GetChild("cb_play").value) local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GetRoundStat(self.group_id, pid, function(res) if self._is_destroy then return end - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败") else - self.round_data = res.Data.rounds - self.lst_round.numItems = #self.round_data + self.round_data = res.Data.rounds + self.lst_round.numItems = #self.round_data end end) end function M:OnRenderRoundItem(index, obj) - local tem = #self.round_data - index - local data = self.round_data[tem] - obj:GetChild("tex_time").text = os.date("%Y-%m-%d", data.time) - obj:GetChild("tex_round").text = data.num + local tem = #self.round_data - index + local data = self.round_data[tem] + obj:GetChild("tex_time").text = os.date("%Y-%m-%d", data.time) + obj:GetChild("tex_round").text = data.num end -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupTakeLogView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupTakeLogView.lua index 0d1869a2..a1e732ba 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupTakeLogView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupTakeLogView.lua @@ -1,13 +1,13 @@ -- 能量包提取记录 -local TimeSettingPanel = import(".TimeSettingPanel") +local TimeSettingPanel = import(".TimeSettingPanelTog") local GroupTakeLogView = {} local M = GroupTakeLogView -function GroupTakeLogView.new(blur_view,group_id,uid) - setmetatable(M, {__index = BaseWindow}) - local self = setmetatable({}, {__index = M}) +function GroupTakeLogView.new(blur_view, group_id, uid) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) self.class = "GroupTakeLogView" self._close_destroy = true self.uid = uid @@ -18,22 +18,22 @@ function GroupTakeLogView.new(blur_view,group_id,uid) end function M:init(url) - BaseWindow.init(self,url) + BaseWindow.init(self, url) self.take_log = {} self.lst_log = self._view:GetChild("lst_log") - self.lst_log:SetVirtual() + self.lst_log:SetVirtual() self.lst_log.itemRenderer = function(index, obj) self:OnRenderItem(index, obj) - end + end self.lst_log.scrollPane.onPullUpRelease:Set(function() self:getTakeLog(self.lst_log.numItems) end) - self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) - self._view:GetChild("btn_search").onClick:Set(function() - self.take_log = {} - self:getTakeLog(0) - end) + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0, function() + self.take_log = {} + self:getTakeLog(0) + end) self:getTakeLog(0) end @@ -41,8 +41,8 @@ end function M:getTakeLog(index) local begin_time, end_time = self.time_panel:GetDate() local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetTakeLog(self.group_id, index, 6, begin_time, end_time, self.uid,function(res) - if res.ReturnCode ~= 0 then + fgCtr:FG_GetTakeLog(self.group_id, index, 6, begin_time, end_time, self.uid, function(res) + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取提取详情失败") else local hp_logs = res.Data.hp_logs @@ -64,4 +64,4 @@ function M:OnRenderItem(index, obj) obj:GetChild("tex_data").text = os.date("%Y-%m-%d\r%H:%M", data.time) end -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/TimeSettingPanelTog.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/TimeSettingPanelTog.lua index 34bd3fc6..2076dcbf 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/TimeSettingPanelTog.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/TimeSettingPanelTog.lua @@ -52,69 +52,101 @@ end local max_pos, min_pos = 0.2, 2.2 -- 添加列表特效：中部的组件放大，两边的渐渐透明 -local function addListEffect(lst) - local mid_y = 0.5 * lst.height - local cnt = lst.numChildren - for i = 0, cnt - 1 do - local item = lst:GetChildAt(i) - local index = lst.scrollPane.percY * (lst.numChildren - 5) - local dist = math.abs(index + 2 - i) -- 距离列表中点的位置 - if dist <= max_pos then - item.alpha = 1 - item:GetChild("title"):SetScale(1, 1) - elseif dist <= min_pos then - local scale = dist / min_pos - item.alpha = 1 - 0.7 * scale - item:GetChild("title"):SetScale(1 - 0.5 * scale, 1 - 0.5 * scale) - else - item.alpha = 0.3 - item:GetChild("title"):SetScale(0.5, 0.5) - end - lst.data = lst:GetChildAt(2).data - math.floor(index + 0.5) * 86400 - end -end +-- local function addListEffect(lst) +-- local mid_y = 0.5 * lst.height +-- local cnt = lst.numChildren +-- for i = 0, cnt - 1 do +-- local item = lst:GetChildAt(i) +-- local index = lst.scrollPane.percY * (lst.numChildren - 5) +-- local dist = math.abs(index + 2 - i) -- 距离列表中点的位置 +-- if dist <= max_pos then +-- item.alpha = 1 +-- item:GetChild("title"):SetScale(1, 1) +-- elseif dist <= min_pos then +-- local scale = dist / min_pos +-- item.alpha = 1 - 0.7 * scale +-- item:GetChild("title"):SetScale(1 - 0.5 * scale, 1 - 0.5 * scale) +-- else +-- item.alpha = 0.3 +-- item:GetChild("title"):SetScale(0.5, 0.5) +-- end +-- lst.data = lst:GetChildAt(2).data - math.floor(index + 0.5) * 86400 +-- end +-- end -- 显示日期 -- +/-2的原因是列表中需要两个看不见的组件 -local function initList(lst, date, show_day) - local now_time = os.date("*t", now) +-- local function initList(lst, date, show_day) +-- local now_time = os.date("*t", now) +-- local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 }) +-- lst:RemoveChildrenToPool() +-- local index = -1 +-- local num = show_day - 1 +-- for i = 0 - 2, num + 2 do +-- local item = lst:AddItemFromPool() +-- if i >= 0 and i <= num then +-- local time = today - 86400 * i +-- item.data = time +-- item.title = os.date("%Y年%m月%d日", time) +-- if time == date then +-- index = i +-- end +-- else +-- item.title = " " +-- end +-- end +-- lst.scrollPane.percY = index / num +-- addListEffect(lst) +-- lst.scrollPane.onScroll:Add(function() +-- addListEffect(lst) +-- end) +-- end + +local function initList(list_start, list_end, showday, day1, day2) + local now_time = os.date("*t") local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 }) - lst:RemoveChildrenToPool() - local index = -1 - local num = show_day - 1 - for i = 0 - 2, num + 2 do - local item = lst:AddItemFromPool() - if i >= 0 and i <= num then - local time = today - 86400 * i - item.data = time - item.title = os.date("%Y年%m月%d日", time) - if time == date then - index = i - end - else - item.title = " " - end + list_start:SetVirtual() + list_start.itemRenderer = function(index, obj) + local time = today - 86400 * index + obj.data = time + obj.text = os.date("%m月%d日", time) + obj.selected = day1 == time end - lst.scrollPane.percY = index / num - addListEffect(lst) - lst.scrollPane.onScroll:Add(function() - addListEffect(lst) - end) + list_end:SetVirtual() + list_end.itemRenderer = function(index, obj) + local time = today - 86400 * index + obj.data = time + obj.text = os.date("%m月%d日", time) + obj.selected = day2 == time + end + list_start.numItems = showday + list_end.numItems = showday + list_start:RefreshVirtualList() + list_end:RefreshVirtualList() end -- 显示设置时间面板 -function M:ShowSetDatePanel(btn) - local date = btn.data - local com_set_date = UIPackage.CreateObjectFromURL("ui://NewGroup/com_set_time") - local lst_y = com_set_date:GetChild("lst_year") - initList(lst_y, date, self.show_day) - com_set_date:GetChild("btn_confirm").onClick:Set(function() - local time = os.date("%Y年%m月%d日", lst_y.data) - btn.title = time - btn.data = lst_y.data +function M:ShowSetDatePanel() + local com_set_date = UIPackage.CreateObjectFromURL("ui://NewGroup/com_set_time_together") + local list_start = com_set_date:GetChild("list_start") + local list_end = com_set_date:GetChild("list_end") + local now_time = os.date("*t") + local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 }) + initList(list_start, list_end, self.show_day, self.btn1.data, self.btn2.data) + com_set_date:GetChild("btn_ok").onClick:Set(function() + self.btn1.data = today - 86400 * list_start.selectedIndex + self.btn1.title = os.date("%Y年%m月%d日", self.btn1.data) + self.btn2.data = today - 86400 * list_end.selectedIndex + self.btn2.title = os.date("%Y年%m月%d日", self.btn2.data) com_set_date:Dispose() if self.callback then self.callback() end end) - AddPanel(com_set_date) + com_set_date:GetChild("btn_cancel").onClick:Set(function() + -- local time = os.date("%Y年%m月%d日", lst_y.data) + -- btn.title = time + -- btn.data = lst_y.data + com_set_date:Dispose() + end) + AddPanelCenter(com_set_date) -- self.parent:AddChild(com_set_date) -- com_set_date.x = self.posX -- com_set_date.y = GRoot.inst.height - com_set_date.height - (GRoot.inst.height - self.parent.height) * 0.5 + self.posY diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua index ca22f6ed..7a58a891 100644 --- a/lua_probject/base_project/Game/View/ResultView.lua +++ b/lua_probject/base_project/Game/View/ResultView.lua @@ -2,102 +2,94 @@ ResultView = {} local M = ResultView -setmetatable(M, {__index = BaseWindow}) -local self = setmetatable({}, {__index = M}) +setmetatable(M, { __index = BaseWindow }) +local self = setmetatable({}, { __index = M }) function M:InitView() - self:InitMaPai() - self:InitMaPaiShowPanel() - + self:InitMaPai() + self:InitMaPaiShowPanel() end - function M:InitMaPaiShowPanel() - self.mapaiTypeCtr=self._view:GetController("matype") - if self.mapaiTypeCtr then - self.mapaiTypeCtr.selectedIndex=0 - end - - - self.mapaiTypeBgShowCtr=self._view:GetController("matypebgshow") - if self.mapaiTypeBgShowCtr then - self.mapaiTypeBgShowCtr.selectedIndex=0 - end - - self.mapaiTypeShowCtr=self._view:GetController("matypeshow") - if self.mapaiTypeShowCtr then - self.mapaiTypeShowCtr.selectedIndex=0 - end + self.mapaiTypeCtr = self._view:GetController("matype") + if self.mapaiTypeCtr then + self.mapaiTypeCtr.selectedIndex = 0 + end + + + self.mapaiTypeBgShowCtr = self._view:GetController("matypebgshow") + if self.mapaiTypeBgShowCtr then + self.mapaiTypeBgShowCtr.selectedIndex = 0 + end + + self.mapaiTypeShowCtr = self._view:GetController("matypeshow") + if self.mapaiTypeShowCtr then + self.mapaiTypeShowCtr.selectedIndex = 0 + end end function M:InitMaPai() - self.maPaiCtr=self._view:GetController("mapai") - if self.maPaiCtr then - self.maPaiCtr.selectedIndex=0 - end - - - self.maPaiList={} - - for i=1,8 do - local tempMP=self._view:GetChild("niao"..i) - if tempMP then - table.insert(self.maPaiList,tempMP) - end - - end - + self.maPaiCtr = self._view:GetController("mapai") + if self.maPaiCtr then + self.maPaiCtr.selectedIndex = 0 + end + + + self.maPaiList = {} + + for i = 1, 8 do + local tempMP = self._view:GetChild("niao" .. i) + if tempMP then + table.insert(self.maPaiList, tempMP) + end + end end -function M:IsMapaiShow(niao,isShow) - if niao then - niao.visible=isShow - end +function M:IsMapaiShow(niao, isShow) + if niao then + niao.visible = isShow + end end - -function M:SetMaPaiValue(niao,value) - if niao then - niao.icon='ui://Main_Majiang/' ..get_majiang_prefix(DataManager.CurrenRoom.game_id).."201_"..value - end +function M:SetMaPaiValue(niao, value) + if niao then + niao.icon = 'ui://Main_Majiang/' .. get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. value + end end -function M:SetMaPaiColor(niao,num) - niao:GetController("color").selectedIndex=num +function M:SetMaPaiColor(niao, num) + niao:GetController("color").selectedIndex = num end function M:HideAllMapai() - for i=1,#self.maPaiList do - self:IsMapaiShow(self.maPaiList[i],false) - self:SetMaPaiColor(self.maPaiList[i],0) - end + for i = 1, #self.maPaiList do + self:IsMapaiShow(self.maPaiList[i], false) + self:SetMaPaiColor(self.maPaiList[i], 0) + end end - - function M:ShowSelectMaPai(niaoList) - if niaoList and #niaoList>0 then - self.maPaiCtr.selectedIndex=1 - self:HideAllMapai() - for i=1,#niaoList do - self:IsMapaiShow(self.maPaiList[i],true) - self:SetMaPaiValue(self.maPaiList[i],niaoList[i].card) - if niaoList[i].score>0 then - self:SetMaPaiColor(self.maPaiList[i],2) - end - end - else - self.maPaiCtr.selectedIndex=0 - end + if niaoList and #niaoList > 0 then + self.maPaiCtr.selectedIndex = 1 + self:HideAllMapai() + for i = 1, #niaoList do + self:IsMapaiShow(self.maPaiList[i], true) + self:SetMaPaiValue(self.maPaiList[i], niaoList[i].card) + if niaoList[i].score > 0 then + self:SetMaPaiColor(self.maPaiList[i], 2) + end + end + else + self.maPaiCtr.selectedIndex = 0 + end end - -function M:init(url,isBigFull) +function M:init(url, isBigFull) BaseWindow.init(self, url) - - self:InitView() - + + self:InitView() + local btn_share = self._view:GetChild('btn_share') if btn_share ~= nil then btn_share.onClick:Set( @@ -127,15 +119,15 @@ function M:init(url,isBigFull) local big_result = self._view:GetChild('big_result') if big_result ~= nil then - if isBigFull then - - else - self._full = true - big_result:AddRelation(self._view, RelationType.Size) - big_result.width = self._view.width - big_result.height = self._view.height - end - + if isBigFull then + + else + self._full = true + big_result:AddRelation(self._view, RelationType.Size) + big_result.width = self._view.width + big_result.height = self._view.height + end + local btn_share_copy = big_result:GetChild('btn_share_copy') btn_share_copy.onClick:Set( @@ -193,7 +185,6 @@ function M:init(url,isBigFull) end end - -- 分享数据至聊天室，需在扩展填充数据，GenerateRoomResultInfo() function M:__ShareResultInfo() local info = self._resultInfo @@ -277,6 +268,7 @@ function M:InitBigResult(room, fontsize) local maxScore = 0 local isWin = false + local flag_new = big_result:GetChild('flag_tempNew') for i = 1, #self._resultInfo.player_list do local player_info = self._resultInfo.player_list[i] @@ -310,11 +302,29 @@ function M:InitBigResult(room, fontsize) for i = 1, #self._resultInfo.player_list do local player_info = self._resultInfo.player_list[i] + local item2 + if player_info.id == room.self_player.self_user.account_id then + if isWin then + item2 = big_result:GetChild('play_win') + else + item2 = big_result:GetChild('play_lose') + end + else + if not isWin then + item2 = big_result:GetChild('play_win') + else + item2 = big_result:GetChild('play_lose') + end + end local item = player_list:AddItemFromPool() item:GetChild('txt_name').text = player_info.nick + item2:GetChild('txt_name').text = player_info.nick + item2:GetChild('txt_id').text = player_info.id local head = item:GetChild('head'):GetChild('n4') ImageLoad.Load(player_info.head_url, head) + local head = item2:GetChild('head'):GetChild('n4') + ImageLoad.Load(player_info.head_url, head) if player_info.entrust ~= nil and player_info.entrust == true then item:GetController('entrust').selectedIndex = 1 @@ -336,9 +346,15 @@ function M:InitBigResult(room, fontsize) if player_info.total_score >= 0 then item:GetController('pn').selectedIndex = 1 item:GetChild('txt_positive').text = '+' .. tostring(player_info.total_score) + item2:GetChild('txt_navigate').text = string.format("总战绩:+%s", player_info.total_score) + item2:GetChild('txt_daniao').text = string.format("打鸟 +%s", player_info.daniao) + item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao else item:GetController('pn').selectedIndex = 0 item:GetChild('txt_navigate').text = tostring(player_info.total_score) + item2:GetChild('txt_navigate').text = string.format("总战绩:%s", player_info.total_score) + item2:GetChild('txt_daniao').text = string.format("打鸟 %s", player_info.daniao) + item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao end end @@ -368,10 +384,43 @@ function M:InitBigResult(room, fontsize) else if big then pitem:GetChild('txt_key').textFormat.size = 30 - pitem:GetChild('txt_value').textFormat.size = 12 + pitem:GetChild('txt_value').textFormat.size = 30 else pitem:GetChild('txt_key').textFormat.size = 24 - pitem:GetChild('txt_value').textFormat.size = 8 + pitem:GetChild('txt_value').textFormat.size = 24 + end + end + end + end + + local list_param = item2:GetChild('list_param') + list_param:RemoveChildrenToPool() + if self._gameStatisticsLineSpacing ~= nil then + list_param.lineGap = self._gameStatisticsLineSpacing + end + + if player_info.param ~= nil then + local big = false + if #player_info.param <= 4 then + big = true + end + + for i = 1, #player_info.param do + local pitem = list_param:AddItemFromPool() + + pitem:GetChild('txt_key').text = player_info.param[i].key + pitem:GetChild('txt_value').text = player_info.param[i].value + + if fontsize ~= nil and fontsize > 0 then + pitem:GetChild('txt_key').textFormat.size = fontsize + pitem:GetChild('txt_value').textFormat.size = fontsize + else + if big then + pitem:GetChild('txt_key').textFormat.size = 30 + pitem:GetChild('txt_value').textFormat.size = 30 + else + pitem:GetChild('txt_key').textFormat.size = 24 + pitem:GetChild('txt_value').textFormat.size = 24 end end end diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua index 26c3c7f5..68b66d3d 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -9,66 +9,64 @@ local RunFast_ResultView = {} local M = RunFast_ResultView function RunFast_ResultView.new(blur_view, data, roomid, over, win_seat, dissolve, remaincards) - setmetatable(M, {__index = ResultView}) - local self = setmetatable({}, {__index = M}) - + setmetatable(M, { __index = ResultView }) + local self = setmetatable({}, { __index = M }) + self.class = "RunFast_ResultView" self._currenIndex = 0 self._close_zone = false --self._blur_view = blur_view self._gamectr = ControllerManager.GetController(GameController) self:init("ui://Extend_Poker_RunFastNew/clearing", data, roomid, over, win_seat, dissolve, remaincards) - + return self end function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) - - ResultView.init(self, url,true) - self.xiPaiCtr=self._view:GetController("xipai") - - - local round=DataManager.CurrenRoom.room_config.config.times or 1 - local xpconfig=DataManager.CurrenRoom.room_config.config.xi_pai - if xpconfig and round>1 then - self.xiPaiCtr.selectedIndex=1 - else - self.xiPaiCtr.selectedIndex=0 - end - - + ResultView.init(self, url, true) + self.xiPaiCtr = self._view:GetController("xipai") + + + local round = DataManager.CurrenRoom.room_config.config.times or 1 + local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai + if xpconfig and round > 1 then + self.xiPaiCtr.selectedIndex = 1 + else + self.xiPaiCtr.selectedIndex = 0 + end + + --self:InitData(data,roomid) --self:InitData(data,roomid) - printlog("aaaaaaaaaaaaaaaa1111111111111111111111111222222222222222 ",dissolve) + printlog("aaaaaaaaaaaaaaaa1111111111111111111111111222222222222222 ", dissolve) pt(data) if dissolve == 1 then -- body - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 self:InitData(data, win_seat, roomid) else - local xipai=self._view:GetChild("btn_xipai") - xipai.touchable=true - xipai.onClick:Add(function() - local xiPaiCallBack=function () - xipai.touchable=false - self.xiPaiCtr.selectedIndex=0 - ViewUtil.ErrorTip(1000000,"申请洗牌成功") - end - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendXiPaiAction(xiPaiCallBack) - end) - if DataManager.CurrenRoom.xipaiScore then - --xipai.text="洗牌 积分x"..DataManager.CurrenRoom.xipaiScore - else - --xipai.text="洗牌 积分x0" - end - + local xipai = self._view:GetChild("btn_xipai") + xipai.touchable = true + xipai.onClick:Add(function() + local xiPaiCallBack = function() + xipai.touchable = false + self.xiPaiCtr.selectedIndex = 0 + ViewUtil.ErrorTip(1000000, "申请洗牌成功") + end + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:SendXiPaiAction(xiPaiCallBack) + end) + if DataManager.CurrenRoom.xipaiScore then + --xipai.text="洗牌 积分x"..DataManager.CurrenRoom.xipaiScore + else + --xipai.text="洗牌 积分x0" + end + self:InitData_One(data, win_seat, over, roomid, remaincards) end - end -function M:ChangeCodeByTo( card ) +function M:ChangeCodeByTo(card) local flower = card % 10 local number = math.floor(card / 10) if number == 15 then @@ -79,43 +77,40 @@ end -- 小结算 function M:InitData_One(data, winseat, over, roomid, remaincards) - local room = DataManager.CurrenRoom self._view:GetController("sdk").selectedIndex = 1 local _gamectr = ControllerManager.GetController(GameController) local list_view = self._view:GetChild("player_list_1") list_view:RemoveChildrenToPool() - - local leftCardAll = self._view:GetChild("leftCardHand") - leftCardAll:RemoveChildrenToPool() - - if remaincards and #remaincards>0 then - table.sort(remaincards,function (a,b) + + local leftCardAll = self._view:GetChild("leftCardHand") + leftCardAll:RemoveChildrenToPool() + + if remaincards and #remaincards > 0 then + table.sort(remaincards, function(a, b) return a % 100 < b % 100 - end) - for i=1,#remaincards do - local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..remaincards[i]) + for i = 1, #remaincards do + local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. remaincards[i]) leftCardAll:AddChild(card_code_obj) - end - end - + end + end + for i = 1, #data do local player = data[i] local item = list_view:AddItemFromPool("ui://Extend_Poker_RunFastNew/clearing_item_1") - - - local leftCard = item:GetChild("leftCard") + + local leftCard = item:GetChild("leftCard") leftCard:RemoveChildrenToPool() -- table.sort(data[i].handCards,function (a,b) - + -- return a % 100 < b % 100 -- end) - - for j=1,#data[i].handCards do + + for j = 1, #data[i].handCards do local code = data[i].handCards[j] - local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code) + local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) leftCard:AddChild(card_code_obj) end @@ -123,38 +118,37 @@ function M:InitData_One(data, winseat, over, roomid, remaincards) -- return a % 100 < b % 100 -- end) - - for k=1,#data[i].outCards do + + for k = 1, #data[i].outCards do local code = data[i].outCards[k] - local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..code) + local card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. code) leftCard:AddChild(card_code_obj) - card_code_obj:GetChildAt(0):GetChildAt(0).color = Color(0.7,0.7,0.7) + card_code_obj:GetChildAt(0):GetChildAt(0).color = Color(0.7, 0.7, 0.7) end - - - + + + local boom = item:GetChild("boom") boom.text = player.thisboomnum - + local piao = item:GetChild("piao") if player.piao <= 0 then piao.text = "0" else piao.text = "" .. player.piao end - + local nichen = item:GetChild("nichen") - + if player.nick ~= nil then -- body nichen.text = tostring(player.nick) else - nichen.text = tostring(player.self_user.nick_name) end - - + + local shengpai = item:GetChild("shengpai") if player.cards ~= nil then -- body @@ -162,23 +156,22 @@ function M:InitData_One(data, winseat, over, roomid, remaincards) else shengpai.text = tostring(#player.hand_list) end - + local rt = 1 if room.hpOnOff == 1 then rt = room.score_times end - + local hp_nonnegative = room:checkHpNonnegative() - local roundScore = player.winscore + local roundScore = player.winCardScore if hp_nonnegative then - local jifen = "" if roundScore > 0 then jifen = "+" .. roundScore else jifen = "" .. roundScore end - + local tili = "" local limit = "" if player.hp_info.round_actual_hp > 0 then @@ -192,10 +185,9 @@ function M:InitData_One(data, winseat, over, roomid, remaincards) limit = "达到下限" end end - + item:GetChild("score").text = jifen .. tili .. limit else - local jifen = "" if roundScore >= 0 then jifen = "+" .. roundScore @@ -203,10 +195,9 @@ function M:InitData_One(data, winseat, over, roomid, remaincards) jifen = "" .. roundScore end jifen = jifen .. " " - + local tili = "" if room.hpOnOff > 0 then - local need = roundScore * rt tili = "(" if roundScore > 0 then @@ -214,30 +205,33 @@ function M:InitData_One(data, winseat, over, roomid, remaincards) else tili = tili .. tostring(need) end - + tili = tili .. ")" end - - + + item:GetChild("score").text = jifen .. tili end - + if roundScore >= 0 then - if room.self_player.seat == player.seat then -- body self._view:GetController("result").selectedIndex = 1 + item:GetController('win').selectedIndex = 1 + else + item:GetController('win').selectedIndex = 0 end else - if room.self_player.seat == player.seat then self._view:GetController("result").selectedIndex = 0 + item:GetController('win').selectedIndex = 0 + else + item:GetController('win').selectedIndex = 1 end end - end - - + + if over == 0 then -- body local btn_confirm = self._view:GetChild("btn_confirm") @@ -245,78 +239,78 @@ function M:InitData_One(data, winseat, over, roomid, remaincards) self:Destroy() local _gamectr = ControllerManager.GetController(GameController) _gamectr:ConformToNextGame() - end) else - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 local btn_confirm = self._view:GetChild("btn_confirm") btn_confirm.onClick:Set(function() - --self:Destroy() - self:InitData(data, winseat, roomid) - -- ViewManager.ChangeView(ViewManager.View_Lobby) + --self:Destroy() + self:InitData(data, winseat, roomid) + -- ViewManager.ChangeView(ViewManager.View_Lobby) end) - end end -- 大结算 function M:InitData(data, winseat, roomid) - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 self._view:GetController("sdk").selectedIndex = 0 - + local room = DataManager.CurrenRoom - + local rt = 1 if room.hpOnOff == 1 and room.score_times ~= 1 then rt = room.score_times end - + -- 赋值result_info，聊天室分享需要 local player_list = {} for i = 1, #data do player_list[i] = {} - + local user = room:GetPlayerBySeat(data[i].seat).self_user - + player_list[i].id = user.account_id - + player_list[i].score = data[i].score player_list[i].hp_info = data[i].hp_info player_list[i].house = room.owner_id == player_list[i].id and 1 or 0 player_list[i].nick = user.nick_name player_list[i].seat = data[i].seat player_list[i].head_url = data[i].self_user.head_url - + player_list[i].daniao = data[i].daniao + if data[i].entrust ~= nil then player_list[i].entrust = data[i].entrust > 0 else player_list[i].entrust = false end - + player_list[i].param = {} - + player_list[i].param[1] = {} player_list[i].param[1].key = "赢局数：" player_list[i].param[1].value = tostring(data[i].settle_log.winnum) - + player_list[i].param[2] = {} player_list[i].param[2].key = "打出炸弹数：" player_list[i].param[2].value = tostring(data[i].settle_log.boomnum) - + player_list[i].param[3] = {} player_list[i].param[3].key = "春天次数：" player_list[i].param[3].value = tostring(data[i].settle_log.springnum) - + player_list[i].param[4] = {} player_list[i].param[4].key = "当局最高分：" player_list[i].param[4].value = tostring(data[i].settle_log.maxscore * rt) - + if data[i].daniao > 0 then - player_list[i].flag = {"打鸟"} + player_list[i].flag = { "打鸟" } end end - - self:GenerateRoomResultInfo(room.room_config.Times, room.room_config:GetGameName(), room.room_id, room.create_time, player_list) + + self:GenerateRoomResultInfo(room.room_config.Times, room.room_config:GetGameName(), room.room_id, room.create_time, + player_list) self:InitBigResult(room) local big_result = self._view:GetChild("big_result") local lst_p = big_result:GetChild("player_list") @@ -329,7 +323,6 @@ function M:InitData(data, winseat, roomid) tem:GetChild("txt_value").textFormat.size = 30 end end - end return M diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index 85f03107..e078dbbb 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index 8d46756e..f8239774 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index 78256ea4..ab4b6654 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 51849c74..0e96c4ac 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/wb_new_ui/.objs/metas/9n9stu2e/m9jahb.info b/wb_new_ui/.objs/metas/9n9stu2e/m9jahb.info new file mode 100644 index 00000000..097810d4 --- /dev/null +++ b/wb_new_ui/.objs/metas/9n9stu2e/m9jahb.info @@ -0,0 +1,25 @@ +{ + "objectStatus": { + "n3_tjnv": { + "hidden": true + }, + "n28_tjnv": { + "hidden": true + }, + "n2_tjnv": { + "hidden": true + }, + "n14_tjnv": { + "collapsed": true + }, + "n11_tjnv": { + "collapsed": true + }, + "n17_tjnv": { + "collapsed": true + }, + "n26_tjnv": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/9n9stu2e/m9jahn.info b/wb_new_ui/.objs/metas/9n9stu2e/m9jahn.info index 291a0431..d1c102db 100644 --- a/wb_new_ui/.objs/metas/9n9stu2e/m9jahn.info +++ b/wb_new_ui/.objs/metas/9n9stu2e/m9jahn.info @@ -1,7 +1,34 @@ { "objectStatus": { + "n20_naue": { + "hidden": true + }, + "n12_tjnv": { + "hidden": true + }, + "n7_tjnv": { + "hidden": true + }, + "n2_tjnv": { + "hidden": true + }, + "n10_tjnv": { + "hidden": true + }, "n4_tjnv": { "hidden": true + }, + "n18_n12b": { + "hidden": true + }, + "n0_tjnv": { + "hidden": true + }, + "n21_naue": { + "hidden": true + }, + "n22_naue": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/9n9stu2e/prgzee.info b/wb_new_ui/.objs/metas/9n9stu2e/prgzee.info index 13061944..22178475 100644 --- a/wb_new_ui/.objs/metas/9n9stu2e/prgzee.info +++ b/wb_new_ui/.objs/metas/9n9stu2e/prgzee.info @@ -1,14 +1,3 @@ { - "objectStatus": { - "n39_j7ij": { - "collapsed": true - }, - "n18_fmkv": { - "collapsed": true - }, - "n47_m5rj": { - "collapsed": true - } - }, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 58466713..557bb9ad 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -3,9 +3,6 @@ "n154_cioe": { "hidden": true }, - "n45_l0s4": { - "locked": true - }, "n214_ovii": { "hidden": true }, @@ -15,21 +12,15 @@ "n204_jvvo": { "hidden": true }, - "n153_cioe": { + "n241_n6w8": { "hidden": true }, "n175_mn85": { "collapsed": true }, - "n74_i7lq": { - "locked": true - }, "n243_n6w8": { "hidden": true }, - "n171_mpll": { - "hidden": true - }, "n236_o6b1": { "hidden": true, "collapsed": true @@ -40,13 +31,16 @@ "n240_n6w8": { "hidden": true }, + "n153_cioe": { + "hidden": true + }, "n229_csp4": { "hidden": true }, "n216_ovii": { "hidden": true }, - "n241_n6w8": { + "n171_mpll": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info index 63e79497..d5f04d1e 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info +++ b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info @@ -1,18 +1,21 @@ { "objectStatus": { - "n133_et16": { + "n107_sbng": { "hidden": true }, "n79_nk4v": { "hidden": true }, + "n101_sbng": { + "hidden": true + }, "n78_nk4v": { "hidden": true }, - "n98_yetw": { + "n133_et16": { "hidden": true }, - "n108_sbng": { + "n98_yetw": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info b/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info index e5ec0083..ec1adef1 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info +++ b/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info @@ -1,4 +1,12 @@ { + "objectStatus": { + "n51_k5m9": { + "hidden": true + }, + "n42_ozaz": { + "hidden": true + } + }, "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info b/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info index 9e26dfee..bb44d701 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n35_p747": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info index 471d1ef6..c7469fae 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info @@ -1,7 +1,13 @@ { "objectStatus": { + "n100_dzx8": { + "hidden": true + }, "n147_j120": { "hidden": true + }, + "n161_rt3g": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info index 6d722e55..7e8240a0 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hma.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n80_7b4q": { + "hidden": true + }, "n82_et16": { "hidden": true }, @@ -9,12 +12,18 @@ "n81_7b4q": { "hidden": true }, - "n80_7b4q": { - "hidden": true + "n75_s9vt": { + "collapsed": true }, "n39_gltd": { "hidden": true }, + "n40_gltd": { + "collapsed": true + }, + "n74_s9vt": { + "hidden": true + }, "n79_ovii": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info b/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info index e5ec0083..e7479945 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info @@ -1,4 +1,9 @@ { + "objectStatus": { + "n98_k5m9": { + "hidden": true + } + }, "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info index 178964c4..d0d0c178 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n86_kwi0": { + "hidden": true + }, "n122_j120": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/m16m7igb.info b/wb_new_ui/.objs/metas/m7iejg46/m16m7igb.info new file mode 100644 index 00000000..65778ede --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/m16m7igb.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n3_imp5": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info index 6a79376a..2f150126 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info @@ -3,20 +3,20 @@ "n69_jd7v": { "hidden": true }, + "n33_rpaz": { + "hidden": true + }, "n86_t1hq": { "hidden": true }, "n113_csp4": { "hidden": true }, - "n33_rpaz": { + "n85_t1hq": { "hidden": true }, "n35_rpaz": { "hidden": true - }, - "n88_t1hq": { - "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info index 90c959bb..291a102b 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info @@ -6,6 +6,9 @@ "n57_ocx0": { "hidden": true }, + "n78_iaes": { + "hidden": true + }, "n44_rpaz": { "collapsed": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 724bf1f6..7445f5ed 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 297, + "libview.firstColumnWidth": 522, "expanded_nodes": [ "27vd145b", "/", @@ -8,65 +8,38 @@ ], "libview.iconScale": 0, "doc.openedDocs": [ - "ui://ppu1wv76j4mf9j", - "ui://v6yvqp7wf55qwa", - "ui://v6yvqp7wf55qw7", - "ui://v6yvqp7wf55qvx", - "ui://v6yvqp7wf55qvw", - "ui://v6yvqp7wddb914i", - "ui://v6yvqp7wcyprww", - "ui://v6yvqp7wcyprwy", - "ui://v6yvqp7wcyprwu", - "ui://v6yvqp7wcyprwt", - "ui://m7iejg46kwi0hkb", - "ui://m7iejg46mpllhv2", - "ui://m7iejg46kwi0hkl", - "ui://v6yvqp7wf55qw5", - "ui://v6yvqp7wf55qw4" + "ui://m7iejg4610snh5j", + "ui://0khx14are0py2", + "ui://2d9xdj6zfn7fao", + "ui://2d9xdj6zlumrgj", + "ui://m7iejg46kwi0hma", + "ui://27vd145bm16m7iji", + "ui://27vd145bh1uu3i", + "ui://m7iejg46gltdhc9", + "ui://m7iejg46hsbhhjn", + "ui://2zlli80mw9te0" + ], + "packageGroup.mine": [ + "m7iejg46" ], - "packageGroup.mine": [], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://v6yvqp7wf55qw4", + "doc.activeDoc": "ui://m7iejg46kwi0hma", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", "/", "27vd145b", "/component/", - "egnzysm7", + "27vd145b", + "/component/create_room/", + "27vd145b", + "/component/create_room/image/", + "m7iejg46", "/", - "egnzysm7", - "/component/", - "egnzysm7", - "/component/clearing/", - "egnzysm7", - "/component/clearing/image/", - "ppu1wv76", - "/", - "ppu1wv76", - "/component/", - "ppu1wv76", - "/component/cards/", - "ppu1wv76", - "/component/clearing/", - "ppu1wv76", - "/images/", - "v6yvqp7w", - "/", - "v6yvqp7w", - "/component/", - "v6yvqp7w", - "/component/Main/", - "v6yvqp7w", - "/component/Main/component/", - "v6yvqp7w", - "/component/cards/", - "v6yvqp7w", - "/images/", - "v6yvqp7w", - "/images/cards/" + "m7iejg46", + "/images/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/component/create_room/Btn_mul_checkbox3.xml b/wb_new_ui/assets/Common/component/create_room/Btn_mul_checkbox3.xml new file mode 100644 index 00000000..4e0cc434 --- /dev/null +++ b/wb_new_ui/assets/Common/component/create_room/Btn_mul_checkbox3.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + +