Skip to content

Commit de4cbdc

Browse files
MrXMrQMrXMrQ
authored
Merge pull request #13 from MrXMrQ/bugfix
Bugfix
2 parents c253993 + 888a560 commit de4cbdc

30 files changed

+460
-16
lines changed

‎Assets/Materials/Particles/boss_spawn_particle.png‎

1.84 KB
Loading

‎Assets/Materials/Particles/boss_spawn_particle.png.meta‎

Lines changed: 127 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Prefabs/Bosses/Projectilies/boss_granade.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,4 @@ MonoBehaviour:
165165
MOVEMENT_SPEED: 30
166166
MAX_LIFE_TIME: 0.5
167167
MIN_LIFE_TIME: 0.25
168+
hit_particles: {fileID: 739995767386574900, guid: 917f021215eb0ec4183bd33e2134db29, type: 3}

‎Assets/Prefabs/Bosses/Projectilies/boss_mine.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,4 @@ MonoBehaviour:
138138
MOVEMENT_SPEED: 0
139139
MAX_LIFE_TIME: 1
140140
MIN_LIFE_TIME: 0.25
141+
hit_particles: {fileID: 739995767386574900, guid: 917f021215eb0ec4183bd33e2134db29, type: 3}

‎Assets/Prefabs/Bosses/Projectilies/boss_missile.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,3 +280,4 @@ MonoBehaviour:
280280
MOVEMENT_SPEED: 10
281281
MAX_LIFE_TIME: 2
282282
MIN_LIFE_TIME: 1
283+
hit_particles: {fileID: 739995767386574900, guid: 917f021215eb0ec4183bd33e2134db29, type: 3}

‎Assets/Prefabs/Bosses/Projectilies/boss_projectil.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,4 +276,5 @@ MonoBehaviour:
276276
m_Name:
277277
m_EditorClassIdentifier:
278278
PROJECTILE_SPEED: 30
279+
hit_particles: {fileID: 739995767386574900, guid: 917f021215eb0ec4183bd33e2134db29, type: 3}
279280
DAMAGE: 1

‎Assets/Resources/Prefabs/Player Projectiles/player_projectile_default.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,6 @@ MonoBehaviour:
276276
m_Name:
277277
m_EditorClassIdentifier:
278278
PROJECTILE_SPEED: 30
279-
MOVE_DIRECTION: {x: 0, y: 1}
279+
move_direction: {x: 0, y: 1}
280280
is_destructible: 1
281281
hit_particles: {fileID: 739995767386574900, guid: 917f021215eb0ec4183bd33e2134db29, type: 3}

‎Assets/Scripts/Player/Aditions/Turret/TurretScript.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
public class TurretScript : MonoBehaviour
55
{
6+
[SerializeField] ParticleSystem hit_particle;
67
[SerializeField] float max_life_time;
78
[SerializeField] float min_life_time;
89
[SerializeField] string tag_to_detect;
@@ -40,7 +41,7 @@ private void OnTriggerEnter2D(Collider2D other)
4041
if (other.CompareTag("Asteroid"))
4142
{
4243
Destroy(other.gameObject);
43-
44+
Instantiate(hit_particle, other.transform.position, Quaternion.identity);
4445
AsteroidLogic asteroid_script = other.gameObject.GetComponent<AsteroidLogic>();
4546

4647
if (asteroid_script != null)

Assets/sprites/particles/item_collect_particle.mat renamed to Assets/Sprites/Particles/boss_phase_sprite.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: item_collect_particle
10+
m_Name: boss_phase_sprite
1111
m_Shader: {fileID: 10101, guid: 0000000000000000e000000000000000, type: 0}
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0

‎Assets/Sprites/Particles/boss_phase_sprite.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)