Skip to content

Enemy Branch Refactor #15

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

Open
wants to merge 9 commits into
base: dev/Enemy-Solution
Choose a base branch
from
Open

Enemy Branch Refactor #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a4cd19e
Branch Refactor
Aryan-Khera Jul 2, 2024
9098356
New
Aryan-Khera Jul 3, 2024
9502d4e
Fixed Player Scale
Aryan-Khera Jul 3, 2024
5da7656
Rider Setup
Aryan-Khera Jul 3, 2024
4e209cf
Removed View
Aryan-Khera Jul 4, 2024
2f62ed9
EnemySpawning
Aryan-Khera Jul 8, 2024
b5bb259
Patrolling System
Aryan-Khera Jul 8, 2024
d8166e3
Melee Refactor
Aryan-Khera Jul 10, 2024
3c8c16e
Code Refactor
Aryan-Khera Jul 11, 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
13 changes: 13 additions & 0 deletions .idea/.idea.Unity-Platformer/.idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.Unity-Platformer/.idea/indexLayout.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.Unity-Platformer/.idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Assets/Animations/Player/Sprite.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,37 +341,37 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Jump
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: TakeDamage
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Death
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Attack
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Slide
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down
15 changes: 4 additions & 11 deletions Assets/ExternalAssets/generic_char_v0.2/png/blue/char_blue_1.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/ExternalAssets/generic_char_v0.2/png/blue/char_blue_2.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 17 additions & 53 deletions Assets/Prefabs/Enemies/MushroomHead.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5262625101771186828
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3267312777984044649}
m_Layer: 7
m_Name: MeleeContainer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3267312777984044649
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5262625101771186828}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.13, y: -0.06, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6293099713857923212}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6606441315159465579
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -42,8 +11,8 @@ GameObject:
- component: {fileID: 6293099713857923212}
- component: {fileID: 3738019520128718361}
- component: {fileID: 4434763010371326}
- component: {fileID: 3535772070237282434}
- component: {fileID: 2233408193191899455}
- component: {fileID: 2814245402117734481}
- component: {fileID: 387656631982292860}
m_Layer: 7
m_Name: MushroomHead
Expand All @@ -63,8 +32,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 6, y: 6, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3267312777984044649}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -133,7 +101,7 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.0033840835, y: -0.05608578}
m_Offset: {x: 0.03439837, y: -0.05608578}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
Expand All @@ -144,8 +112,21 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.18453515, y: 0.335046}
m_Size: {x: 0.24656372, y: 0.335046}
m_EdgeRadius: 0
--- !u!114 &3535772070237282434
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6606441315159465579}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0748dad147e380044ac41c060d316f35, type: 3}
m_Name:
m_EditorClassIdentifier:
Animator: {fileID: 2233408193191899455}
--- !u!95 &2233408193191899455
Animator:
serializedVersion: 5
Expand All @@ -167,23 +148,6 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &2814245402117734481
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6606441315159465579}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8ac4778d001d024bb557d6ff8ab8c53, type: 3}
m_Name:
m_EditorClassIdentifier:
Animator: {fileID: 0}
MeleeContainer: {fileID: 3267312777984044649}
groundLayer:
serializedVersion: 2
m_Bits: 64
--- !u!50 &387656631982292860
Rigidbody2D:
serializedVersion: 4
Expand Down
35 changes: 17 additions & 18 deletions Assets/Prefabs/Enemies/Slime.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ GameObject:
- component: {fileID: 3738019520128718361}
- component: {fileID: 4434763010371326}
- component: {fileID: 2233408193191899455}
- component: {fileID: 4382203948783424941}
- component: {fileID: 3055625062541944518}
m_Layer: 7
- component: {fileID: 260711026401855676}
m_Layer: 3
m_Name: Slime
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -79,7 +79,7 @@ SpriteRenderer:
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: c981975d14820d642923d7a0f697bd7d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
Expand Down Expand Up @@ -135,21 +135,6 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &4382203948783424941
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6606441315159465579}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fce9fcbf53447474a8ef1ae00d6ce001, type: 3}
m_Name:
m_EditorClassIdentifier:
groundLayer:
serializedVersion: 2
m_Bits: 64
--- !u!50 &3055625062541944518
Rigidbody2D:
serializedVersion: 4
Expand All @@ -171,3 +156,17 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!114 &260711026401855676
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6606441315159465579}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0748dad147e380044ac41c060d316f35, type: 3}
m_Name:
m_EditorClassIdentifier:
MeleeContainer: {fileID: 0}
Animator: {fileID: 0}
8 changes: 5 additions & 3 deletions Assets/Prefabs/Enemies/Spike.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 6293099713857923212}
- component: {fileID: 3738019520128718361}
- component: {fileID: 4434763010371326}
- component: {fileID: 4810342422011848712}
- component: {fileID: 4910111746936067550}
m_Layer: 0
m_Name: Spike
m_TagString: Untagged
Expand Down Expand Up @@ -112,7 +112,7 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 4.8028536, y: 1.3136377}
m_EdgeRadius: 0
--- !u!114 &4810342422011848712
--- !u!114 &4910111746936067550
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -121,6 +121,8 @@ MonoBehaviour:
m_GameObject: {fileID: 6606441315159465579}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7c4b4579336bc5e49bf0119a952ea3ef, type: 3}
m_Script: {fileID: 11500000, guid: 0748dad147e380044ac41c060d316f35, type: 3}
m_Name:
m_EditorClassIdentifier:
MeleeContainer: {fileID: 0}
Animator: {fileID: 0}
Loading