diff --git a/xiaofang/Assets/Res/gsj/test111.cs b/xiaofang/Assets/Res/gsj/test111.cs index 7b645dd5..81e7f8a9 100644 --- a/xiaofang/Assets/Res/gsj/test111.cs +++ b/xiaofang/Assets/Res/gsj/test111.cs @@ -6,6 +6,7 @@ public class test111 : MonoBehaviour { // Start is called before the first frame update public Canvas canvas1; + public Camera camera; public Canvas canvas2; public Camera camera1; @@ -15,6 +16,7 @@ public class test111 : MonoBehaviour { Debug.Log(ReadRoom.instance.isenter); canvas1.gameObject.SetActive(false); + camera.gameObject.SetActive(false); canvas2.gameObject.SetActive(true); camera1.gameObject.SetActive(true); } @@ -22,6 +24,7 @@ public class test111 : MonoBehaviour { canvas1.gameObject.SetActive(false); + camera.gameObject.SetActive(false); canvas2.gameObject.SetActive(true); camera1.gameObject.SetActive(true); } diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity index 8303275d..3dcd3f68 100644 --- a/xiaofang/Assets/Scenes/Tmap 1.unity +++ b/xiaofang/Assets/Scenes/Tmap 1.unity @@ -10715,6 +10715,52 @@ MonoBehaviour: arrowDistanceText: {fileID: 1368271979} edgePadding: 50 textOffset: {x: 0, y: -30} +--- !u!1 &491785396 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 491785398} + - component: {fileID: 491785397} + m_Layer: 0 + m_Name: BurstCollisionWorld + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &491785397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491785396} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3} + m_Name: + m_EditorClassIdentifier: + cellSpans: + m_AlignBytes: 16 +--- !u!4 &491785398 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491785396} + 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: 0} + m_RootOrder: 43 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &496425324 GameObject: m_ObjectHideFlags: 0 @@ -18001,6 +18047,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: canvas1: {fileID: 1039624184} + camera: {fileID: 1707678918} canvas2: {fileID: 5640692783290307690} camera1: {fileID: 4163391439018457569} --- !u!1001 &984914341 @@ -29275,7 +29322,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!81 &1707678917 AudioListener: m_ObjectHideFlags: 0 @@ -31320,52 +31367,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -2598835819404414415, guid: 00003e04dc9a2534eb207f108c7b0cd3, type: 3} ---- !u!1 &1843323060 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1843323062} - - component: {fileID: 1843323061} - m_Layer: 0 - m_Name: BurstCollisionWorld - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1843323061 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1843323060} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3} - m_Name: - m_EditorClassIdentifier: - cellSpans: - m_AlignBytes: 16 ---- !u!4 &1843323062 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1843323060} - 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: 0} - m_RootOrder: 43 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1845569623 PrefabInstance: m_ObjectHideFlags: 0