diff --git a/Assets/Racer/Animations/RunnerAnimator.controller b/Assets/Racer/Animations/RunnerAnimator.controller index 5173e62..6954a64 100644 --- a/Assets/Racer/Animations/RunnerAnimator.controller +++ b/Assets/Racer/Animations/RunnerAnimator.controller @@ -220,6 +220,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-8098181574206066500 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RunToIdleKick + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: currentPriority + m_EventTreshold: 3 + - m_ConditionMode: 1 + m_ConditionEvent: IsKickingIdle + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4565651633669448552} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.60526323 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-8090228352377669139 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -332,6 +360,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-7975770875256506118 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleKickToRun + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isRunning + m_EventTreshold: 0 + - m_ConditionMode: 6 + m_ConditionEvent: currentPriority + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1531097096785451343} + 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 &-7812921793763085099 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -906,34 +962,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-5661276559049509992 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: JogToMovingKick - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isKickingMoving - m_EventTreshold: 0 - - m_ConditionMode: 6 - m_ConditionEvent: currentPriority - m_EventTreshold: 3 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1073953080501869946} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.60526323 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &-5597047277586196964 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -1026,7 +1054,6 @@ AnimatorState: - {fileID: -8107591750952066339} - {fileID: -4418851218120212499} - {fileID: -2294883422514629056} - - {fileID: 8820921950377077826} - {fileID: -7803353195787025252} - {fileID: 5856579348454608918} - {fileID: 2503974720552454189} @@ -1035,6 +1062,7 @@ AnimatorState: - {fileID: -9223308238729633029} - {fileID: 7113385839236374401} - {fileID: -7977302763359804340} + - {fileID: 3541007919663594040} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -1078,34 +1106,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-4612630774370522073 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KickToJog - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isJogging - m_EventTreshold: 0 - - m_ConditionMode: 6 - m_ConditionEvent: currentPriority - m_EventTreshold: 1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3127306146308516746} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.7580645 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-4565651633669448552 AnimatorState: serializedVersion: 6 @@ -1119,6 +1119,9 @@ AnimatorState: m_Transitions: - {fileID: 3925824916938458427} - {fileID: -5932118863062872708} + - {fileID: 8294924626503473282} + - {fileID: -7975770875256506118} + - {fileID: -4197754923306516991} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -1190,6 +1193,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-4197754923306516991 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleKickToJog + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isJogging + m_EventTreshold: 0 + - m_ConditionMode: 6 + m_ConditionEvent: currentPriority + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3127306146308516746} + 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 &-4118790594908874843 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -1361,34 +1392,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-3415010267637933912 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KickToWalk - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isWalking - m_EventTreshold: 0 - - m_ConditionMode: 6 - m_ConditionEvent: currentPriority - m_EventTreshold: 1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -4724635435179957578} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.7580645 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &-3371482887331629431 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -1776,7 +1779,6 @@ AnimatorState: m_Transitions: - {fileID: 1786241621901037311} - {fileID: 4743446852038937674} - - {fileID: 3754315753073842175} - {fileID: 8946022432248781058} - {fileID: -2202113779748792143} - {fileID: 5487776416083351198} @@ -1785,6 +1787,7 @@ AnimatorState: - {fileID: -3579835053381082649} - {fileID: 3916670651851087445} - {fileID: -1813508981681523073} + - {fileID: -8098181574206066500} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -2427,34 +2430,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &582405419870544382 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ToRagdoll - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isRagdoll - m_EventTreshold: 0 - - m_ConditionMode: 6 - m_ConditionEvent: currentPriority - m_EventTreshold: 5 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 4637710859641002442} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.7580645 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &688324084393511069 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -2571,36 +2546,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &1073953080501869946 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: MovingKickState - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: -4612630774370522073} - - {fileID: -3415010267637933912} - - {fileID: 1271448391174718686} - - {fileID: 582405419870544382} - 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: -203655887218126122, guid: 94c70f0bbd236cc4ebf08227b01b3f95, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1101 &1262108729973847992 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -2629,34 +2574,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1271448391174718686 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KickToRun - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isRunning - m_EventTreshold: 0 - - m_ConditionMode: 6 - m_ConditionEvent: currentPriority - m_EventTreshold: 1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -1531097096785451343} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.7580645 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &1278341306160073633 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -2978,6 +2895,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &1973267485849660093 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JogToIdleKick + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: currentPriority + m_EventTreshold: 3 + - m_ConditionMode: 1 + m_ConditionEvent: IsKickingIdle + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4565651633669448552} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.60526323 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &2099882758980975457 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -3214,7 +3159,6 @@ AnimatorState: - {fileID: 6589235098424553200} - {fileID: 6055554627475130867} - {fileID: 6705452199768708978} - - {fileID: -5661276559049509992} - {fileID: -2607284023931118805} - {fileID: 2099882758980975457} - {fileID: -8041163178714288343} @@ -3223,6 +3167,7 @@ AnimatorState: - {fileID: 7472342430747963968} - {fileID: -7812921793763085099} - {fileID: -8169411582175345553} + - {fileID: 1973267485849660093} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -3302,6 +3247,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &3541007919663594040 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WalkToIdleKick + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: currentPriority + m_EventTreshold: 3 + - m_ConditionMode: 1 + m_ConditionEvent: IsKickingIdle + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4565651633669448552} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7580645 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &3593363245546161951 AnimatorState: serializedVersion: 6 @@ -3361,34 +3334,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &3754315753073842175 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RunToMovingKick - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isKickingMoving - m_EventTreshold: 0 - - m_ConditionMode: 6 - m_ConditionEvent: currentPriority - m_EventTreshold: 3 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1073953080501869946} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.60526323 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &3775546310611873107 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -4423,9 +4368,6 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -5818761240578026763} m_Position: {x: -290, y: -930, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1073953080501869946} - m_Position: {x: 380, y: -690, z: 0} - serializedVersion: 1 m_State: {fileID: -5764326617583992875} m_Position: {x: -980, y: 220, z: 0} @@ -4566,6 +4508,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &8294924626503473282 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleKickToWalk + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + - m_ConditionMode: 6 + m_ConditionEvent: currentPriority + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4724635435179957578} + 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 &8442405539069471691 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -4622,34 +4592,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &8820921950377077826 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: WalkToMovingKick - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isKickingMoving - m_EventTreshold: 0 - - m_ConditionMode: 6 - m_ConditionEvent: currentPriority - m_EventTreshold: 3 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1073953080501869946} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.7580645 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &8886679762257949795 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/Controls.unity b/Assets/Scenes/Controls.unity index ffca959..f7d9b27 100644 --- a/Assets/Scenes/Controls.unity +++ b/Assets/Scenes/Controls.unity @@ -2010,6 +2010,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 443351559} m_CullTransparentMesh: 1 +--- !u!1 &474284780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 474284781} + - component: {fileID: 474284783} + - component: {fileID: 474284782} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &474284781 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474284780} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1909090753} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 10.715, y: 1.7501} + m_SizeDelta: {x: 578.57, y: 217.7565} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &474284782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474284780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: 'Continue ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2} + m_sharedMaterial: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &474284783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474284780} + m_CullTransparentMesh: 1 --- !u!1 &606199964 GameObject: m_ObjectHideFlags: 0 @@ -2539,7 +2673,7 @@ GameObject: - component: {fileID: 648106102} - component: {fileID: 648106101} m_Layer: 5 - m_Name: Icon + m_Name: dashIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2676,7 +2810,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: dashKey + m_StringArgument: dash m_BoolArgument: 0 m_CallState: 2 --- !u!114 &648106104 @@ -2732,7 +2866,7 @@ GameObject: - component: {fileID: 654200070} - component: {fileID: 654200069} m_Layer: 5 - m_Name: Icon + m_Name: nitroIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2869,7 +3003,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: nitroKey + m_StringArgument: nitro m_BoolArgument: 0 m_CallState: 2 --- !u!114 &654200072 @@ -3120,6 +3254,219 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 681678314} m_CullTransparentMesh: 1 +--- !u!1 &706508545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 706508546} + - component: {fileID: 706508548} + - component: {fileID: 706508547} + m_Layer: 5 + m_Name: Outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &706508546 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706508545} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 742976117} + - {fileID: 1909090753} + - {fileID: 1093239309} + m_Father: {fileID: 858022455} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &706508547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706508545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 1840919964890053311, guid: 129d6de3c52ce5747b4594049bbc9a0b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &706508548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706508545} + m_CullTransparentMesh: 1 +--- !u!1 &742976116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 742976117} + - component: {fileID: 742976119} + - component: {fileID: 742976118} + m_Layer: 5 + m_Name: WarningText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &742976117 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 742976116} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 706508546} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.0005, y: 291.85333} + m_SizeDelta: {x: 1562.0189, y: 285.6033} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &742976118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 742976116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: There are multiple actions that are binded to the same key. If you exit + now, all actions will be binded to their defaults. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2} + m_sharedMaterial: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &742976119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 742976116} + m_CullTransparentMesh: 1 --- !u!1 &837643339 GameObject: m_ObjectHideFlags: 0 @@ -3195,6 +3542,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 837643339} m_CullTransparentMesh: 1 +--- !u!1 &858022454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 858022455} + m_Layer: 5 + m_Name: WarningBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &858022455 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858022454} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 706508546} + m_Father: {fileID: 1900436314} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &883804335 GameObject: m_ObjectHideFlags: 0 @@ -3835,7 +4218,7 @@ GameObject: - component: {fileID: 997718478} - component: {fileID: 997718477} m_Layer: 5 - m_Name: Icon + m_Name: grappleIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4317,6 +4700,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1074090463} m_CullTransparentMesh: 1 +--- !u!1 &1093239308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1093239309} + - component: {fileID: 1093239312} + - component: {fileID: 1093239311} + - component: {fileID: 1093239310} + m_Layer: 5 + m_Name: Cancel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1093239309 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093239308} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1453651972} + m_Father: {fileID: 706508546} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 480, y: -240} + m_SizeDelta: {x: 600, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1093239310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093239308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1093239311} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1900436318} + m_TargetAssemblyTypeName: WarningPop, Assembly-CSharp + m_MethodName: cancel + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1093239311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093239308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: -9178075151235286286, guid: 6f81bdd0a5c7c0946bf59a2f2d299bf2, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1093239312 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093239308} + m_CullTransparentMesh: 1 --- !u!1 &1152894521 GameObject: m_ObjectHideFlags: 0 @@ -4773,7 +5289,7 @@ GameObject: - component: {fileID: 1322325986} - component: {fileID: 1322325985} m_Layer: 5 - m_Name: Icon + m_Name: kickIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4910,7 +5426,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: kickKey + m_StringArgument: kick m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1322325988 @@ -5039,6 +5555,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372727231} m_CullTransparentMesh: 1 +--- !u!1 &1453651971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1453651972} + - component: {fileID: 1453651974} + - component: {fileID: 1453651973} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1453651972 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453651971} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1093239309} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -0.6112} + m_SizeDelta: {x: 600, y: 227.1122} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1453651973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453651971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Cancel + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2} + m_sharedMaterial: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1453651974 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453651971} + m_CullTransparentMesh: 1 --- !u!1 &1505670057 GameObject: m_ObjectHideFlags: 0 @@ -5598,6 +6248,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1900436314} m_Modifications: + - target: {fileID: 4215836264082284890, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: canvasRef + value: + objectReference: {fileID: 1900436313} + - target: {fileID: 4215836264082284890, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: warningBox + value: + objectReference: {fileID: 858022454} + - target: {fileID: 4215836264082284893, guid: f9007eec4604c3042ac96f526d59b667, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: backToSettings + objectReference: {fileID: 0} - target: {fileID: 4215836264082284894, guid: f9007eec4604c3042ac96f526d59b667, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6794,7 +7456,7 @@ GameObject: - component: {fileID: 1900436311} - component: {fileID: 1900436315} - component: {fileID: 1900436316} - - component: {fileID: 1900436317} + - component: {fileID: 1900436318} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -6881,6 +7543,7 @@ RectTransform: - {fileID: 631858743} - {fileID: 384261475} - {fileID: 1592956673} + - {fileID: 858022455} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6915,7 +7578,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ad99f686b83c15c40a0741b75afb37a2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1900436317 + allButtonObjects: + - {fileID: 997718475} + - {fileID: 2093244709} + - {fileID: 1322325983} + - {fileID: 648106099} + - {fileID: 654200067} + allSprites: + - {fileID: 7136259645469174369, guid: 333692572c859df4a8f79e4e00fa57ec, type: 3} + - {fileID: 2508556123498468650, guid: 333692572c859df4a8f79e4e00fa57ec, type: 3} + - {fileID: -157329293977272682, guid: 333692572c859df4a8f79e4e00fa57ec, type: 3} + - {fileID: -5907697010799613142, guid: 333692572c859df4a8f79e4e00fa57ec, type: 3} + - {fileID: -1157620234444397289, guid: 333692572c859df4a8f79e4e00fa57ec, type: 3} +--- !u!114 &1900436318 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6924,9 +7599,143 @@ MonoBehaviour: m_GameObject: {fileID: 1900436310} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5df0ae8b0ae70844496f4608ba6d6747, type: 3} + m_Script: {fileID: 11500000, guid: df9e171fd2cc7654982551923930a953, type: 3} m_Name: m_EditorClassIdentifier: + warningBox: {fileID: 858022454} +--- !u!1 &1909090752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1909090753} + - component: {fileID: 1909090756} + - component: {fileID: 1909090755} + - component: {fileID: 1909090754} + m_Layer: 5 + m_Name: Continue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1909090753 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909090752} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 474284781} + m_Father: {fileID: 706508546} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -480, y: -240} + m_SizeDelta: {x: 600, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1909090754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909090752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1909090755} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1900436318} + m_TargetAssemblyTypeName: WarningPop, Assembly-CSharp + m_MethodName: setDefaultAndContinue + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1909090755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909090752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: -6886762294741261117, guid: 129d6de3c52ce5747b4594049bbc9a0b, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1909090756 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909090752} + m_CullTransparentMesh: 1 --- !u!1 &1911009451 GameObject: m_ObjectHideFlags: 0 @@ -7215,7 +8024,7 @@ GameObject: - component: {fileID: 2093244712} - component: {fileID: 2093244711} m_Layer: 5 - m_Name: Icon + m_Name: slideIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7352,7 +8161,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: slideKey + m_StringArgument: slide m_BoolArgument: 0 m_CallState: 2 --- !u!114 &2093244714 diff --git a/Assets/Scenes/Preloader.unity b/Assets/Scenes/Preloader.unity index 881a7a2..a151772 100644 --- a/Assets/Scenes/Preloader.unity +++ b/Assets/Scenes/Preloader.unity @@ -213,6 +213,49 @@ MonoBehaviour: - {x: 730.21, y: 26, z: 501} - {x: 730.21, y: 26, z: 494} kingSpawnPoint: {x: 350, y: 625, z: 1130} +--- !u!1 &751229570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 751229572} + - component: {fileID: 751229571} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &751229571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 751229570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5df0ae8b0ae70844496f4608ba6d6747, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &751229572 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 751229570} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1494071116 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index 2f7f304..f3e37f4 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -714,6 +714,8 @@ GameObject: - component: {fileID: 543787202} - component: {fileID: 543787201} - component: {fileID: 543787200} + - component: {fileID: 543787204} + - component: {fileID: 543787203} m_Layer: 5 m_Name: BackToMenu m_TagString: Untagged @@ -834,6 +836,53 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 543787198} m_CullTransparentMesh: 1 +--- !u!61 &543787203 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 543787198} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 150, y: 50} + m_EdgeRadius: 0 +--- !u!50 &543787204 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 543787198} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 --- !u!1 &627060238 GameObject: m_ObjectHideFlags: 0 @@ -1973,6 +2022,8 @@ GameObject: - component: {fileID: 1244920496} - component: {fileID: 1244920495} - component: {fileID: 1244920494} + - component: {fileID: 1244920498} + - component: {fileID: 1244920497} m_Layer: 5 m_Name: JoinGame m_TagString: Untagged @@ -2093,6 +2144,53 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1244920492} m_CullTransparentMesh: 1 +--- !u!50 &1244920497 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244920492} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!61 &1244920498 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244920492} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 150, y: 50} + m_EdgeRadius: 0 --- !u!1 &1268511101 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs index 3485b92..1306b1c 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs @@ -14,7 +14,7 @@ public class dOffenseKickState : dOffenseBaseState oSM.leg.SetActive(true); // activate leg kicked = false; // haven't kicked - oSM.animator.SetBool("IsKicking", true); + oSM.animator.SetBool("IsKickingIdle", true); //start kicking routine oSM.StartCoroutine(kicking(1f)); } @@ -23,7 +23,7 @@ public class dOffenseKickState : dOffenseBaseState legRotation = 0; // reset leg angle oSM.leg.transform.eulerAngles = new Vector3(legRotation, oSM.leg.transform.eulerAngles.y, oSM.leg.transform.eulerAngles.z); // rotate leg oSM.leg.SetActive(false); // reset leg angle - oSM.animator.SetBool("IsKicking", false); + oSM.animator.SetBool("IsKickingIdle", false); } public override void UpdateState(dOffenseStateManager oSM){ diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Kick&Punch/OffenseKickState.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Kick&Punch/OffenseKickState.cs index be4991e..dbc605e 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Kick&Punch/OffenseKickState.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Kick&Punch/OffenseKickState.cs @@ -13,7 +13,7 @@ public class OffenseKickState : OffenseBaseState oSM.leg.SetActive(true); // activate leg kicked = false; // haven't kicked - oSM.animator.SetBool("IsKicking", true); + oSM.animator.SetBool("IsKickingIdle", true); //start kicking routine oSM.StartCoroutine(kicking(1f)); } @@ -22,7 +22,7 @@ public class OffenseKickState : OffenseBaseState legRotation = 0; // reset leg angle oSM.leg.transform.eulerAngles = new Vector3(legRotation, oSM.leg.transform.eulerAngles.y, oSM.leg.transform.eulerAngles.z); // rotate leg oSM.leg.SetActive(false); // reset leg angle - oSM.animator.SetBool("IsKicking", false); + oSM.animator.SetBool("IsKickingIdle", false); } public override void UpdateState(OffenseStateManager oSM){ diff --git a/Assets/Scripts/UI/Controls.meta b/Assets/Scripts/UI/Controls.meta new file mode 100644 index 0000000..a98876e --- /dev/null +++ b/Assets/Scripts/UI/Controls.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2f604442be2a1440adeaa1e30ab9be9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/ControlsMenuScript.cs b/Assets/Scripts/UI/Controls/ControlsMenuScript.cs similarity index 100% rename from Assets/Scripts/UI/ControlsMenuScript.cs rename to Assets/Scripts/UI/Controls/ControlsMenuScript.cs diff --git a/Assets/Scripts/UI/ControlsMenuScript.cs.meta b/Assets/Scripts/UI/Controls/ControlsMenuScript.cs.meta similarity index 100% rename from Assets/Scripts/UI/ControlsMenuScript.cs.meta rename to Assets/Scripts/UI/Controls/ControlsMenuScript.cs.meta diff --git a/Assets/Scripts/UI/GameManager.cs b/Assets/Scripts/UI/Controls/GameManager.cs similarity index 71% rename from Assets/Scripts/UI/GameManager.cs rename to Assets/Scripts/UI/Controls/GameManager.cs index 9e07ddd..1180eb7 100644 --- a/Assets/Scripts/UI/GameManager.cs +++ b/Assets/Scripts/UI/Controls/GameManager.cs @@ -26,21 +26,21 @@ public class GameManager : MonoBehaviour //for keyboard -/* walkForward = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkForwardKey", "W")); - walkBackward = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkBackwardKey", "S")); - walkLeft = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkLeftKey", "A")); - walkRight = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkRightKey", "D"));*/ - KeyCode jump = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("jumpKey", "Space")); - KeyCode kick = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("kickKey", "F")); + /* walkForward = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkForwardKey", "W")); + walkBackward = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkBackwardKey", "S")); + walkLeft = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkLeftKey", "A")); + walkRight = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("walkRightKey", "D"));*/ + //KeyCode jump = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("jumpKey", "Space")); KeyCode slide = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("slideKey", "Q")); + KeyCode kick = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("kickKey", "F")); KeyCode dash = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("dashKey", "R")); KeyCode nitro = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("nitroKey", "LeftShift")); KeyCode grapple = (KeyCode)System.Enum.Parse(typeof(KeyCode), PlayerPrefs.GetString("grappleKey", "E")); - bindableActions.Add("jumpKey", jump); - bindableActions.Add("kickKey", kick); + //bindableActions.Add("jumpKey", jump); bindableActions.Add("slideKey", slide); + bindableActions.Add("kickKey", kick); bindableActions.Add("dashKey", dash); bindableActions.Add("nitroKey", nitro); bindableActions.Add("grappleKey", grapple); diff --git a/Assets/Scripts/UI/GameManager.cs.meta b/Assets/Scripts/UI/Controls/GameManager.cs.meta similarity index 100% rename from Assets/Scripts/UI/GameManager.cs.meta rename to Assets/Scripts/UI/Controls/GameManager.cs.meta diff --git a/Assets/Scripts/UI/Controls/RebindManager.cs b/Assets/Scripts/UI/Controls/RebindManager.cs new file mode 100644 index 0000000..4a7b4b2 --- /dev/null +++ b/Assets/Scripts/UI/Controls/RebindManager.cs @@ -0,0 +1,287 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class RebindManager : MonoBehaviour +{ + Event keyEvent; + KeyCode newKey; + GameObject currentButtonObject; + //const array of valid input + readonly KeyCode[] valildKeys = {KeyCode.Q, KeyCode.E, KeyCode.R, KeyCode.F, KeyCode.LeftShift}; + + //dictionary with keycode as key and value as sprites + public Dictionary keyToSpriteDict = new Dictionary(); + //holds ref to all game buttons in scene (should be assigned in editor) + public List allButtonObjects = new List(); + //holds ref to all sprites + public Sprite[] allSprites; + + //currently waiting for input from user + bool waitingForKey; + bool hasPressedValidKey = false; + // Start is called before the first frame update + void Start() + { + List tHolder = new List(); + foreach (var item in GameManager.GM.bindableActions) + { + Debug.Log(item.Key + item.Value); + tHolder.Add(item.Value); + } + + + waitingForKey = false; + keyToSpriteDict.Add(KeyCode.Q, allSprites[0]); + keyToSpriteDict.Add(KeyCode.E, allSprites[1]); + keyToSpriteDict.Add(KeyCode.R, allSprites[2]); + keyToSpriteDict.Add(KeyCode.F, allSprites[3]); + keyToSpriteDict.Add(KeyCode.LeftShift, allSprites[4]); + + //currently hardcoded + allButtonObjects[0].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["grappleKey"]]; + allButtonObjects[1].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["slideKey"]]; + allButtonObjects[2].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["kickKey"]]; + allButtonObjects[3].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["dashKey"]]; + allButtonObjects[4].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["nitroKey"]]; + + //if any of them are shift, set them to correct dimension + //hardcoded, if anythem are bound to leftshift + if (GameManager.GM.bindableActions["grappleKey"] == KeyCode.LeftShift) + { + allButtonObjects[0].GetComponent().sizeDelta = new Vector2(200, 100); + } + else if (GameManager.GM.bindableActions["slideKey"] == KeyCode.LeftShift) + { + allButtonObjects[1].GetComponent().sizeDelta = new Vector2(200, 100); + } + else if (GameManager.GM.bindableActions["kickKey"] == KeyCode.LeftShift) + { + allButtonObjects[2].GetComponent().sizeDelta = new Vector2(200, 100); + } + else if (GameManager.GM.bindableActions["dashKey"] == KeyCode.LeftShift) + { + allButtonObjects[3].GetComponent().sizeDelta = new Vector2(200, 100); + } + else if (GameManager.GM.bindableActions["nitroKey"] == KeyCode.LeftShift) + { + allButtonObjects[4].GetComponent().sizeDelta = new Vector2(200, 100); + } + + + } + // Update is called once per frame + void Update() + { + + } + void OnGUI() + { + keyEvent = Event.current; + //if is a key event + if (keyEvent.isKey) + { + //if waiting for a key and the key entered is valid + if (waitingForKey && isValidKey(keyEvent.keyCode)) + { + newKey = keyEvent.keyCode; + waitingForKey = false; + hasPressedValidKey = true; + //Debug.Log("right key"); + } + } + } + public void SendCurrentButton(GameObject gameObject) + { + currentButtonObject = gameObject; + } + public void StartAssignment(string keyName) + { + if (!waitingForKey) + { + StartCoroutine(AssignKey(keyName)); + } + } + + // + IEnumerator waitForKey() + { + //if it gets past here it has a keycode, but we also want to double check if it is one of the 10 keys we + //TO-DO add controller keys + //Debug.Log("waiting"); + while (hasPressedValidKey == false) + { + yield return null; + } + } + public bool isValidKey(KeyCode keycode) + { + bool hasValue = false; + for(int i =0; i < valildKeys.Length; i++) { + if(valildKeys[i] == keycode) + { + hasValue = true; + } + } + return hasValue; + } + public bool areThereDuplicates() + { + //retrieve values from dictionary and put in list + bool duplicateExists = false; + List tHolder = new List(); + foreach (var item in GameManager.GM.bindableActions) + { + tHolder.Add(item.Value); + } + +/* foreach (var item in tHolder) + { + Debug.Log(item); + }*/ + + + //check list for duplicates + for (int i=0; i < tHolder.Count - 1; i++) + { + for(int j=i+1; j < tHolder.Count; j++) + { + if(tHolder[i] == tHolder[j]) + { + //if there is a duplicate + //set flag to tru + duplicateExists = true; + } + } + } + return duplicateExists; + } + public void setAllControlsToDefaults() + { + //set gm buttons to default + GameManager.GM.bindableActions["kickKey"] = KeyCode.F; + GameManager.GM.bindableActions["slideKey"] = KeyCode.Q; + GameManager.GM.bindableActions["dashKey"] = KeyCode.R; + GameManager.GM.bindableActions["nitroKey"] = KeyCode.LeftShift; + GameManager.GM.bindableActions["grappleKey"] = KeyCode.E; + + //set prefs turned off for now + /* PlayerPrefs.SetString("kickKey", GameManager.GM.bindableActions["kickKey"].ToString()); + PlayerPrefs.SetString("slideKey", GameManager.GM.bindableActions["slideKey"].ToString()); + PlayerPrefs.SetString("dashKey", GameManager.GM.bindableActions["dashKey"].ToString()); + PlayerPrefs.SetString("nitroKey", GameManager.GM.bindableActions["nitroKey"].ToString()); + PlayerPrefs.SetString("grappleKey", GameManager.GM.bindableActions["grappleKey"].ToString());*/ + + //set all sprites done (probs doesn't set scale back to default) + allButtonObjects[0].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["grappleKey"]]; + allButtonObjects[1].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["slideKey"]]; + allButtonObjects[2].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["kickKey"]]; + allButtonObjects[3].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["dashKey"]]; + allButtonObjects[4].GetComponent().sprite = keyToSpriteDict[GameManager.GM.bindableActions["nitroKey"]]; + } + public IEnumerator AssignKey(string keyName) + { + waitingForKey = true; + yield return waitForKey(); + + //could be a bit more dyanmic, but it is sufficeint solution for goal + switch (keyName) + { + //player prefs are used to keep key binds after game has closed (won't do anything until then). They are commented out for now for SGX + case "kick": + GameManager.GM.bindableActions["kickKey"] = newKey; + //replace image of button + currentButtonObject.GetComponent().sprite = keyToSpriteDict[newKey]; + + if (newKey == KeyCode.LeftShift) + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(200, 100); + } + //else set to regular size + else + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(100, 100); + } + //PlayerPrefs.SetString("kickKey", GameManager.GM.bindableActions["kickKey"].ToString()); + //revert flag + hasPressedValidKey = false; + break; + case "slide": + GameManager.GM.bindableActions["slideKey"] = newKey; + //replace image of button + currentButtonObject.GetComponent().sprite = keyToSpriteDict[newKey]; + + //if the new button is LeftShift, resie + if(newKey == KeyCode.LeftShift) + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(200, 100); + } + //else set to regular size + else + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(100, 100); + } + //PlayerPrefs.SetString("slideKey", GameManager.GM.bindableActions["slideKey"].ToString()); + //revert flag + hasPressedValidKey = false; + break; + case "dash": + GameManager.GM.bindableActions["dashKey"] = newKey; + //replace image of button + currentButtonObject.GetComponent().sprite = keyToSpriteDict[newKey]; + + //if the new button is LeftShift, resize (sprite image requires it) + if (newKey == KeyCode.LeftShift) + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(200, 100); + } + //else set to regular size + else + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(100, 100); + } + //PlayerPrefs.SetString("dashKey", GameManager.GM.bindableActions["dashKey"].ToString()); + //revert flag + hasPressedValidKey = false; + break; + case "nitro": + GameManager.GM.bindableActions["nitroKey"] = newKey; + //replace image of button + currentButtonObject.GetComponent().sprite = keyToSpriteDict[newKey]; + //if the new button is LeftShift, resie + if (newKey == KeyCode.LeftShift) + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(200, 100); + } + //else set to regular size + else + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(100, 100); + } + //PlayerPrefs.SetString("nitroKey", GameManager.GM.bindableActions["nitroKey"].ToString()); + //revert flag + hasPressedValidKey = false; + break; + case "grapple": + GameManager.GM.bindableActions["grappleKey"] = newKey; + //replace image of button + currentButtonObject.GetComponent().sprite = keyToSpriteDict[newKey]; + //if the new button is LeftShift, resie + if (newKey == KeyCode.LeftShift) + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(200, 100); + } + //else set to regular size + else + { + currentButtonObject.GetComponent().sizeDelta = new Vector2(100, 100); + } + //PlayerPrefs.SetString("grappleKey", GameManager.GM.bindableActions["grappleKey"].ToString()); + //revert flag + hasPressedValidKey = false; + break; + } + yield return null; + } +} diff --git a/Assets/Scripts/UI/RebindManager.cs.meta b/Assets/Scripts/UI/Controls/RebindManager.cs.meta similarity index 100% rename from Assets/Scripts/UI/RebindManager.cs.meta rename to Assets/Scripts/UI/Controls/RebindManager.cs.meta diff --git a/Assets/Scripts/UI/Controls/WarningPop.cs b/Assets/Scripts/UI/Controls/WarningPop.cs new file mode 100644 index 0000000..8233dcf --- /dev/null +++ b/Assets/Scripts/UI/Controls/WarningPop.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + + +public class WarningPop : MonoBehaviour +{ + public GameObject warningBox; + // Start is called before the first frame update + + //they no want defautls + public void cancel() + { + warningBox.SetActive(false); + } + public void setDefaultAndContinue() + { + //set default + this.GetComponent().setAllControlsToDefaults(); + warningBox.SetActive(false); + SceneManager.LoadScene("Options"); + } +} diff --git a/Assets/Scripts/UI/Controls/WarningPop.cs.meta b/Assets/Scripts/UI/Controls/WarningPop.cs.meta new file mode 100644 index 0000000..30cbced --- /dev/null +++ b/Assets/Scripts/UI/Controls/WarningPop.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: df9e171fd2cc7654982551923930a953 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/RebindManager.cs b/Assets/Scripts/UI/RebindManager.cs deleted file mode 100644 index 78cfcb4..0000000 --- a/Assets/Scripts/UI/RebindManager.cs +++ /dev/null @@ -1,163 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class RebindManager : MonoBehaviour -{ - Event keyEvent; - KeyCode newKey; - GameObject currentButtonObject; - //const array of valid input - readonly KeyCode[] valildKeys = {KeyCode.Q, KeyCode.E, KeyCode.R, KeyCode.F, KeyCode.LeftShift, KeyCode.Space}; - - - //currently waiting for input from user - bool waitingForKey; - bool hasPressedValidKey = false; - // Start is called before the first frame update - void Start() - { - waitingForKey = false; - //go through all buttons and set correct image - //for - - - - - } - // Update is called once per frame - void Update() - { - - } - void OnGUI() - { - keyEvent = Event.current; - //if is a key event - if (keyEvent.isKey) - { - //if waiting for a key and the key entered is valid - if (waitingForKey && isValidKey(keyEvent.keyCode)) - { - newKey = keyEvent.keyCode; - waitingForKey = false; - hasPressedValidKey = true; - //Debug.Log("right key"); - } - } - } - public void SendCurrentButton(GameObject gameObject) - { - currentButtonObject = gameObject; - } - public void StartAssignment(string keyName) - { - if (!waitingForKey) - { - StartCoroutine(AssignKey(keyName)); - } - } - - // - IEnumerator waitForKey() - { - //if it gets past here it has a keycode, but we also want to double check if it is one of the 10 keys we - //TO-DO add controller keys - //Debug.Log("waiting"); - while (hasPressedValidKey == false) - { - yield return null; - } - } - public bool isValidKey(KeyCode keycode) - { - bool hasValue = false; - for(int i =0; i < valildKeys.Length; i++) { - if(valildKeys[i] == keycode) - { - hasValue = true; - } - } - return hasValue; - } - public bool areThereDuplicates() - { - bool duplicateExists = false; - List tHolder = new List(); - foreach (var item in GameManager.GM.bindableActions) - { - tHolder.Add(item.Value); - } - - /* foreach (var item in tHolder) - { - Debug.Log(item); - }*/ - - for(int i=0; i < tHolder.Count - 1; i++) - { - for(int j=i+1; j < tHolder.Count; j++) - { - if(tHolder[i] == tHolder[j]) - { - - duplicateExists = true; - } - } - } - return duplicateExists; - } - public IEnumerator AssignKey(string keyName) - { - waitingForKey = true; - yield return waitForKey(); - - //could be a bit more dyanmic, but it is sufficeint solution for goal - switch (keyName) - { - //player prefs are used to keep key binds after game has closed (won't do anything until then). They are commented out for now for SGX - case "kick": - GameManager.GM.bindableActions["kickKey"] = newKey; - //replace image of button - //currentButtonObject.GetComponent().sprite = - //PlayerPrefs.SetString("kickKey", GameManager.GM.bindableActions["kickKey"].ToString()); - //revert flag - hasPressedValidKey = false; - break; - case "slide": - GameManager.GM.bindableActions["slideKey"] = newKey; - //replace image of button - //currentButtonObject.GetComponent().sprite = - //PlayerPrefs.SetString("slideKey", GameManager.GM.bindableActions["slideKey"].ToString()); - //revert flag - hasPressedValidKey = false; - break; - case "dash": - GameManager.GM.bindableActions["dashKey"] = newKey; - //replace image of button - //currentButtonObject.GetComponent().sprite = - //PlayerPrefs.SetString("dashKey", GameManager.GM.bindableActions["dashKey"].ToString()); - //revert flag - hasPressedValidKey = false; - break; - case "nitro": - GameManager.GM.bindableActions["nitroKey"] = newKey; - //replace image of button - //currentButtonObject.GetComponent().sprite = - //PlayerPrefs.SetString("nitroKey", GameManager.GM.bindableActions["nitroKey"].ToString()); - //revert flag - hasPressedValidKey = false; - break; - case "grapple": - GameManager.GM.bindableActions["grappleKey"] = newKey; - //replace image of button - //currentButtonObject.GetComponent().sprite = - //PlayerPrefs.SetString("grappleKey", GameManager.GM.bindableActions["grappleKey"].ToString()); - //revert flag - hasPressedValidKey = false; - break; - } - yield return null; - } -} diff --git a/Assets/Scripts/UI/Title/ReturnToTitle.cs b/Assets/Scripts/UI/Title/ReturnToTitle.cs index 1f9a620..cc4168a 100644 --- a/Assets/Scripts/UI/Title/ReturnToTitle.cs +++ b/Assets/Scripts/UI/Title/ReturnToTitle.cs @@ -5,11 +5,24 @@ using UnityEngine.SceneManagement; public class ReturnToTitle : MonoBehaviour { - public void backToSettings(){ - SceneManager.LoadScene("Options"); + //reference to canvas (used to clal rebindManager) + public Canvas canvasRef; + public GameObject warningBox; + + public void backToSettings() + { + //if there are no duplicates, let them go back + if (canvasRef.GetComponent().areThereDuplicates() == false){ + SceneManager.LoadScene("Options"); + } + //bring + else + { + warningBox.SetActive(true); + } } - public void backToTitle(){ - SceneManager.LoadScene("TitleScene"); - } -} + public void backToTitle() { + SceneManager.LoadScene("TitleScene"); + } +} \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 7df0245..90c084d 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 + value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 + value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 vcSharedLogLevel: value: 0d5e400f0650