From b0fb0f9e09a542894212532f32c8401b40e44048 Mon Sep 17 00:00:00 2001 From: Evan Nydahl Date: Wed, 27 Apr 2022 19:52:01 -0500 Subject: [PATCH] ReAssigned Controller and added colliders for controller in pasue menu --- Assets/Prefabs/Game/PauseMenu.prefab | 440 +++++++++++++++++- Assets/Scenes/Demos/BreakableBlocks.unity | 4 +- Assets/Scenes/Options.unity | 6 +- .../DebugAerialState/dAerialStateManager.cs | 2 +- .../DebugDash/dDashNoneState.cs | 2 +- .../DebugNitro/dNitroNoneState.cs | 2 +- .../DebugOffense/dOffenseNoneState.cs | 4 +- .../AerialState/AerialStateManager.cs | 2 +- .../DashState/Dash/DashNoneState.cs | 2 +- .../NitroState/Nitro/NitroNoneState.cs | 2 +- .../OffenseState/Offense/OffenseNoneState.cs | 4 +- .../Scripts/UI/Controls/ControlsMenuScript.cs | 28 +- UserSettings/EditorUserSettings.asset | 26 +- 13 files changed, 454 insertions(+), 70 deletions(-) diff --git a/Assets/Prefabs/Game/PauseMenu.prefab b/Assets/Prefabs/Game/PauseMenu.prefab index ccce43c..6e1a9bb 100644 --- a/Assets/Prefabs/Game/PauseMenu.prefab +++ b/Assets/Prefabs/Game/PauseMenu.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 5433838229305792719} - component: {fileID: 8338240346242917450} - component: {fileID: 5493919945375996349} + - component: {fileID: 4819973169499212989} + - component: {fileID: 1520991451151998414} m_Layer: 5 m_Name: No m_TagString: Untagged @@ -132,6 +134,53 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!50 &4819973169499212989 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451556703987980318} + 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 &1520991451151998414 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451556703987980318} + 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: 300, y: 150} + m_EdgeRadius: 0 --- !u!1 &958517785060009819 GameObject: m_ObjectHideFlags: 0 @@ -278,6 +327,8 @@ GameObject: - component: {fileID: 2924649602741248367} - component: {fileID: 3484684182119191096} - component: {fileID: 1595670806379124694} + - component: {fileID: 8229065992285294547} + - component: {fileID: 4352579872230879398} m_Layer: 5 m_Name: No m_TagString: Untagged @@ -398,6 +449,53 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!50 &8229065992285294547 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1684178345811703121} + 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 &4352579872230879398 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1684178345811703121} + 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: 300, y: 150} + m_EdgeRadius: 0 --- !u!1 &2884488883947615754 GameObject: m_ObjectHideFlags: 0 @@ -410,6 +508,8 @@ GameObject: - component: {fileID: 7833952391038157643} - component: {fileID: 4795927247137001599} - component: {fileID: 901687264667949450} + - component: {fileID: 1097721352388150239} + - component: {fileID: 5978171380920093798} m_Layer: 5 m_Name: Reset Player m_TagString: Untagged @@ -531,6 +631,53 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!50 &1097721352388150239 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2884488883947615754} + 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 &5978171380920093798 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2884488883947615754} + 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: 400, y: 150} + m_EdgeRadius: 0 --- !u!1 &3332378607483661777 GameObject: m_ObjectHideFlags: 0 @@ -543,6 +690,8 @@ GameObject: - component: {fileID: 640538301296595160} - component: {fileID: 2104409052775902095} - component: {fileID: 5878630193185967097} + - component: {fileID: 3666250099127514120} + - component: {fileID: 5776327551676720113} m_Layer: 5 m_Name: Resume Game m_TagString: Untagged @@ -663,6 +812,53 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!50 &3666250099127514120 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3332378607483661777} + 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 &5776327551676720113 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3332378607483661777} + 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: 500, y: 120} + m_EdgeRadius: 0 --- !u!1 &3830806490259888607 GameObject: m_ObjectHideFlags: 0 @@ -886,6 +1082,8 @@ GameObject: - component: {fileID: 1886829138446971759} - component: {fileID: 4508367141461923727} - component: {fileID: 4559567947970002408} + - component: {fileID: 7111048423987156855} + - component: {fileID: 7228847528741810582} m_Layer: 5 m_Name: Quit Game m_TagString: Untagged @@ -1006,6 +1204,53 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!61 &7111048423987156855 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4147107921178206352} + 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: 500, y: 120} + m_EdgeRadius: 0 +--- !u!50 &7228847528741810582 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4147107921178206352} + 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 &4414581513358013603 GameObject: m_ObjectHideFlags: 0 @@ -1105,6 +1350,8 @@ GameObject: - component: {fileID: 3802064352915797351} - component: {fileID: 4332827154247433946} - component: {fileID: 240069910456330447} + - component: {fileID: 2553089861890761925} + - component: {fileID: 2913527217006116280} m_Layer: 5 m_Name: Controls m_TagString: Untagged @@ -1225,6 +1472,53 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!61 &2553089861890761925 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4446168051527838164} + 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: 500, y: 120} + m_EdgeRadius: 0 +--- !u!50 &2913527217006116280 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4446168051527838164} + 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: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &5027872871932674801 GameObject: m_ObjectHideFlags: 0 @@ -1316,6 +1610,8 @@ GameObject: - component: {fileID: 8951795080569376307} - component: {fileID: 7579446591872151628} - component: {fileID: 2547471780069228184} + - component: {fileID: 5784571601551121603} + - component: {fileID: 2807421781297616665} m_Layer: 5 m_Name: Yes m_TagString: Untagged @@ -1436,6 +1732,53 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!61 &5784571601551121603 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5462472603902457520} + 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: 300, y: 150} + m_EdgeRadius: 0 +--- !u!50 &2807421781297616665 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5462472603902457520} + 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 &6166253268564238546 GameObject: m_ObjectHideFlags: 0 @@ -1582,6 +1925,8 @@ GameObject: - component: {fileID: 6315999763176095441} - component: {fileID: 5587618179766766041} - component: {fileID: 2974351421764017748} + - component: {fileID: 2645143821802652893} + - component: {fileID: 4602108851939528234} m_Layer: 5 m_Name: Yes m_TagString: Untagged @@ -1702,6 +2047,53 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!61 &2645143821802652893 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7080744422910871472} + 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: 300, y: 150} + m_EdgeRadius: 0 +--- !u!50 &4602108851939528234 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7080744422910871472} + 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 &8561726280644655765 GameObject: m_ObjectHideFlags: 0 @@ -1891,6 +2283,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1793745641813536501} m_Modifications: + - target: {fileID: 9937337342898206, guid: b011977908109f5499facd442c54a381, type: 3} + propertyPath: m_Size.x + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 9937337342898206, guid: b011977908109f5499facd442c54a381, type: 3} + propertyPath: m_Size.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1191276914729058385, guid: b011977908109f5499facd442c54a381, type: 3} + propertyPath: m_Size.x + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 1191276914729058385, guid: b011977908109f5499facd442c54a381, type: 3} + propertyPath: m_Size.y + value: 100 + objectReference: {fileID: 0} - target: {fileID: 2826890308670544853, guid: b011977908109f5499facd442c54a381, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2017,22 +2425,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b011977908109f5499facd442c54a381, type: 3} ---- !u!114 &6732421683011924078 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8880696270374963161, guid: b011977908109f5499facd442c54a381, type: 3} - m_PrefabInstance: {fileID: 2760935190401791927} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &2454220827682723122 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 315229139951084165, guid: b011977908109f5499facd442c54a381, type: 3} - m_PrefabInstance: {fileID: 2760935190401791927} - m_PrefabAsset: {fileID: 0} --- !u!1 &7490756162657434656 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4729990066779556759, guid: b011977908109f5499facd442c54a381, type: 3} @@ -2059,3 +2451,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &6732421683011924078 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8880696270374963161, guid: b011977908109f5499facd442c54a381, type: 3} + m_PrefabInstance: {fileID: 2760935190401791927} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2454220827682723122 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 315229139951084165, guid: b011977908109f5499facd442c54a381, type: 3} + m_PrefabInstance: {fileID: 2760935190401791927} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Demos/BreakableBlocks.unity b/Assets/Scenes/Demos/BreakableBlocks.unity index b146b02..5485f9b 100644 --- a/Assets/Scenes/Demos/BreakableBlocks.unity +++ b/Assets/Scenes/Demos/BreakableBlocks.unity @@ -668,11 +668,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3} propertyPath: hasNitro - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3} propertyPath: hasGlider - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3} propertyPath: hasGrapple diff --git a/Assets/Scenes/Options.unity b/Assets/Scenes/Options.unity index a39ead6..39a8d9d 100644 --- a/Assets/Scenes/Options.unity +++ b/Assets/Scenes/Options.unity @@ -291,7 +291,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1659762132620482750, guid: a4b73e27fc2b6314899be279692e516a, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1659762132620482750, guid: a4b73e27fc2b6314899be279692e516a, type: 3} propertyPath: m_AnchorMax.x @@ -1181,7 +1181,7 @@ RectTransform: m_Children: - {fileID: 935642449} m_Father: {fileID: 1713758107} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1569,8 +1569,8 @@ RectTransform: - {fileID: 1959534872} - {fileID: 2042651154} - {fileID: 658843504} - - {fileID: 126909622} - {fileID: 1475788377} + - {fileID: 126909622} m_Father: {fileID: 1619285604} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs index 86f0f96..fd95810 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs @@ -571,7 +571,7 @@ public class dAerialStateManager : NetworkBehaviour //Checks if the player can grapple public bool CheckGrapple(){ if(!pStats.IsPaused){ - if ((Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton2)) && pStats.HasGrapple) //If grapple button is hit + if ((Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton10)) && pStats.HasGrapple) //If grapple button is hit { //Debug.Log("Checking Hooks"); hookPointIndex = FindHookPoint(); //Find the nearest hook point within max distance diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/DebugDash/dDashNoneState.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/DebugDash/dDashNoneState.cs index f73bd1a..858f423 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/DebugDash/dDashNoneState.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/DebugDash/dDashNoneState.cs @@ -23,7 +23,7 @@ public class dDashNoneState : dDashBaseState } //if R key then Dashing - else if ((Input.GetKeyDown(KeyCode.R) || Input.GetAxis("Dash") != 0) && !dSM.pStats.IsPaused){ + else if ((Input.GetKeyDown(KeyCode.R) || Input.GetKeyDown(KeyCode.JoystickButton5) && !dSM.pStats.IsPaused)){ dSM.SwitchState(dSM.DashingState); } diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroNoneState.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroNoneState.cs index 787b2b4..6b289e0 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroNoneState.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroNoneState.cs @@ -23,7 +23,7 @@ public class dNitroNoneState : dNitroBaseState } //if pressing left shift then nitroing - else if ((Input.GetKeyDown(KeyCode.LeftShift) || Input.GetKeyDown(KeyCode.JoystickButton8)) && !nSM.pStats.IsPaused) + else if ((Input.GetKeyDown(KeyCode.LeftShift) || Input.GetKeyDown(KeyCode.JoystickButton4)) && !nSM.pStats.IsPaused) { nSM.SwitchState(nSM.NitroingState); } diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugOffense/dOffenseNoneState.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugOffense/dOffenseNoneState.cs index ed66387..66232be 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugOffense/dOffenseNoneState.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugOffense/dOffenseNoneState.cs @@ -20,13 +20,13 @@ public class dOffenseNoneState : dOffenseBaseState } //if grounded then grounded kick states - else if(oSM.aSM.currentState == oSM.aSM.GroundedState && (Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && !oSM.pStats.IsPaused){ + else if(oSM.aSM.currentState == oSM.aSM.GroundedState && (Input.GetKeyDown(KeyCode.F) || Input.GetKeyDown(KeyCode.JoystickButton2)) && !oSM.pStats.IsPaused){ // kick oSM.SwitchState(oSM.KickState); } //if in the air - else if((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && !oSM.pStats.IsPaused){ + else if((Input.GetKeyDown(KeyCode.F) || Input.GetKeyDown(KeyCode.JoystickButton2)) && !oSM.pStats.IsPaused){ //air kick oSM.SwitchState(oSM.AirKickState); } diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs index 02bef2b..8d94304 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs @@ -588,7 +588,7 @@ public class AerialStateManager : NetworkBehaviour ////Grapple Functions public bool CheckGrapple(){ if(!pStats.IsPaused){ - if ((Input.GetKeyDown(GameManager.GM.bindableActions["grappleKey"]) || Input.GetKeyDown(KeyCode.JoystickButton2)) && pStats.HasGrapple) //If grapple button is hit + if ((Input.GetKeyDown(GameManager.GM.bindableActions["grappleKey"]) || Input.GetKeyDown(KeyCode.JoystickButton10)) && pStats.HasGrapple) //If grapple button is hit { //Debug.Log("Checking Hooks"); hookPointIndex = FindHookPoint(); //Find the nearest hook point within max distance diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/Dash/DashNoneState.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/Dash/DashNoneState.cs index aac50f6..922d96a 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/Dash/DashNoneState.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/Dash/DashNoneState.cs @@ -23,7 +23,7 @@ public class DashNoneState : DashBaseState } //if R key then Dashing - else if ((Input.GetKeyDown(GameManager.GM.bindableActions["dashKey"]) || Input.GetAxis("Dash") != 0) && !dSM.pStats.IsPaused){ + else if ((Input.GetKeyDown(GameManager.GM.bindableActions["dashKey"]) || Input.GetKeyDown(KeyCode.JoystickButton5) && !dSM.pStats.IsPaused)){ dSM.SwitchState(dSM.DashingState); } diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroNoneState.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroNoneState.cs index a68fb52..b4d2e1b 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroNoneState.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroNoneState.cs @@ -23,7 +23,7 @@ public class NitroNoneState : NitroBaseState } //if pressing left shift then nitroing - else if ((Input.GetKeyDown(GameManager.GM.bindableActions["nitroKey"]) || Input.GetKeyDown(KeyCode.JoystickButton8)) && !nSM.pStats.IsPaused) + else if ((Input.GetKeyDown(GameManager.GM.bindableActions["nitroKey"]) || Input.GetKeyDown(KeyCode.JoystickButton4)) && !nSM.pStats.IsPaused) { nSM.SwitchState(nSM.NitroingState); } diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Offense/OffenseNoneState.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Offense/OffenseNoneState.cs index 02575da..fc5d07b 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Offense/OffenseNoneState.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Offense/OffenseNoneState.cs @@ -20,13 +20,13 @@ public class OffenseNoneState : OffenseBaseState } //if grounded then grounded kick states - else if(oSM.aSM.currentState == oSM.aSM.GroundedState && (Input.GetKeyDown(GameManager.GM.bindableActions["kickKey"]) || Input.GetAxis("Kick") != 0) && !oSM.pStats.IsPaused){ + else if(oSM.aSM.currentState == oSM.aSM.GroundedState && (Input.GetKeyDown(GameManager.GM.bindableActions["kickKey"]) || Input.GetKeyDown(KeyCode.JoystickButton2)) && !oSM.pStats.IsPaused){ //Regular Kick oSM.SwitchState(oSM.KickState); } //if in the air - else if((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && !oSM.pStats.IsPaused){ + else if((Input.GetKeyDown(KeyCode.F) || Input.GetKeyDown(KeyCode.JoystickButton2) && !oSM.pStats.IsPaused)){ oSM.SwitchState(oSM.AirKickState); } } diff --git a/Assets/Scripts/UI/Controls/ControlsMenuScript.cs b/Assets/Scripts/UI/Controls/ControlsMenuScript.cs index 3cdfcb8..d3bac03 100644 --- a/Assets/Scripts/UI/Controls/ControlsMenuScript.cs +++ b/Assets/Scripts/UI/Controls/ControlsMenuScript.cs @@ -32,12 +32,6 @@ public class ControlsMenuScript : MonoBehaviour keyboardKingControlsMenu.SetActive(false); gamePadKingControlsMenu.SetActive(true); } - //if off, turn it on - if(gamePadKingControlsMenu.activeInHierarchy == false) - { - keyboardKingControlsMenu.SetActive(false); - gamePadKingControlsMenu.SetActive(true); - } } else{ //if off, turn it on @@ -46,12 +40,6 @@ public class ControlsMenuScript : MonoBehaviour keyboardRunnerControlsMenu.SetActive(false); gamePadRunnerControlsMenu.SetActive(true); } - //if off, turn it on - if(gamePadRunnerControlsMenu.activeInHierarchy == false) - { - keyboardRunnerControlsMenu.SetActive(false); - gamePadRunnerControlsMenu.SetActive(true); - } } } @@ -59,14 +47,8 @@ public class ControlsMenuScript : MonoBehaviour if (Input.GetAxis("Mouse X") != 0 || Input.GetAxis("Mouse Y") != 0) { if(isKing){ - //if off, turn it on - if(gamePadKingControlsMenu.activeInHierarchy == false) - { - keyboardKingControlsMenu.SetActive(true); - gamePadKingControlsMenu.SetActive(false); - } //if off, turn it on - if(gamePadKingControlsMenu.activeInHierarchy == false) + if(keyboardKingControlsMenu.activeInHierarchy == false) { keyboardKingControlsMenu.SetActive(true); gamePadKingControlsMenu.SetActive(false); @@ -74,17 +56,11 @@ public class ControlsMenuScript : MonoBehaviour } else{ //if off, turn it on - if(gamePadRunnerControlsMenu.activeInHierarchy == false) + if(keyboardRunnerControlsMenu.activeInHierarchy == false) { keyboardRunnerControlsMenu.SetActive(true); gamePadRunnerControlsMenu.SetActive(false); } - //if off, turn it on - if(gamePadRunnerControlsMenu.activeInHierarchy == false) - { - keyboardRunnerControlsMenu.SetActive(true); - gamePadRunnerControlsMenu.SetActive(false); - } } } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 3506174..78a2705 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,13 +6,13 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 @@ -21,19 +21,19 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 - flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c731f1415016439262f2434 - flags: 0 - RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 - flags: 0 - RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c731f1415016439262f2434 + flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 vcSharedLogLevel: value: 0d5e400f0650