From e960e7fce9fbcedac58acf8842c9c0728a34152b Mon Sep 17 00:00:00 2001 From: Vladdie <71079139+Vladdie-byte@users.noreply.github.com> Date: Fri, 29 Apr 2022 20:04:09 -0500 Subject: [PATCH] updates to archer/ui buttons --- .../Prefabs/Environment/Archer/Archer.prefab | 4 + Assets/Scenes/Controls.unity | 485 ++++++++++++++++++ Assets/Scenes/Credits.unity | 443 ++++++++++++++++ Assets/Scenes/Game-Mountain.unity | 70 +-- Assets/Scenes/Lobby.unity | 12 +- Assets/Scenes/Options.unity | 12 +- Assets/Scenes/TitleScene.unity | 14 +- Assets/Scripts/Enemy scripts/Arrow.cs | 2 +- UserSettings/EditorUserSettings.asset | 26 +- 9 files changed, 1000 insertions(+), 68 deletions(-) diff --git a/Assets/Prefabs/Environment/Archer/Archer.prefab b/Assets/Prefabs/Environment/Archer/Archer.prefab index c259989..ce90c98 100644 --- a/Assets/Prefabs/Environment/Archer/Archer.prefab +++ b/Assets/Prefabs/Environment/Archer/Archer.prefab @@ -912,6 +912,10 @@ PrefabInstance: propertyPath: m_Name value: Arrow objectReference: {fileID: 0} + - target: {fileID: 26604539265034266, guid: 0e61ec06fdabb014bb1868596534f8b7, type: 3} + propertyPath: speed + value: 90 + objectReference: {fileID: 0} - target: {fileID: 26604539265034267, guid: 0e61ec06fdabb014bb1868596534f8b7, type: 3} propertyPath: m_RootOrder value: 9 diff --git a/Assets/Scenes/Controls.unity b/Assets/Scenes/Controls.unity index b4c3946..1944db3 100644 --- a/Assets/Scenes/Controls.unity +++ b/Assets/Scenes/Controls.unity @@ -1531,6 +1531,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 288445782} m_CullTransparentMesh: 1 +--- !u!1 &348889849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 348889851} + - component: {fileID: 348889850} + m_Layer: 0 + m_Name: ButtonHover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &348889850 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 348889849} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f3337b88e20674642a9d19171068eedf, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.5 + 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!4 &348889851 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 348889849} + 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: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &356356467 GameObject: m_ObjectHideFlags: 0 @@ -2268,6 +2395,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 474284780} m_CullTransparentMesh: 1 +--- !u!1 &477706828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 477706830} + - component: {fileID: 477706829} + m_Layer: 0 + m_Name: ButtonSelect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &477706829 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 477706828} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1c7c0e77f9d86f246a98035477e22afa, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.5 + 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!4 &477706830 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 477706828} + 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: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &500876468 GameObject: m_ObjectHideFlags: 0 @@ -3728,6 +3982,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 837643339} m_CullTransparentMesh: 1 +--- !u!1 &841986625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 841986627} + - component: {fileID: 841986626} + m_Layer: 0 + m_Name: ButtonBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &841986626 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 841986625} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 21333c8c82f2ff24bbfb0194f8835a84, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.5 + 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!4 &841986627 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 841986625} + 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: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &850827623 GameObject: m_ObjectHideFlags: 0 @@ -6570,10 +6951,38 @@ PrefabInstance: propertyPath: warningBox value: objectReference: {fileID: 858022454} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 477706829} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: backToSettings objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 4215836264082284894, guid: f9007eec4604c3042ac96f526d59b667, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6669,6 +7078,40 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4215836264082284894, guid: f9007eec4604c3042ac96f526d59b667, type: 3} m_PrefabInstance: {fileID: 1592956672} m_PrefabAsset: {fileID: 0} +--- !u!1 &1592956674 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4215836264082284895, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + m_PrefabInstance: {fileID: 1592956672} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1592956675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592956674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 348889850} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1596159898 GameObject: m_ObjectHideFlags: 0 @@ -9060,6 +9503,7 @@ GameObject: - component: {fileID: 2103757803} - component: {fileID: 2103757808} - component: {fileID: 2103757807} + - component: {fileID: 2103757809} m_Layer: 5 m_Name: SwapControls m_TagString: Untagged @@ -9169,6 +9613,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 477706829} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &2103757805 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9254,6 +9710,35 @@ Rigidbody2D: m_SleepingMode: 0 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &2103757809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103757801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 348889850} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &18495537601588811 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Credits.unity b/Assets/Scenes/Credits.unity index f9ea524..d7caee4 100644 --- a/Assets/Scenes/Credits.unity +++ b/Assets/Scenes/Credits.unity @@ -370,6 +370,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 248713135} m_CullTransparentMesh: 1 +--- !u!1 &274370809 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 274370811} + - component: {fileID: 274370810} + m_Layer: 0 + m_Name: ButtonBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &274370810 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 274370809} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 21333c8c82f2ff24bbfb0194f8835a84, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.5 + 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!4 &274370811 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 274370809} + 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: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &603959124 GameObject: m_ObjectHideFlags: 0 @@ -1068,6 +1195,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1123979486} m_CullTransparentMesh: 1 +--- !u!1 &1341153913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1341153915} + - component: {fileID: 1341153914} + m_Layer: 0 + m_Name: ButtonSelect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1341153914 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341153913} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1c7c0e77f9d86f246a98035477e22afa, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.5 + 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!4 &1341153915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341153913} + 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: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1402068016 GameObject: m_ObjectHideFlags: 0 @@ -1909,6 +2163,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1887992841} m_CullTransparentMesh: 1 +--- !u!1 &1908049277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1908049279} + - component: {fileID: 1908049278} + m_Layer: 0 + m_Name: ButtonHover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1908049278 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1908049277} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f3337b88e20674642a9d19171068eedf, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.5 + 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!4 &1908049279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1908049277} + 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: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4215836263446113975 PrefabInstance: m_ObjectHideFlags: 0 @@ -1916,6 +2297,34 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1123979487} m_Modifications: + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 274370810} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 4215836264082284894, guid: f9007eec4604c3042ac96f526d59b667, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2006,3 +2415,37 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9007eec4604c3042ac96f526d59b667, type: 3} +--- !u!1 &4215836263446113976 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4215836264082284895, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + m_PrefabInstance: {fileID: 4215836263446113975} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4215836263446113977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4215836263446113976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1908049278} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index 3ebb024..29aa597 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -1616,7 +1616,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -1680,7 +1680,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -9259,7 +9259,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -9323,7 +9323,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -10170,7 +10170,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -20472,7 +20472,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -20536,7 +20536,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -25629,7 +25629,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_RootOrder - value: 9 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_LocalPosition.x @@ -25891,7 +25891,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -37397,7 +37397,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -50428,7 +50428,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -50492,7 +50492,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -61522,7 +61522,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -62659,7 +62659,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -68476,7 +68476,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -68540,7 +68540,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -69061,7 +69061,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -69125,7 +69125,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -95374,7 +95374,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -135028,7 +135028,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -159548,7 +159548,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -172126,7 +172126,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_RootOrder - value: 11 + value: 7 objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_LocalPosition.x @@ -186883,7 +186883,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -211486,7 +211486,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -235487,7 +235487,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_RootOrder - value: 10 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_LocalPosition.x @@ -244720,7 +244720,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -244784,7 +244784,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -246722,7 +246722,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_RootOrder - value: 8 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_LocalPosition.x @@ -260922,7 +260922,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -260986,7 +260986,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -267462,7 +267462,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -292212,7 +292212,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -306192,7 +306192,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -306256,7 +306256,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689294808140859936, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: fireRate - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6689294808140859937, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_Name @@ -327329,7 +327329,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 55 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index dfeb3c4..07e20ae 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -151,8 +151,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 21333c8c82f2ff24bbfb0194f8835a84, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 @@ -288,8 +288,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: f3337b88e20674642a9d19171068eedf, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 @@ -730,8 +730,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c7c0e77f9d86f246a98035477e22afa, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Scenes/Options.unity b/Assets/Scenes/Options.unity index cffae22..3bf749b 100644 --- a/Assets/Scenes/Options.unity +++ b/Assets/Scenes/Options.unity @@ -340,8 +340,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: f3337b88e20674642a9d19171068eedf, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 @@ -577,8 +577,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 21333c8c82f2ff24bbfb0194f8835a84, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 @@ -1166,8 +1166,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c7c0e77f9d86f246a98035477e22afa, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index 85db68b..adea266 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.8674563, g: 0.8218122, b: 0.7859322, a: 1} + m_IndirectSpecularColor: {r: 0.8672222, g: 0.82182354, b: 0.78585345, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -2324,8 +2324,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 1c7c0e77f9d86f246a98035477e22afa, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 @@ -3462,8 +3462,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 21333c8c82f2ff24bbfb0194f8835a84, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 @@ -3665,8 +3665,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: f3337b88e20674642a9d19171068eedf, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Scripts/Enemy scripts/Arrow.cs b/Assets/Scripts/Enemy scripts/Arrow.cs index ec84055..6544626 100644 --- a/Assets/Scripts/Enemy scripts/Arrow.cs +++ b/Assets/Scripts/Enemy scripts/Arrow.cs @@ -66,7 +66,7 @@ public class Arrow : NetworkBehaviour { void OnTriggerEnter(Collider objectHit) { if (objectHit != null) { return; } - if (objectHit.transform.parent.gameObject.tag == "Player") { + if (objectHit.gameObject.tag == "ArcherTarget") { //Checks if the other object is the player MoveStateManager playerMovement = objectHit.GetComponent(); diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 1ffce13..82661be 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,23 +6,23 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a - flags: 0 - RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a - flags: 0 - RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b180b651f3c272428041c30eae93a3dd6e225fda92f31352d1b flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c731f1415016439262f2434 + flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 @@ -30,10 +30,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 vcSharedLogLevel: value: 0d5e400f0650