From 5c6f18656f7570f4763635a3ae6f92a0ae837bbc Mon Sep 17 00:00:00 2001 From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com> Date: Wed, 9 Jul 2025 23:48:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BA=BB=E5=B0=86=E5=B8=83=E5=B1=80=EF=BC=8C?= =?UTF-8?q?=E5=AE=B6=E6=97=8F=E5=9C=A8=E7=BA=BF=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/NewGroupController.lua | 20 ++++++++++++++ lua_probject/base_project/Game/Protocol.lua | 5 +++- .../base_project/Game/View/FamilyView.lua | 12 ++++++-- .../Main/Component/Label_joinPlayers.xml | 2 +- .../Main_new/Main/Comp_ConterBox.xml | 20 +++++++------- .../Main_new/Main/Component/Comp_jing.xml | 8 +++--- .../Main_new_2/Player_card_info_2_1.xml | 15 +++++----- .../Main_new_2/Player_card_info_2_2.xml | 12 ++++---- .../Main_new/Main_new_2_jiangxi.xml | 26 ++++++++++-------- .../Main_new_4/Component/Btn_HandCard.xml | 8 +++--- .../Main_new_4/Component/Comp_4_1_FZ.xml | 26 ++++++++++++------ .../Main_new_4/Component/Comp_4_1_FZ_Card.xml | 2 +- wb_new_ui/assets/Main_Majiang/package.xml | 5 +++- .../ART/base/Family/ui/Family_fui.bytes | Bin 116689 -> 116689 bytes .../main_majiang/ui/Main_Majiang_atlas0.png | Bin 1656366 -> 2008717 bytes .../main_majiang/ui/Main_Majiang_atlas0_1.png | Bin 4707217 -> 5033870 bytes .../main_majiang/ui/Main_Majiang_atlas0_2.png | Bin 3863353 -> 3556268 bytes .../main_majiang/ui/Main_Majiang_atlas0_3.png | Bin 1100851 -> 903397 bytes .../main_majiang/ui/Main_Majiang_atlas0_4.png | Bin 1477135 -> 1478021 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 367109 -> 367063 bytes .../Assets/Source/Generate/Game_UtilsWrap.cs | 19 +++++++++++++ 21 files changed, 122 insertions(+), 58 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 4954cc9a..5f67fa32 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1674,3 +1674,23 @@ function M:FG_Recharge_Diamo(groupId, diamo, callback) callback(res) end) end + +-- 进入亲友圈 +function M:FG_Get_Online_Member(groupId, callback) + local _data = {} + _data.id = groupId + local _client = ControllerManager.GroupClient + _client:send(Protocol.WEB_FG_GET_ONLINE_MEMBER, _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 diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index d0de4a3c..7ebbce74 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -277,7 +277,10 @@ Protocol = { -- 亲友圈房卡充值 WEB_FG_RECHARGE_DIAMO = "group/recharge_diamo", - + -- 进入亲友圈 + WEB_FG_GET_ONLINE_MEMBER = "group/get_online_member", + -- 退出亲友圈 + WEB_FG_GET_OFFLINE_MEMBER = "get_offline_member", -------------- group-log--------------------- -- 获取奖励日志 WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 290defbe..a34b1985 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -23,6 +23,13 @@ FamilyView = {} local M = FamilyView +local function FamilyOnline(groupId) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_Get_Online_Member(groupId, function(res) + + end) +end + function FamilyView.new() UIPackage.AddPackage("base/Family/ui/Family") @@ -336,6 +343,8 @@ function M:ConnetFamilyRoom(fgCtr, id) pt(res) end) + FamilyOnline(self._group.id) + return 1 end end) @@ -552,8 +561,7 @@ function M:ConnetFamily(index, groups, isCreate) list_family.itemRenderer = function(i, obj) local j = i + 1 obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc - --obj.text = ViewUtil.TextOmit(groups[j].name) - obj.text = groups[j].name + obj.text = Utils.TextOmit(groups[j].name, 6) obj.onClick:Add(function() if groups[j].id == self._group.id then diff --git a/wb_new_ui/assets/Family/Main/Component/Label_joinPlayers.xml b/wb_new_ui/assets/Family/Main/Component/Label_joinPlayers.xml index df0bcc28..ec8a23d7 100644 --- a/wb_new_ui/assets/Family/Main/Component/Label_joinPlayers.xml +++ b/wb_new_ui/assets/Family/Main/Component/Label_joinPlayers.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml index f86e8554..ea6b487b 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml @@ -1,25 +1,25 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml index ad4d3794..219dfa27 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml index 5cf3237b..bac0f8f3 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml @@ -1,10 +1,10 @@ - + - - + + @@ -24,14 +24,15 @@ - + - - + + + @@ -79,7 +80,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml index e44d0708..c04b467d 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml @@ -20,8 +20,8 @@ - - + + @@ -36,13 +36,13 @@ - - - + + + @@ -70,7 +70,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index 677b2d83..22980a10 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -1,13 +1,13 @@ - + - + - + @@ -85,7 +85,9 @@ - + + + @@ -102,7 +104,7 @@