Merge branch 'ActuallyMoveGrapple'

2026-09-11 03:45:21 -05:00 · 2022-05-01 00:04:47 -05:00
parent b021db4338 8e3dfdb9c2
commit 2bba6bbaa6
17 changed files with 775 additions and 22 deletions
--- a/Assets/Prefabs/King/kingCursor.prefab
+++ b/Assets/Prefabs/King/kingCursor.prefab
@@ -38,7 +38,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 16.871477, y: 40.819946}
-  m_SizeDelta: {x: 70, y: 70}
+  m_SizeDelta: {x: 50, y: 50}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1659762132620482748
 CanvasRenderer:
@@ -61,16 +61,16 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 8882251455786784145, guid: d9ad7c581c228cb41a8a3d72db1d9ad0, type: 3}
  m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
  m_FillCenter: 1
  m_FillMethod: 4
  m_FillAmount: 1
--- a/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab
+++ b/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab
@@ -590,6 +590,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4641502454356007196}
+  - {fileID: 7008165214999136213}
  - {fileID: 3664469140520897471}
  - {fileID: 855666514563682740}
  m_Father: {fileID: 5812657890528605903}
@@ -5279,7 +5280,7 @@ Transform:
  m_Children:
  - {fileID: 2190073626933027295}
  m_Father: {fileID: 6107527997929964892}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7436209311881506612
 GameObject:
@@ -7249,7 +7250,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3}
      propertyPath: m_LocalScale.x
@@ -7318,3 +7319,81 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3}
  m_PrefabInstance: {fileID: 8388684436150958510}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8576812810463284274
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6107527997929964892}
+    m_Modifications:
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.00008
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.00008
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.00008
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.0058
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.0014
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7660445
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.6427876
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -180
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2093932219337445725, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_Name
+      value: KR_Model_PaperGlider_FinalVer_Vang
+      objectReference: {fileID: 0}
+    - target: {fileID: 2093932219337445725, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+--- !u!4 &7008165214999136213 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3}
+  m_PrefabInstance: {fileID: 8576812810463284274}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab
+++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab
@@ -5298,6 +5298,7 @@ MonoBehaviour:
  handController: {fileID: 8180634872082948009}
  handPosition: {fileID: 1297835615514477272}
  removeableHand: {fileID: 2040784287476203616}
+  glider: {fileID: 6875021042914849118}
  moveController: {fileID: 0}
  animator: {fileID: 0}
  pStats: {fileID: 0}
--- a/Assets/Racer/Animations/RunnerAnimator.controller
+++ b/Assets/Racer/Animations/RunnerAnimator.controller
@@ -3567,7 +3567,7 @@ AnimatorState:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GlidingState
-  m_Speed: 5
+  m_Speed: 16
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 5139486948372686744}
--- a/Assets/Scenes/Demos/MovementScene.unity
+++ b/Assets/Scenes/Demos/MovementScene.unity
@@ -693,7 +693,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &294252281
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -1534,6 +1534,11 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &602949031 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7640868647639293295, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+  m_PrefabInstance: {fileID: 4756939987922741697}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &650550299
 GameObject:
  m_ObjectHideFlags: 0
@@ -3838,6 +3843,18 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 1707207228499037414, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: glider
+      value: 
+      objectReference: {fileID: 602949031}
+    - target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: hasGlider
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4148131814043635973, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 5759777694531189237, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
      propertyPath: m_RootOrder
      value: 12
