Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

D enemy script cleanup #64

Open
wants to merge 14 commits into
base: dev
Choose a base branch
from
+610 −263
Open

D enemy script cleanup #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0b666dc
Initial implementation of idol passive
WangXin1507 Dec 22, 2024
e897264
fix
WangXin1507 Dec 22, 2024
6b7d260
Optimized enemy cooldown update.
WangXin1507 Dec 24, 2024
0d8a65f
Merge branch 'dev' into D-idol_passive
WangXin1507 Dec 25, 2024
b663dd8
Initial implementation of drawing damage boxes in editor
WangXin1507 Dec 26, 2024
9148372
Added stats component to enemy prefab
WangXin1507 Dec 26, 2024
cfd3af8
Drawing rectangular damage frames in game view
WangXin1507 Dec 27, 2024
bfe3849
Enabled drawing circular damage frame in game view
WangXin1507 Dec 27, 2024
6425607
Serialized ActionPool for Riot Police
WangXin1507 Dec 27, 2024
78a0a84
Serialized the ActionPool for each enemy prefab
WangXin1507 Dec 28, 2024
bbdbf27
Removed extraneous code
WangXin1507 Dec 28, 2024
a4d82b7
Serialized enemy attack damage
WangXin1507 Dec 29, 2024
96c886e
Revert "Serialized enemy attack damage"
WangXin1507 Dec 29, 2024
efc250c
Modified enemy serialization
WangXin1507 Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 47 additions & 9 deletions Assets/Prefabs/Enemies/Camera Drone/Camera Drone.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ GameObject:
- component: {fileID: 1467948147633493128}
- component: {fileID: 1603849808541719507}
- component: {fileID: 3602954514945515610}
- component: {fileID: 7679382285400612018}
- component: {fileID: 7321790019576285446}
- component: {fileID: 8856570929518799469}
- component: {fileID: 3715663957954540872}
m_Layer: 21
m_Name: Camera Drone
m_TagString: Untagged
Expand Down Expand Up @@ -227,13 +228,28 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 20782b93b693591488b8c308e283c380, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 4.83
aggroRange: 16.76
stats: {fileID: 0}
pool: {fileID: 0}
animator: {fileID: 6400381198355053387}
aggroRange: 16.76
alarmTrigger: {fileID: 7775618551989780944}
enemyToSummon: {fileID: 2119936537419083514, guid: 0fedb38f283d38a4faca7620ea8ae537,
type: 3}
--- !u!114 &7679382285400612018
--- !u!114 &7321790019576285446
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8652318323731026824}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc353fcbdb963e84d880d2d6cb407830, type: 3}
m_Name:
m_EditorClassIdentifier:
health: 0
isAlive: 1
--- !u!114 &8856570929518799469
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -246,10 +262,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
stats:
- name: Speed
value: 1
modifier: 100
- name: Max Health
value: 10
value: 1
modifier: 100
--- !u!114 &7321790019576285446
--- !u!114 &3715663957954540872
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -258,8 +277,27 @@ MonoBehaviour:
m_GameObject: {fileID: 8652318323731026824}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc353fcbdb963e84d880d2d6cb407830, type: 3}
m_Script: {fileID: 11500000, guid: 872d96247465fd541bea93e36537b26f, type: 3}
m_Name:
m_EditorClassIdentifier:
health: 0
isAlive: 1
actions:
- name: Call Alarm
hitBox: {fileID: 7775618551989780944}
coolDown: 5
animationClip: {fileID: 7400000, guid: 6be99b37274953c40b797d9e1744a2a7, type: 2}
priority: 1
ready: 0
move:
name: Move
hitBox: {fileID: 0}
coolDown: 0
animationClip: {fileID: 7400000, guid: 4739459637a37884c8ebb6a3ce1e90ce, type: 2}
priority: 0
ready: 0
idle:
name:
hitBox: {fileID: 0}
coolDown: 0
animationClip: {fileID: 7400000, guid: 468a49c330cf0294486adcfa8c854b6e, type: 2}
priority: 0
ready: 0
60 changes: 58 additions & 2 deletions Assets/Prefabs/Enemies/Cyborg/Cyborg.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ GameObject:
- component: {fileID: 953836412094399138}
- component: {fileID: 8868405178309692734}
- component: {fileID: 8480991602502054467}
- component: {fileID: 7261880397543917784}
m_Layer: 21
m_Name: Cyborg
m_TagString: Untagged
Expand Down Expand Up @@ -262,9 +263,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 03dbe72ab01511e4eb989afdb7a8fadf, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 4
aggroRange: 18.6
stats: {fileID: 0}
pool: {fileID: 0}
animator: {fileID: 7905894014490810442}
aggroRange: 18.6
meleeTrigger: {fileID: 2358971396437510415}
tpBackTrigger: {fileID: 1365265030456903513}
tpForwardTrigger: {fileID: 3423477219027819224}
Expand All @@ -286,6 +288,9 @@ MonoBehaviour:
- name: Max Health
value: 10
modifier: 100
- name: Speed
value: 10
modifier: 100
--- !u!114 &8480991602502054467
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -300,6 +305,57 @@ MonoBehaviour:
m_EditorClassIdentifier:
health: 0
isAlive: 1
--- !u!114 &7261880397543917784
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2119936537419083514}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 20d794b3ea5a6da42ac5b8feade20f68, type: 3}
m_Name:
m_EditorClassIdentifier:
actions:
- name: Slash
hitBox: {fileID: 2358971396437510415}
coolDown: 0
animationClip: {fileID: 7400000, guid: d69a7e64e120bf14a9aa1e57c15eeb6a, type: 2}
priority: 7
ready: 0
- name: Teleport Backwards
hitBox: {fileID: 1365265030456903513}
coolDown: 7
animationClip: {fileID: 7400000, guid: a5a8d9d16988a1f499f24e6107fe9dff, type: 2}
priority: 1
ready: 0
- name: Teleport Forwards
hitBox: {fileID: 3423477219027819224}
coolDown: 18
animationClip: {fileID: 7400000, guid: 012a586afaa024e44ab554a7584bd561, type: 2}
priority: 5
ready: 0
- name: Stinger Attack
hitBox: {fileID: 6623908715604477131}
coolDown: 4
animationClip: {fileID: 7400000, guid: 1414bb1595d35334baa24da1ab98026c, type: 2}
priority: 2
ready: 0
move:
name: Move
hitBox: {fileID: 0}
coolDown: 0
animationClip: {fileID: 7400000, guid: 106e624640ffb024a911166cfd9df3ac, type: 2}
priority: 0
ready: 0
idle:
name: Idle
hitBox: {fileID: 0}
coolDown: 0
animationClip: {fileID: 7400000, guid: d9b9bb522aca7c043b7f8568e51360fa, type: 2}
priority: 0
ready: 0
--- !u!1 &2960955476441126688
GameObject:
m_ObjectHideFlags: 0
Expand Down
65 changes: 63 additions & 2 deletions Assets/Prefabs/Enemies/G.R.E.G/G.R.E.G.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ GameObject:
- component: {fileID: 4071386136463933295}
- component: {fileID: 166145500235385066}
- component: {fileID: 8152285351237874372}
- component: {fileID: 3440705048582449508}
- component: {fileID: 310345646144262094}
m_Layer: 21
m_Name: G.R.E.G
m_TagString: Untagged
Expand Down Expand Up @@ -289,11 +291,70 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c46f0def17192ce4195c0f554f8184b4, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 2
aggroRange: 9.92
stats: {fileID: 0}
pool: {fileID: 0}
animator: {fileID: 166145500235385066}
aggroRange: 9.92
gunKick: {fileID: 8875514496581505741}
gunShoot: {fileID: 6754032986899484797}
rangeOrig: {fileID: 6425544609560146439}
projectile: {fileID: 1293525611164901038, guid: e64abde8a304ea641afa693f1da4fc8b,
type: 3}
--- !u!114 &3440705048582449508
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8433722653154054174}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 532320b84239cf640a651fa5709b989a, type: 3}
m_Name:
m_EditorClassIdentifier:
stats:
- name: Speed
value: 1
modifier: 100
- name: Max Health
value: 1
modifier: 100
--- !u!114 &310345646144262094
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8433722653154054174}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 872d96247465fd541bea93e36537b26f, type: 3}
m_Name:
m_EditorClassIdentifier:
actions:
- name: Kick
priority: 7
ready: 0
hitBox: {fileID: 8875514496581505741}
coolDown: 4
animationClip: {fileID: 7400000, guid: 8c897a8a0dede6440a96aac7136b23fc, type: 2}
- name: Shoot
priority: 3
ready: 0
hitBox: {fileID: 6754032986899484797}
coolDown: 4
animationClip: {fileID: 7400000, guid: e06dacd5cab3a6349968796d2cef56de, type: 2}
move:
name:
priority: 0
ready: 0
hitBox: {fileID: 0}
coolDown: 0
animationClip: {fileID: 7400000, guid: 50188f8587fb1d944acdb9fdcc0b1425, type: 2}
idle:
name:
priority: 0
ready: 0
hitBox: {fileID: 0}
coolDown: 0
animationClip: {fileID: 7400000, guid: ff1895b71cbdcc8408401395813d5733, type: 2}
59 changes: 57 additions & 2 deletions Assets/Prefabs/Enemies/Riot Police/RiotPolice.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ GameObject:
- component: {fileID: 2458881036478296064}
- component: {fileID: 5267342110057752590}
- component: {fileID: 2197548027611747354}
- component: {fileID: 9121469439051838776}
- component: {fileID: 628772375253420757}
m_Layer: 21
m_Name: RiotPolice
m_TagString: Untagged
Expand Down Expand Up @@ -225,7 +227,60 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 47a0dd1a6bcc7584d8521953966c8c06, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 2
aggroRange: 7.33
stats: {fileID: 0}
pool: {fileID: 0}
animator: {fileID: 8056966106870366120}
aggroRange: 7.33
batonTrigger: {fileID: 3561678645181035360}
--- !u!114 &9121469439051838776
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1393067818931581941}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 532320b84239cf640a651fa5709b989a, type: 3}
m_Name:
m_EditorClassIdentifier:
stats:
- name: Speed
value: 4
modifier: 100
- name: Max Health
value: 1
modifier: 100
--- !u!114 &628772375253420757
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1393067818931581941}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 872d96247465fd541bea93e36537b26f, type: 3}
m_Name:
m_EditorClassIdentifier:
actions:
- name: Baton Swing
ready: 0
hitBox: {fileID: 3561678645181035360}
maxCoolDown: 2
priority: 1
animationClip: {fileID: 7400000, guid: f612aa8e9cc4b4a488df5b9e1c8237d2, type: 2}
move:
name:
ready: 0
hitBox: {fileID: 0}
maxCoolDown: 0
priority: 0
animationClip: {fileID: 7400000, guid: e1d9f2c18293436429c8a1403b4ada95, type: 2}
idle:
name:
ready: 0
hitBox: {fileID: 0}
maxCoolDown: 0
priority: 0
animationClip: {fileID: 7400000, guid: 968e5750ed810fb418cf0add49c4620a, type: 2}
Loading