From 33938f068dec38f701f5c26a67e1f0ea65c74349 Mon Sep 17 00:00:00 2001 From: GanX <2423855310@qq.com> Date: Thu, 30 Oct 2025 10:03:58 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AFBUG?= =?UTF-8?q?=EF=BC=8C=E4=BA=BA=E7=89=A9=E6=91=94=E8=90=BD=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9BUG=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BC=A0?= =?UTF-8?q?=E6=92=AD=E6=8E=A7=E5=88=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Core.unity | 30 +++ Assets/Scenes/Level1.unity | 198 ++++++++++++------ .../Facility/BaseFacilityController.cs | 11 +- .../Gameplay/Player/PlayerMoveController.cs | 2 + 4 files changed, 167 insertions(+), 74 deletions(-) diff --git a/Assets/Scenes/Core.unity b/Assets/Scenes/Core.unity index cd19b88..c966704 100644 --- a/Assets/Scenes/Core.unity +++ b/Assets/Scenes/Core.unity @@ -666,6 +666,36 @@ PrefabInstance: propertyPath: m_Name value: BUGManager objectReference: {fileID: 0} + - target: {fileID: 7837787133520654591, guid: 815c9cbdee8c66b4d83594233fe55511, + type: 3} + propertyPath: AreaSize.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 7837787133520654591, guid: 815c9cbdee8c66b4d83594233fe55511, + type: 3} + propertyPath: AreaSize.y + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 7837787133520654591, guid: 815c9cbdee8c66b4d83594233fe55511, + type: 3} + propertyPath: AreaSize.z + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 7837787133520654591, guid: 815c9cbdee8c66b4d83594233fe55511, + type: 3} + propertyPath: AreaCenter.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 7837787133520654591, guid: 815c9cbdee8c66b4d83594233fe55511, + type: 3} + propertyPath: AreaCenter.y + value: -70 + objectReference: {fileID: 0} + - target: {fileID: 7837787133520654591, guid: 815c9cbdee8c66b4d83594233fe55511, + type: 3} + propertyPath: AreaCenter.z + value: -200 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index c7d6dd9..48da49a 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -137,21 +137,6 @@ PrefabInstance: propertyPath: m_Name value: PressurePlate (2) objectReference: {fileID: 0} - - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, - type: 3} - propertyPath: m_LocalScale.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalPosition.x @@ -170,27 +155,27 @@ PrefabInstance: - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} @@ -524,6 +509,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3535959014221630543, guid: 85652dd0e36597644aa5b3bc9603797b, + type: 3} + propertyPath: sendSignalMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3535959014221630543, guid: 85652dd0e36597644aa5b3bc9603797b, type: 3} propertyPath: needSignalCount @@ -878,6 +868,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -7803032184951374842, guid: b259f2c2ad8200d49b8ba9163724d69a, + type: 3} + propertyPath: pressTopPrefab + value: + objectReference: {fileID: 0} - target: {fileID: 2191333364839819432, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_Name @@ -1568,22 +1563,22 @@ PrefabInstance: - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b, type: 3} propertyPath: m_LocalScale.x - value: 4.52 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b, type: 3} propertyPath: m_LocalPosition.x - value: 75 + value: 100.8 objectReference: {fileID: 0} - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b, type: 3} propertyPath: m_LocalPosition.y - value: -65.1 + value: 66.45 objectReference: {fileID: 0} - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b, type: 3} propertyPath: m_LocalPosition.z - value: -191.2 + value: -294.66 objectReference: {fileID: 0} - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b, type: 3} @@ -1620,6 +1615,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8268117914458884828, guid: 667aedb0d3f8c9d469819c9ff2b4472b, + type: 3} + propertyPath: fallDamageThreshold + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3889,6 +3889,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3535959014221630543, guid: 85652dd0e36597644aa5b3bc9603797b, + type: 3} + propertyPath: sendSignalMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3535959014221630543, guid: 85652dd0e36597644aa5b3bc9603797b, type: 3} propertyPath: needSignalCount @@ -3897,7 +3902,7 @@ PrefabInstance: - target: {fileID: 3535959014221630543, guid: 85652dd0e36597644aa5b3bc9603797b, type: 3} propertyPath: isEnableSendSignal - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3535959014221630543, guid: 85652dd0e36597644aa5b3bc9603797b, type: 3} @@ -5514,21 +5519,6 @@ PrefabInstance: propertyPath: m_Name value: PressurePlate objectReference: {fileID: 0} - - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, - type: 3} - propertyPath: m_LocalScale.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalPosition.x @@ -5547,27 +5537,27 @@ PrefabInstance: - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} @@ -5913,6 +5903,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 119873216418816890, guid: dbf59764203ca4645a295e650a306b7b, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.54 + objectReference: {fileID: 0} + - target: {fileID: 119873216418816890, guid: dbf59764203ca4645a295e650a306b7b, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.02 + objectReference: {fileID: 0} - target: {fileID: 5873928673589519195, guid: dbf59764203ca4645a295e650a306b7b, type: 3} propertyPath: m_Name @@ -5996,17 +5996,17 @@ PrefabInstance: - target: {fileID: 7351527485767933101, guid: dbf59764203ca4645a295e650a306b7b, type: 3} propertyPath: fixedScale.x - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7351527485767933101, guid: dbf59764203ca4645a295e650a306b7b, type: 3} propertyPath: fixedScale.y - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7351527485767933101, guid: dbf59764203ca4645a295e650a306b7b, type: 3} propertyPath: fixedScale.z - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7351527485767933101, guid: dbf59764203ca4645a295e650a306b7b, type: 3} @@ -6028,6 +6028,11 @@ PrefabInstance: propertyPath: isEnableSendSignal value: 0 objectReference: {fileID: 0} + - target: {fileID: 7351527485767933101, guid: dbf59764203ca4645a295e650a306b7b, + type: 3} + propertyPath: overridePrefabScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -13020,6 +13025,21 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 605469399670797709, guid: b3e24e2df98d14e4ebc08cc68c071afa, + type: 3} + propertyPath: isEnableEdit + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 605469399670797709, guid: b3e24e2df98d14e4ebc08cc68c071afa, + type: 3} + propertyPath: isEnableConnect + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 605469399670797709, guid: b3e24e2df98d14e4ebc08cc68c071afa, + type: 3} + propertyPath: isEnableInteract + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2729643726423589850, guid: b3e24e2df98d14e4ebc08cc68c071afa, type: 3} propertyPath: m_Name @@ -18590,10 +18610,20 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 605469399670797709, guid: b3e24e2df98d14e4ebc08cc68c071afa, + type: 3} + propertyPath: isEnableEdit + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 605469399670797709, guid: b3e24e2df98d14e4ebc08cc68c071afa, + type: 3} + propertyPath: isEnableConnect + value: 0 + objectReference: {fileID: 0} - target: {fileID: 605469399670797709, guid: b3e24e2df98d14e4ebc08cc68c071afa, type: 3} propertyPath: isEnableInteract - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2729643726423589850, guid: b3e24e2df98d14e4ebc08cc68c071afa, type: 3} @@ -20265,21 +20295,6 @@ PrefabInstance: propertyPath: m_Name value: PressurePlate (1) objectReference: {fileID: 0} - - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, - type: 3} - propertyPath: m_LocalScale.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalPosition.x @@ -20298,27 +20313,27 @@ PrefabInstance: - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8123550679489282954, guid: b259f2c2ad8200d49b8ba9163724d69a, type: 3} @@ -21868,6 +21883,31 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 14.6 objectReference: {fileID: 0} + - target: {fileID: 1628880265110654716, guid: d9031d854d8b90242bd2ede9f1e5ae39, + type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1976379023418738175, guid: d9031d854d8b90242bd2ede9f1e5ae39, + type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2516335685923675096, guid: d9031d854d8b90242bd2ede9f1e5ae39, + type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2761094629435702802, guid: d9031d854d8b90242bd2ede9f1e5ae39, + type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2795244373605232313, guid: d9031d854d8b90242bd2ede9f1e5ae39, + type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2939363002710945596, guid: d9031d854d8b90242bd2ede9f1e5ae39, type: 3} propertyPath: m_LocalPosition.z @@ -21948,11 +21988,31 @@ PrefabInstance: propertyPath: m_Name value: altar01 objectReference: {fileID: 0} + - target: {fileID: 5805080855777853256, guid: d9031d854d8b90242bd2ede9f1e5ae39, + type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5936490221634710696, guid: d9031d854d8b90242bd2ede9f1e5ae39, type: 3} propertyPath: m_IsKinematic value: 1 objectReference: {fileID: 0} + - target: {fileID: 7057752660415097379, guid: d9031d854d8b90242bd2ede9f1e5ae39, + type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411275220573203128, guid: d9031d854d8b90242bd2ede9f1e5ae39, + type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7676316482596382265, guid: d9031d854d8b90242bd2ede9f1e5ae39, + type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Script/Gameplay/Facility/BaseFacilityController.cs b/Assets/Script/Gameplay/Facility/BaseFacilityController.cs index 7d97ee8..8fc9007 100644 --- a/Assets/Script/Gameplay/Facility/BaseFacilityController.cs +++ b/Assets/Script/Gameplay/Facility/BaseFacilityController.cs @@ -18,6 +18,7 @@ namespace Script.Gameplay.Facility [SerializeField] protected int currentSignalCount = 0; [SerializeField] protected string componentName; [SerializeField] protected bool isEnableSendSignal = false; + [SerializeField] protected bool isEnableDeliverSignal = false; public virtual bool IsEnableInteract { @@ -109,11 +110,6 @@ namespace Script.Gameplay.Facility public virtual void OnSignalReceived(bool active, GameObject sender) { - if (isEnableSendSignal) - { - SendSignal(active, sender); - } - if (active) { CurrentNeedSignalCount++; @@ -127,6 +123,11 @@ namespace Script.Gameplay.Facility { return; } + + if (isEnableDeliverSignal) + { + SendSignal(active, sender); + } // Implement signal received logic here } diff --git a/Assets/Script/Gameplay/Player/PlayerMoveController.cs b/Assets/Script/Gameplay/Player/PlayerMoveController.cs index 3d90745..05728ab 100644 --- a/Assets/Script/Gameplay/Player/PlayerMoveController.cs +++ b/Assets/Script/Gameplay/Player/PlayerMoveController.cs @@ -49,6 +49,7 @@ namespace Script.Gameplay.Player if (characterController == null) Debug.LogError("PlayerMoveController 需要 CharacterController 组件！"); + lastGroundY = transform.position.y; initSpeed = speed; playerSound = playerSound != null ? playerSound : GetComponent(); if (playerSound == null) @@ -76,6 +77,7 @@ namespace Script.Gameplay.Player // 落地检测 if (!wasGroundedLastFrame && isCurrentlyGrounded) { + float fallHeight = lastGroundY - transform.position.y; if (fallHeight > fallDamageThreshold) // 3米为伤害阈值，可调整 {