From 91c34045211d98da5a02556687810a0a0224ed45 Mon Sep 17 00:00:00 2001 From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com> Date: Wed, 18 Jun 2025 14:48:00 +0800 Subject: [PATCH] familyUI --- .../Game/Controller/GroupMgrController.lua | 1 + .../Game/View/Family/FamilyRecord.lua | 25 +++++++++++++++--- .../base_project/Game/View/FamilyView.lua | 9 +++++-- .../assets/Family/Main/Image/zhuangrang 1.png | Bin 0 -> 33844 bytes wb_new_ui/assets/Family/NumberDetail.xml | 14 ++++------ .../NumberDetail/Component/btn_makeOver.xml | 6 +++-- wb_new_ui/assets/Family/Record/com_Record.xml | 1 + wb_new_ui/assets/Family/package.xml | 1 + .../ART/base/Family/ui/Family_atlas0.png | Bin 2640910 -> 2613381 bytes .../ART/base/Family/ui/Family_fui.bytes | Bin 86701 -> 86244 bytes 10 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 wb_new_ui/assets/Family/Main/Image/zhuangrang 1.png 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 0000000000000000000000000000000000000000..d3090a5e8d63c48b92f1b4b3436f597e20c830e6 GIT binary patch literal 33844 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 M07*qoM6N<$f<*Qi)Bpeg literal 0 HcmV?d00001 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 @@ - + + + -