@@ -3882,10 +3899,46 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7008165214999136213, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7008165214999136213, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.0058
+      objectReference: {fileID: 0}
+    - target: {fileID: 7008165214999136213, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.0014
+      objectReference: {fileID: 0}
+    - target: {fileID: 7008165214999136213, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7008165214999136213, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7008165214999136213, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7660445
+      objectReference: {fileID: 0}
+    - target: {fileID: 7008165214999136213, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.6427876
+      objectReference: {fileID: 0}
+    - target: {fileID: 7008165214999136213, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 80
+      objectReference: {fileID: 0}
    - target: {fileID: 7053551988629990270, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
      propertyPath: m_Name
      value: DebugSMPlayerPrefab
      objectReference: {fileID: 0}
+    - target: {fileID: 7640868647639293295, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
 --- !u!114 &4756939987922741698 stripped
--- a/Assets/Scenes/Options.unity
+++ b/Assets/Scenes/Options.unity
@@ -1956,10 +1956,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
  m_ReferencePixelsPerUnit: 100
  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
  m_ScreenMatchMode: 0
  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
--- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialGlidingState.cs
+++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialGlidingState.cs
@@ -4,12 +4,20 @@ using UnityEngine;

 public class dAerialGlidingState : dAerialBaseState
 {
+    bool rotateGlider = false;
+
+    Vector3 gliderInitialPos = new Vector3(0,.0058f,-.0014f);
+    Vector3 gliderInitialRot = new Vector3(80,-180,0);
+
+    Vector3 gliderEndPos = new Vector3(0,.0355f,.0037f);
+    Vector3 gliderEndRot = new Vector3(0,-180f,0);

    public override void EnterState(dAerialStateManager aSM, dAerialBaseState previousState){
        //Modify base traction
        aSM.pStats.CurTraction = 1.0f;
        aSM.pStats.GravVel = -1;
        aSM.GetComponent<Animator>().SetBool("isGliding", true);
+        rotateGlider = true;

    }

@@ -18,10 +26,17 @@ public class dAerialGlidingState : dAerialBaseState
        //return traction to normal
        aSM.pStats.CurTraction = aSM.pStats.Traction;
        aSM.GetComponent<Animator>().SetBool("isGliding", false);
+
+        aSM.glider.transform.localPosition = gliderInitialPos;
+        aSM.glider.transform.localEulerAngles = gliderInitialRot;
    }

    public override void UpdateState(dAerialStateManager aSM){

+        if(rotateGlider){
+            rotateGlider = RotateGlider(aSM);
+        }
+
        //if not holding jump fall
        if(!Input.GetButton("Jump") || (aSM.mSM.currentState == aSM.mSM.RagdollState)){
            aSM.SwitchState(aSM.FallingState);
@@ -53,4 +68,22 @@ public class dAerialGlidingState : dAerialBaseState
            aSM.GrappleReleaseForce();
        }  
    }
+
+    private bool RotateGlider(dAerialStateManager aSM){
+        Debug.Log(aSM.glider.transform.localEulerAngles);
+        if(aSM.glider.transform.localEulerAngles.x >= 0 && aSM.glider.transform.localEulerAngles.x <= 90){
+            if(aSM.glider.transform.localPosition != gliderEndPos){
+                aSM.glider.transform.localPosition = Vector3.Lerp(aSM.glider.transform.localPosition, gliderEndPos, 20*Time.deltaTime);
+            }
+            if(aSM.glider.transform.localEulerAngles != gliderEndRot){
+                aSM.glider.transform.localEulerAngles = new Vector3(aSM.glider.transform.localEulerAngles.x - 30,aSM.glider.transform.localEulerAngles.y,aSM.glider.transform.localEulerAngles.z);
+            }   
+            
+            return true;
+        }
+        else{
+            aSM.glider.transform.localEulerAngles = new Vector3(0,aSM.glider.transform.localEulerAngles.y,aSM.glider.transform.localEulerAngles.z);
+            return false;
+        }
+    }
 }
--- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs
+++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs
@@ -32,6 +32,7 @@ public class dAerialStateManager : NetworkBehaviour
    public LineRenderer lr;
    public CharacterController handController;
    public Transform handPosition;
+    public GameObject glider;
    ////

    ////Components Section
--- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/Aerial/AerialGlidingState.cs
+++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/Aerial/AerialGlidingState.cs
@@ -4,13 +4,21 @@ using UnityEngine;

 public class AerialGlidingState : AerialBaseState
 {
+    bool rotateGlider = false;
+
+    Vector3 gliderInitialPos = new Vector3(0,.0058f,-.0014f);
+    Vector3 gliderInitialRot = new Vector3(80,-180,0);
+
+    Vector3 gliderEndPos = new Vector3(0,.0355f,.0037f);
+    Vector3 gliderEndRot = new Vector3(0,-180f,0);

    public override void EnterState(AerialStateManager aSM, AerialBaseState previousState){
-
        //Modify base traction
        aSM.pStats.CurTraction = 1.0f;
-        aSM.pStats.GravVel = -4;
+        aSM.pStats.GravVel = -3;
        aSM.GetComponent<Animator>().SetBool("isGliding", true);
+        rotateGlider = true;
+
    }

    public override void ExitState(AerialStateManager aSM, AerialBaseState nextState){
@@ -18,10 +26,17 @@ public class AerialGlidingState : AerialBaseState
        //return traction to normal
        aSM.pStats.CurTraction = aSM.pStats.Traction;
        aSM.GetComponent<Animator>().SetBool("isGliding", false);
+
+        aSM.glider.transform.localPosition = gliderInitialPos;
+        aSM.glider.transform.localEulerAngles = gliderInitialRot;
    }

    public override void UpdateState(AerialStateManager aSM){

+        if(rotateGlider){
+            rotateGlider = RotateGlider(aSM);
+        }
+
        //if not holding jump fall
        if(!Input.GetButton("Jump") || (aSM.mSM.currentState == aSM.mSM.RagdollState)){
            aSM.SwitchState(aSM.FallingState);
@@ -53,4 +68,22 @@ public class AerialGlidingState : AerialBaseState
            aSM.GrappleReleaseForce();
        }  
    }
+
+    private bool RotateGlider(AerialStateManager aSM){
+
+        if(aSM.glider.transform.localEulerAngles.x >= 0 && aSM.glider.transform.localEulerAngles.x <= 90){
+            if(aSM.glider.transform.localPosition != gliderEndPos){
+                aSM.glider.transform.localPosition = Vector3.Lerp(aSM.glider.transform.localPosition, gliderEndPos, 20*Time.deltaTime);
+            }
+            if(aSM.glider.transform.localEulerAngles != gliderEndRot){
+                aSM.glider.transform.localEulerAngles = new Vector3(aSM.glider.transform.localEulerAngles.x - 30,aSM.glider.transform.localEulerAngles.y,aSM.glider.transform.localEulerAngles.z);
+            }   
+            
+            return true;
+        }
+        else{
+            aSM.glider.transform.localEulerAngles = new Vector3(0,aSM.glider.transform.localEulerAngles.y,aSM.glider.transform.localEulerAngles.z);
+            return false;
+        }
+    }
 }
--- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs
+++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs
@@ -35,6 +35,7 @@ public class AerialStateManager : NetworkBehaviour
    public CharacterController handController;
    public Transform handPosition;
    public GameObject removeableHand;
+    public GameObject glider;
    ////

    ////Components Section
--- a/Assets/Scripts/UI/PauseMenu.cs
+++ b/Assets/Scripts/UI/PauseMenu.cs
@@ -79,7 +79,7 @@ public class PauseMenu : NetworkBehaviour {
    void Update() {
        // Listen for Pause button and not already paused
        // TODO: UPDATE TO ALSO LISTEN FOR CONTROLLER PAUSE BUTTON PRESSED
-        if (isUsable && Input.GetKeyDown(KeyCode.Escape) && PauseMenuPanel.activeInHierarchy != true) {
+        if (isUsable && (Input.GetKeyDown(KeyCode.Escape) || Input.GetKeyDown(KeyCode.JoystickButton0)) && PauseMenuPanel.activeInHierarchy != true) {
            GameObject[] players = GameObject.FindGameObjectsWithTag("Player");

            foreach(GameObject player in players){
--- a/Assets/Sprites/King/MicrosoftTeams-image
+++ b/Assets/Sprites/King/MicrosoftTeams-image
--- a/Assets/Sprites/King/MicrosoftTeams-image
+++ b/Assets/Sprites/King/MicrosoftTeams-image
@@ -0,0 +1,108 @@
+fileFormatVersion: 2
+guid: fcbb5f64a646be349845de9767347c71
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 7
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 32
+    resizeAlgorithm: 0
+    textureFormat: 4
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/King/MicrosoftTeams-image
+++ b/Assets/Sprites/King/MicrosoftTeams-image
--- a/Assets/Sprites/King/MicrosoftTeams-image
+++ b/Assets/Sprites/King/MicrosoftTeams-image
@@ -0,0 +1,444 @@
+fileFormatVersion: 2
+guid: d9ad7c581c228cb41a8a3d72db1d9ad0
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: -2058004621427595419
+    second: MicrosoftTeams-image (6)_0
+  - first:
+      213: 6172119545264029736
+    second: MicrosoftTeams-image (6)_1
+  - first:
+      213: -1582648166059048980
+    second: MicrosoftTeams-image (6)_2
+  - first:
+      213: -5574865602430634364
+    second: MicrosoftTeams-image (6)_3
+  - first:
+      213: -1407166154927051788
+    second: MicrosoftTeams-image (6)_4
+  - first:
+      213: 8712594793188015525
+    second: MicrosoftTeams-image (6)_5
+  - first:
+      213: 5150121024355037057
+    second: MicrosoftTeams-image (6)_6
+  - first:
+      213: 6118300546997326143
+    second: MicrosoftTeams-image (6)_7
+  - first:
+      213: 5276485688030243364
+    second: MicrosoftTeams-image (6)_8
+  - first:
+      213: 7085434342811453449
+    second: MicrosoftTeams-image (6)_9
+  - first:
+      213: -835931797690445747
+    second: MicrosoftTeams-image (6)_10
+  - first:
+      213: 8882251455786784145
+    second: MicrosoftTeams-image (6)_11
+  - first:
+      213: 1969299921773743803
+    second: MicrosoftTeams-image (6)_12
+  - first:
+      213: 3470737705431676227
+    second: MicrosoftTeams-image (6)_13
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_0
+      rect:
+        serializedVersion: 2
+        x: 130
+        y: 889
+        width: 525
+        height: 141
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 56722b953bf7073e0800000000000000
+      internalID: -2058004621427595419
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_1
+      rect:
+        serializedVersion: 2
+        x: 841
+        y: 890
+        width: 526
+        height: 140
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 82045be6606c7a550800000000000000
+      internalID: 6172119545264029736
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_2
+      rect:
+        serializedVersion: 2
+        x: 1577
+        y: 793
+        width: 294
+        height: 187
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: cef70a1d0ed490ae0800000000000000
+      internalID: -1582648166059048980
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_3
+      rect:
+        serializedVersion: 2
+        x: 192
+        y: 731
+        width: 518
+        height: 129
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 486f390854912a2b0800000000000000
+      internalID: -5574865602430634364
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_4
+      rect:
+        serializedVersion: 2
+        x: 904
+        y: 732
+        width: 518
+        height: 128
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 4fbee9b66ddb87ce0800000000000000
+      internalID: -1407166154927051788
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_5
+      rect:
+        serializedVersion: 2
+        x: 150
+        y: 558
+        width: 520
+        height: 140
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 5adb3e79dca59e870800000000000000
+      internalID: 8712594793188015525
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_6
+      rect:
+        serializedVersion: 2
+        x: 861
+        y: 559
+        width: 521
+        height: 140
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 18fe3fef8c7e87740800000000000000
+      internalID: 5150121024355037057
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_7
+      rect:
+        serializedVersion: 2
+        x: 1570
+        y: 522
+        width: 295
+        height: 186
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: f319adc6ee198e450800000000000000
+      internalID: 6118300546997326143
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_8
+      rect:
+        serializedVersion: 2
+        x: 126
+        y: 293
+        width: 358
+        height: 157
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 42aa979f6c7d93940800000000000000
+      internalID: 5276485688030243364
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_9
+      rect:
+        serializedVersion: 2
+        x: 707
+        y: 306
+        width: 358
+        height: 157
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 90841aa9ef4845260800000000000000
+      internalID: 7085434342811453449
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_10
+      rect:
+        serializedVersion: 2
+        x: 1165
+        y: 86
+        width: 292
+        height: 358
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: d40153e757c2664f0800000000000000
+      internalID: -835931797690445747
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_11
+      rect:
+        serializedVersion: 2
+        x: 1540
+        y: 89
+        width: 321
+        height: 358
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 1951edb83a8144b70800000000000000
+      internalID: 8882251455786784145
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_12
+      rect:
+        serializedVersion: 2
+        x: 136
+        y: 62
+        width: 358
+        height: 157
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: bbe478558db545b10800000000000000
+      internalID: 1969299921773743803
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: MicrosoftTeams-image (6)_13
+      rect:
+        serializedVersion: 2
+        x: 717
+        y: 75
+        width: 358
+        height: 157
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 3453fc8ed898a2030800000000000000
+      internalID: 3470737705431676227
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 9cefb4e5d79a134408048596f70d87e0
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -14,7 +14,7 @@ PlayerSettings:
  accelerometerFrequency: 60
  companyName: DefaultCompany
  productName: The Kings Race
-  defaultCursor: {fileID: 0}
+  defaultCursor: {fileID: 2800000, guid: 1d420e1e36c84db41a7258e594c6306a, type: 3}
  cursorHotspot: {x: 0, y: 0}
  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
  m_ShowUnitySplashScreen: 1
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -9,31 +9,31 @@ EditorUserSettings:
      value: 22424703114646680e0b0227036c7b151b180b651f3c272428041c30eae93a3dd6e225fda92f31352d1b
      flags: 0
    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
+      value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
      flags: 0
    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
-      flags: 0
-    RecentlyUsedScenePath-3:
      value: 22424703114646680e0b0227036c7000021e17243f66333e243d04
      flags: 0
-    RecentlyUsedScenePath-4:
+    RecentlyUsedScenePath-3:
      value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04
      flags: 0
+    RecentlyUsedScenePath-4:
+      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
+      flags: 0
    RecentlyUsedScenePath-5:
      value: 22424703114646680e0b0227036c731f1415016439262f2434
      flags: 0
    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
+      value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
      flags: 0
    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
+      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
      flags: 0
    RecentlyUsedScenePath-8:
      value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
      flags: 0
    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
+      value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650