From 81e28ee57864544dba1e399bb3b8676065a282fa Mon Sep 17 00:00:00 2001 From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com> Date: Thu, 24 Jul 2025 17:04:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/GroupMgrController.lua | 9 ------- .../Game/Controller/NewGroupController.lua | 21 +++------------ .../base_project/Game/GroupUpdataHelper.lua | 2 +- .../Game/View/Family/FamilyAllNumbers.lua | 1 + .../Game/View/Family/FamilyEventView.lua | 8 +++++- .../base_project/Game/View/FamilyView.lua | 25 +++++++++--------- .../NumberList/Component/c_numberChild.xml | 4 +-- .../ART/base/Family/ui/Family_fui.bytes | Bin 119453 -> 119453 bytes 8 files changed, 28 insertions(+), 42 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 15d0c117..4c806cde 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -375,15 +375,6 @@ function M:FG_Get_Offline_Member(groupId, callback) end) end --- 获取申请列表的数量 -function M:FG_Get_Apply_Count(groupId, callback) - local _data = {} - _data.id = groupId - self._mgr_client:send(Protocol.WEB_FG_APPLYCOUNT, _data, function(res) - callback(res) - end) -end - -- 回复邀请 -- function M:FG_ResponseInvited(id, refuse) -- local _data = {} diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index e2b7db4a..8b4d6d8a 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1678,24 +1678,11 @@ function M:FG_Recharge_Diamo(groupId, diamo, callback) end) end ---[[ --- 进入亲友圈 -function M:FG_Get_Online_Member(groupId, callback) +-- 获取申请列表的数量 +function M:FG_Get_Apply_Count(callback) local _data = {} - _data.id = groupId local _client = ControllerManager.GroupClient - _client:send(Protocol.WEB_FG_GET_ONLINE_MEMBER, _data, function(res) + _client:send(Protocol.WEB_FG_APPLYCOUNT, _data, function(res) callback(res) end) -end - --- 退出亲友圈 -function M:FG_Get_Offline_Member(groupId, callback) - local _data = {} - _data.id = groupId - local _client = ControllerManager.GroupClient - _client:send(Protocol.WEB_FG_GET_OFFLINE_MEMBER, _data, function(res) - callback(res) - end) -end -]] +end \ No newline at end of file diff --git a/lua_probject/base_project/Game/GroupUpdataHelper.lua b/lua_probject/base_project/Game/GroupUpdataHelper.lua index bc6608fc..657a743a 100644 --- a/lua_probject/base_project/Game/GroupUpdataHelper.lua +++ b/lua_probject/base_project/Game/GroupUpdataHelper.lua @@ -22,6 +22,6 @@ function GroupUpdataHelper:Updata() end end -UpdateBeat:Add(GroupUpdataHelper.Updata, GroupUpdataHelper) +--UpdateBeat:Add(GroupUpdataHelper.Updata, GroupUpdataHelper) return GroupUpdataHelper diff --git a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua index be153b2b..31981277 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua @@ -83,6 +83,7 @@ function M:FillList(numbers) end) end) end + if self._viewList_allNumbers.numItems == #numbers then self._viewList_allNumbers:RefreshVirtualList() else diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index fdf9b584..5e313ff0 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -104,6 +104,12 @@ function M:_evtOnNewApply(...) print("_evtOnNewApply") local arg = { ... } pt(arg) + + local view = ViewManager.GetCurrenView() + if view.class ~= "FamilyMainView" then + return + end + view:RefalshMoreBtn() self._child_familyAuditNumber:OnNewApply(arg) end @@ -226,7 +232,7 @@ function M:_evtOnFamilyReflash(...) local gourpId = arg[1].gourpId local parm = arg[1].parm - if reflashType == "joinFamily" then + if reflashType == "joinFamily" then view:Reflash() end end diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index ea4baff8..75a15159 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -390,12 +390,22 @@ end function M:OnEnterGroupCallBack() local fgCtr = ControllerManager.GetController(NewGroupController) - self._mgr_ctr:FG_Get_Apply_Count(self._group.id, function(res) + fgCtr:FG_Get_Apply_Count(function(res) print("收到获得申请列表的数量") pt(res) if res.ReturnCode ~= 0 then return end + + local ApplyRp = {} + + --[[ + for _,rp in pairs(ApplyRp) do + local group = DataManager.groups:get() + group.ApplyRedPoint = ApplyRp. + end + ]] + end) self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0 @@ -409,7 +419,6 @@ function M:OnEnterGroupCallBack() ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈权限中......") self:ChangeOther(tonumber(self._group.lev) + 1) - allLoad = 1 ViewUtil.ShowModalWait(self._root_view, "正在加载成员列表中......") self:ChangeNumber(fgCtr, self._group.id, 0, self._group.total_member_num, false, 1) @@ -740,26 +749,18 @@ function M:OnUpdate() -- -- print("====================================UpdateFamilyRoom", fgCtr, self._group.id) self:UpdateFamilyRoom(fgCtr, self._group.id) end - + --[[ local HeartbeatTime = 3 if newTime - self.lastTime > HeartbeatTime then fgCtr:FG_SetFamilyHeartbeat(self._group.id, DataManager.SelfUser.account_id, function(res) print(res) end) - --[[ - fgCtr:FG_SetFamilyHeartbeat(self._group.id, DataManager.SelfUser.account_id, function(res) - self:ChangeNumber(fgCtr, self._group.id, 0, self._group.total_member_num, false, - 1) - pt(res) - end) - ]] self.lastTime = newTime - --self._view:GetChild('list_familyNumber').numItems = 0 - if self._view:GetChild('list_familyNumber').itemRenderer then self._view:GetChild('list_familyNumber').numItems = #self._group.members end end + ]] end local IDENTITY_LIST = { diff --git a/wb_new_ui/assets/Family/NumberList/Component/c_numberChild.xml b/wb_new_ui/assets/Family/NumberList/Component/c_numberChild.xml index 556728a8..9c0bcc72 100644 --- a/wb_new_ui/assets/Family/NumberList/Component/c_numberChild.xml +++ b/wb_new_ui/assets/Family/NumberList/Component/c_numberChild.xml @@ -21,10 +21,10 @@ - + - + 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 b34e1a5ba74ebf3459b0acb7bb1d23cb681ae221..bf95f433fe8e0309edf0c9ed3a43acf8bda20e32 100644 GIT binary patch delta 20 ccmbQclzr|}_6>@Q7}=YZ7HwBr#8_@QCg