diff --git a/Assets/Prefabs/King/TempBumper.prefab b/Assets/Prefabs/King/TempBumper.prefab index 5f4e3d0..08200c4 100644 --- a/Assets/Prefabs/King/TempBumper.prefab +++ b/Assets/Prefabs/King/TempBumper.prefab @@ -1,5 +1,132 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &478499754020412463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1959958561732208720} + - component: {fileID: 8067585669408531801} + m_Layer: 19 + m_Name: bumpNoise + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1959958561732208720 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 478499754020412463} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7334268124744262400} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8067585669408531801 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 478499754020412463} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + 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 &5019352696064972879 MonoBehaviour: m_ObjectHideFlags: 0 @@ -104,6 +231,10 @@ PrefabInstance: propertyPath: m_Layer value: 18 objectReference: {fileID: 0} + - target: {fileID: 7202565981442459797, guid: 779115152a7c03340ab739e77b4eab49, type: 3} + propertyPath: bumpNoise + value: + objectReference: {fileID: 8067585669408531801} - target: {fileID: 8513270710366443798, guid: 779115152a7c03340ab739e77b4eab49, type: 3} propertyPath: m_IsTrigger value: 1 @@ -117,3 +248,8 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6693924812654725878, guid: 779115152a7c03340ab739e77b4eab49, type: 3} m_PrefabInstance: {fileID: 3409778990194893120} m_PrefabAsset: {fileID: 0} +--- !u!4 &7334268124744262400 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5375461689996214848, guid: 779115152a7c03340ab739e77b4eab49, type: 3} + m_PrefabInstance: {fileID: 3409778990194893120} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index 99960fe..2e2a184 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -68536,7 +68536,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 469369229} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4600, y: -600, z: 175} + m_LocalPosition: {x: -4600, y: 0, z: 175} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 872262141} @@ -68552,9 +68552,9 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5bd2649bfb5b004c93878ebddbe2f80, type: 3} m_PlayOnAwake: 1 - m_Volume: 0.65 + m_Volume: 0.45 m_Pitch: 1 Loop: 1 Mute: 0 @@ -68562,10 +68562,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 8000 + MinDistance: 4586.5596 + MaxDistance: 4586.5596 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 1 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -131216,7 +131216,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 836228833} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4600, y: -600, z: 175} + m_LocalPosition: {x: -4600, y: 0, z: 175} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 872262141} @@ -131232,9 +131232,9 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 531accee1c4e0bd49afbfc9ae9a445b8, type: 3} m_PlayOnAwake: 1 - m_Volume: 0.65 + m_Volume: 0.45 m_Pitch: 1 Loop: 1 Mute: 0 @@ -131242,10 +131242,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 2000 + MinDistance: 20 + MaxDistance: 236.9284 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 1 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -333103,7 +333103,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2085762870 Transform: m_ObjectHideFlags: 0 @@ -333112,7 +333112,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2085762869} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4600, y: -600, z: 175} + m_LocalPosition: {x: -4600, y: 0, z: 175} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 872262141} @@ -333125,12 +333125,12 @@ AudioSource: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2085762869} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 7fed9cad7f8797f49b2dc2be89eca2d9, type: 3} m_PlayOnAwake: 1 - m_Volume: 0.65 + m_Volume: 0.45 m_Pitch: 1 Loop: 1 Mute: 0 @@ -333138,10 +333138,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 3400 + MinDistance: 2136.4277 + MaxDistance: 2136.4277 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 1 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 diff --git a/Assets/Scripts/AnimationManager.cs b/Assets/Scripts/AnimationManager.cs index f6faea2..609f4df 100644 --- a/Assets/Scripts/AnimationManager.cs +++ b/Assets/Scripts/AnimationManager.cs @@ -68,7 +68,7 @@ public class AnimationManager : NetworkBehaviour highestPriority = 3; } //if current state in aerialManager is not grounded - else if (aerialState.currentState.GetType() == typeof(AerialJumpingState) || aerialState.currentState.GetType() == typeof(AerialFallingState) || aerialState.currentState.GetType() == typeof(dAerialWallRunState) || aerialState.currentState.GetType() == typeof(AerialGrappleAirState) || aerialState.currentState.GetType() == typeof(AerialGlidingState)) + else if (aerialState.currentState.GetType() == typeof(AerialJumpingState) || aerialState.currentState.GetType() == typeof(AerialFallingState) || aerialState.currentState.GetType() == typeof(AerialWallRunState) || aerialState.currentState.GetType() == typeof(AerialGrappleAirState) || aerialState.currentState.GetType() == typeof(AerialGlidingState)) { highestPriority = 2; } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b5d9852..ff41f0a 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b180b651f3c272428041c30eae93a3dd6e225fda92f31352d1b - flags: 0 - RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 - flags: 0 - RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 + RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 + flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a flags: 0 RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 vcSharedLogLevel: value: 0d5e400f0650