diff --git a/config/attack/blunt_mid_hit_blow.tres b/config/attack/blunt_mid_hit_blow.tres index 3d5dc01..e309599 100644 --- a/config/attack/blunt_mid_hit_blow.tres +++ b/config/attack/blunt_mid_hit_blow.tres @@ -11,7 +11,7 @@ damage_type = 1 is_floating = true is_hit_down = false is_rebound = false -hit_back_speed = 4.0 +hit_back_speed = 3.0 hit_up_speed = 3.0 hit_back_duration = 0.05 hit_up_duration = 0.05 diff --git a/config/attack/blunt_normal_hit.tres b/config/attack/blunt_normal_hit.tres index daea2d3..ca72177 100644 --- a/config/attack/blunt_normal_hit.tres +++ b/config/attack/blunt_normal_hit.tres @@ -12,7 +12,7 @@ is_floating = false is_hit_down = false is_rebound = false hit_back_speed = 2.0 -hit_up_speed = 1.0 +hit_up_speed = 2.0 hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.05 diff --git a/config/attack/blunt_normal_hit_back.tres b/config/attack/blunt_normal_hit_back.tres index e9cad42..64d1ca1 100644 --- a/config/attack/blunt_normal_hit_back.tres +++ b/config/attack/blunt_normal_hit_back.tres @@ -11,8 +11,8 @@ damage_type = 1 is_floating = false is_hit_down = false is_rebound = false -hit_back_speed = 4.0 -hit_up_speed = 2.0 +hit_back_speed = 3.0 +hit_up_speed = 3.0 hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.05 diff --git a/config/attack/sharp_heavy_hit_blow.tres b/config/attack/sharp_heavy_hit_blow.tres index f12a18a..f23b440 100644 --- a/config/attack/sharp_heavy_hit_blow.tres +++ b/config/attack/sharp_heavy_hit_blow.tres @@ -8,7 +8,7 @@ damage_rate = 1.0 break_level = 3 stun_attack = 10.0 damage_type = 0 -is_floating = false +is_floating = true is_hit_down = false is_rebound = false hit_back_speed = 10.0 diff --git a/config/skill_player_weapon/hero01_long_attack04.tres b/config/skill_player_weapon/hero01_long_attack04.tres index c94dd23..6aac951 100644 --- a/config/skill_player_weapon/hero01_long_attack04.tres +++ b/config/skill_player_weapon/hero01_long_attack04.tres @@ -1,6 +1,7 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://chuv8k5d44ln4"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=7 format=3 uid="uid://chuv8k5d44ln4"] [ext_resource type="Resource" uid="uid://dbs2wjw20s0hu" path="res://config/attack/sharp_heavy_hit_blow.tres" id="1_7tise"] +[ext_resource type="Resource" uid="uid://c87w2x5qfqdns" path="res://config/attack/blunt_normal_hit_back.tres" id="1_rvymn"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_xsxbs"] [ext_resource type="Animation" uid="uid://dk1o3gqhjmuvh" path="res://resource/skill_animation/hero01_long_attack04.tres" id="2_sam6s"] [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="3_w7h1m"] @@ -15,7 +16,7 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("2_sam6s") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_7tise")]) +attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_rvymn"), ExtResource("1_7tise")]) sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false refresh_animation = false diff --git a/render/material/effect_skew1.tres b/render/material/effect_skew1.tres deleted file mode 100644 index f246e9d..0000000 --- a/render/material/effect_skew1.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="ShaderMaterial" load_steps=4 format=3 uid="uid://bkbuvtya3uk3x"] - -[ext_resource type="Shader" path="res://render/shader/effect_skew1.gdshader" id="1_dcuof"] -[ext_resource type="Texture2D" uid="uid://csjm7d1tg6b50" path="res://render/texture/particle/mask/mask6.png" id="3_p44lv"] -[ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="4_vjpnf"] - -[resource] -render_priority = 0 -shader = ExtResource("1_dcuof") -shader_parameter/distortionView = 0.06 -shader_parameter/speedView = 0.5 -shader_parameter/noise = ExtResource("4_vjpnf") -shader_parameter/tex_mask = ExtResource("3_p44lv") diff --git a/render/material/effect_slash.tres b/render/material/effect_slash.tres deleted file mode 100644 index f792e9a..0000000 --- a/render/material/effect_slash.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="ShaderMaterial" load_steps=5 format=3 uid="uid://dtyosukxpf33d"] - -[ext_resource type="Shader" path="res://render/shader/effect_slash.gdshader" id="1_s5fvm"] -[ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="2_gu3jv"] -[ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="3_p66ui"] -[ext_resource type="Texture2D" uid="uid://cksxjvafx2skm" path="res://render/texture/particle/mask/mask5.png" id="3_r0nln"] - -[resource] -render_priority = 0 -shader = ExtResource("1_s5fvm") -shader_parameter/tex_main = ExtResource("2_gu3jv") -shader_parameter/tex_noise = ExtResource("3_p66ui") -shader_parameter/tex_mask = ExtResource("3_r0nln") diff --git a/render/mesh/dash.obj b/render/mesh/dash.obj new file mode 100644 index 0000000..5b5d743 --- /dev/null +++ b/render/mesh/dash.obj @@ -0,0 +1,1381 @@ +v 0 0.2963065 -1.156435 +v -0.09156381 0.2818042 -1.156435 +v -0.09270518 0.2853169 -1 +v 0 0.3 -1 +v -0.09156382 0.2818042 -0.8435656 +v 3.287597E-08 0.2963066 -0.8435656 +v -0.08816787 0.2713525 -0.6909831 +v 0 0.2853169 -0.6909831 +v -0.08260093 0.2542192 -0.5460095 +v 0 0.2673019 -0.5460095 +v -0.07500008 0.2308262 -0.4122148 +v 1.499457E-08 0.2427052 -0.4122148 +v -0.06555249 0.2017495 -0.2928932 +v 1.583527E-09 0.2121321 -0.2928932 +v -0.05449077 0.167705 -0.190983 +v 1.499457E-08 0.1763356 -0.190983 +v -0.04208732 0.1295311 -0.1089935 +v 2.393527E-08 0.1361972 -0.1089935 +v -0.1246882 0.1716183 -0.2928932 +v -0.1426586 0.1963525 -0.4122148 +v -0.1571163 0.2162517 -0.5460095 +v -0.1677053 0.2308262 -0.6909831 +v -0.1741647 0.2397169 -0.8435656 +v -0.1763357 0.242705 -1 +v -0.1741647 0.2397169 -1.156435 +v -0.08005482 0.1101857 -0.1089935 +v -0.1036476 0.1426584 -0.190983 +v -0.2397172 0.1741645 -0.8435656 +v -0.2427053 0.1763354 -1 +v -0.2397172 0.1741644 -1.156435 +v -0.110186 0.08005455 -0.1089935 +v -0.1426587 0.1036473 -0.190983 +v -0.1716186 0.1246879 -0.2928932 +v -0.1963528 0.1426584 -0.4122148 +v -0.216252 0.157116 -0.5460095 +v -0.2308265 0.1677049 -0.6909831 +v -0.2017498 0.06555219 -0.2928932 +v -0.2308265 0.07499982 -0.4122148 +v -0.2542195 0.08260062 -0.5460095 +v -0.2713528 0.08816756 -0.6909831 +v -0.2818045 0.09156354 -0.8435656 +v -0.2853172 0.09270488 -1 +v -0.2818045 0.09156352 -1.156435 +v -0.2853172 -3.058367E-07 -0.6909831 +v -0.2963068 -2.879553E-07 -0.8435656 +v -0.3000003 -2.96896E-07 -1 +v -0.2963068 -2.96896E-07 -1.156435 +v -0.2121323 -2.924256E-07 -0.2928932 +v -0.1763358 -2.745442E-07 -0.190983 +v -0.1677053 0.0544905 -0.190983 +v -0.1361974 -2.700739E-07 -0.1089935 +v -0.1295314 0.04208704 -0.1089935 +v -0.1677053 -0.05449105 -0.190983 +v -0.2017498 -0.06555278 -0.2928932 +v -0.2427054 -2.611332E-07 -0.4122148 +v -0.2673022 -3.058367E-07 -0.5460095 +v -0.2308265 -0.07500035 -0.4122148 +v -0.2542195 -0.08260123 -0.5460095 +v -0.2713528 -0.08816817 -0.6909831 +v -0.2818045 -0.09156412 -0.8435656 +v -0.2853172 -0.09270548 -1 +v -0.2818045 -0.09156412 -1.156435 +v -0.216252 -0.1571166 -0.5460095 +v -0.2308265 -0.1677056 -0.6909831 +v -0.2397172 -0.1741651 -0.8435656 +v -0.2427053 -0.176336 -1 +v -0.2397172 -0.1741651 -1.156435 +v -0.1963528 -0.1426589 -0.4122148 +v -0.1716186 -0.1246885 -0.2928932 +v -0.1426587 -0.1036479 -0.190983 +v -0.110186 -0.0800551 -0.1089935 +v -0.1295314 -0.04208758 -0.1089935 +v -0.08005484 -0.1101863 -0.1089935 +v -0.1036476 -0.142659 -0.190983 +v -0.1246882 -0.1716189 -0.2928932 +v -0.1426587 -0.1963531 -0.4122148 +v -0.1571163 -0.2162524 -0.5460095 +v -0.1677053 -0.2308268 -0.6909831 +v -0.1741648 -0.2397175 -0.8435656 +v -0.1763357 -0.2427056 -1 +v -0.1741647 -0.2397175 -1.156435 +v -0.08260092 -0.2542198 -0.5460095 +v -0.08816785 -0.2713531 -0.6909831 +v -0.09156385 -0.2818048 -0.8435656 +v -0.09270517 -0.2853175 -1 +v -0.09156381 -0.2818048 -1.156435 +v -0.07500011 -0.2308268 -0.4122148 +v -0.06555247 -0.2017501 -0.2928932 +v -0.05449079 -0.1677056 -0.190983 +v -0.04208733 -0.1295317 -0.1089935 +v 3.287597E-08 -0.3000006 -1 +v 2.393527E-08 -0.2963071 -1.156435 +v -1.182752E-08 -0.1361977 -0.1089935 +v -1.629787E-08 -0.1763361 -0.190983 +v 1.946492E-08 -0.2121326 -0.2928932 +v -2.076822E-08 -0.2427057 -0.4122148 +v 2.393527E-08 -0.2673025 -0.5460095 +v 2.393527E-08 -0.2853175 -0.6909831 +v -2.886822E-09 -0.2963071 -0.8435656 +v 0.07500008 -0.2308269 -0.4122148 +v 0.08260097 -0.2542199 -0.5460095 +v 0.08816791 -0.2713531 -0.6909831 +v 0.09156385 -0.2818048 -0.8435656 +v 0.09270523 -0.2853175 -1 +v 0.09156388 -0.2818048 -1.156435 +v 0.06555251 -0.2017501 -0.2928932 +v 0.1763358 -0.2427056 -1 +v 0.1741648 -0.2397175 -1.156435 +v 0.1246883 -0.171619 -0.2928932 +v 0.1036476 -0.142659 -0.190983 +v 0.05449076 -0.1677057 -0.190983 +v 0.0420873 -0.1295317 -0.1089935 +v 0.08005482 -0.1101863 -0.1089935 +v 0.1741648 -0.2397176 -0.8435656 +v 0.1677053 -0.2308268 -0.6909831 +v 0.1571164 -0.2162524 -0.5460095 +v 0.1426587 -0.1963531 -0.4122148 +v 0.1963528 -0.142659 -0.4122148 +v 0.2162521 -0.1571166 -0.5460095 +v 0.2308266 -0.1677056 -0.6909831 +v 0.2397173 -0.1741651 -0.8435656 +v 0.2427054 -0.1763361 -1 +v 0.2397173 -0.1741651 -1.156435 +v 0.1716187 -0.1246886 -0.2928932 +v 0.1426587 -0.1036479 -0.190983 +v 0.110186 -0.08005512 -0.1089935 +v 0.2818046 -0.09156415 -0.8435656 +v 0.2853173 -0.09270548 -1 +v 0.2818046 -0.09156411 -1.156435 +v 0.1295314 -0.04208761 -0.1089935 +v 0.1677054 -0.05449108 -0.190983 +v 0.2017499 -0.06555279 -0.2928932 +v 0.2308266 -0.0750004 -0.4122148 +v 0.2542197 -0.08260122 -0.5460095 +v 0.2713529 -0.08816817 -0.6909831 +v 0.2121324 -2.834849E-07 -0.2928932 +v 0.2427054 -2.879553E-07 -0.4122148 +v 0.2673023 -2.521925E-07 -0.5460095 +v 0.2853173 -2.611332E-07 -0.6909831 +v 0.2963069 -2.879553E-07 -0.8435656 +v 0.3000004 -2.700739E-07 -1 +v 0.2963069 -2.521925E-07 -1.156435 +v 0.1763359 -2.96896E-07 -0.190983 +v 0.1361974 -2.924256E-07 -0.1089935 +v 0.115911 -2.881113E-07 -0.07896847 +v 0.1102379 -0.03581876 -0.07896847 +v 0.09270536 -2.834849E-07 -0.04894346 +v 0.08816803 -0.02864781 -0.04894346 +v 0.09377397 -0.06813106 -0.07896847 +v 0.0750002 -0.05449112 -0.04894346 +v 0.06813077 -0.09377424 -0.07896847 +v 0.05449083 -0.07500049 -0.04894346 +v 0.03581845 -0.1102382 -0.07896847 +v 0.02864752 -0.08816831 -0.04894346 +v -9.715687E-09 -0.1159113 -0.07896847 +v -7.35717E-09 -0.09270563 -0.04894346 +v -0.03581848 -0.1102382 -0.07896847 +v -0.02864754 -0.08816831 -0.04894346 +v -0.06813078 -0.09377424 -0.07896847 +v -0.05449085 -0.07500049 -0.04894346 +v -0.09377397 -0.06813105 -0.07896847 +v -0.07500021 -0.05449113 -0.04894346 +v -0.1102379 -0.03581874 -0.07896847 +v -0.08816803 -0.02864781 -0.04894346 +v -0.115911 -2.756611E-07 -0.07896847 +v -0.09270535 -2.812498E-07 -0.04894346 +v -0.1102379 0.03581819 -0.07896847 +v -0.08816803 0.02864725 -0.04894346 +v -0.09377397 0.06813049 -0.07896847 +v -0.07500021 0.05449056 -0.04894346 +v -0.06813077 0.09377369 -0.07896847 +v -0.05449084 0.07499992 -0.04894346 +v -0.03581847 0.1102376 -0.07896847 +v -0.02864753 0.08816774 -0.04894346 +v 1.518479E-08 0.1159108 -0.07896847 +v 6.053876E-09 0.0927051 -0.04894346 +v 0.03581849 0.1102377 -0.07896847 +v 0.02864754 0.08816777 -0.04894346 +v 0.06813081 0.0937737 -0.07896847 +v 0.05449086 0.07499994 -0.04894346 +v 0.093774 0.0681305 -0.07896847 +v 0.07500023 0.05449056 -0.04894346 +v 0.1102379 0.03581818 -0.07896847 +v 0.08816804 0.02864725 -0.04894346 +v 0.115911 -2.881113E-07 -0.07896847 +v 0.09270536 -2.834849E-07 -0.04894346 +v 5.522658E-09 0.07142612 -0.03062755 +v 0.02207198 0.06793026 -0.03062755 +v 4.902746E-09 0.04516094 -0.01231164 +v -0.01395558 0.04295057 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v -0.02207196 0.06793023 -0.03062755 +v -0.02654509 0.0365359 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v -0.04198337 0.05778487 -0.03062755 +v -0.03653618 0.02654481 -0.01231164 +v -0.05778515 0.04198308 -0.03062755 +v 2.290179E-07 -3.589274E-07 0 +v -0.04295086 0.0139553 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v -0.06793052 0.02207168 -0.03062755 +v -0.04516121 -2.835631E-07 -0.01231164 +v -0.07142638 -2.824123E-07 -0.03062755 +v 2.290179E-07 -3.589274E-07 0 +v -0.04295086 -0.01395587 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v -0.06793052 -0.02207225 -0.03062755 +v -0.03653619 -0.02654538 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v -0.05778516 -0.04198365 -0.03062755 +v -0.0265451 -0.03653647 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v -0.04198337 -0.05778544 -0.03062755 +v -0.01395559 -0.04295115 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v -0.02207197 -0.06793081 -0.03062755 +v -4.776319E-09 -0.0451615 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v -6.482339E-09 -0.07142666 -0.03062755 +v 0.01395558 -0.04295116 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v 0.02207196 -0.06793081 -0.03062755 +v 0.02654509 -0.03653648 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v 0.04198337 -0.05778544 -0.03062755 +v 0.03653619 -0.02654539 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v 0.05778515 -0.04198366 -0.03062755 +v 0.04295088 -0.01395588 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v 0.06793053 -0.02207225 -0.03062755 +v 0.04516122 -2.889403E-07 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v 0.07142639 -2.86414E-07 -0.03062755 +v 0.2963069 -2.879553E-07 -0.8435656 +v 0.2818046 0.09156357 -0.8435656 +v 0.2713529 0.08816765 -0.6909831 +v 0.2853173 -2.611332E-07 -0.6909831 +v 0.3000004 -2.700739E-07 -1 +v 0.2853173 0.09270494 -1 +v 0.2963069 -2.521925E-07 -1.156435 +v 0.2818046 0.09156361 -1.156435 +v 0.2542197 0.08260072 -0.5460095 +v 0.2673023 -2.521925E-07 -0.5460095 +v 0.2308266 0.07499982 -0.4122148 +v 0.2427054 -2.879553E-07 -0.4122148 +v 0.2017499 0.06555223 -0.2928932 +v 0.2121324 -2.834849E-07 -0.2928932 +v 0.1677054 0.05449049 -0.190983 +v 0.1763359 -2.96896E-07 -0.190983 +v 0.1295315 0.04208703 -0.1089935 +v 0.1361974 -2.924256E-07 -0.1089935 +v 0.1426588 0.1036474 -0.190983 +v 0.1716187 0.124688 -0.2928932 +v 0.1963529 0.1426584 -0.4122148 +v 0.2162521 0.1571161 -0.5460095 +v 0.2308266 0.1677051 -0.6909831 +v 0.2397173 0.1741645 -0.8435656 +v 0.2427054 0.1763355 -1 +v 0.2397173 0.1741646 -1.156435 +v 0.1101861 0.08005455 -0.1089935 +v 0.1677053 0.2308263 -0.6909831 +v 0.1741648 0.239717 -0.8435656 +v 0.1763358 0.2427051 -1 +v 0.1741648 0.2397171 -1.156435 +v 0.1426587 0.1963526 -0.4122148 +v 0.1246883 0.1716184 -0.2928932 +v 0.1036477 0.1426585 -0.190983 +v 0.08005488 0.1101858 -0.1089935 +v 0.05449081 0.1677051 -0.190983 +v 0.06555253 0.2017496 -0.2928932 +v 0.07500013 0.2308263 -0.4122148 +v 0.1571164 0.2162519 -0.5460095 +v 0.08260095 0.2542194 -0.5460095 +v 0.0881679 0.2713526 -0.6909831 +v 0.0915639 0.2818044 -0.8435656 +v 0.09270521 0.2853171 -1 +v 0.09156386 0.2818044 -1.156435 +v 0.04208735 0.1295312 -0.1089935 +v 0.07142639 -2.86414E-07 -0.03062755 +v 0.06793053 0.02207168 -0.03062755 +v 0.04295088 0.0139553 -0.01231164 +v 0.04516122 -2.889403E-07 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v 0.0365362 0.02654481 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v 0.05778517 0.04198309 -0.03062755 +v 0.02654511 0.03653591 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v 0.04198338 0.05778488 -0.03062755 +v 0.01395559 0.04295059 -0.01231164 +v 2.290179E-07 -3.589274E-07 0 +v 2.290179E-07 -3.589274E-07 0 +vn 0 0.9997217 -0.02359144 +vn -0.3089159 0.9507968 -0.02359138 +vn -0.3090039 0.9510608 0 +vn 0 1 0 +vn -0.3086728 0.949976 0.04761019 +vn 0 0.998866 0.0476101 +vn -0.3075385 0.9465422 0.09735513 +vn 0 0.9952497 0.09735508 +vn -0.3054367 0.9400539 0.1516807 +vn 0 0.9884294 0.1516811 +vn -0.3018675 0.9290416 0.2139106 +vn 0 0.9768538 0.213908 +vn -0.2958253 0.9105181 0.2888669 +vn 0 0.957369 0.2888679 +vn -0.2852911 0.8780911 0.384142 +vn 0 0.9232718 0.3841472 +vn -0.2679583 0.8247501 0.4979814 +vn 0 0.8671838 0.4979883 +vn -0.5627232 0.7745302 0.2888694 +vn -0.5741839 0.7902888 0.2139075 +vn -0.5809872 0.7996546 0.1516786 +vn -0.5849857 0.8051792 0.09735519 +vn -0.5871308 0.8080907 0.04761015 +vn -0.5877669 0.8090302 0 +vn -0.5876197 0.8087934 -0.02359146 +vn -0.5097039 0.7015792 0.4979845 +vn -0.5426849 0.7469469 0.3841398 +vn -0.8080907 0.5871308 0.04761015 +vn -0.8090302 0.5877669 0 +vn -0.8087934 0.5876197 -0.02359146 +vn -0.7015792 0.5097039 0.4979845 +vn -0.7469469 0.5426849 0.3841398 +vn -0.7745302 0.5627232 0.2888694 +vn -0.7902888 0.5741839 0.2139075 +vn -0.7996546 0.5809872 0.1516786 +vn -0.8051792 0.5849857 0.09735519 +vn -0.9105181 0.2958253 0.2888669 +vn -0.9290416 0.3018675 0.2139106 +vn -0.9400539 0.3054367 0.1516807 +vn -0.9465422 0.3075385 0.09735513 +vn -0.949976 0.3086728 0.04761019 +vn -0.9510608 0.3090039 0 +vn -0.9507968 0.3089159 -0.02359138 +vn -0.9952497 0 0.09735508 +vn -0.998866 0 0.0476101 +vn -1 0 0 +vn -0.9997217 0 -0.02359144 +vn -0.957369 0 0.2888679 +vn -0.9232718 0 0.3841472 +vn -0.8780911 0.2852911 0.384142 +vn -0.8671838 0 0.4979883 +vn -0.8247501 0.2679583 0.4979814 +vn -0.8780911 -0.2852911 0.384142 +vn -0.9105181 -0.2958253 0.2888669 +vn -0.9768538 0 0.213908 +vn -0.9884294 0 0.1516811 +vn -0.9290416 -0.3018675 0.2139106 +vn -0.9400539 -0.3054367 0.1516807 +vn -0.9465422 -0.3075385 0.09735513 +vn -0.949976 -0.3086728 0.04761019 +vn -0.9510608 -0.3090039 0 +vn -0.9507968 -0.3089159 -0.02359138 +vn -0.7996546 -0.5809872 0.1516786 +vn -0.8051792 -0.5849857 0.09735519 +vn -0.8080907 -0.5871308 0.04761015 +vn -0.8090302 -0.5877669 0 +vn -0.8087934 -0.5876197 -0.02359146 +vn -0.7902888 -0.5741839 0.2139075 +vn -0.7745302 -0.5627232 0.2888694 +vn -0.7469469 -0.5426849 0.3841398 +vn -0.7015792 -0.5097039 0.4979845 +vn -0.8247501 -0.2679583 0.4979814 +vn -0.5097039 -0.7015792 0.4979845 +vn -0.5426849 -0.7469469 0.3841398 +vn -0.5627232 -0.7745302 0.2888694 +vn -0.5741839 -0.7902888 0.2139075 +vn -0.5809872 -0.7996546 0.1516786 +vn -0.5849857 -0.8051792 0.09735519 +vn -0.5871308 -0.8080907 0.04761015 +vn -0.5877669 -0.8090302 0 +vn -0.5876197 -0.8087934 -0.02359146 +vn -0.3054367 -0.9400539 0.1516807 +vn -0.3075385 -0.9465422 0.09735513 +vn -0.3086728 -0.949976 0.04761019 +vn -0.3090039 -0.9510608 0 +vn -0.3089159 -0.9507968 -0.02359138 +vn -0.3018675 -0.9290416 0.2139106 +vn -0.2958253 -0.9105181 0.2888669 +vn -0.2852911 -0.8780911 0.384142 +vn -0.2679583 -0.8247501 0.4979814 +vn 0 -1 0 +vn 0 -0.9997217 -0.02359144 +vn 0 -0.8671838 0.4979883 +vn 0 -0.9232718 0.3841472 +vn 0 -0.957369 0.2888679 +vn 0 -0.9768538 0.213908 +vn 0 -0.9884294 0.1516811 +vn 0 -0.9952497 0.09735508 +vn 0 -0.998866 0.0476101 +vn 0.3018675 -0.9290416 0.2139106 +vn 0.3054367 -0.9400539 0.1516807 +vn 0.3075385 -0.9465422 0.09735513 +vn 0.3086728 -0.949976 0.04761019 +vn 0.3090039 -0.9510608 0 +vn 0.3089159 -0.9507968 -0.02359138 +vn 0.2958253 -0.9105181 0.2888669 +vn 0.5877669 -0.8090302 0 +vn 0.5876197 -0.8087934 -0.02359146 +vn 0.5627232 -0.7745302 0.2888694 +vn 0.5426849 -0.7469469 0.3841398 +vn 0.2852911 -0.8780911 0.384142 +vn 0.2679583 -0.8247501 0.4979814 +vn 0.5097039 -0.7015792 0.4979845 +vn 0.5871308 -0.8080907 0.04761015 +vn 0.5849857 -0.8051792 0.09735519 +vn 0.5809872 -0.7996546 0.1516786 +vn 0.5741839 -0.7902888 0.2139075 +vn 0.7902888 -0.5741839 0.2139075 +vn 0.7996546 -0.5809872 0.1516786 +vn 0.8051792 -0.5849857 0.09735519 +vn 0.8080907 -0.5871308 0.04761015 +vn 0.8090302 -0.5877669 0 +vn 0.8087934 -0.5876197 -0.02359146 +vn 0.7745302 -0.5627232 0.2888694 +vn 0.7469469 -0.5426849 0.3841398 +vn 0.7015792 -0.5097039 0.4979845 +vn 0.949976 -0.3086728 0.04761019 +vn 0.9510608 -0.3090039 0 +vn 0.9507968 -0.3089159 -0.02359138 +vn 0.8247501 -0.2679583 0.4979814 +vn 0.8780911 -0.2852911 0.384142 +vn 0.9105181 -0.2958253 0.2888669 +vn 0.9290416 -0.3018675 0.2139106 +vn 0.9400539 -0.3054367 0.1516807 +vn 0.9465422 -0.3075385 0.09735513 +vn 0.957369 0 0.2888679 +vn 0.9768538 0 0.213908 +vn 0.9884294 0 0.1516811 +vn 0.9952497 0 0.09735508 +vn 0.998866 0 0.0476101 +vn 1 0 0 +vn 0.9997217 0 -0.02359144 +vn 0.9232718 0 0.3841472 +vn 0.8671838 0 0.4979883 +vn 0.8114133 0 0.5844728 +vn 0.7717022 -0.2507437 0.5844684 +vn 0.7302012 0 0.6832322 +vn 0.6944655 -0.2256288 0.6832344 +vn 0.6564456 -0.4769295 0.5844805 +vn 0.590737 -0.4291969 0.683242 +vn 0.4769295 -0.6564456 0.5844805 +vn 0.4291969 -0.590737 0.683242 +vn 0.2507151 -0.7717081 0.5844728 +vn 0.2256288 -0.6944655 0.6832344 +vn 0 -0.8114133 0.5844728 +vn 0 -0.7302012 0.6832322 +vn -0.2507151 -0.7717081 0.5844728 +vn -0.2256288 -0.6944655 0.6832344 +vn -0.4769295 -0.6564456 0.5844805 +vn -0.4291969 -0.590737 0.683242 +vn -0.6564456 -0.4769295 0.5844805 +vn -0.590737 -0.4291969 0.683242 +vn -0.7717081 -0.2507151 0.5844728 +vn -0.6944655 -0.2256288 0.6832344 +vn -0.8114133 0 0.5844728 +vn -0.7302012 0 0.6832322 +vn -0.7717081 0.2507151 0.5844728 +vn -0.6944655 0.2256288 0.6832344 +vn -0.6564456 0.4769295 0.5844805 +vn -0.590737 0.4291969 0.683242 +vn -0.4769295 0.6564456 0.5844805 +vn -0.4291969 0.590737 0.683242 +vn -0.2507437 0.7717022 0.5844684 +vn -0.2256288 0.6944655 0.6832344 +vn 0 0.8114133 0.5844728 +vn 0 0.7302012 0.6832322 +vn 0.2507437 0.7717022 0.5844684 +vn 0.2256288 0.6944655 0.6832344 +vn 0.4769295 0.6564456 0.5844805 +vn 0.4291969 0.590737 0.683242 +vn 0.6564456 0.4769295 0.5844805 +vn 0.590737 0.4291969 0.683242 +vn 0.7717081 0.2507151 0.5844728 +vn 0.6944655 0.2256288 0.6832344 +vn 0.8114133 0 0.5844728 +vn 0.7302012 0 0.6832322 +vn 0 0.6161272 0.7876467 +vn 0.1903808 0.5859747 0.7876477 +vn 0 0.4374944 0.8992211 +vn -0.1351712 0.4160732 0.8992285 +vn 0 0 1 +vn -0.1903808 0.5859747 0.7876477 +vn -0.2571563 0.3539332 0.8992229 +vn 0 0 1 +vn -0.3621474 0.4984486 0.7876537 +vn -0.3539332 0.2571563 0.8992229 +vn -0.4984486 0.3621474 0.7876537 +vn 0 0 1 +vn -0.4160732 0.1351712 0.8992285 +vn 0 0 1 +vn -0.5859747 0.1903808 0.7876477 +vn -0.4374944 0 0.8992211 +vn -0.6161272 0 0.7876467 +vn 0 0 1 +vn -0.4160732 -0.1351712 0.8992285 +vn 0 0 1 +vn -0.5859747 -0.1903808 0.7876477 +vn -0.3539332 -0.2571563 0.8992229 +vn 0 0 1 +vn -0.4984486 -0.3621474 0.7876537 +vn -0.2571563 -0.3539332 0.8992229 +vn 0 0 1 +vn -0.3621474 -0.4984486 0.7876537 +vn -0.1351712 -0.4160732 0.8992285 +vn 0 0 1 +vn -0.1903808 -0.5859747 0.7876477 +vn 0 -0.4374944 0.8992211 +vn 0 0 1 +vn 0 -0.6161272 0.7876467 +vn 0.1351712 -0.4160732 0.8992285 +vn 0 0 1 +vn 0.1903808 -0.5859747 0.7876477 +vn 0.2571563 -0.3539332 0.8992229 +vn 0 0 1 +vn 0.3621474 -0.4984486 0.7876537 +vn 0.3539332 -0.2571563 0.8992229 +vn 0 0 1 +vn 0.4984486 -0.3621474 0.7876537 +vn 0.4160732 -0.1351712 0.8992285 +vn 0 0 1 +vn 0.5859747 -0.1903808 0.7876477 +vn 0.4374944 0 0.8992211 +vn 0 0 1 +vn 0.6161272 0 0.7876467 +vn 0.998866 0 0.0476101 +vn 0.949976 0.3086728 0.04761019 +vn 0.9465422 0.3075385 0.09735513 +vn 0.9952497 0 0.09735508 +vn 1 0 0 +vn 0.9510608 0.3090039 0 +vn 0.9997217 0 -0.02359144 +vn 0.9507968 0.3089159 -0.02359138 +vn 0.9400539 0.3054367 0.1516807 +vn 0.9884294 0 0.1516811 +vn 0.9290416 0.3018675 0.2139106 +vn 0.9768538 0 0.213908 +vn 0.9105181 0.2958253 0.2888669 +vn 0.957369 0 0.2888679 +vn 0.8780911 0.2852911 0.384142 +vn 0.9232718 0 0.3841472 +vn 0.8247501 0.2679583 0.4979814 +vn 0.8671838 0 0.4979883 +vn 0.7469469 0.5426849 0.3841398 +vn 0.7745302 0.5627232 0.2888694 +vn 0.7902888 0.5741839 0.2139075 +vn 0.7996546 0.5809872 0.1516786 +vn 0.8051792 0.5849857 0.09735519 +vn 0.8080907 0.5871308 0.04761015 +vn 0.8090302 0.5877669 0 +vn 0.8087934 0.5876197 -0.02359146 +vn 0.7015792 0.5097039 0.4979845 +vn 0.5849857 0.8051792 0.09735519 +vn 0.5871308 0.8080907 0.04761015 +vn 0.5877669 0.8090302 0 +vn 0.5876197 0.8087934 -0.02359146 +vn 0.5741839 0.7902888 0.2139075 +vn 0.5627232 0.7745302 0.2888694 +vn 0.5426849 0.7469469 0.3841398 +vn 0.5097039 0.7015792 0.4979845 +vn 0.2852911 0.8780911 0.384142 +vn 0.2958253 0.9105181 0.2888669 +vn 0.3018675 0.9290416 0.2139106 +vn 0.5809872 0.7996546 0.1516786 +vn 0.3054367 0.9400539 0.1516807 +vn 0.3075385 0.9465422 0.09735513 +vn 0.3086728 0.949976 0.04761019 +vn 0.3090039 0.9510608 0 +vn 0.3089159 0.9507968 -0.02359138 +vn 0.2679583 0.8247501 0.4979814 +vn 0.6161272 0 0.7876467 +vn 0.5859747 0.1903808 0.7876477 +vn 0.4160732 0.1351712 0.8992285 +vn 0.4374944 0 0.8992211 +vn 0 0 1 +vn 0.3539332 0.2571563 0.8992229 +vn 0 0 1 +vn 0.4984486 0.3621474 0.7876537 +vn 0.2571563 0.3539332 0.8992229 +vn 0 0 1 +vn 0.3621474 0.4984486 0.7876537 +vn 0.1351712 0.4160732 0.8992285 +vn 0 0 1 +vn 0 0 1 +vt 0.7499999 4.470348E-06 +vt 0.6999998 4.470348E-06 +vt 0.6999998 0.09748882 +vt 0.7499999 0.09748882 +vt 0.6999998 0.1949731 +vt 0.7499999 0.1949731 +vt 0.6999998 0.2924576 +vt 0.7499999 0.2924576 +vt 0.6999998 0.3899418 +vt 0.7499999 0.3899418 +vt 0.6999998 0.4874262 +vt 0.7499999 0.4874261 +vt 0.6999998 0.5849105 +vt 0.7499999 0.5849103 +vt 0.6999998 0.682395 +vt 0.7499999 0.6823947 +vt 0.6999998 0.7798792 +vt 0.7499999 0.779879 +vt 0.6499997 0.5849105 +vt 0.6499998 0.4874262 +vt 0.6499998 0.3899418 +vt 0.6499998 0.2924576 +vt 0.6499998 0.1949731 +vt 0.6499998 0.09748882 +vt 0.6499998 4.470348E-06 +vt 0.6499997 0.779879 +vt 0.6499997 0.6823947 +vt 0.5999998 0.1949731 +vt 0.5999998 0.09748882 +vt 0.5999998 4.529953E-06 +vt 0.5999997 0.779879 +vt 0.5999997 0.6823947 +vt 0.5999997 0.5849103 +vt 0.5999998 0.4874261 +vt 0.5999997 0.3899418 +vt 0.5999998 0.2924576 +vt 0.5499997 0.5849103 +vt 0.5499997 0.4874261 +vt 0.5499997 0.3899418 +vt 0.5499997 0.2924575 +vt 0.5499998 0.1949731 +vt 0.5499998 0.09748882 +vt 0.5499998 4.529953E-06 +vt 0.4999997 0.2924574 +vt 0.4999998 0.1949731 +vt 0.4999997 0.09748882 +vt 0.4999997 4.529953E-06 +vt 0.4999997 0.5849103 +vt 0.4999997 0.6823945 +vt 0.5499997 0.6823945 +vt 0.4999996 0.7798787 +vt 0.5499997 0.779879 +vt 0.4499997 0.6823945 +vt 0.4499997 0.58491 +vt 0.4999997 0.4874259 +vt 0.4999997 0.3899418 +vt 0.4499997 0.4874259 +vt 0.4499997 0.3899416 +vt 0.4499997 0.2924574 +vt 0.4499997 0.194973 +vt 0.4499997 0.09748882 +vt 0.4499997 4.529953E-06 +vt 0.3999998 0.3899416 +vt 0.3999998 0.2924573 +vt 0.3999998 0.194973 +vt 0.3999998 0.09748882 +vt 0.3999998 4.649162E-06 +vt 0.3999998 0.4874257 +vt 0.3999997 0.58491 +vt 0.3999997 0.6823943 +vt 0.3999997 0.7798785 +vt 0.4499996 0.7798787 +vt 0.3499997 0.7798785 +vt 0.3499998 0.6823943 +vt 0.3499998 0.58491 +vt 0.3499998 0.4874256 +vt 0.3499998 0.3899415 +vt 0.3499998 0.2924573 +vt 0.3499998 0.194973 +vt 0.3499998 0.09748882 +vt 0.3499998 4.649162E-06 +vt 0.2999998 0.3899414 +vt 0.2999998 0.2924573 +vt 0.2999998 0.194973 +vt 0.2999998 0.09748882 +vt 0.2999998 4.649162E-06 +vt 0.2999998 0.4874256 +vt 0.2999998 0.5849098 +vt 0.2999998 0.682394 +vt 0.2999998 0.7798783 +vt 0.2499999 0.09748882 +vt 0.2499999 4.649162E-06 +vt 0.2499999 0.7798783 +vt 0.2499999 0.682394 +vt 0.2499999 0.5849098 +vt 0.2499999 0.4874256 +vt 0.2499999 0.3899414 +vt 0.2499999 0.2924573 +vt 0.2499999 0.194973 +vt 0.1999999 0.4874256 +vt 0.1999999 0.3899414 +vt 0.1999999 0.2924573 +vt 0.1999999 0.194973 +vt 0.1999999 0.09748882 +vt 0.1999999 4.649162E-06 +vt 0.1999999 0.5849098 +vt 0.1499999 0.09748882 +vt 0.1499999 4.649162E-06 +vt 0.15 0.5849098 +vt 0.15 0.682394 +vt 0.2 0.682394 +vt 0.2 0.7798783 +vt 0.1500001 0.7798785 +vt 0.15 0.194973 +vt 0.15 0.2924573 +vt 0.15 0.3899414 +vt 0.15 0.4874256 +vt 0.1 0.4874256 +vt 0.09999999 0.3899415 +vt 0.09999999 0.2924573 +vt 0.09999999 0.194973 +vt 0.09999999 0.09748882 +vt 0.09999999 4.649162E-06 +vt 0.1 0.5849098 +vt 0.1000001 0.6823943 +vt 0.1000001 0.7798785 +vt 0.05000001 0.194973 +vt 0.05000001 0.09748882 +vt 0.05000001 4.649162E-06 +vt 0.05000016 0.7798787 +vt 0.05000013 0.6823943 +vt 0.05000004 0.58491 +vt 0.05000004 0.4874257 +vt 0.05000001 0.3899415 +vt 0.05000001 0.2924573 +vt 5.960464E-08 0.58491 +vt 5.960464E-08 0.4874259 +vt 0 0.3899416 +vt 0 0.2924574 +vt 0 0.194973 +vt 0 0.09748882 +vt 0 4.649162E-06 +vt 1.192093E-07 0.6823945 +vt 1.788139E-07 0.7798787 +vt 2.384186E-07 0.8286209 +vt 0.05000022 0.8286209 +vt 2.980232E-07 0.8773632 +vt 0.05000028 0.877363 +vt 0.1000002 0.8286207 +vt 0.1000002 0.877363 +vt 0.1500001 0.8286207 +vt 0.1500001 0.8773627 +vt 0.2 0.8286204 +vt 0.2 0.8773627 +vt 0.2499999 0.8286204 +vt 0.2499999 0.8773627 +vt 0.2999998 0.8286204 +vt 0.2999998 0.8773627 +vt 0.3499997 0.8286207 +vt 0.3499997 0.8773627 +vt 0.3999996 0.8286207 +vt 0.3999996 0.877363 +vt 0.4499996 0.8286209 +vt 0.4499995 0.877363 +vt 0.4999995 0.8286209 +vt 0.4999995 0.8773632 +vt 0.5499996 0.8286211 +vt 0.5499995 0.8773634 +vt 0.5999996 0.8286211 +vt 0.5999995 0.8773634 +vt 0.6499997 0.8286214 +vt 0.6499996 0.8773637 +vt 0.6999998 0.8286214 +vt 0.6999997 0.8773637 +vt 0.7499999 0.8286214 +vt 0.7499999 0.8773637 +vt 0.8 0.8286214 +vt 0.8 0.8773637 +vt 0.8500001 0.8286211 +vt 0.8500001 0.8773634 +vt 0.9000002 0.8286211 +vt 0.9000002 0.8773634 +vt 0.9500002 0.8286211 +vt 0.9500002 0.8773632 +vt 1 0.8286209 +vt 1 0.8773632 +vt 0.7499999 0.9261059 +vt 0.8000001 0.9261059 +vt 0.7499999 0.9748479 +vt 0.6999996 0.9748479 +vt 0.725 0.9999806 +vt 0.6999997 0.9261059 +vt 0.6499994 0.9748479 +vt 0.6749996 0.9999806 +vt 0.6499995 0.9261059 +vt 0.5999992 0.9748479 +vt 0.5999994 0.9261056 +vt 0.6249992 0.9999806 +vt 0.5499991 0.9748474 +vt 0.5749989 0.9999806 +vt 0.5499993 0.9261054 +vt 0.4999991 0.9748474 +vt 0.4999993 0.9261054 +vt 0.5249986 0.9999806 +vt 0.4499991 0.9748474 +vt 0.4749985 0.9999806 +vt 0.4499993 0.9261051 +vt 0.3999992 0.974847 +vt 0.4249985 0.9999806 +vt 0.3999994 0.9261049 +vt 0.3499994 0.974847 +vt 0.3749986 0.9999806 +vt 0.3499995 0.9261049 +vt 0.2999997 0.974847 +vt 0.3249989 0.9999806 +vt 0.2999997 0.9261049 +vt 0.2499999 0.974847 +vt 0.2749993 0.9999806 +vt 0.2499999 0.9261049 +vt 0.2000002 0.974847 +vt 0.2249997 0.9999806 +vt 0.2000001 0.9261049 +vt 0.1500004 0.974847 +vt 0.1750002 0.9999806 +vt 0.1500003 0.9261049 +vt 0.1000006 0.974847 +vt 0.1250006 0.9999806 +vt 0.1000004 0.9261049 +vt 0.0500007 0.9748474 +vt 0.07500097 0.9999806 +vt 0.05000049 0.9261051 +vt 7.152557E-07 0.9748474 +vt 0.02500117 0.9999806 +vt 5.066395E-07 0.9261054 +vt 1 0.194973 +vt 0.95 0.1949731 +vt 0.95 0.2924574 +vt 1 0.2924574 +vt 1 0.09748882 +vt 0.95 0.09748882 +vt 1 4.649162E-06 +vt 0.95 4.529953E-06 +vt 0.95 0.3899416 +vt 1 0.3899416 +vt 0.95 0.4874259 +vt 1 0.4874259 +vt 0.95 0.5849103 +vt 1 0.58491 +vt 0.95 0.6823945 +vt 1 0.6823945 +vt 0.9500002 0.779879 +vt 1 0.7798787 +vt 0.9000001 0.6823945 +vt 0.9 0.5849103 +vt 0.9 0.487426 +vt 0.9 0.3899418 +vt 0.9 0.2924574 +vt 0.9 0.1949731 +vt 0.9 0.09748882 +vt 0.9 4.529953E-06 +vt 0.9000001 0.779879 +vt 0.8499999 0.2924575 +vt 0.85 0.1949731 +vt 0.8499999 0.09748882 +vt 0.8499999 4.529953E-06 +vt 0.85 0.4874261 +vt 0.85 0.5849103 +vt 0.85 0.6823945 +vt 0.85 0.779879 +vt 0.8 0.6823947 +vt 0.8 0.5849103 +vt 0.8 0.4874261 +vt 0.8499999 0.3899418 +vt 0.7999999 0.3899418 +vt 0.7999999 0.2924575 +vt 0.8 0.1949731 +vt 0.7999999 0.09748882 +vt 0.7999999 4.529953E-06 +vt 0.8 0.779879 +vt 1 0.9261054 +vt 0.9500004 0.9261054 +vt 0.9500006 0.9748474 +vt 1.000001 0.9748474 +vt 0.9750013 0.9999806 +vt 0.9000006 0.9748474 +vt 0.9250013 0.9999806 +vt 0.9000004 0.9261054 +vt 0.8500004 0.9748479 +vt 0.8750011 0.9999806 +vt 0.8500003 0.9261056 +vt 0.8000002 0.9748479 +vt 0.8250009 0.9999806 +vt 0.7750005 0.9999806 + +g Bullet +f 1/1/1 2/2/2 3/3/3 +f 1/1/1 3/3/3 4/4/4 +f 4/4/4 3/3/3 5/5/5 +f 4/4/4 5/5/5 6/6/6 +f 6/6/6 5/5/5 7/7/7 +f 6/6/6 7/7/7 8/8/8 +f 8/8/8 7/7/7 9/9/9 +f 8/8/8 9/9/9 10/10/10 +f 10/10/10 9/9/9 11/11/11 +f 10/10/10 11/11/11 12/12/12 +f 12/12/12 11/11/11 13/13/13 +f 12/12/12 13/13/13 14/14/14 +f 14/14/14 13/13/13 15/15/15 +f 14/14/14 15/15/15 16/16/16 +f 16/16/16 15/15/15 17/17/17 +f 16/16/16 17/17/17 18/18/18 +f 11/11/11 19/19/19 13/13/13 +f 11/11/11 20/20/20 19/19/19 +f 9/9/9 20/20/20 11/11/11 +f 9/9/9 21/21/21 20/20/20 +f 7/7/7 21/21/21 9/9/9 +f 7/7/7 22/22/22 21/21/21 +f 5/5/5 22/22/22 7/7/7 +f 5/5/5 23/23/23 22/22/22 +f 3/3/3 23/23/23 5/5/5 +f 3/3/3 24/24/24 23/23/23 +f 2/2/2 24/24/24 3/3/3 +f 2/2/2 25/25/25 24/24/24 +f 15/15/15 26/26/26 17/17/17 +f 15/15/15 27/27/27 26/26/26 +f 13/13/13 19/19/19 27/27/27 +f 13/13/13 27/27/27 15/15/15 +f 24/24/24 28/28/28 23/23/23 +f 24/24/24 29/29/29 28/28/28 +f 25/25/25 29/29/29 24/24/24 +f 25/25/25 30/30/30 29/29/29 +f 27/27/27 31/31/31 26/26/26 +f 27/27/27 32/32/32 31/31/31 +f 19/19/19 32/32/32 27/27/27 +f 19/19/19 33/33/33 32/32/32 +f 20/20/20 33/33/33 19/19/19 +f 20/20/20 34/34/34 33/33/33 +f 21/21/21 34/34/34 20/20/20 +f 21/21/21 35/35/35 34/34/34 +f 22/22/22 35/35/35 21/21/21 +f 22/22/22 36/36/36 35/35/35 +f 23/23/23 28/28/28 36/36/36 +f 23/23/23 36/36/36 22/22/22 +f 34/34/34 37/37/37 33/33/33 +f 34/34/34 38/38/38 37/37/37 +f 35/35/35 38/38/38 34/34/34 +f 35/35/35 39/39/39 38/38/38 +f 36/36/36 39/39/39 35/35/35 +f 36/36/36 40/40/40 39/39/39 +f 28/28/28 40/40/40 36/36/36 +f 28/28/28 41/41/41 40/40/40 +f 29/29/29 41/41/41 28/28/28 +f 29/29/29 42/42/42 41/41/41 +f 30/30/30 42/42/42 29/29/29 +f 30/30/30 43/43/43 42/42/42 +f 41/41/41 44/44/44 40/40/40 +f 41/41/41 45/45/45 44/44/44 +f 42/42/42 45/45/45 41/41/41 +f 42/42/42 46/46/46 45/45/45 +f 43/43/43 46/46/46 42/42/42 +f 43/43/43 47/47/47 46/46/46 +f 38/38/38 48/48/48 37/37/37 +f 37/37/37 48/48/48 49/49/49 +f 37/37/37 49/49/49 50/50/50 +f 50/50/50 49/49/49 51/51/51 +f 50/50/50 51/51/51 52/52/52 +f 32/32/32 50/50/50 52/52/52 +f 32/32/32 52/52/52 31/31/31 +f 33/33/33 50/50/50 32/32/32 +f 33/33/33 37/37/37 50/50/50 +f 48/48/48 53/53/53 49/49/49 +f 48/48/48 54/54/54 53/53/53 +f 55/55/55 54/54/54 48/48/48 +f 38/38/38 55/55/55 48/48/48 +f 39/39/39 55/55/55 38/38/38 +f 39/39/39 56/56/56 55/55/55 +f 40/40/40 56/56/56 39/39/39 +f 40/40/40 44/44/44 56/56/56 +f 55/55/55 57/57/57 54/54/54 +f 56/56/56 57/57/57 55/55/55 +f 56/56/56 58/58/58 57/57/57 +f 44/44/44 58/58/58 56/56/56 +f 44/44/44 59/59/59 58/58/58 +f 45/45/45 59/59/59 44/44/44 +f 45/45/45 60/60/60 59/59/59 +f 46/46/46 60/60/60 45/45/45 +f 46/46/46 61/61/61 60/60/60 +f 47/47/47 61/61/61 46/46/46 +f 47/47/47 62/62/62 61/61/61 +f 59/59/59 63/63/63 58/58/58 +f 59/59/59 64/64/64 63/63/63 +f 60/60/60 64/64/64 59/59/59 +f 60/60/60 65/65/65 64/64/64 +f 61/61/61 65/65/65 60/60/60 +f 61/61/61 66/66/66 65/65/65 +f 62/62/62 66/66/66 61/61/61 +f 62/62/62 67/67/67 66/66/66 +f 58/58/58 63/63/63 68/68/68 +f 58/58/58 68/68/68 57/57/57 +f 57/57/57 68/68/68 69/69/69 +f 57/57/57 69/69/69 54/54/54 +f 54/54/54 69/69/69 70/70/70 +f 54/54/54 70/70/70 53/53/53 +f 53/53/53 70/70/70 71/71/71 +f 53/53/53 71/71/71 72/72/72 +f 49/49/49 53/53/53 72/72/72 +f 49/49/49 72/72/72 51/51/51 +f 70/70/70 73/73/73 71/71/71 +f 70/70/70 74/74/74 73/73/73 +f 69/69/69 74/74/74 70/70/70 +f 69/69/69 75/75/75 74/74/74 +f 68/68/68 75/75/75 69/69/69 +f 68/68/68 76/76/76 75/75/75 +f 63/63/63 76/76/76 68/68/68 +f 63/63/63 77/77/77 76/76/76 +f 64/64/64 77/77/77 63/63/63 +f 64/64/64 78/78/78 77/77/77 +f 65/65/65 78/78/78 64/64/64 +f 65/65/65 79/79/79 78/78/78 +f 66/66/66 79/79/79 65/65/65 +f 66/66/66 80/80/80 79/79/79 +f 67/67/67 80/80/80 66/66/66 +f 67/67/67 81/81/81 80/80/80 +f 78/78/78 82/82/82 77/77/77 +f 78/78/78 83/83/83 82/82/82 +f 79/79/79 83/83/83 78/78/78 +f 79/79/79 84/84/84 83/83/83 +f 80/80/80 84/84/84 79/79/79 +f 80/80/80 85/85/85 84/84/84 +f 81/81/81 85/85/85 80/80/80 +f 81/81/81 86/86/86 85/85/85 +f 77/77/77 82/82/82 87/87/87 +f 77/77/77 87/87/87 76/76/76 +f 76/76/76 87/87/87 88/88/88 +f 76/76/76 88/88/88 75/75/75 +f 75/75/75 88/88/88 89/89/89 +f 75/75/75 89/89/89 74/74/74 +f 74/74/74 89/89/89 90/90/90 +f 74/74/74 90/90/90 73/73/73 +f 86/86/86 91/91/91 85/85/85 +f 86/86/86 92/92/92 91/91/91 +f 89/89/89 93/93/93 90/90/90 +f 89/89/89 94/94/94 93/93/93 +f 88/88/88 94/94/94 89/89/89 +f 88/88/88 95/95/95 94/94/94 +f 87/87/87 95/95/95 88/88/88 +f 87/87/87 96/96/96 95/95/95 +f 82/82/82 96/96/96 87/87/87 +f 82/82/82 97/97/97 96/96/96 +f 83/83/83 97/97/97 82/82/82 +f 83/83/83 98/98/98 97/97/97 +f 84/84/84 98/98/98 83/83/83 +f 84/84/84 99/99/99 98/98/98 +f 85/85/85 91/91/91 99/99/99 +f 85/85/85 99/99/99 84/84/84 +f 97/97/97 100/100/100 96/96/96 +f 97/97/97 101/101/101 100/100/100 +f 98/98/98 101/101/101 97/97/97 +f 98/98/98 102/102/102 101/101/101 +f 99/99/99 102/102/102 98/98/98 +f 99/99/99 103/103/103 102/102/102 +f 91/91/91 103/103/103 99/99/99 +f 91/91/91 104/104/104 103/103/103 +f 92/92/92 104/104/104 91/91/91 +f 92/92/92 105/105/105 104/104/104 +f 96/96/96 100/100/100 106/106/106 +f 105/105/105 107/107/107 104/104/104 +f 105/105/105 108/108/108 107/107/107 +f 100/100/100 109/109/109 106/106/106 +f 106/106/106 109/109/109 110/110/110 +f 106/106/106 110/110/110 111/111/111 +f 95/95/95 106/106/106 111/111/111 +f 95/95/95 111/111/111 94/94/94 +f 94/94/94 111/111/111 112/112/112 +f 94/94/94 112/112/112 93/93/93 +f 96/96/96 106/106/106 95/95/95 +f 111/111/111 110/110/110 113/113/113 +f 111/111/111 113/113/113 112/112/112 +f 104/104/104 107/107/107 114/114/114 +f 104/104/104 114/114/114 103/103/103 +f 103/103/103 114/114/114 115/115/115 +f 103/103/103 115/115/115 102/102/102 +f 102/102/102 115/115/115 116/116/116 +f 102/102/102 116/116/116 101/101/101 +f 101/101/101 116/116/116 117/117/117 +f 100/100/100 117/117/117 109/109/109 +f 101/101/101 117/117/117 100/100/100 +f 116/116/116 118/118/118 117/117/117 +f 116/116/116 119/119/119 118/118/118 +f 115/115/115 119/119/119 116/116/116 +f 115/115/115 120/120/120 119/119/119 +f 114/114/114 120/120/120 115/115/115 +f 114/114/114 121/121/121 120/120/120 +f 107/107/107 121/121/121 114/114/114 +f 107/107/107 122/122/122 121/121/121 +f 108/108/108 122/122/122 107/107/107 +f 108/108/108 123/123/123 122/122/122 +f 117/117/117 118/118/118 124/124/124 +f 117/117/117 124/124/124 109/109/109 +f 109/109/109 124/124/124 125/125/125 +f 109/109/109 125/125/125 110/110/110 +f 110/110/110 125/125/125 126/126/126 +f 110/110/110 126/126/126 113/113/113 +f 122/122/122 127/127/127 121/121/121 +f 122/122/122 128/128/128 127/127/127 +f 123/123/123 128/128/128 122/122/122 +f 123/123/123 129/129/129 128/128/128 +f 125/125/125 130/130/130 126/126/126 +f 125/125/125 131/131/131 130/130/130 +f 124/124/124 131/131/131 125/125/125 +f 124/124/124 132/132/132 131/131/131 +f 118/118/118 132/132/132 124/124/124 +f 118/118/118 133/133/133 132/132/132 +f 119/119/119 133/133/133 118/118/118 +f 119/119/119 134/134/134 133/133/133 +f 120/120/120 134/134/134 119/119/119 +f 120/120/120 135/135/135 134/134/134 +f 121/121/121 127/127/127 135/135/135 +f 121/121/121 135/135/135 120/120/120 +f 133/133/133 136/136/136 132/132/132 +f 133/133/133 137/137/137 136/136/136 +f 134/134/134 137/137/137 133/133/133 +f 134/134/134 138/138/138 137/137/137 +f 135/135/135 138/138/138 134/134/134 +f 135/135/135 139/139/139 138/138/138 +f 127/127/127 139/139/139 135/135/135 +f 127/127/127 140/140/140 139/139/139 +f 128/128/128 140/140/140 127/127/127 +f 128/128/128 141/141/141 140/140/140 +f 129/129/129 141/141/141 128/128/128 +f 129/129/129 142/142/142 141/141/141 +f 132/132/132 136/136/136 143/143/143 +f 132/132/132 143/143/143 131/131/131 +f 131/131/131 143/143/143 144/144/144 +f 131/131/131 144/144/144 130/130/130 +f 130/130/130 144/144/144 145/145/145 +f 130/130/130 145/145/145 146/146/146 +f 146/146/146 145/145/145 147/147/147 +f 146/146/146 147/147/147 148/148/148 +f 149/149/149 146/146/146 148/148/148 +f 149/149/149 148/148/148 150/150/150 +f 151/151/151 149/149/149 150/150/150 +f 151/151/151 150/150/150 152/152/152 +f 153/153/153 151/151/151 152/152/152 +f 153/153/153 152/152/152 154/154/154 +f 155/155/155 153/153/153 154/154/154 +f 155/155/155 154/154/154 156/156/156 +f 157/157/157 155/155/155 156/156/156 +f 157/157/157 156/156/156 158/158/158 +f 159/159/159 157/157/157 158/158/158 +f 159/159/159 158/158/158 160/160/160 +f 161/161/161 159/159/159 160/160/160 +f 161/161/161 160/160/160 162/162/162 +f 163/163/163 161/161/161 162/162/162 +f 163/163/163 162/162/162 164/164/164 +f 165/165/165 163/163/163 164/164/164 +f 165/165/165 164/164/164 166/166/166 +f 167/167/167 165/165/165 166/166/166 +f 167/167/167 166/166/166 168/168/168 +f 169/169/169 167/167/167 168/168/168 +f 169/169/169 168/168/168 170/170/170 +f 171/171/171 169/169/169 170/170/170 +f 171/171/171 170/170/170 172/172/172 +f 173/173/173 171/171/171 172/172/172 +f 173/173/173 172/172/172 174/174/174 +f 175/175/175 173/173/173 174/174/174 +f 175/175/175 174/174/174 176/176/176 +f 177/177/177 175/175/175 176/176/176 +f 177/177/177 176/176/176 178/178/178 +f 179/179/179 177/177/177 178/178/178 +f 179/179/179 178/178/178 180/180/180 +f 181/181/181 179/179/179 180/180/180 +f 181/181/181 180/180/180 182/182/182 +f 183/183/183 181/181/181 182/182/182 +f 183/183/183 182/182/182 184/184/184 +f 185/185/185 183/183/183 184/184/184 +f 185/185/185 184/184/184 186/186/186 +f 178/178/178 176/176/176 187/187/187 +f 178/178/178 187/187/187 188/188/188 +f 180/180/180 178/178/178 188/188/188 +f 188/188/188 187/187/187 189/189/189 +f 187/187/187 190/190/190 189/189/189 +f 189/189/189 190/190/190 191/191/191 +f 187/187/187 192/192/192 190/190/190 +f 192/192/192 193/193/193 190/190/190 +f 190/190/190 193/193/193 194/194/194 +f 192/192/192 195/195/195 193/193/193 +f 195/195/195 196/196/196 193/193/193 +f 195/195/195 197/197/197 196/196/196 +f 193/193/193 196/196/196 198/198/198 +f 197/197/197 199/199/199 196/196/196 +f 196/196/196 199/199/199 200/200/200 +f 197/197/197 201/201/201 199/199/199 +f 201/201/201 202/202/202 199/199/199 +f 201/201/201 203/203/203 202/202/202 +f 199/199/199 202/202/202 204/204/204 +f 203/203/203 205/205/205 202/202/202 +f 202/202/202 205/205/205 206/206/206 +f 203/203/203 207/207/207 205/205/205 +f 207/207/207 208/208/208 205/205/205 +f 205/205/205 208/208/208 209/209/209 +f 207/207/207 210/210/210 208/208/208 +f 210/210/210 211/211/211 208/208/208 +f 208/208/208 211/211/211 212/212/212 +f 210/210/210 213/213/213 211/211/211 +f 213/213/213 214/214/214 211/211/211 +f 211/211/211 214/214/214 215/215/215 +f 213/213/213 216/216/216 214/214/214 +f 216/216/216 217/217/217 214/214/214 +f 214/214/214 217/217/217 218/218/218 +f 216/216/216 219/219/219 217/217/217 +f 219/219/219 220/220/220 217/217/217 +f 217/217/217 220/220/220 221/221/221 +f 219/219/219 222/222/222 220/220/220 +f 222/222/222 223/223/223 220/220/220 +f 220/220/220 223/223/223 224/224/224 +f 222/222/222 225/225/225 223/223/223 +f 225/225/225 226/226/226 223/223/223 +f 223/223/223 226/226/226 227/227/227 +f 225/225/225 228/228/228 226/226/226 +f 228/228/228 229/229/229 226/226/226 +f 226/226/226 229/229/229 230/230/230 +f 228/228/228 231/231/231 229/229/229 +f 231/231/231 232/232/232 229/229/229 +f 229/229/229 232/232/232 233/233/233 +f 231/231/231 234/234/234 232/232/232 +f 148/148/148 234/234/234 231/231/231 +f 148/148/148 147/147/147 234/234/234 +f 150/150/150 148/148/148 231/231/231 +f 150/150/150 231/231/231 228/228/228 +f 152/152/152 150/150/150 228/228/228 +f 152/152/152 228/228/228 225/225/225 +f 154/154/154 152/152/152 225/225/225 +f 154/154/154 225/225/225 222/222/222 +f 156/156/156 154/154/154 222/222/222 +f 156/156/156 222/222/222 219/219/219 +f 158/158/158 156/156/156 219/219/219 +f 158/158/158 219/219/219 216/216/216 +f 160/160/160 158/158/158 216/216/216 +f 160/160/160 216/216/216 213/213/213 +f 162/162/162 160/160/160 213/213/213 +f 162/162/162 213/213/213 210/210/210 +f 164/164/164 162/162/162 210/210/210 +f 164/164/164 210/210/210 207/207/207 +f 166/166/166 164/164/164 207/207/207 +f 166/166/166 207/207/207 203/203/203 +f 168/168/168 166/166/166 203/203/203 +f 168/168/168 203/203/203 201/201/201 +f 170/170/170 168/168/168 201/201/201 +f 170/170/170 201/201/201 197/197/197 +f 172/172/172 170/170/170 197/197/197 +f 172/172/172 197/197/197 195/195/195 +f 174/174/174 172/172/172 195/195/195 +f 174/174/174 195/195/195 192/192/192 +f 176/176/176 174/174/174 192/192/192 +f 176/176/176 192/192/192 187/187/187 +f 235/235/235 236/236/236 237/237/237 +f 235/235/235 237/237/237 238/238/238 +f 239/239/239 236/236/236 235/235/235 +f 239/239/239 240/240/240 236/236/236 +f 241/241/241 240/240/240 239/239/239 +f 241/241/241 242/242/242 240/240/240 +f 238/238/238 237/237/237 243/243/243 +f 238/238/238 243/243/243 244/244/244 +f 244/244/244 243/243/243 245/245/245 +f 244/244/244 245/245/245 246/246/246 +f 246/246/246 245/245/245 247/247/247 +f 246/246/246 247/247/247 248/248/248 +f 248/248/248 247/247/247 249/249/249 +f 248/248/248 249/249/249 250/250/250 +f 250/250/250 249/249/249 251/251/251 +f 250/250/250 251/251/251 252/252/252 +f 247/247/247 253/253/253 249/249/249 +f 247/247/247 254/254/254 253/253/253 +f 245/245/245 254/254/254 247/247/247 +f 245/245/245 255/255/255 254/254/254 +f 243/243/243 255/255/255 245/245/245 +f 243/243/243 256/256/256 255/255/255 +f 237/237/237 256/256/256 243/243/243 +f 237/237/237 257/257/257 256/256/256 +f 236/236/236 257/257/257 237/237/237 +f 236/236/236 258/258/258 257/257/257 +f 240/240/240 258/258/258 236/236/236 +f 240/240/240 259/259/259 258/258/258 +f 242/242/242 259/259/259 240/240/240 +f 242/242/242 260/260/260 259/259/259 +f 249/249/249 253/253/253 261/261/261 +f 249/249/249 261/261/261 251/251/251 +f 258/258/258 262/262/262 257/257/257 +f 258/258/258 263/263/263 262/262/262 +f 259/259/259 263/263/263 258/258/258 +f 259/259/259 264/264/264 263/263/263 +f 260/260/260 264/264/264 259/259/259 +f 260/260/260 265/265/265 264/264/264 +f 256/256/256 266/266/266 255/255/255 +f 255/255/255 266/266/266 267/267/267 +f 255/255/255 267/267/267 254/254/254 +f 254/254/254 267/267/267 268/268/268 +f 254/254/254 268/268/268 253/253/253 +f 253/253/253 268/268/268 269/269/269 +f 253/253/253 269/269/269 261/261/261 +f 267/267/267 270/270/270 268/268/268 +f 267/267/267 271/271/271 270/270/270 +f 266/266/266 271/271/271 267/267/267 +f 266/266/266 272/272/272 271/271/271 +f 273/273/273 272/272/272 266/266/266 +f 256/256/256 273/273/273 266/266/266 +f 257/257/257 262/262/262 273/273/273 +f 257/257/257 273/273/273 256/256/256 +f 273/273/273 274/274/274 272/272/272 +f 262/262/262 274/274/274 273/273/273 +f 262/262/262 275/275/275 274/274/274 +f 263/263/263 275/275/275 262/262/262 +f 263/263/263 276/276/276 275/275/275 +f 264/264/264 276/276/276 263/263/263 +f 264/264/264 277/277/277 276/276/276 +f 265/265/265 277/277/277 264/264/264 +f 265/265/265 278/278/278 277/277/277 +f 275/275/275 10/10/10 274/274/274 +f 275/275/275 8/8/8 10/10/10 +f 276/276/276 8/8/8 275/275/275 +f 276/276/276 6/6/6 8/8/8 +f 277/277/277 6/6/6 276/276/276 +f 277/277/277 4/4/4 6/6/6 +f 278/278/278 4/4/4 277/277/277 +f 278/278/278 1/1/1 4/4/4 +f 274/274/274 10/10/10 12/12/12 +f 274/274/274 12/12/12 272/272/272 +f 272/272/272 12/12/12 14/14/14 +f 272/272/272 14/14/14 271/271/271 +f 271/271/271 14/14/14 16/16/16 +f 271/271/271 16/16/16 270/270/270 +f 270/270/270 16/16/16 18/18/18 +f 270/270/270 18/18/18 279/279/279 +f 268/268/268 270/270/270 279/279/279 +f 268/268/268 279/279/279 269/269/269 +f 279/279/279 18/18/18 175/175/175 +f 279/279/279 175/175/175 177/177/177 +f 269/269/269 279/279/279 177/177/177 +f 269/269/269 177/177/177 179/179/179 +f 261/261/261 269/269/269 179/179/179 +f 261/261/261 179/179/179 181/181/181 +f 251/251/251 261/261/261 181/181/181 +f 251/251/251 181/181/181 183/183/183 +f 252/252/252 251/251/251 183/183/183 +f 252/252/252 183/183/183 185/185/185 +f 18/18/18 173/173/173 175/175/175 +f 18/18/18 17/17/17 173/173/173 +f 17/17/17 171/171/171 173/173/173 +f 17/17/17 26/26/26 171/171/171 +f 26/26/26 169/169/169 171/171/171 +f 26/26/26 31/31/31 169/169/169 +f 31/31/31 167/167/167 169/169/169 +f 31/31/31 52/52/52 167/167/167 +f 52/52/52 165/165/165 167/167/167 +f 52/52/52 51/51/51 165/165/165 +f 51/51/51 163/163/163 165/165/165 +f 51/51/51 72/72/72 163/163/163 +f 72/72/72 161/161/161 163/163/163 +f 72/72/72 71/71/71 161/161/161 +f 71/71/71 159/159/159 161/161/161 +f 71/71/71 73/73/73 159/159/159 +f 73/73/73 157/157/157 159/159/159 +f 73/73/73 90/90/90 157/157/157 +f 90/90/90 155/155/155 157/157/157 +f 90/90/90 93/93/93 155/155/155 +f 93/93/93 153/153/153 155/155/155 +f 93/93/93 112/112/112 153/153/153 +f 112/112/112 151/151/151 153/153/153 +f 112/112/112 113/113/113 151/151/151 +f 113/113/113 149/149/149 151/151/151 +f 113/113/113 126/126/126 149/149/149 +f 126/126/126 146/146/146 149/149/149 +f 126/126/126 130/130/130 146/146/146 +f 280/280/280 281/281/281 282/282/282 +f 280/280/280 282/282/282 283/283/283 +f 283/283/283 282/282/282 284/284/284 +f 281/281/281 285/285/285 282/282/282 +f 282/282/282 285/285/285 286/286/286 +f 281/281/281 287/287/287 285/285/285 +f 287/287/287 288/288/288 285/285/285 +f 285/285/285 288/288/288 289/289/289 +f 287/287/287 290/290/290 288/288/288 +f 290/290/290 291/291/291 288/288/288 +f 288/288/288 291/291/291 292/292/292 +f 290/290/290 188/188/188 291/291/291 +f 188/188/188 189/189/189 291/291/291 +f 291/291/291 189/189/189 293/293/293 +f 180/180/180 188/188/188 290/290/290 +f 182/182/182 180/180/180 290/290/290 +f 182/182/182 290/290/290 287/287/287 +f 184/184/184 182/182/182 287/287/287 +f 184/184/184 287/287/287 281/281/281 +f 186/186/186 184/184/184 281/281/281 +f 186/186/186 281/281/281 280/280/280 diff --git a/render/mesh/dash.obj.import b/render/mesh/dash.obj.import new file mode 100644 index 0000000..98bc1f3 --- /dev/null +++ b/render/mesh/dash.obj.import @@ -0,0 +1,22 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://c56sknyl34eas" +path="res://.godot/imported/dash.obj-f50e04222858882752d7c9a7684827d6.mesh" + +[deps] + +files=["res://.godot/imported/dash.obj-f50e04222858882752d7c9a7684827d6.mesh"] + +source_file="res://render/mesh/dash.obj" +dest_files=["res://.godot/imported/dash.obj-f50e04222858882752d7c9a7684827d6.mesh", "res://.godot/imported/dash.obj-f50e04222858882752d7c9a7684827d6.mesh"] + +[params] + +generate_tangents=true +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +optimize_mesh=true +force_disable_mesh_compression=false diff --git a/render/shader/effect_dash.gdshader b/render/shader/effect_dash.gdshader new file mode 100644 index 0000000..660b6a2 --- /dev/null +++ b/render/shader/effect_dash.gdshader @@ -0,0 +1,17 @@ +shader_type spatial; +render_mode blend_add,unshaded,depth_test_disabled,cull_disabled; + +uniform sampler2D tex_main : source_color; +uniform sampler2D tex_noise : source_color; +uniform sampler2D tex_mask : source_color; + +void fragment() { + vec2 uv = clamp(UV,vec2(0.01,0.01),vec2(0.99,0.99)); + vec2 uv_noise = uv - 0.5 * vec2(mod(TIME, 2.0) - 1.0, 0); + vec4 col_main = texture(tex_main, uv); + vec4 col_noise = texture(tex_noise, uv_noise); + vec4 col_mask = texture(tex_mask, uv); + vec4 col = col_mask * COLOR * 1.0 + (col_noise + col_main) * COLOR; + ALBEDO = col.rgb; + ALPHA = col_mask.r * COLOR.a; +} diff --git a/render/texture/particle/mask/mask7.png b/render/texture/particle/mask/mask7.png new file mode 100644 index 0000000..75fa388 Binary files /dev/null and b/render/texture/particle/mask/mask7.png differ diff --git a/render/texture/particle/mask/mask7.png.import b/render/texture/particle/mask/mask7.png.import new file mode 100644 index 0000000..9c4aadd --- /dev/null +++ b/render/texture/particle/mask/mask7.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dbwhs56fum5o0" +path="res://.godot/imported/mask7.png-b1230d4b578ec6c4ba31eebc8cdc4efc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://render/texture/particle/mask/mask7.png" +dest_files=["res://.godot/imported/mask7.png-b1230d4b578ec6c4ba31eebc8cdc4efc.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=0 +compress/normal_map=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=false +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/render/texture/particle/mask/mask8.png b/render/texture/particle/mask/mask8.png new file mode 100644 index 0000000..9621694 Binary files /dev/null and b/render/texture/particle/mask/mask8.png differ diff --git a/render/texture/particle/mask/mask8.png.import b/render/texture/particle/mask/mask8.png.import new file mode 100644 index 0000000..a419a35 --- /dev/null +++ b/render/texture/particle/mask/mask8.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://n5eob6sceoxj" +path="res://.godot/imported/mask8.png-c372cdcce0e458be6646c28aa88e47f9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://render/texture/particle/mask/mask8.png" +dest_files=["res://.godot/imported/mask8.png-c372cdcce0e458be6646c28aa88e47f9.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=0 +compress/normal_map=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=false +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/resource/skill_animation/hero01_fist_attack01.tres b/resource/skill_animation/hero01_fist_attack01.tres index 9bb04b1..cb4deeb 100644 --- a/resource/skill_animation/hero01_fist_attack01.tres +++ b/resource/skill_animation/hero01_fist_attack01.tres @@ -36,7 +36,7 @@ tracks/2/path = NodePath("Status:break_level") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.4, 0.7), +"times": PackedFloat32Array(0, 0.3, 0.5), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, "values": [0, 3, 4] @@ -48,7 +48,7 @@ tracks/3/path = NodePath("Status:speed_up_rate") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0.2, 0.4), +"times": PackedFloat32Array(0.1, 0.2), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [-0.5, -1.0] @@ -60,7 +60,7 @@ tracks/4/path = NodePath("Status:skill_move_speed") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { -"times": PackedFloat32Array(0.1, 0.4), +"times": PackedFloat32Array(0.1, 0.2), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [2.0, 0.0] diff --git a/resource/skill_animation/hero01_fist_attack02.tres b/resource/skill_animation/hero01_fist_attack02.tres index d780c54..d8aca4c 100644 --- a/resource/skill_animation/hero01_fist_attack02.tres +++ b/resource/skill_animation/hero01_fist_attack02.tres @@ -36,7 +36,7 @@ tracks/2/path = NodePath("Status:break_level") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.4, 0.7), +"times": PackedFloat32Array(0, 0.4, 0.6), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, "values": [0, 3, 4] @@ -48,7 +48,7 @@ tracks/3/path = NodePath("Status:speed_up_rate") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0.2, 0.4), +"times": PackedFloat32Array(0.1, 0.2), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [-0.5, -1.0] @@ -60,7 +60,7 @@ tracks/4/path = NodePath("Status:skill_move_speed") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { -"times": PackedFloat32Array(0.1, 0.4), +"times": PackedFloat32Array(0.1, 0.2), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [2.0, 0.0] diff --git a/resource/skill_animation/hero01_fist_attack03.tres b/resource/skill_animation/hero01_fist_attack03.tres index 93e53bd..539c4a9 100644 --- a/resource/skill_animation/hero01_fist_attack03.tres +++ b/resource/skill_animation/hero01_fist_attack03.tres @@ -36,7 +36,7 @@ tracks/2/path = NodePath("Status:break_level") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.4, 0.7), +"times": PackedFloat32Array(0, 0.4, 0.6), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, "values": [0, 3, 4] @@ -48,7 +48,7 @@ tracks/3/path = NodePath("Status:speed_up_rate") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0.2, 0.4), +"times": PackedFloat32Array(0.1, 0.2), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [-0.5, -1.0] @@ -60,10 +60,10 @@ tracks/4/path = NodePath("Status:skill_move_speed") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { -"times": PackedFloat32Array(0.1, 0.4), +"times": PackedFloat32Array(0.1, 0.2), "transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [2.0, 0.0] +"values": [4.0, 0.0] } tracks/5/type = "method" tracks/5/imported = false diff --git a/resource/skill_animation/hero01_fist_attack04.tres b/resource/skill_animation/hero01_fist_attack04.tres index fc6f29e..bf13a65 100644 --- a/resource/skill_animation/hero01_fist_attack04.tres +++ b/resource/skill_animation/hero01_fist_attack04.tres @@ -36,7 +36,7 @@ tracks/2/path = NodePath("Status:break_level") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.4, 0.7), +"times": PackedFloat32Array(0, 0.8, 1), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, "values": [0, 3, 4] @@ -48,7 +48,7 @@ tracks/3/path = NodePath("Status:speed_up_rate") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0.2, 0.4), +"times": PackedFloat32Array(0.1, 0.3), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [-0.5, -1.0] @@ -60,10 +60,10 @@ tracks/4/path = NodePath("Status:skill_move_speed") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { -"times": PackedFloat32Array(0.1, 0.4), +"times": PackedFloat32Array(0.1, 0.3), "transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [2.0, 0.0] +"values": [4.0, 0.0] } tracks/5/type = "method" tracks/5/imported = false @@ -72,7 +72,7 @@ tracks/5/path = NodePath("Battle") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { -"times": PackedFloat32Array(0.2), +"times": PackedFloat32Array(0.3), "transitions": PackedFloat32Array(1), "values": [{ "args": [], @@ -86,7 +86,7 @@ tracks/6/path = NodePath("Effect") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/keys = { -"times": PackedFloat32Array(0.1), +"times": PackedFloat32Array(0.2), "transitions": PackedFloat32Array(1), "values": [{ "args": [], diff --git a/resource/skill_animation/hero01_fist_attack05.tres b/resource/skill_animation/hero01_fist_attack05.tres index 5dd5892..a34ef7c 100644 --- a/resource/skill_animation/hero01_fist_attack05.tres +++ b/resource/skill_animation/hero01_fist_attack05.tres @@ -36,7 +36,7 @@ tracks/2/path = NodePath("Status:break_level") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.8, 1), +"times": PackedFloat32Array(0, 0.9, 1.1), "transitions": PackedFloat32Array(1, 1, 1), "update": 1, "values": [0, 3, 4] @@ -48,7 +48,7 @@ tracks/3/path = NodePath("Status:speed_up_rate") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { -"times": PackedFloat32Array(0.3, 0.7), +"times": PackedFloat32Array(0.3, 0.6), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [-0.5, -1.0] @@ -60,7 +60,7 @@ tracks/4/path = NodePath("Status:skill_move_speed") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { -"times": PackedFloat32Array(0.2, 0.7), +"times": PackedFloat32Array(0.2, 0.6), "transitions": PackedFloat32Array(1, 1), "update": 1, "values": [2.0, 0.0] diff --git a/resource/skill_animation/hero01_long_attack04.tres b/resource/skill_animation/hero01_long_attack04.tres index acc0f8f..8046ae2 100644 --- a/resource/skill_animation/hero01_long_attack04.tres +++ b/resource/skill_animation/hero01_long_attack04.tres @@ -72,11 +72,14 @@ tracks/5/path = NodePath("Battle") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/keys = { -"times": PackedFloat32Array(0.5), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0.3, 0.5), +"transitions": PackedFloat32Array(1, 1), "values": [{ "args": [], "method": &"attack" +}, { +"args": [], +"method": &"attack" }] } tracks/6/type = "method" diff --git a/resource/skill_animation/hero01_long_flash.tres b/resource/skill_animation/hero01_long_flash.tres index acfccbe..896b801 100644 --- a/resource/skill_animation/hero01_long_flash.tres +++ b/resource/skill_animation/hero01_long_flash.tres @@ -101,3 +101,17 @@ tracks/6/keys = { "update": 1, "values": [0, 1, 2, 3, 4] } +tracks/7/type = "method" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath("Effect") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0.1), +"transitions": PackedFloat32Array(1), +"values": [{ +"args": [], +"method": &"cast_attack_particle" +}] +} diff --git a/scene/character/character.tscn b/scene/character/character.tscn index b095cff..8dfda5e 100644 --- a/scene/character/character.tscn +++ b/scene/character/character.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=3 uid="uid://8rcvw1vnjcf7"] +[gd_scene load_steps=16 format=3 uid="uid://8rcvw1vnjcf7"] [ext_resource type="Script" path="res://script/character/character.gd" id="1_tonbs"] [ext_resource type="Script" path="res://script/character/status.gd" id="2_txdip"] @@ -6,7 +6,7 @@ [ext_resource type="Script" path="res://script/character/move.gd" id="4_66r53"] [ext_resource type="Texture2D" uid="uid://daqn6aqfp1hva" path="res://resource/animation/character/hero01_long_attack.png" id="4_fcd8a"] [ext_resource type="Script" path="res://script/character/view.gd" id="4_vijjv"] -[ext_resource type="SpriteFrames" uid="uid://cwe8setoi6bd" path="res://resource/animation/character/hero01_move.aseprite" id="5_2ikpt"] +[ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="5_oukeb"] [ext_resource type="Script" path="res://script/character/skill.gd" id="6_h4xqy"] [ext_resource type="AnimationLibrary" uid="uid://croik07a1qko5" path="res://resource/skill_animation_library/animation_library.tres" id="6_pakq5"] [ext_resource type="Script" path="res://script/character/battle.gd" id="8_w84sf"] @@ -23,6 +23,11 @@ shader_parameter/deformation_dir = Vector2(0, 0) shader_parameter/deformation_rate = 0.0 shader_parameter/tex = ExtResource("4_fcd8a") +[sub_resource type="Curve" id="Curve_e7j3f"] +max_value = 6.0 +_data = [Vector2(0, 6), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 2 + [node name="Character" type="CharacterBody3D"] collision_layer = 512 script = ExtResource("1_tonbs") @@ -49,8 +54,8 @@ pixel_size = 0.02 double_sided = false alpha_cut = 2 texture_filter = 0 -sprite_frames = ExtResource("5_2ikpt") -animation = &"idle_loop" +sprite_frames = ExtResource("5_oukeb") +animation = &"fist_attack05" script = ExtResource("4_vijjv") [node name="Move" type="Node3D" parent="."] @@ -71,6 +76,7 @@ script = ExtResource("9_jlnhy") [node name="Battle" type="Node3D" parent="."] unique_name_in_owner = true script = ExtResource("8_w84sf") +hit_back_limit_curve = SubResource("Curve_e7j3f") [node name="Effect" type="Node3D" parent="."] unique_name_in_owner = true diff --git a/scene/character/player.tscn b/scene/character/player.tscn index 9cd0bd1..ef7fb38 100644 --- a/scene/character/player.tscn +++ b/scene/character/player.tscn @@ -1,12 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://ba7pkdaq5y8nl"] +[gd_scene load_steps=8 format=3 uid="uid://ba7pkdaq5y8nl"] [ext_resource type="PackedScene" uid="uid://8rcvw1vnjcf7" path="res://scene/character/character.tscn" id="1_pot50"] [ext_resource type="Script" path="res://script/character/player/combo.gd" id="2_i44w8"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="2_kqo4a"] -[ext_resource type="AnimationLibrary" uid="uid://croik07a1qko5" path="res://resource/skill_animation_library/animation_library.tres" id="3_io1si"] [ext_resource type="Script" path="res://script/character/player/player_input.gd" id="3_n07go"] [ext_resource type="Script" path="res://script/character/player/core.gd" id="3_rxdse"] -[ext_resource type="Script" path="res://script/character/skill.gd" id="4_j6kp0"] [ext_resource type="Script" path="res://script/character/player/player_info.gd" id="4_mi1lk"] [ext_resource type="Script" path="res://script/character/player/player_action.gd" id="5_gum7v"] @@ -18,13 +16,7 @@ speed_up_rate = 0.0 [node name="View" parent="." index="2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.693056, 0) sprite_frames = ExtResource("2_kqo4a") -animation = &"fist_attack05" - -[node name="Skill" type="AnimationPlayer" parent="Skill" index="0"] -libraries = { -"animation_library": ExtResource("3_io1si") -} -script = ExtResource("4_j6kp0") +animation = &"fist_attack01" [node name="Combo" type="Node3D" parent="." index="8"] unique_name_in_owner = true @@ -44,5 +36,3 @@ script = ExtResource("5_gum7v") [node name="PlayerInfo" type="Node3D" parent="." index="12"] script = ExtResource("4_mi1lk") - -[connection signal="animation_finished" from="Skill/Skill" to="Skill/Skill" method="_on_animation_finished"] diff --git a/scene/effect/particle/_particle_dash1.tscn b/scene/effect/particle/_particle_dash1.tscn new file mode 100644 index 0000000..33dd806 --- /dev/null +++ b/scene/effect/particle/_particle_dash1.tscn @@ -0,0 +1,58 @@ +[gd_scene load_steps=13 format=3 uid="uid://cxopc3y11lwg1"] + +[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_2qqsc"] +[ext_resource type="Shader" path="res://render/shader/effect_dash.gdshader" id="2_b7c5p"] +[ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="3_srlkl"] +[ext_resource type="Texture2D" uid="uid://n5eob6sceoxj" path="res://render/texture/particle/mask/mask8.png" id="4_stgto"] +[ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="5_yrr1g"] +[ext_resource type="ArrayMesh" uid="uid://c56sknyl34eas" path="res://render/mesh/dash.obj" id="6_5h1mv"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_hupcc"] +render_priority = 0 +shader = ExtResource("2_b7c5p") +shader_parameter/tex_main = ExtResource("3_srlkl") +shader_parameter/tex_noise = ExtResource("5_yrr1g") +shader_parameter/tex_mask = ExtResource("4_stgto") + +[sub_resource type="Curve" id="Curve_xch7k"] +_data = [Vector2(0, 0.428571), 0.0, 0.0, 0, 0, Vector2(0.0669643, 0.516483), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 3 + +[sub_resource type="CurveTexture" id="CurveTexture_gfymj"] +curve = SubResource("Curve_xch7k") + +[sub_resource type="Gradient" id="Gradient_ny7rk"] +offsets = PackedFloat32Array(0, 0.346939) +colors = PackedColorArray(1, 0.992157, 1, 1, 0.54902, 0.905882, 1, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_acoej"] +gradient = SubResource("Gradient_ny7rk") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_f5m0v"] +particle_flag_rotate_y = true +emission_shape_offset = Vector3(0.5, 0, 0) +angle_min = 90.0 +angle_max = 90.0 +gravity = Vector3(0, 0, 0) +scale_min = 2.0 +scale_max = 2.0 +color_ramp = SubResource("GradientTexture1D_acoej") +alpha_curve = SubResource("CurveTexture_gfymj") + +[node name="Particle" type="Node3D"] +script = ExtResource("1_2qqsc") + +[node name="Dash" type="GPUParticles3D" parent="."] +layers = 512 +material_override = SubResource("ShaderMaterial_hupcc") +cast_shadow = 0 +gi_mode = 0 +emitting = false +amount = 1 +lifetime = 0.25 +one_shot = true +speed_scale = 1.5 +fixed_fps = 60 +local_coords = true +process_material = SubResource("ParticleProcessMaterial_f5m0v") +draw_pass_1 = ExtResource("6_5h1mv") diff --git a/scene/effect/particle/_particle_slash.tscn b/scene/effect/particle/_particle_slash.tscn deleted file mode 100644 index 4e63ba2..0000000 --- a/scene/effect/particle/_particle_slash.tscn +++ /dev/null @@ -1,41 +0,0 @@ -[gd_scene load_steps=6 format=3 uid="uid://b2h4pcmlii7dg"] - -[ext_resource type="Material" uid="uid://dtyosukxpf33d" path="res://render/material/effect_slash.tres" id="1_6c80n"] -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_fx8ev"] -[ext_resource type="Material" uid="uid://dubkkji6sm8on" path="res://render/process_material/slash_normal.tres" id="2_eq67i"] -[ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="3_idjnm"] -[ext_resource type="Material" uid="uid://bkbuvtya3uk3x" path="res://render/material/effect_skew1.tres" id="5_qg8g8"] - -[node name="Particle" type="Node3D"] -script = ExtResource("1_fx8ev") - -[node name="Slash" type="GPUParticles3D" parent="."] -layers = 512 -material_override = ExtResource("1_6c80n") -cast_shadow = 0 -gi_mode = 0 -emitting = false -amount = 1 -lifetime = 0.25 -one_shot = true -speed_scale = 1.5 -fixed_fps = 60 -local_coords = true -process_material = ExtResource("2_eq67i") -draw_pass_1 = ExtResource("3_idjnm") - -[node name="Skew1" type="GPUParticles3D" parent="."] -transform = Transform3D(0.99, 0, 0, 0, 0.99, 0, 0, 0, 0.99, 0, 0, 0) -layers = 512 -material_override = ExtResource("5_qg8g8") -cast_shadow = 0 -gi_mode = 0 -emitting = false -amount = 1 -lifetime = 0.25 -one_shot = true -speed_scale = 1.5 -fixed_fps = 60 -local_coords = true -process_material = ExtResource("2_eq67i") -draw_pass_1 = ExtResource("3_idjnm") diff --git a/scene/effect/particle/_particle_slash1.tscn b/scene/effect/particle/_particle_slash1.tscn new file mode 100644 index 0000000..2008bd5 --- /dev/null +++ b/scene/effect/particle/_particle_slash1.tscn @@ -0,0 +1,59 @@ +[gd_scene load_steps=11 format=3 uid="uid://b2h4pcmlii7dg"] + +[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_fx8ev"] +[ext_resource type="Shader" path="res://render/shader/effect_slash.gdshader" id="2_a0jwb"] +[ext_resource type="Material" uid="uid://dubkkji6sm8on" path="res://render/process_material/slash_normal.tres" id="2_eq67i"] +[ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="3_fvsr3"] +[ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="3_idjnm"] +[ext_resource type="Texture2D" uid="uid://csjm7d1tg6b50" path="res://render/texture/particle/mask/mask6.png" id="4_wvohg"] +[ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="5_ymh7m"] +[ext_resource type="Shader" path="res://render/shader/effect_skew1.gdshader" id="8_gng47"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_hupcc"] +render_priority = 0 +shader = ExtResource("2_a0jwb") +shader_parameter/tex_main = ExtResource("3_fvsr3") +shader_parameter/tex_noise = ExtResource("5_ymh7m") +shader_parameter/tex_mask = ExtResource("4_wvohg") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ntvqm"] +render_priority = 0 +shader = ExtResource("8_gng47") +shader_parameter/distortionView = 0.03 +shader_parameter/speedView = 0.5 +shader_parameter/noise = ExtResource("3_fvsr3") +shader_parameter/tex_mask = ExtResource("4_wvohg") + +[node name="Particle" type="Node3D"] +script = ExtResource("1_fx8ev") + +[node name="Slash" type="GPUParticles3D" parent="."] +layers = 512 +material_override = SubResource("ShaderMaterial_hupcc") +cast_shadow = 0 +gi_mode = 0 +emitting = false +amount = 1 +lifetime = 0.25 +one_shot = true +speed_scale = 1.5 +fixed_fps = 60 +local_coords = true +process_material = ExtResource("2_eq67i") +draw_pass_1 = ExtResource("3_idjnm") + +[node name="Skew1" type="GPUParticles3D" parent="."] +transform = Transform3D(0.99, 0, 0, 0, 0.99, 0, 0, 0, 0.99, 0, 0, 0) +layers = 512 +material_override = SubResource("ShaderMaterial_ntvqm") +cast_shadow = 0 +gi_mode = 0 +emitting = false +amount = 1 +lifetime = 0.25 +one_shot = true +speed_scale = 1.5 +fixed_fps = 60 +local_coords = true +process_material = ExtResource("2_eq67i") +draw_pass_1 = ExtResource("3_idjnm") diff --git a/scene/effect/particle/hero01_common_skill02.tscn b/scene/effect/particle/hero01_common_skill02.tscn index 4bd6c46..4d566e4 100644 --- a/scene/effect/particle/hero01_common_skill02.tscn +++ b/scene/effect/particle/hero01_common_skill02.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cswp0rj0gep6c"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_qyqjx"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_qyqjx"] [node name="Particle" instance=ExtResource("1_qyqjx")] transform = Transform3D(1.5, 0, 0, 0, 1, 0, 0, 0, 1.2, 0, 0, 0) diff --git a/scene/effect/particle/hero01_fist_air_skill01_0.tscn b/scene/effect/particle/hero01_fist_air_skill01_0.tscn index 991c78f..34909bf 100644 --- a/scene/effect/particle/hero01_fist_air_skill01_0.tscn +++ b/scene/effect/particle/hero01_fist_air_skill01_0.tscn @@ -1,5 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://dfdt6u2dbig3e"] +[gd_scene load_steps=2 format=3 uid="uid://dcsls0bn14i04"] -[ext_resource type="PackedScene" uid="uid://me2heq5v1c5q" path="res://scene/effect/particle/particle_dash.tscn" id="1_1r02f"] +[ext_resource type="PackedScene" uid="uid://cxopc3y11lwg1" path="res://scene/effect/particle/_particle_dash1.tscn" id="1_eappe"] -[node name="Particle" instance=ExtResource("1_1r02f")] +[node name="Particle" instance=ExtResource("1_eappe")] +rotation_order = 4 + +[node name="Dash" parent="." index="0"] +transform = Transform3D(0.866025, 0.5, 0, -0.5, 0.866025, 0, 0, 0, 1, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack01.tscn b/scene/effect/particle/hero01_long_attack01.tscn index c7aef60..1af00eb 100644 --- a/scene/effect/particle/hero01_long_attack01.tscn +++ b/scene/effect/particle/hero01_long_attack01.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://c101pt8hqvmbk"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_glj7d"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_glj7d"] [node name="Particle" instance=ExtResource("1_glj7d")] transform = Transform3D(1, 0, 0, 0, 0.707107, -0.353553, 0, 0.707107, 0.353553, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack02.tscn b/scene/effect/particle/hero01_long_attack02.tscn index f4a3015..969259d 100644 --- a/scene/effect/particle/hero01_long_attack02.tscn +++ b/scene/effect/particle/hero01_long_attack02.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://ns84g1jmmm56"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_hciuf"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_hciuf"] [node name="Particle" instance=ExtResource("1_hciuf")] transform = Transform3D(1, 0, 0, 0, -0.707107, 0.353553, 0, -0.707107, -0.353553, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack03_0.tscn b/scene/effect/particle/hero01_long_attack03_0.tscn index da0a434..dfce45e 100644 --- a/scene/effect/particle/hero01_long_attack03_0.tscn +++ b/scene/effect/particle/hero01_long_attack03_0.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bn2ktr7iynt5"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_p44mg"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_p44mg"] [node name="Particle" instance=ExtResource("1_p44mg")] transform = Transform3D(1, 0, 0, 0, -0.707107, 0.353553, 0, -0.707107, -0.353553, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack03_1.tscn b/scene/effect/particle/hero01_long_attack03_1.tscn index ccafda6..c4b03e7 100644 --- a/scene/effect/particle/hero01_long_attack03_1.tscn +++ b/scene/effect/particle/hero01_long_attack03_1.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dj04l4oge27f0"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_078jk"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_078jk"] [node name="Particle" instance=ExtResource("1_078jk")] transform = Transform3D(1, 0, 0, 0, 0.5, 0.433012, 0, -0.866026, 0.25, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack04.tscn b/scene/effect/particle/hero01_long_attack04.tscn index 1e36a1b..4f4f1f8 100644 --- a/scene/effect/particle/hero01_long_attack04.tscn +++ b/scene/effect/particle/hero01_long_attack04.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://c5srkd0js0bwc"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash.tscn" id="1_5b0hk"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_5b0hk"] [node name="Particle" instance=ExtResource("1_5b0hk")] transform = Transform3D(1.2, 0, 0, 0, 0.707107, -0.353553, 0, 0.707107, 0.353553, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_flash.tscn b/scene/effect/particle/hero01_long_flash.tscn new file mode 100644 index 0000000..00b8fb4 --- /dev/null +++ b/scene/effect/particle/hero01_long_flash.tscn @@ -0,0 +1,5 @@ +[gd_scene load_steps=2 format=3 uid="uid://cafvtgn54mpkk"] + +[ext_resource type="PackedScene" uid="uid://cxopc3y11lwg1" path="res://scene/effect/particle/_particle_dash1.tscn" id="1_4w7de"] + +[node name="Particle" instance=ExtResource("1_4w7de")] diff --git a/scene/effect/particle/particle_dash.tscn b/scene/effect/particle/particle_dash.tscn deleted file mode 100644 index ad02941..0000000 --- a/scene/effect/particle/particle_dash.tscn +++ /dev/null @@ -1,41 +0,0 @@ -[gd_scene load_steps=6 format=3 uid="uid://me2heq5v1c5q"] - -[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_5usbn"] -[ext_resource type="Material" uid="uid://dtyosukxpf33d" path="res://render/material/effect_slash.tres" id="2_w7v70"] -[ext_resource type="Material" uid="uid://dubkkji6sm8on" path="res://render/process_material/slash_normal.tres" id="3_uy3s2"] -[ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="4_1ed4g"] -[ext_resource type="Material" uid="uid://bkbuvtya3uk3x" path="res://render/material/effect_skew1.tres" id="5_uwxv5"] - -[node name="Particle" type="Node3D"] -script = ExtResource("1_5usbn") - -[node name="Slash" type="GPUParticles3D" parent="."] -layers = 512 -material_override = ExtResource("2_w7v70") -cast_shadow = 0 -gi_mode = 0 -emitting = false -amount = 1 -lifetime = 0.25 -one_shot = true -speed_scale = 1.5 -fixed_fps = 60 -local_coords = true -process_material = ExtResource("3_uy3s2") -draw_pass_1 = ExtResource("4_1ed4g") - -[node name="Skew1" type="GPUParticles3D" parent="."] -transform = Transform3D(0.99, 0, 0, 0, 0.99, 0, 0, 0, 0.99, 0, 0, 0) -layers = 512 -material_override = ExtResource("5_uwxv5") -cast_shadow = 0 -gi_mode = 0 -emitting = false -amount = 1 -lifetime = 0.25 -one_shot = true -speed_scale = 1.5 -fixed_fps = 60 -local_coords = true -process_material = ExtResource("3_uy3s2") -draw_pass_1 = ExtResource("4_1ed4g") diff --git a/scene/launcher.tscn b/scene/launcher.tscn index 5774484..7ae099d 100644 --- a/scene/launcher.tscn +++ b/scene/launcher.tscn @@ -74,9 +74,6 @@ script = ExtResource("4_oonkb") [node name="EffectManager" type="Node3D" parent="GameManager/Stage/SubViewport"] script = ExtResource("8_0jv87") -[node name="CSGBox3D" type="CSGBox3D" parent="GameManager/Stage/SubViewport"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.36529, 0) - [node name="UIManager" type="Node3D" parent="GameManager"] process_mode = 3 script = ExtResource("7_wa6ef") @@ -91,7 +88,6 @@ visible = false visible = false [node name="ProfileScreen" parent="GameManager/UIManager" instance=ExtResource("6_u1fxn")] -visible = false [node name="InputManager" type="Node3D" parent="GameManager"] process_mode = 3 diff --git a/script/character/battle.gd b/script/character/battle.gd index 716e033..96cbdc0 100644 --- a/script/character/battle.gd +++ b/script/character/battle.gd @@ -1,6 +1,8 @@ extends Node3D class_name Battle +@export var hit_back_limit_curve : Curve + @onready var character = (get_owner() as Character) @onready var status = (%Status as Status) @onready var skill = (%Skill as Skill) @@ -146,6 +148,7 @@ func settle(hit_info:HitInfo) -> bool: #浮空 击落 强制位移 var hit_up_speed = attack.hit_up_speed + var hit_back_speed = attack.hit_back_speed if is_floating: character_to.add_buff("stagger",-1) character_to.add_buff("floating",-1) @@ -156,7 +159,11 @@ func settle(hit_info:HitInfo) -> bool: hit_up_speed = 0 if is_hit_down: character_to.add_buff("hit_down",-1) - character_to.set_hit_move(hit_info.dir,attack.hit_back_speed,hit_up_speed) + if hit_back_limit_curve: + var dir = character_from.pos2D() - character_to.pos2D() + var dist = clamp(dir.length(),0,1) + hit_back_speed = max(hit_back_limit_curve.sample(dist),hit_back_speed) + character_to.set_hit_move(hit_info.dir,hit_back_speed,hit_up_speed) character_to.add_buff("hit_back",attack.hit_back_duration) character_to.add_buff("hit_up",attack.hit_up_duration) @@ -186,7 +193,7 @@ func settle(hit_info:HitInfo) -> bool: elif is_break_stun:character_to.show_hit_text("Stun") elif not is_break_skill:character_to.show_hit_text("Block") - return !is_break_skill + return true func add_mp(value:float): var mp = character.get_status("mp") diff --git a/script/manager/ui_manager.gd b/script/manager/ui_manager.gd index c866341..d488e1f 100644 --- a/script/manager/ui_manager.gd +++ b/script/manager/ui_manager.gd @@ -3,7 +3,6 @@ extends Node3D class_name UIManager @onready var ui_map = { - "profile" : $ProfileScreen, "hud" : $HudScreen, "status" : $StatusScreen, "menu" : $MenuScreen