Working on Character controller

Assets/Animations/CharacterController.controller

@@ -8,5 +8,303 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: CharacterController
   serializedVersion: 5
-  m_AnimatorParameters: []
-  m_AnimatorLayers: []
+  m_AnimatorParameters:
+  - m_Name: isWalking
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: isRunning
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: Jump
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: Attack
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Main
+    m_StateMachine: {fileID: 1107575609398583050}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1101 &1101425544804232820
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Jump
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102327515966221190}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.027124286
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101530445318437922
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102373004189010166}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.022549152
+  m_TransitionOffset: 0.18196069
+  m_ExitTime: 0.98696625
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101927995282899484
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102373004189010166}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.04150331
+  m_TransitionOffset: 0.17794108
+  m_ExitTime: 0.97268885
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101940742889338882
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Attack
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102928467354121838}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.012091637
+  m_TransitionOffset: 0.02913162
+  m_ExitTime: 0.7601961
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &1102276490540242372
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Walk
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400004, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102327515966221190
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Jump
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101530445318437922}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400008, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102373004189010166
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400002, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102812159766614166
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Run
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400006, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102928467354121838
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Attack
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101927995282899484}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400010, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &1107575609398583050
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Main
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102373004189010166}
+    m_Position: {x: 576, y: 240, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102276490540242372}
+    m_Position: {x: 708, y: 420, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102812159766614166}
+    m_Position: {x: 444, y: 420, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102327515966221190}
+    m_Position: {x: 468, y: 24, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102928467354121838}
+    m_Position: {x: 696, y: 24, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions:
+  - {fileID: 1101940742889338882}
+  - {fileID: 1101425544804232820}
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 600, y: -132, z: 0}
+  m_EntryPosition: {x: 252, y: 240, z: 0}
+  m_ExitPosition: {x: 1068, y: 252, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1102373004189010166}

Assets/Models.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 296bd90e667df1f4697823a0aa45acf0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/IngameDebugConsole.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5f8eae876be4b03438375a82d2c69b4d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/IngameDebugConsole/Android.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3d7d7a61a5341904eb3c65af025b1d86
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/IngameDebugConsole/Prefabs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7dbc36665bc0d684db9a4447e27a7a4b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/IngameDebugConsole/Scripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 860c08388401a6d4e858fe4910ea9337
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/IngameDebugConsole/Sprites.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cb5d7b23a9e684a41a6a5d4f300eb1e6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6caae32d463529478f2186f47c2e3fe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Character.cs

@@ -7,11 +7,11 @@ using Networking.Server;
 
 public class Character : MonoBehaviour
 {
-    public enum Animation {Walk,Run,Jump,Slide}
+    public enum Animation { Walk, Run, Jump, Slide }
 
     public string nextScene;
     Animator characterAnimator;
-	public bool isTuteLevel = false;
+    public bool isTuteLevel = false;
 
     public bool inWater = false; //Am I in the water?
     public bool inPit = false; //Did I fall into a pit?
@@ -26,7 +26,7 @@ public class Character : MonoBehaviour
 
     [SerializeField]
     [Tooltip("Layers to ignore when checking for blocks")]
-    private LayerMask Ignore;
+    public LayerMask Ignore;
 
     [Tooltip("Current Inventory of the player")]
     public Inventory Inventory;
@@ -87,28 +87,31 @@ public class Character : MonoBehaviour
 
     public void DisplayBlock(LogicBlock block)
     {
-		if(isTuteLevel == false){
-			if (BlockTitlePrefab == null)
-				return;
-        
-			TMPro.TextMeshPro temp = Instantiate(BlockTitlePrefab.gameObject).GetComponent<TMPro.TextMeshPro>();
-			temp.text = block.DisplayName;
+        if (isTuteLevel == false)
+        {
+            if (BlockTitlePrefab == null)
+                return;
+
+            TMPro.TextMeshPro temp = Instantiate(BlockTitlePrefab.gameObject).GetComponent<TMPro.TextMeshPro>();
+            temp.text = block.DisplayName;
             temp.color = ClientLink.Color;
 
-			temp.transform.position = transform.position + (Vector3.one * 0.25f);
-			temp.transform.rotation = Quaternion.LookRotation(temp.transform.position - Camera.main.transform.position);
-		}
+            temp.transform.position = transform.position + (Vector3.one * 0.25f);
+            temp.transform.rotation = Quaternion.LookRotation(temp.transform.position - Camera.main.transform.position);
+        }
     }
 
-    public Vector3 yValue(float time, float heightMultiplier)
+    public float yValue(float time, float heightMultiplier)
     {
         float y = Mathf.Sin((Mathf.PI * time)) * heightMultiplier;
-        return new Vector3(0, y, 0);
+        return y;
     }
 
     public IEnumerator MoveToBlock(Block target, Animation animation, float time)
     {
 
+        System.Func<float, float> yFunction = null;
+
         switch (animation)
         {
             case Animation.Walk:
@@ -119,20 +122,30 @@ public class Character : MonoBehaviour
                 break;
             case Animation.Jump:
                 characterAnimator.SetTrigger("Jump");
+                yFunction = (t) => yValue(t, 1.0f);
                 break;
             default:
                 break;
         }
 
+        yield return StartCoroutine(LerpToBlock(target, time, yFunction));
 
-
-
-
-        yield return null;
-
+        switch (animation)
+        {
+            case Animation.Walk:
+                characterAnimator.SetBool("isWalking", false);
+                break;
+            case Animation.Run:
+                characterAnimator.SetBool("isRunning", false);
+                break;
+            case Animation.Jump:
+                break;
+            default:
+                break;
+        }
     }
 
-    public IEnumerator LerpToBlock(Block target,float time, System.Func<float,float> heightOffset)
+    public IEnumerator LerpToBlock(Block target, float time, System.Func<float, float> heightOffset = null)
     {
 
         Vector3 _startPos = transform.position;
@@ -141,7 +154,7 @@ public class Character : MonoBehaviour
         Vector3 _newPos;
 
         float elapsedTime = 0;
-        while(elapsedTime/time < 1)
+        while (elapsedTime / time < 1)
         {
 
             _newPos = Vector3.Lerp(_startPos, _endPos, (elapsedTime / time));
@@ -155,7 +168,8 @@ public class Character : MonoBehaviour
         }
 
         _newPos = _endPos;
-        _newPos.y += heightOffset(elapsedTime / time);
+        if (heightOffset != null)
+            _newPos.y += heightOffset(elapsedTime / time);
 
         transform.position = _newPos;
     }
@@ -171,7 +185,7 @@ public class Character : MonoBehaviour
         while (elapsedTime < time)
         {
             transform.position = Vector3.Lerp(startPosition, Target.VisualPosition, (elapsedTime / time));
-            transform.position += yValue((elapsedTime / time), heightMax);
+            //transform.position += yValue((elapsedTime / time), heightMax);
             yield return new WaitForEndOfFrame();
             elapsedTime += Time.deltaTime;
         }
@@ -297,7 +311,7 @@ public class Character : MonoBehaviour
         while (elapsedTime < time)
         {
             transform.position = Vector3.Lerp(startPosition, Target.VisualPosition, (elapsedTime / time));
-            transform.position += yValue((elapsedTime / time), heightMax);
+            //transform.position += yValue((elapsedTime / time), heightMax);
             yield return new WaitForEndOfFrame();
             elapsedTime += Time.deltaTime;
         }
@@ -366,7 +380,7 @@ public class Character : MonoBehaviour
             _currentBlock = moveTo;
             StartCoroutine(MoveConveyorForwardCoroutine(_currentBlock, transform, speed, 0.3f));
         }
