diff --git a/Animations/BEAR_JUMP_SMASH.tres b/Animations/BEAR_JUMP_SMASH.tres index 6f26214..bc40bd8 100644 --- a/Animations/BEAR_JUMP_SMASH.tres +++ b/Animations/BEAR_JUMP_SMASH.tres @@ -1,4 +1,4 @@ -[gd_resource type="Animation" format=3 uid="uid://cxbces1e773ij"] +[gd_resource type="Animation" format=3 uid="uid://mromdsq6ijs8"] [resource] resource_name = "JUMP_SMASH" diff --git a/Animations/BEAR_SMASH_HIT.tres b/Animations/BEAR_SMASH_HIT.tres index f0f5414..63eb381 100644 --- a/Animations/BEAR_SMASH_HIT.tres +++ b/Animations/BEAR_SMASH_HIT.tres @@ -1,4 +1,4 @@ -[gd_resource type="Animation" format=3 uid="uid://btio8501w0mqk"] +[gd_resource type="Animation" format=3 uid="uid://dycs4ovqj6a5q"] [resource] resource_name = "SMASH_HIT" diff --git a/Assets/bear_fx.tscn b/Assets/bear_fx.tscn deleted file mode 100644 index f153afd..0000000 --- a/Assets/bear_fx.tscn +++ /dev/null @@ -1,3 +0,0 @@ -[gd_scene format=3 uid="uid://c2dx4khl7voyd"] - -[node name="BearFx" type="Node3D" unique_id=1568304275] diff --git a/Assets/fx/Bear_FX.glb b/Assets/fx/Bear_FX.glb new file mode 100644 index 0000000..5f17ea3 Binary files /dev/null and b/Assets/fx/Bear_FX.glb differ diff --git a/Assets/fx/Bear_FX.glb.import b/Assets/fx/Bear_FX.glb.import new file mode 100644 index 0000000..930a4dd --- /dev/null +++ b/Assets/fx/Bear_FX.glb.import @@ -0,0 +1,45 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bdbx0wwa73rhp" +path="res://.godot/imported/Bear_FX.glb-5bac655e61b5e140f6cd145298d00ca8.scn" + +[deps] + +source_file="res://Assets/fx/Bear_FX.glb" +dest_files=["res://.godot/imported/Bear_FX.glb-5bac655e61b5e140f6cd145298d00ca8.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +mesh_library/use_node_names_as_mesh_names=false +array_mesh/deduplicate_surfaces=true +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 +gltf/texture_map_mode=1 diff --git a/Bear.tscn b/Bear.tscn index 94d1c82..33c163f 100644 --- a/Bear.tscn +++ b/Bear.tscn @@ -29,7 +29,7 @@ shape = SubResource("CapsuleShape3D_hit") [node name="bear_model" parent="." unique_id=359217823 instance=ExtResource("2_bearglb")] -[node name="Skeleton3D" parent="bear_model/bear-rig" parent_id_path=PackedInt32Array(359217823, 660647381) index="0" unique_id=2009911229] +[node name="Skeleton3D" parent="bear_model/bear-rig" parent_id_path=PackedInt32Array(359217823, 1619621659) index="0" unique_id=1324818366] bones/1/position = Vector3(-0.011276185, 0.70064664, 0.6516155) bones/1/rotation = Quaternion(0.62049717, 0.5337393, -0.48571983, 0.3068907) bones/2/rotation = Quaternion(0.22357875, -0.003894657, 0.14433222, 0.9639324)