diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupSetUpTeamAlertSystemView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupSetUpTeamAlertSystemView.lua new file mode 100644 index 00000000..eb8067cf --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/GroupSetUpTeamAlertSystemView.lua @@ -0,0 +1,279 @@ +local TimeSettingPanel = import(".MngView.TimeSettingPanel") +local GroupPartnerStatMember = import(".MngView.GroupPartnerStatMember") +local GroupPartnerStatPlay = import(".MngView.GroupPartnerStatPlay") +local GroupNumberInputView = import(".MngView.GroupNumberInputView") +local GroupSetMemberInfoDiaoduView = import('.MngView.GroupSetMemberInfoDiaoduView') +-- 开桌统计 +local GroupSetUpTeamAlertSystemView = {} + +local M = GroupSetUpTeamAlertSystemView + + +function GroupSetUpTeamAlertSystemView.new(gid) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "GroupSetUpTeamAlertSystemView" + self._close_destroy = true + self.group_id = gid + self.record_data = {} + self:init("ui://NewGroup/Win_SetUpTeamAlertSystem") + return self +end + +function M:init(url) + BaseWindow.init(self, url) + + local group = DataManager.groups:get(self.group_id) + + 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_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) + + 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 + 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 + self:GetRecordData(0) + end) + + -- 搜索玩家 + 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 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) + 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 + ) + + local btn_back = self._view:GetChild('btn_back') + btn_back.onClick:Set( + function() + self.lst_record.numItems = #self.record_data + end + ) + + -- 初始化数据 + self:initData() +end + +function M:initData() + self.lst_record.numItems = 0 + self.record_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 + self.end_time = today + 86400 + self:GetRecordData(0) +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 + time_type = 0 + end + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res) + ViewUtil.CloseModalWait() + + if res.ReturnCode == 0 then + local members = res.Data.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 + +-- 显示奖励 +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) + 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) + 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 + + ViewUtil.ShowModalWait(self._root_view) + local fgCtr = ControllerManager.GetController(NewGroupController) + -- 异步获取 HP + fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + if res.ReturnCode == 0 then + local hp = d2ad(res.Data.hp) + + tex_total_score.text = hp + data._total_hp = hp + + obj:GetChild("tex_total").text = hp + + data.total = res.Data.total_member - 1 + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) + ctr_show_total.selectedIndex = 1 + end + end) + + local btn_award = obj:GetChild("btn_award") + btn_award.text = d2ad(data.reward_hp) + 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) + obj:GetChild("tex_round_valid").text = d2ad(data.reward_hp) + + local btn_detail = obj:GetChild("btn_detail") + btn_detail.onClick:Set(function() + local time_type = self._view:GetController("type").selectedIndex + 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() + 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") + local menControl = obj:GetController("menkan") + local texMentext = obj:GetChild("tex_Men_text") + if group.lev == 1 or (group.lev == 3 and group.partnerLev > 0) then + if (DataManager.SelfUser.account_id ~= data.uid) then + menControl.selectedIndex = 1 + texMentext.text = d2ad(data.autoscore) + btnMen.touchable = true + else + texMentext.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("设置成功") + texMentext.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 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 5428f936..9b6df886 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua @@ -192,8 +192,9 @@ 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_name").text = ViewUtil.stringEllipsis(data.nick) obj:GetChild("tex_id").text = "ID:" .. data.uid + obj:GetChild("tex_numberofpeople").text = data.total local tex_total_score = obj:GetChild("tex_total_score") local ctr_show_total = obj:GetController("show_total") @@ -223,7 +224,7 @@ function M:FillRecordItem(data, obj) 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..")" + obj:GetChild("tex_name").text = data.nick ctr_show_total.selectedIndex = 1 end 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 6883ea9e..b8cb4224 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua @@ -5,6 +5,7 @@ local GroupSetPermissionView = import('.GroupSetPermissionView') local GroupBanSameTableView = import('.GroupBanSameTableView') local GroupMemberOperateView = import('.GroupMemberOperateView') local GroupAddMemberInfoView=import('.GroupAddMemberInfoView') +local GroupSetUpTeamAlertSystemView=import('..GroupSetUpTeamAlertSystemView') local MngPermission = import('.MngPermission') @@ -66,7 +67,14 @@ function M:FillView() self:GetMemberData(self.lst_member.numItems) end ) - + local btn_detail1 = self._view:GetChild("bth_SetUpTeamAlertSystem") + -- 【新增】判断按钮是否存在 + if btn_detail1 then + btn_detail1.onClick:Set(function() + local gniv1 = GroupSetUpTeamAlertSystemView.new(self.group_id) + gniv1:Show() + end) + end --local n50=self._view:GetChild('n50') --print(n50) --n50.displayObject.gameObject.transform.localPosition.x=214 diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua index f7f95cce..f9523261 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua @@ -2,7 +2,7 @@ local TimeSettingPanel = import(".TimeSettingPanel") local GroupPartnerStatMember = import(".GroupPartnerStatMember") local GroupPartnerStatPlay = import(".GroupPartnerStatPlay") local GroupNumberInputView = import(".GroupNumberInputView") -local GroupSetMemberInfoDiaoduView=import('.GroupSetMemberInfoDiaoduView') +local GroupSetMemberInfoDiaoduView = import('.GroupSetMemberInfoDiaoduView') -- 开桌统计 local GroupMngPartnerStatView = {} @@ -21,8 +21,8 @@ function M:initData() self.lst_record.numItems = 0 self.record_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}) + 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) @@ -34,7 +34,7 @@ end -- 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) @@ -57,28 +57,29 @@ function M:InitView() -- end 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, nil, true) + + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0, nil, true) 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}) + 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 - 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}) + 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 @@ -115,7 +116,7 @@ function M:InitView() local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_FindPartnerStat( self.group_id, - qid,0, 6, time_type,self.begin_time,self.end_time, + qid, 0, 6, time_type, self.begin_time, self.end_time, function(res) -- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222") -- pt(res) @@ -133,14 +134,14 @@ function M:InitView() for j = 1, #res.Data.members do local tem = item_result:AddItemFromPool() - self:FillRecordItem(res.Data.members[j],tem) + 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() @@ -149,9 +150,7 @@ function M:InitView() ) end - function M:GetRecordData(index) - ViewUtil.ShowModalWait() local time_type = self._view:GetController("type").selectedIndex @@ -160,15 +159,13 @@ function M:GetRecordData(index) end local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type,self.begin_time,self.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 res.ReturnCode == 0 then - local members = res.Data.members -- printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc") - -- pt(members) + -- pt(members) for i = 1, #members do self.record_data[#self.record_data + 1] = members[i] end @@ -189,118 +186,137 @@ local function __showRewardsValue(rtype, cur_value, max_value, mng) end function M:FillRecordItem(data, obj) + local group = DataManager.groups:get(self.group_id) - local group = DataManager.groups:get(self.group_id) + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) + obj:GetChild("tex_id").text = "ID:" .. data.uid + obj:GetChild("tex_gps_ips_numberOfPeople").text = data.total - 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 - + 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 + 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_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 + ViewUtil.ShowModalWait(self._root_view) + local fgCtr = ControllerManager.GetController(NewGroupController) + -- 异步获取 HP + fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local hp = d2ad(res.Data.hp) - 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) + -- 【修改点】在回调内部更新数据和UI + tex_total_score.text = hp + data._total_hp = hp + + -- 如果 tex_total 也需要显示这个值，必须在这里设置 + obj:GetChild("tex_total").text = hp + + data.total = res.Data.total_member - 1 + obj:GetChild("tex_name").text = data.nick + ctr_show_total.selectedIndex = 1 + end end) + --obj:GetChild("tex_total").text =data._total_hp + -- 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 + -- 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.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() + 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) + obj:GetChild("tex_round_valid").text = d2ad(data.reward_hp) 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() + 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 + obj:GetController('diaodu_ismengzhu').selectedIndex = 1 else - obj:GetController('diaodu_ismengzhu').selectedIndex = 0 + obj:GetController('diaodu_ismengzhu').selectedIndex = 0 end local btn_detail1 = obj:GetChild("btn_detail_zhengzudiaodu") - -- 【新增】判断按钮是否存在 - if btn_detail1 then + -- 【新增】判断按钮是否存在 + 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) + local diaoduView = GroupSetMemberInfoDiaoduView.new(self.group_id, data.uid) + diaoduView:SetCurrentState(res.Data.group_black + 1, res.Data) else - ViewUtil.ErrorTip(res.ReturnCode,"获取整组调度失败！") + ViewUtil.ErrorTip(res.ReturnCode, "获取整组调度失败！") end - end) - end) -end + end) + end local btnMen = obj:GetChild("btnMen") - -- btnMen.text = d2ad(data.autoscore) + -- btnMen.text = d2ad(data.autoscore) local menControl = obj:GetController("menkan") - - if group.lev==1 or (group.lev==3 and group.partnerLev>0) then + + 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 + 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) + 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,"设置失败") + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "设置失败") else ViewUtil.ShowBannerOnScreenCenter("设置成功") - btnMen.text = num - data.autoscore = ad2d(num) + btnMen.text = num + data.autoscore = ad2d(num) end end) end, 0) @@ -310,8 +326,7 @@ end function M:OnRenderRecordItem(index, obj) local data = self.record_data[index + 1] - self:FillRecordItem(data, obj) + self:FillRecordItem(data, obj) end - -return M \ No newline at end of file +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua index daa2f185..c700e97c 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua @@ -14,9 +14,9 @@ function GroupMngShufflingStatisticsFagListView.new(gid) end function M:initData() - self.prop_data = {} - self.lst_prop.numItems = 0 - self:GetPropData(0) + self.prop_data = {} + self.lst_prop.numItems = 0 + self:GetPropData(0) end function M:FillView() @@ -24,60 +24,61 @@ function M:FillView() self.prop_data = {} self._view:GetChild("btn_search").onClick:Set(function() - self:initData() + self:initData() end) self.lst_prop = self._view:GetChild("lst_proportion") - self.lst_prop:SetVirtual() + self.lst_prop:SetVirtual() self.lst_prop.itemRenderer = function(index, obj) - self:OnRenderPropItem(index, obj) - end + 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) + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0) end -- 获取抽水数据 -function M:GetPropData(index) - ViewUtil.ShowModalWait() - local begin_time, end_time = self.time_panel:GetDate() +function M:GetPropData(index) + ViewUtil.ShowModalWait() + local begin_time, end_time = self.time_panel:GetDate() local fgCtr = ControllerManager.GetController(NewGroupController) 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.CloseModalWait() + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败") else - local props = res.Data.hp_logs - if index == 0 then - self._view:GetChild("tex_winner_count").text = res.Data.count + 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 - 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 + self._view:GetChild("tex_winner_proportion").text = d2ad(res.Data.pump) + self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.gains) + end + 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: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) + 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 +return M 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 9aee921e..741cd6f8 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua @@ -2,6 +2,7 @@ local TimeSettingPanel = import(".TimeSettingPanel") local GroupPartnerStatMember = import(".GroupPartnerStatMember") local GroupPartnerStatPlay = import(".GroupPartnerStatPlay") local GroupNumberInputView = import(".GroupNumberInputView") +local GroupMngPersonStatAloneView = import(".GroupMngPersonStatAloneView") -- 开桌统计 local GroupMngXingYunStatView = {} @@ -34,8 +35,6 @@ function M:InitView() -- self._view:GetController("mng").selectedIndex = 1 -- 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 @@ -140,6 +139,12 @@ function M:FillRecordItem(data, obj) 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 bth_record = obj:GetChild('bth_xy_record') + bth_record.onClick:Set(function() + local gl_bth_record = GroupMngPersonStatAloneView.new(self.curGroup.id) + gl_bth_record:InitView() + gl_bth_record:Show() + end) end function M:OnRenderRecordItem(index, obj) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua index aaf9e6cf..c64eb469 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua @@ -185,7 +185,7 @@ function M:OnRenderItem(index, obj) local btn_detail_tiaoduzjM = obj:GetChild("btn_detail_tiaoduzjM") if btn_detail_tiaoduzjM then - btn_detail_tiaoduzjM.visible = true + --btn_detail_tiaoduzjM.visible = true btn_detail_tiaoduzjM.onClick:Set(function() ViewUtil.ShowModalWait() ControllerManager.GetController(NewGroupController):FG_GetBanMemberHB(self.group_id, data.uid, function(res) diff --git a/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikm.info b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikm.info new file mode 100644 index 00000000..2429f183 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikm.info @@ -0,0 +1,44 @@ +{ + "objectStatus": { + "n42_f6br": { + "hidden": true + }, + "n41_f6br": { + "hidden": true + }, + "n44_f6br": { + "hidden": true + }, + "n20_oj7k": { + "hidden": true, + "collapsed": true + }, + "n62_omkm": { + "hidden": true + }, + "n67_wbjh": { + "hidden": true + }, + "n63_omkm": { + "hidden": true + }, + "n43_f6br": { + "hidden": true + }, + "n54_j120": { + "hidden": true + }, + "n52_j120": { + "hidden": true + }, + "n56_j120": { + "hidden": true + }, + "n59_omkm": { + "hidden": true + }, + "n36_oj7k": { + "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 d9b22c91..72f347bb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info +++ b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info @@ -1,8 +1,5 @@ { "objectStatus": { - "n54_j120": { - "hidden": true - }, "n42_f6br": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/nwgkhx0.info b/wb_new_ui/.objs/metas/m7iejg46/nwgkhx0.info index e5ec0083..5fcf46d8 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/nwgkhx0.info +++ b/wb_new_ui/.objs/metas/m7iejg46/nwgkhx0.info @@ -1,4 +1,12 @@ { - "adaptiveTest": true, + "objectStatus": { + "n89_dji9": { + "hidden": true, + "collapsed": true + }, + "n90_dji9": { + "hidden": true + } + }, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/nwgkhx1.info b/wb_new_ui/.objs/metas/m7iejg46/nwgkhx1.info index d2c361e8..e20e65c9 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/nwgkhx1.info +++ b/wb_new_ui/.objs/metas/m7iejg46/nwgkhx1.info @@ -1,6 +1,18 @@ { "objectStatus": { - "n44_f6br": { + "n48_h60m": { + "hidden": true + }, + "n43_f6br": { + "hidden": true + }, + "n50_k72r": { + "hidden": true + }, + "n53_loe7": { + "hidden": true + }, + "n46_f6br": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/qlfs7ima.info b/wb_new_ui/.objs/metas/m7iejg46/qlfs7ima.info new file mode 100644 index 00000000..ab10dd20 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/qlfs7ima.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n148_eh0o": { + "collapsed": true + }, + "n77_nk4v": { + "collapsed": true + }, + "n151_eh0o": { + "collapsed": true + }, + "n130_yre9": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/qlfs7imc.info b/wb_new_ui/.objs/metas/m7iejg46/qlfs7imc.info new file mode 100644 index 00000000..bf6f9964 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/qlfs7imc.info @@ -0,0 +1,22 @@ +{ + "objectStatus": { + "n148_eh0o": { + "hidden": true, + "collapsed": true + }, + "n130_yre9": { + "hidden": true, + "collapsed": true + }, + "n151_eh0o": { + "hidden": true, + "collapsed": true + }, + "n109_tyis": { + "hidden": true + }, + "n20_gls1": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/qlfs7imd.info b/wb_new_ui/.objs/metas/m7iejg46/qlfs7imd.info new file mode 100644 index 00000000..d0d94d1a --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/qlfs7imd.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n51_k5m9": { + "hidden": true + }, + "n42_ozaz": { + "hidden": true + }, + "n49_et16": { + "hidden": true + }, + "n40_oj7k": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/qlfs7ime.info b/wb_new_ui/.objs/metas/m7iejg46/qlfs7ime.info new file mode 100644 index 00000000..070aa09d --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/qlfs7ime.info @@ -0,0 +1,8 @@ +{ + "objectStatus": { + "n83_kwi0": { + "hidden": true, + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/qlfs7imf.info b/wb_new_ui/.objs/metas/m7iejg46/qlfs7imf.info new file mode 100644 index 00000000..d5bf39b3 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/qlfs7imf.info @@ -0,0 +1,31 @@ +{ + "objectStatus": { + "n44_f6br": { + "hidden": true + }, + "n56_j120": { + "hidden": true + }, + "n63_omkm": { + "hidden": true + }, + "n52_j120": { + "hidden": true + }, + "n41_f6br": { + "hidden": true + }, + "n43_f6br": { + "hidden": true + }, + "n42_f6br": { + "hidden": true + }, + "n54_j120": { + "hidden": true + }, + "n67_wbjh": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 16133d0d..890da6c6 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,14 +2,17 @@ "libview.firstColumnWidth": 398, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46eh0o7ikl", - "ui://m7iejg46tkv17iii", - "ui://m7iejg46eh0o7ikm" + "ui://m7iejg46ozazhxs", + "ui://m7iejg46cioeho9", + "ui://m7iejg46qlfs7ime", + "ui://m7iejg46kwi0hkr", + "ui://m7iejg46qlfs7imf", + "ui://m7iejg46cioehoa" ], "test.device": "iPhone 5", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46eh0o7ikm", + "doc.activeDoc": "ui://m7iejg46qlfs7ime", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", diff --git a/wb_new_ui/assets/NewGroup/Win_ManagerView.xml b/wb_new_ui/assets/NewGroup/Win_ManagerView.xml index 77085982..497cd503 100644 --- a/wb_new_ui/assets/NewGroup/Win_ManagerView.xml +++ b/wb_new_ui/assets/NewGroup/Win_ManagerView.xml @@ -25,7 +25,7 @@ - +