-        
+
     }
     public void conveyorMoveBackward(Direction direction, float speed)
     {
@@ -499,9 +513,9 @@ public class Character : MonoBehaviour
             this.transform.position = currentBlock.VisualPosition;
             this.inPit = false;
             this._currentBlock = currentBlock;
-            Debug.Log("Moved " + this.name + " to " 
-                + this.transform.position.x + ", " 
-                + this.transform.position.y + ", " 
+            Debug.Log("Moved " + this.name + " to "
+                + this.transform.position.x + ", "
+                + this.transform.position.y + ", "
                 + this.transform.position.z + ", "
                 + " inPit = " + inPit);
         }

Assets/Scripts/Logic/Blocks/Move.cs

@@ -22,7 +22,9 @@ public class Move : LogicBlock
     protected override void BlockLogic(Character player, float animationTime)
     {
         player.justMoved = true;
-        player.Move(direction, animationTime);
+        //player.Move(direction, animationTime);
+        Block endBlock =  GetEndBlock(player.CurrentBlock, player.transform, player.Ignore);
+        player.MoveToBlock(endBlock, Character.Animation.Walk, animationTime);
     }
 
     /// <summary>

Assets/Scripts/LogicBlocks.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8936b441d7647f74884c94f97bfb8931
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Third Party Assets/KUBIKOS - Cube Mini Animals/Animals1_AnimCTRL/BearCont.overrideController

@@ -3,24 +3,9 @@
 --- !u!221 &22100000
 AnimatorOverrideController:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: BearCont
-  m_Controller: {fileID: 9100000, guid: 57bf079d37ba4dfa9d08024e126557fe, type: 2}
-  m_Clips:
-  - m_OriginalClip: {fileID: 7400010, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-    m_OverrideClip: {fileID: 7400010, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-  - m_OriginalClip: {fileID: 7400012, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-    m_OverrideClip: {fileID: 7400012, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-  - m_OriginalClip: {fileID: 7400002, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-    m_OverrideClip: {fileID: 7400002, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-  - m_OriginalClip: {fileID: 7400000, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-    m_OverrideClip: {fileID: 7400000, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-  - m_OriginalClip: {fileID: 7400008, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-    m_OverrideClip: {fileID: 7400008, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-  - m_OriginalClip: {fileID: 7400014, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-    m_OverrideClip: {fileID: 7400014, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-  - m_OriginalClip: {fileID: 7400006, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-    m_OverrideClip: {fileID: 7400006, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-  - m_OriginalClip: {fileID: 7400004, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
-    m_OverrideClip: {fileID: 7400004, guid: ecb900ca4b414eae9053afe2b45f3656, type: 3}
+  m_Controller: {fileID: 9100000, guid: ed2a73208a872914f8187d96fb1f35e0, type: 2}
+  m_Clips: []