Fixed error in testint.tscn
This commit is contained in:
parent
9073fa0155
commit
a85cccd56e
@ -13,8 +13,6 @@ radius = 0.591769
|
|||||||
|
|
||||||
[node name="Arm" instance=ExtResource( 1 )]
|
[node name="Arm" instance=ExtResource( 1 )]
|
||||||
script = ExtResource( 3 )
|
script = ExtResource( 3 )
|
||||||
key = 0
|
|
||||||
damage = 10.0
|
|
||||||
|
|
||||||
[node name="PartCollider" parent="." index="0"]
|
[node name="PartCollider" parent="." index="0"]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.83 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.83 )
|
||||||
@ -29,14 +27,14 @@ visible = false
|
|||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
|
||||||
|
|
||||||
[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
|
[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
|
||||||
transform = Transform( 1, -1.98292e-23, -3.18966e-24, 6.71348e-24, -9.49949e-08, 1, -2.07636e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -5.05441 )
|
transform = Transform( 1, -1.98247e-23, -2.98292e-24, 6.50669e-24, -9.49949e-08, 1, -2.07684e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -5.05441 )
|
||||||
bone_name = "bone_2"
|
bone_name = "bone_2"
|
||||||
|
|
||||||
[node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
|
[node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
|
||||||
remote_path = NodePath("../../../../../TouchArea")
|
remote_path = NodePath("../../../../../TouchArea")
|
||||||
|
|
||||||
[node name="TouchArea" parent="." index="2"]
|
[node name="TouchArea" parent="." index="2"]
|
||||||
transform = Transform( 1, -1.98292e-23, -3.18966e-24, 6.71348e-24, -9.49949e-08, 1, -2.07636e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -5.05441 )
|
transform = Transform( 1, -1.98247e-23, -2.98292e-24, 6.50669e-24, -9.49949e-08, 1, -2.07684e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -5.05441 )
|
||||||
|
|
||||||
[node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
|
[node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
|
||||||
transform = Transform( 1, 2.98291e-24, -1.98247e-23, -2.07684e-23, -9.49949e-08, -1, -6.50669e-24, 1, -9.49949e-08, 0, 0, 0 )
|
transform = Transform( 1, 2.98291e-24, -1.98247e-23, -2.07684e-23, -9.49949e-08, -1, -6.50669e-24, 1, -9.49949e-08, 0, 0, 0 )
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
[sub_resource type="SphereShape" id=2]
|
[sub_resource type="SphereShape" id=2]
|
||||||
|
|
||||||
[node name="AttachmentPoint" type="Spatial"]
|
[node name="AttachmentPoint" type="Spatial"]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
|
|
||||||
|
|
||||||
[node name="Mesh" type="MeshInstance" parent="."]
|
[node name="Mesh" type="MeshInstance" parent="."]
|
||||||
transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
|
transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
|
||||||
|
@ -4,14 +4,14 @@
|
|||||||
[ext_resource path="res://BodyParts/BodyBase/AttachmentPoint.tscn" type="PackedScene" id=2]
|
[ext_resource path="res://BodyParts/BodyBase/AttachmentPoint.tscn" type="PackedScene" id=2]
|
||||||
[ext_resource path="res://3D Input/Fertige GLBs/Torso.glb" type="PackedScene" id=3]
|
[ext_resource path="res://3D Input/Fertige GLBs/Torso.glb" type="PackedScene" id=3]
|
||||||
|
|
||||||
[sub_resource type="CapsuleShape" id=2]
|
[sub_resource type="CapsuleShape" id=1]
|
||||||
|
|
||||||
[node name="Torso" type="RigidBody"]
|
[node name="Torso" type="RigidBody"]
|
||||||
script = ExtResource( 1 )
|
script = ExtResource( 1 )
|
||||||
|
|
||||||
[node name="TorsoCollider" type="CollisionShape" parent="."]
|
[node name="TorsoCollider" type="CollisionShape" parent="."]
|
||||||
transform = Transform( 0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0 )
|
transform = Transform( 0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0 )
|
||||||
shape = SubResource( 2 )
|
shape = SubResource( 1 )
|
||||||
|
|
||||||
[node name="FrontLeft" parent="." instance=ExtResource( 2 )]
|
[node name="FrontLeft" parent="." instance=ExtResource( 2 )]
|
||||||
transform = Transform( 0.5, -1.62921e-07, -0.866025, -3.25841e-07, -1, 0, -0.866025, 2.82187e-07, -0.5, 0.6, 0, 1 )
|
transform = Transform( 0.5, -1.62921e-07, -0.866025, -3.25841e-07, -1, 0, -0.866025, 2.82187e-07, -0.5, 0.6, 0, 1 )
|
||||||
|
@ -17,8 +17,6 @@ func _ready() -> void:
|
|||||||
assert(base is BodyBase)
|
assert(base is BodyBase)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
func _process(delta: float) -> void:
|
func _process(delta: float) -> void:
|
||||||
# We do this here because we want the whole tree to really be done instancing
|
# We do this here because we want the whole tree to really be done instancing
|
||||||
if not setup_done:
|
if not setup_done:
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
[ext_resource path="res://BodyParts/BodyPart.gd" type="Script" id=1]
|
[ext_resource path="res://BodyParts/BodyPart.gd" type="Script" id=1]
|
||||||
|
|
||||||
|
|
||||||
[node name="BodyPart" type="Spatial"]
|
[node name="BodyPart" type="Spatial"]
|
||||||
script = ExtResource( 1 )
|
script = ExtResource( 1 )
|
||||||
|
|
||||||
|
@ -12,29 +12,33 @@ script = ExtResource( 4 )
|
|||||||
[node name="Camera" type="Camera" parent="."]
|
[node name="Camera" type="Camera" parent="."]
|
||||||
transform = Transform( -4.37114e-08, -0.5, 0.866025, 0, 0.866025, 0.5, -1, 2.18557e-08, -3.78552e-08, 17, 9, -2 )
|
transform = Transform( -4.37114e-08, -0.5, 0.866025, 0, 0.866025, 0.5, -1, 2.18557e-08, -3.78552e-08, 17, 9, -2 )
|
||||||
|
|
||||||
[node name="Torso" parent="." instance=ExtResource( 3 )]
|
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.02111, 0 )
|
|
||||||
|
|
||||||
[node name="Arm" parent="Torso/FrontLeft" index="1" instance=ExtResource( 1 )]
|
|
||||||
key = 83
|
|
||||||
|
|
||||||
[node name="Arm" parent="Torso/FrontRight" index="1" instance=ExtResource( 1 )]
|
|
||||||
key = 65
|
|
||||||
|
|
||||||
[node name="Torso2" parent="." instance=ExtResource( 3 )]
|
|
||||||
transform = Transform( -0.866025, -0.353553, -0.353554, -1.0677e-07, -0.707107, 0.707106, -0.5, 0.612372, 0.612373, 0, 3.02111, -9 )
|
|
||||||
player_id = 1
|
|
||||||
|
|
||||||
[node name="Arm" parent="Torso2/FrontLeft" index="1" instance=ExtResource( 1 )]
|
|
||||||
key = 81
|
|
||||||
|
|
||||||
[node name="Arm" parent="Torso2/FrontRight" index="1" instance=ExtResource( 1 )]
|
|
||||||
key = 87
|
|
||||||
|
|
||||||
[node name="UI" parent="." instance=ExtResource( 2 )]
|
[node name="UI" parent="." instance=ExtResource( 2 )]
|
||||||
|
|
||||||
[node name="Arena" parent="." instance=ExtResource( 5 )]
|
[node name="Arena" parent="." instance=ExtResource( 5 )]
|
||||||
|
|
||||||
|
[node name="Torso" parent="." instance=ExtResource( 3 )]
|
||||||
|
|
||||||
|
[node name="Arm" parent="Torso/FrontLeft/Limb" index="0" instance=ExtResource( 1 )]
|
||||||
|
key = 65
|
||||||
|
|
||||||
|
[node name="Arm" parent="Torso/FrontRight/Limb" index="0" instance=ExtResource( 1 )]
|
||||||
|
key = 83
|
||||||
|
|
||||||
|
[node name="Torso2" parent="." instance=ExtResource( 3 )]
|
||||||
|
|
||||||
|
[node name="Arm" parent="Torso2/FrontLeft/Limb" index="0" instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( 1, 2.84217e-14, 0, -2.84217e-14, 1, 0, 0, 0, 1, 0, 0, 0 )
|
||||||
|
|
||||||
|
[node name="Arm" parent="Torso2/FrontRight/Limb" index="0" instance=ExtResource( 1 )]
|
||||||
|
|
||||||
[editable path="Torso"]
|
[editable path="Torso"]
|
||||||
|
|
||||||
|
[editable path="Torso/FrontLeft"]
|
||||||
|
|
||||||
|
[editable path="Torso/FrontRight"]
|
||||||
|
|
||||||
[editable path="Torso2"]
|
[editable path="Torso2"]
|
||||||
|
|
||||||
|
[editable path="Torso2/FrontLeft"]
|
||||||
|
|
||||||
|
[editable path="Torso2/FrontRight"]
|
||||||
|
@ -38,8 +38,8 @@ config/icon="res://icon.png"
|
|||||||
|
|
||||||
[autoload]
|
[autoload]
|
||||||
|
|
||||||
InGameState="*res://Global/InGameState.gd"
|
|
||||||
BodyPartLoader="*res://Global/BodyPartLoader.gd"
|
BodyPartLoader="*res://Global/BodyPartLoader.gd"
|
||||||
|
InGameState="*res://Global/InGameState.gd"
|
||||||
|
|
||||||
[rendering]
|
[rendering]
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user