From 11cc3d18f88ba2d7181b057d2b82bc7eb0ba491a Mon Sep 17 00:00:00 2001 From: bread disco <> Date: Sun, 24 Sep 2023 18:40:39 +0200 Subject: [PATCH] Ennemy basic behavior --- InsAsterix/Assets/Prefabs/Player.meta | 8 + .../Assets/Prefabs/Player/PlayerObelix.prefab | 480 ++++++++++++++++ .../Prefabs/Player/PlayerObelix.prefab.meta | 7 + InsAsterix/Assets/Scenes/Entities.unity | 217 ++++++- InsAsterix/Assets/Scenes/Sandbox Gwen.unity | 531 ++---------------- .../Scripts/Entities/Ennemies/GreenEnemy.cs | 101 +++- .../Assets/Scripts/Entities/Player.meta | 8 + .../Entities/Player}/NewInputPlatformer.cs | 2 +- .../Player}/NewInputPlatformer.cs.meta | 0 InsAsterix/ProjectSettings/TagManager.asset | 2 + 10 files changed, 853 insertions(+), 503 deletions(-) create mode 100644 InsAsterix/Assets/Prefabs/Player.meta create mode 100644 InsAsterix/Assets/Prefabs/Player/PlayerObelix.prefab create mode 100644 InsAsterix/Assets/Prefabs/Player/PlayerObelix.prefab.meta create mode 100644 InsAsterix/Assets/Scripts/Entities/Player.meta rename InsAsterix/Assets/{ => Scripts/Entities/Player}/NewInputPlatformer.cs (99%) rename InsAsterix/Assets/{ => Scripts/Entities/Player}/NewInputPlatformer.cs.meta (100%) diff --git a/InsAsterix/Assets/Prefabs/Player.meta b/InsAsterix/Assets/Prefabs/Player.meta new file mode 100644 index 00000000..5c0c5d92 --- /dev/null +++ b/InsAsterix/Assets/Prefabs/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc82eaf111d930bf7a1c9edaf16ddd8a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/InsAsterix/Assets/Prefabs/Player/PlayerObelix.prefab b/InsAsterix/Assets/Prefabs/Player/PlayerObelix.prefab new file mode 100644 index 00000000..b57026c2 --- /dev/null +++ b/InsAsterix/Assets/Prefabs/Player/PlayerObelix.prefab @@ -0,0 +1,480 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8818525836407299751 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8818525836407299748} + - component: {fileID: 8818525836407299749} + m_Layer: 0 + m_Name: AttackBox + m_TagString: Untagged + m_Icon: {fileID: 2488908585195742037, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8818525836407299748 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525836407299751} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.57, y: 0.0242, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8818525837413079787} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &8818525836407299749 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525836407299751} + m_Enabled: 0 + 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.5, y: 0.5} + oldSize: {x: 0.5, y: 0.5} + newSize: {x: 1, y: 0.5} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.72, y: 1} + m_EdgeRadius: 0 +--- !u!1 &8818525836820548556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8818525836820548557} + - component: {fileID: 8818525836820548592} + m_Layer: 0 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8818525836820548557 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525836820548556} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8818525837413079787} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8818525836820548592 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525836820548556} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 2067066292, guid: f8bf3edc8aa60e54b9ff7968bef6a6db, 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: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8818525837413079781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8818525837413079787} + - component: {fileID: 8818525837413079785} + - component: {fileID: 8818525837413079784} + - component: {fileID: 8818525837413079791} + - component: {fileID: 8818525837413079790} + - component: {fileID: 8818525837413079788} + m_Layer: 0 + m_Name: PlayerObelix + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8818525837413079787 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525837413079781} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -2.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8818525836820548557} + - {fileID: 8818525837616603952} + - {fileID: 8818525836407299748} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &8818525837413079785 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525837413079781} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 1 + m_AngularDrag: 0.05 + m_GravityScale: 5 + m_Material: {fileID: 0} + m_Interpolate: 1 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 4 +--- !u!70 &8818525837413079784 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525837413079781} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 0.62, y: 1.47} + m_Direction: 0 +--- !u!114 &8818525837413079791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525837413079781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2197024ef645ea46b2a51fbb3b00d60, type: 3} + m_Name: + m_EditorClassIdentifier: + rigidbody2D: {fileID: 0} + collider: {fileID: 0} + groundCheck: {fileID: 8818525837616603952} + attackPos: {fileID: 8818525836407299748} + moveSpeed: 4 + crouchMultiplier: 0.75 + sprintMultiplier: 1.5 + jumpForce: 15 + dashSpeed: 80 + groundMask: + serializedVersion: 2 + m_Bits: 8 + obstacleMask: + serializedVersion: 2 + m_Bits: 72 + spawnPoint: {fileID: 0} + anim: {fileID: 0} + maxHP: 0 + maxStamina: 0 + dashCooldown: 1.5 + jumpCooldown: 0.5 + death: + m_PersistentCalls: + m_Calls: [] + resurrect: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8818525837413079790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525837413079781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 9900487a8eaa15641bdf56f14edfb3f1, 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_Target: {fileID: 8818525837413079791} + m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp + m_MethodName: MoveInputs + 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: 004102f2-7239-467f-bb9d-0dac730f3e8f + m_ActionName: Player/Move[/SwitchProControllerHID/leftStick,/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 66694b56-38d3-4b71-956b-b20c137d2539 + m_ActionName: Player/Look[/SwitchProControllerHID/rightStick,/Mouse/delta] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8818525837413079791} + m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp + m_MethodName: Attack + 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: 9c576f00-da36-43fc-9d04-60bc3c4eb6da + m_ActionName: Player/Attack[/Keyboard/z,/SwitchProControllerHID/buttonNorth,/SwitchProControllerHID/buttonWest] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8818525837413079791} + m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp + m_MethodName: Jump + 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: 17198255-8e04-49d6-abfb-a317ecf09d35 + m_ActionName: Player/Jump[/Keyboard/space,/SwitchProControllerHID/buttonSouth,/SwitchProControllerHID/buttonEast] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8818525837413079791} + m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp + m_MethodName: DashV2 + 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: 9408516b-8e34-4478-928d-097aedeb81cd + m_ActionName: Player/Dash[/Keyboard/c,/SwitchProControllerHID/buttonWest,/SwitchProControllerHID/buttonNorth] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8818525837413079791} + m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp + m_MethodName: Crouch + 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: 0c58132b-1a06-44a8-a6a3-d815d3533163 + m_ActionName: Player/Crouch[/Keyboard/v,/SwitchProControllerHID/buttonEast,/SwitchProControllerHID/buttonSouth] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: f88d6f76-a792-48ac-82dd-545c34b17014 + m_ActionName: UI/Navigate[/SwitchProControllerHID/leftStick/up,/SwitchProControllerHID/rightStick/up,/SwitchProControllerHID/leftStick/down,/SwitchProControllerHID/rightStick/down,/SwitchProControllerHID/leftStick/left,/SwitchProControllerHID/rightStick/left,/SwitchProControllerHID/leftStick/right,/SwitchProControllerHID/rightStick/right,/SwitchProControllerHID/dpad,/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: d8511937-780e-4017-becb-742fb3e13219 + m_ActionName: UI/Submit[/Keyboard/enter] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 2b8aacf7-1d25-4420-883b-da76763a9dd6 + m_ActionName: UI/Cancel[/Keyboard/escape] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 3186eaa2-3ef0-4900-bd6a-3f72d0f0a2bf + m_ActionName: UI/Point[/Mouse/position] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: b504f292-6d4e-4f70-a73f-23f709b0eba3 + m_ActionName: UI/Click[/Mouse/leftButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 72501458-9690-47c4-9ac6-6d7dcad33da6 + m_ActionName: UI/ScrollWheel[/Mouse/scroll] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 89f6e474-fb4a-44c1-9626-54c31ee99232 + m_ActionName: UI/MiddleClick[/Mouse/middleButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 8aa1a29b-b305-44ef-89fb-b7f7f1032f4b + m_ActionName: UI/RightClick[/Mouse/rightButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 5da7e19b-482c-4540-9bbd-ae485624ff92 + m_ActionName: UI/TrackedDevicePosition + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 347eb2f8-d45a-4964-a440-c43a8b544086 + m_ActionName: UI/TrackedDeviceOrientation + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8818525837413079791} + m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp + m_MethodName: Sprint + 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: a5f911d2-1511-46ae-89a2-d655bd19e112 + m_ActionName: Player/Sprint[/Keyboard/shift] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!95 &8818525837413079788 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525837413079781} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4fe501f22a3148d45a236320ccfe3ae9, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 +--- !u!1 &8818525837616603955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8818525837616603952} + m_Layer: 0 + m_Name: GroundCheck + m_TagString: Untagged + m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8818525837616603952 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8818525837616603955} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.582, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8818525837413079787} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/InsAsterix/Assets/Prefabs/Player/PlayerObelix.prefab.meta b/InsAsterix/Assets/Prefabs/Player/PlayerObelix.prefab.meta new file mode 100644 index 00000000..ef8ecfb5 --- /dev/null +++ b/InsAsterix/Assets/Prefabs/Player/PlayerObelix.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7ae1a20bcf566935098d5683d247e4b0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/InsAsterix/Assets/Scenes/Entities.unity b/InsAsterix/Assets/Scenes/Entities.unity index 4f37c001..2b185ee8 100644 --- a/InsAsterix/Assets/Scenes/Entities.unity +++ b/InsAsterix/Assets/Scenes/Entities.unity @@ -705,7 +705,7 @@ GameObject: - component: {fileID: 42766216} m_Layer: 3 m_Name: Tiles_0 (15) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1960,7 +1960,7 @@ GameObject: - component: {fileID: 123594420} m_Layer: 3 m_Name: Tiles_0 - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2071,7 +2071,7 @@ GameObject: - component: {fileID: 147020413} m_Layer: 3 m_Name: Tiles_0 (12) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2182,7 +2182,7 @@ GameObject: - component: {fileID: 202334692} m_Layer: 3 m_Name: Tiles_0 (13) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2580,7 +2580,7 @@ GameObject: - component: {fileID: 365819972} m_Layer: 3 m_Name: Tiles_0 (3) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2691,7 +2691,7 @@ GameObject: - component: {fileID: 377328879} m_Layer: 3 m_Name: Tiles_0 (7) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2802,7 +2802,7 @@ GameObject: - component: {fileID: 406583793} m_Layer: 3 m_Name: Tiles_0 (2) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3142,7 +3142,7 @@ GameObject: - component: {fileID: 901337328} m_Layer: 3 m_Name: Tiles_0 (10) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3364,7 +3364,7 @@ GameObject: - component: {fileID: 1055994926} m_Layer: 3 m_Name: Tiles_0 (1) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3475,7 +3475,7 @@ GameObject: - component: {fileID: 1120810956} m_Layer: 3 m_Name: Tiles_0 (9) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3573,6 +3573,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1120955041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1120955042} + - component: {fileID: 1120955043} + m_Layer: 0 + m_Name: AttackPhaseIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1120955042 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120955041} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.5, z: 0} + m_LocalScale: {x: 0.5, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1276761820} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1120955043 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120955041} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 3625043607559282579, guid: 19fb86013d8c24d6cb8410c0aadf30fa, 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: 0.5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1153691264 GameObject: m_ObjectHideFlags: 0 @@ -3586,7 +3670,7 @@ GameObject: - component: {fileID: 1153691266} m_Layer: 3 m_Name: Tiles_0 (14) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3684,6 +3768,67 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1181643594 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8818525837413079781, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_Name + value: PlayerObelix + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079781, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalPosition.x + value: 5.91 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalPosition.y + value: -2.51 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} --- !u!1 &1276761817 GameObject: m_ObjectHideFlags: 0 @@ -3697,9 +3842,10 @@ GameObject: - component: {fileID: 1276761818} - component: {fileID: 1276761822} - component: {fileID: 1276761823} + - component: {fileID: 1276761824} m_Layer: 0 - m_Name: Capsule - m_TagString: Untagged + m_Name: Ennemy + m_TagString: Ennemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3788,7 +3934,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1120955042} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3804,8 +3951,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5dff4e6a8da93abdaab7b34c87d320b0, type: 3} m_Name: m_EditorClassIdentifier: - goLeftInit: 1 + goLeftInit: 0 speedInit: 2 + sprintSpeed: 4 + AttackPhaseDuration: 1 --- !u!70 &1276761823 CapsuleCollider2D: m_ObjectHideFlags: 0 @@ -3822,6 +3971,32 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 1, y: 2} m_Direction: 0 +--- !u!61 &1276761824 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276761817} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 2.5, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 2} + newSize: {x: 1, y: 2} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 5, y: 2} + m_EdgeRadius: 0 --- !u!1 &1347206506 GameObject: m_ObjectHideFlags: 0 @@ -3835,7 +4010,7 @@ GameObject: - component: {fileID: 1347206508} m_Layer: 3 m_Name: Tiles_0 (8) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -4643,7 +4818,7 @@ GameObject: - component: {fileID: 1526698600} m_Layer: 3 m_Name: Tiles_0 (5) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -4754,7 +4929,7 @@ GameObject: - component: {fileID: 1566253676} m_Layer: 3 m_Name: Tiles_0 (16) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -4865,7 +5040,7 @@ GameObject: - component: {fileID: 1765578990} m_Layer: 3 m_Name: Tiles_0 (6) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -4976,7 +5151,7 @@ GameObject: - component: {fileID: 1859454044} m_Layer: 3 m_Name: Tiles_0 (11) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -5087,7 +5262,7 @@ GameObject: - component: {fileID: 1869468608} m_Layer: 3 m_Name: Tiles_0 (4) - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/InsAsterix/Assets/Scenes/Sandbox Gwen.unity b/InsAsterix/Assets/Scenes/Sandbox Gwen.unity index de9aea29..939d0ae1 100644 --- a/InsAsterix/Assets/Scenes/Sandbox Gwen.unity +++ b/InsAsterix/Assets/Scenes/Sandbox Gwen.unity @@ -1675,90 +1675,6 @@ TilemapCollider2D: m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 ---- !u!1 &253906654 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 253906655} - - component: {fileID: 253906658} - m_Layer: 0 - m_Name: Body - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &253906655 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 253906654} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 10} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1760894969} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &253906658 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 253906654} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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: 2067066292, guid: f8bf3edc8aa60e54b9ff7968bef6a6db, 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: 2} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &301257673 GameObject: m_ObjectHideFlags: 0 @@ -2386,64 +2302,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &885005237 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 885005238} - - component: {fileID: 885005239} - m_Layer: 0 - m_Name: AttackBox - m_TagString: Untagged - m_Icon: {fileID: 2488908585195742037, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &885005238 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885005237} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.57, y: 0.0242, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1760894969} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &885005239 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885005237} - m_Enabled: 0 - 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.5, y: 0.5} - oldSize: {x: 0.5, y: 0.5} - newSize: {x: 1, y: 0.5} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.72, y: 1} - m_EdgeRadius: 0 --- !u!1 &1090890416 GameObject: m_ObjectHideFlags: 0 @@ -4146,309 +4004,6 @@ TilemapCollider2D: m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 ---- !u!1 &1760894967 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1760894969} - - component: {fileID: 1760894971} - - component: {fileID: 1760894970} - - component: {fileID: 1760894973} - - component: {fileID: 1760894972} - - component: {fileID: 1760894974} - m_Layer: 0 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1760894969 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1760894967} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -2.75, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 253906655} - - {fileID: 2094310946} - - {fileID: 885005238} - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!70 &1760894970 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1760894967} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_Size: {x: 0.62, y: 1.47} - m_Direction: 0 ---- !u!50 &1760894971 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1760894967} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 1 - m_AngularDrag: 0.05 - m_GravityScale: 5 - m_Material: {fileID: 0} - m_Interpolate: 1 - m_SleepingMode: 1 - m_CollisionDetection: 1 - m_Constraints: 4 ---- !u!114 &1760894972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1760894967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 9900487a8eaa15641bdf56f14edfb3f1, 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_Target: {fileID: 1760894973} - m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp - m_MethodName: MoveInputs - 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: 004102f2-7239-467f-bb9d-0dac730f3e8f - m_ActionName: Player/Move[/SwitchProControllerHID/leftStick,/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 66694b56-38d3-4b71-956b-b20c137d2539 - m_ActionName: Player/Look[/SwitchProControllerHID/rightStick,/Mouse/delta] - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1760894973} - m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp - m_MethodName: Attack - 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: 9c576f00-da36-43fc-9d04-60bc3c4eb6da - m_ActionName: Player/Attack[/Keyboard/z,/SwitchProControllerHID/buttonNorth,/SwitchProControllerHID/buttonWest] - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1760894973} - m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp - m_MethodName: Jump - 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: 17198255-8e04-49d6-abfb-a317ecf09d35 - m_ActionName: Player/Jump[/Keyboard/space,/SwitchProControllerHID/buttonSouth,/SwitchProControllerHID/buttonEast] - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1760894973} - m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp - m_MethodName: DashV2 - 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: 9408516b-8e34-4478-928d-097aedeb81cd - m_ActionName: Player/Dash[/Keyboard/c,/SwitchProControllerHID/buttonWest,/SwitchProControllerHID/buttonNorth] - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1760894973} - m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp - m_MethodName: Crouch - 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: 0c58132b-1a06-44a8-a6a3-d815d3533163 - m_ActionName: Player/Crouch[/Keyboard/v,/SwitchProControllerHID/buttonEast,/SwitchProControllerHID/buttonSouth] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: f88d6f76-a792-48ac-82dd-545c34b17014 - m_ActionName: UI/Navigate[/SwitchProControllerHID/leftStick/up,/SwitchProControllerHID/rightStick/up,/SwitchProControllerHID/leftStick/down,/SwitchProControllerHID/rightStick/down,/SwitchProControllerHID/leftStick/left,/SwitchProControllerHID/rightStick/left,/SwitchProControllerHID/leftStick/right,/SwitchProControllerHID/rightStick/right,/SwitchProControllerHID/dpad,/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: d8511937-780e-4017-becb-742fb3e13219 - m_ActionName: UI/Submit[/Keyboard/enter] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 2b8aacf7-1d25-4420-883b-da76763a9dd6 - m_ActionName: UI/Cancel[/Keyboard/escape] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 3186eaa2-3ef0-4900-bd6a-3f72d0f0a2bf - m_ActionName: UI/Point[/Mouse/position] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: b504f292-6d4e-4f70-a73f-23f709b0eba3 - m_ActionName: UI/Click[/Mouse/leftButton] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 72501458-9690-47c4-9ac6-6d7dcad33da6 - m_ActionName: UI/ScrollWheel[/Mouse/scroll] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 89f6e474-fb4a-44c1-9626-54c31ee99232 - m_ActionName: UI/MiddleClick[/Mouse/middleButton] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 8aa1a29b-b305-44ef-89fb-b7f7f1032f4b - m_ActionName: UI/RightClick[/Mouse/rightButton] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 5da7e19b-482c-4540-9bbd-ae485624ff92 - m_ActionName: UI/TrackedDevicePosition - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 347eb2f8-d45a-4964-a440-c43a8b544086 - m_ActionName: UI/TrackedDeviceOrientation - - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1760894973} - m_TargetAssemblyTypeName: NewInputPlatformer, Assembly-CSharp - m_MethodName: Sprint - 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: a5f911d2-1511-46ae-89a2-d655bd19e112 - m_ActionName: Player/Sprint[/Keyboard/shift] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: Player - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &1760894973 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1760894967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f2197024ef645ea46b2a51fbb3b00d60, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidbody2D: {fileID: 0} - collider: {fileID: 0} - groundCheck: {fileID: 2094310946} - attackPos: {fileID: 885005238} - moveSpeed: 4 - crouchMultiplier: 0.75 - sprintMultiplier: 1.5 - jumpForce: 15 - dashSpeed: 80 - groundMask: - serializedVersion: 2 - m_Bits: 8 - obstacleMask: - serializedVersion: 2 - m_Bits: 72 - spawnPoint: {fileID: 0} - anim: {fileID: 0} - dashCooldown: 1.5 - jumpCooldown: 0.5 - death: - m_PersistentCalls: - m_Calls: [] - resurrect: - m_PersistentCalls: - m_Calls: [] ---- !u!95 &1760894974 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1760894967} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 4fe501f22a3148d45a236320ccfe3ae9, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 --- !u!1 &1934325932 GameObject: m_ObjectHideFlags: 0 @@ -4497,34 +4052,60 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2094310945 -GameObject: +--- !u!1001 &8818525836738643218 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2094310946} - m_Layer: 0 - m_Name: GroundCheck - m_TagString: Untagged - m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2094310946 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2094310945} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.582, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1760894969} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8818525837413079781, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalPosition.y + value: -2.75 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8818525837413079787, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7ae1a20bcf566935098d5683d247e4b0, type: 3} diff --git a/InsAsterix/Assets/Scripts/Entities/Ennemies/GreenEnemy.cs b/InsAsterix/Assets/Scripts/Entities/Ennemies/GreenEnemy.cs index 02c52ba4..27dc063d 100644 --- a/InsAsterix/Assets/Scripts/Entities/Ennemies/GreenEnemy.cs +++ b/InsAsterix/Assets/Scripts/Entities/Ennemies/GreenEnemy.cs @@ -1,5 +1,6 @@ using System;using System.Collections; using System.Collections.Generic; +using Unity.VisualScripting; using UnityEngine; public class GreenEnemy : MonoBehaviour @@ -7,24 +8,112 @@ public class GreenEnemy : MonoBehaviour public bool goLeftInit = false; public float speedInit; + public float sprintSpeed; + private bool _isSprinting= false; + + public float AttackPhaseDuration; + + private float _currentSpeed; + + private GameObject _attackPhaseIndicator; + private SpriteRenderer _attackPhaseIndicatorSpriteRenderer; + private bool _isAttacking = false; + + private bool _directionLeft; + // public float sight; + private BoxCollider2D _sightCollider; - private float currentSpeed; // Start is called before the first frame update void Start() { - currentSpeed = goLeftInit ? -speedInit: speedInit; + _directionLeft = goLeftInit; + _currentSpeed = goLeftInit ? -speedInit: speedInit; + + // Attack phase color + _attackPhaseIndicator = transform.Find("AttackPhaseIndicator").GameObject(); + _attackPhaseIndicatorSpriteRenderer = _attackPhaseIndicator.GetComponent(); + + _sightCollider = transform.GetComponent(); + _sightCollider.offset = goLeftInit ? -_sightCollider.offset : _sightCollider.offset; } // Update is called once per frame void Update() { - transform.position = new Vector3(currentSpeed * Time.deltaTime + transform.position.x, transform.position.y, + transform.position = new Vector3(_currentSpeed * Time.deltaTime + transform.position.x, transform.position.y, transform.position.z); } - void OnCollisionEnter2D(Collision2D coll) { - if (coll.gameObject.tag == "Wall") { - currentSpeed = -currentSpeed; + IEnumerator AttackSequence() + { + _currentSpeed = 0f; + _attackPhaseIndicator.SetActive(true); + _attackPhaseIndicatorSpriteRenderer.color = Color.green; + yield return new WaitForSeconds(AttackPhaseDuration); + _attackPhaseIndicatorSpriteRenderer.color = Color.yellow; + yield return new WaitForSeconds(AttackPhaseDuration); + _attackPhaseIndicatorSpriteRenderer.color = Color.red; + yield return new WaitForSeconds(AttackPhaseDuration); + _attackPhaseIndicator.SetActive(false); + + if (_isSprinting) + { + _currentSpeed = _directionLeft ? -sprintSpeed : sprintSpeed; + } + else + { + _currentSpeed = _directionLeft ? -speedInit : speedInit; + } + + + } + + private void OnCollisionEnter2D(Collision2D coll) + { + // Changing direction + if (coll.gameObject.CompareTag("Wall") ) + { + _directionLeft = !_directionLeft; + _currentSpeed = -_currentSpeed; + _sightCollider.offset = -_sightCollider.offset; + } + } + + IEnumerator OnCollisionStay2D(Collision2D coll) { + // Attacking + if (coll.gameObject.CompareTag("Player") && !_isAttacking) + { + _isAttacking = true; + var speed = _currentSpeed; + yield return AttackSequence(); + _isAttacking = false; + } + + yield return null; + } + + private void OnTriggerEnter2D(Collider2D coll) + { + if (coll.gameObject.CompareTag("Player")) + { + _isSprinting = true; + if (!_isAttacking) + { + _currentSpeed = _directionLeft ? -sprintSpeed : sprintSpeed; + } + } + } + + + private void OnTriggerExit2D(Collider2D coll) + { + if (coll.gameObject.CompareTag("Player")) + { + _isSprinting = false; + if(!_isAttacking) + { + _currentSpeed = _directionLeft ? -speedInit : speedInit; + } } } } diff --git a/InsAsterix/Assets/Scripts/Entities/Player.meta b/InsAsterix/Assets/Scripts/Entities/Player.meta new file mode 100644 index 00000000..abacbefe --- /dev/null +++ b/InsAsterix/Assets/Scripts/Entities/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8a9729ab338da314a51bd15efbf586c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/InsAsterix/Assets/NewInputPlatformer.cs b/InsAsterix/Assets/Scripts/Entities/Player/NewInputPlatformer.cs similarity index 99% rename from InsAsterix/Assets/NewInputPlatformer.cs rename to InsAsterix/Assets/Scripts/Entities/Player/NewInputPlatformer.cs index 85e8d2af..8c06806a 100644 --- a/InsAsterix/Assets/NewInputPlatformer.cs +++ b/InsAsterix/Assets/Scripts/Entities/Player/NewInputPlatformer.cs @@ -74,7 +74,7 @@ public class NewInputPlatformer : MonoBehaviour return; } - Debug.Log("Player state: " + _state); + // Debug.Log("Player state: " + _state); Controls(); StateManager(); AnimationController(); diff --git a/InsAsterix/Assets/NewInputPlatformer.cs.meta b/InsAsterix/Assets/Scripts/Entities/Player/NewInputPlatformer.cs.meta similarity index 100% rename from InsAsterix/Assets/NewInputPlatformer.cs.meta rename to InsAsterix/Assets/Scripts/Entities/Player/NewInputPlatformer.cs.meta diff --git a/InsAsterix/ProjectSettings/TagManager.asset b/InsAsterix/ProjectSettings/TagManager.asset index 8b51a2f1..a158b092 100644 --- a/InsAsterix/ProjectSettings/TagManager.asset +++ b/InsAsterix/ProjectSettings/TagManager.asset @@ -5,6 +5,8 @@ TagManager: serializedVersion: 2 tags: - Wall + - Ennemy + - Ground layers: - Default - TransparentFX