From 7c9b6711a5775a7b7d63ac1067058da12fa961d9 Mon Sep 17 00:00:00 2001 From: unfa Date: Tue, 1 Jun 2021 01:03:11 +0200 Subject: [PATCH] Created a parent Weapon class --- Game/Assets/Characters/Player.tscn | 4 ++-- Game/Assets/Weapons/Weapon.tscn | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 Game/Assets/Weapons/Weapon.tscn diff --git a/Game/Assets/Characters/Player.tscn b/Game/Assets/Characters/Player.tscn index 8d03b55..bd01f63 100644 --- a/Game/Assets/Characters/Player.tscn +++ b/Game/Assets/Characters/Player.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://Assets/Characters/Player.gd" type="Script" id=1] -[ext_resource path="res://Assets/Weapons/Handgun/Handgun.gltf" type="PackedScene" id=2] +[ext_resource path="res://Assets/Weapons/Weapon.tscn" type="PackedScene" id=3] [sub_resource type="CapsuleMesh" id=1] radius = 0.4 @@ -38,7 +38,7 @@ script = null transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.3, -0.4, -0.6 ) script = null -[node name="Handgun" parent="Head/Camera/Hand" instance=ExtResource( 2 )] +[node name="Weapon" parent="Head/Camera/Hand" instance=ExtResource( 3 )] [node name="Tween" type="Tween" parent="Head/Camera"] script = null diff --git a/Game/Assets/Weapons/Weapon.tscn b/Game/Assets/Weapons/Weapon.tscn new file mode 100644 index 0000000..30d5fa3 --- /dev/null +++ b/Game/Assets/Weapons/Weapon.tscn @@ -0,0 +1,13 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Assets/Weapons/Handgun/Handgun.gltf" type="PackedScene" id=1] + +[node name="Weapon" type="Node3D"] +script = null + +[node name="Handgun" parent="." instance=ExtResource( 1 )] + +[node name="AnimationPlayer" parent="Handgun" index="4"] +blend_times = [ ] + +[editable path="Handgun"]