Skip to content

Dodani leteci enemy #94

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.

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 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Assets/Pixel Adventure 1.meta

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

44 changes: 22 additions & 22 deletions Assets/Prefabs/Enemy/Circle.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ GameObject:
- component: {fileID: 2157864364840506741}
- component: {fileID: 1417250189635142134}
- component: {fileID: 5819494892187875797}
- component: {fileID: -2591212885737334371}
- component: {fileID: -7955960088100232682}
- component: {fileID: 6019109341514027303}
- component: {fileID: 8988046855811930432}
- component: {fileID: -2591212885737334371}
- component: {fileID: -8024352693128602536}
m_Layer: 0
m_Name: Circle
m_TagString: Untagged
Expand Down Expand Up @@ -101,6 +101,21 @@ Halo:
serializedVersion: 2
rgba: 4286611584
m_Size: 0.4
--- !u!114 &-2591212885737334371
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3637587245857244965}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6e4e7b319cf7f934a88b9da8907ed7ee, type: 3}
m_Name:
m_EditorClassIdentifier:
damage: 2
speed: 0
resetTime: 5
--- !u!114 &-7955960088100232682
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -110,10 +125,10 @@ MonoBehaviour:
m_GameObject: {fileID: 3637587245857244965}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ce7d4303eff169c07af4515380161304, type: 3}
m_Script: {fileID: 11500000, guid: ef0b9bb5bbc606a4c85a76663c67cce2, type: 3}
m_Name:
m_EditorClassIdentifier:
bulletSpeed: 7
bulletSpeed: 4
--- !u!61 &6019109341514027303
BoxCollider2D:
m_ObjectHideFlags: 0
Expand All @@ -124,7 +139,7 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
Expand All @@ -140,7 +155,7 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!50 &8988046855811930432
--- !u!50 &-8024352693128602536
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
Expand All @@ -152,7 +167,7 @@ Rigidbody2D:
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_Mass: 0.0001
m_LinearDrag: 0
m_AngularDrag: 0
m_GravityScale: 0
Expand All @@ -161,18 +176,3 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!114 &-2591212885737334371
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3637587245857244965}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6e4e7b319cf7f934a88b9da8907ed7ee, type: 3}
m_Name:
m_EditorClassIdentifier:
damage: 7
speed: 0
resetTime: 9
27 changes: 3 additions & 24 deletions Assets/Prefabs/Enemy/FlyingEnemy.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ GameObject:
- component: {fileID: 84820332779584235}
- component: {fileID: 84820332779584236}
- component: {fileID: 84820332779584237}
- component: {fileID: 84820332779584233}
m_Layer: 0
m_Name: FlyingEnemy
m_TagString: Untagged
Expand Down Expand Up @@ -127,33 +126,13 @@ MonoBehaviour:
m_GameObject: {fileID: 84820332779584238}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5555c26d189c9fa6e8bde05f68ddcfe3, type: 3}
m_Script: {fileID: 11500000, guid: 69e814f5e23b85734b83b074e93164e3, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 4
speed: 5
lineOfSite: 10
bulletRange: 4
bulletRange: 6
bullet: {fileID: 3637587245857244965, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3}
bulletParent: {fileID: 84820332161536273}
fireRate: 1
nextFireTime: 0
--- !u!114 &84820332779584233
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 84820332779584238}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41fdbc9db2d9d5245bd0400c220220bb, type: 3}
m_Name:
m_EditorClassIdentifier:
attackCooldown: 0
range: 0
damage: 2
colliderDistance: 1
boxCollider: {fileID: 0}
firepoint: {fileID: 84820332161536272}
fireballs: []
odparents: {fileID: 0}
138 changes: 138 additions & 0 deletions Assets/Prefabs/Enemy/HomingBulletEnemy.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8970212626547973400
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8970212626547973403}
- component: {fileID: 8970212626547973402}
- component: {fileID: 8970212626547973401}
m_Layer: 0
m_Name: HomingBulletEnemy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8970212626547973403
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8970212626547973400}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 19.24, y: 5.97, z: 0}
m_LocalScale: {x: 5, y: 5, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8970212627477606795}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8970212626547973402
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8970212626547973400}
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: 10754, guid: 0000000000000000f000000000000000, type: 0}
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: 21300000, guid: f682c22c8cbd73536a00a3a021f1d1b6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.32, y: 0.32}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &8970212626547973401
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8970212626547973400}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69e814f5e23b85734b83b074e93164e3, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 5
lineOfSite: 10
bulletRange: 5
bullet: {fileID: 4301114826325031261, guid: ee9da5bbe36dcce0abf245e537bd200a, type: 3}
bulletParent: {fileID: 8970212627477606794}
fireRate: 1
nextFireTime: 0
--- !u!1 &8970212627477606794
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8970212627477606795}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8970212627477606795
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8970212627477606794}
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: 8970212626547973403}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7 changes: 7 additions & 0 deletions Assets/Prefabs/Enemy/HomingBulletEnemy.prefab.meta

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

17 changes: 13 additions & 4 deletions Assets/Prefabs/Enemy/homingBullet.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: -2591212885737334371, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1417250189635142134, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3}
propertyPath: m_Color.b
value: 0.12726949
Expand Down Expand Up @@ -75,14 +79,19 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
- target: {fileID: 6019109341514027303, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3}
propertyPath: m_IsTrigger
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: -7955960088100232682, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3}
--- !u!1 &4301114826325031261 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3637587245857244965, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3}
m_PrefabInstance: {fileID: 705921059879452280}
m_PrefabAsset: {fileID: 0}
--- !u!114 &-4717444892966850761
--- !u!114 &3130110914220481978
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -91,7 +100,7 @@ MonoBehaviour:
m_GameObject: {fileID: 4301114826325031261}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1f1aeca88e4cfde269cba8dac4452457, type: 3}
m_Script: {fileID: 11500000, guid: a8979ad34c80e938ba71b757d153b38a, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 5
speed: 4
Loading