diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua
index e8db3b89..576dfb82 100644
--- a/lua_probject/base_project/Main.lua
+++ b/lua_probject/base_project/Main.lua
@@ -60,6 +60,7 @@ function Main()
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("AlibabaPuHuiTi-3-65-Medium","base/static/fonts/AlibabaPuHuiTi-3-65-Medium.TTF"),null)
--FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("HYFangLiJ","base/static/fonts/HYFangLiJ.ttf"),null)
_game_info = json.decode(GameApplication.Instance.GameInfo)
--_game_info["login_url"]="http://8.134.59.224:8101/"
diff --git a/wb_new_ui/assets/Family/Main/Component/Label_gameRule.xml b/wb_new_ui/assets/Family/Main/Component/Label_gameRule.xml
index 1dd15b95..c1bfd800 100644
--- a/wb_new_ui/assets/Family/Main/Component/Label_gameRule.xml
+++ b/wb_new_ui/assets/Family/Main/Component/Label_gameRule.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
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 e7452b3c..9b8cac85 100644
--- a/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml
+++ b/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml
@@ -1,32 +1,16 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -37,14 +21,6 @@
-
-
-
-
-
-
-
-
@@ -57,5 +33,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Main/Image/bg_mainListChild(1).png b/wb_new_ui/assets/Family/Main/Image/bg_mainListChild(1).png
new file mode 100644
index 00000000..4aa6f6bd
Binary files /dev/null and b/wb_new_ui/assets/Family/Main/Image/bg_mainListChild(1).png differ
diff --git a/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml b/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
index 38b84387..243aefac 100644
--- a/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
+++ b/wb_new_ui/assets/Family/MyFamily/com_myFamily.xml
@@ -13,66 +13,69 @@
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml
index 8ad75ead..7e675a5b 100644
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@@ -373,6 +373,7 @@
+
\ 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 becdab14..f9247781 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_atlas0_1.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
index 122afb54..7127d3fc 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png
index c941a646..696ef1a1 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png
index 99d4243f..4b08989e 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.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 54f16964..289e458f 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_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 9f5ca545..1e259e0e 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/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf
new file mode 100644
index 00000000..38ee60f7
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf differ
diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf.meta
new file mode 100644
index 00000000..71fbbe05
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1027a6c6a4e2a204a949b2409f290d04
+TrueTypeFontImporter:
+ externalObjects: {}
+ serializedVersion: 4
+ fontSize: 16
+ forceTextureCase: -2
+ characterSpacing: 0
+ characterPadding: 1
+ includeFontData: 1
+ fontName: Alibaba PuHuiTi 3.0
+ fontNames:
+ - Alibaba PuHuiTi 3.0
+ fallbackFontReferences: []
+ customCharacters:
+ fontRenderingMode: 0
+ ascentCalculationMode: 1
+ useLegacyBoundsCalculation: 0
+ shouldRoundAdvanceValue: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant: