From 500c5c8ee230754c2c99f9fd6515dd1729e80c19 Mon Sep 17 00:00:00 2001 From: Roman <1325980292@qq.com> Date: Thu, 9 Sep 2021 14:45:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E5=AE=9E=E8=A3=85?= =?UTF-8?q?=E5=92=8C=E5=AE=8C=E5=96=84=E9=83=A8=E5=88=86=E9=9F=B3=E6=95=88?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=201.=E5=90=8C=E6=AD=A5=E7=9B=AE=E5=89=8D=E6=89=80=E6=9C=89?= =?UTF-8?q?=E9=9F=B3=E6=95=88=E5=88=B0=E6=89=80=E6=9C=89=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Effects/Wave/Attack_Wave/AWM0.mat | 2 +- Assets/Scenes/序章-家中.unity | 256 +++++++++++++++--- Assets/Scenes/序章-战场.unity | 125 ++++++++- Assets/Scenes/第一关.unity | 38 +-- Assets/Scenes/第二关.unity | 219 ++++++++++++++- Assets/Scripts/具象物体/Patrolman.cs | 27 ++ Assets/游戏内动画资源/AC/巡逻敌人.controller | 12 +- Assets/游戏内动画资源/AM/小孩骨骼/走.anim | 16 +- UserSettings/EditorUserSettings.asset | 10 +- 9 files changed, 626 insertions(+), 79 deletions(-) diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 5e5c858..b500957 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -44,6 +44,6 @@ Material: - WaveIntensity_2: 1 - WaveSpread_Value: 0 m_Colors: - - Center: {r: -0.025560379, g: 0.37146693, b: 0, a: 0} + - Center: {r: 0.4547038, g: 0.35989675, b: 0, a: 0} - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/序章-家中.unity b/Assets/Scenes/序章-家中.unity index e3818eb..6a81610 100644 --- a/Assets/Scenes/序章-家中.unity +++ b/Assets/Scenes/序章-家中.unity @@ -3149,7 +3149,17 @@ MonoBehaviour: missile: {fileID: 0} throwOffset: {fileID: 0} machineAudio: {fileID: 891250825} - runFootsDust: {fileID: 0} + walkSEs: + - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} + RunSEs: + - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} + ReapareTelephoneLineSE: {fileID: 0} + upHoleSE: {fileID: 0} + dropHoleSE: {fileID: 0} + pickSE: {fileID: 0} + throwSE: {fileID: 0} --- !u!50 &798428062 Rigidbody2D: serializedVersion: 4 @@ -3338,6 +3348,102 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!82 &798428066 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798428060} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &799637149 PrefabInstance: m_ObjectHideFlags: 0 @@ -5132,36 +5238,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1071101928} m_CullTransparentMesh: 1 ---- !u!1 &1075508405 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1075508406} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1075508406 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1075508405} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 11.56, y: -0.81, z: -10.486094} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1121347157 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5563886958839055788, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} @@ -5175,6 +5251,102 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1121347157} m_Enabled: 1 +--- !u!82 &1121347159 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1121347157} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1132274496 GameObject: m_ObjectHideFlags: 0 @@ -7761,7 +7933,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861856986} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.870555, y: -0.61863995, z: -10} + m_LocalPosition: {x: -10.870554, y: -0.61863995, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 716192431} @@ -8135,7 +8307,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 242972254775927363, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 242972254775927363, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_SortingLayerID @@ -8151,7 +8323,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1224173943602610437, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1224173943602610437, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_SortingLayerID @@ -8213,6 +8385,18 @@ PrefabInstance: propertyPath: machineAudio value: objectReference: {fileID: 891250825} + - target: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: walkSEs.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: walkSEs.Array.data[0] + value: + objectReference: {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - target: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: walkSEs.Array.data[1] + value: + objectReference: {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} - target: {fileID: 1692961902718145227, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_UpdateMode value: 0 @@ -8271,7 +8455,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2808971052666711577, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2808971052666711577, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_SortingLayerID @@ -8491,7 +8675,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7773944400862429264, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7773944400862429264, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_SortingLayerID diff --git a/Assets/Scenes/序章-战场.unity b/Assets/Scenes/序章-战场.unity index fea4dc9..4f5df0d 100644 --- a/Assets/Scenes/序章-战场.unity +++ b/Assets/Scenes/序章-战场.unity @@ -275,7 +275,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 56435766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.498786, y: 1.616767, z: -10} + m_LocalPosition: {x: -6.4954042, y: 1.6168762, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1049093360} @@ -601,6 +601,10 @@ PrefabInstance: propertyPath: m_TagString value: Player objectReference: {fileID: 0} + - target: {fileID: 3076861919745587545, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5384316869031239824, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} propertyPath: m_RootOrder value: 0 @@ -645,6 +649,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6335341074447929579, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8362882774665735019, guid: 856a868bf55224d4bb398f7106c4965a, type: 3} propertyPath: m_IsActive value: 0 @@ -695,9 +703,19 @@ MonoBehaviour: catched: {fileID: 0} throwingAngle: 45 missile: {fileID: 4018427281142380165, guid: 628f0c1ef857ddd4687c94b8ba9b1aa6, type: 3} - throwOffset: {fileID: 918764316} + throwOffset: {fileID: 0} machineAudio: {fileID: 0} - runFootsDust: {fileID: 0} + walkSEs: + - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} + RunSEs: + - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} + ReapareTelephoneLineSE: {fileID: 8300000, guid: a5c5ddaef3d4a6145a38180977237d7b, type: 3} + upHoleSE: {fileID: 8300000, guid: 2339e6668ec63b147b36f840df292bb3, type: 3} + dropHoleSE: {fileID: 8300000, guid: 61dfc74a8bd7df24a9a01c2dfbac866b, type: 3} + pickSE: {fileID: 8300000, guid: 76bdef1d772006d4294cf2a754b80a83, type: 3} + throwSE: {fileID: 8300000, guid: 748d6296585c4ec4797c87e569e6969b, type: 3} --- !u!114 &318330980 MonoBehaviour: m_ObjectHideFlags: 0 @@ -911,6 +929,102 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 318330977} m_Enabled: 1 +--- !u!82 &318330984 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318330977} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!114 &336340668 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} @@ -11129,11 +11243,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_interface: {fileID: 0} ---- !u!4 &918764316 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - m_PrefabInstance: {fileID: 966544878} - m_PrefabAsset: {fileID: 0} --- !u!1 &927359184 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/第一关.unity b/Assets/Scenes/第一关.unity index f736c59..75cbd04 100644 --- a/Assets/Scenes/第一关.unity +++ b/Assets/Scenes/第一关.unity @@ -1066,7 +1066,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: -2102267203 m_SortingLayer: 3 - m_SortingOrder: 0 + m_SortingOrder: 50 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -7338,7 +7338,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 367679635} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 29.88, y: -9.96, z: 0} + m_LocalPosition: {x: -47, y: -15.6, z: 0} m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998} m_Children: - {fileID: 1737112887496214201} @@ -22242,7 +22242,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1142437218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 45.18, y: -0.8499992, z: -10} + m_LocalPosition: {x: -29.007105, y: -3.2993822, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1608038909} @@ -24438,7 +24438,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1477400527} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 45.18, y: -0.8499992, z: -10} + m_LocalPosition: {x: -31.699995, y: -6.4900007, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 32565896} @@ -42462,8 +42462,8 @@ MonoBehaviour: - {fileID: 2047411004448683759} - {fileID: 5695032862028633419} m_Bounds: - m_Center: {x: 0.002210021, y: -0.0058805943, z: 0} - m_Extent: {x: 1.54779, y: 2.3711004, z: 0} + m_Center: {x: 0.002210021, y: -0.0058801174, z: 0} + m_Extent: {x: 1.54779, y: 2.3711, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 --- !u!4 &1062080848641781139 @@ -42615,7 +42615,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 4936508675712544306} m_Bounds: - m_Center: {x: 0.003477633, y: -0.0018951595, z: 0} + m_Center: {x: 0.003477633, y: -0.0018989742, z: 0} m_Extent: {x: 0.68153024, y: 0.4230354, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -42700,7 +42700,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 5437654542896820717} m_Bounds: - m_Center: {x: 6.3699875, y: -0.0021153688, z: 0} + m_Center: {x: 6.369995, y: -0.0021167994, z: 0} m_Extent: {x: 0.855, y: 1.1198149, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -42783,7 +42783,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 2934879650646324577} m_Bounds: - m_Center: {x: 0.00083500147, y: -0.0022355914, z: 0} + m_Center: {x: 0.00083500147, y: -0.002237022, z: 0} m_Extent: {x: 0.6941651, y: 0.8818251, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -42968,7 +42968,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 7089406931308197820} m_Bounds: - m_Center: {x: -0.008472621, y: 0.0000141859055, z: 0} + m_Center: {x: -0.008464992, y: 0.000012755394, z: 0} m_Extent: {x: 0.55653495, y: 0.69665515, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43039,7 +43039,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 2360827735431813924} m_Bounds: - m_Center: {x: -0.0004349947, y: 0.004311979, z: 0} + m_Center: {x: -0.0004426241, y: 0.00431484, z: 0} m_Extent: {x: 0.689565, y: 0.9506854, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43772,7 +43772,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 4718247844144699107} m_Bounds: - m_Center: {x: 0.0019773245, y: -0.0000009536743, z: 0} + m_Center: {x: 0.001969695, y: 0, z: 0} m_Extent: {x: 0.57801485, y: 0.9349998, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43810,7 +43810,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 5215891186772959842} m_Bounds: - m_Center: {x: -0.000007748604, y: 0.0016950965, z: 0} + m_Center: {x: 0.00001513958, y: 0.0016950965, z: 0} m_Extent: {x: 1.1549999, y: 0.77910495, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -44787,7 +44787,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 6675447233366868755} m_Bounds: - m_Center: {x: -0.000027358532, y: 0.0006043911, z: 0} + m_Center: {x: -0.000027358532, y: 0.0006067753, z: 0} m_Extent: {x: 0.705515, y: 1.2171149, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -44878,7 +44878,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 7263140363742385229} m_Bounds: - m_Center: {x: -0.004254937, y: 0.0007261038, z: 0} + m_Center: {x: -0.0042625666, y: 0.00072705746, z: 0} m_Extent: {x: 0.8907454, y: 1.2819755, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45004,7 +45004,7 @@ MonoBehaviour: - {fileID: 8355431490900499643} - {fileID: 4936508675712544306} m_Bounds: - m_Center: {x: 0.002315104, y: -0.001675427, z: 0} + m_Center: {x: 0.002315104, y: -0.0016773343, z: 0} m_Extent: {x: 0.68268514, y: 0.4232551, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45134,7 +45134,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 3397380986102525386} m_Bounds: - m_Center: {x: 0.0013449192, y: 0.0000009536743, z: 0} + m_Center: {x: 0.0013296604, y: 0.0000019073486, z: 0} m_Extent: {x: 0.7836551, y: 1.035, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45205,7 +45205,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 5215891186772959842} m_Bounds: - m_Center: {x: 0.0030323267, y: -0.0026347637, z: 0} + m_Center: {x: 0.003039956, y: -0.0026350021, z: 0} m_Extent: {x: 0.9919598, y: 1.2031548, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45241,7 +45241,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 8339351226288312874} m_Bounds: - m_Center: {x: 0.0016974211, y: -0.00012481213, z: 0} + m_Center: {x: 0.0017203093, y: -0.00012290478, z: 0} m_Extent: {x: 1.0732954, y: 1.2652456, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 diff --git a/Assets/Scenes/第二关.unity b/Assets/Scenes/第二关.unity index f2fd879..573c7d2 100644 --- a/Assets/Scenes/第二关.unity +++ b/Assets/Scenes/第二关.unity @@ -8037,7 +8037,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.028, y: 0.8655201} m_AnchorMax: {x: 0.2527861, y: 0.95120806} - m_AnchoredPosition: {x: 1.0006104, y: -0.1533966} + m_AnchoredPosition: {x: 1.0006256, y: -0.1533966} m_SizeDelta: {x: -6.6341, y: -3.6931992} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1144070038 @@ -11753,7 +11753,14 @@ MonoBehaviour: walkSEs: - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} - RunSEs: [] + RunSEs: + - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} + ReapareTelephoneLineSE: {fileID: 8300000, guid: a5c5ddaef3d4a6145a38180977237d7b, type: 3} + upHoleSE: {fileID: 8300000, guid: 2339e6668ec63b147b36f840df292bb3, type: 3} + dropHoleSE: {fileID: 8300000, guid: 61dfc74a8bd7df24a9a01c2dfbac866b, type: 3} + pickSE: {fileID: 8300000, guid: 76bdef1d772006d4294cf2a754b80a83, type: 3} + throwSE: {fileID: 8300000, guid: 748d6296585c4ec4797c87e569e6969b, type: 3} --- !u!114 &1720952668 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12900,7 +12907,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791259307} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -28.860825, y: -3.1726923, z: -10} + m_LocalPosition: {x: -28.859085, y: -3.1726923, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1031032740} @@ -14022,6 +14029,7 @@ GameObject: - component: {fileID: 1996504127} - component: {fileID: 1996504126} - component: {fileID: 1996504125} + - component: {fileID: 1996504128} m_Layer: 0 m_Name: "\u654C\u4EBA" m_TagString: Untagged @@ -14109,6 +14117,12 @@ MonoBehaviour: speed: 0 target: {fileID: 0} missiles: [] + RunSEs: + - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} + walkSEs: + - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} --- !u!95 &1996504127 Animator: serializedVersion: 3 @@ -14128,6 +14142,102 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!82 &1996504128 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1996504123} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &2006347510 GameObject: m_ObjectHideFlags: 0 @@ -17533,6 +17643,7 @@ GameObject: - component: {fileID: 1580265791} - component: {fileID: 8735070709909669208} - component: {fileID: 8735070709909669209} + - component: {fileID: 8735070709909669210} m_Layer: 0 m_Name: "\u654C\u4EBA" m_TagString: Untagged @@ -17559,6 +17670,12 @@ MonoBehaviour: speed: 0 target: {fileID: 0} missiles: [] + RunSEs: + - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} + walkSEs: + - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} + - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} --- !u!61 &8735070709909669209 BoxCollider2D: m_ObjectHideFlags: 0 @@ -17585,6 +17702,102 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 11.34, y: 7} m_EdgeRadius: 0 +--- !u!82 &8735070709909669210 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8735070709909669207} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &8824217202246417099 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/具象物体/Patrolman.cs b/Assets/Scripts/具象物体/Patrolman.cs index e6e69a3..f6b7f35 100644 --- a/Assets/Scripts/具象物体/Patrolman.cs +++ b/Assets/Scripts/具象物体/Patrolman.cs @@ -26,6 +26,11 @@ public class Patrolman : MonoBehaviour [SerializeField] private List missiles;//投掷物列表，巡逻者会自动往搜索听觉范围内的投掷物 private Animator animator; + public AudioClip[] RunSEs; + public AudioClip[] walkSEs; + private AudioSource audioPlayer; + + // Start is called before the first frame update void Start() @@ -37,6 +42,7 @@ public class Patrolman : MonoBehaviour missiles = new List();//初始化投掷物列表 animator = GetComponent(); animator.SetBool("IsWalk",true); + audioPlayer = GetComponent(); } // Update is called once per frame @@ -46,6 +52,27 @@ public class Patrolman : MonoBehaviour CheckMissiles();//检查是否有投掷物落地 } + private int shouldBePlayedWalkSEID = 0; + public void OnWalkFootTouched() + { + //走路动画中脚着地触发 + audioPlayer.clip = walkSEs[shouldBePlayedWalkSEID % walkSEs.Length]; + audioPlayer.volume = 0.2f; + audioPlayer.Play(); + shouldBePlayedWalkSEID++; + } + private int shouldBePlayedRunSEID = 0; + public void OnRunFootTouched() + { + //跑步动画中脚着地触发 + audioPlayer.clip = RunSEs[shouldBePlayedRunSEID % RunSEs.Length]; + audioPlayer.volume = 0.2f; + audioPlayer.Play(); + shouldBePlayedRunSEID++; + + } + + private void CheckMissiles() { foreach(Missile missile in missiles) diff --git a/Assets/游戏内动画资源/AC/巡逻敌人.controller b/Assets/游戏内动画资源/AC/巡逻敌人.controller index 2a00440..0d53172 100644 --- a/Assets/游戏内动画资源/AC/巡逻敌人.controller +++ b/Assets/游戏内动画资源/AC/巡逻敌人.controller @@ -143,31 +143,31 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsRush m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsFire m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsListen m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsCheck m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -295,7 +295,7 @@ AnimatorStateMachine: m_Position: {x: 450, y: 460, z: 0} - serializedVersion: 1 m_State: {fileID: 4090589713448523476} - m_Position: {x: 870, y: 500, z: 0} + m_Position: {x: 890, y: 480, z: 0} - serializedVersion: 1 m_State: {fileID: 9213814869900402295} m_Position: {x: 640, y: 640, z: 0} diff --git a/Assets/游戏内动画资源/AM/小孩骨骼/走.anim b/Assets/游戏内动画资源/AM/小孩骨骼/走.anim index a32f59d..d3fa4f5 100644 --- a/Assets/游戏内动画资源/AM/小孩骨骼/走.anim +++ b/Assets/游戏内动画资源/AM/小孩骨骼/走.anim @@ -21560,4 +21560,18 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: OnWalkFootTouched + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.8333333 + functionName: OnWalkFootTouched + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 2c9e09c..6b5059f 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,16 +9,16 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb flags: 0 + RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb + flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bae495d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd898d91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969989eacfcc