diff --git a/Assets/Animations/MageBasicAnimations/MageAnimController.controller b/Assets/Animations/MageBasicAnimations/MageAnimController.controller index b28a9203..474feaf9 100644 --- a/Assets/Animations/MageBasicAnimations/MageAnimController.controller +++ b/Assets/Animations/MageBasicAnimations/MageAnimController.controller @@ -1,5 +1,36 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!206 &-8659289150219975004 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: -5164704163215866354} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: OCSpeed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -703431875239177136} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: OCSpeed + m_Mirror: 0 + m_BlendParameter: DodgeXZ + m_BlendParameterY: OCSpeed + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 --- !u!206 &-8544385262456306091 BlendTree: m_ObjectHideFlags: 1 @@ -99,7 +130,7 @@ AnimatorStateTransition: m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 6655196143368466440} m_Solo: 0 - m_Mute: 0 + m_Mute: 1 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.25 @@ -307,6 +338,62 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!206 &-5164704163215866354 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlendTree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: -203655887218126122, guid: 56cd733da0a8c194bba7dc3ce2edcbee, type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1.35 + m_CycleOffset: 0 + m_DirectBlendParameter: OCSpeed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -203655887218126122, guid: 4de851d5c2d306943906f8e06131f3c1, type: 3} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1.35 + m_CycleOffset: 0 + m_DirectBlendParameter: OCSpeed + m_Mirror: 0 + m_BlendParameter: DodgeX + m_BlendParameterY: Blend + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1101 &-4408819579032090322 +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: isDodging + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 152313149370873080} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-3376461215804680224 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -397,8 +484,12 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1663691838980439704} m_Position: {x: -140, y: 160, z: 0} + - serializedVersion: 1 + m_State: {fileID: 152313149370873080} + m_Position: {x: 320, y: 150, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: -4408819579032090322} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -511,6 +602,37 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!206 &-703431875239177136 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlendTree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: -203655887218126122, guid: 298d9f18961c80a43979025d4cfd1f0e, type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1.45 + m_CycleOffset: 0 + m_DirectBlendParameter: OCSpeed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -203655887218126122, guid: 4b5c33feb5054234091f8a09fbf7971f, type: 3} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1.45 + m_CycleOffset: 0 + m_DirectBlendParameter: OCSpeed + m_Mirror: 0 + m_BlendParameter: DodgeZ + m_BlendParameterY: Blend + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -641,6 +763,33 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &152313149370873080 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 7250055748610333887} + 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: -8659289150219975004} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!206 &600015436739096336 BlendTree: m_ObjectHideFlags: 1 @@ -1191,6 +1340,28 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!1101 &7250055748610333887 +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: -6889767807120140086} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7810219 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!206 &7656557605223885373 BlendTree: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/PlayerType/Player - TPS.prefab b/Assets/Prefabs/PlayerType/Player - TPS.prefab index e38e49aa..97364138 100644 --- a/Assets/Prefabs/PlayerType/Player - TPS.prefab +++ b/Assets/Prefabs/PlayerType/Player - TPS.prefab @@ -102,7 +102,7 @@ MonoBehaviour: airMult: 0.4 dodgeForce: 50 dodgeDur: 0.25 - dodgeCd: 1 + dodgeCd: 2 maxSlopeAngle: 40 slopeCheck: 0.77 groundDrag: 5 @@ -454,8 +454,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6030567581599643063} serializedVersion: 2 - m_LocalRotation: {x: -0.07758557, y: -0.29456323, z: -0.024001744, w: 0.95217484} - m_LocalPosition: {x: 2.1548817, y: -0.34605378, z: -4.0395093} + m_LocalRotation: {x: 0.065826505, y: -0.29483706, z: 0.02036398, w: 0.95306} + m_LocalPosition: {x: 1.9737273, y: 0.7651491, z: -3.7747393} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -538,7 +538,7 @@ MonoBehaviour: SplineCurvature: 0.473 RecenteringTarget: 2 HorizontalAxis: - Value: -34.379776 + Value: -34.37978 Center: 0 Range: {x: -180, y: 180} Wrap: 1 @@ -548,7 +548,7 @@ MonoBehaviour: Time: 2 Restrictions: 0 VerticalAxis: - Value: 7.679455 + Value: 19.72297 Center: 17.5 Range: {x: -10, y: 45} Wrap: 0 @@ -802,8 +802,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8684131270940623896} serializedVersion: 2 - m_LocalRotation: {x: -0.077585585, y: -0.29456326, z: -0.024001747, w: 0.95217484} - m_LocalPosition: {x: 2.1548817, y: -0.34605378, z: -4.0395093} + m_LocalRotation: {x: 0.065826505, y: -0.29483706, z: 0.020363979, w: 0.95306} + m_LocalPosition: {x: 1.9737273, y: 0.7651491, z: -3.7747393} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/DeveloperScenes/LuisDevScene.unity b/Assets/Scenes/DeveloperScenes/LuisDevScene.unity index fd1ca6bd..a1fe6cc7 100644 --- a/Assets/Scenes/DeveloperScenes/LuisDevScene.unity +++ b/Assets/Scenes/DeveloperScenes/LuisDevScene.unity @@ -4631,6 +4631,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6193368412943276983, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: dodgeCd + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6429870482830862044, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 30ef35bb..a8399151 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -954,9 +954,33 @@ PrefabInstance: propertyPath: itemDescription value: objectReference: {fileID: 1501419510} + - target: {fileID: 4465824423169734599, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalPosition.x + value: 1.9737273 + objectReference: {fileID: 0} - target: {fileID: 4465824423169734599, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} propertyPath: m_LocalPosition.y - value: 0.65394616 + value: 1.7651491 + objectReference: {fileID: 0} + - target: {fileID: 4465824423169734599, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalPosition.z + value: -3.7747393 + objectReference: {fileID: 0} + - target: {fileID: 4465824423169734599, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalRotation.w + value: 0.95306 + objectReference: {fileID: 0} + - target: {fileID: 4465824423169734599, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06582654 + objectReference: {fileID: 0} + - target: {fileID: 4465824423169734599, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalRotation.y + value: -0.29483718 + objectReference: {fileID: 0} + - target: {fileID: 4465824423169734599, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalRotation.z + value: 0.020363998 objectReference: {fileID: 0} - target: {fileID: 4832999982327109972, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} propertyPath: m_AnchorMax.y @@ -1190,9 +1214,33 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6423730428231168063, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalPosition.x + value: 1.9737273 + objectReference: {fileID: 0} - target: {fileID: 6423730428231168063, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} propertyPath: m_LocalPosition.y - value: 0.65394616 + value: 1.7651491 + objectReference: {fileID: 0} + - target: {fileID: 6423730428231168063, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalPosition.z + value: -3.7747393 + objectReference: {fileID: 0} + - target: {fileID: 6423730428231168063, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalRotation.w + value: 0.95306 + objectReference: {fileID: 0} + - target: {fileID: 6423730428231168063, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalRotation.x + value: 0.06582653 + objectReference: {fileID: 0} + - target: {fileID: 6423730428231168063, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalRotation.y + value: -0.29483712 + objectReference: {fileID: 0} + - target: {fileID: 6423730428231168063, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} + propertyPath: m_LocalRotation.z + value: 0.020363992 objectReference: {fileID: 0} - target: {fileID: 6429870482830862044, guid: 491ae2bb515ae3f44961b8a45249e0b3, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 6eafb39c..f2a0e517 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -367,6 +367,11 @@ public void removeLossMenu() { lossMenu.SetActive(false); } + public void removeWinMenu() + { + victoryMenu.SetActive(false); + } + public bool PlayerCompletedTutorial() { PlayerController playerScript = player.GetComponent(); diff --git a/Assets/Scripts/Player/PlayerAnimation.cs b/Assets/Scripts/Player/PlayerAnimation.cs index f6c9742f..3533308a 100644 --- a/Assets/Scripts/Player/PlayerAnimation.cs +++ b/Assets/Scripts/Player/PlayerAnimation.cs @@ -59,12 +59,14 @@ public IEnumerator PlayerDeathAnimation() void GetPlayerStateAnimation() { - if (player.inCombat) { + if (player.inCombat) + { anim.SetBool("CombatMode", true); onActionModeEnabled?.Invoke(); } - else { + else + { anim.SetBool("CombatMode", false); onActionModeDisabled?.Invoke(); } @@ -118,7 +120,7 @@ void GetPlayerStateAnimation() } anim.SetFloat("ICSpeed", ICSpeed); - if (player.dodgeCdTimer < 0) + if (!player.isDodging) { anim.SetBool("isDodging", false); BaseLayerOverride(); diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index bea7c238..74b5c22c 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -137,7 +137,7 @@ void FixedUpdate() IsGrounded(); Movement(); - if (Input.GetButtonDown("Dodge") && inCombat) + if (Input.GetButton("Dodge") && inCombat) Dodge(); // key bind set to space } diff --git a/Assets/Scripts/UIScripts/MainSceneLogic.cs b/Assets/Scripts/UIScripts/MainSceneLogic.cs index 4bac94f9..330e4335 100644 --- a/Assets/Scripts/UIScripts/MainSceneLogic.cs +++ b/Assets/Scripts/UIScripts/MainSceneLogic.cs @@ -203,6 +203,7 @@ public void returnToMenu() MMCamera.SetActive(true); DisableTabs(); GameManager.GetInstance().removeLossMenu(); + GameManager.GetInstance().removeWinMenu(); // Only process main menu things when the game mode is overridden diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 060cca73..6ff0b34e 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -64,7 +64,7 @@ { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "editor.backFaceSelectEnabled", - "value": "{\"m_Value\":true}" + "value": "{\"m_Value\":false}" }, { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", @@ -84,12 +84,12 @@ { "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "ShapeBuilder.ActiveShapeIndex", - "value": "{\"m_Value\":6}" + "value": "{\"m_Value\":8}" }, { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastSize.Cube", - "value": "{\"m_Value\":{\"x\":-4.0,\"y\":-2.0,\"z\":6.0}}" + "value": "{\"m_Value\":{\"x\":-3.0,\"y\":3.0,\"z\":1.0}}" }, { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", @@ -99,12 +99,12 @@ { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastSize.Cylinder", - "value": "{\"m_Value\":{\"x\":-2.2693817615509035,\"y\":0.5315986275672913,\"z\":-2.2333757877349855}}" + "value": "{\"m_Value\":{\"x\":3.9971370697021486,\"y\":4.92060661315918,\"z\":-4.525791168212891}}" }, { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastSize.Stairs", - "value": "{\"m_Value\":{\"x\":-4.0,\"y\":4.0,\"z\":6.0}}" + "value": "{\"m_Value\":{\"x\":-0.0010000000474974514,\"y\":0.0,\"z\":0.0010000000474974514}}" }, { "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",