diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity index 757838a6..141dde3a 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity +++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity @@ -12980,7 +12980,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &388288287 GameObject: @@ -26671,7 +26671,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -26961,7 +26961,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3} propertyPath: m_RootOrder - value: 23 + value: 24 objectReference: {fileID: 0} - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3} propertyPath: m_LocalPosition.x @@ -32528,7 +32528,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3} propertyPath: m_RootOrder - value: 20 + value: 21 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3} propertyPath: m_LocalPosition.x @@ -32590,6 +32590,10 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 2249601072385645600, guid: c494ecc284aba354aae4fc93fffe7399, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2249601072385645600, guid: c494ecc284aba354aae4fc93fffe7399, type: 3} propertyPath: m_StaticEditorFlags value: 0 @@ -32612,6 +32616,29 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: e3c135b4872f7f149af512e1721355da, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c494ecc284aba354aae4fc93fffe7399, type: 3} +--- !u!1 &854357933 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3451149981163930307, guid: c494ecc284aba354aae4fc93fffe7399, type: 3} + m_PrefabInstance: {fileID: 854357932} + m_PrefabAsset: {fileID: 0} +--- !u!65 &854357934 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854357933} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 12.643806, y: 39.59106, z: 4.8362184} + m_Center: {x: 11.109867, y: -3.9301128, z: 2.4181106} +--- !u!4 &854357935 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5076147426688453975, guid: c494ecc284aba354aae4fc93fffe7399, type: 3} + m_PrefabInstance: {fileID: 854357932} + m_PrefabAsset: {fileID: 0} --- !u!1001 &855158950 PrefabInstance: m_ObjectHideFlags: 0 @@ -34621,7 +34648,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &905697366 MonoBehaviour: @@ -37754,6 +37781,51 @@ Transform: m_Father: {fileID: 1745594328} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &960870798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 960870800} + - component: {fileID: 960870799} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &960870799 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960870798} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!4 &960870800 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960870798} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 98.2331, y: 2.0826, z: 298.2952} + m_LocalScale: {x: 25.657972, y: 5.1652, z: 12.9896} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &963586247 GameObject: m_ObjectHideFlags: 0 @@ -38335,7 +38407,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &977773623 PrefabInstance: @@ -49253,6 +49325,51 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268342221} m_Mesh: {fileID: 3564021358373180619, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3} +--- !u!1 &1268459357 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1268459358} + - component: {fileID: 1268459359} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1268459358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268459357} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.532, y: -15.469, z: 0.3551} + m_LocalScale: {x: 39.387344, y: 0.1235377, z: 1.7102} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 854357935} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1268459359 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268459357} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &1269524962 PrefabInstance: m_ObjectHideFlags: 0 @@ -50599,7 +50716,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} propertyPath: m_RootOrder - value: 26 + value: 27 objectReference: {fileID: 0} - target: {fileID: 7809819629956257521, guid: 40d3a9a89d67e314cb52ac4653578b36, type: 3} propertyPath: m_LocalScale.x @@ -64246,6 +64363,25 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} m_PrefabInstance: {fileID: 1679712370} m_PrefabAsset: {fileID: 0} +--- !u!1 &1679712372 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 30e501bfe66ef934eb01a02524bd336c, type: 3} + m_PrefabInstance: {fileID: 1679712370} + m_PrefabAsset: {fileID: 0} +--- !u!136 &1679712373 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1679712372} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.4 + m_Height: 1.8 + m_Direction: 1 + m_Center: {x: 0, y: 0.9, z: 0} --- !u!1 &1680200294 GameObject: m_ObjectHideFlags: 0 @@ -67969,7 +68105,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} propertyPath: m_RootOrder - value: 25 + value: 26 objectReference: {fileID: 0} - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3} propertyPath: m_LocalPosition.x @@ -76037,7 +76173,7 @@ Transform: - {fileID: 1446289608} - {fileID: 696764694} m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1987230714 GameObject: @@ -92852,7 +92988,7 @@ Transform: - {fileID: 4240377296742345613} - {fileID: 50144230157523243} m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!4 &2397982214548926677 Transform: @@ -141505,7 +141641,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} propertyPath: m_RootOrder - value: 24 + value: 25 objectReference: {fileID: 0} - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3} propertyPath: m_LocalPosition.x diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs index dc4eaf47..2a47d1b1 100644 --- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs +++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs @@ -20,4 +20,15 @@ public class BoxDools : MonoBehaviour } } } + private void OnTriggerExit(Collider other) + { + if (other != null) + { + for (int i = 0; i < GameManager.ins.interactive.Count; i++) + { + GameManager.ins.interactive[i].GetComponent().enabled = true; + GameManager.ins.interactive[i].GetComponent().animator.Play(GameManager.ins.interactive[i].GetComponent().Ŷ); + } + } + } }