diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index b2d21944..b3dc7c79 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -2133,12 +2133,12 @@ function M:__refreshManager() btn_partner.onClick:Set( function() --print("成员..........................................") - if not self.mng_view3 then - self.mng_view3 = GroupManagerView.new(self._root_view, self.curGroup.id, 5) - self.mng_view3:SetCurrentGroupInfoViewIns(function() - self:OnclickMember() - end) - end + -- if not self.mng_view3 then + self.mng_view3 = GroupManagerView.new(self._root_view, self.curGroup.id, 5) + self.mng_view3:SetCurrentGroupInfoViewIns(function() + self:OnclickMember() + end) + -- end self.mng_view3:Show() -- self:SetRoomListVisible(false) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua index 6437144c..081a5dd1 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua @@ -1,3 +1,5 @@ +local TimeSettingPanel = import(".TimeSettingPanelTog") + -- 开桌统计 local GroupMngRoomStatView = {} @@ -26,10 +28,41 @@ end function M:InitView() self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupStat") + local group = DataManager.groups:get(self.group_id) self.record_data = {} --回放数据 self.player_record_data = {} --指定玩家的回放数据 self.qid = 0 --查询玩家id + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0, function() + self.record_data = {} + self.lst_record.numItems = 0 + + self.begin_time, self.end_time = self.time_panel:GetDate() + if self._view:GetController("search").selectedIndex == 0 then + self:GetRecordData(0) + else + local qid = self._view:GetChild("tex_id").text + local rtype = self._view:GetChild("cb_type").value + if (qid == "" and rtype == "1") or (string.len(qid) < 6 and rtype == "2") then + self._view:GetController("search").selectedIndex = 0 + self:GetRecordData(0) + ViewUtil.ErrorTip(nil, "请输入正确的ID") + return + end + self.begin_time, self.end_time = self.time_panel:GetDate() + if rtype == "1" then + self.lst_player_record.numItems = 0 + self.player_record_data = {} + self.qid = tonumber(qid) + self:GetRecordData(0, self.qid) + else + self:GetRecordByRoomid() + end + end + end, { showDay = group.lev < 3 and 30 or 7 }) + self.begin_time, self.end_time = self.time_panel:GetDate() + self.lst_record_find = self._view:GetChild("lst_record_find") self.lst_record_find:SetVirtual() self.lst_record_find.itemRenderer = function(index, obj) @@ -61,6 +94,7 @@ function M:InitView() ViewUtil.ErrorTip(nil, "请输入正确的ID") return end + self.begin_time, self.end_time = self.time_panel:GetDate() if rtype == "1" then self.lst_player_record.numItems = 0 self.player_record_data = {} @@ -83,42 +117,43 @@ function M:GetRecordData(index, qid) ViewUtil.ShowModalWait() local group = DataManager.groups:get(self.group_id) local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetGroupRecord(self.group_id, GetPlatform(), qid, index, 6, function(res) - printlog("ccccccccccccccccccccccccccccccccccccc") - pt(res) - if self._is_destroy then - return - end - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败") - else - local ctr_search = self._view:GetController("search") - local records = res.Data.records - if qid == 0 then - for i = 1, #records do - self.record_data[#self.record_data + 1] = records[i] - end - self.lst_record.numItems = #self.record_data - if ctr_search.selectedIndex ~= 0 then - ctr_search.selectedIndex = 0 - end + fgCtr:FG_GetGroupRecordSpe(self.group_id, GetPlatform(), 0, qid, index, 6, self.begin_time, self.end_time, 0, + function(res) + printlog("ccccccccccccccccccccccccccccccccccccc") + pt(res) + if self._is_destroy then + return + end + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败") else - if group.lev == 1 then + local ctr_search = self._view:GetController("search") + local records = res.Data.records + if qid == 0 then for i = 1, #records do - self.player_record_data[#self.player_record_data + 1] = self:deepcopy(records[i]) - self.player_record_data[#self.player_record_data + 1] = self:deepcopy(records[i]) + self.record_data[#self.record_data + 1] = records[i] + end + self.lst_record.numItems = #self.record_data + if ctr_search.selectedIndex ~= 0 then + ctr_search.selectedIndex = 0 end else - for i = 1, #records do - self.player_record_data[#self.player_record_data + 1] = records[i] + if group.lev == 1 then + for i = 1, #records do + self.player_record_data[#self.player_record_data + 1] = self:deepcopy(records[i]) + self.player_record_data[#self.player_record_data + 1] = self:deepcopy(records[i]) + end + else + for i = 1, #records do + self.player_record_data[#self.player_record_data + 1] = records[i] + end end + self.lst_player_record.numItems = #self.player_record_data + ctr_search.selectedIndex = 2 end - self.lst_player_record.numItems = #self.player_record_data - ctr_search.selectedIndex = 2 end - end - end) + end) end function M:FillRecordItem(data, obj) diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index 0acf86ba..d04551a1 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -5,6 +5,9 @@ }, "n84_rbpg": { "hidden": true + }, + "n4_fux2": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/assets/Common/component/game/platform_btn_ready_1.png b/wb_new_ui/assets/Common/component/game/platform_btn_ready_1.png index e74b5a6b..238f1a56 100644 Binary files a/wb_new_ui/assets/Common/component/game/platform_btn_ready_1.png and b/wb_new_ui/assets/Common/component/game/platform_btn_ready_1.png differ diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml index a74921a0..da972ea0 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml @@ -6,8 +6,8 @@ - - + + @@ -24,10 +24,10 @@