修复prefab丢失bug

xiaofang/Assets/Prefabs/HYLPrefabs/Panel/FreePanel02.prefab

@@ -544,11 +544,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-<<<<<<< HEAD
   - {fileID: 5033446575465077021}
-=======
-  - {fileID: 7697798338937740108}
->>>>>>> dba8c4a9750ededdb2198165abaa956cb8527657
   - {fileID: 2368487730631202383}
   - {fileID: 2368487730040724335}
   m_Father: {fileID: 0}
@@ -954,82 +950,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 119.558655}
   m_SizeDelta: {x: 1920, y: 687.5455}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &9086276164615348635
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7697798338937740108}
-  - component: {fileID: 4744705606949050053}
-  - component: {fileID: 2344303043716919252}
-  m_Layer: 5
-  m_Name: Mask
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7697798338937740108
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9086276164615348635}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2368487730057768969}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1920, y: 1080}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4744705606949050053
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9086276164615348635}
-  m_CullTransparentMesh: 1
---- !u!114 &2344303043716919252
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9086276164615348635}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1001 &522893711962272754
 PrefabInstance:
   m_ObjectHideFlags: 0

xiaofang/Assets/Script/hylScripts/Free01/FreePanel01.cs

@@ -10,7 +10,7 @@ public class FreePanel01 : MonoBehaviour
 
     public Button connectBtn;
 
-    public GameObject FreePanel02;
+    //public GameObject FreePanel02;
 
     //这里是计时器相关变量
     public Text timerText;
@@ -24,7 +24,6 @@ public class FreePanel01 : MonoBehaviour
     {
         timeElapsed = 0f;
 
-
         connectBtn.onClick.AddListener(OnClickConnectBtn);
     }