diff --git a/Assets/Prefabs/Minion Placeholder.prefab b/Assets/Prefabs/Minion Placeholder.prefab new file mode 100644 index 0000000..01f0e6e --- /dev/null +++ b/Assets/Prefabs/Minion Placeholder.prefab @@ -0,0 +1,115 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3184282681332450356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6153955645646227194} + m_Layer: 0 + m_Name: Minion Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6153955645646227194 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3184282681332450356} + 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: 235749034672455163} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6096501706814537923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 235749034672455163} + - component: {fileID: 8528772758425380850} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &235749034672455163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6096501706814537923} + 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: 6153955645646227194} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8528772758425380850 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6096501706814537923} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Color: {r: 1, g: 0.609827, b: 0.2028302, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Minion Placeholder.prefab.meta b/Assets/Prefabs/Minion Placeholder.prefab.meta new file mode 100644 index 0000000..6cea558 --- /dev/null +++ b/Assets/Prefabs/Minion Placeholder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ad8e845c759fda343ab2c2a62d9aa373 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/YannTest.unity b/Assets/Scenes/YannTest.unity index 3b762c3..87eb671 100644 --- a/Assets/Scenes/YannTest.unity +++ b/Assets/Scenes/YannTest.unity @@ -319,6 +319,253 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1072850790 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1072850792} + - component: {fileID: 1072850791} + - component: {fileID: 1072850793} + - component: {fileID: 1072850794} + m_Layer: 0 + m_Name: Player Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1072850791 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072850790} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1072850792 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072850790} + 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: 1166324212} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1072850793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072850790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56c3e06ea5db48a40a7f55e72291cb0d, type: 3} + m_Name: + m_EditorClassIdentifier: + aimArrow: {fileID: 1166324211} +--- !u!114 &1072850794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072850790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 3f999e92409efaa4fa202b3263fc7ba4, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 1071c237-0382-46b6-9750-c39a686354f8 + m_ActionName: Player/Move[/XInputControllerWindows/leftStick,/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: eefb12f1-0980-4e79-a169-5b8d9c5f8909 + m_ActionName: Player/Jump[/XInputControllerWindows/buttonSouth,/Keyboard/space] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: bd3662a8-0f8c-46c3-a035-be5ce123a673 + m_ActionName: Player/Suck[/XInputControllerWindows/buttonWest,/Keyboard/e] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: d0405457-c534-4103-a0b6-cf113432b467 + m_ActionName: Player/SwitchMinion[/Keyboard/q,/Keyboard/e,/XInputControllerWindows/leftShoulder,/XInputControllerWindows/rightShoulder] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1072850793} + m_TargetAssemblyTypeName: MinionThrower, Assembly-CSharp + m_MethodName: AimThrow + m_Mode: 0 + 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 + m_ActionId: 09f4053a-a3bc-44c9-829a-ec0efcb4551d + m_ActionName: Player/Aim[/XInputControllerWindows/rightStick,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1072850793} + m_TargetAssemblyTypeName: MinionThrower, Assembly-CSharp + m_MethodName: ToggleThrowMode + m_Mode: 0 + 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 + m_ActionId: 6f870ff4-cc58-4173-855c-37192c5b63f5 + m_ActionName: Player/Throw[/Keyboard/r,/XInputControllerWindows/buttonNorth] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: bba4f6e1-6e22-4374-b248-2e5bc19a3705 + m_ActionName: UI/Navigate[/XInputControllerWindows/leftStick/up,/XInputControllerWindows/rightStick/up,/XInputControllerWindows/leftStick/down,/XInputControllerWindows/rightStick/down,/XInputControllerWindows/leftStick/left,/XInputControllerWindows/rightStick/left,/XInputControllerWindows/leftStick/right,/XInputControllerWindows/rightStick/right,/XInputControllerWindows/dpad,/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: f0db3b44-2fa0-4228-9bca-9c384c0d12c6 + m_ActionName: UI/Submit[/Keyboard/enter,/XInputControllerWindows/buttonSouth] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: baf9b26e-f035-4332-98a0-35730b6f70c8 + m_ActionName: UI/Cancel[/Keyboard/escape,/XInputControllerWindows/buttonEast] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 17b66829-f839-44f5-9544-2693e69f7dea + m_ActionName: UI/Point[/Mouse/position] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 1ebf91c2-c166-4c56-84b5-b441c4bc0788 + m_ActionName: UI/Click[/Mouse/leftButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: e6c07a73-7275-4cad-b986-88f211037618 + m_ActionName: UI/ScrollWheel[/Mouse/scroll] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 2664e5d8-ab63-41f4-b614-5aaa91e73447 + m_ActionName: UI/MiddleClick[/Mouse/middleButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 056609de-e1b8-4db5-be6d-089e2e870adf + m_ActionName: UI/RightClick[/Mouse/rightButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: e6b3fe0b-f8c4-43f6-8c25-939569ff5b0e + m_ActionName: UI/TrackedDevicePosition + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 6e7e8be9-9198-4490-bb0c-a25fa63601b6 + m_ActionName: UI/TrackedDeviceOrientation + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!1 &1166324211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1166324212} + m_Layer: 0 + m_Name: Aim Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1166324212 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1166324211} + 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: 1484154427} + m_Father: {fileID: 1072850792} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1302468886 GameObject: m_ObjectHideFlags: 0 @@ -396,10 +643,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: minionTypes: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 3184282681332450356, guid: ad8e845c759fda343ab2c2a62d9aa373, type: 3} + - {fileID: 3184282681332450356, guid: ad8e845c759fda343ab2c2a62d9aa373, type: 3} + - {fileID: 3184282681332450356, guid: ad8e845c759fda343ab2c2a62d9aa373, type: 3} + - {fileID: 3184282681332450356, guid: ad8e845c759fda343ab2c2a62d9aa373, type: 3} minionIconPrefab: {fileID: 1979632678310270257, guid: 2fee1ea5c97c5a04bb2c5f1f685fc92e, type: 3} --- !u!114 &1302468890 MonoBehaviour: @@ -494,11 +741,101 @@ MonoBehaviour: m_CallState: 2 m_ActionId: d0405457-c534-4103-a0b6-cf113432b467 m_ActionName: Player/SwitchMinion[/Keyboard/q,/Keyboard/e,/XInputControllerWindows/leftShoulder,/XInputControllerWindows/rightShoulder] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 09f4053a-a3bc-44c9-829a-ec0efcb4551d + m_ActionName: Player/Aim[/XInputControllerWindows/rightStick,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 6f870ff4-cc58-4173-855c-37192c5b63f5 + m_ActionName: Player/Throw[/Keyboard/r,/XInputControllerWindows/buttonNorth] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: Player m_SplitScreenIndex: -1 m_Camera: {fileID: 0} +--- !u!1 &1484154426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1484154427} + - component: {fileID: 1484154428} + m_Layer: 0 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1484154427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484154426} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2, y: 0, z: 0} + m_LocalScale: {x: 2, y: 0.1, z: 1} + m_Children: [] + m_Father: {fileID: 1166324212} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1484154428 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484154426} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1535968660 GameObject: m_ObjectHideFlags: 0 @@ -585,6 +922,7 @@ GameObject: - component: {fileID: 1612282034} - component: {fileID: 1612282033} - component: {fileID: 1612282032} + - component: {fileID: 1612282035} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -657,6 +995,39 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1612282035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612282031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &1877036976 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/MinionThrower.cs b/Assets/Scripts/MinionThrower.cs index 5b7372e..2660e36 100644 --- a/Assets/Scripts/MinionThrower.cs +++ b/Assets/Scripts/MinionThrower.cs @@ -5,8 +5,6 @@ using UnityEngine.InputSystem; public class MinionThrower : MonoBehaviour { - public GameObject placeholderMinionPrefab; - public GameObject aimArrow; bool isInThrowMode; @@ -18,6 +16,7 @@ public class MinionThrower : MonoBehaviour { } public void ToggleThrowMode(InputAction.CallbackContext context) { + print("a " + context.phase.ToString()); if(context.performed) { isInThrowMode = true; } else if(context.canceled) { @@ -27,15 +26,17 @@ public class MinionThrower : MonoBehaviour { } public void AimThrow(InputAction.CallbackContext context) { + print("b " + context.ReadValue().ToString()); throwDirection = context.ReadValue().normalized; + aimArrow.transform.rotation = Quaternion.FromToRotation(transform.right, throwDirection); } void PerformThrow() { if(!isInThrowMode) { return; } - Object currentMinion = minionBar.GetCurrentMinion(); - GameObject newMinion = Instantiate(placeholderMinionPrefab, transform.position + new Vector3(throwDirection.x, throwDirection.y, 0f) * 1f, Quaternion.identity); + GameObject newMinion = Instantiate(minionBar.GetCurrentMinion(), transform.position + new Vector3(throwDirection.x, throwDirection.y, 0f) * 1f, Quaternion.identity); + // Apply throw force } } diff --git a/Assets/Scripts/UI/MinionBar.cs b/Assets/Scripts/UI/MinionBar.cs index 48d5b84..9e1b99b 100644 --- a/Assets/Scripts/UI/MinionBar.cs +++ b/Assets/Scripts/UI/MinionBar.cs @@ -5,7 +5,7 @@ using UnityEngine.InputSystem; public class MinionBar : MonoBehaviour { - public Object[] minionTypes; + public GameObject[] minionTypes; public GameObject minionIconPrefab; MinionIcon[] minionIcons; @@ -46,7 +46,7 @@ public class MinionBar : MonoBehaviour { // print("new selected minion type : " + currentIndex.ToString()); } - public Object GetCurrentMinion() { + public GameObject GetCurrentMinion() { return minionTypes[currentIndex]; } diff --git a/Assets/Settings/ConjureLudumDare50.inputactions b/Assets/Settings/ConjureLudumDare50.inputactions index 92bc982..5efb17f 100644 --- a/Assets/Settings/ConjureLudumDare50.inputactions +++ b/Assets/Settings/ConjureLudumDare50.inputactions @@ -40,6 +40,24 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Aim", + "type": "Value", + "id": "09f4053a-a3bc-44c9-829a-ec0efcb4551d", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Throw", + "type": "Button", + "id": "6f870ff4-cc58-4173-855c-37192c5b63f5", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -284,6 +302,94 @@ "action": "SwitchMinion", "isComposite": false, "isPartOfComposite": true + }, + { + "name": "", + "id": "2ee1f7f0-f3f1-4e56-8612-df107e397ef8", + "path": "/r", + "interactions": "", + "processors": "", + "groups": "", + "action": "Throw", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "cf5e87bb-ed2a-433c-95f7-84f0d4f35929", + "path": "/buttonNorth", + "interactions": "", + "processors": "", + "groups": "", + "action": "Throw", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9feebf49-c2e0-4cf1-9a0c-210f8d284c99", + "path": "/rightStick", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Directionnal arrows", + "id": "3746bd1a-6768-44b7-be2e-d28e87b34679", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "3dc03336-9818-4b34-adcd-7b4e29584953", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "a6cbc7d7-7102-4fa4-a950-76c9a53eed92", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "5dc64a8b-901d-4277-9c52-2dcc67ff276b", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "124bbe5b-42cc-49cc-afc4-b0d4c28e69ef", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "", + "action": "Aim", + "isComposite": false, + "isPartOfComposite": true } ] },