diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index c1f76b36..30da6a4e 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -342,7 +342,10 @@ function M:UpdateFamilyRoom(fgCtr, id)
                 roomList[newIndex].id)
             obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 1
             obj:GetController('num').selectedIndex = roomList[newIndex].maxPlayers - 2
-            obj:GetController('type').selectedIndex = 1
+            if self._group.isWatch == 1 then
+                -- 允许观战
+                obj:GetController('type').selectedIndex = 1
+            end
             local plist = roomList[newIndex].plist
             local insertName = ""
             for i = 1, #plist do
diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua
index d454d07b..a3a0990f 100644
--- a/lua_probject/base_project/Main.lua
+++ b/lua_probject/base_project/Main.lua
@@ -42,6 +42,7 @@ function Main()
         typeof(UnityEngine.AudioClip)))
     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("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/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..45a0ce9c
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..14e2aa5c
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/static/fonts/方正胖娃_GBK.ttf.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: fc9b70dad43c41b4f995a42484aeb83c
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: FZPangWa-M18
+  fontNames:
+  - FZPangWa-M18
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: