Testing the Audio main merge

GGK/Assets/Animation/AnimationControllers/DiningController.controller

@@ -31,23 +31,23 @@ BlendTree:
   m_Name: Blend Tree
   m_Childs:
   - serializedVersion: 2
-    m_Motion: {fileID: -3100369314251171874, guid: 48f3caee7fad21d43a611b0ed72a625e, type: 3}
+    m_Motion: {fileID: -3100369314251171874, guid: c7cab5e66d4712f4d906113bca0e6341, type: 3}
     m_Threshold: 0
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: -3332656750375472118, guid: 48f3caee7fad21d43a611b0ed72a625e, type: 3}
+    m_Motion: {fileID: -3332656750375472118, guid: c7cab5e66d4712f4d906113bca0e6341, type: 3}
     m_Threshold: 0.25
     m_Position: {x: 0.7, y: 0.7}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 2242093226116659609, guid: 48f3caee7fad21d43a611b0ed72a625e, type: 3}
+    m_Motion: {fileID: 2242093226116659609, guid: c7cab5e66d4712f4d906113bca0e6341, type: 3}
     m_Threshold: 0.5
     m_Position: {x: -0.7, y: -0.7}
     m_TimeScale: 1

GGK/Assets/Animation/AnimationControllers/GizmoController.controller

@@ -31,39 +31,39 @@ BlendTree:
   m_Name: Blend Tree
   m_Childs:
   - serializedVersion: 2
-    m_Motion: {fileID: -3100369314251171874, guid: 397197582d86edf4c8698bfa08fdb4b2, type: 3}
+    m_Motion: {fileID: -3100369314251171874, guid: b23efd17262f40a4bb0107971e0a4bc9, type: 3}
     m_Threshold: 0
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: -3332656750375472118, guid: 397197582d86edf4c8698bfa08fdb4b2, type: 3}
+    m_Motion: {fileID: -3332656750375472118, guid: b23efd17262f40a4bb0107971e0a4bc9, type: 3}
     m_Threshold: 0.25
     m_Position: {x: 0.7, y: 0.7}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 2242093226116659609, guid: 397197582d86edf4c8698bfa08fdb4b2, type: 3}
+    m_Motion: {fileID: 2242093226116659609, guid: b23efd17262f40a4bb0107971e0a4bc9, type: 3}
     m_Threshold: 0.5
     m_Position: {x: -0.7, y: -0.7}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: -4867271923309767793, guid: 397197582d86edf4c8698bfa08fdb4b2, type: 3}
+    m_Motion: {fileID: -4867271923309767793, guid: b23efd17262f40a4bb0107971e0a4bc9, type: 3}
     m_Threshold: 0.75
     m_Position: {x: -1.4, y: -1.4}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 4237265332130688531, guid: 397197582d86edf4c8698bfa08fdb4b2, type: 3}
+    m_Motion: {fileID: 4237265332130688531, guid: b23efd17262f40a4bb0107971e0a4bc9, type: 3}
     m_Threshold: 1
     m_Position: {x: 1.4, y: 1.4}
     m_TimeScale: 1

GGK/Assets/Animation/AnimationControllers/JamsterController.controller

@@ -57,15 +57,15 @@ BlendTree:
   - serializedVersion: 2
     m_Motion: {fileID: 4237265332130688531, guid: 06f010f73d6773b45890e83f56a91dd0, type: 3}
     m_Threshold: 0.75
-    m_Position: {x: -1, y: -1}
+    m_Position: {x: 1, y: 1}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
     m_Motion: {fileID: -4867271923309767793, guid: 06f010f73d6773b45890e83f56a91dd0, type: 3}
     m_Threshold: 1
-    m_Position: {x: 1, y: 1}
+    m_Position: {x: -1, y: -1}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend

GGK/Assets/Animation/AnimationControllers/KaiController.controller

@@ -31,41 +31,41 @@ BlendTree:
   m_Name: Blend Tree
   m_Childs:
   - serializedVersion: 2
