补充上传

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua

@@ -27,6 +27,8 @@ end
 function M:init(url)
     BaseWindow.init(self, url)
 
+    local group = DataManager.groups:get(self.group_id)
+
     local btn_close = self._view:GetChild("btn_close")
     btn_close.onClick:Set(function()
         self:Destroy()
@@ -87,7 +89,7 @@ function M:init(url)
             self.m_index = 0
             self.begin_time, self.end_time = self.time_panel:GetDate()
             self:GetData(0)
-        end)
+        end, { showDay = group.lev < 3 and 30 or 7 })
     self.begin_time, self.end_time = self.time_panel:GetDate()
 
     self:GetData(0)

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua

@@ -96,7 +96,7 @@ function M:FillView()
     self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"),
         self._view:GetChild("btn_date2"), -308, 0, function()
             self:GetMngFagInfo()
-        end)
+        end, { showDay = group.lev < 3 and 30 or 7 })
 end
 
 -- 获取上下分数据

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua

@@ -50,6 +50,7 @@ function M:InitView()
     --     self._view:GetController("mng").selectedIndex = 1
     -- end
 
+    local group = DataManager.groups:get(self.group_id)
     local lst_mgr_index = self._view:GetChild("lst_mgr_index")
     -- lst_mgr_index.visible = false
     -- if group.lev == 1 then
@@ -81,7 +82,7 @@ function M:InitView()
             self.record_data = {}
             self.record_data.numItems = 0
             self:GetRecordData(0)
-        end, true)
+        end, { showDay = group.lev < 3 and 30 or 7 })
 
     local ctr_page = self._view:GetController("type")
     ctr_page.onChanged:Set(function()

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua

@@ -203,7 +203,7 @@ function M:InitView()
             else
                 self:GetRecordData(0)
             end
-        end, true)
+        end, { showDay = group.lev < 3 and 30 or 7 })
     self.begin_time, self.end_time = self.time_panel:GetDate()
     local ctr_page = self._view:GetController("type")
     ctr_page.onChanged:Set(function()

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatView.lua

@@ -22,6 +22,7 @@ end
 function M:InitView()
     self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupPersonStat")
 
+    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)
@@ -33,12 +34,12 @@ function M:InitView()
 
     self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
         -308, 0, function()
-        self.record_data = {}
+            self.record_data = {}
-        self.lst_record.numItems = 0
+            self.lst_record.numItems = 0
 
-        self.begin_time, self.end_time = self.time_panel:GetDate()
+            self.begin_time, self.end_time = self.time_panel:GetDate()
-        self:GetRecordData(0)
+            self:GetRecordData(0)
-    end)
+        end, { showDay = group.lev < 3 and 30 or 7 })
     self.begin_time, self.end_time = self.time_panel:GetDate()
     local ctr_page = self._view:GetController("type")
     ctr_page.onChanged:Set(function()
@@ -70,32 +71,33 @@ function M:GetRecordData(index)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetGroupPersonRecord(self.group_id, GetPlatform(), DataManager.SelfUser.account_id, time_type,
         self.begin_time, self.end_time, index, 6, function(res)
-        if self._is_destroy then
+            if self._is_destroy then
-            return
+                return
-        end
-        ViewUtil.CloseModalWait()
-        if res.ReturnCode ~= 0 then
-            ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败")
-        else
-            local records = res.Data.records
-            for i = 1, #records do
-                self.record_data[#self.record_data + 1] = records[i]
             end
-            self.lst_record.numItems = #self.record_data
+            ViewUtil.CloseModalWait()
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败")
+            else
+                local records = res.Data.records
+                for i = 1, #records do
+                    self.record_data[#self.record_data + 1] = records[i]
+                end
+                self.lst_record.numItems = #self.record_data
 
-            printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333", res.Data.total_round,
+                printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333", res.Data
-                "    ", res.Data.valid_round)
+                    .total_round,
-            pt(res.Data)
+                    "    ", res.Data.valid_round)
-            if index == 0 then
+                pt(res.Data)
-                --self._view:GetChild("tex_num1").text = ""..res.Data.total
+                if index == 0 then
-                --self._view:GetChild("tex_num3").text = ""..d2ad(res.Data.consume)
+                    --self._view:GetChild("tex_num1").text = ""..res.Data.total
-                self._view:GetChild("tex_winner_count").text = res.Data.total_round
+                    --self._view:GetChild("tex_num3").text = ""..d2ad(res.Data.consume)
-                self._view:GetChild("tex_valid_count").text = res.Data.valid_round / 100
+                    self._view:GetChild("tex_winner_count").text = res.Data.total_round
+                    self._view:GetChild("tex_valid_count").text = res.Data.valid_round / 100
 
-                self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.total_win)
+                    self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.total_win)
+                end
             end
-        end
+        end)
-    end)
 end
 
 function M:FillRecordItem(data, obj)

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua

@@ -19,6 +19,7 @@ end
 function M:InitView()
     self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupPlayStat")
 
+    local group = DataManager.groups:get(self.group_id)
     self.consume_stat = {} --消耗统计
 
     self.lst_consume_stat = self._view:GetChild("lst_consume_stat")
@@ -35,10 +36,10 @@ function M:InitView()
 
     self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
         -308, 0, function()
-        self.consume_stat = {}
+            self.consume_stat = {}
-        self.lst_consume_stat.numItems = 0
+            self.lst_consume_stat.numItems = 0
-        self:GetConsumeStatData()
+            self:GetConsumeStatData()
-    end)
+        end, { showDay = group.lev < 3 and 30 or 7 })
 end
 
 function M:GetConsumeStatData()

lua_probject/base_project/Game/View/NewGroup/MngView/GroupTakeLogView.lua

@@ -19,6 +19,7 @@ end
 
 function M:init(url)
     BaseWindow.init(self, url)
+    local group = DataManager.groups:get(self.group_id)
     self.take_log = {}
     self.lst_log = self._view:GetChild("lst_log")
     self.lst_log:SetVirtual()
@@ -33,7 +34,7 @@ function M:init(url)
         -308, 0, function()
             self.take_log = {}
             self:getTakeLog(0)
-        end)
+        end, { showDay = group.lev < 3 and 30 or 7 })
 
     self:getTakeLog(0)
 end

lua_probject/base_project/Game/View/NewGroup/MngView/TimeSettingPanelTog.lua

@@ -3,7 +3,7 @@ local TimeSettingPanel = {}
 
 local M = TimeSettingPanel
 
-function TimeSettingPanel.new(parent, btn_date1, btn_date2, posX, posY, callback, flag)
+function TimeSettingPanel.new(parent, btn_date1, btn_date2, posX, posY, callback, data)
     local self = setmetatable({}, { __index = M })
     self.class = "TimeSettingPanel"
     self.parent = parent
@@ -12,7 +12,7 @@ function TimeSettingPanel.new(parent, btn_date1, btn_date2, posX, posY, callback
     self.posX = posX or 0
     self.posY = posY or 0
     self.callback = callback
-    self.show_day = flag or 20
+    self.show_day = data and (data.showDay or 7) or 7
     self:initView()
     return self
 end

wb_new_ui/assets/Lobby/package.xml

@@ -685,6 +685,7 @@
     <image id="hz877e2c" name="gerenxinxi.png" path="/images/new/"/>
     <image id="hz877e2d" name="shezhi.png" path="/images/new/"/>
     <image id="hz875k" name="luxiang.png" path="/images/new/"/>
+    <component id="hz877e2e" name="pop_notice(1).xml" path="/component/notice/"/>
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>