diff --git a/Assets/Art/Model/aocao.prefab b/Assets/Art/Model/aocao.prefab index 1657edc..de560fc 100644 --- a/Assets/Art/Model/aocao.prefab +++ b/Assets/Art/Model/aocao.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0c9c2b257c7b14f0cc25a9af5368686b2ccf914deda849890b85f9efe3d4892 -size 2516 +oid sha256:d18d889b1bca3561998fb75b734c6bcb8f1658b0119d5458574e226bdcc1b881 +size 4803 diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity index 146ce86..9ecde56 100644 --- a/Assets/Scenes/Test.unity +++ b/Assets/Scenes/Test.unity @@ -1315,6 +1315,84 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1b9d4654dd2760b41a57e40cd13d935a, type: 3} +--- !u!1001 &1494809738 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.98 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalPosition.y + value: 4.31 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalPosition.z + value: -9.9 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4435893386940746007, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7979385610396712053, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: m_Name + value: BaseSphere (2) + objectReference: {fileID: 0} + - target: {fileID: 9140300362975493256, guid: 9fc63211af583b946b1f381e4bf38ddf, + type: 3} + propertyPath: isOpenInEditor + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9fc63211af583b946b1f381e4bf38ddf, type: 3} --- !u!1001 &1707098865 PrefabInstance: m_ObjectHideFlags: 0 @@ -1980,7 +2058,7 @@ PrefabInstance: - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, type: 3} propertyPath: m_LocalPosition.z - value: 5 + value: -9.1 objectReference: {fileID: 0} - target: {fileID: 3168027658201720378, guid: 9fc63211af583b946b1f381e4bf38ddf, type: 3} @@ -2037,6 +2115,74 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9fc63211af583b946b1f381e4bf38ddf, type: 3} +--- !u!1001 &1087152227488215159 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.44 + objectReference: {fileID: 0} + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.48 + objectReference: {fileID: 0} + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalPosition.z + value: -10.37 + objectReference: {fileID: 0} + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000005338508 + objectReference: {fileID: 0} + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.000000053385076 + objectReference: {fileID: 0} + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692268012960553271, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6176888571047436423, guid: 5473e6013a314664bb411e5cc35e0484, + type: 3} + propertyPath: m_Name + value: aocao + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5473e6013a314664bb411e5cc35e0484, type: 3} --- !u!1001 &1781028406820323425 PrefabInstance: m_ObjectHideFlags: 0 @@ -3104,6 +3250,7 @@ SceneRoots: - {fileID: 7779342506646282638} - {fileID: 8980111935536418165} - {fileID: 1035971231385273297} + - {fileID: 1494809738} - {fileID: 382252025} - {fileID: 366996911271636373} - {fileID: 6191742170513974480} @@ -3120,3 +3267,4 @@ SceneRoots: - {fileID: 6671531601154661223} - {fileID: 668609047} - {fileID: 1067528595} + - {fileID: 1087152227488215159} diff --git a/Assets/Script/Gameplay/Facility/PressurePlateController.cs b/Assets/Script/Gameplay/Facility/PressurePlateController.cs index 97dee45..7481d6a 100644 --- a/Assets/Script/Gameplay/Facility/PressurePlateController.cs +++ b/Assets/Script/Gameplay/Facility/PressurePlateController.cs @@ -17,7 +17,8 @@ namespace Script.Gameplay.Facility private void FixedUpdate() { if (!isOpenInEditor) return; - hasObject = Physics.CheckBox(transform.position + plateOffset, plateSize * 0.5f, Quaternion.identity, detectLayer); + hasObject = Physics.CheckBox(transform.position + plateOffset, plateSize * 0.5f, Quaternion.identity, + detectLayer); if (hasObject != lastState) { SendSignal(hasObject, this.gameObject); @@ -25,17 +26,18 @@ namespace Script.Gameplay.Facility if (hasObject) { // 被压下动画 - pressTopPrefab.transform.localPosition = new Vector3(0,0,0.1f); + if (pressTopPrefab != null) + pressTopPrefab.transform.localPosition = new Vector3(0, 0, 0.1f); } else { // 弹起动画 - pressTopPrefab.transform.localPosition = new Vector3(0,0,1); - + if (pressTopPrefab != null) + pressTopPrefab.transform.localPosition = new Vector3(0, 0, 1); } } } - + #if UNITY_EDITOR private void OnDrawGizmosSelected() {