From fa6b4bed7bcee64adb3ac8c11539d49a166a56db Mon Sep 17 00:00:00 2001 From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com> Date: Fri, 20 Jun 2025 01:55:55 +0800 Subject: [PATCH] =?UTF-8?q?familyUI-=E5=A4=87=E6=B3=A8=E3=80=81=E6=88=91?= =?UTF-8?q?=E7=9A=84=E4=BA=B2=E5=8F=8B=E5=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/View/Family/FamilyAllNumbers.lua | 3 +- .../Game/View/Family/FamilyAuditNumber.lua | 8 +- .../Game/View/Family/FamilyJoinAndCreate.lua | 5 +- .../Game/View/Family/FamilyMyFamily.lua | 42 +++----- .../Game/View/Family/FamilyMyfamilyList.lua | 99 ++++++++++++++++++ .../Game/View/Family/FamilyNumberRemark.lua | 42 ++++++++ .../base_project/Game/View/FamilyView.lua | 41 +++++++- .../Game/View/NewGroup/GroupSetTagView.lua | 12 ++- .../CreateAndJoin/com_createAndJoin.xml | 4 +- wb_new_ui/assets/Family/Main.xml | 11 +- .../Image/hall_club_common_tittle_icon1.png | Bin 0 -> 10972 bytes .../Family/MyFamily/Component/btn_bg.xml | 1 - .../MyFamily/Component/btn_familyManage.xml | 10 ++ .../MyFamily/Component/btn_familyRank.xml | 10 ++ .../MyFamily/Component/btn_familyRecord.xml | 10 ++ .../MyFamily/Component/btn_myFamilylist.xml | 20 ++++ .../MyFamily/Component/item_myFamilyList.xml | 15 +++ .../assets/Family/MyFamily/Image/4-1.png | Bin 0 -> 64165 bytes .../assets/Family/MyFamily/Image/4-4.png | Bin 0 -> 54957 bytes .../Family/MyFamily/Image/Group 556.png | Bin 0 -> 60727 bytes .../Family/MyFamily/Image/Rectangle 259.png | Bin 0 -> 46614 bytes .../Family/MyFamily/Image/Rectangle 260.png | Bin 0 -> 28489 bytes ...lub_common_club_liebiao_btntext_guanli.png | Bin 0 -> 48268 bytes ...l_club_common_club_liebiao_icon_renshu.png | Bin 0 -> 2508 bytes .../assets/Family/MyFamily/com_myFamily.xml | 28 ++--- .../Family/MyFamily/com_myFamilyList.xml | 23 ++++ .../Family/NumberRemark/com_numberRemark.xml | 15 +++ wb_new_ui/assets/Family/package.xml | 15 +++ wb_new_ui/assets/NewGroup/Win_SetTag.xml | 26 ++--- .../component/Btn/btn_numberRemarkConfirm.xml | 10 ++ .../component/Btn/btn_numberRemarkQuit.xml | 10 ++ .../NewGroup/images/common/CommonRes_3.png | Bin 0 -> 50147 bytes .../NewGroup/images/common/Rectangle 262.png | Bin 0 -> 921 bytes .../NewGroup/images/common/Rectangle 39.png | Bin 0 -> 8343 bytes .../NewGroup/images/common/Rectangle 40.png | Bin 0 -> 9662 bytes .../hall_club_common_btntext_queding.png | Bin 0 -> 87739 bytes .../NewGroup/images/common/title_top.png | Bin 0 -> 204180 bytes wb_new_ui/assets/NewGroup/package.xml | 8 ++ .../ART/base/Family/ui/Family_atlas0.png | Bin 2734928 -> 3004017 bytes .../ART/base/Family/ui/Family_atlas0_1.png | Bin 1674367 -> 1762932 bytes .../ART/base/Family/ui/Family_atlas0_2.png | Bin 505869 -> 269267 bytes .../ART/base/Family/ui/Family_atlas0_3.png | Bin 614207 -> 445408 bytes .../ART/base/Family/ui/Family_atlas0_4.png | Bin 208185 -> 614207 bytes .../ART/base/Family/ui/Family_fui.bytes | Bin 89069 -> 94405 bytes .../ART/base/newgroup/ui/NewGroup_atlas0.png | Bin 591252 -> 1071109 bytes .../base/newgroup/ui/NewGroup_atlas0_1.png | Bin 1398355 -> 1373931 bytes .../ART/base/newgroup/ui/NewGroup_fui.bytes | Bin 258970 -> 260425 bytes 47 files changed, 394 insertions(+), 74 deletions(-) create mode 100644 lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua create mode 100644 lua_probject/base_project/Game/View/Family/FamilyNumberRemark.lua create mode 100644 wb_new_ui/assets/Family/Main/Image/hall_club_common_tittle_icon1.png create mode 100644 wb_new_ui/assets/Family/MyFamily/Component/btn_familyManage.xml create mode 100644 wb_new_ui/assets/Family/MyFamily/Component/btn_familyRank.xml create mode 100644 wb_new_ui/assets/Family/MyFamily/Component/btn_familyRecord.xml create mode 100644 wb_new_ui/assets/Family/MyFamily/Component/btn_myFamilylist.xml create mode 100644 wb_new_ui/assets/Family/MyFamily/Component/item_myFamilyList.xml create mode 100644 wb_new_ui/assets/Family/MyFamily/Image/4-1.png create mode 100644 wb_new_ui/assets/Family/MyFamily/Image/4-4.png create mode 100644 wb_new_ui/assets/Family/MyFamily/Image/Group 556.png create mode 100644 wb_new_ui/assets/Family/MyFamily/Image/Rectangle 259.png create mode 100644 wb_new_ui/assets/Family/MyFamily/Image/Rectangle 260.png create mode 100644 wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_club_liebiao_btntext_guanli.png create mode 100644 wb_new_ui/assets/Family/MyFamily/Image/hall_club_common_club_liebiao_icon_renshu.png create mode 100644 wb_new_ui/assets/Family/MyFamily/com_myFamilyList.xml create mode 100644 wb_new_ui/assets/Family/NumberRemark/com_numberRemark.xml create mode 100644 wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkConfirm.xml create mode 100644 wb_new_ui/assets/NewGroup/component/Btn/btn_numberRemarkQuit.xml create mode 100644 wb_new_ui/assets/NewGroup/images/common/CommonRes_3.png create mode 100644 wb_new_ui/assets/NewGroup/images/common/Rectangle 262.png create mode 100644 wb_new_ui/assets/NewGroup/images/common/Rectangle 39.png create mode 100644 wb_new_ui/assets/NewGroup/images/common/Rectangle 40.png create mode 100644 wb_new_ui/assets/NewGroup/images/common/hall_club_common_btntext_queding.png create mode 100644 wb_new_ui/assets/NewGroup/images/common/title_top.png diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua index 4e0702c8..fccb4f7f 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -4,9 +4,10 @@ local FamilyInviteFamilyView = {} local M = FamilyInviteFamilyView -function FamilyInviteFamilyView.new(root) +function FamilyInviteFamilyView.new(group, root) setmetatable(M, { __index = root }) local self = setmetatable({}, { __index = M }) + self._group = group local numbers = self._group.members print("lingmengFamilyInviteFamilyView", self._group.lev) pt(self._group) diff --git a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua index d88161b7..50320dce 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua @@ -1,3 +1,6 @@ +--local NumberRemark = import(".FamilyNumberRemark") +local GroupSetTagView = import("..NewGroup.GroupSetTagView") + local FamilyAuditNumber = {} local M = FamilyAuditNumber @@ -46,8 +49,11 @@ function M:ClickBtn(isAllow, uid) if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败") else - ViewUtil.ShowOneChooose("审核成功") + --ViewUtil.ShowOneChooose("审核成功") self:InitList() + --NumberRemark:TryShow() + local tagView = GroupSetTagView.new(self._group.id, uid) + tagView:Show() end end) end diff --git a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua index f9d8a518..d73888b3 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua @@ -118,9 +118,10 @@ function FamilyJoinAndCreate:JoinRoom(roomId) --后端似乎还未调通 self:ClearNumTex() fgCtr:FG_JoinGroup(tonumber(roomId), function(res) - if res.ReturnCode ~= 0 then - ViewUtil.ShowOneChooose("加入失败" .. res.ReturnCode) + if res.ReturnCode == 0 then + ViewUtil.ShowOneChooose("已申请加入亲友圈" .. res.ReturnCode) else + ViewUtil.ShowOneChooose("申请加入亲友圈失败" .. res.ReturnCode) end end) --先换成邀请玩家 diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua index cf2e0cfb..920e7d19 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua @@ -13,32 +13,17 @@ local function ShowMainView() root.familyType.selectedIndex = rootLastIndex or 1 end -local function SetRelation(self) - local contentPane = self._root_view:GetChild("contentPane") - --contentPane:RemoveRelation(self._root_view, RelationType.Center_Center) - contentPane.relations:ClearAll() - contentPane:AddRelation(self._root_view, RelationType.Width) - contentPane:AddRelation(self._root_view, RelationType.Height) -end - --endregion -function FamilyMyFamily:TryShow(r) +function FamilyMyFamily:TryShow(groupId, r) self:Init() root = r + self.groupId = groupId self:Show() end function FamilyMyFamily:Show() - local family = root._group - --pt(family) - if not family then - -- 跳转创建家族界面 - root:CreateFamily() - return - end - self:Refalsh() HideMainView() @@ -52,7 +37,8 @@ end function FamilyMyFamily:Refalsh() - local family = root._group + --local family = root._group + local family = DataManager.groups.groupMap[self.groupId] self.tex_fName.text = family.name self.tex_playerName.text = "亲友圈号:" .. family.id @@ -66,11 +52,13 @@ end function FamilyMyFamily:Init() setmetatable(FamilyMyFamily, { __index = BaseWindow }) - BaseWindow.init(self, 'ui://Family/com_myFamily') - -- 设置成组件的形式 + self._close_destroy = true self._full = true self._animation = false + self._full_offset = false + BaseWindow.init(self, 'ui://Family/com_myFamily') + -- 隐藏背景图 self._root_view:GetChild("win_mode").visible = false self._view:GetChild("btn_close").onClick:Set(function() @@ -119,7 +107,8 @@ function FamilyMyFamily:Init() self.btn_checkNumber.onClick:Set(function() self:Close() - root:AllNumber() + local family = DataManager.groups.groupMap[self.groupId] + root:OpenAllNumber(family) end) self.btn_applyMsg.onClick:Set(function() @@ -167,21 +156,14 @@ function FamilyMyFamily:Init() ViewUtil.ErrorTip(res.ReturnCode, "更改公告失败,请稍后再试") else ViewUtil.ErrorTip(res.ReturnCode, "修改成功！") + family.notice = self.input_notice.text self:Refalsh() + self.cWindow.selectedIndex = 0 end end ) end) - SetRelation(self) - - print(string.format("myfamily x=%s height=%s", self._view.x, self._view.y)) - print(string.format("myfamily width=%s height=%s", self._view.width, self._view.height)) - - print(string.format("myfamilyroot width=%s height=%s", self._root_view.width, self._root_view.height)) - print(string.format("myfamilyroot x=%s y=%s", self._root_view.x, self._root_view.y)) - --print(string.format("familyrootParent x=%s y=%s", self._root_view.parent.width, self._root_view.parent.height)) - return self end diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua b/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua new file mode 100644 index 00000000..c35b6948 --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua @@ -0,0 +1,99 @@ +local FamilyMyFamily = import(".FamilyMyFamily") + +--#region LOCAL + +local FamilyMyfamilyList = {} + +local function HideMainView(self) + self.rootLastIndex = self.FamilyView.familyType.selectedIndex + self.FamilyView.familyType.selectedIndex = 0 +end + +local function ShowMainView(self) + self.FamilyView.familyType.selectedIndex = self.rootLastIndex or 1 +end + +--#endregion + +function FamilyMyfamilyList:TryShow(root) + local Instance = self.New(root) + Instance:Show() +end + +function FamilyMyfamilyList.New(root) + setmetatable(FamilyMyfamilyList, { __index = BaseWindow }) + local Instance = setmetatable({}, { __index = FamilyMyfamilyList }) + Instance._full = true + Instance._close_destroy = true + Instance._full_offset = false + + BaseWindow.init(Instance, "ui://Family/com_myFamilyList") + -- 隐藏背景图 + Instance._root_view:GetChild("win_mode").visible = false + + Instance.FamilyView = root + Instance:Init() + + return Instance +end + +function FamilyMyfamilyList:Refalsh() + self.list_familys.numItems = #DataManager.groups.groupList +end + +function FamilyMyfamilyList:Show() + HideMainView(self) + self:Refalsh() + BaseWindow.Show(self) +end + +function FamilyMyfamilyList:Init() + + self.list_familys = self._view:GetChild("list_familys") + self.btn_close = self._view:GetChild("btn_close") + + self.btn_close.onClick:Set(function() + self:Close() + end) + + self.list_familys.itemRenderer = function(index, obj) + local groups = DataManager.groups.groupList + local group = groups[index +1] + + local tex_familyId = obj:GetChild("tex_familyId") + local tex_familyName = obj:GetChild("tex_familyName") + local tex_familyNumber = obj:GetChild("tex_familyNumber") + local btn_familyManage = obj:GetChild("btn_familyManage") + local btn_record = obj:GetChild("btn_record") + local btn_rank = obj:GetChild("btn_rank") + local loader_icon = obj:GetChild("loader_icon") + + tex_familyId.text = group.id + tex_familyName.text = group.name + tex_familyNumber.text = group.total_member_num + ImageLoad.Load(group.o_portrait, loader_icon) + + btn_familyManage.onClick:Set(function() + self:Close() + self.FamilyView:OpenMyFamily(group.id) + end) + + btn_record.onClick:Set(function() + self:Close() + self.FamilyView:FamilyRecord() + end) + + btn_rank.onClick:Set(function() + + end) + end + + pt(DataManager.groups.groupList) +end + +function FamilyMyfamilyList:Close() + ShowMainView(self) + BaseWindow.Close(self) +end + +return FamilyMyfamilyList \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRemark.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRemark.lua new file mode 100644 index 00000000..14cf2c0e --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRemark.lua @@ -0,0 +1,42 @@ +local FamilyNumberRemark = {} + +function FamilyNumberRemark:TryShow() + local inst = self.New() + inst:Init() + inst:Show() +end + +function FamilyNumberRemark.New() + setmetatable(FamilyNumberRemark, { __index = BaseWindow }) + local inst = setmetatable({}, { __index = FamilyNumberRemark }) + inst._close_destroy = true + inst._close_zone = true + BaseWindow.init(inst, "ui://Family/com_numberRemark") + + inst:Init() + return inst +end + +function FamilyNumberRemark:Show() + BaseWindow.Show(self) +end + +function FamilyNumberRemark:Init() + + self.input_remark = self._view:GetChild("input_remark") + self.btn_quit = self._view:GetChild("btn_quit") + self.btn_confirm = self._view:GetChild("btn_confirm") + self.btn_bg = self._view:GetChild("btn_bg") + + self.btn_bg.onClick:Set(function() + self:Close() + end) + + self.btn_quit.onClick:Set(function() + self:Close() + end) + + self.btn_confirm.onClick:Set() +end + +return FamilyNumberRemark \ 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 f0ce3ac3..cf23ad41 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -13,6 +13,7 @@ local FamilyBanDesk = import(".Family.FamilyBanDesk") local FamilyMyFamily = import(".Family.FamilyMyFamily") local FamilyRecord = import(".Family.FamilyRecord") local FamilyRoomCard = import(".Family.FamilyRoomCard") +local FamilyMyfamilyList = import(".Family.FamilyMyfamilyList") --- FamilyView = {} @@ -39,7 +40,12 @@ function M:init(url) self.familyType = view:GetController('familyType') self.btn_close = view:GetChild('btn_close') + self.btn_myFamilyList = view:GetChild("btn_myFamilyList") + self.btn_creatFamily = view:GetChild("btn_creatFamily") + self.btn_joinFamily = view:GetChild("btn_joinFamily") self._mgr_ctr = ControllerManager.GetController(GroupMgrController) + self.cMyfamilyList = view:GetController("cMyfamilyList") + self.btn_quitMyfamilyTab = view:GetChild("btn_quitMyfamilyTab") self:InitCloseClick() @@ -64,11 +70,29 @@ function M:init(url) end -------绑定我的亲友圈按钮 view:GetChild('btn_myfamily').onClick:Set(function() - FamilyMyFamily:TryShow(self) + self.cMyfamilyList.selectedIndex = 1 + end) + + self.btn_myFamilyList.onClick:Set(function() + self.cMyfamilyList.selectedIndex = 0 + --FamilyMyFamily:TryShow(self) + FamilyMyfamilyList:TryShow(self) + end) + + self.btn_creatFamily.onClick:Set(function() + self.cMyfamilyList.selectedIndex = 0 + self:CreateFamily() + end) + + self.btn_joinFamily.onClick:Set(function() + self.cMyfamilyList.selectedIndex = 0 + self:CreateFamily() + end) + + self.btn_quitMyfamilyTab.onClick:Set(function() + self.cMyfamilyList.selectedIndex = 0 end) - print(string.format("familyView x=%s y=%s", self._view.x, self._view.y)) - print(string.format("familyView width=%s height=%s", self._view.width, self._view.height)) end function M:InitCloseClick() @@ -118,9 +142,13 @@ function M:PlayEdit() self.lastType = 1 end +function M:OpenMyFamily(groupId) + FamilyMyFamily:TryShow(groupId, self) +end + function M:AllNumber() self.lastType = 1 - self._child_familyAllNumbers = FamilyAllNumbers.new(self) + self._child_familyAllNumbers = FamilyAllNumbers.new(self._group, self) end function M:AuditNumber() @@ -135,6 +163,11 @@ function M:ShowShop() FamilyRoomCard:TryShow() end +function M:OpenAllNumber(group) + self.lastType = 1 + self._child_familyAllNumbers = FamilyAllNumbers.new(group, self) +end + function M:MoreBtn() local ctr_more = self._view:GetController('moreBtn') self._view:GetChild('bg_moreBtnBack').onClick:Set(function() diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua index b87b35ec..f06080b1 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua @@ -4,6 +4,7 @@ local GroupSetTagView = {} local M = GroupSetTagView function GroupSetTagView.new(group_id, member, callback) + UIPackage.AddPackage('base/newgroup/ui/NewGroup') setmetatable(M, {__index = BaseWindow}) local self = setmetatable({}, {__index = M}) self.class = "GroupSetTagView" @@ -18,14 +19,19 @@ function M:init(url, member) BaseWindow.init(self,url) local tex_tag = self._view:GetChild("tex_tag") + + --[[ 你是谁，为什么会在这里 if tag ~= 0 then tex_tag.text = member.score end + ]] + self._view:GetChild("btn_ok").onClick:Set(function() ViewUtil.ShowModalWait(nil) - local score = tonumber(tex_tag.text) or 0 + --local score = tonumber(tex_tag.text) or 0 + local score = tex_tag.text local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_SetMemberTag(self.group_id, member.uid, score, function(res) + fgCtr:FG_SetMemberTag(self.group_id, member, score, function(res) if self._is_destroy then return end @@ -34,7 +40,7 @@ function M:init(url, member) ViewUtil.ErrorTip(res.ReturnCode, "备注失败") else ViewUtil.ShowBannerOnScreenCenter("备注成功") - member.score = score + --member.score = score self:Destroy() self.callback(true) end diff --git a/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml b/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml index cad44d14..08d51729 100644 --- a/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml +++ b/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml @@ -14,9 +14,9 @@ - + - + diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 057b133e..f9f67063 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -1,6 +1,6 @@ - + @@ -9,6 +9,7 @@ + @@ -323,5 +324,13 @@ + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Main/Image/hall_club_common_tittle_icon1.png b/wb_new_ui/assets/Family/Main/Image/hall_club_common_tittle_icon1.png new file mode 100644 index 0000000000000000000000000000000000000000..190d0bdbcb72c6dbbe3967f3f0ad84efcbe47cb3 GIT binary patch literal 10972 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 KMNUMnLSTaF=xt&E literal 0 HcmV?d00001 diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_bg.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_bg.xml index a54dec69..8460c3fc 100644 --- a/wb_new_ui/assets/Family/MyFamily/Component/btn_bg.xml +++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_bg.xml @@ -3,7 +3,6 @@ - diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_familyManage.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_familyManage.xml new file mode 100644 index 00000000..80b70888 --- /dev/null +++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_familyManage.xml @@ -0,0 +1,10 @@ + + + + + + + + +