diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua
index cef03abd..95f862df 100644
--- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua
+++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua
@@ -290,6 +290,15 @@ function M:FG_GetOnlinePlayers(callback)
     end)
 end
 
+--设置允许成员可以查看聊天室
+function M:FG_OPEN_ISOPEN_CHATROOM(callback)
+    self._mgr_client:send(Protocol.WEB_FG_OPEN_ISOPEN_CHATROOM, nil, function(res)
+        print("允许成员可以查看聊天室")
+        pt(res)
+        callback(res)
+    end)
+end
+
 -- 邀请在线玩家
 function M:FG_InvitePlayer(group_id, tag, player_id, roomid, pid, game_name, callback)
     local _data = {}
diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua
index b7b2b99a..f3c03571 100644
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua
@@ -147,6 +147,8 @@ function M:FG_UpdateGroupInfo(id, name, notice, ban, dissolve_opt, kick_opt, app
     data.ban_chat2 = ban_chat2
     data.option = option
     data.show_num = showNum
+    print("FG_UpdateGroupInfo")
+    pt(data)
     _client:send(Protocol.WEB_FG_UPDATE_GROUP_INFO, data, function(res)
         callback(res)
     end)
@@ -1600,7 +1602,7 @@ function M:SetIsOpenChatRoom(groupId, value, callback)
     local _data = {}
     _data.id = groupId
     _data.isOpenChatRoom = value
-    _client:send(Protocol.WEB_FG_SET_ISOPEN_CHATROOM, _data, function(res)
+    _client:send(Protocol.WEB_FG_OPEN_ISOPEN_CHATROOM, _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 ab0d4d09..5969647a 100644
--- a/lua_probject/base_project/Game/Protocol.lua
+++ b/lua_probject/base_project/Game/Protocol.lua
@@ -274,10 +274,6 @@ Protocol = {
 
     -- 亲友圈聊天室
     WEB_FG_GETCHATROOM              = "group/get_chat_rooms",
-    -- 设置是否允许成员查看聊天室
-    WEB_FG_SET_ISOPEN_CHATROOM      = "group/set_open_chatroom",
-    -- 设置是否允许观战
-    WEB_FG_SET_CANWATCH             = "group/set_group_guest",
 
     -------------- group-log---------------------
     -- 获取奖励日志
@@ -385,6 +381,12 @@ Protocol = {
     FGMGR_EVT_INVITED               = "12010",
     -- 未读邮件提示事件
     FGMGR_EVT_NEW_MAIL              = "update_mail_tip",
+    -- 设置允许成员查看聊天室
+    WEB_FG_OPEN_ISOPEN_CHATROOM      = "13001",
+    -- 设置不允许成员查看聊天室
+    WEB_FG_CLOSE_ISOPEN_CHATROOM      = "13002",
+    -- 设置是否允许观战
+    WEB_FG_SET_CANWATCH             = "set_group_guest",
 
     --end::::::::::::::牌友圈协议::::::::::::::::::::
 
diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
index 00072363..24f68a9c 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
@@ -16,26 +16,36 @@ local function ShowMainView()
     root.familyType.selectedIndex = rootLastIndex or 1
 end
 
-local function ChangeNotice(self)
+local function ChangeFamilyConfig(data, self)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_UpdateGroupInfo(
-        self.family.id,
-        self.family.name,
-        self.input_notice.text,
-        not self.family.ban,
-        self.family.dissolve_opt,
-        self.family.kick_opt,
-        self.family.apply,
-        self.family.ban_chat1,
-        self.family.ban_chat2,
-        self.family.option,
+        data.id or self.family.id,
+        data.name or self.family.name,
+        data.notice or self.family.text,
+        data.ban or not self.family.ban,
+        data.dissolve_opt or self.family.dissolve_opt,
+        data.kick_opt or self.family.kick_opt,
+        data.apply or self.family.apply,
+        data.ban_chat1 or self.family.ban_chat1,
+        data.ban_chat2 or self.family.ban_chat2,
+        data.option or self.family.option,
         0,
         function(res)
             if res.ReturnCode ~= 0 then
-                ViewUtil.ErrorTip(res.ReturnCode, "更改公告失败,请稍后再试")
+                ViewUtil.ErrorTip(res.ReturnCode, "更改失败,请稍后再试")
             else
                 ViewUtil.ErrorTip(res.ReturnCode, "修改成功！")
-                self.family.notice = self.input_notice.text
+                self.family.id = data.id or self.family.id
+                self.family.name = data.name or self.family.name
+                self.family.text = data.notice or self.family.text
+                self.family.ban = data.ban or not self.family.ban
+                self.family.dissolve_opt = data.dissolve_opt or self.family.dissolve_opt
+                self.family.kick_opt = data.kick_opt or self.family.kick_opt
+                self.family.apply = data.apply or self.family.apply
+                self.family.ban_chat1 = data.ban_chat1 or self.family.ban_chat1
+                self.family.ban_chat2 = data.ban_chat2 or self.family.ban_chat2
+                self.family.option = data.option or self.family.option
+
                 self:Refalsh()
                 self.cWindow.selectedIndex = 0
             end
@@ -54,7 +64,6 @@ function FamilyMyFamily:TryShow(groupId, r)
 end
 
 function FamilyMyFamily:Show()
-
     self:Refalsh()
 
     HideMainView()
@@ -67,7 +76,6 @@ function FamilyMyFamily:Close()
 end
 
 function FamilyMyFamily:Refalsh()
-
     self.family = DataManager.groups.groupMap[self.groupId]
 
     self.tex_fName.text = self.family.name
@@ -77,7 +85,7 @@ function FamilyMyFamily:Refalsh()
     self.tex_nocice.text = self.family.notice
     ImageLoad.Load(self.family.o_portrait, self.loader_icon)
 
-    self.cStyle.selectedIndex = self.family.lev -1
+    self.cStyle.selectedIndex = self.family.lev - 1
 
     -- index = 0 是显示隐藏按钮
     self.showNumber = self.family.isShow
@@ -121,6 +129,7 @@ function FamilyMyFamily:Init()
     self.btn_applyMsg = self._view:GetChild("btn_applyMsg")
     self.btn_buyCrad = self._view:GetChild("btn_buyCrad")
     self.btn_checkNumber = self._view:GetChild("btn_checkNumber")
+    self.btn_editName = self._view:GetChild("btn_editName")
     self.btn_editNotice = self._view:GetChild("btn_editNotice")
     self.btn_quitNotice = self._view:GetChild("btn_quitNotice")
     self.btn_bgNotice = self._view:GetChild("btn_bgNotice")
@@ -128,7 +137,7 @@ function FamilyMyFamily:Init()
     self.btn_hideNumber = self._view:GetChild("btn_hideNumber")
     self.btn_showNumber = self._view:GetChild("btn_showNumber")
 
-    self.input_notice = self._view:GetChild("input_notice")
+    self.input_text = self._view:GetChild("input_text")
 
     self.cStyle = self._view:GetController("cStyle")
     self.cWindow = self._view:GetController("cWindow")
@@ -168,9 +177,9 @@ function FamilyMyFamily:Init()
 
     self.btn_quitFamily.onClick:Set(function()
         local fgCtr = ControllerManager.GetController(NewGroupController)
-        print("发送了退出协议 familyid = ",self.family.id)
+        print("发送了退出协议 familyid = ", self.family.id)
         fgCtr:FG_ExitGroup(self.family.id, function(res)
-            if res.ReturnCode ~= 0 then 
+            if res.ReturnCode ~= 0 then
                 return
             end
             self:Close()
@@ -188,14 +197,22 @@ function FamilyMyFamily:Init()
     end)
 
     self.btn_editNotice.onClick:Set(function()
+        self.changeCallback = function() ChangeFamilyConfig({ notice = self.input_text.text }, self) end
         self.cWindow.selectedIndex = 1
     end)
 
-    self.btn_confirmNotice.onClick:Set(ChangeNotice)
+    self.btn_editName.onClick:Set(function()
+        self.changeCallback = function() ChangeFamilyConfig({ name = self.input_text.text }, self) end
+        self.cWindow.selectedIndex = 1
+    end)
+
+    self.btn_confirmNotice.onClick:Set(function()
+        self.changeCallback()
+        self.cWindow.selectedIndex = 0
+    end)
 
     self.btn_hideNumber.onClick:Set(function()
-
-        if self.isShowContenting == true then 
+        if self.isShowContenting == true then
             ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
             return
         end
@@ -203,12 +220,12 @@ function FamilyMyFamily:Init()
         print("点击了")
 
         local fgCtr = ControllerManager.GetController(NewGroupController)
-        self.isShowContenting = true 
-        fgCtr:FG_SetGroupShow(0, self.family.id, function (res)
+        self.isShowContenting = true
+        fgCtr:FG_SetGroupShow(0, self.family.id, function(res)
             print("收到协议M:FG_SetGroupShow")
             pt(res)
             self.isShowContenting = false
-            if res.ReturnCode ~= 0 then 
+            if res.ReturnCode ~= 0 then
                 ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
                 return
             end
@@ -219,7 +236,7 @@ function FamilyMyFamily:Init()
     end)
 
     self.btn_showNumber.onClick:Set(function()
-        if self.isShowContenting == true then 
+        if self.isShowContenting == true then
             ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
             return
         end
@@ -227,12 +244,12 @@ function FamilyMyFamily:Init()
         print("点击了")
 
         local fgCtr = ControllerManager.GetController(NewGroupController)
-        self.isShowContenting = true 
-        fgCtr:FG_SetGroupShow(1, self.family.id, function (res)
+        self.isShowContenting = true
+        fgCtr:FG_SetGroupShow(1, self.family.id, function(res)
             print("收到协议M:FG_SetGroupShow")
             pt(res)
             self.isShowContenting = false
-            if res.ReturnCode ~= 0 then 
+            if res.ReturnCode ~= 0 then
                 ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
                 return
             end
@@ -245,4 +262,4 @@ function FamilyMyFamily:Init()
     return self
 end
 
-return FamilyMyFamily
\ No newline at end of file
+return FamilyMyFamily
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index ccb56570..d3e8231c 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -144,6 +144,10 @@ function M:SetIsOpenChatRoom()
         value = 1
     end
 
+    local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+    mgr_ctr:FG_OPEN_ISOPEN_CHATROOM()
+
+    --[[
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:SetIsOpenChatRoom(self._group.id, value, function(res)
         print("设置开启聊天室协议")
@@ -154,7 +158,7 @@ function M:SetIsOpenChatRoom()
         end
         self._group.isOpenChatRoom = value
         self:RefalshMoreBtn()
-    end)
+    end)]]
 end
 
 function M:SetCanWatch()
diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua
index 9d51de01..25f511ba 100644
--- a/lua_probject/base_project/Main.lua
+++ b/lua_probject/base_project/Main.lua
@@ -58,6 +58,7 @@ function Main()
     FairyGUI.UIConfig.defaultFont = "FZDaBiaoSong-B06S"
     FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("SIYUAN", "base/static/fonts/SIYUAN.TTF"), null)
     FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("方正胖娃_GBK", "base/static/fonts/方正胖娃_GBK.TTF"), null)
+    FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("方正粗圆_GBK", "base/static/fonts/方正粗圆_GBK.TTF"), null)
     --FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("FZCuYuan-M03","base/static/fonts/FZCuYuan-M03.TTF"),null)
     --FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("HYFangLiJ","base/static/fonts/HYFangLiJ.ttf"),null)
     _game_info = json.decode(GameApplication.Instance.GameInfo)
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
index e5d4dbf2..af66d9a5 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
@@ -103,6 +103,9 @@ function M:InitView(url)
                 if self._state.selectedIndex > 0 and self._state.selectedIndex < 3 then
                     ViewUtil.ErrorTip(nil, '房间已开始,无法退出游戏。')
                 else
+                    local _gamectr = ControllerManager.GetController(GameController)
+                    _gamectr:AskDismissRoom()
+                    --[[
                     ViewUtil.ShowModalWait(self._root_view)
                     self._gamectr:LevelRoom(
                         function(res)
@@ -113,7 +116,7 @@ function M:InitView(url)
                                 ViewUtil.ErrorTip(res.ReturnCode)
                             end
                         end
-                    )
+                    )]]
                 end
             end
         )
diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml
index a527487d..0f3cb564 100644
--- a/wb_new_ui/assets/Family/Main.xml
+++ b/wb_new_ui/assets/Family/Main.xml
@@ -9,7 +9,7 @@
   <controller name="lev" pages="0,1,1,2,2,3" selected="0"/>
   <controller name="moreBtn" pages="0,,1," selected="0"/>
   <controller name="familyBan" pages="0,,1," selected="0"/>
-  <controller name="cMyfamilyList" pages="0,,1," selected="0"/>
+  <controller name="cMyfamilyList" pages="0,,1," selected="1"/>
   <controller name="cIsChatRoom" pages="0,,1," selected="0">
     <remark page="0" value="关闭聊天室"/>
     <remark page="1" value="打开聊天室"/>
@@ -23,13 +23,13 @@
     </image>
     <component id="n3_in3i" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n17_in3i"/>
     <group id="n17_in3i" name="bg" xy="0,0" size="2532,1170"/>
-    <image id="n11_in3i" name="n11" src="jrro7cye" fileName="Main/Image/bg_topTitle.png" xy="1036,23" group="n34_86ct"/>
+    <image id="n11_in3i" name="n11" src="jrro7cye" fileName="Main/Image/bg_topTitle.png" xy="1021,13" size="489,104" group="n34_86ct"/>
     <component id="n10_in3i" name="btn_family_record" src="in3i7cud" fileName="Main/Component/btn_family_record.xml" xy="399,14" size="328,108" group="n34_86ct">
       <gearDisplay controller="lev" pages="0,1"/>
       <relation target="" sidePair="left-left%,top-top%"/>
     </component>
-    <component id="n6_in3i" name="btn_myfamily" src="in3i7cue" fileName="Main/Component/btn_myfamily.xml" xy="2161,29" group="n34_86ct"/>
-    <component id="n8_in3i" name="btn_showALlStartRoom" src="in3i7cuc" fileName="Main/Component/btn_showALlStartRoom.xml" xy="1849,29" group="n34_86ct">
+    <component id="n6_in3i" name="btn_myfamily" src="in3i7cue" fileName="Main/Component/btn_myfamily.xml" xy="2131,29" group="n34_86ct" scale="1.2,1.2"/>
+    <component id="n8_in3i" name="btn_showALlStartRoom" src="in3i7cuc" fileName="Main/Component/btn_showALlStartRoom.xml" xy="1749,29" group="n34_86ct" scale="1.2,1.2">
       <gearDisplay controller="lev" pages="0,1"/>
     </component>
     <image id="n353_jrro" name="n353" src="jrro7cy2" fileName="Main/Image/bg_left1.png" xy="28,143" size="420,1011" group="n360_jrro">
@@ -39,28 +39,28 @@
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
     <group id="n360_jrro" name="bg_left" xy="28,143" size="420,1011" group="n34_86ct"/>
-    <image id="n355_jrro" name="n355" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="460,143" size="2070,1011" group="n362_jrro">
+    <image id="n355_jrro" name="n355" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="460,142" size="2070,1011" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n356_jrro" name="n356" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="479,161" size="2034,978" group="n362_jrro">
+    <image id="n356_jrro" name="n356" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="479,160" size="2034,978" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n357_jrro" name="n357" src="jrro7cyj" fileName="Main/Image/bg_main3.png" xy="490,278" size="2010,852" group="n362_jrro">
+    <image id="n357_jrro" name="n357" src="jrro7cyj" fileName="Main/Image/bg_main3.png" xy="490,277" size="2010,852" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n358_jrro" name="n358" src="jrro7cyi" fileName="Main/Image/bg_main4.png" xy="859,290" size="1632,828" group="n362_jrro">
+    <image id="n358_jrro" name="n358" src="jrro7cyi" fileName="Main/Image/bg_main4.png" xy="839,289" size="1652,828" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n363_jrro" name="n363" src="jrro7cyf" fileName="Main/Image/bg_mainOpenGame.png" xy="871,299" group="n362_jrro"/>
-    <group id="n362_jrro" name="bg_right" xy="460,143" size="2070,1011" group="n34_86ct"/>
-    <component id="n5_in3i" name="btn_inviteFriends" src="in3i7cug" fileName="Main/Component/btn_inviteFriends.xml" xy="514,323" group="n23_in3i">
+    <image id="n363_jrro" name="n363" src="jrro7cyf" fileName="Main/Image/bg_mainOpenGame.png" xy="854,298" size="1623,60" group="n362_jrro"/>
+    <group id="n362_jrro" name="bg_right" xy="460,142" size="2070,1011" group="n34_86ct"/>
+    <component id="n5_in3i" name="btn_inviteFriends" src="in3i7cug" fileName="Main/Component/btn_inviteFriends.xml" xy="500,323" group="n23_in3i">
       <relation target="" sidePair="left-left%,top-top"/>
     </component>
-    <text id="n22_in3i" name="text_familyId" xy="637,374" size="111,42" group="n23_in3i" font="ui://27vd145bh35o7iln" fontSize="30" color="#ad3c3a" text="123456">
+    <text id="n22_in3i" name="text_familyId" xy="649,374" size="111,42" group="n23_in3i" font="ui://27vd145bh35o7iln" fontSize="30" color="#ad3c3a" text="123456">
       <relation target="n5_in3i" sidePair="center-center,bottom-bottom%"/>
     </text>
-    <group id="n23_in3i" name="inviteFriends" xy="514,323" size="321,99" group="n34_86ct"/>
-    <list id="n19_in3i" name="list_other" xy="48,161" size="384,977" group="n34_86ct" overflow="scroll" defaultItem="ui://htcn7v3rin3i7cun" autoClearItems="true">
+    <group id="n23_in3i" name="inviteFriends" xy="500,323" size="321,99" group="n34_86ct"/>
+    <list id="n19_in3i" name="list_other" xy="48,180" size="384,958" group="n34_86ct" overflow="scroll" defaultItem="ui://htcn7v3rin3i7cun" autoClearItems="true">
       <relation target="" sidePair="height-height%,left-left%"/>
       <item/>
       <item/>
@@ -85,7 +85,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n24_in3i" name="list_familyNumber" xy="515,437" size="322,679" group="n34_86ct" overflow="scroll" lineGap="13" defaultItem="ui://htcn7v3rin3i7cur">
+    <list id="n24_in3i" name="list_familyNumber" xy="499,437" size="322,679" group="n34_86ct" overflow="scroll" lineGap="20" defaultItem="ui://htcn7v3rin3i7cur">
       <relation target="" sidePair="height-height,left-left%"/>
       <item/>
       <item/>
@@ -93,14 +93,14 @@
       <item/>
       <item/>
     </list>
-    <list id="n28_in3i" name="list_room" xy="869,367" size="1620,743" group="n34_86ct" overflow="scroll" lineGap="10" defaultItem="ui://htcn7v3rin3i7cuh" autoClearItems="true">
+    <list id="n28_in3i" name="list_room" xy="854,367" size="1636,752" group="n34_86ct" overflow="scroll" lineGap="12" defaultItem="ui://htcn7v3rin3i7cuh" autoClearItems="true">
       <relation target="" sidePair="height-height,left-left%"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n364_jrro" name="n364" xy="1605,308" size="147,42" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="30" color="#444444" text="dangqian">
+    <text id="n364_jrro" name="n364" xy="1569,301" size="204,56" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="42" color="#444444" text="dangqian">
       <relation target="n28_in3i" sidePair="center-center,bottom-top"/>
     </text>
     <graph id="n371_ajr3" name="bh_ban" xy="860,297" size="1644,814" group="n34_86ct" type="rect" lineSize="0" fillColor="#66000000">
@@ -110,12 +110,14 @@
     <text id="n372_ajr3" name="text_banMain" xy="1375,647" size="455,121" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="50" autoSize="none" text="该亲友圈已打样">
       <gearDisplay controller="familyBan" pages="1"/>
     </text>
-    <component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="584,1020" group="n34_86ct"/>
+    <component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="573,1028" group="n34_86ct">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </component>
     <component id="n391_j0cy" name="com_chatRoom" src="ieus7d1d" fileName="ChatRoom/com_chatRoom.xml" xy="0,0" group="n34_86ct">
       <gearDisplay controller="cIsChatRoom" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <group id="n34_86ct" name="main" xy="0,0" size="2532,1170" advanced="true">
+    <group id="n34_86ct" name="main" xy="0,0" size="2530,1154" advanced="true">
       <gearDisplay controller="familyType" pages="0"/>
     </group>
     <image id="n35_86ct" name="n35" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="297,171" size="2034,981" group="n39_86ct"/>
@@ -185,10 +187,10 @@
     </group>
     <text id="n87_qz7i" name="n87" xy="-503,661" size="0,0" fontSize="66" color="#ffffff" bold="true" text=""/>
     <component id="n390_yk1o" name="btn_quitMyfamilyTab" src="sfjv7d3g" fileName="MyFamily/Component/btn_bg.xml" xy="0,0" size="2532,1170" group="n386_yk1o" alpha="0"/>
-    <image id="n385_yk1o" name="n385" src="yk1o7d41" fileName="MyFamily/Image/Group 556.png" xy="2185,110" group="n386_yk1o"/>
-    <component id="n387_yk1o" name="btn_myFamilyList" src="yk1o7d42" fileName="MyFamily/Component/btn_myFamilylist.xml" xy="2186,109" size="234,91" group="n386_yk1o"/>
-    <component id="n388_yk1o" name="btn_creatFamily" src="yk1o7d42" fileName="MyFamily/Component/btn_myFamilylist.xml" xy="2186,201" size="234,91" group="n386_yk1o"/>
-    <component id="n389_yk1o" name="btn_joinFamily" src="yk1o7d42" fileName="MyFamily/Component/btn_myFamilylist.xml" xy="2186,292" size="234,91" group="n386_yk1o"/>
+    <image id="n385_yk1o" name="n385" src="yk1o7d41" fileName="MyFamily/Image/Group 556.png" xy="2164,131" group="n386_yk1o" scale="1.2,1.2"/>
+    <component id="n387_yk1o" name="btn_myFamilyList" src="yk1o7d42" fileName="MyFamily/Component/btn_myFamilylist.xml" xy="2165,134" size="280,106" group="n386_yk1o"/>
+    <component id="n388_yk1o" name="btn_creatFamily" src="yk1o7d42" fileName="MyFamily/Component/btn_myFamilylist.xml" xy="2165,241" size="280,106" group="n386_yk1o"/>
+    <component id="n389_yk1o" name="btn_joinFamily" src="yk1o7d42" fileName="MyFamily/Component/btn_myFamilylist.xml" xy="2165,348" size="280,106" group="n386_yk1o"/>
     <group id="n386_yk1o" name="n386" xy="0,0" size="2532,1170" advanced="true">
       <gearDisplay controller="cMyfamilyList" pages="1"/>
     </group>
diff --git a/wb_new_ui/assets/Family/Main/Component/btn_joinGame.xml b/wb_new_ui/assets/Family/Main/Component/btn_joinGame.xml
index 4667878d..abdc7b51 100644
--- a/wb_new_ui/assets/Family/Main/Component/btn_joinGame.xml
+++ b/wb_new_ui/assets/Family/Main/Component/btn_joinGame.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="300,174" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="type" pages="0,进入玩法,1,进入房间,4,正在游戏" selected="2"/>
+  <controller name="type" pages="0,进入玩法,1,进入房间,4,正在游戏" selected="0"/>
   <displayList>
     <image id="n5_jrro" name="n5" src="jrro7cy7" fileName="Main/Image/btn_mainListJoin.png" xy="0,0">
       <gearDisplay controller="type" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n6_jrro" name="n6" src="jrro7cy6" fileName="Main/Image/btn_mainListOn.png" xy="0,0">
       <gearDisplay controller="type" pages="4"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n7_jrro" name="n7" src="jrro7cy5" fileName="Main/Image/btn_mainListStart.png" xy="0,0">
       <gearDisplay controller="type" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
   <Button/>
diff --git a/wb_new_ui/assets/Family/Main/Component/btn_watch.xml b/wb_new_ui/assets/Family/Main/Component/btn_watch.xml
index 80877705..913dc712 100644
--- a/wb_new_ui/assets/Family/Main/Component/btn_watch.xml
+++ b/wb_new_ui/assets/Family/Main/Component/btn_watch.xml
@@ -2,9 +2,12 @@
 <component size="108,174" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
+    <image id="n6_mggi" name="n6" src="mggi7d5h" fileName="Main/Image/look.png" xy="0,0" size="108,174">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <loader id="n5_o8k8" name="icon" xy="0,0" size="108,174">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Main/Component/c_otherChild.xml b/wb_new_ui/assets/Family/Main/Component/c_otherChild.xml
index 3914c6f8..d5c62170 100644
--- a/wb_new_ui/assets/Family/Main/Component/c_otherChild.xml
+++ b/wb_new_ui/assets/Family/Main/Component/c_otherChild.xml
@@ -2,7 +2,7 @@
 <component size="360,105">
   <displayList>
     <image id="n3_jrro" name="n3" src="jrro7cym" fileName="Main/Image/bg_leftLine.png" xy="0,102"/>
-    <text id="n4_jrro" name="title" xy="71,16" size="217,72" font="ui://27vd145bh35o7iln" fontSize="54" color="#ad3c3a" text="好几个字">
+    <text id="n4_jrro" name="title" xy="71,16" size="217,72" font="ui://27vd145bh35o7ili" fontSize="54" color="#ad3c3a" text="好几个字">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>
diff --git a/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml b/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml
index 3646e4f3..e7452b3c 100644
--- a/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml
+++ b/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1620,174">
+<component size="1620,180">
   <controller name="type" pages="0,玩法匹配,1,加入房间" selected="1"/>
   <controller name="num" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <image id="n23_jrro" name="n23" src="jrro7cyg" fileName="Main/Image/bg_mainListChild.png" xy="0,0"/>
+    <image id="n23_jrro" name="n23" src="jrro7cyg" fileName="Main/Image/bg_mainListChild.png" xy="0,0" size="1326,180">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <text id="n2_in3i" name="game_type" xy="198,12" size="292,64" font="ui://27vd145bh35o7ika" fontSize="48" color="#474747" leading="0" text="（抚州麻将）">
-      <relation target="" sidePair="left-left"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n3_in3i" name="n3" xy="249,63" size="110,49" font="ui://27vd145bh35o7iln" fontSize="36" color="#474747" leading="0" text="玩法："/>
-    <text id="n5_in3i" name="n5" xy="209,115" size="124,49" font="ui://27vd145bh35o7im7" fontSize="36" color="#474747" leading="0" text="已加入:"/>
-    <component id="n7_in3i" name="Label_gameRule" src="in3i7cuj" fileName="Main/Component/Label_gameRule.xml" xy="344,63" size="969,49"/>
-    <component id="n8_in3i" name="Label_joinPlayers" src="in3i7cuk" fileName="Main/Component/Label_joinPlayers.xml" xy="337,115" size="952,49"/>
+    <text id="n3_in3i" name="n3" xy="249,63" size="110,49" font="ui://27vd145bh35o7iln" fontSize="36" color="#474747" leading="0" text="玩法：">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n5_in3i" name="n5" xy="223,115" size="124,49" font="ui://27vd145bh35o7im7" fontSize="36" color="#474747" leading="0" text="已加入:">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <component id="n7_in3i" name="Label_gameRule" src="in3i7cuj" fileName="Main/Component/Label_gameRule.xml" xy="344,63" size="969,49">
+      <relation target="" sidePair="center-center,middle-middle"/>
+      <Label titleColor="#ad3c3a"/>
+    </component>
+    <component id="n8_in3i" name="Label_joinPlayers" src="in3i7cuk" fileName="Main/Component/Label_joinPlayers.xml" xy="351,115" size="952,49">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
     <image id="n24_jrro" name="n24" src="jrro7cy8" fileName="Main/Image/btn_mainGameNumberHead.png" xy="12,51">
       <gearDisplay controller="num" pages="0,1,2"/>
       <gearXY controller="num" pages="0,1" values="12,51|62,12" default="12,12"/>
@@ -40,10 +51,11 @@
     <component id="n18_in3i" name="player4" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="108,90" size="90,72">
       <gearDisplay controller="num" pages="1,2"/>
     </component>
-    <component id="n19_kes2" name="btn_joinGame" src="kes27cuv" fileName="Main/Component/btn_joinGame.xml" xy="1320,0"/>
-    <component id="n28_o8k8" name="btn_watch" src="ayfr7cwq" fileName="Main/Component/btn_watch.xml" xy="1164,-8" size="132,74">
+    <component id="n19_kes2" name="btn_joinGame" src="kes27cuv" fileName="Main/Component/btn_joinGame.xml" xy="1320,0" size="300,180">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <component id="n28_o8k8" name="btn_watch" src="ayfr7cwq" fileName="Main/Component/btn_watch.xml" xy="1148,3" size="160,63">
       <gearDisplay controller="type" pages="1,4"/>
-      <Button icon="ui://htcn7v3ro8k87cyt"/>
     </component>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Main/Image/look.png b/wb_new_ui/assets/Family/Main/Image/look.png
new file mode 100644
index 00000000..e0ecf5b0
Binary files /dev/null and b/wb_new_ui/assets/Family/Main/Image/look.png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_confirmNotice.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_confirmNotice.xml
index f988e908..e97e3464 100644
--- a/wb_new_ui/assets/Family/MyFamily/Component/btn_confirmNotice.xml
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_confirmNotice.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="423,162" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_sfjv" src="sfjv7d3m" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
+    <image id="n0_sfjv" name="n0" src="sfjv7d3m" fileName="MyFamily/Image/hall_club_common_btntext_queding.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
+  <Button downEffect="dark" downEffectValue="0.9"/>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/Component/btn_quitNotice.xml b/wb_new_ui/assets/Family/MyFamily/Component/btn_quitNotice.xml
index 570cff29..07e447d5 100644
--- a/wb_new_ui/assets/Family/MyFamily/Component/btn_quitNotice.xml
+++ b/wb_new_ui/assets/Family/MyFamily/Component/btn_quitNotice.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="162,162" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_sfjv" src="sfjv7d3j" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
+    <image id="n0_sfjv" name="n0" src="sfjv7d3j" fileName="MyFamily/Image/CommonRes_3.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
+  <Button downEffect="dark" downEffectValue="0.9"/>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml b/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
index f621dfc0..8d9018ec 100644
--- a/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
+++ b/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
@@ -81,7 +81,7 @@
     <image id="n40_sfjv" name="n40" src="c8pn7czw" fileName="RoomCrad/Image/title_top.png" xy="630,124" group="n42_sfjv"/>
     <component id="n41_sfjv" name="btn_quitNotice" src="sfjv7d3k" fileName="MyFamily/Component/btn_quitNotice.xml" xy="1777,89" group="n42_sfjv"/>
     <image id="n44_sfjv" name="n44" src="ieus7d1p" fileName="MyFamily/Image/Rectangle 267.png" xy="696,318" size="1140,457" group="n42_sfjv"/>
-    <text id="n45_sfjv" name="input_notice" xy="707,331" size="1129,457" group="n42_sfjv" font="ui://27vd145bh35o7il1" fontSize="54" color="#111111" autoSize="none" autoClearText="true" text="文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本" input="true"/>
+    <text id="n45_sfjv" name="input_text" xy="707,331" size="1129,457" group="n42_sfjv" font="ui://27vd145bh35o7il1" fontSize="54" color="#111111" autoSize="none" autoClearText="true" text="文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本" input="true"/>
     <component id="n46_sfjv" name="btn_confirmNotice" src="sfjv7d3n" fileName="MyFamily/Component/btn_confirmNotice.xml" xy="1054,805" group="n42_sfjv"/>
     <text id="n47_sfjv" name="tex_changeTitle" xy="1020,133" size="492,127" group="n42_sfjv" font="ui://27vd145bh35o7ilc" fontSize="90" color="#ffffff" align="center" autoSize="none" text="修改公告"/>
     <group id="n42_sfjv" name="n42" xy="0,0" size="2532,1170" advanced="true">
diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml
index 619f0d3a..f938e82b 100644
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@@ -371,6 +371,7 @@
     <image id="edxg7d5e" name="Group 650.png" path="/FamilyMsgRecord/Iamge/"/>
     <image id="edxg7d5f" name="Rectangle 290.png" path="/FamilyMsgRecord/Iamge/"/>
     <image id="edxg7d5g" name="Rectangle 291.png" path="/FamilyMsgRecord/Iamge/"/>
+    <image id="mggi7d5h" name="look.png" path="/Main/Image/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
index 3bd0c2c8..5840c6a0 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ
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 72f0fd8e..9a48e510 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/static/fonts/方正粗圆_GBK.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/方正粗圆_GBK.ttf
new file mode 100644
index 00000000..dbabeeda
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/方正粗圆_GBK.ttf differ
diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/方正粗圆_GBK.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/方正粗圆_GBK.ttf.meta
new file mode 100644
index 00000000..4c184b17
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/static/fonts/方正粗圆_GBK.ttf.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 545e9f78c59b7c94ca8552daa0397675
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: FZCuYuan-M03
+  fontNames:
+  - FZCuYuan-M03
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: bec9df6b5907b044bb5a04b4b1952839, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: