Browse Source

:recycle: Fix orphan trail curve texture

The resource was existing but not used by the particle.
DricomDragon 2 years ago
parent
commit
1eebaea4d0
2 changed files with 7 additions and 9 deletions
  1. 6 8
      godot/effect/particle/trail/Trail.tscn
  2. 1 1
      godot/main.tscn

+ 6 - 8
godot/effect/particle/trail/Trail.tscn

@@ -1,14 +1,12 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://effect/particle/trail/trail_particle.png" type="Texture" id=1]
+[ext_resource path="res://effect/particle/trail/decrease_curve.tres" type="Curve" id=2]
 
-[sub_resource type="Curve" id=1]
-_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0.290909 ), 0.0, 0.0, 0, 0 ]
+[sub_resource type="CurveTexture" id=1]
+curve = ExtResource( 2 )
 
-[sub_resource type="CurveTexture" id=2]
-curve = SubResource( 1 )
-
-[sub_resource type="ParticlesMaterial" id=3]
+[sub_resource type="ParticlesMaterial" id=2]
 flag_disable_z = true
 spread = 0.0
 gravity = Vector3( 0, 0, 0 )
@@ -20,10 +18,10 @@ angle = 180.0
 angle_random = 1.0
 scale = 0.5
 scale_random = 0.5
-scale_curve = SubResource( 2 )
+scale_curve = SubResource( 1 )
 
 [node name="Trail" type="Particles2D"]
 lifetime = 0.1
 local_coords = false
-process_material = SubResource( 3 )
+process_material = SubResource( 2 )
 texture = ExtResource( 1 )

+ 1 - 1
godot/main.tscn

@@ -66,8 +66,8 @@ title = "Balls"
 [connection signal="gain_new_bullet" from="Launcher" to="UI/BallCounter" method="increase_counter"]
 [connection signal="get_firing" from="Launcher" to="UI" method="_on_Launcher_get_firing"]
 [connection signal="is_full" from="Launcher" to="Grid" method="_on_Launcher_is_full"]
-[connection signal="has_moved" from="Grid" to="DeadLine" method="_on_Grid_has_moved"]
 [connection signal="has_moved" from="Grid" to="Launcher" method="_on_Grid_has_moved"]
+[connection signal="has_moved" from="Grid" to="DeadLine" method="_on_Grid_has_moved"]
 [connection signal="kace_broken" from="Grid" to="Launcher" method="_on_Grid_kace_broken"]
 [connection signal="kace_damaged" from="Grid" to="UI/ScoreCounter" method="increase_counter"]
 [connection signal="game_lost" from="DeadLine" to="Launcher" method="_on_DeadLine_game_lost"]