X-Git-Url: http://git.purplebirdman.com/frog-ninja.git/blobdiff_plain/992458ba0caf1d218a85c4bf10e48fd304c85626..HEAD:/asset/projectile/projectile.tscn?ds=inline

diff --git a/asset/projectile/projectile.tscn b/asset/projectile/projectile.tscn
index 48dd9fe..878952c 100644
--- a/asset/projectile/projectile.tscn
+++ b/asset/projectile/projectile.tscn
@@ -1,23 +1,22 @@
-[gd_scene load_steps=6 format=3 uid="uid://dxmuwbdsw1cux"]
+[gd_scene load_steps=9 format=3 uid="uid://dxmuwbdsw1cux"]
 
 [ext_resource type="Script" uid="uid://dhljelflbvhq0" path="res://asset/projectile/projectile.gd" id="1_a85iw"]
+[ext_resource type="Script" uid="uid://cgj2olkiyt66o" path="res://asset/projectile/projectile_model.gd" id="2_ia5gd"]
 [ext_resource type="Script" uid="uid://bfwn8qkon3k0y" path="res://asset/character/model/hurtbox.gd" id="2_qxf0c"]
+[ext_resource type="Script" uid="uid://cy7gp78g4xag4" path="res://asset/projectile/projectile_hitbox.gd" id="3_e5gjc"]
+[ext_resource type="PackedScene" uid="uid://c7wv7pk6df1wi" path="res://asset/effect/hit_effect.tscn" id="4_ia5gd"]
+[ext_resource type="PackedScene" uid="uid://eoglfqffybu2" path="res://asset/projectile/projectile_visual.tscn" id="6_xofgy"]
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_a85iw"]
-radius = 0.115693
+radius = 0.3
 
-[sub_resource type="SphereMesh" id="SphereMesh_qxf0c"]
-radius = 0.1
-height = 0.2
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qxf0c"]
-shading_mode = 0
-albedo_color = Color(1, 0, 1, 1)
+[sub_resource type="SphereShape3D" id="SphereShape3D_e5gjc"]
 
 [node name="Projectile" type="Node3D"]
 script = ExtResource("1_a85iw")
 
 [node name="Model" type="Node3D" parent="."]
+script = ExtResource("2_ia5gd")
 
 [node name="Hurtbox" type="Area3D" parent="Model"]
 script = ExtResource("2_qxf0c")
@@ -27,8 +26,13 @@ metadata/_custom_type_script = "uid://bfwn8qkon3k0y"
 shape = SubResource("SphereShape3D_a85iw")
 debug_color = Color(1, 0.6, 0.701961, 0.419608)
 
-[node name="Visual" type="Node3D" parent="."]
+[node name="Hitbox" type="Area3D" parent="Model"]
+script = ExtResource("3_e5gjc")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Model/Hitbox"]
+shape = SubResource("SphereShape3D_e5gjc")
+debug_color = Color(1.03962e-05, 0.819041, 0.983756, 0.419608)
+
+[node name="HitEffect" parent="Model/Hitbox" instance=ExtResource("4_ia5gd")]
 
-[node name="MeshInstance3D" type="MeshInstance3D" parent="Visual"]
-mesh = SubResource("SphereMesh_qxf0c")
-surface_material_override/0 = SubResource("StandardMaterial3D_qxf0c")
+[node name="Visual" parent="Model" instance=ExtResource("6_xofgy")]