diff --git a/config/character/monster03.tres b/config/character/monster03.tres index 21f4afe..9490434 100644 --- a/config/character/monster03.tres +++ b/config/character/monster03.tres @@ -4,7 +4,7 @@ [ext_resource type="Resource" uid="uid://dx54fjf5t0uu8" path="res://config/character_move/normal.tres" id="1_ol2gy"] [ext_resource type="Resource" uid="uid://dpajmgrlaytah" path="res://config/character_mp/normal.tres" id="2_kkpsf"] [ext_resource type="Script" path="res://script/config/character_cfg.gd" id="3_0gem5"] -[ext_resource type="Resource" uid="uid://dlaekoamystx3" path="res://config/character_shield/normal.tres" id="4_3daai"] +[ext_resource type="Resource" uid="uid://h1curvk64vm3" path="res://config/character_shield/none.tres" id="5_2xoig"] [ext_resource type="SpriteFrames" uid="uid://bvcrc6bbufwqv" path="res://resource/animation/character/monster03_move.aseprite" id="5_4dnud"] [ext_resource type="Resource" uid="uid://cac6mk6g078vn" path="res://config/character_stun/normal.tres" id="6_ar00t"] @@ -16,10 +16,12 @@ sprite_frames = ExtResource("5_4dnud") sprite_height = 45 sprite_width = 16 move = ExtResource("1_ol2gy") -shield = ExtResource("4_3daai") +shield = ExtResource("5_2xoig") stun = ExtResource("6_ar00t") mp = ExtResource("2_kkpsf") ai = ExtResource("1_lr20m") hp_max = 100.0 attack = 10.0 sub_character_auto_create = false +material_on = 0 +material_off = 0 diff --git a/resource/animation/character/basic_move.aseprite b/resource/animation/character/basic_move.aseprite index 4c2a75c..fd1059e 100644 Binary files a/resource/animation/character/basic_move.aseprite and b/resource/animation/character/basic_move.aseprite differ diff --git a/resource/animation/character/basic_move.png b/resource/animation/character/basic_move.png index aab61b3..438613d 100644 Binary files a/resource/animation/character/basic_move.png and b/resource/animation/character/basic_move.png differ diff --git a/resource/animation/character/hero01_fist_attack.aseprite b/resource/animation/character/hero01_fist_attack.aseprite index b017feb..2c1afc9 100644 Binary files a/resource/animation/character/hero01_fist_attack.aseprite and b/resource/animation/character/hero01_fist_attack.aseprite differ diff --git a/resource/animation/character/hero01_fist_attack.png b/resource/animation/character/hero01_fist_attack.png index cd92100..579c5e1 100644 Binary files a/resource/animation/character/hero01_fist_attack.png and b/resource/animation/character/hero01_fist_attack.png differ diff --git a/resource/animation/character/hero01_move.aseprite b/resource/animation/character/hero01_move.aseprite index 4d1a42e..fae4823 100644 Binary files a/resource/animation/character/hero01_move.aseprite and b/resource/animation/character/hero01_move.aseprite differ diff --git a/resource/animation/character/hero01_move.png b/resource/animation/character/hero01_move.png index 6fc9bc6..677e623 100644 Binary files a/resource/animation/character/hero01_move.png and b/resource/animation/character/hero01_move.png differ diff --git a/resource/animation/character/monster01_move.aseprite b/resource/animation/character/monster01_move.aseprite index 9c08119..efcf079 100644 Binary files a/resource/animation/character/monster01_move.aseprite and b/resource/animation/character/monster01_move.aseprite differ diff --git a/resource/animation/character/monster02_move.aseprite b/resource/animation/character/monster02_move.aseprite index 4a6f5ad..ca333e9 100644 Binary files a/resource/animation/character/monster02_move.aseprite and b/resource/animation/character/monster02_move.aseprite differ diff --git a/resource/animation/character/monster02_move.png b/resource/animation/character/monster02_move.png index 79dc748..4c1e359 100644 Binary files a/resource/animation/character/monster02_move.png and b/resource/animation/character/monster02_move.png differ diff --git a/resource/animation/character/monster03_move.aseprite b/resource/animation/character/monster03_move.aseprite index eea473f..41abd17 100644 Binary files a/resource/animation/character/monster03_move.aseprite and b/resource/animation/character/monster03_move.aseprite differ diff --git a/resource/animation/character/monster03_move.png b/resource/animation/character/monster03_move.png index 4e0e491..01fbc8a 100644 Binary files a/resource/animation/character/monster03_move.png and b/resource/animation/character/monster03_move.png differ diff --git a/scene/character/character.tscn b/scene/character/character.tscn index 6f5c2fc..b9111e3 100644 --- a/scene/character/character.tscn +++ b/scene/character/character.tscn @@ -22,7 +22,7 @@ height = 1.0 [sub_resource type="Curve" id="Curve_v7nnw"] -_data = [Vector2(0, 0.498516), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +_data = [Vector2(0, 0.201638), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] point_count = 2 [sub_resource type="CylinderShape3D" id="CylinderShape3D_ehwx5"] diff --git a/script/character/battle.gd b/script/character/battle.gd index 7fdf393..dae0ba6 100644 --- a/script/character/battle.gd +++ b/script/character/battle.gd @@ -195,6 +195,7 @@ func settle(from: int, to: int, dir: Vector2, attack: AttackCfg) -> HitResult: if is_break_skill and attack.is_throw_check and not character_to.get_status("is_be_throw") and status.throw_target == 0: character_to.set_status("is_be_throw", true) status.throw_target = character_to.id() + is_floating = true #投技结束 if attack.is_throw_end: @@ -228,7 +229,10 @@ func settle(from: int, to: int, dir: Vector2, attack: AttackCfg) -> HitResult: if dir.x!=0: character_to.set_status("is_right", dir.x<0) else: - character_to.add_buff("stagger", 1) + match break_level_sub: + 1: character_to.add_buff("stagger", 0.3) + 2: character_to.add_buff("stagger", 0.6) + 3: character_to.add_buff("stagger", 0.9) hit_up_speed = 0 if hit_back_limit_curve: var character_dir: Vector2 = character_from.pos2D() - character_to.pos2D() diff --git a/script/character/view.gd b/script/character/view.gd index 1a8f935..8211cbb 100644 --- a/script/character/view.gd +++ b/script/character/view.gd @@ -36,18 +36,12 @@ func _ready(): trans("jump5", "run1", "speed_xz", ">", 1) #地面受击 - trigger("any", "hit1", "trigger_hit") - trigger("any", "mhit1", "trigger_mhit") - trigger("any", "lhit1", "trigger_lhit") - run("hit1", "hit2_loop") - run("mhit1", "mhit2_loop") - run("lhit1", "lhit2_loop") - trans("hit2_loop", "hit3", "is_stagger", "=", false) - trans("mhit2_loop", "mhit3", "is_stagger", "=", false) - trans("lhit2_loop", "lhit3", "is_stagger", "=", false) - run("hit3", "idle_loop") - run("mhit3", "idle_loop") - run("lhit3", "idle_loop") + trigger("any", "hit", "trigger_hit") + trigger("any", "mhit", "trigger_mhit") + trigger("any", "lhit", "trigger_lhit") + run("hit", "idle_loop") + run("mhit", "idle_loop") + run("lhit", "idle_loop") #空中受击 trigger("any", "airhit1", "trigger_air_hit_up") @@ -203,4 +197,3 @@ func play_animation(animation_name: String) -> void: play() else: play(animation_name, Setting.animation_speed_scale) -