fix():修复场景BUG,人物摔落伤害不对BUG,添加传播控制字段

This commit is contained in:
2025-10-30 10:03:58 +08:00
parent 0aca79600d
commit 33938f068d
4 changed files with 167 additions and 74 deletions

View File

@@ -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: []

View File

@@ -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: []

View File

@@ -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
}

View File

@@ -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<AudioSource>();
if (playerSound == null)
@@ -76,6 +77,7 @@ namespace Script.Gameplay.Player
// 落地检测
if (!wasGroundedLastFrame && isCurrentlyGrounded)
{
float fallHeight = lastGroundY - transform.position.y;
if (fallHeight > fallDamageThreshold) // 3米为伤害阈值可调整
{