diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index cbbf120..99960fe 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -10110,6 +10110,10 @@ PrefabInstance: propertyPath: m_Name value: ArcherTower objectReference: {fileID: 0} + - target: {fileID: 2829059010708695621, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_RootOrder value: 0 @@ -14556,6 +14560,7 @@ GameObject: - component: {fileID: 130254333} - component: {fileID: 130254332} - component: {fileID: 130254331} + - component: {fileID: 130254334} m_Layer: 0 m_Name: WindSys (2) m_TagString: WindSystem @@ -19377,6 +19382,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &130254334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 130254330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76ec7f4abf3a38f47a8c177ed4a94116, type: 3} + m_Name: + m_EditorClassIdentifier: + windDireciton: {x: 0, y: 0, z: 0} --- !u!1001 &130942381 PrefabInstance: m_ObjectHideFlags: 0 @@ -53163,6 +53181,7 @@ GameObject: - component: {fileID: 377267355} - component: {fileID: 377267354} - component: {fileID: 377267353} + - component: {fileID: 377267356} m_Layer: 0 m_Name: WindSys (3) m_TagString: WindSystem @@ -57984,6 +58003,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &377267356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377267352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76ec7f4abf3a38f47a8c177ed4a94116, type: 3} + m_Name: + m_EditorClassIdentifier: + windDireciton: {x: 0, y: 0, z: 0} --- !u!1 &377349553 GameObject: m_ObjectHideFlags: 0 @@ -64065,7 +64097,7 @@ Transform: m_Children: - {fileID: 1642884612} m_Father: {fileID: 1884048514} - m_RootOrder: 84 + m_RootOrder: 85 m_LocalEulerAnglesHint: {x: 0, y: -105, z: 0} --- !u!23 &432384648 MeshRenderer: @@ -133122,7 +133154,7 @@ Transform: m_Children: - {fileID: 1890438312} m_Father: {fileID: 1884048514} - m_RootOrder: 81 + m_RootOrder: 82 m_LocalEulerAnglesHint: {x: -11.246, y: -120.65, z: 6.592} --- !u!23 &853558320 MeshRenderer: @@ -166939,6 +166971,7 @@ GameObject: - component: {fileID: 1107700336} - component: {fileID: 1107700335} - component: {fileID: 1107700334} + - component: {fileID: 1107700337} m_Layer: 0 m_Name: WindSys (1) m_TagString: WindSystem @@ -171760,6 +171793,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1107700337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1107700333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76ec7f4abf3a38f47a8c177ed4a94116, type: 3} + m_Name: + m_EditorClassIdentifier: + windDireciton: {x: 0, y: 0, z: 0} --- !u!1001 &1108309324 PrefabInstance: m_ObjectHideFlags: 0 @@ -175220,6 +175266,7 @@ GameObject: - component: {fileID: 1131580174} - component: {fileID: 1131580173} - component: {fileID: 1131580172} + - component: {fileID: 1131580175} m_Layer: 0 m_Name: WindSys m_TagString: WindSystem @@ -180041,6 +180088,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1131580175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1131580171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76ec7f4abf3a38f47a8c177ed4a94116, type: 3} + m_Name: + m_EditorClassIdentifier: + windDireciton: {x: 0, y: 0, z: 0} --- !u!1 &1131696463 GameObject: m_ObjectHideFlags: 0 @@ -247410,6 +247470,10 @@ PrefabInstance: propertyPath: m_Name value: ArcherTower (4) objectReference: {fileID: 0} + - target: {fileID: 2829059010708695621, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3173074572158742783, guid: a67c0448767220243a6a8dc3624c9b77, type: 3} propertyPath: m_RootOrder value: 4 @@ -305783,6 +305847,7 @@ Transform: - {fileID: 1784366752} - {fileID: 349630636} - {fileID: 226530189} + - {fileID: 1926694603} - {fileID: 853558319} - {fileID: 1898081549} - {fileID: 2081436691} @@ -307840,7 +307905,7 @@ Transform: m_Children: - {fileID: 1577660290} m_Father: {fileID: 1884048514} - m_RootOrder: 82 + m_RootOrder: 83 m_LocalEulerAnglesHint: {x: -11.246, y: -120.65, z: 6.592} --- !u!23 &1898081550 MeshRenderer: @@ -310548,6 +310613,52 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1926388585} m_Mesh: {fileID: -5750084716789328873, guid: 2515724f3e268054f953e1a377fcc105, type: 3} +--- !u!1001 &1926694602 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1884048514} + m_Modifications: + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_RootOrder + value: 81 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalPosition.x + value: -4434 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalPosition.y + value: 388.4 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalPosition.z + value: 870 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150145139066044112, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + propertyPath: m_Name + value: Grappling Hook Point (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} +--- !u!4 &1926694603 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2150145139066044109, guid: daebaf6273c9a184baebfcc6b0894c9d, type: 3} + m_PrefabInstance: {fileID: 1926694602} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1926879829 PrefabInstance: m_ObjectHideFlags: 0 @@ -313478,7 +313589,7 @@ Transform: m_Children: - {fileID: 89349977} m_Father: {fileID: 1884048514} - m_RootOrder: 85 + m_RootOrder: 86 m_LocalEulerAnglesHint: {x: 0, y: 141.251, z: 0} --- !u!23 &1953047926 MeshRenderer: @@ -332449,7 +332560,7 @@ Transform: m_Children: - {fileID: 356597571} m_Father: {fileID: 1884048514} - m_RootOrder: 83 + m_RootOrder: 84 m_LocalEulerAnglesHint: {x: -7.329, y: 180, z: 0} --- !u!23 &2081436692 MeshRenderer: diff --git a/Assets/Scripts/PlayerScripts/PlayerStats.cs b/Assets/Scripts/PlayerScripts/PlayerStats.cs index 62d9c28..95fbaa3 100644 --- a/Assets/Scripts/PlayerScripts/PlayerStats.cs +++ b/Assets/Scripts/PlayerScripts/PlayerStats.cs @@ -279,8 +279,8 @@ public class PlayerStats : MonoBehaviour weatherOn = false; - acc *= (1/tractionModification); - traction *= (1/accModification); + acc *= (1/accModification); + traction *= (1/tractionModification); curTraction *= (1/tractionModification); diff --git a/Assets/Scripts/UI/WeatherWheel.cs b/Assets/Scripts/UI/WeatherWheel.cs index 5ab67b4..552c264 100644 --- a/Assets/Scripts/UI/WeatherWheel.cs +++ b/Assets/Scripts/UI/WeatherWheel.cs @@ -17,9 +17,6 @@ public class WeatherWheel : NetworkBehaviour { private float weatherDuration = 20f; private float postWeatherCooldown = 10f; - public AudioSource fogJingle; - public AudioSource snowJingle; - void Start() { gameObject.GetComponent().enabled = false; pointer.SetActive(false); @@ -79,7 +76,6 @@ public class WeatherWheel : NetworkBehaviour { Vector3 windDirection = new Vector3(Random.Range(-1f, 1f), 0f, Random.Range(-1f, 1f)); SpawnWeatherServerRPC(PlayerStats.Weather.Wind, windDirection); - //wind sound // Set angle back to centered transform.localRotation = Quaternion.Euler(0, 0, 0); @@ -89,9 +85,6 @@ public class WeatherWheel : NetworkBehaviour { // Snow SpawnWeatherServerRPC(PlayerStats.Weather.Snow); - //snow jingle - snowJingle.Play(); - // Set angle back to centered transform.localRotation = Quaternion.Euler(0, 0, 90); } @@ -108,9 +101,6 @@ public class WeatherWheel : NetworkBehaviour { // Fog SpawnWeatherServerRPC(PlayerStats.Weather.Fog); - //fog jingle - fogJingle.Play(); - // Set angle back to centered transform.localRotation = Quaternion.Euler(0, 0, 270); } @@ -179,7 +169,7 @@ public class WeatherWheel : NetworkBehaviour { go.GetComponent().Play(); // Also store the wind direction - go.GetComponent().windDireciton = windDir; + go.GetComponent().windDireciton = windDir; } break; case PlayerStats.Weather.Fog: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index aec687f..68d85c4 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,31 +6,31 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 + value: 22424703114646680e0b0227036c7b151b180b651f3c272428041c30eae93a3dd6e225fda92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a - flags: 0 - RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb