diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupListSetTagView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupListSetTagView.lua new file mode 100644 index 00000000..08f10795 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/GroupListSetTagView.lua @@ -0,0 +1,44 @@ + +-- 备注界面 +local GroupListSetTagView = {} + +local M = GroupListSetTagView + +function GroupListSetTagView.new() + setmetatable(M, {__index = BaseWindow}) + local self = setmetatable({}, {__index = M}) + self.class = "GroupListSetTagView" + self._close_destroy = true + self:init("ui://NewGroup/Win_ListSetTag") + return self +end + +function M:init(url) + BaseWindow.init(self,url) + + -- local tex_tag = self._view:GetChild("tex_tag") + -- if tag ~= 0 then + -- tex_tag.text = member.score + -- end + -- self._view:GetChild("btn_ok").onClick:Set(function() + -- ViewUtil.ShowModalWait(nil) + -- local score = tonumber(tex_tag.text) or 0 + -- local fgCtr = ControllerManager.GetController(NewGroupController) + -- fgCtr:FG_SetMemberTag(self.group_id, member.uid, score, function(res) + -- if self._is_destroy then + -- return + -- end + -- ViewUtil.CloseModalWait() + -- if res.ReturnCode ~= 0 then + -- ViewUtil.ErrorTip(res.ReturnCode, "备注失败") + -- else + -- ViewUtil.ShowBannerOnScreenCenter("备注成功") + -- member.score = score + -- self:Destroy() + -- self.callback(true) + -- end + -- end) + -- end) +end + +return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupOneclickCcollectionView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupOneclickCcollectionView.lua new file mode 100644 index 00000000..e7504283 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/GroupOneclickCcollectionView.lua @@ -0,0 +1,44 @@ + +-- 备注界面 +local GroupOneclickCcollectionView = {} + +local M = GroupOneclickCcollectionView + +function GroupOneclickCcollectionView.new() + setmetatable(M, {__index = BaseWindow}) + local self = setmetatable({}, {__index = M}) + self.class = "GroupOneclickCcollectionView" + self._close_destroy = true + self:init("ui://NewGroup/Win_OneclickCollection") + return self +end + +function M:init(url) + BaseWindow.init(self,url) + + -- local tex_tag = self._view:GetChild("tex_tag") + -- if tag ~= 0 then + -- tex_tag.text = member.score + -- end + -- self._view:GetChild("btn_ok").onClick:Set(function() + -- ViewUtil.ShowModalWait(nil) + -- local score = tonumber(tex_tag.text) or 0 + -- local fgCtr = ControllerManager.GetController(NewGroupController) + -- fgCtr:FG_SetMemberTag(self.group_id, member.uid, score, function(res) + -- if self._is_destroy then + -- return + -- end + -- ViewUtil.CloseModalWait() + -- if res.ReturnCode ~= 0 then + -- ViewUtil.ErrorTip(res.ReturnCode, "备注失败") + -- else + -- ViewUtil.ShowBannerOnScreenCenter("备注成功") + -- member.score = score + -- self:Destroy() + -- self.callback(true) + -- end + -- end) + -- end) +end + +return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GrouRankingSettingsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GrouRankingSettingsView.lua new file mode 100644 index 00000000..9a5bd487 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GrouRankingSettingsView.lua @@ -0,0 +1,23 @@ +local GroupListSetTagView = import("..GroupListSetTagView") +local GrouRankingSettingsView = {} + +local M = GrouRankingSettingsView + +function GrouRankingSettingsView.new() + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "GrouRankingSettingsView" + self:init("ui://NewGroup/Win_RankingSettings") + return self +end + +function M:init(url) + BaseWindow.init(self,url) + local btn_manager_set = self._view:GetChild('btn_WL_day_comment') + btn_manager_set.onClick:Set(function() + local win1 = GroupListSetTagView.new() + win1:Show() + end) +end + +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 a8bbd4eb..fe728c6f 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,6 @@ --牌友圈体力值记录 local TimeSettingPanel = import(".TimeSettingPanel") +local GroupOneclickCcollectionView = import("..GroupOneclickCcollectionView") local GroupMngFagListView = {} local M = GroupMngFagListView @@ -67,6 +68,11 @@ function M:FillView() self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() self:GetFagData(self.lst_fag_result.numItems) end) + local btn_linqu = self._view:GetChild('btn_linqu') + btn_linqu.onClick:Set(function() + local win2 = GroupOneclickCcollectionView.new() + win2:Show() + end) -- 切换页面事件，1,2页为上下分，3页是管理员总计 self._view:GetController("page").onChanged:Set(function() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua index ad1ad927..5428f936 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua @@ -1,227 +1,317 @@ ---牌友圈体力值记录 local TimeSettingPanel = import(".TimeSettingPanel") +local GroupPartnerStatMember = import(".GroupPartnerStatMember") +local GroupPartnerStatPlay = import(".GroupPartnerStatPlay") +local GroupNumberInputView = import(".GroupNumberInputView") +local GroupSetMemberInfoDiaoduView=import('.GroupSetMemberInfoDiaoduView') +-- 开桌统计 local GroupMngGiveFagListView = {} local M = GroupMngGiveFagListView -function GroupMngGiveFagListView.new(group_id) + +function GroupMngGiveFagListView.new(gid) local self = M self.class = "GroupMngGiveFagListView" - self.group_id = group_id - -- 体力值数据 - self.fag_data = {} - -- 体力值查询结果 - self.fag_result_data = {} - -- 查询id - self.quary_id = 0 - self.query_nick = "" - self:FillView() + self.group_id = gid + self:InitView() return self end function M:initData() + self.lst_record.numItems = 0 + self.record_data = {} - self.fag_result_data = {} - self.fag_data = {} - - if self._view:GetController("page").selectedIndex < 2 then - self:GetFagData(0) - else - self:GetMngFagInfo() - end - local group = DataManager.groups:get(self.group_id) - if group.lev < 3 then - self:GetHpStatistic() - end + 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}) + self.begin_time = today + self.end_time = today + 86400 + self:GetRecordData(0) + --self:ShowPeopleNum() end -function M:FillView() +-- function M:ShowPeopleNum() +-- local fgCtr = ControllerManager.GetController(NewGroupController) +-- fgCtr:FG_GetMembersCount(self.group_id,function(res) +-- ViewUtil.CloseModalWait() + +-- if res.ReturnCode == 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) +-- end +-- end) +-- end + +function M:InitView() self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupGiveFagList") + local group = DataManager.groups:get(self.group_id) - if group.lev < 3 then - self._view:GetController("mng").selectedIndex = 1 + -- if group.lev ~= 3 then + -- self._view:GetController("mng").selectedIndex = 1 + -- end + + local lst_mgr_index = self._view:GetChild("lst_mgr_index") + -- lst_mgr_index.visible = false + -- if group.lev == 1 then + -- lst_mgr_index.visible = true + -- end + + self.lst_record = self._view:GetChild("lst_record") + self.lst_record:SetVirtual() + self.lst_record.itemRenderer = function(index, obj) + self:OnRenderRecordItem(index, obj) end - -- 初始化列表 - self.lst_fag = self._view:GetChild("lst_fag") - self.lst_fag:SetVirtual() - self.lst_fag.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) - end - self.lst_fag.scrollPane.onPullUpRelease:Set(function() - self:GetFagData(self.lst_fag.numItems) - end) - self.lst_fag_result = self._view:GetChild("lst_fag_result") - self.lst_fag_result:SetVirtual() - self.lst_fag_result.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) - end - self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() - self:GetFagData(self.lst_fag_result.numItems) + 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, nil, true) - -- 切换页面事件，1,2页为上下分，3页是管理员总计 - self._view:GetController("page").onChanged:Set(function() - if self._view:GetController("page").selectedIndex < 2 then - if self._view:GetController("search").selectedIndex == 0 then - self.quary_id = 0 - self.query_nick = "" - - self.fag_data = {} - self:GetFagData(0) - else - - self.quary_id = 0 - self.query_nick = "" - - self.fag_result_data = {} - self:GetFagData(0) - end - else - self:GetMngFagInfo() - end - end) - - self._view:GetChild("btn_search").onClick:Set(function() - local qid = self._view:GetChild("tex_id").text - qid = tonumber(qid) - self.quary_id = qid or 0 - self.query_nick = self._view:GetChild("tex_id").text or "" - self.fag_result_data = {} - self._view:GetChild("tex_id").text = "" - self:GetFagData(0) - end) - self._view:GetChild("btn_back").onClick:Set(function() - self.quary_id = 0 - self.query_nick = "" - end) - - self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, function() - self:GetMngFagInfo() - end) -end - --- 获取上下分数据 -local num = 8 -function M:GetFagData(index) - qid = self.quary_id or 0 - qName = self.query_nick or "" - -- 重新获取数据时，清空数据列表 - if index == 0 then - if qid == 0 then - self.fag_data = {} + local ctr_page = self._view:GetController("type") + ctr_page.onChanged:Set(function() + self.record_data = {} + self.lst_record.numItems = 0 + if ctr_page.selectedIndex == 0 then + 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}) + self.begin_time = today + self.end_time = today + 86400 else - self.fag_result_data = {} + 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}) + self.begin_time = today - 86400 * ctr_page.selectedIndex + self.end_time = today - 86400 * (ctr_page.selectedIndex - 1) end - end - ViewUtil.ShowModalWait(nil) + self:GetRecordData(0) + end) - --type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分 - local type = self._view:GetController("page").selectedIndex + 1 - local group = DataManager.groups:get(self.group_id) - if group.lev == 3 then - type = type + 2 - end - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMngHpLog(self.group_id, index, num, type, qid, qName, function(res) - ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") - else - if res.Data.hp_logs ~= nil then - local data = res.Data.hp_logs - -- if #data == 0 then return end - local local_data = self.fag_data - local lst = self.lst_fag - if qid ~= 0 or self.query_nick ~= "" then - local_data = self.fag_result_data - lst = self.lst_fag_result - self._view:GetController("search").selectedIndex = 1 - else - self._view:GetController("search").selectedIndex = 0 - end - for i = 1, #data do - local_data[#local_data + 1] = data[i] - end - lst.numItems = #local_data + -- self._view:GetChild("btn_search").onClick:Set(function() + -- self.record_data = {} + -- self.lst_record.numItems = 0 + + -- self.begin_time, self.end_time = self.time_panel:GetDate() + -- self:GetRecordData(0) + -- end) + + -- 搜索玩家 + local ctr_search = self._view:GetController('search') + self._view:GetChild('btn_search').onClick:Set( + function() + --printlog("aaaaaaaaaa1111111111111111111111111111111111111111111111") + ViewUtil.ShowModalWait(nil) + local text = self._view:GetChild('tex_id').text + local qid, qnick + if text == "" then + ViewUtil.CloseModalWait() + ViewUtil.ErrorTip(nil, '输入不能为空') + return end + qid = tonumber(text) or 0 + qnick = text + local time_type = self._view:GetController("type").selectedIndex + if self.begin_time ~= nil and self.end_time ~= nil then + time_type = 0 + end + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_FindPartnerStat( + self.group_id, + qid,0, 6, time_type,self.begin_time,self.end_time, + function(res) + -- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222") + -- pt(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') + else + self._view:GetChild('tex_id').text = '' + ctr_search.selectedIndex = 1 + local item_result = self._view:GetChild('lst_member_find') + item_result:RemoveChildrenToPool() + + for j = 1, #res.Data.members do + local tem = item_result:AddItemFromPool() + self:FillRecordItem(res.Data.members[j],tem) + end + end + end + ) end - end) + ) + + local btn_back = self._view:GetChild('btn_back') + btn_back.onClick:Set( + function() + self.lst_record.numItems = #self.record_data + end + ) end --- 获取体力值统计 -function M:GetHpStatistic() - -- ViewUtil.ShowModalWait(nil, "正在获取数据") - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMngHpStatistic(self.group_id, function(res) - -- ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") - else - self._view:GetChild("tex_yd_cost").text = d2ad(res.Data.last_hp_cost) - self._view:GetChild("tex_td_cost").text = d2ad(res.Data.hp_cost) - self._view:GetChild("tex_add").text = d2ad(res.Data.hp_upper) - self._view:GetChild("tex_minus").text = d2ad(res.Data.hp_sub) - end - end) -end --- 获取管理员总计/合伙人总计 -function M:GetMngFagInfo() - ViewUtil.ShowModalWait(nil) - local begin_time, end_time = self.time_panel1:GetDate() - local group = DataManager.groups:get(self.group_id) - local type = group.lev < 3 and 1 or 2 +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 + time_type = 0 + end + local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMngHpInfo(self.group_id, type, begin_time, end_time, function(res) + fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type,self.begin_time,self.end_time,function(res) + ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败") - else - local add_count = 0 - local minus_count = 0 - local lst_fag_info = self._view:GetChild("lst_mgr_data") - lst_fag_info:RemoveChildrenToPool() - for i = 1, #res.Data.infos do - local data = res.Data.infos[i] - local item = lst_fag_info:AddItemFromPool() - item:GetChild("tex_mgr").text = not data.lev and "合伙人" or (data.lev == 1 and "盟主" or "副盟主") - item:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) - item:GetChild("tex_add").text = d2ad(data.hp_upper) - item:GetChild("tex_minus").text = d2ad(data.hp_sub) - add_count = add_count + data.hp_upper - minus_count = minus_count + data.hp_sub - end - self._view:GetChild("tex_add2").text = d2ad(add_count) - self._view:GetChild("tex_minus2").text = d2ad(minus_count) + + if res.ReturnCode == 0 then + + local members = res.Data.members + -- printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc") + -- pt(members) + for i = 1, #members do + self.record_data[#self.record_data + 1] = members[i] + end + self.lst_record.numItems = #self.record_data end end) end --- 填充对象 -function M:OnRenderItem(index, obj) - local local_data = (self.quary_id == 0 and self.query_nick == "" ) and self.fag_data or self.fag_result_data - local rdata = local_data[index + 1] - local num = d2ad(rdata.hp) - printlog("+++++++++++++++++++++++++sssssssssss") - pt(rdata) - obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(rdata.m_nick) - obj:GetChild("tex_id").text = rdata.mgr_id - -- obj:GetChild("tex_obj_name").text = ViewUtil.stringEllipsis(rdata.t_nick) - -- obj:GetChild("tex_id").text = rdata.uid - -- obj:GetChild("tex_num").text = num >= 0 and "+".. num or num - -- obj:GetController("add").selectedIndex = num >=0 and 1 or 0 - -- obj:GetChild("tex_left").text = d2ad(rdata.cur_hp) - -- obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) +-- 显示奖励 +local function __showRewardsValue(rtype, cur_value, max_value, mng) + local str = "" + if not mng then + str = string.format("%s%%/%s%%", cur_value, max_value) + else + str = string.format("%s%%", cur_value) + end + return str end +function M:FillRecordItem(data, obj) + + local group = DataManager.groups:get(self.group_id) + + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick).."("..data.total..")" + obj:GetChild("tex_id").text = "ID:" .. data.uid + + local tex_total_score = obj:GetChild("tex_total_score") + local ctr_show_total = obj:GetController("show_total") + if data._total_hp then + + tex_total_score.text = data._total_hp + ctr_show_total.selectedIndex = 1 + else + ctr_show_total.selectedIndex = 0 + end + + obj:GetChild("tex_round_valid").text = d2ad(data.reward_hp+data.total_win)--d2ad(data.reward_hp) --data.valid_round / 100 + obj:GetChild("tex_round_total").text = data.total_round + obj:GetChild("tex_total").text = d2ad(data.total_win) + obj:GetChild("tex_round_youxiao").text = data.valid_round / 100 + + + local btn_check_members = obj:GetChild("btn_check_members") + btn_check_members.onClick:Set(function() + ViewUtil.ShowModalWait(self._root_view) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + + local hp = d2ad(res.Data.hp) + tex_total_score.text = hp + data._total_hp = hp + data.total = res.Data.total_member - 1 + obj:GetChild("tex_name").text = data.nick.."("..data.total..")" + ctr_show_total.selectedIndex = 1 + end + end) + end) + + + local btn_award = obj:GetChild("btn_award") + btn_award.text = d2ad(data.reward_hp)--d2ad(data.reward_hp+data.total_win) + btn_award.onClick:Set(function() + + local time_type = self._view:GetController("type").selectedIndex + local gniv = GroupPartnerStatPlay.new(self.group_id, data.uid, data.partnerLev, DataManager.SelfUser.account_id, time_type,self.begin_time,self.end_time) + gniv:Show() + end) + + local btn_detail = obj:GetChild("btn_detail") + btn_detail.onClick:Set(function() + local time_type = self._view:GetController("type").selectedIndex + --printlog("ccccccccccwwwwwwwwwwwwwwwwwwwwwwwwwwww ",self.begin_time," ",self.end_time) + local gniv = GroupPartnerStatMember.new(self.group_id,data.uid, 0,self.begin_time,self.end_time) + gniv:Show() + end) + + if group.lev == 1 then + obj:GetController('diaodu_ismengzhu').selectedIndex = 1 + else + obj:GetController('diaodu_ismengzhu').selectedIndex = 0 + end + + local btn_detail1 = obj:GetChild("btn_detail_zhengzudiaodu") + -- 【新增】判断按钮是否存在 + if btn_detail1 then + btn_detail1.onClick:Set(function() + ViewUtil.ShowModalWait() + ControllerManager.GetController(NewGroupController):FG_GetBanMemberHB(self.group_id, data.uid, function(res) + ViewUtil.CloseModalWait() + --pt(res) + if res.ReturnCode == 0 then + local diaoduView=GroupSetMemberInfoDiaoduView.new(self.group_id, data.uid) + diaoduView:SetCurrentState(res.Data.group_black+1,res.Data) + else + ViewUtil.ErrorTip(res.ReturnCode,"获取整组调度失败！") + end + + end) + end) +end + local btnMen = obj:GetChild("btnMen") + -- btnMen.text = d2ad(data.autoscore) + local menControl = obj:GetController("menkan") + + if group.lev==1 or (group.lev==3 and group.partnerLev>0) then + if (DataManager.SelfUser.account_id ~= data.uid) then + menControl.selectedIndex = 1 + btnMen.text = d2ad(data.autoscore) + btnMen.touchable = true + + else + btnMen.text = d2ad(data.autoscore) + menControl.selectedIndex = 1 + btnMen.touchable = false + end + else + menControl.selectedIndex = 0 + end + + btnMen.onClick:Set(function() + local gfiv = GroupNumberInputView.new(self._root_view,function(num) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_SetPartnerThreshold(self.group_id, data.uid, num, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode,"设置失败") + else + ViewUtil.ShowBannerOnScreenCenter("设置成功") + btnMen.text = num + data.autoscore = ad2d(num) + end + end) + end, 0) + gfiv:Show() + end) +end + +function M:OnRenderRecordItem(index, obj) + local data = self.record_data[index + 1] + self:FillRecordItem(data, obj) +end + + return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua index ba61c6ce..0f24ce8b 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua @@ -221,6 +221,8 @@ function M:OnRenderItem(index, obj) obj:GetChild("tex_num").text = num >= 0 and "+".. num or num obj:GetController("add").selectedIndex = num >=0 and 1 or 0 obj:GetChild("tex_left").text = d2ad(rdata.cur_hp) + obj:GetChild("tex_reason_name_id").text = "给"..ViewUtil.stringEllipsis(rdata.t_nick).. + "(ID:"..rdata.uid..")增加\n"..num.."比赛分" obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua index 079be680..6883ea9e 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua @@ -147,8 +147,6 @@ function M:FillView() self.group_id, tonumber(self._texnum_str), function(response) - printlog("响应获取添加玩家==》》》") - pt(response) ViewUtil.CloseModalWait() if (response.ReturnCode and response.ReturnCode == 0) then GroupAddMemberInfoView.new(self.group_id,tonumber(self._texnum_str)):SetAddMember(response.Data) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView2.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView2.lua deleted file mode 100644 index f8d54c87..00000000 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView2.lua +++ /dev/null @@ -1,505 +0,0 @@ --- 牌友圈成员列表 -local GroupNumberInputView = import('.GroupNumberInputView') -local GroupMemberFagLogView = import('.GroupMemberFagLogView') -local GroupSetPermissionView = import('.GroupSetPermissionView') -local GroupBanSameTableView = import('.GroupBanSameTableView') -local GroupMemberOperateView = import('.GroupMemberOperateView') -local GroupAddMemberInfoView=import('.GroupAddMemberInfoView') - - -local MngPermission = import('.MngPermission') - -local GroupMngMemberListView2 = {} - -local M = GroupMngMemberListView2 - -local gid -function GroupMngMemberListView2.new(group_id, blur_view) - local self = M - self.class = 'GroupMngMemberListView2' - self.group_id = group_id - self.member_data = {} - self:FillView() - return self -end - -function M:initData() - if self._view:GetController('page').selectedIndex == 0 then - self:GetMemberData(0) - elseif self._view:GetController('page').selectedIndex == 1 then - self:GetJoinsData() - end -end - --- 管理员权限 -local MngPermissionList = { - DeleteMember = 1, - -- 删除成员 - AddMember = 2, - --添加成员 - SetFag = 3, - --设置体力值 - BanPlaying = 4, - --禁止游戏 - BanSameTable = 5 - --禁止同桌 -} -local function CheckPermission(lev, permission) - if lev == 2 and not permission then - ViewUtil.ErrorTip(nil, '您无权操作！如有需要请联系盟主。', 1) - return false - end - return true -end - -function M:FillView() - self._view = UIPackage.CreateObjectFromURL('ui://NewGroup/View_GroupMemberList2') - -- 初始化成员列表 - self.lst_member = self._view:GetChild('lst_member') - self.lst_member:SetVirtual() - self.lst_member.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) - end - self.lst_member.scrollPane.onPullUpRelease:Set( - function() - --print("aaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbb ",self.lst_member.numItems) - self:GetMemberData(self.lst_member.numItems) - end - ) - - --local n50=self._view:GetChild('n50') - --print(n50) - --n50.displayObject.gameObject.transform.localPosition.x=214 - --print(n50.displayObject.gameObject.transform.localPosition.x) - -- 搜索玩家 - local ctr_search = self._view:GetController('search') - self._view:GetChild('btn_search').onClick:Set( - function() - ViewUtil.ShowModalWait(nil) - local text = self._view:GetChild('tex_id').text - local qid, qnick - if text == "" then - ViewUtil.CloseModalWait() - ViewUtil.ErrorTip(nil, '输入不能为空') - return - end - qid = tonumber(text) or 0 - qnick = text - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_FindMember( - self.group_id, - qid, - function(res) - ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') - else - self._view:GetChild('tex_id').text = '' - ctr_search.selectedIndex = 1 - local item_result = self._view:GetChild('lst_member_find') - item_result:RemoveChildrenToPool() - - for j = 1, #res.Data.members do - local tem = item_result:AddItemFromPool() - self:FillItem(tem, res.Data.members[j], true) - end - end - end, - qnick - ) - end - ) - local btn_back = self._view:GetChild('btn_back') - btn_back.onClick:Set( - function() - self.lst_member.numItems = #self.member_data - end - ) - - local group = DataManager.groups:get(self.group_id) - local perm_array = MngPermission.getPermData(group.permission) - - self.tex_num = self._view:GetChild('tex_num') - self:ClearNumTex() - - local cnt = self._view.numChildren - 1 - - for i = 0, 9 do - local obj = self._view:GetChild('btn_' .. i) - obj.onClick:Add(handler(self, self.OnNumButtonAction)) - i = i + 1 - end - local btn_ok = self._view:GetChild('btn_ok') - btn_ok.onClick:Set( - function() - if not CheckPermission(group.lev, perm_array[2]) then - return - end - if self._texnum_str == '' then - return - end - ViewUtil.ShowModalWait() - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:GetAddMember( - self.group_id, - tonumber(self._texnum_str), - function(response) - printlog("响应获取添加玩家==》》》") - pt(response) - ViewUtil.CloseModalWait() - if (response.ReturnCode and response.ReturnCode == 0) then - GroupAddMemberInfoView.new(self.group_id,tonumber(self._texnum_str)):SetAddMember(response.Data) - self:ClearNumTex() - --ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1) - else - ViewUtil.ErrorTip(123456, '获取玩家失败') - end - end - ) - end - ) - local btn_del = self._view:GetChild('btn_del') - btn_del.onClick:Add(handler(self, self.OnNumButtonAction)) - - local ctr_mng = self._view:GetController('mng') - if group.lev < 3 then - ctr_mng.selectedIndex = 1 - end - local ctr_page = self._view:GetController('page') - ctr_page.onChanged:Set( - function() - self:initData() - end - ) - - - -end - --- 快速访问 -function M:navigation() - self._view:GetController('page').selectedIndex = 2 - self:initData() -end - --- 获取成员数据 -function M:GetMemberData(index) - --print("11111111111111111111") - --print(debug.traceback()) - local group = DataManager.groups:get(self.group_id) - if index == 0 then - group:clearMember() - end - - ViewUtil.ShowModalWait(nil) - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GroupMembers11( - self.group_id, - index, - 6, - false, - 1, - function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') - else - self.member_data = group.members - self.lst_member.numItems = group.member_num - if index == 0 then - self._view:GetChild('tex_memb_num').text = res.Data.member_num - self._view:GetChild('tex_total_hp').text = d2ad(res.Data.hp_num1) - end - end - end - ) -end - --- 修改体力值 -local function __change_fag(gid, pid, is_add, cur_hp, callback) - printlog("修改体力值==》》》",pid) - local gniv = - GroupNumberInputView.new( - nil, - function(num) - num = ad2d((is_add and num or -num)) - ViewUtil.ShowModalWait() - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_ChangeFag( - gid, - pid, - num, - function(res1) - ViewUtil.CloseModalWait() - -- if gniv._is_destroy then - -- return - -- end - if (res1.ReturnCode == 0) then - callback(res1.Data) - else - ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败！') - end - end - ) - -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str - end, - is_add and 1 or 2, - cur_hp and d2ad(cur_hp) or nil - ) - gniv:Show() -end - --- 填充成员对象 -function M:FillItem(obj, member, refresh) - local group = DataManager.groups:get(self.group_id) - obj:GetChild('tex_name').text = ViewUtil.stringEllipsis(member.nick) - obj:GetChild('btn_head').icon = 'ui://Common/Head0' - ImageLoad.Load(member.portrait, obj:GetChild('btn_head')._iconObject, self.class) - -- obj.data = member.id - -- 显示玩家标签，合伙人、管理员 - local ctr_type = obj:GetController('type') - if member.lev < 3 then - ctr_type.selectedIndex = member.lev - elseif member.partnerLev ~= 0 then - ctr_type.selectedIndex = 3 - else - ctr_type.selectedIndex = 0 - end - - -- 体力值数据 - local tex_fag = obj:GetChild('tex_fag') - tex_fag.text = d2ad(member.hp) - - obj:GetChild('tex_id').text = '' .. member.uid - --obj:GetChild("tex_cost_count").text = d2ad(member.last_hp_cost) - - -- if member.online == 1 then - -- obj:GetChild('tex_last_login').text = '在线' - -- else - -- if member.last_time ~= 0 then - -- obj:GetChild('tex_last_login').text = '最近登录\n' .. os.date('%Y/%m/%d', member.last_time) - -- else - -- obj:GetChild('tex_last_login').text = '加入时间\n' .. os.date('%Y/%m/%d', member.join_time) - -- end - -- end - - - -- --上级 - -- obj:GetChild('tex_shangjiName').text=member.parentId_nick or "" - -- if member.parentId==0 then - -- obj:GetChild('tex_shangjiID').text="" - -- else - -- obj:GetChild('tex_shangjiID').text=member.parentId - -- end - - - local perm_array = MngPermission.getPermData(group.permission) - -- 体力值操作按钮事件 - if group.lev < 3 or member.parentId == DataManager.SelfUser.account_id then - obj:GetController('fag').selectedIndex = 1 - else - obj:GetController('fag').selectedIndex = 0 - end - - --obj:GetChild("btn_tag").title = member.score - - local fgCtr = ControllerManager.GetController(NewGroupController) - local p = group:getMember(member.uid) - local mp = group:getMember(DataManager.SelfUser.account_id) - obj:GetChild('btn_fag_add').onClick:Set( - function() - - if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then - return - end - __change_fag( - self.group_id, - member.uid, - true, - nil, - function(data) - local hp = data.hp - member.hp = hp - if p then - p.hp = hp - if mp and mp ~= p then - local mhp = data.mhp - mp.hp = mhp - end - end - self.lst_member.numItems = #self.member_data - -- 搜索出的玩家显示 - if self._view:GetController('search').selectedIndex == 1 then - obj:GetChild('tex_fag').text = d2ad(hp) - end - end - ) - end - ) - obj:GetChild('btn_fag_minus').onClick:Set( - function() - if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then - return - end - __change_fag( - self.group_id, - member.uid, - false, - member.hp, - function(data) - local hp = data.hp - member.hp = hp - if p then - p.hp = hp - if mp and mp ~= p then - local mhp = data.mhp - mp.hp = mhp - end - end - self.lst_member.numItems = #self.member_data - -- 搜索出的玩家显示 - if self._view:GetController('search').selectedIndex == 1 then - obj:GetChild('tex_fag').text = d2ad(hp) - end - end - ) - end - ) - - -- obj:GetChild('btn_score_detail').onClick:Set( - -- function() - -- local mflv = GroupMemberFagLogView.new(self.group_id, member) - -- mflv:Show() - -- end - -- ) - - -- obj:GetChild('btn_operate').onClick:Set( - -- function() - -- local mflv = - -- GroupMemberOperateView.new( - -- self.group_id, - -- member, - -- function(delete) - -- if delete ~= nil and delete == true then - -- local group = DataManager.groups:get(self.group_id) - -- self.member_data = group.members - -- self.lst_member.numItems = #self.member_data - -- self._view:GetController('search').selectedIndex = 0 - -- else - -- self.lst_member.numItems = self.lst_member.numItems - -- if refresh then - -- self:FillItem(obj, member) - -- end - -- end - -- end - -- ) - -- mflv:Show() - -- end - -- ) - -end - -function M:OnRenderItem(index, obj) - local member = self.member_data[index + 1] - - if member then - self:FillItem(obj, member) - end -end - ---获取申请列表 -function M:GetJoinsData() - local group = DataManager.groups:get(self.group_id) - if group.joins > 0 then - ViewUtil.ShowModalWait() - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GroupJoins( - self.group_id, - function(res) - ViewUtil.CloseModalWait() - if (res.ReturnCode == 0) then - local joins = res.Data.joins - group.joins = #joins - if #joins == 0 then - group.update_joins = true - end - self:FillJoinList(joins) - else - ViewUtil.ErrorTip(res.ReturnCode, '获取申请列表失败！') - self:FillJoinList({}) - end - end - ) - else - self:FillJoinList({}) - end -end - ---填充申请 -function M:FillJoinList(data) - local lst_joins = self._view:GetChild('lst_joins') - lst_joins:RemoveChildrenToPool() - for i = 1, #data do - local item = lst_joins:AddItemFromPool() - item:GetChild('tex_name').text = ViewUtil.stringEllipsis(data[i].nick) - item:GetChild('tex_id').text = data[i].id - local btn_head = item:GetChild('btn_head') - ImageLoad.Load(data[i].portrait, btn_head._iconObject) - item:GetChild('btn_yes').onClick:Set( - function() - self:VerifyPlayerJoin(data[i].id, true) - end - ) - item:GetChild('btn_no').onClick:Set( - function() - self:VerifyPlayerJoin(data[i].id, false) - end - ) - end -end - -function M:VerifyPlayerJoin(id, allow) - ViewUtil.ShowModalWait() - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GroupVerifyJoin( - self.group_id, - id, - allow, - function(res) - ViewUtil.CloseModalWait() - if (res.ReturnCode == 0) then - self:GetJoinsData() - else - ViewUtil.ErrorTip(res.ReturnCode, '操作申请失败') - end - end - ) -end - -function M:OnNumButtonAction(context) - local typer = string.sub(context.sender.name, 5) - if typer == 'del' then - if (self._currenIndex > 0) then - self._currenIndex = self._currenIndex - 1 - self._texnum_str = string.sub(self._texnum_str, 0, self._currenIndex) - self.tex_num.text = self._texnum_str - end - else - if (self._currenIndex < 6) then - self._currenIndex = self._currenIndex + 1 - self._texnum_str = self._texnum_str .. typer - self.tex_num.text = self._texnum_str - end - end -end - -function M:ClearNumTex() - self._texnum_str = '' - self._currenIndex = 0 - self.tex_num.text = self._texnum_str -end - -return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua index 0455ec2e..096f73f8 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua @@ -326,7 +326,7 @@ 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) GroupMngPartnerListView2:Show() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngProportionView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngProportionView.lua index 0d5dc6ca..76635267 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngProportionView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngProportionView.lua @@ -72,7 +72,7 @@ end function M:OnRenderPropItem(index, obj) local tem = index + 1 local data = self.prop_data[tem] - obj:GetChild("tex_num").text = d2ad(math.abs(data.hp)) + --obj:GetChild("tex_num").text = d2ad(math.abs(data.hp)) obj:GetChild("tex_winner").text = ViewUtil.stringEllipsis(data.nick) local play_name = DataManager.groups:get(self.group_id):getPlayName(data.pid) obj:GetChild("tex_game").text = play_name 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 62b67d47..d583f852 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,6 @@ -- 牌友圈排行界面 local TimeSettingPanel = import(".TimeSettingPanel") +local GrouRankingSettingsView = import(".GrouRankingSettingsView") local GroupMngRankView = {} @@ -85,6 +86,12 @@ function M:FillView() self:OnRenderRoundItem(index, obj) end + local btn_manager_set = self._view:GetChild('btn_set') + btn_manager_set.onClick:Set(function() + local win1 = GrouRankingSettingsView.new() + win1:Show() + end) + self.lst_winrank = self._view:GetChild("lst_winrank") self.lst_winrank:SetVirtual() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua index 1ae4cb4b..daa2f185 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua @@ -1,227 +1,83 @@ ---牌友圈体力值记录 +-- 赢家管理界面(抽水明细) local TimeSettingPanel = import(".TimeSettingPanel") + local GroupMngShufflingStatisticsFagListView = {} local M = GroupMngShufflingStatisticsFagListView -function GroupMngShufflingStatisticsFagListView.new(group_id) +function GroupMngShufflingStatisticsFagListView.new(gid) local self = M self.class = "GroupMngShufflingStatisticsFagListView" - self.group_id = group_id - -- 体力值数据 - self.fag_data = {} - -- 体力值查询结果 - self.fag_result_data = {} - -- 查询id - self.quary_id = 0 - self.query_nick = "" + self.group_id = gid self:FillView() return self end function M:initData() - - self.fag_result_data = {} - self.fag_data = {} - - if self._view:GetController("page").selectedIndex < 2 then - self:GetFagData(0) - else - self:GetMngFagInfo() - end - local group = DataManager.groups:get(self.group_id) - if group.lev < 3 then - self:GetHpStatistic() - end + self.prop_data = {} + self.lst_prop.numItems = 0 + self:GetPropData(0) end function M:FillView() + self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupProportion") - - - self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupShufflingStatisticsFagList") - local group = DataManager.groups:get(self.group_id) - if group.lev < 3 then - self._view:GetController("mng").selectedIndex = 1 - end - -- 初始化列表 - self.lst_fag = self._view:GetChild("lst_fag") - self.lst_fag:SetVirtual() - self.lst_fag.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) - end - self.lst_fag.scrollPane.onPullUpRelease:Set(function() - self:GetFagData(self.lst_fag.numItems) - end) - self.lst_fag_result = self._view:GetChild("lst_fag_result") - self.lst_fag_result:SetVirtual() - self.lst_fag_result.itemRenderer = function(index, obj) - self:OnRenderItem(index, obj) - end - self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() - self:GetFagData(self.lst_fag_result.numItems) - end) - - -- 切换页面事件，1,2页为上下分，3页是管理员总计 - self._view:GetController("page").onChanged:Set(function() - if self._view:GetController("page").selectedIndex < 2 then - if self._view:GetController("search").selectedIndex == 0 then - self.quary_id = 0 - self.query_nick = "" - - self.fag_data = {} - self:GetFagData(0) - else - - self.quary_id = 0 - self.query_nick = "" - - self.fag_result_data = {} - self:GetFagData(0) - end - else - self:GetMngFagInfo() - end - end) - + self.prop_data = {} self._view:GetChild("btn_search").onClick:Set(function() - local qid = self._view:GetChild("tex_id").text - qid = tonumber(qid) - self.quary_id = qid or 0 - self.query_nick = self._view:GetChild("tex_id").text or "" - self.fag_result_data = {} - self._view:GetChild("tex_id").text = "" - self:GetFagData(0) - end) - self._view:GetChild("btn_back").onClick:Set(function() - self.quary_id = 0 - self.query_nick = "" + self:initData() end) - self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, function() - self:GetMngFagInfo() - end) + self.lst_prop = self._view:GetChild("lst_proportion") + self.lst_prop:SetVirtual() + self.lst_prop.itemRenderer = function(index, obj) + self:OnRenderPropItem(index, obj) + end + self.lst_prop.scrollPane.onPullUpRelease:Set(function() + self:GetPropData(self.lst_prop.numItems) + end) + + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) end --- 获取上下分数据 -local num = 8 -function M:GetFagData(index) - qid = self.quary_id or 0 - qName = self.query_nick or "" - -- 重新获取数据时，清空数据列表 - if index == 0 then - if qid == 0 then - self.fag_data = {} - else - self.fag_result_data = {} - end - end - ViewUtil.ShowModalWait(nil) - - --type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分 - local type = self._view:GetController("page").selectedIndex + 1 - local group = DataManager.groups:get(self.group_id) - if group.lev == 3 then - type = type + 2 - end +-- 获取抽水数据 +function M:GetPropData(index) + ViewUtil.ShowModalWait() + local begin_time, end_time = self.time_panel:GetDate() local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMngHpLog(self.group_id, index, num, type, qid, qName, function(res) - ViewUtil.CloseModalWait() + fgCtr:FG_GetPropLog(self.group_id, index, 8, begin_time, end_time, function(res) if self._is_destroy then return end + ViewUtil.CloseModalWait() if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") + ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败") else - if res.Data.hp_logs ~= nil then - local data = res.Data.hp_logs - -- if #data == 0 then return end - local local_data = self.fag_data - local lst = self.lst_fag - if qid ~= 0 or self.query_nick ~= "" then - local_data = self.fag_result_data - lst = self.lst_fag_result - self._view:GetController("search").selectedIndex = 1 - else - self._view:GetController("search").selectedIndex = 0 - end - for i = 1, #data do - local_data[#local_data + 1] = data[i] - end - lst.numItems = #local_data - end - end - end) -end - --- 获取体力值统计 -function M:GetHpStatistic() - -- ViewUtil.ShowModalWait(nil, "正在获取数据") - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMngHpStatistic(self.group_id, function(res) - -- ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") - else - self._view:GetChild("tex_yd_cost").text = d2ad(res.Data.last_hp_cost) - self._view:GetChild("tex_td_cost").text = d2ad(res.Data.hp_cost) - self._view:GetChild("tex_add").text = d2ad(res.Data.hp_upper) - self._view:GetChild("tex_minus").text = d2ad(res.Data.hp_sub) - end - end) -end - --- 获取管理员总计/合伙人总计 -function M:GetMngFagInfo() - ViewUtil.ShowModalWait(nil) - local begin_time, end_time = self.time_panel1:GetDate() - local group = DataManager.groups:get(self.group_id) - local type = group.lev < 3 and 1 or 2 - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetMngHpInfo(self.group_id, type, begin_time, end_time, function(res) - ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败") - else - local add_count = 0 - local minus_count = 0 - local lst_fag_info = self._view:GetChild("lst_mgr_data") - lst_fag_info:RemoveChildrenToPool() - for i = 1, #res.Data.infos do - local data = res.Data.infos[i] - local item = lst_fag_info:AddItemFromPool() - item:GetChild("tex_mgr").text = not data.lev and "合伙人" or (data.lev == 1 and "盟主" or "副盟主") - item:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) - item:GetChild("tex_add").text = d2ad(data.hp_upper) - item:GetChild("tex_minus").text = d2ad(data.hp_sub) - add_count = add_count + data.hp_upper - minus_count = minus_count + data.hp_sub + local props = res.Data.hp_logs + if index == 0 then + self._view:GetChild("tex_winner_count").text = res.Data.count + self._view:GetChild("tex_valid_count").text = res.Data.valid_count + self._view:GetChild("tex_winner_proportion").text = d2ad(res.Data.pump) + self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.gains) end - self._view:GetChild("tex_add2").text = d2ad(add_count) - self._view:GetChild("tex_minus2").text = d2ad(minus_count) + if #props == 0 then return end + for i = 1, #props do + self.prop_data[#self.prop_data + 1] = props[i] + end + self.lst_prop.numItems = #self.prop_data end end) end --- 填充对象 -function M:OnRenderItem(index, obj) - local local_data = (self.quary_id == 0 and self.query_nick == "" ) and self.fag_data or self.fag_result_data - local rdata = local_data[index + 1] - local num = d2ad(rdata.hp) - obj:GetChild("tex_mgr_name").text = ViewUtil.stringEllipsis(rdata.m_nick) - obj:GetChild("tex_mgr_id").text = rdata.mgr_id - obj:GetChild("tex_obj_name").text = ViewUtil.stringEllipsis(rdata.t_nick) - obj:GetChild("tex_id").text = rdata.uid - obj:GetChild("tex_num").text = num >= 0 and "+".. num or num - obj:GetController("add").selectedIndex = num >=0 and 1 or 0 - obj:GetChild("tex_left").text = d2ad(rdata.cur_hp) - obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) +-- 填充抽水对象 +function M:OnRenderPropItem(index, obj) + local tem = index + 1 + local data = self.prop_data[tem] + --obj:GetChild("tex_num").text = d2ad(math.abs(data.hp)) + obj:GetChild("tex_winner").text = ViewUtil.stringEllipsis(data.nick) + local play_name = DataManager.groups:get(self.group_id):getPlayName(data.pid) + obj:GetChild("tex_game").text = play_name + obj:GetChild("tex_roomid").text = data.roomid + obj:GetChild("tex_date").text = os.date("%m月%d日\r%H:%M", data.time) end return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua index 851eafcb..9aee921e 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua @@ -33,11 +33,9 @@ function M:InitView() -- if group.lev ~= 3 then -- self._view:GetController("mng").selectedIndex = 1 -- end - if group then - printlog("group.lev-----------------", group.o_nick) -- 直接打印 lev 字段的值notice - pt(group) -- 使用 pt 打印整个表的详细结构 - end - +local groups = DataManager.groups.groupList +printlog("-----------------sss------") +pt(group) local lst_mgr_index = self._view:GetChild("lst_mgr_index") if self._view:GetChild("tex_gyxs_name") then self._view:GetChild("tex_gyxs_name").text = group.o_nick @@ -87,6 +85,26 @@ function M:InitView() self.begin_time, self.end_time = self.time_panel:GetDate() self:GetRecordData(0) end) + self._view:GetChild("btn_today").onClick:Set(function() + self.record_data = {} + self.lst_record.numItems = 0 + + -- 显式计算今天的时间范围 + 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 + }) + + self.begin_time = today + self.end_time = today + 86400 + + self:GetRecordData(0) + end) self.totalwin = self._view:GetChild("tex_alltotal") end @@ -98,7 +116,6 @@ function M:GetRecordData(index) if self.begin_time ~= nil and self.end_time ~= nil then time_type = 0 end - local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GetXingYunStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res) ViewUtil.CloseModalWait() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua index b749a178..d4948891 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua @@ -24,6 +24,10 @@ function M:initView(url) BaseWindow.init(self, "ui://NewGroup/Win_PartnerRewards") self.lst_rewards = self._view:GetChild("lst_rewards") + -- printlog("合伙人玩法奖励", self.partner_id) + --self.lst_rewards = self._view:GetChild("tex_duiname") + + self._view:GetChild("tex_duiname").text = "您正在对用户"..self.partner_id.."进行比赛分成设置操作" self.lst_rewards:SetVirtual() self.lst_rewards.itemRenderer = function(index, obj) self:OnRenderRewardsItem(index, obj) @@ -91,6 +95,8 @@ function M:OnRenderRewardsItem(index, obj) obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1) obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3, data.rewardValueType or 1) obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value, data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1) + obj:GetChild("tex_section").text ="0-"..data.max_value + obj:GetChild("tex_residue").text = data.max_value local play_name = group:getPlayName(data.pid) obj:GetChild("tex_name").text = play_name if data.rewardType == 3 or self.partner_id == DataManager.SelfUser.account_id then diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua index bc1bc6c6..b38951fb 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua @@ -3,7 +3,6 @@ local GroupMngFagListView = import(".GroupMngFagListView") local GroupMngGameListView = import(".GroupMngGameListView") local GroupMngMemberListView = import(".GroupMngMemberListView") local GroupMngMemberListView1 = import(".GroupMngMemberListView1") -local GroupMngMemberListView2 = import(".GroupMngMemberListView2") local GroupMngAddMemberView = import(".GroupMngAddMemberView") local GroupMngRankView = import(".GroupMngRankView") local GroupMngRoomStatView = import(".GroupMngRoomStatView") @@ -53,9 +52,9 @@ MngPageConfig.PageList = { {id = 25, title = "座位分明细", view = GroupMngFagListView, refresh = true, clear_image = false,anchorOffset = 300}, {id = 26, title = "每日统计", view = GroupMngPlayStatView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 27, title = "比赛分管理", view = GroupMngMemberListView, refresh = true, clear_image = true,anchorOffset = 300}, - {id = 28, title = "比赛分分成", view = GroupMngMemberListView2, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 28, title = "比赛分分成", view = GroupMngPartnerListView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 29, title = "比赛分明细", view = GroupMngMatchFagListView, refresh = true, clear_image = true,anchorOffset = 300}, - {id = 30, title = "赠送分明细", view = GroupMngGiftPointsFagListView, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 30, title = "赠送分明细", view = GroupMngProportionView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 31, title = "洗牌统计", view = GroupMngShufflingStatisticsFagListView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 32, title = "赠送统计", view = GroupMngGiveFagListView, refresh = true, clear_image = true,anchorOffset = 300}, } diff --git a/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info b/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info index a7afb294..e5bfea59 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info @@ -1,34 +1,3 @@ { - "objectStatus": { - "n118_l7wn": { - "hidden": true - }, - "n112_l7wn": { - "hidden": true - }, - "n117_l7wn": { - "hidden": true - }, - "n114_l7wn": { - "hidden": true - }, - "n113_l7wn": { - "hidden": true - }, - "n116_l7wn": { - "hidden": true - }, - "n119_l7wn": { - "hidden": true - }, - "n115_l7wn": { - "hidden": true - }, - "n111_l7wn": { - "hidden": true - }, - "n110_l7wn": { - "hidden": true - } - } + "adaptiveTest": true } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info index 79530278..e6f352dd 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info +++ b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info @@ -1,21 +1,11 @@ { "objectStatus": { - "n133_et16": { - "hidden": true - }, "n79_nk4v": { "hidden": true }, "n78_nk4v": { "hidden": true - }, - "n111_myu9": { - "hidden": true - }, - "n98_yetw": { - "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info b/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info index d844b294..844de5f0 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info +++ b/wb_new_ui/.objs/metas/m7iejg46/cioehoa.info @@ -1,6 +1,15 @@ { "objectStatus": { - "n44_myu9": { + "n49_et16": { + "hidden": true + }, + "n28_oj7k": { + "hidden": true + }, + "n27_oj7k": { + "hidden": true + }, + "n51_k5m9": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/eh0o7iju.info b/wb_new_ui/.objs/metas/m7iejg46/eh0o7iju.info new file mode 100644 index 00000000..588dd762 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/eh0o7iju.info @@ -0,0 +1,8 @@ +{ + "objectStatus": { + "n91_eh0o": { + "collapsed": true + } + }, + "adaptiveTest": true +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikl.info b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikl.info new file mode 100644 index 00000000..828aebb5 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikl.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n104_kwi0": { + "collapsed": true + }, + "n189_dji9": { + "hidden": true + }, + "n184_b5ny": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info index ee3a6e2b..d9b22c91 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info +++ b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info @@ -21,14 +21,11 @@ "n56_j120": { "hidden": true }, - "n63_omkm": { - "hidden": true - }, "n35_oj7k": { "hidden": true }, - "n36_oj7k": { - "collapsed": true + "n63_omkm": { + "hidden": true }, "n67_wbjh": { "hidden": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info b/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info index e4f5d468..edb77609 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info +++ b/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info @@ -3,6 +3,9 @@ "n155_sbng": { "collapsed": true }, + "n134_lcv1": { + "locked": true + }, "n187_g6sw": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info b/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info index a7a608f4..dea2072f 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info +++ b/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info @@ -1,13 +1,25 @@ { "objectStatus": { - "n12_cpin": { + "n8_zgn4": { "hidden": true }, "n11_cpin": { "hidden": true }, + "n12_cpin": { + "hidden": true + }, + "n4_gls1": { + "hidden": true + }, "n10_cpin": { "hidden": true + }, + "n9_zgn4": { + "hidden": true + }, + "n7_zgn4": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info index f67cc7d3..74192d5f 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info +++ b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info @@ -7,6 +7,9 @@ "hidden": true, "collapsed": true }, + "n202_ex3l": { + "hidden": true + }, "n187_dji9": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info index 48877098..2c01674d 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info @@ -12,6 +12,7 @@ "collapsed": true }, "n140_ex3l": { + "hidden": true, "collapsed": true }, "n94_kwi0": { diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info index e5ec0083..469cc1ff 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info @@ -1,4 +1,14 @@ { + "objectStatus": { + "n35_gls1": { + "hidden": true, + "collapsed": true + }, + "n13_gls1": { + "hidden": true, + "collapsed": true + } + }, "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm4.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm4.info index 9e26dfee..e9e92bdc 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm4.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm4.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n8_gls1": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info index 366989bf..4d10333d 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info +++ b/wb_new_ui/.objs/metas/m7iejg46/lf2qhju.info @@ -15,9 +15,6 @@ "n104_vyn3": { "hidden": true }, - "n92_jj65": { - "collapsed": true - }, "n69_f8lb": { "collapsed": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info b/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info index d62b1f07..d0e3d58e 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info @@ -1,7 +1,8 @@ { "objectStatus": { - "n86_cpin": { + "n93_eh0o": { "hidden": true } - } + }, + "adaptiveTest": true } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info index 82d643f6..966480d8 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii5.info @@ -1,9 +1,21 @@ { "objectStatus": { + "n145_tkv1": { + "collapsed": true + }, + "n136_s8rw": { + "hidden": true + }, + "n33_rpaz": { + "collapsed": true + }, + "n142_tkv1": { + "collapsed": true + }, "n131_jawz": { "hidden": true }, - "n136_s8rw": { + "n94_ocx0": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info index b22e354e..c70eb7f1 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info @@ -1,23 +1,14 @@ { "objectStatus": { - "n108_p747": { - "hidden": true - }, - "n144_ex3l": { - "hidden": true - }, "n136_ex3l": { "hidden": true }, - "n140_ex3l": { + "n84_kwi0": { "hidden": true }, "n65_kwi0": { "hidden": true }, - "n84_kwi0": { - "hidden": true - }, "n117_sbng": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info index c677e7c4..eea41e95 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17iig.info @@ -1,19 +1,22 @@ { "objectStatus": { - "n136_ex3l": { - "hidden": true - }, - "n84_kwi0": { - "hidden": true - }, "n108_p747": { "hidden": true }, - "n65_kwi0": { + "n136_ex3l": { "hidden": true }, "n140_ex3l": { "hidden": true + }, + "n60_kwi0": { + "collapsed": true + }, + "n65_kwi0": { + "hidden": true + }, + "n84_kwi0": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tkv17iii.info b/wb_new_ui/.objs/metas/m7iejg46/tkv17iii.info index ab040c86..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tkv17iii.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tkv17iii.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n44_rpaz": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index f2790253..16133d0d 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,22 +2,14 @@ "libview.firstColumnWidth": 398, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg4610snh5j", - "ui://m7iejg46l7wn7i82", - "ui://m7iejg46l7wn7i81", - "ui://m7iejg46l7wn7i80", - "ui://m7iejg46kwi0hkr", - "ui://m7iejg46tkv17ii5", - "ui://m7iejg46z3847i6m", - "ui://m7iejg46tkv17iig", + "ui://m7iejg46eh0o7ikl", "ui://m7iejg46tkv17iii", - "ui://2d9xdj6zfn7fao", - "ui://2d9xdj6zlumrgj" + "ui://m7iejg46eh0o7ikm" ], - "test.device": "Huawei Mate20", + "test.device": "iPhone 5", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46tkv17iii", + "doc.activeDoc": "ui://m7iejg46eh0o7ikm", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -40,36 +32,6 @@ "/images/", "27vd145b", "/images/ComxiantangMui/", - "egnzysm7", - "/", - "egnzysm7", - "/component/", - "egnzysm7", - "/component/EPCDWHZMui/", - "442j0uep", - "/", - "442j0uep", - "/component/", - "442j0uep", - "/component/EPRHZMui/", - "1hl55dqm", - "/", - "d1qrzqpr", - "/", - "qubt49z8", - "/", - "4wmd3o8g", - "/", - "96mvx2ml", - "/", - "boq0ohep", - "/", - "2d9xdj6z", - "/", - "2d9xdj6z", - "/component/", - "2d9xdj6z", - "/component/group/", "m7iejg46", "/", "m7iejg46", @@ -77,11 +39,19 @@ "m7iejg46", "/component/Btn/", "m7iejg46", + "/component/Lst_friend/", + "m7iejg46", "/images/", "m7iejg46", "/images/NGXiangTangMui/", "m7iejg46", "/mgr/", + "m7iejg46", + "/mgr/component/", + "m7iejg46", + "/mgr/component/member/", + "m7iejg46", + "/mgr/component/member/partner/", "x3mp2cn6", "/" ], diff --git a/wb_new_ui/assets/NewGroup/Win_FagInput0.xml b/wb_new_ui/assets/NewGroup/Win_FagInput0.xml index ccd20e42..df60e575 100644 --- a/wb_new_ui/assets/NewGroup/Win_FagInput0.xml +++ b/wb_new_ui/assets/NewGroup/Win_FagInput0.xml @@ -1,64 +1,62 @@ - + - + - - + + +