合并后错误修改

Assets/Resources/UI/Prefab/Panel/GameRoomCountDown.prefab

@@ -66,7 +66,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 56ffaecccce0ae34fa083c91bcabecdb, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 96
     m_FontStyle: 0
     m_BestFit: 0

Assets/Resources/UI/Prefab/Panel/HomePanel.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8bb6a9e5107a46744ba70fc370774184
+guid: 36bfda55f1b326a4d9f58750c891c4a9
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Resources/UI/Prefab/Panel/NewHomePanel.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 332fcc2a652bb8f48acfcf2d88ab2f20
+guid: 8bb6a9e5107a46744ba70fc370774184
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Resources/UI/Prefab/Panel/NewHomePanelback.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 332fcc2a652bb8f48acfcf2d88ab2f20
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: