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 @@
-
+
@@ -122,25 +124,25 @@
-
+
-
+
-
+
-
+
-
+
@@ -238,9 +240,9 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
index 691ebde2..30c9a84c 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
@@ -1,17 +1,17 @@
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml
index cf53292c..013e6727 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml
@@ -1,17 +1,25 @@
-
-
+
+
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml
index 409f3da4..8286b82c 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index 30802843..dfeaa244 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1115,7 +1115,7 @@
-
+
@@ -1404,6 +1404,9 @@
+
+
+
\ No newline at end of file
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 d33328ba..d8e89a82 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
index c4ae02f1..a7a1ad8b 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
index d11be825..153d8e42 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png
index a612959d..80cf6d2e 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png
index 95ce37bd..5cb3de31 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png
index 3b2feec8..c21dba9a 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 7978cfd3..c68439c9 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ
diff --git a/wb_unity_pro/Assets/Source/Generate/Game_UtilsWrap.cs b/wb_unity_pro/Assets/Source/Generate/Game_UtilsWrap.cs
index be92327b..1c11831e 100644
--- a/wb_unity_pro/Assets/Source/Generate/Game_UtilsWrap.cs
+++ b/wb_unity_pro/Assets/Source/Generate/Game_UtilsWrap.cs
@@ -18,6 +18,7 @@ public class Game_UtilsWrap
L.RegFunction("LocalAddress", LocalAddress);
L.RegFunction("IsGPSEnable", IsGPSEnable);
L.RegFunction("DownloadFile", DownloadFile);
+ L.RegFunction("TextOmit", TextOmit);
L.EndStaticLibs();
}
@@ -208,5 +209,23 @@ public class Game_UtilsWrap
return LuaDLL.toluaL_exception(L, e);
}
}
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int TextOmit(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 2);
+ string arg0 = ToLua.CheckString(L, 1);
+ int arg1 = (int)LuaDLL.luaL_checknumber(L, 2);
+ string o = Game.Utils.TextOmit(arg0, arg1);
+ LuaDLL.lua_pushstring(L, o);
+ return 1;
+ }
+ catch (Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
}