Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added health bar to slimes and improved attack logic

Browse Source
This commit is contained in:
finnchen123
2025-12-10 16:39:24 +01:00
parent abc11650ee
commit f74ec7e84d
7 changed files with 407 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

260
Assets/Prefabs/slime.prefab
View File

@@ -1,5 +1,258 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1755437404601407390
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1490485691279698368}
- component: {fileID: 2823500805711375321}
- component: {fileID: 2095238798181559198}
m_Layer: 5
m_Name: pnlHealth
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1490485691279698368
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1755437404601407390}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8692566566668546467}
m_Father: {fileID: 8927601208402363686}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2823500805711375321
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1755437404601407390}
m_CullTransparentMesh: 1
--- !u!114 &2095238798181559198
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1755437404601407390}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1873279497245847383
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8927601208402363686}
- component: {fileID: 4898475509121882234}
- component: {fileID: 7219702916767965912}
- component: {fileID: 985266517551115690}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8927601208402363686
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1873279497245847383}
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: 0
m_Children:
- {fileID: 1490485691279698368}
m_Father: {fileID: 4016379320889883386}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0.75}
m_SizeDelta: {x: 0.2, y: 0.05}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &4898475509121882234
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1873279497245847383}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &7219702916767965912
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1873279497245847383}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
--- !u!114 &985266517551115690
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1873279497245847383}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &2454216620873436980
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8692566566668546467}
- component: {fileID: 7163846638090094393}
- component: {fileID: 2408993422533026150}
m_Layer: 5
m_Name: pnlFill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8692566566668546467
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2454216620873436980}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1490485691279698368}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7163846638090094393
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2454216620873436980}
m_CullTransparentMesh: 1
--- !u!114 &2408993422533026150
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2454216620873436980}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4493055063801180089
GameObject:
m_ObjectHideFlags: 0
@@ -181,7 +434,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3}
propertyPath: m_LocalPosition.x
value: -29.780752
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3}
propertyPath: m_LocalPosition.y
@@ -189,7 +442,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3}
propertyPath: m_LocalPosition.z
value: 26.58583
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3}
propertyPath: m_LocalRotation.w
@@ -239,6 +492,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3}
insertIndex: -1
addedObject: {fileID: 1643418974084022053}
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3}
insertIndex: -1
addedObject: {fileID: 8927601208402363686}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3}
insertIndex: -1

72
Assets/Scripts/InteractableObjects/Enemy.cs
View File

@@ -20,6 +20,7 @@ namespace Assets.Scripts.InteractableObjects
Stopwatch jumpTimer;
bool followsPlayer;
bool isAttacking;
bool isAttackOnCooldown;
Stopwatch attackTimer;
// Start is called before the first frame update
@@ -30,41 +31,57 @@ namespace Assets.Scripts.InteractableObjects
jumpTimer.Start();
followsPlayer = false;
isAttacking = false;
isAttackOnCooldown = false;
attackTimer = new Stopwatch();
//Nothing
}
// Update is called once per frame
void Update()
{
if (gameObject.activeSelf)
Jump();
if (isAttacking)
{
if (!isJumping)
Attack();
}
}
void Attack()
{
if (!isAttackOnCooldown)
{
attackTimer.Start();
isAttackOnCooldown = true;
}
if (attackTimer.ElapsedMilliseconds >= 2000)
{
attackTimer.Reset();
isAttackOnCooldown = false;
}
}
void Jump()
{
if (!isJumping)
{
jumpTimer.Start();
isJumping = true;
Vector3 jumpVector;
if (followsPlayer)
{
jumpTimer.Start();
isJumping = true;
Vector3 jumpVector;
if (followsPlayer)
{
jumpVector = GameObject.Find("Player").transform.position - gameObject.transform.position;
jumpVector *= 0.25f * Mathf.Log10(jumpVector.magnitude);
jumpVector.y = 5;
}
else
{
jumpVector = new Vector3(rand.Next(-5, 5), 10, rand.Next(-5, 5));
}
gameObject.GetComponent<Rigidbody>().AddForce(jumpVector, ForceMode.Impulse);
jumpVector = GameObject.Find("Player").transform.position - gameObject.transform.position;
jumpVector *= 0.25f * Mathf.Log10(jumpVector.magnitude);
jumpVector.y = 5;
}
if (jumpTimer.ElapsedMilliseconds >= 5000)
else
{
jumpTimer.Reset();
isJumping = false;
}
if (gameObject.transform.position.x > 1000 || gameObject.transform.position.x > 5000 || gameObject.transform.position.x > 5000)
{
UnityEngine.Debug.Log("BUG!");
jumpVector = new Vector3(rand.Next(-5, 5), 10, rand.Next(-5, 5));
}
gameObject.GetComponent<Rigidbody>().AddForce(jumpVector, ForceMode.Impulse);
}
if (jumpTimer.ElapsedMilliseconds >= 5000)
{
jumpTimer.Reset();
isJumping = false;
}
}
@@ -76,7 +93,7 @@ namespace Assets.Scripts.InteractableObjects
}
}
public void handleAttack()
public void HandleAttack()
{
isAttacking = true;
//Create attack logic here
@@ -86,10 +103,11 @@ namespace Assets.Scripts.InteractableObjects
{
followsPlayer = isFollowing;
isAttacking = false;
//Stop attacks
attackTimer.Reset();
isAttackOnCooldown = false;
}
public void handleDetection()
public void HandleDetection()
{
followsPlayer = true;
}

4
Assets/Scripts/Player/PlayerGameObject.cs
View File

@@ -242,10 +242,10 @@ namespace Assets.Scripts.Player
switch (col.name)
{
case "AttackRange":
enemy.handleAttack();
enemy.HandleAttack();
break;
case "DetectionRange":
enemy.handleDetection();
enemy.HandleDetection();
break;
case "FollowRange":
//Do nothing, as it needs to be detected first

8
Assets/TextMesh Pro.meta Executable file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f54d1bd14bd3ca042bd867b519fee8cc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: