Sveskejuice/fgm24
Sveskejuice
/
fgm24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24

This commit is contained in:
OliverS 2024-02-04 08:28:53 +01:00
parent ae415cc858 6903b3602a
commit 6690ff0b44
25 changed files with 153 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller
View File

@ -14,13 +14,13 @@ AnimatorStateMachine:
m_Position: {x: -150, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: 548892628922324246}
m_Position: {x: 750, y: 130, z: 0}
m_Position: {x: 570, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 5718945116413065706}
m_Position: {x: 130, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 3308394434488297487}
m_Position: {x: 700, y: 190, z: 0}
m_Position: {x: 420, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: -4512082985165587279}
m_Position: {x: 130, y: -20, z: 0}
@ -131,19 +131,19 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: IsSwinging
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: IsPulling
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer

22
Assets/Animations/PlayerAnimations/Player1/RunningMopping/RunningMopping.anim
View File

@ -22,24 +22,16 @@ AnimationClip:
curve:
- time: 0
value: {fileID: 21300000, guid: 9bf9e9b1313836249a44ead3d25eac20, type: 3}
- time: 0.05
value: {fileID: 21300000, guid: 9832866514b3e5a41a10c9949b572fb5, type: 3}
- time: 0.11666667
- time: 0.083333336
value: {fileID: 21300000, guid: 41ea2c215472c504bb9a0608b036798d, type: 3}
- time: 0.16666667
value: {fileID: 21300000, guid: a7d74ef6bbe4a6c44b01c0485fe71075, type: 3}
- time: 0.21666667
value: {fileID: 21300000, guid: 04c99bd2dc800c647af0c03aaf87222d, type: 3}
- time: 0.28333333
- time: 0.25
value: {fileID: 21300000, guid: 5c1b32f936716b240b9dcc9879ba6b8a, type: 3}
- time: 0.33333334
value: {fileID: 21300000, guid: d6d9695879910cc45897f43d9d42a390, type: 3}
- time: 0.38333333
- time: 0.3
value: {fileID: 21300000, guid: 47c8cef9a72fbf7408b6e41e87e476b2, type: 3}
- time: 0.45
- time: 0.36666667
value: {fileID: 21300000, guid: 7db4df161134b9b4ca8974b29a04166f, type: 3}
- time: 0.5
value: {fileID: 21300000, guid: 634b972e969b01e4ba6fa38896a7a3c9, type: 3}
attribute: m_Sprite
path:
classID: 212
@ -63,21 +55,17 @@ AnimationClip:
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 9bf9e9b1313836249a44ead3d25eac20, type: 3}
- {fileID: 21300000, guid: 9832866514b3e5a41a10c9949b572fb5, type: 3}
- {fileID: 21300000, guid: 41ea2c215472c504bb9a0608b036798d, type: 3}
- {fileID: 21300000, guid: a7d74ef6bbe4a6c44b01c0485fe71075, type: 3}
- {fileID: 21300000, guid: 04c99bd2dc800c647af0c03aaf87222d, type: 3}
- {fileID: 21300000, guid: 5c1b32f936716b240b9dcc9879ba6b8a, type: 3}
- {fileID: 21300000, guid: d6d9695879910cc45897f43d9d42a390, type: 3}
- {fileID: 21300000, guid: 47c8cef9a72fbf7408b6e41e87e476b2, type: 3}
- {fileID: 21300000, guid: 7db4df161134b9b4ca8974b29a04166f, type: 3}
- {fileID: 21300000, guid: 634b972e969b01e4ba6fa38896a7a3c9, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.51666665
m_StopTime: 0.38333336
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0

26
Assets/Resources/Enemies/1/Enemy1V1.prefab
View File

@ -213,7 +213,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
@ -244,29 +243,6 @@ Transform:
- {fileID: 2526773998354774740}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2938081276856164938
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 1
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
@ -416,7 +392,7 @@ PrefabInstance:
- target: {fileID: 3891416435710064780, guid: 0ea0f1215ba49f5448e8e8d60a899fe8, type: 3}
propertyPath: attachedHealth
value:
objectReference: {fileID: 2938081276856164938}
objectReference: {fileID: 944314729512195366}
- target: {fileID: 5537527563549888860, guid: 0ea0f1215ba49f5448e8e8d60a899fe8, type: 3}
propertyPath: m_Name
value: HealthBar

24
Assets/Resources/Enemies/2/Enemy2V1.prefab
View File

@ -130,7 +130,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 8407687426537136098}
@ -183,29 +182,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/2/Enemy2V2.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 2239829156743597080}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/2/Enemy2V3.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 2593167518683313509}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/3/Enemy3V2.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 5537633588480359369}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/3/Enemy3V3.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 5342177024833758816}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/4/Enemy4V1.prefab
View File

@ -130,7 +130,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 6703538002322560484}
@ -183,29 +182,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/4/Enemy4V2.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 5189432348483020584}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/4/Enemy4V3.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 8229201628275188815}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/5/Enemy5V1.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 17691115352120009}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/5/Enemy5V2.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 893626435943606516}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/5/Enemy5V3.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 2019234432969631736}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/6/Enemy6V1.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 4552190225719755244}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/6/Enemy6V2.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 7803025104266690665}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

24
Assets/Resources/Enemies/6/Enemy6V3.prefab
View File

@ -214,7 +214,6 @@ GameObject:
m_Component:
- component: {fileID: 3920219362688286786}
- component: {fileID: 2938081276856164938}
- component: {fileID: 944314729512195366}
- component: {fileID: 8373694659570615877}
- component: {fileID: -1793628155013383594}
- component: {fileID: 316906110964971930}
@ -267,29 +266,6 @@ MonoBehaviour:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!114 &944314729512195366
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6905705041633878913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
m_Name:
m_EditorClassIdentifier:
onlyCallZeroHealthOnce: 1
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []
OnHealthChange:
m_PersistentCalls:
m_Calls: []
minThreshold: 1
squezeDamageScalor: 1
--- !u!195 &8373694659570615877
NavMeshAgent:
m_ObjectHideFlags: 0

41
Assets/Resources/Player1.prefab
View File

@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 2669453284189978930}
- component: {fileID: 8069942137008974672}
- component: {fileID: 1842047609192968100}
- component: {fileID: 5062989152879916107}
m_Layer: 7
m_Name: Renderer
m_TagString: Untagged
@ -142,6 +143,46 @@ CircleCollider2D:
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.5
--- !u!114 &5062989152879916107
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936012740462134995}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 136b23dbdb54d7f4493b3da7b84f0173, type: 3}
m_Name:
m_EditorClassIdentifier:
body: {fileID: 1508323898269695585}
damageLayers:
serializedVersion: 2
m_Bits: 1
speedToDamage:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.14138794
inSlope: 16.652266
outSlope: 16.652266
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0.02691511
- serializedVersion: 3
time: 29.937866
value: 150
inSlope: 0.82769793
outSlope: 0.82769793
tangentMode: 0
weightedMode: 0
inWeight: 0.13692878
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &2470138561869876166
GameObject:
m_ObjectHideFlags: 0

41
Assets/Resources/Player2.prefab
View File

@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 2669453284189978930}
- component: {fileID: 8069942137008974672}
- component: {fileID: 1842047609192968100}
- component: {fileID: 4634548561666258600}
m_Layer: 7
m_Name: Renderer
m_TagString: Untagged
@ -142,6 +143,46 @@ CircleCollider2D:
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.5
--- !u!114 &4634548561666258600
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936012740462134995}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 136b23dbdb54d7f4493b3da7b84f0173, type: 3}
m_Name:
m_EditorClassIdentifier:
body: {fileID: 1508323898269695585}
damageLayers:
serializedVersion: 2
m_Bits: 1
speedToDamage:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.14138794
inSlope: 16.652266
outSlope: 16.652266
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0.02691511
- serializedVersion: 3
time: 29.937866
value: 150
inSlope: 0.98160595
outSlope: 0.98160595
tangentMode: 0
weightedMode: 0
inWeight: 0.067287885
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &3096169748286405671
GameObject:
m_ObjectHideFlags: 0

12
Assets/Scenes/GameScene.unity
View File

@ -577,6 +577,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1842047609192968100, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
propertyPath: m_IncludeLayers.m_Bits
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 3120938410244321186, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
propertyPath: m_Name
value: Player2
@ -695,6 +699,10 @@ PrefabInstance:
propertyPath: otherPlayerAttack
value:
objectReference: {fileID: 869964774}
- target: {fileID: 1842047609192968100, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
propertyPath: m_IncludeLayers.m_Bits
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 3120938410244321186, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
propertyPath: m_Name
value: Player1
@ -2399,6 +2407,10 @@ PrefabInstance:
propertyPath: spawner
value:
objectReference: {fileID: 5796191506433166634}
- target: {fileID: 1656765803503857110, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
propertyPath: waveTextDisplayTime
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2404937059918327841, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
propertyPath: m_AnchorMax.y
value: 0

23
Assets/Scripts/Player/PlayerCollideAttack.cs Normal file
View File

@ -0,0 +1,23 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PlayerCollideAttack : MonoBehaviour
{
[SerializeField] Rigidbody2D body;
[SerializeField] LayerMask damageLayers;
[SerializeField] AnimationCurve speedToDamage;
public void OnCollisionEnter2D(Collision2D collision)
{
HealthComponent health = collision.collider.gameObject.GetComponent<HealthComponent>();
if (health == null)
health = collision.collider.transform.parent.GetComponent<HealthComponent>();
if (health == null) return;
float speed = body.velocity.magnitude;
float damage = speedToDamage.Evaluate(speed);
health.TakeDamage(damage);
}
}

11
Assets/Scripts/Player/PlayerCollideAttack.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 136b23dbdb54d7f4493b3da7b84f0173
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/Scripts/Player/PlayerMovement.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.InputSystem;
using System.Linq;
using UnityEngine.Windows;
using UnityEngine.InputSystem.DualShock;
[RequireComponent(typeof(PlayerInput))]

2
Assets/Scripts/UI/DamageText.cs
View File

@ -24,6 +24,6 @@ public class DamageText : MonoBehaviour
if (damage > superCritThreshold)
damageText.color = superCritColor;
damageText.text = damage.ToString();
damageText.text = ((int)damage).ToString();
}
}

24
Assets/Scripts/UI/WaveUI.cs
View File

@ -31,24 +31,26 @@ public class WaveUI : MonoBehaviour
IEnumerator ShowWave()
{
Color color = new Color(1, 1, 1, 0);
while (color.a > 1)
{
waveText.color = color;
color.a += 0.05f;
yield return new WaitForSecondsRealtime(0.1f);
}
waveText.text = $"Wave: {spawner.Wave}";
Color color = new Color(1, 1, 1, 0);
while (color.a < 1)
{
color.a += 0.05f;
waveText.color = color;
yield return new WaitForSecondsRealtime(0.05f);
}
yield return new WaitForSecondsRealtime(waveTextDisplayTime);
color = new Color(1, 1, 1, 1);
while (color.a <= 0)
while (color.a >= 0)
{
waveText.color = color;
color.a -= 0.05f;
yield return new WaitForSecondsRealtime(0.1f);
waveText.color = color;
yield return new WaitForSecondsRealtime(0.05f);
}
}
}