diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
index bbf14822..4aabd4ea 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
@@ -22,4 +22,38 @@ function M:init()
self._view = com_Record
end
+function M:ShowNumberRecord()
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ self.records = {}
+ local uid = DataManager
+ local timeTable = os.date("*t", os.time())
+ timeTable.hour = 0
+ timeTable.min = 0
+ timeTable.sec = 0
+ local leftTime = os.time(timeTable)
+ local rightTime = os.time(timeTable) + 86399
+ self:RecursionRecord(fgCtr, 0, uid, leftTime, rightTime)
+end
+
+function M:RecursionRecord(fgCtr, index, uid, leftTime, rightTime)
+ fgCtr:FG_GetGroupRecordSpe(self.group_id, GetPlatform(), uid, 0, index * 60, 60, leftTime, rightTime, 3,
+ function(res)
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "查看个人战绩失败")
+ self.visible = false
+ return
+ else
+ local records = res.Data.records
+ if records and #records > 0 then
+ for i = 1, #records do
+ table.insert(self.records, records[i])
+ end
+ self:RecursionRecord(fgCtr, index + 1, uid, leftTime, rightTime)
+ else
+
+ end
+ end
+ end)
+end
+
return M
diff --git a/wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml b/wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml
index 0b822808..c21b09c9 100644
--- a/wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml
+++ b/wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml
@@ -8,12 +8,12 @@
-
-
-
-
+
+
+
+
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml
index 22292fe3..b80c14e1 100644
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@@ -292,13 +292,11 @@
-<<<<<<< HEAD
-=======
@@ -322,7 +320,6 @@
->>>>>>> fa6b4bed7bcee64adb3ac8c11539d49a166a56db
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
index a1baf175..1626881f 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
index 2e4866b1..d598ce5f 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png
index 0c3ba2cc..f9d4fff7 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
index 78ba95b7..57f0a329 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