diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua
index da205448..cef03abd 100644
--- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua
+++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua
@@ -105,6 +105,7 @@ function M:connect(host, groupId, callback)
group:clearPlay()
local play_list = res.Data.play_list
printlog("2222222222222222")
+ pt(res.Data)
pt(play_list)
for i = 1, #play_list do
local m = play_list[i]
diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
index 44c7b25d..8c9592f0 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
@@ -1,17 +1,34 @@
local FamilyRecord = {}
-function FamilyRecord:TryShow()
-
+function FamilyRecord:TryShow(r)
+ if not self._view then
+ self:Init()
+ root = r
+ end
+
+ self:Show()
end
function FamilyRecord:Show()
-
+ BaseView.Show(self)
end
+
function FamilyRecord:Init()
setmetatable(FamilyRecord, {__index = BaseView})
self:InitView("ui://Family/com_Record")
+ local loader_test = self._view:GetChild("loader_test")
+
+ local btn_close = self._view:GetChild("btn_close")
+
+ btn_close.onClick:Set(function()
+ self:Close()
+ end)
+
+ ImageLoad.Load()
--self
-end
\ No newline at end of file
+end
+
+return FamilyRecord
\ No newline at end of file
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index 907f333c..bbe20d26 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -11,6 +11,7 @@ local FamilyJoinAndCreate = import(".Family.FamilyJoinAndCreate")
local FamilyEventView = import(".Family.FamilyEventView")
local FamilyBanDesk = import(".Family.FamilyBanDesk")
local FamilyMyFamily = import(".Family.FamilyMyFamily")
+local FamilyRecord = import(".Family.FamilyRecord")
---
FamilyView = {}
@@ -86,6 +87,10 @@ function M:ShareWx()
familyInviteFamilyView:Show()
end
+function M:FamilyRecord()
+ FamilyRecord:TryShow(self)
+end
+
function M:CreateFamily(frist)
self.familyType.selectedIndex = 3
if not frist then
@@ -472,7 +477,7 @@ local IDENTITY_LIST = {
},
{
name = "游戏记录",
- Fct = M.ShareWx
+ Fct = M.FamilyRecord
},
{
name = "玩法管理",
@@ -514,7 +519,7 @@ local IDENTITY_LIST = {
},
{
name = "游戏记录",
- Fct = M.ShareWx
+ Fct = M.FamilyRecord
},
{
name = "玩法管理",
diff --git a/wb_new_ui/assets/Family/Main/Image/zhuangrang 1.png b/wb_new_ui/assets/Family/Main/Image/zhuangrang 1.png
new file mode 100644
index 00000000..d3090a5e
Binary files /dev/null and b/wb_new_ui/assets/Family/Main/Image/zhuangrang 1.png differ
diff --git a/wb_new_ui/assets/Family/NumberDetail.xml b/wb_new_ui/assets/Family/NumberDetail.xml
index 3e157683..82864c04 100644
--- a/wb_new_ui/assets/Family/NumberDetail.xml
+++ b/wb_new_ui/assets/Family/NumberDetail.xml
@@ -1,6 +1,6 @@
-
+
@@ -48,21 +48,17 @@
-
+
-
+
-
+
-
+
-
-
-
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/NumberDetail/Component/btn_makeOver.xml b/wb_new_ui/assets/Family/NumberDetail/Component/btn_makeOver.xml
index 54226f2e..a664a440 100644
--- a/wb_new_ui/assets/Family/NumberDetail/Component/btn_makeOver.xml
+++ b/wb_new_ui/assets/Family/NumberDetail/Component/btn_makeOver.xml
@@ -2,8 +2,10 @@
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Record/com_Record.xml b/wb_new_ui/assets/Family/Record/com_Record.xml
index 00480eba..8532a129 100644
--- a/wb_new_ui/assets/Family/Record/com_Record.xml
+++ b/wb_new_ui/assets/Family/Record/com_Record.xml
@@ -52,5 +52,6 @@