Compare commits
No commits in common. "ea195e54ccc38ea26612869b4256a5660e20fb9d" and "e22b5a7bd034ab09e1420452adbd92557e2f34c8" have entirely different histories.
ea195e54cc
...
e22b5a7bd0
|
@ -1,11 +1,10 @@
|
|||
[gd_scene load_steps=41 format=3 uid="uid://bgoo1lbt28na"]
|
||||
[gd_scene load_steps=40 format=3 uid="uid://bgoo1lbt28na"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://bhanbx2dyhv2d" path="res://Models/grape_man.glb" id="1_fh5yr"]
|
||||
[ext_resource type="Script" path="res://Models/grape_man.gd" id="2_ksje8"]
|
||||
[ext_resource type="AudioStream" uid="uid://csboqs15k3vps" path="res://Sounds/dropgrunt.ogg" id="3_c648b"]
|
||||
[ext_resource type="AudioStream" uid="uid://baocyd0p3jcku" path="res://Sounds/pickup_grunt.ogg" id="4_nvurj"]
|
||||
[ext_resource type="AudioStream" uid="uid://b80t5xqckjoqk" path="res://Sounds/heartychuckle.ogg" id="5_b32re"]
|
||||
[ext_resource type="AudioStream" uid="uid://0mhkf1ls1wcn" path="res://Sounds/sadsound.ogg" id="6_qe4bi"]
|
||||
|
||||
[sub_resource type="AnimationNodeAdd2" id="AnimationNodeAdd2_a0vxm"]
|
||||
filters = ["rig/Skeleton3D:forearm.L", "rig/Skeleton3D:forearm.R", "rig/Skeleton3D:head", "rig/Skeleton3D:upper_arm.L", "rig/Skeleton3D:upper_arm.R"]
|
||||
|
@ -154,7 +153,7 @@ transform = Transform3D(0.065, 0, 0, 0, 0.065, 0, 0, 0, 0.065, 0, 0, 0)
|
|||
script = ExtResource("2_ksje8")
|
||||
|
||||
[node name="Skeleton3D" parent="rig" index="0"]
|
||||
bones/0/rotation = Quaternion(0.104001, 0, 0, 0.994577)
|
||||
bones/0/rotation = Quaternion(0.0962932, 0, 0, 0.995353)
|
||||
bones/1/rotation = Quaternion(-0.0891896, 1.18734e-07, -1.06322e-08, 0.996015)
|
||||
bones/2/rotation = Quaternion(0.0133933, -1.19199e-07, 1.5966e-09, 0.99991)
|
||||
bones/3/rotation = Quaternion(-0.00997737, 0.100365, -0.694951, 0.711948)
|
||||
|
@ -187,6 +186,3 @@ stream = ExtResource("4_nvurj")
|
|||
|
||||
[node name="chuckle" type="AudioStreamPlayer" parent="." index="6"]
|
||||
stream = ExtResource("5_b32re")
|
||||
|
||||
[node name="sad" type="AudioStreamPlayer" parent="." index="7"]
|
||||
stream = ExtResource("6_qe4bi")
|
||||
|
|
|
@ -100,9 +100,7 @@ func drop():
|
|||
func _on_grape_man_anim_check_grab(_position):
|
||||
var obj = target.get_ref()
|
||||
if not obj:
|
||||
$grape_man/sad.play()
|
||||
return
|
||||
$grape_man/chuckle.play()
|
||||
holding = target
|
||||
target = weakref(null)
|
||||
|
||||
|
|
Loading…
Reference in New Issue