diff --git a/spine-godot/example/assets/spineboy/spinebody-data-res.tres b/spine-godot/example/assets/spineboy/spinebody-data-res.tres index 9f8ebf57a..a6566b79c 100644 --- a/spine-godot/example/assets/spineboy/spinebody-data-res.tres +++ b/spine-godot/example/assets/spineboy/spinebody-data-res.tres @@ -1,8 +1,19 @@ -[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2] +[gd_resource type="SpineSkeletonDataResource" load_steps=5 format=2] [ext_resource path="res://assets/spineboy/spineboy.atlas" type="SpineAtlasResource" id=1] [ext_resource path="res://assets/spineboy/spineboy-pro.json" type="SpineSkeletonFileResource" id=2] +[sub_resource type="SpineAnimationMix" id=1] +from = "idle" +to = "run" +mix = 0.2 + +[sub_resource type="SpineAnimationMix" id=2] +from = "run" +to = "idle" +mix = 0.2 + [resource] atlas_res = ExtResource( 1 ) skeleton_file_res = ExtResource( 2 ) +animation_mixes = [ SubResource( 1 ), SubResource( 2 ) ] diff --git a/spine-godot/example/examples/mix-and-match/mix-and-match.tscn b/spine-godot/example/examples/mix-and-match/mix-and-match.tscn index b02dc8bc9..a3c6865c3 100644 --- a/spine-godot/example/examples/mix-and-match/mix-and-match.tscn +++ b/spine-godot/example/examples/mix-and-match/mix-and-match.tscn @@ -6,7 +6,7 @@ [node name="Node2D" type="Node2D"] [node name="MixAndMatch" type="SpineSprite" parent="."] -position = Vector2( 775.779, 516.856 ) +position = Vector2( 532.982, 480.287 ) scale = Vector2( 0.441932, 0.441932 ) skeleton_data_res = ExtResource( 1 ) script = ExtResource( 2 ) diff --git a/spine-godot/example/examples/simple-input/spineboy-simple-input.gd b/spine-godot/example/examples/simple-input/spineboy-simple-input.gd index c871dc613..5b0277060 100644 --- a/spine-godot/example/examples/simple-input/spineboy-simple-input.gd +++ b/spine-godot/example/examples/simple-input/spineboy-simple-input.gd @@ -3,7 +3,7 @@ extends SpineSprite func _ready(): get_animation_state().set_animation("idle", true, 0) -func _process(delta): +func _process(_delta): if Input.is_action_just_pressed("ui_left"): get_animation_state().set_animation("run", true, 0) get_skeleton().set_scale_x(-1)