From f0e4efdaca6cc2545d2df52a2038b5fc7076433d Mon Sep 17 00:00:00 2001 From: chendian <-> Date: Tue, 3 Oct 2023 06:28:28 +0800 Subject: [PATCH] fix --- .../hero01_long_normal_attack01.tres | 2 +- .../hero01_long_normal_attack02.tres | 2 +- .../hero01_long_normal_attack01.tres | 40 ++++++++++++++++++- .../hero01_long_normal_attack02.tres | 40 ++++++++++++++++++- scene/character/player.tscn | 8 +++- script/config/skill_cfg.gd | 15 +++++++ 6 files changed, 102 insertions(+), 5 deletions(-) diff --git a/config/player_skill/hero01_long_normal_attack01.tres b/config/player_skill/hero01_long_normal_attack01.tres index 63ec775..afe988e 100644 --- a/config/player_skill/hero01_long_normal_attack01.tres +++ b/config/player_skill/hero01_long_normal_attack01.tres @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_rossy"] [ext_resource type="Resource" uid="uid://cy3wwalxeyro0" path="res://config/weapon/long.tres" id="2_eiqoa"] [ext_resource type="SpriteFrames" uid="uid://7swf8owxd63i" path="res://resource/animation/character/hero01_long_normal_attack.aseprite" id="2_h7r7b"] -[ext_resource type="Animation" uid="uid://u8ktjgjrw4vq" path="res://resource/skill_animation/hero01_long_normal_attack01.tres" id="2_xp4qp"] +[ext_resource type="Animation" uid="uid://b28xyr8shsxad" path="res://resource/skill_animation/hero01_long_normal_attack01.tres" id="2_xp4qp"] [resource] script = ExtResource("1_rossy") diff --git a/config/player_skill/hero01_long_normal_attack02.tres b/config/player_skill/hero01_long_normal_attack02.tres index 1d2cf5d..31fefb9 100644 --- a/config/player_skill/hero01_long_normal_attack02.tres +++ b/config/player_skill/hero01_long_normal_attack02.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="PlayerSkillCfg" load_steps=4 format=3 uid="uid://cs32884hwqxd7"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_oext1"] -[ext_resource type="Animation" uid="uid://cx5yvy5g382y8" path="res://resource/skill_animation/hero01_long_normal_attack02.tres" id="2_x4jpa"] +[ext_resource type="Animation" uid="uid://cidi63jms7hxv" path="res://resource/skill_animation/hero01_long_normal_attack02.tres" id="2_x4jpa"] [ext_resource type="SpriteFrames" uid="uid://7swf8owxd63i" path="res://resource/animation/character/hero01_long_normal_attack.aseprite" id="3_o58di"] [resource] diff --git a/resource/skill_animation/hero01_long_normal_attack01.tres b/resource/skill_animation/hero01_long_normal_attack01.tres index ddeb9fb..d431302 100644 --- a/resource/skill_animation/hero01_long_normal_attack01.tres +++ b/resource/skill_animation/hero01_long_normal_attack01.tres @@ -1,4 +1,42 @@ -[gd_resource type="Animation" format=3 uid="uid://u8ktjgjrw4vq"] +[gd_resource type="Animation" load_steps=2 format=3 uid="uid://b28xyr8shsxad"] + +[ext_resource type="SpriteFrames" uid="uid://7swf8owxd63i" path="res://resource/animation/character/hero01_long_normal_attack.aseprite" id="1_kkk0x"] [resource] resource_name = "hero01_long_normal_attack01" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("View:sprite_frames") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [ExtResource("1_kkk0x")] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("View:animation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": ["long_attack01"] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("View:frame") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1), +"update": 0, +"values": [0, 1, 2, 3, 4, 5, 6, 7, 8] +} diff --git a/resource/skill_animation/hero01_long_normal_attack02.tres b/resource/skill_animation/hero01_long_normal_attack02.tres index 00e9de5..4b70660 100644 --- a/resource/skill_animation/hero01_long_normal_attack02.tres +++ b/resource/skill_animation/hero01_long_normal_attack02.tres @@ -1,4 +1,42 @@ -[gd_resource type="Animation" format=3 uid="uid://cx5yvy5g382y8"] +[gd_resource type="Animation" load_steps=2 format=3 uid="uid://cidi63jms7hxv"] + +[ext_resource type="SpriteFrames" uid="uid://7swf8owxd63i" path="res://resource/animation/character/hero01_long_normal_attack.aseprite" id="1_3vfd1"] [resource] resource_name = "hero01_long_normal_attack02" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("View:sprite_frames") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [ExtResource("1_3vfd1")] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("View:animation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": ["long_attack02"] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("View:frame") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1), +"update": 0, +"values": [0, 1, 2, 3, 4, 5, 6, 7, 8] +} diff --git a/scene/character/player.tscn b/scene/character/player.tscn index 9db5491..1454dac 100644 --- a/scene/character/player.tscn +++ b/scene/character/player.tscn @@ -1,9 +1,15 @@ -[gd_scene load_steps=3 format=3 uid="uid://b85fy0wfgr4gs"] +[gd_scene load_steps=4 format=3 uid="uid://b85fy0wfgr4gs"] [ext_resource type="PackedScene" uid="uid://vnkcr04hevna" path="res://scene/character/character.tscn" id="1_bny0p"] [ext_resource type="Script" path="res://script/character/player/input.gd" id="2_qkra8"] +[ext_resource type="Resource" uid="uid://b6x3jdiqtum6" path="res://config/player_skill/hero01_long_normal_attack01.tres" id="3_b6mhs"] [node name="Character" instance=ExtResource("1_bny0p")] +[node name="View" parent="." index="2"] +animation = &"long_attack01" +frame = 8 + [node name="Input" type="Node3D" parent="." index="5"] script = ExtResource("2_qkra8") +test_skill_cfg = ExtResource("3_b6mhs") diff --git a/script/config/skill_cfg.gd b/script/config/skill_cfg.gd index 2d2def6..c0a8e90 100644 --- a/script/config/skill_cfg.gd +++ b/script/config/skill_cfg.gd @@ -46,6 +46,21 @@ func create_animation(res_name,path) -> bool: var animation = Animation.new() animation.resource_name = res_name + var track_sprite_frames = animation.add_track(Animation.TYPE_VALUE) + animation.track_set_path(track_sprite_frames,"View:sprite_frames") + animation.track_insert_key(track_sprite_frames,0,sprite_frams) + + var track_animation = animation.add_track(Animation.TYPE_VALUE) + animation.track_set_path(track_animation,"View:animation") + animation.track_insert_key(track_animation,0,animation_name) + + var track_frame = animation.add_track(Animation.TYPE_VALUE) + animation.track_set_path(track_frame,"View:frame") + var animation_speed = 0.1 + var animation_frame_count = sprite_frams.get_frame_count(animation_name) + for i in range(0,animation_frame_count): + var time = i * animation_speed + animation.track_insert_key(track_frame,time,i) ResourceSaver.save(animation,path) refresh_animation_lib()