-    m_Motion: {fileID: -3100369314251171874, guid: 48f3caee7fad21d43a611b0ed72a625e, type: 3}
+    m_Motion: {fileID: -3100369314251171874, guid: 25cbb667ee06d3c40aac23f4231c0b4b, type: 3}
     m_Threshold: 0
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: -3332656750375472118, guid: 48f3caee7fad21d43a611b0ed72a625e, type: 3}
+    m_Motion: {fileID: -3332656750375472118, guid: 25cbb667ee06d3c40aac23f4231c0b4b, type: 3}
     m_Threshold: 0.25
     m_Position: {x: 0.7, y: 0.7}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 2242093226116659609, guid: 48f3caee7fad21d43a611b0ed72a625e, type: 3}
+    m_Motion: {fileID: 2242093226116659609, guid: 25cbb667ee06d3c40aac23f4231c0b4b, type: 3}
     m_Threshold: 0.5
     m_Position: {x: -0.7, y: -0.7}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: -4867271923309767793, guid: c7cab5e66d4712f4d906113bca0e6341, type: 3}
+    m_Motion: {fileID: -4867271923309767793, guid: 25cbb667ee06d3c40aac23f4231c0b4b, type: 3}
     m_Threshold: 0.75
-    m_Position: {x: 1, y: 1}
+    m_Position: {x: -1, y: -1}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 4237265332130688531, guid: c7cab5e66d4712f4d906113bca0e6341, type: 3}
+    m_Motion: {fileID: 4237265332130688531, guid: 25cbb667ee06d3c40aac23f4231c0b4b, type: 3}
     m_Threshold: 1
-    m_Position: {x: -1, y: -1}
+    m_Position: {x: 1, y: 1}
     m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Blend

GGK/Assets/AppearanceSettings.cs

@@ -10,7 +10,8 @@ public class AppearanceSettings : NetworkBehaviour
     public Sprite icon;
     public Color color;
     public string kartName;
-    //public Material kartColor;
+
+    public Renderer renderer;
 
     public List<GameObject> models; // List of GameObjects representing different character models
     CharacterData characterData; // Reference to CharacterData script
@@ -60,17 +61,28 @@ public void UpdateAppearance()
 
     public void UpdateModel()
     {
-        //if(color != null)
-        //{
-        //    kartColor.color = color; // Set the kart's color material to the selected color
-        //}
+        if (color != null && GetComponent<NEWDriver>())
+        {
+            Material[] materials = renderer.materials;
+
+            // Create a new instance of the existing material so we don't modify the shared one
+            Material newMaterial = new Material(materials[3]);
+            newMaterial.color = color;
+
+            // Replace the old material in the array
+            materials[3] = newMaterial;
+
+            // Assign the array back to the renderer
+            renderer.materials = materials;
+        }
+
         // Set correct character model active
         if (models != null)
         {
             for (int i = 0; i < models.Count; i++)
             {
                 //Setting active correct model
-                if (name == models[i].name || CharacterBuilder.ModelToName(name) == models[i].name)
+                if (name == models[i].name)
                 {
                     models[i].SetActive(true);
                     break;

GGK/Assets/DeathZone.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using Unity.Netcode;
 using UnityEngine;
 
 public class DeathZone : MonoBehaviour
@@ -8,7 +9,21 @@ public class DeathZone : MonoBehaviour
     private void OnTriggerEnter(Collider other)
     {
         if (other.CompareTag("Kart"))
-        {          
+        {
+            if (other.transform.parent.GetChild(0).TryGetComponent<NEWDriver>(out NEWDriver kart))
+            {
+                if (MultiplayerManager.Instance.IsMultiplayer)
+                {
+                    if (kart.OwnerClientId == NetworkManager.Singleton.LocalClientId)
+                    {
+                        kart.IncrementFellOffMapRpc();
+                    }
+                }
+                else
+                {
+                    kart.playerInfo.fellOffMap++;
+                }
+            }
 
             DynamicRecovery recovery = other.GetComponent<DynamicRecovery>();
             if (recovery != null)
@@ -17,8 +32,6 @@ private void OnTriggerEnter(Collider other)
                 recovery.StartRecovery();
 
             }
-
-            other.GetComponent<NEWDriver>().playerInfo.fellOffMap++;
         }
     }
 

GGK/Assets/Images/Debug/Materials/squirrelDisintegrating.mat

@@ -0,0 +1,133 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2737923563161712881
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: squirrelDisintegrating
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 123d6e1633effc4498cd5f7561ecf254, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 123d6e1633effc4498cd5f7561ecf254, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []