Merge branch 'bugfix/settings-and-vehicles' into 'develop'

Fixed vehicle prefabs and gamesettings bug

See merge request fauchezlegouic/projet-integrateur!401

Wrecking Brawl/Assets/Cars/Prefabs/V2/Models/MUSCLE_v3_text_2.prefab

@@ -684,6 +684,8 @@ MonoBehaviour:
   brakeOnMaterial: {fileID: 2100000, guid: b0fb673290e17b14096d92bf27de4199, type: 2}
   brakeLightsRenderer: {fileID: 3980001326217141208}
   shield: {fileID: 1530598418984531185}
+  customizableMaterial: {fileID: 2100000, guid: 92ed74da84a7e664d8d294f6f8bb0045,
+    type: 2}
 --- !u!114 &1898532462439949835
 MonoBehaviour:
   m_ObjectHideFlags: 0

Wrecking Brawl/Assets/Cars/Prefabs/V2/Models/NASCAR_v4.prefab

@@ -959,7 +959,8 @@ MonoBehaviour:
   brakeOnMaterial: {fileID: 2100000, guid: b0fb673290e17b14096d92bf27de4199, type: 2}
   brakeLightsRenderer: {fileID: 76853278226849836}
   shield: {fileID: 2933040619362178280}
-  customizableMaterial: {fileID: 0}
+  customizableMaterial: {fileID: 2100000, guid: 5e5982c6530abd94daa99687d0f28388,
+    type: 2}
 --- !u!114 &3058658948622271665
 MonoBehaviour:
   m_ObjectHideFlags: 0

Wrecking Brawl/Assets/Cars/Prefabs/V2/Models/Vehicle2.prefab

@@ -959,6 +959,8 @@ MonoBehaviour:
   brakeOnMaterial: {fileID: 2100000, guid: b0fb673290e17b14096d92bf27de4199, type: 2}
   brakeLightsRenderer: {fileID: 3954695776463480090}
   shield: {fileID: 8206736549006792958}
+  customizableMaterial: {fileID: 2100000, guid: a64fc39d12635594ab512958d365c598,
+    type: 2}
 --- !u!114 &3350980876703986545
 MonoBehaviour:
   m_ObjectHideFlags: 0

Wrecking Brawl/Assets/Cars/Prefabs/V2/Models/tanuki.prefab

@@ -915,6 +915,8 @@ MonoBehaviour:
   brakeOnMaterial: {fileID: 2100000, guid: b0fb673290e17b14096d92bf27de4199, type: 2}
   brakeLightsRenderer: {fileID: 7785802982597132312}
   shield: {fileID: 2245993262976378628}
+  customizableMaterial: {fileID: 2100000, guid: f350250de1b11da4f8f6ef6986fbfd9d,
+    type: 2}
 --- !u!114 &247611631114641570
 MonoBehaviour:
   m_ObjectHideFlags: 0

Wrecking Brawl/Assets/Models/Véhicules/Daytona/Materials/Material.mat

@@ -88,7 +88,7 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - Color_F5EC01B6: {r: 0.90588236, g: 0.63529414, b: 0, a: 0.2}
+    - Color_F5EC01B6: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 0.2}
     - _BaseColor: {r: 0.020249316, g: 0, b: 0.06680677, a: 1}
     - _Color: {r: 0.020249316, g: 0, b: 0.06680677, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Wrecking Brawl/Assets/Models/Véhicules/Demolisher/Materials/cadre_mat.mat

@@ -88,7 +88,7 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - Color_F5EC01B6: {r: 0.019607844, g: 0, b: 0.06666667, a: 0.2}
+    - Color_F5EC01B6: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 0.2}
     - _BaseColor: {r: 0.55834055, g: 0.44520116, b: 0.27467734, a: 1}
     - _Color: {r: 0.55834055, g: 0.44520116, b: 0.27467734, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Wrecking Brawl/Assets/Models/Véhicules/Muscle/Car_base.mat

@@ -34,7 +34,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - Texture2D_23FC72E3:
-        m_Texture: {fileID: 2800000, guid: 951d6566e755af84ca5006531da0c4bc, type: 3}
+        m_Texture: {fileID: 2800000, guid: 72768779f2f038a44a2d68ea21ac9306, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseMap:

Wrecking Brawl/Assets/Models/Véhicules/Tanuki/Materials/Car_base.mat

@@ -75,7 +75,7 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - Color_F5EC01B6: {r: 0.1254902, g: 0.11372549, b: 0.11372549, a: 0.2}
+    - Color_F5EC01B6: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 0.2}
     - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
     - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Wrecking Brawl/Assets/Scenes/PROD_testeControlsMobile.meta

-fileFormatVersion: 2
-guid: 7d5f9392fc748334b8b10545f2765ced
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Wrecking Brawl/Assets/Scripts/Game/GameManager.cs

@@ -201,9 +201,14 @@ public class GameManager : Singleton<GameManager>
 
 	public static void Quit()
 	{
-		Instance.networkManager.ClientDisconnect(Communication.Messages.DisconnectionReason.NO_REASON);
+		//Instance.networkManager.ClientDisconnect(Communication.Messages.DisconnectionReason.NO_REASON);
 
 		if (Application.isEditor) Debug.Break();
 		Application.Quit();
 	}
+
+	private void OnApplicationQuit()
+	{
+		Instance.networkManager.ClientDisconnect(Communication.Messages.DisconnectionReason.NO_REASON);
+	}
 }

Wrecking Brawl/Assets/Scripts/Input/InputManager.cs

@@ -52,10 +52,7 @@ public class InputManager : SettingsManager<InputManager>
 	 */
 	public bool LoadBindings()
 	{
-		//var bindingOverrides = PlayerPrefs.GetString(saveRebindsKey, "{}");
-		var overrides = GameSettings.Get<Dictionary<string, object>>(saveRebindsKey, "{}");
-
-		//var overrides = MiniJSON.Json.Deserialize(bindingOverrides) as Dictionary<string, object>;
+		var overrides = GameSettings.Get<Dictionary<string, object>>(saveRebindsKey, new Dictionary<string, string>());
 
 		if (overrides == null || overrides.Count == 0)
 		{

Wrecking Brawl/Assets/Scripts/Network/NetworkManager.cs

@@ -678,12 +678,15 @@ public class NetworkManager : MonoBehaviour
 			);
 		}
 
-		// Close connection
-		_client.Send(new DisconnectionMessage());
-		_client.Flush();
-		_client.NewMessageEvent -= MessageQueue;
-		_clientConnection.Close();
-		_client = null;
+		if (_client != null)
+		{
+			// Close connection
+			_client.Send(new DisconnectionMessage());
+			_client.Flush();
+			_client.NewMessageEvent -= MessageQueue;
+			_clientConnection.Close();
+			_client = null;
+		}
 
 		ClearPlayerInfo();
 		Connected = false;