From 68308f5f778534c9f397c820f3b7788a7c3065ee Mon Sep 17 00:00:00 2001 From: Hossein Pan Date: Mon, 28 Jun 2021 21:46:08 +0430 Subject: [PATCH 1/3] Camera shake on hit for PigChef --- .../Assets/Prefabs/Characters/PigChef.prefab | 50 ++++++++++- .../Prefabs/Gameplay/CameraSystem.prefab | 35 ++++++-- .../Actions/CameraShakeAction.asset | 14 +++ .../Actions/CameraShakeAction.asset.meta | 8 ++ .../Protagonist/States/GettingHit.asset | 1 + .../Actions/CameraShakeActionSO.cs | 43 +++++++++ .../Actions/CameraShakeActionSO.cs.meta | 11 +++ ...machineImpulseSource_6DShake_PigChef.asset | 88 +++++++++++++++++++ ...neImpulseSource_6DShake_PigChef.asset.meta | 10 +++ 9 files changed, 247 insertions(+), 13 deletions(-) create mode 100644 UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset create mode 100644 UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset.meta create mode 100644 UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs create mode 100644 UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs.meta create mode 100644 UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset create mode 100644 UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset.meta diff --git a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab index 632825bc1..8e62f59e9 100644 --- a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab +++ b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab @@ -213,6 +213,48 @@ MonoBehaviour: appendConditionsInfo: 1 appendActionsInfo: 1 currentState: +--- !u!114 &146591931023343909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 309633228405838073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 180ecf9b41d478f468eb3e9083753217, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ImpulseDefinition: + m_ImpulseChannel: 1 + m_RawSignal: {fileID: 11400000, guid: 41edfbe1c960d7d4e9640e19eadbd2a7, type: 2} + m_AmplitudeGain: 1 + m_FrequencyGain: 1 + m_RepeatMode: 0 + m_Randomize: 1 + m_TimeEnvelope: + m_AttackShape: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_DecayShape: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_AttackTime: 0 + m_SustainTime: 0.2 + m_DecayTime: 0.7 + m_ScaleWithImpact: 1 + m_HoldForever: 0 + m_ImpactRadius: 100 + m_DirectionMode: 0 + m_DissipationMode: 2 + m_DissipationDistance: 1000 + m_PropagationSpeed: 343 --- !u!114 &1144843397063430348 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4459,9 +4501,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &5700738674217691736 stripped +--- !u!4 &8291487101514034000 stripped Transform: - m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} @@ -4555,9 +4597,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8291487101514034000 stripped +--- !u!4 &5700738674217691736 stripped Transform: - m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} diff --git a/UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab b/UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab index 27c665aff..c525d6a87 100644 --- a/UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab +++ b/UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab @@ -168,7 +168,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1988373824387590796} - m_LocalRotation: {x: 0.12278774, y: -0.08864836, z: 0.026336022, w: 0.9881149} + m_LocalRotation: {x: -0, y: -9.280685e-16, z: 2.7181896e-16, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -212,7 +212,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.7777778, y: 1} + m_SensorSize: {x: 2.0121357, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -419,7 +419,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5457523176376150323} - m_LocalRotation: {x: 0.14805879, y: -0.087944664, z: 0.028598182, w: 0.98464537} + m_LocalRotation: {x: 0.025615782, y: -9.208012e-16, z: 2.95503e-16, w: 0.99967194} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -463,7 +463,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.7777778, y: 1} + m_SensorSize: {x: 2.0121357, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -679,7 +679,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6333144650067166509} - m_LocalRotation: {x: 0.12278774, y: -0.08864836, z: 0.026336022, w: 0.9881149} + m_LocalRotation: {x: -0, y: -9.280685e-16, z: 2.7181896e-16, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -723,7 +723,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.7777778, y: 1} + m_SensorSize: {x: 2.0121357, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -847,6 +847,7 @@ GameObject: - component: {fileID: 8745341641394998850} - component: {fileID: 8745341641394998849} - component: {fileID: 643664704} + - component: {fileID: 6041037716461695204} m_Layer: 0 m_Name: FreeLook_VCam m_TagString: Untagged @@ -861,7 +862,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8745341641394998848} - m_LocalRotation: {x: 0.08212709, y: 0.09216256, z: -0.007627606, w: 0.992322} + m_LocalRotation: {x: 0.20474699, y: 9.640615e-16, z: -7.6041245e-17, w: 0.97881496} m_LocalPosition: {x: 0, y: 5, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -901,7 +902,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.7777778, y: 1} + m_SensorSize: {x: 2.0121357, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 1 @@ -1005,6 +1006,22 @@ MonoBehaviour: m_Damping: 0.1 m_DampingWhenOccluded: 0 m_OptimalTargetDistance: 0 +--- !u!114 &6041037716461695204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8745341641394998848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ApplyAfter: 2 + m_ChannelMask: 1 + m_Gain: 1.8 + m_Use2DDistance: 0 --- !u!1 &8745341642014614487 GameObject: m_ObjectHideFlags: 0 @@ -1031,7 +1048,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8745341642014614487} - m_LocalRotation: {x: 0.20474699, y: -2.981331e-17, z: 2.8927992e-19, w: 0.97881496} + m_LocalRotation: {x: 0.20474699, y: 4.236726e-31, z: -4.110915e-33, w: 0.97881496} m_LocalPosition: {x: 0, y: 5, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset new file mode 100644 index 000000000..bfe9f86b7 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b40b49a4fc34a2142a27e6717f6a7827, type: 3} + m_Name: CameraShakeAction + m_EditorClassIdentifier: diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset.meta b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset.meta new file mode 100644 index 000000000..fbc6bfb91 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ccd550286cb68d40910d42c7b67ea5d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/GettingHit.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/GettingHit.asset index ec3ad4081..f6c9e3ffb 100644 --- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/GettingHit.asset +++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/GettingHit.asset @@ -17,3 +17,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 21788cba83bea9b49942b100edc2b832, type: 2} - {fileID: 11400000, guid: 374fbb8c166197a44b863aeded0c1fcc, type: 2} - {fileID: 11400000, guid: bbab1c59d57af344d95e166f153b21f9, type: 2} + - {fileID: 11400000, guid: 1ccd550286cb68d40910d42c7b67ea5d, type: 2} diff --git a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs new file mode 100644 index 000000000..8762bcb39 --- /dev/null +++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs @@ -0,0 +1,43 @@ +using Cinemachine; +using UnityEngine; +using UOP1.StateMachine; +using UOP1.StateMachine.ScriptableObjects; + +[CreateAssetMenu(fileName = "CameraShakeAction", menuName = "State Machines/Actions/Camera Shake")] +public class CameraShakeActionSO : StateActionSO +{ + protected override StateAction CreateAction() => new CameraShakeAction(); +} + +public class CameraShakeAction : StateAction +{ + private CinemachineImpulseSource _impulseSource; + + public override void Awake(StateMachine stateMachine) + { + _impulseSource = stateMachine.GetComponent(); + + if (_impulseSource == null) + { + Debug.LogError("Please Add CinemachineImpulseSource to GameObject"); + } + } + + public override void OnUpdate() + { + } + + public override void OnStateEnter() + { + if (_impulseSource == null) + { + return; + } + + _impulseSource.GenerateImpulse(); + } + + public override void OnStateExit() + { + } +} diff --git a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs.meta b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs.meta new file mode 100644 index 000000000..2c21d9cf4 --- /dev/null +++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b40b49a4fc34a2142a27e6717f6a7827 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset b/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset new file mode 100644 index 000000000..63b1612b5 --- /dev/null +++ b/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset @@ -0,0 +1,88 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7f59e54f2bfd184b9dd451a678d089b, type: 3} + m_Name: SignalCinemachineImpulseSource_6DShake_PigChef + m_EditorClassIdentifier: + PositionNoise: + - X: + Frequency: 3.2 + Amplitude: 0.011 + Constant: 1 + Y: + Frequency: 1.9 + Amplitude: 0.059 + Constant: 1 + Z: + Frequency: 3.33 + Amplitude: 0.021 + Constant: 1 + - X: + Frequency: 7.7 + Amplitude: 0.009 + Constant: 1 + Y: + Frequency: 9.1 + Amplitude: 0.04 + Constant: 0 + Z: + Frequency: 9.22 + Amplitude: 0.009 + Constant: 1 + - X: + Frequency: 51.51 + Amplitude: 0.002 + Constant: 1 + Y: + Frequency: 55.54 + Amplitude: 0.05 + Constant: 1 + Z: + Frequency: 58.55 + Amplitude: 0.017 + Constant: 1 + OrientationNoise: + - X: + Frequency: 5.83 + Amplitude: 0.09 + Constant: 1 + Y: + Frequency: 1.8 + Amplitude: 0.059 + Constant: 1 + Z: + Frequency: 2.38 + Amplitude: 0.017 + Constant: 1 + - X: + Frequency: 9.17 + Amplitude: 0.14 + Constant: 1 + Y: + Frequency: 11.35 + Amplitude: 0.041 + Constant: 1 + Z: + Frequency: 10.52 + Amplitude: 0.009 + Constant: 1 + - X: + Frequency: 57.17 + Amplitude: 0.15 + Constant: 1 + Y: + Frequency: 54.17 + Amplitude: 0.048 + Constant: 1 + Z: + Frequency: 63.76 + Amplitude: 0.016 + Constant: 1 diff --git a/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset.meta b/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset.meta new file mode 100644 index 000000000..f1c298b52 --- /dev/null +++ b/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 41edfbe1c960d7d4e9640e19eadbd2a7 +timeCreated: 1518036470 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: From e120ecf9fd93c913ba27d621ff91ad902835d4be Mon Sep 17 00:00:00 2001 From: Hossein Pan Date: Tue, 29 Jun 2021 08:59:55 +0430 Subject: [PATCH 2/3] Revert "Camera shake on hit for PigChef" This reverts commit 68308f5f778534c9f397c820f3b7788a7c3065ee. --- .../Assets/Prefabs/Characters/PigChef.prefab | 50 +---------- .../Prefabs/Gameplay/CameraSystem.prefab | 35 ++------ .../Actions/CameraShakeAction.asset | 14 --- .../Actions/CameraShakeAction.asset.meta | 8 -- .../Protagonist/States/GettingHit.asset | 1 - .../Actions/CameraShakeActionSO.cs | 43 --------- .../Actions/CameraShakeActionSO.cs.meta | 11 --- ...machineImpulseSource_6DShake_PigChef.asset | 88 ------------------- ...neImpulseSource_6DShake_PigChef.asset.meta | 10 --- 9 files changed, 13 insertions(+), 247 deletions(-) delete mode 100644 UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset delete mode 100644 UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset.meta delete mode 100644 UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs delete mode 100644 UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs.meta delete mode 100644 UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset delete mode 100644 UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset.meta diff --git a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab index 8e62f59e9..632825bc1 100644 --- a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab +++ b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab @@ -213,48 +213,6 @@ MonoBehaviour: appendConditionsInfo: 1 appendActionsInfo: 1 currentState: ---- !u!114 &146591931023343909 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 309633228405838073} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 180ecf9b41d478f468eb3e9083753217, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ImpulseDefinition: - m_ImpulseChannel: 1 - m_RawSignal: {fileID: 11400000, guid: 41edfbe1c960d7d4e9640e19eadbd2a7, type: 2} - m_AmplitudeGain: 1 - m_FrequencyGain: 1 - m_RepeatMode: 0 - m_Randomize: 1 - m_TimeEnvelope: - m_AttackShape: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_DecayShape: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_AttackTime: 0 - m_SustainTime: 0.2 - m_DecayTime: 0.7 - m_ScaleWithImpact: 1 - m_HoldForever: 0 - m_ImpactRadius: 100 - m_DirectionMode: 0 - m_DissipationMode: 2 - m_DissipationDistance: 1000 - m_PropagationSpeed: 343 --- !u!114 &1144843397063430348 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4501,9 +4459,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8291487101514034000 stripped +--- !u!4 &5700738674217691736 stripped Transform: - m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} @@ -4597,9 +4555,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &5700738674217691736 stripped +--- !u!4 &8291487101514034000 stripped Transform: - m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} diff --git a/UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab b/UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab index c525d6a87..27c665aff 100644 --- a/UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab +++ b/UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab @@ -168,7 +168,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1988373824387590796} - m_LocalRotation: {x: -0, y: -9.280685e-16, z: 2.7181896e-16, w: 1} + m_LocalRotation: {x: 0.12278774, y: -0.08864836, z: 0.026336022, w: 0.9881149} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -212,7 +212,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 2.0121357, y: 1} + m_SensorSize: {x: 1.7777778, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -419,7 +419,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5457523176376150323} - m_LocalRotation: {x: 0.025615782, y: -9.208012e-16, z: 2.95503e-16, w: 0.99967194} + m_LocalRotation: {x: 0.14805879, y: -0.087944664, z: 0.028598182, w: 0.98464537} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -463,7 +463,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 2.0121357, y: 1} + m_SensorSize: {x: 1.7777778, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -679,7 +679,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6333144650067166509} - m_LocalRotation: {x: -0, y: -9.280685e-16, z: 2.7181896e-16, w: 1} + m_LocalRotation: {x: 0.12278774, y: -0.08864836, z: 0.026336022, w: 0.9881149} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -723,7 +723,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 2.0121357, y: 1} + m_SensorSize: {x: 1.7777778, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -847,7 +847,6 @@ GameObject: - component: {fileID: 8745341641394998850} - component: {fileID: 8745341641394998849} - component: {fileID: 643664704} - - component: {fileID: 6041037716461695204} m_Layer: 0 m_Name: FreeLook_VCam m_TagString: Untagged @@ -862,7 +861,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8745341641394998848} - m_LocalRotation: {x: 0.20474699, y: 9.640615e-16, z: -7.6041245e-17, w: 0.97881496} + m_LocalRotation: {x: 0.08212709, y: 0.09216256, z: -0.007627606, w: 0.992322} m_LocalPosition: {x: 0, y: 5, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -902,7 +901,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 2.0121357, y: 1} + m_SensorSize: {x: 1.7777778, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 1 @@ -1006,22 +1005,6 @@ MonoBehaviour: m_Damping: 0.1 m_DampingWhenOccluded: 0 m_OptimalTargetDistance: 0 ---- !u!114 &6041037716461695204 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8745341641394998848} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ApplyAfter: 2 - m_ChannelMask: 1 - m_Gain: 1.8 - m_Use2DDistance: 0 --- !u!1 &8745341642014614487 GameObject: m_ObjectHideFlags: 0 @@ -1048,7 +1031,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8745341642014614487} - m_LocalRotation: {x: 0.20474699, y: 4.236726e-31, z: -4.110915e-33, w: 0.97881496} + m_LocalRotation: {x: 0.20474699, y: -2.981331e-17, z: 2.8927992e-19, w: 0.97881496} m_LocalPosition: {x: 0, y: 5, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset deleted file mode 100644 index bfe9f86b7..000000000 --- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset +++ /dev/null @@ -1,14 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b40b49a4fc34a2142a27e6717f6a7827, type: 3} - m_Name: CameraShakeAction - m_EditorClassIdentifier: diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset.meta b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset.meta deleted file mode 100644 index fbc6bfb91..000000000 --- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/CameraShakeAction.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1ccd550286cb68d40910d42c7b67ea5d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/GettingHit.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/GettingHit.asset index f6c9e3ffb..ec3ad4081 100644 --- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/GettingHit.asset +++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/GettingHit.asset @@ -17,4 +17,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 21788cba83bea9b49942b100edc2b832, type: 2} - {fileID: 11400000, guid: 374fbb8c166197a44b863aeded0c1fcc, type: 2} - {fileID: 11400000, guid: bbab1c59d57af344d95e166f153b21f9, type: 2} - - {fileID: 11400000, guid: 1ccd550286cb68d40910d42c7b67ea5d, type: 2} diff --git a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs deleted file mode 100644 index 8762bcb39..000000000 --- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Cinemachine; -using UnityEngine; -using UOP1.StateMachine; -using UOP1.StateMachine.ScriptableObjects; - -[CreateAssetMenu(fileName = "CameraShakeAction", menuName = "State Machines/Actions/Camera Shake")] -public class CameraShakeActionSO : StateActionSO -{ - protected override StateAction CreateAction() => new CameraShakeAction(); -} - -public class CameraShakeAction : StateAction -{ - private CinemachineImpulseSource _impulseSource; - - public override void Awake(StateMachine stateMachine) - { - _impulseSource = stateMachine.GetComponent(); - - if (_impulseSource == null) - { - Debug.LogError("Please Add CinemachineImpulseSource to GameObject"); - } - } - - public override void OnUpdate() - { - } - - public override void OnStateEnter() - { - if (_impulseSource == null) - { - return; - } - - _impulseSource.GenerateImpulse(); - } - - public override void OnStateExit() - { - } -} diff --git a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs.meta b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs.meta deleted file mode 100644 index 2c21d9cf4..000000000 --- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/CameraShakeActionSO.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b40b49a4fc34a2142a27e6717f6a7827 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset b/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset deleted file mode 100644 index 63b1612b5..000000000 --- a/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset +++ /dev/null @@ -1,88 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b7f59e54f2bfd184b9dd451a678d089b, type: 3} - m_Name: SignalCinemachineImpulseSource_6DShake_PigChef - m_EditorClassIdentifier: - PositionNoise: - - X: - Frequency: 3.2 - Amplitude: 0.011 - Constant: 1 - Y: - Frequency: 1.9 - Amplitude: 0.059 - Constant: 1 - Z: - Frequency: 3.33 - Amplitude: 0.021 - Constant: 1 - - X: - Frequency: 7.7 - Amplitude: 0.009 - Constant: 1 - Y: - Frequency: 9.1 - Amplitude: 0.04 - Constant: 0 - Z: - Frequency: 9.22 - Amplitude: 0.009 - Constant: 1 - - X: - Frequency: 51.51 - Amplitude: 0.002 - Constant: 1 - Y: - Frequency: 55.54 - Amplitude: 0.05 - Constant: 1 - Z: - Frequency: 58.55 - Amplitude: 0.017 - Constant: 1 - OrientationNoise: - - X: - Frequency: 5.83 - Amplitude: 0.09 - Constant: 1 - Y: - Frequency: 1.8 - Amplitude: 0.059 - Constant: 1 - Z: - Frequency: 2.38 - Amplitude: 0.017 - Constant: 1 - - X: - Frequency: 9.17 - Amplitude: 0.14 - Constant: 1 - Y: - Frequency: 11.35 - Amplitude: 0.041 - Constant: 1 - Z: - Frequency: 10.52 - Amplitude: 0.009 - Constant: 1 - - X: - Frequency: 57.17 - Amplitude: 0.15 - Constant: 1 - Y: - Frequency: 54.17 - Amplitude: 0.048 - Constant: 1 - Z: - Frequency: 63.76 - Amplitude: 0.016 - Constant: 1 diff --git a/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset.meta b/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset.meta deleted file mode 100644 index f1c298b52..000000000 --- a/UOP1_Project/Assets/Settings/Presets/SignalCinemachineImpulseSource_6DShake_PigChef.asset.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 41edfbe1c960d7d4e9640e19eadbd2a7 -timeCreated: 1518036470 -licenseType: Pro -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: From eccc8ff29bd40d57b29cfc59cc7bbec210f9b46c Mon Sep 17 00:00:00 2001 From: Hossein Pan Date: Fri, 9 Jul 2021 20:35:10 +0430 Subject: [PATCH 3/3] Ground material detector --- .../Assets/Prefabs/Characters/PigChef.prefab | 279 +++++++++--------- .../ScriptableObjects/Audio/GroundTypes.meta | 8 + .../Audio/GroundTypes/GroundTypeList.asset | 20 ++ .../GroundTypes/GroundTypeList.asset.meta | 8 + .../GroundTypes/GroundType_Cobblestone.asset | 18 ++ .../GroundType_Cobblestone.asset.meta | 8 + .../Audio/GroundTypes/GroundType_Dirt.asset | 18 ++ .../GroundTypes/GroundType_Dirt.asset.meta | 8 + .../Audio/GroundTypes/GroundType_Grass.asset | 18 ++ .../GroundTypes/GroundType_Grass.asset.meta | 8 + .../Audio/GroundTypes/GroundType_Rock.asset | 18 ++ .../GroundTypes/GroundType_Rock.asset.meta | 8 + .../Audio/GroundTypes/GroundType_Sand.asset | 18 ++ .../GroundTypes/GroundType_Sand.asset.meta | 8 + .../Scripts/Audio/AudioData/GroundType.meta | 8 + .../GroundType/GroundTypeDetector.cs | 179 +++++++++++ .../GroundType/GroundTypeDetector.cs.meta | 11 + .../AudioData/GroundType/GroundTypeListSO.cs | 13 + .../GroundType/GroundTypeListSO.cs.meta | 11 + .../AudioData/GroundType/GroundTypeSO.cs | 29 ++ .../AudioData/GroundType/GroundTypeSO.cs.meta | 11 + 21 files changed, 575 insertions(+), 132 deletions(-) create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes.meta create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset.meta create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset.meta create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset.meta create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset.meta create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset.meta create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset create mode 100644 UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset.meta create mode 100644 UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType.meta create mode 100644 UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeDetector.cs create mode 100644 UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeDetector.cs.meta create mode 100644 UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeListSO.cs create mode 100644 UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeListSO.cs.meta create mode 100644 UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeSO.cs create mode 100644 UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeSO.cs.meta diff --git a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab index b901af428..d9aed6b78 100644 --- a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab +++ b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab @@ -402,6 +402,21 @@ MonoBehaviour: position: {x: 0, y: 0, z: 0} rotation: {x: 0, y: 0, z: 0} m_Visible: 1 +--- !u!114 &6650101099884577384 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 309633228405838073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 19a86e2a21c71164d9614311b5e778a4, type: 3} + m_Name: + m_EditorClassIdentifier: + _groundTypeList: {fileID: 11400000, guid: beee5d325e80d2b458985741de411757, type: 2} + _debugMode: 1 + _groundTypeTitle: --- !u!114 &8300318066946783926 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4467,9 +4482,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &1414160192716409753 stripped +--- !u!4 &8291487101514034000 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1958356815571363377, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} @@ -4515,33 +4530,27 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8637924750589673304 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9182121511924208368, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - m_PrefabInstance: {fileID: 616254372594363816} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4758616446005709032 stripped +--- !u!4 &1083073290189785667 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3853004972517743296, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &436620074108784059 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1045485693096927251, guid: c478a391cfbc4b74ebda3f9a57283705, +--- !u!137 &2643181883930254223 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -6042959897766808025, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &7450739070704029045 stripped +--- !u!4 &7479199366626129125 stripped Transform: - m_CorrespondingSourceObject: {fileID: -1158771302699065123, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &5944104996185666453 stripped +--- !u!4 &489423445654532973 stripped Transform: - m_CorrespondingSourceObject: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 1028975834724622021, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} @@ -4557,159 +4566,165 @@ Transform: type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &9049048348530379419 stripped +--- !u!4 &8916725356198928834 stripped Transform: - m_CorrespondingSourceObject: {fileID: -785370636125362381, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -922126996795814806, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &928224351994020785 stripped +--- !u!4 &8237582483159280860 stripped Transform: - m_CorrespondingSourceObject: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &1083073290189785667 stripped +--- !u!4 &5700738674217691736 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &6905220490405268265 stripped +--- !u!4 &8613994902604584134 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &2518796056843120514 stripped +--- !u!4 &1414160192716409753 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 1958356815571363377, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &9121043209303941797 stripped +--- !u!4 &5337852870612368657 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &5337852870612368657 stripped +--- !u!4 &4150588075678938521 stripped Transform: - m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &7646398735186508214 stripped +--- !u!4 &2553538599320838613 stripped Transform: - m_CorrespondingSourceObject: {fileID: -2121169907620178914, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &6251068571708505270 stripped +--- !u!4 &6238229487294904517 stripped Transform: - m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 6782355879607981421, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!137 &2643181883930254223 stripped -SkinnedMeshRenderer: - m_CorrespondingSourceObject: {fileID: -6042959897766808025, guid: c478a391cfbc4b74ebda3f9a57283705, +--- !u!4 &3509300304837266133 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &7479199366626129125 stripped +--- !u!4 &1693530112229282522 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &489423445654532973 stripped +--- !u!4 &2961255287932742051 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1028975834724622021, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8916725356198928834 stripped +--- !u!4 &4323982477642669181 stripped Transform: - m_CorrespondingSourceObject: {fileID: -922126996795814806, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8237582483159280860 stripped +--- !u!4 &7422665375057060625 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8291487101514034000 stripped +--- !u!4 &5616668664904030341 stripped Transform: - m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &5700738674217691736 stripped +--- !u!4 &8764961453140708844 stripped Transform: - m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8613994902604584134 stripped +--- !u!4 &5352552595453864673 stripped Transform: - m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -4411990312409643191, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &4150588075678938521 stripped +--- !u!4 &8865730958858592416 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 8323785998403603720, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &2553538599320838613 stripped +--- !u!4 &313519885195136893 stripped Transform: - m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &2680419760045213584 stripped +--- !u!4 &1780510391696116336 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3296533255824239160, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &6924639228666418553 stripped +--- !u!4 &3597017886523096375 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7535686175401523409, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8746458819780820913 stripped +--- !u!4 &996919128022108076 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8209158195610554905, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &5328577669981913599 stripped +--- !u!4 &7980046698497209273 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4719641836314782807, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &675585260765626204 stripped +--- !u!4 &5338329370284706551 stripped Transform: - m_CorrespondingSourceObject: {fileID: -9084524466672233740, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -4424524600484927649, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &6856479198010907045 stripped +--- !u!4 &722022415557853372 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6316997315383997453, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 182470111581875476, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &7103292230657876148 stripped +--- !u!4 &8520217290748661238 stripped Transform: - m_CorrespondingSourceObject: {fileID: -1576657136440373988, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -94429984831856546, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + m_PrefabInstance: {fileID: 616254372594363816} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8731736048503314800 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} @@ -4719,117 +4734,117 @@ Transform: type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8731736048503314800 stripped +--- !u!4 &7103292230657876148 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -1576657136440373988, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8520217290748661238 stripped +--- !u!4 &6856479198010907045 stripped Transform: - m_CorrespondingSourceObject: {fileID: -94429984831856546, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 6316997315383997453, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &722022415557853372 stripped +--- !u!4 &675585260765626204 stripped Transform: - m_CorrespondingSourceObject: {fileID: 182470111581875476, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -9084524466672233740, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &5338329370284706551 stripped +--- !u!4 &5328577669981913599 stripped Transform: - m_CorrespondingSourceObject: {fileID: -4424524600484927649, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 4719641836314782807, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &7980046698497209273 stripped +--- !u!4 &8746458819780820913 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 8209158195610554905, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &996919128022108076 stripped +--- !u!4 &6924639228666418553 stripped Transform: - m_CorrespondingSourceObject: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 7535686175401523409, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &3597017886523096375 stripped +--- !u!4 &2680419760045213584 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 3296533255824239160, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &1780510391696116336 stripped +--- !u!4 &5944104996185666453 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &313519885195136893 stripped +--- !u!4 &6251068571708505270 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8865730958858592416 stripped +--- !u!4 &7646398735186508214 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8323785998403603720, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -2121169907620178914, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &5352552595453864673 stripped +--- !u!4 &9121043209303941797 stripped Transform: - m_CorrespondingSourceObject: {fileID: -4411990312409643191, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &8764961453140708844 stripped +--- !u!4 &2518796056843120514 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &5616668664904030341 stripped +--- !u!4 &6905220490405268265 stripped Transform: - m_CorrespondingSourceObject: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &7422665375057060625 stripped +--- !u!4 &928224351994020785 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &4323982477642669181 stripped +--- !u!4 &9049048348530379419 stripped Transform: - m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -785370636125362381, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &2961255287932742051 stripped +--- !u!4 &7450739070704029045 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -1158771302699065123, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &1693530112229282522 stripped +--- !u!4 &436620074108784059 stripped Transform: - m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 1045485693096927251, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &3509300304837266133 stripped +--- !u!4 &4758616446005709032 stripped Transform: - m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: -3853004972517743296, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} ---- !u!4 &6238229487294904517 stripped +--- !u!4 &8637924750589673304 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6782355879607981421, guid: c478a391cfbc4b74ebda3f9a57283705, + m_CorrespondingSourceObject: {fileID: 9182121511924208368, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} m_PrefabInstance: {fileID: 616254372594363816} m_PrefabAsset: {fileID: 0} @@ -5007,18 +5022,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5bf7aeff6af6cad4ba9c19219c9841db, type: 3} ---- !u!198 &4839788363397376542 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 6699398188219967595, guid: 5bf7aeff6af6cad4ba9c19219c9841db, - type: 3} - m_PrefabInstance: {fileID: 2293294246731547253} - m_PrefabAsset: {fileID: 0} --- !u!4 &3583992150622067535 stripped Transform: m_CorrespondingSourceObject: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db, type: 3} m_PrefabInstance: {fileID: 2293294246731547253} m_PrefabAsset: {fileID: 0} +--- !u!198 &4839788363397376542 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 6699398188219967595, guid: 5bf7aeff6af6cad4ba9c19219c9841db, + type: 3} + m_PrefabInstance: {fileID: 2293294246731547253} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3384482700167519930 PrefabInstance: m_ObjectHideFlags: 0 @@ -5247,18 +5262,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8a6e96eef53e5a4686f9a85a72fe73b, type: 3} ---- !u!198 &4559447277278735044 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 8368940308521127494, guid: f8a6e96eef53e5a4686f9a85a72fe73b, - type: 3} - m_PrefabInstance: {fileID: 5431934865371800706} - m_PrefabAsset: {fileID: 0} --- !u!4 &5607242278399728533 stripped Transform: m_CorrespondingSourceObject: {fileID: 482719544232312599, guid: f8a6e96eef53e5a4686f9a85a72fe73b, type: 3} m_PrefabInstance: {fileID: 5431934865371800706} m_PrefabAsset: {fileID: 0} +--- !u!198 &4559447277278735044 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 8368940308521127494, guid: f8a6e96eef53e5a4686f9a85a72fe73b, + type: 3} + m_PrefabInstance: {fileID: 5431934865371800706} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6196075796933781866 PrefabInstance: m_ObjectHideFlags: 0 @@ -5593,18 +5608,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a75f6395e1487b344a0ffafad66fc95a, type: 3} ---- !u!198 &3258071037643727441 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 5197471990935564586, guid: a75f6395e1487b344a0ffafad66fc95a, - type: 3} - m_PrefabInstance: {fileID: 7284536550510007163} - m_PrefabAsset: {fileID: 0} --- !u!4 &9135146627525748615 stripped Transform: m_CorrespondingSourceObject: {fileID: 2004471342811329788, guid: a75f6395e1487b344a0ffafad66fc95a, type: 3} m_PrefabInstance: {fileID: 7284536550510007163} m_PrefabAsset: {fileID: 0} +--- !u!198 &3258071037643727441 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 5197471990935564586, guid: a75f6395e1487b344a0ffafad66fc95a, + type: 3} + m_PrefabInstance: {fileID: 7284536550510007163} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8181670996397994228 PrefabInstance: m_ObjectHideFlags: 0 @@ -5674,15 +5689,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, type: 3} ---- !u!198 &334012115255375375 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 8442424470799517435, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, - type: 3} - m_PrefabInstance: {fileID: 8181670996397994228} - m_PrefabAsset: {fileID: 0} --- !u!4 &8517470450379016030 stripped Transform: m_CorrespondingSourceObject: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, type: 3} m_PrefabInstance: {fileID: 8181670996397994228} m_PrefabAsset: {fileID: 0} +--- !u!198 &334012115255375375 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 8442424470799517435, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, + type: 3} + m_PrefabInstance: {fileID: 8181670996397994228} + m_PrefabAsset: {fileID: 0} diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes.meta b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes.meta new file mode 100644 index 000000000..40f414e42 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cae247dff09af9f489f0c9c942cae88e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset new file mode 100644 index 000000000..dc9329900 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5ef327e9d2ae14d84ae2fb2663e81f, type: 3} + m_Name: GroundTypeList + m_EditorClassIdentifier: + groundTypes: + - {fileID: 11400000, guid: 1fb9340ef508e9d4182cbf9a81b63220, type: 2} + - {fileID: 11400000, guid: f2aaed1f1a7a3444b850291a1d1194f5, type: 2} + - {fileID: 11400000, guid: 496d01896c7fcba4e930dcbb33a19369, type: 2} + - {fileID: 11400000, guid: 076ad4d5d656b414a97c1298f2c8402a, type: 2} + - {fileID: 11400000, guid: 1a083b13e087bf5459b1dd0f38422867, type: 2} diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset.meta b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset.meta new file mode 100644 index 000000000..cd5b33ffe --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundTypeList.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: beee5d325e80d2b458985741de411757 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset new file mode 100644 index 000000000..ca74ef238 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3} + m_Name: GroundType_Cobblestone + m_EditorClassIdentifier: + Title: Cobblestone + hasGroundTag: 1 + vertexColorRGB: {x: 0, y: 1, z: 0} + gameObjectTag: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset.meta b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset.meta new file mode 100644 index 000000000..d24f45256 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Cobblestone.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fb9340ef508e9d4182cbf9a81b63220 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset new file mode 100644 index 000000000..f151f5018 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3} + m_Name: GroundType_Dirt + m_EditorClassIdentifier: + Title: Dirt + hasGroundTag: 1 + vertexColorRGB: {x: 1, y: 0, z: 0} + gameObjectTag: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset.meta b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset.meta new file mode 100644 index 000000000..f727ed5c9 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Dirt.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2aaed1f1a7a3444b850291a1d1194f5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset new file mode 100644 index 000000000..5cf0cd9f3 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3} + m_Name: GroundType_Grass + m_EditorClassIdentifier: + Title: Grass + hasGroundTag: 1 + vertexColorRGB: {x: 0, y: 0, z: 0} + gameObjectTag: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset.meta b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset.meta new file mode 100644 index 000000000..3115c04be --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Grass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 496d01896c7fcba4e930dcbb33a19369 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset new file mode 100644 index 000000000..4f7dd1b31 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3} + m_Name: GroundType_Rock + m_EditorClassIdentifier: + Title: Rock + hasGroundTag: 0 + vertexColorRGB: {x: 0, y: 0, z: 0} + gameObjectTag: Rock diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset.meta b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset.meta new file mode 100644 index 000000000..aae468698 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Rock.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 076ad4d5d656b414a97c1298f2c8402a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset new file mode 100644 index 000000000..49ab964c3 --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 389e16317bab1f4448cd1042a39ad65b, type: 3} + m_Name: GroundType_Sand + m_EditorClassIdentifier: + Title: Sand + hasGroundTag: 1 + vertexColorRGB: {x: 0, y: 0, z: 1} + gameObjectTag: diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset.meta b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset.meta new file mode 100644 index 000000000..b2e0a964e --- /dev/null +++ b/UOP1_Project/Assets/ScriptableObjects/Audio/GroundTypes/GroundType_Sand.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a083b13e087bf5459b1dd0f38422867 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType.meta b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType.meta new file mode 100644 index 000000000..2cec0cdee --- /dev/null +++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27677935b1b59ad48a6b92b527150c21 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeDetector.cs b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeDetector.cs new file mode 100644 index 000000000..9e0cc2773 --- /dev/null +++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeDetector.cs @@ -0,0 +1,179 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GroundTypeDetector : MonoBehaviour +{ + [SerializeField] private GroundTypeListSO _groundTypeList = default; + + + [Space] + [Header("Debugger")] + [SerializeField] private bool _debugMode = false; + [SerializeField] private string _groundTypeTitle = default; + + Color vertexColorNearest; + GroundTypeSO _groundType_Debugger = default; + Mesh _mesh; + MeshCollider _meshCollider; + Vector3 p0; + Vector3 p1; + Vector3 p2; + Transform hitTransform; + GroundTypeSO result; + + + + void Start() + { + + } + + + void FixedUpdate() + { + +#if UNITY_EDITOR + DebugGroundType(); +#endif + + } + + private void DebugGroundType() + { + _groundType_Debugger = GetGroundType(); + if (_groundType_Debugger != null) + { + _groundTypeTitle = _groundType_Debugger.Title; + } + else + { + _groundTypeTitle = "Not Defined"; + } + } + + public GroundTypeSO GetGroundType() + { + if (_groundTypeList == null) + { + Debug.LogError("Please Define Ground Types in GroundTypeList ScriptableObject and refrence it to this script component"); + return null; + } + + result = null; + _meshCollider = null; + _mesh = null; + RaycastHit hit; + + void FindNearestVertexColor() + { + p0 = _mesh.vertices[_mesh.triangles[hit.triangleIndex * 3 + 0]]; + p1 = _mesh.vertices[_mesh.triangles[hit.triangleIndex * 3 + 1]]; + p2 = _mesh.vertices[_mesh.triangles[hit.triangleIndex * 3 + 2]]; + + hitTransform = hit.collider.transform; + + p0 = hitTransform.TransformPoint(p0); + p1 = hitTransform.TransformPoint(p1); + p2 = hitTransform.TransformPoint(p2); + + float distance_0 = Vector3.Distance(p0, transform.position); + float distance_1 = Vector3.Distance(p1, transform.position); + float distance_2 = Vector3.Distance(p2, transform.position); + + if (distance_0 <= distance_1 && + distance_0 <= distance_2) + { + vertexColorNearest = _mesh.colors[_mesh.triangles[hit.triangleIndex * 3 + 0]]; + } + else if (distance_1 <= distance_0 && + distance_1 <= distance_2) + { + vertexColorNearest = _mesh.colors[_mesh.triangles[hit.triangleIndex * 3 + 1]]; + } + else + { + vertexColorNearest = _mesh.colors[_mesh.triangles[hit.triangleIndex * 3 + 2]]; + } + + if (_debugMode) + { + Debug.Log("Nearest Vertex Color: " + vertexColorNearest.ToString()); + } + } + + void FindGroundTypeBasedOn_VertexColor() + { + float r_Diffrence; + float g_Diffrence; + float b_Diffrence; + float totalDiffrence; + + float minDiffrence = float.MaxValue; + for (int i = 0; i < _groundTypeList.groundTypes.Length; i++) + { + if (_groundTypeList.groundTypes[i].hasGroundTag) + { + r_Diffrence = Mathf.Abs(vertexColorNearest.r - _groundTypeList.groundTypes[i].vertexColorRGB.x); + g_Diffrence = Mathf.Abs(vertexColorNearest.g - _groundTypeList.groundTypes[i].vertexColorRGB.y); + b_Diffrence = Mathf.Abs(vertexColorNearest.b - _groundTypeList.groundTypes[i].vertexColorRGB.z); + totalDiffrence = r_Diffrence + g_Diffrence + b_Diffrence; + + if (totalDiffrence <= minDiffrence) + { + minDiffrence = totalDiffrence; + result = _groundTypeList.groundTypes[i]; + } + } + } + } + + void FindGroundTypeBasedOn_GameObjectTag() + { + for (int i = 0; i < _groundTypeList.groundTypes.Length; i++) + { + if (_groundTypeList.groundTypes[i].hasGroundTag == false && + hit.transform.CompareTag(_groundTypeList.groundTypes[i].gameObjectTag)) + { + result = _groundTypeList.groundTypes[i]; + break; + } + } + } + + + if(Physics.Raycast(transform.position, Vector3.down, out hit, 50f)) + { + if (hit.transform.CompareTag("Ground")) + { + _meshCollider = hit.collider as MeshCollider; + + if (_meshCollider != null && _meshCollider.sharedMesh != null) + { + _mesh = _meshCollider.sharedMesh; + + if (_mesh.colors.Length > 0) + { + FindNearestVertexColor(); + FindGroundTypeBasedOn_VertexColor(); + } + } + } + else + { + FindGroundTypeBasedOn_GameObjectTag(); + } + + } + + if (result == null) + { + Debug.LogError("This type of ground is not defined in GroundTypeList ScriptableObject"); + } + + return result; + } + + + +} diff --git a/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeDetector.cs.meta b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeDetector.cs.meta new file mode 100644 index 000000000..2d1c048c7 --- /dev/null +++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeDetector.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 19a86e2a21c71164d9614311b5e778a4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeListSO.cs b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeListSO.cs new file mode 100644 index 000000000..2f9a715ab --- /dev/null +++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeListSO.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +/// +/// List of All ground types available in game. +/// +[CreateAssetMenu(fileName = "GroundTypeList", menuName = "Ground Type/Ground Type List")] +public class GroundTypeListSO : ScriptableObject +{ + public GroundTypeSO[] groundTypes = default; +} diff --git a/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeListSO.cs.meta b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeListSO.cs.meta new file mode 100644 index 000000000..30f3807c5 --- /dev/null +++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeListSO.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5b5ef327e9d2ae14d84ae2fb2663e81f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeSO.cs b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeSO.cs new file mode 100644 index 000000000..702edfd68 --- /dev/null +++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeSO.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +/// +/// Ground Type Properties. This will use for detect ground type for footsteps sound. +/// +[CreateAssetMenu(fileName = "newGroundType", menuName = "Ground Type/Ground Type")] + +[SerializeField] +public class GroundTypeSO : ScriptableObject +{ + public string Title; + + [Space] + public bool hasGroundTag; + + [Space] + [Header("If it has Ground tag")] + [Tooltip("This helps to detect the type of ground.")] + public Vector3 vertexColorRGB; + + [Space] + [Header("If it doesn't have Ground tag")] + [Tooltip("This helps to detect the type of ground.")] + public string gameObjectTag; + +} diff --git a/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeSO.cs.meta b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeSO.cs.meta new file mode 100644 index 000000000..adc9d0e4c --- /dev/null +++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/GroundType/GroundTypeSO.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 389e16317bab1f4448cd1042a39ad65b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: