diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx index ed8d65f..56a9357 100644 --- a/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityMaterial.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityMaterial.xlsx index 63374e9..86ae6d8 100644 --- a/DungeonShooting_Godot/excel/excelFile/ActivityMaterial.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/ActivityMaterial.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx b/DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx index 39e31d9..54166ba 100644 --- a/DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/BulletBase.xlsx b/DungeonShooting_Godot/excel/excelFile/BulletBase.xlsx index 7d13e52..977d88e 100644 --- a/DungeonShooting_Godot/excel/excelFile/BulletBase.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/BulletBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/EnemyBase.xlsx b/DungeonShooting_Godot/excel/excelFile/EnemyBase.xlsx index 70020d3..649b1cf 100644 --- a/DungeonShooting_Godot/excel/excelFile/EnemyBase.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/EnemyBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/LiquidMaterial.xlsx b/DungeonShooting_Godot/excel/excelFile/LiquidMaterial.xlsx index b952713..b37ee9d 100644 --- a/DungeonShooting_Godot/excel/excelFile/LiquidMaterial.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/LiquidMaterial.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx index 9ba4926..1ecc6e6 100644 --- a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/WeaponBase.xlsx b/DungeonShooting_Godot/excel/excelFile/WeaponBase.xlsx index 3f64326..142888e 100644 --- a/DungeonShooting_Godot/excel/excelFile/WeaponBase.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/WeaponBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/prefab/bullet/explode/Explode0001.tscn b/DungeonShooting_Godot/prefab/bullet/explode/Explode0001.tscn index 31cb46f..fad5129 100644 --- a/DungeonShooting_Godot/prefab/bullet/explode/Explode0001.tscn +++ b/DungeonShooting_Godot/prefab/bullet/explode/Explode0001.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=26 format=3 uid="uid://cw3c600m8rv6t"] -[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/common/Smoke.png" id="1_ctx3v"] +[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="1_ctx3v"] [ext_resource type="Script" path="res://src/game/activity/bullet/explode/Explode.cs" id="1_qn5pu"] -[ext_resource type="Texture2D" uid="uid://ccdflg560oub6" path="res://resource/sprite/effects/explode/Explode_circle0001.png" id="2_bpdnr"] -[ext_resource type="Texture2D" uid="uid://rk73piti0qot" path="res://resource/sprite/effects/common/Smoke2.png" id="3_xt36q"] -[ext_resource type="Texture2D" uid="uid://cquv6nomd3tpf" path="res://resource/sprite/effects/explode/Explode_line0001.png" id="4_i3ry2"] +[ext_resource type="Texture2D" uid="uid://ccdflg560oub6" path="res://resource/sprite/explode/Explode_circle0001.png" id="2_bpdnr"] +[ext_resource type="Texture2D" uid="uid://rk73piti0qot" path="res://resource/sprite/common/Smoke2.png" id="3_xt36q"] +[ext_resource type="Texture2D" uid="uid://cquv6nomd3tpf" path="res://resource/sprite/explode/Explode_line0001.png" id="4_i3ry2"] [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_sk5lv"] particles_animation = true diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn index 99852ed..dc414e0 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn @@ -3,7 +3,8 @@ [ext_resource type="Script" path="res://src/game/activity/bullet/normal/BoomBullet.cs" id="1_1jbgr"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_w1qob"] [ext_resource type="SpriteFrames" uid="uid://d3vma1qjo478l" path="res://resource/spriteFrames/bullet/Bullet0004.tres" id="3_bttus"] -[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/common/Smoke.png" id="3_ofn8c"] +[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="3_ofn8c"] + [sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0005.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0005.tscn index e5f968f..7431fdc 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0005.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0005.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://src/game/activity/bullet/normal/BrushBullet.cs" id="1_13wdl"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_v0al6"] [ext_resource type="SpriteFrames" uid="uid://jj8oh76pi53j" path="res://resource/spriteFrames/bullet/Bullet0005.tres" id="3_mmvqn"] -[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/common/Smoke.png" id="4_esjg6"] +[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="4_esjg6"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/effect/Blood.tscn b/DungeonShooting_Godot/prefab/effect/Blood.tscn index 7abbec9..88930aa 100644 --- a/DungeonShooting_Godot/prefab/effect/Blood.tscn +++ b/DungeonShooting_Godot/prefab/effect/Blood.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=3 format=3] -[ext_resource type="Texture2D" uid="uid://cgptnp74ive4r" path="res://resource/sprite/effects/Circle.png" id="1"] +[ext_resource type="Texture2D" uid="uid://cgptnp74ive4r" path="res://resource/sprite/common/Circle.png" id="1"] [ext_resource type="Script" path="res://src/game/effects/Blood.cs" id="2"] + [node name="Blood" type="CPUParticles2D"] z_index = -5 lifetime = 0.2 diff --git a/DungeonShooting_Godot/prefab/effect/bullet/BulletDisappear0001.tscn b/DungeonShooting_Godot/prefab/effect/bullet/BulletDisappear0001.tscn index 31f2655..5964bab 100644 --- a/DungeonShooting_Godot/prefab/effect/bullet/BulletDisappear0001.tscn +++ b/DungeonShooting_Godot/prefab/effect/bullet/BulletDisappear0001.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=13 format=3 uid="uid://c6mmikwchwt"] -[ext_resource type="Texture2D" uid="uid://4be6mi1egtiy" path="res://resource/sprite/effects/explode/Explode_circle0003.png" id="1_nag6e"] +[ext_resource type="Texture2D" uid="uid://4be6mi1egtiy" path="res://resource/sprite/explode/Explode_circle0003.png" id="1_nag6e"] [ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_db7di"] -[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/common/Smoke.png" id="3_2w51u"] +[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="3_2w51u"] [sub_resource type="AtlasTexture" id="AtlasTexture_tscb3"] atlas = ExtResource("1_nag6e") diff --git a/DungeonShooting_Godot/prefab/effect/bullet/BulletDisappear0002.tscn b/DungeonShooting_Godot/prefab/effect/bullet/BulletDisappear0002.tscn index 16c69d2..ce0ca7a 100644 --- a/DungeonShooting_Godot/prefab/effect/bullet/BulletDisappear0002.tscn +++ b/DungeonShooting_Godot/prefab/effect/bullet/BulletDisappear0002.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=16 format=3 uid="uid://7fjw62ymmrl7"] -[ext_resource type="Texture2D" uid="uid://cusp3s5t7qbuy" path="res://resource/sprite/effects/explode/Explode_circle0002.png" id="1_xuqre"] +[ext_resource type="Texture2D" uid="uid://cusp3s5t7qbuy" path="res://resource/sprite/explode/Explode_circle0002.png" id="1_xuqre"] [ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_eeot2"] -[ext_resource type="Texture2D" uid="uid://du0f3km5jhxlg" path="res://resource/sprite/effects/common/Smoke4.png" id="3_yow4l"] +[ext_resource type="Texture2D" uid="uid://du0f3km5jhxlg" path="res://resource/sprite/common/Smoke4.png" id="3_yow4l"] [sub_resource type="AtlasTexture" id="AtlasTexture_w7xvw"] atlas = ExtResource("1_xuqre") @@ -99,7 +99,6 @@ frame = 7 frame_progress = 1.0 script = ExtResource("2_eeot2") -DelayTime = 1.5 Particles2D = [NodePath("GPUParticles2D")] [node name="GPUParticles2D" type="GPUParticles2D" parent="."] diff --git a/DungeonShooting_Godot/prefab/effect/bullet/BulletSmoke0001.tscn b/DungeonShooting_Godot/prefab/effect/bullet/BulletSmoke0001.tscn index 1044745..77afb99 100644 --- a/DungeonShooting_Godot/prefab/effect/bullet/BulletSmoke0001.tscn +++ b/DungeonShooting_Godot/prefab/effect/bullet/BulletSmoke0001.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=7 format=3 uid="uid://b8ogu2l8pa70y"] -[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/common/Smoke.png" id="1"] +[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="1"] [ext_resource type="Texture2D" uid="uid://bs1lan5uwxyfg" path="res://resource/curve/Curve1.tres" id="1_8pe88"] -[ext_resource type="SpriteFrames" uid="uid://pwg2tx7dmcvp" path="res://resource/spriteFrames/effect/weapon/Collision1.tres" id="1_r62v8"] +[ext_resource type="SpriteFrames" uid="uid://pwg2tx7dmcvp" path="res://resource/spriteFrames/bullet/Collision0001.tres" id="1_r62v8"] [ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_r547d"] [sub_resource type="CanvasItemMaterial" id="1"] diff --git a/DungeonShooting_Godot/prefab/effect/bullet/BulletSmoke0002.tscn b/DungeonShooting_Godot/prefab/effect/bullet/BulletSmoke0002.tscn new file mode 100644 index 0000000..e47a384 --- /dev/null +++ b/DungeonShooting_Godot/prefab/effect/bullet/BulletSmoke0002.tscn @@ -0,0 +1,51 @@ +[gd_scene load_steps=8 format=3 uid="uid://y47kp0t5uqu0"] + +[ext_resource type="SpriteFrames" uid="uid://dkqd4513sog3f" path="res://resource/spriteFrames/bullet/Collision0002.tres" id="1_0qscf"] +[ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_p27g6"] +[ext_resource type="Texture2D" uid="uid://du0f3km5jhxlg" path="res://resource/sprite/common/Smoke4.png" id="4_d8v0n"] + +[sub_resource type="CanvasItemMaterial" id="1"] +particles_animation = true +particles_anim_h_frames = 3 +particles_anim_v_frames = 1 +particles_anim_loop = false + +[sub_resource type="Curve" id="Curve_r4o86"] +_data = [Vector2(0.0107527, 1), 0.0, 0.0, 0, 0, Vector2(0.512545, 0.8), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 3 + +[sub_resource type="CurveTexture" id="CurveTexture_thj4e"] +curve = SubResource("Curve_r4o86") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_gpp81"] +lifetime_randomness = 0.4 +particle_flag_disable_z = true +angle_max = 360.0 +spread = 25.0 +initial_velocity_min = 10.0 +initial_velocity_max = 60.0 +gravity = Vector3(0, 90, 0) +scale_min = 0.9 +scale_max = 1.5 +scale_curve = SubResource("CurveTexture_thj4e") +color = Color(0.75, 0.75, 0.75, 0.588235) +anim_offset_max = 1.0 + +[node name="BulletSmoke0002" type="AnimatedSprite2D" node_paths=PackedStringArray("Particles2D")] +modulate = Color(0.95, 0.70965, 0.6365, 0.588235) +sprite_frames = ExtResource("1_0qscf") +offset = Vector2(8, 0) +script = ExtResource("2_p27g6") +Particles2D = [NodePath("GpuParticles2D")] + +[node name="GpuParticles2D" type="GPUParticles2D" parent="."] +show_behind_parent = true +material = SubResource("1") +emitting = false +process_material = SubResource("ParticleProcessMaterial_gpp81") +texture = ExtResource("4_d8v0n") +lifetime = 0.6 +one_shot = true +explosiveness = 0.9 +randomness = 0.5 +fixed_fps = 20 diff --git a/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0001.tscn b/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0001.tscn index d92969c..488e2c5 100644 --- a/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0001.tscn +++ b/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0001.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://src/game/effects/enemy/EnemyDead0001.cs" id="1_1re5v"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_s7bee"] [ext_resource type="Texture2D" uid="uid://cn64eauvwx1uj" path="res://resource/sprite/role/enemy0001/enemy0001_Debris.png" id="3_uinig"] -[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/common/Smoke.png" id="4_t55wd"] +[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="4_t55wd"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_s1mj2"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0002.tscn b/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0002.tscn index 6b7cab8..310d6fd 100644 --- a/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0002.tscn +++ b/DungeonShooting_Godot/prefab/effect/enemy/EnemyDead0002.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://src/game/effects/enemy/EnemyDead0002.cs" id="1_ghu6a"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_q163q"] [ext_resource type="Texture2D" uid="uid://x3tjqgdgp43n" path="res://resource/sprite/role/enemy0002/Enemy0002_dead.png" id="3_l0kbp"] -[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/common/Smoke.png" id="4_2wygu"] +[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="4_2wygu"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_s1mj2"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack1.tscn b/DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack1.tscn index b8b60dc..ce93ef0 100644 --- a/DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack1.tscn +++ b/DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack1.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=3 uid="uid://cylm455bsio3g"] -[ext_resource type="Texture2D" uid="uid://7jhe2mmctmr1" path="res://resource/sprite/effects/weapon/MeleeAttack1.png" id="1_bjxle"] +[ext_resource type="Texture2D" uid="uid://7jhe2mmctmr1" path="res://resource/sprite/common/MeleeAttack1.png" id="1_bjxle"] [ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_bjagc"] [sub_resource type="AtlasTexture" id="AtlasTexture_36t2o"] diff --git a/DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack2.tscn b/DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack2.tscn index 307a111..9f8cba9 100644 --- a/DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack2.tscn +++ b/DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack2.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://cxq8wfeda4huc"] -[ext_resource type="SpriteFrames" uid="uid://dj8o7ws03bik4" path="res://resource/spriteFrames/effect/KnifeHit1.tres" id="1_ds7pw"] +[ext_resource type="SpriteFrames" uid="uid://dj8o7ws03bik4" path="res://resource/spriteFrames/weapon/Weapon0004_hit.tres" id="1_ds7pw"] [ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_hl3gp"] [node name="MeleeAttack2" type="AnimatedSprite2D" node_paths=PackedStringArray("Particles2D")] diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire.tscn index 380a59a..159734f 100644 --- a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire.tscn +++ b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=3 uid="uid://433h6huyctl1"] -[ext_resource type="Texture2D" uid="uid://b0jsyrbk4bydt" path="res://resource/sprite/effects/weapon/ShotFire.png" id="1_sencp"] +[ext_resource type="Texture2D" uid="uid://b0jsyrbk4bydt" path="res://resource/sprite/shootFire/ShotFire0001.png" id="1_sencp"] [ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_lnwju"] [sub_resource type="AtlasTexture" id="AtlasTexture_asq5h"] diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire2.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire2.tscn index cf55d21..768d4d4 100644 --- a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire2.tscn +++ b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire2.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=3 uid="uid://drcvbo0xam6q"] -[ext_resource type="Texture2D" uid="uid://cj8gb5dxnk8ov" path="res://resource/sprite/effects/weapon/ShotFire2.png" id="1_ljjfn"] +[ext_resource type="Texture2D" uid="uid://cj8gb5dxnk8ov" path="res://resource/sprite/shootFire/ShotFire0002.png" id="1_ljjfn"] [ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_4ecjw"] [sub_resource type="AtlasTexture" id="AtlasTexture_2nk6j"] diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire3.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire3.tscn new file mode 100644 index 0000000..751fef8 --- /dev/null +++ b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire3.tscn @@ -0,0 +1,43 @@ +[gd_scene load_steps=7 format=3 uid="uid://dbas3vph0i2ro"] + +[ext_resource type="Script" path="res://src/game/effects/AutoDestroyParticles.cs" id="1_pdyqx"] +[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="1_r2unj"] + +[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_4wcis"] +particles_animation = true +particles_anim_h_frames = 3 +particles_anim_v_frames = 1 +particles_anim_loop = false + +[sub_resource type="Curve" id="Curve_86ye5"] +_data = [Vector2(0.0215054, 1), 0.0, 0.0, 0, 0, Vector2(0.512545, 0.882353), 0.0, 0.0, 0, 0, Vector2(1, 0.152941), 0.0, 0.0, 0, 0] +point_count = 3 + +[sub_resource type="CurveTexture" id="CurveTexture_j77i6"] +curve = SubResource("Curve_86ye5") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_8n28q"] +lifetime_randomness = 0.3 +particle_flag_disable_z = true +angle_max = 360.0 +initial_velocity_min = 5.0 +initial_velocity_max = 35.0 +gravity = Vector3(0, 0, 0) +scale_min = 0.6 +scale_max = 1.5 +scale_curve = SubResource("CurveTexture_j77i6") +anim_offset_max = 1.0 + +[node name="ShotFire3" type="GPUParticles2D" node_paths=PackedStringArray("Particles2D")] +modulate = Color(0.95, 0.70965, 0.6365, 0.470588) +material = SubResource("CanvasItemMaterial_4wcis") +emitting = false +process_material = SubResource("ParticleProcessMaterial_8n28q") +texture = ExtResource("1_r2unj") +lifetime = 0.7 +one_shot = true +explosiveness = 1.0 +randomness = 0.5 +fixed_fps = 20 +script = ExtResource("1_pdyqx") +Particles2D = [] diff --git a/DungeonShooting_Godot/prefab/role/Enemy0002.tscn b/DungeonShooting_Godot/prefab/role/Enemy0002.tscn index 76b1509..bd2ff43 100644 --- a/DungeonShooting_Godot/prefab/role/Enemy0002.tscn +++ b/DungeonShooting_Godot/prefab/role/Enemy0002.tscn @@ -35,7 +35,7 @@ [sub_resource type="Animation" id="Animation_bn678"] resource_name = "attack" -length = 0.6 +length = 1.8 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -55,10 +55,10 @@ tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0, 0.5), +"times": PackedFloat32Array(0, 1.7), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [0, 7] +"values": [0, 12] } tracks/2/type = "method" tracks/2/imported = false @@ -67,11 +67,11 @@ tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0.3), +"times": PackedFloat32Array(1.3), "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"ShootBullet" +"method": &"OnAttack" }] } @@ -111,7 +111,6 @@ [node name="AnimatedSprite" parent="." index="2"] material = SubResource("ShaderMaterial_4qvs8") sprite_frames = ExtResource("3_hbsqi") -animation = &"attack" offset = Vector2(0, -9) [node name="HurtCollision" parent="HurtArea" index="0"] diff --git a/DungeonShooting_Godot/resource/animation/enemy/Enemy_reset.res b/DungeonShooting_Godot/resource/animation/enemy/Enemy_reset.res index ef1a612..22d72ae 100644 --- a/DungeonShooting_Godot/resource/animation/enemy/Enemy_reset.res +++ b/DungeonShooting_Godot/resource/animation/enemy/Enemy_reset.res Binary files differ diff --git a/DungeonShooting_Godot/resource/config/ActivityBase.json b/DungeonShooting_Godot/resource/config/ActivityBase.json index 93c1152..cff476b 100644 --- a/DungeonShooting_Godot/resource/config/ActivityBase.json +++ b/DungeonShooting_Godot/resource/config/ActivityBase.json @@ -80,7 +80,7 @@ "IsStatic": false, "__Material": "", "Prefab": "res://prefab/weapon/Weapon0004.tscn", - "Icon": "res://resource/sprite/weapon/knife1.png", + "Icon": "res://resource/sprite/weapon/weapon0004/Weapon0004.png", "ShowInMapEditor": true }, { diff --git a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preinstall.json b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preinstall.json index 571aa13..b2a4f57 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preinstall.json +++ b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preinstall.json @@ -1 +1 @@ -[{"Name":"test1","Weight":100,"Remark":"","WaveList":[[{"Position":{"X":0,"Y":0},"Size":{"X":0,"Y":0},"SpecialMarkType":1,"DelayTime":0,"MarkList":[]},{"Position":{"X":16,"Y":26},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0003","Weight":100,"Attr":{"CurrAmmon":"12","ResidueAmmo":"90"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-16,"Y":25},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"prop0003","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":37,"Y":-13},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0001","Weight":100,"Attr":{"CurrAmmon":"30","ResidueAmmo":"210"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-11,"Y":-12},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0009","Weight":100,"Attr":{"CurrAmmon":"1","ResidueAmmo":"25"},"Altitude":8,"VerticalSpeed":0}]}],[{"Position":{"X":10,"Y":-39},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":2,"MarkList":[{"Id":"prop0003","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-114,"Y":-5},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"enemy0002","Weight":100,"Attr":{"Face":"0","Weapon":null},"Altitude":0,"VerticalSpeed":0}]}]]}] \ No newline at end of file +[{"Name":"test1","Weight":100,"Remark":"","WaveList":[[{"Position":{"X":0,"Y":0},"Size":{"X":0,"Y":0},"SpecialMarkType":1,"DelayTime":0,"MarkList":[]},{"Position":{"X":16,"Y":26},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0003","Weight":100,"Attr":{"CurrAmmon":"12","ResidueAmmo":"90"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-16,"Y":25},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"prop0003","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":37,"Y":-13},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0001","Weight":100,"Attr":{"CurrAmmon":"30","ResidueAmmo":"210"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-11,"Y":-12},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0009","Weight":100,"Attr":{"CurrAmmon":"1","ResidueAmmo":"25"},"Altitude":8,"VerticalSpeed":0}]}],[{"Position":{"X":10,"Y":-39},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":2,"MarkList":[{"Id":"prop0003","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-115,"Y":39},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"enemy0002","Weight":100,"Attr":{"Face":"0","Weapon":null},"Altitude":0,"VerticalSpeed":0}]}]]}] \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preview.png b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preview.png index 1b93c25..055d7fa 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preview.png +++ b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preview.png Binary files differ diff --git a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/RoomInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/RoomInfo.json index dd8ba53..0370957 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/RoomInfo.json +++ b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/RoomInfo.json @@ -1 +1 @@ -{"Position":{"X":-11,"Y":-7},"Size":{"X":16,"Y":14},"DoorAreaInfos":[{"Direction":3,"Start":96,"End":224},{"Direction":0,"Start":0,"End":192},{"Direction":1,"Start":0,"End":128},{"Direction":2,"Start":64,"End":144}],"GroupName":"TestGroup1","RoomType":1,"RoomName":"Start2","Weight":100,"Remark":""} \ No newline at end of file +{"Position":{"X":-11,"Y":-7},"Size":{"X":16,"Y":14},"DoorAreaInfos":[{"Direction":3,"Start":96,"End":224},{"Direction":0,"Start":0,"End":192},{"Direction":1,"Start":0,"End":192},{"Direction":2,"Start":0,"End":144}],"GroupName":"TestGroup1","RoomType":1,"RoomName":"Start2","Weight":100,"Remark":""} \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/TileInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/TileInfo.json index 4b13f17..b37b37a 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/TileInfo.json +++ b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/TileInfo.json @@ -1 +1 @@ -{"NavigationList":[{"Type":0,"Points":[-152,-88,-120,-88,-120,-24,-56,-24,-56,-88,56,-88,56,96,40,96,40,48,-24,48,-24,96,-88,96,-88,16,-136,16,-136,32,-152,32]}],"Floor":[-3,-4,0,0,8,-3,-3,0,0,8,-3,-2,0,0,8,-3,-1,0,0,8,-3,0,0,0,8,-3,1,0,0,8,-3,2,0,0,8,-3,3,0,0,8,-3,4,0,0,8,-3,5,0,0,8,-2,-2,0,0,8,-2,-4,0,0,8,-2,-3,0,0,8,-2,-1,0,0,8,-2,0,0,0,8,-2,1,0,0,8,-2,2,0,0,8,-1,-1,0,0,8,-1,-4,0,0,8,-1,-3,0,0,8,-1,-2,0,0,8,-1,0,0,0,8,-1,1,0,0,8,-1,2,0,0,8,0,0,0,0,8,0,-4,0,0,8,0,-3,0,0,8,0,-2,0,0,8,0,-1,0,0,8,0,1,0,0,8,0,2,0,0,8,1,1,0,0,8,1,-4,0,0,8,1,-3,0,0,8,1,-2,0,0,8,1,-1,0,0,8,1,0,0,0,8,1,2,0,0,8,2,1,0,0,8,2,-4,0,0,8,2,-3,0,0,8,2,-2,0,0,8,2,-1,0,0,8,2,0,0,0,8,2,2,0,0,8,2,3,0,0,8,2,4,0,0,8,2,5,0,0,8,-4,-4,0,0,8,-4,-3,0,0,8,-4,-2,0,0,8,-4,-1,0,0,8,-4,0,0,0,8,-4,1,0,0,8,-4,2,0,0,8,-4,3,0,0,8,-4,4,0,0,8,-4,5,0,0,8,3,-4,0,0,8,3,-3,0,0,8,3,-2,0,0,8,3,-1,0,0,8,3,0,0,0,8,3,1,0,0,8,3,2,0,0,8,3,3,0,0,8,3,4,0,0,8,3,5,0,0,8,-9,-4,0,0,8,-9,-3,0,0,8,-9,-2,0,0,8,-9,-1,0,0,8,-9,0,0,0,8,-9,1,0,0,8,-8,-4,0,0,8,-8,-3,0,0,8,-8,-2,0,0,8,-8,-1,0,0,8,-8,0,0,0,8,-10,1,0,0,8,-10,0,0,0,8,-10,-1,0,0,8,-10,-2,0,0,8,-10,-3,0,0,8,-10,-4,0,0,8,-10,-5,0,0,8,-9,-5,0,0,8,-9,-6,0,0,8,-8,-6,0,0,8,-8,-5,0,0,8,-7,-2,0,0,8,-6,-2,0,0,8,-5,-2,0,0,8,-7,-1,0,0,8,-6,-1,0,0,8,-5,-1,0,0,8,-7,0,0,0,8,-6,0,0,0,8,-5,0,0,0,8,-10,-6,0,0,8,-4,-5,0,0,8,-3,-5,0,0,8,-2,-5,0,0,8,-1,-5,0,0,8,0,-5,0,0,8,1,-5,0,0,8,2,-5,0,0,8,3,-5,0,0,8,3,-6,0,0,8,2,-6,0,0,8,1,-6,0,0,8,0,-6,0,0,8,-1,-6,0,0,8,-2,-6,0,0,8,-3,-6,0,0,8,-4,-6,0,0,8,-2,4,0,0,8,-2,3,0,0,8,-2,5,0,0,8,-5,1,0,0,8,-5,2,0,0,8,-5,3,0,0,8,-5,4,0,0,8,-5,5,0,0,8,-6,1,0,0,8,-6,2,0,0,8,-6,3,0,0,8,-6,4,0,0,8,-6,5,0,0,8],"Middle":[-10,-7,0,2,7,-9,-7,0,2,7,-8,-7,0,2,7,-7,-3,0,1,7,-6,-3,0,2,7,-5,-3,0,3,7,-4,-7,0,2,7,-3,-7,0,2,7,-2,-7,0,2,7,-1,-7,0,2,7,0,-7,0,2,7,1,-7,0,2,7,2,-7,0,2,7,3,-7,0,2,7],"Top":[-11,-7,0,3,4,-11,-6,0,3,3,-11,-5,0,3,3,-11,-4,0,3,3,-11,-3,0,3,3,-11,-2,0,3,3,-11,-1,0,3,3,-11,0,0,3,3,-11,1,0,3,3,-11,2,0,11,2,-10,2,0,2,2,-9,2,0,2,2,-8,1,0,1,2,-8,2,0,13,2,-7,-7,0,1,4,-7,-6,0,1,3,-7,-5,0,1,3,-7,-4,0,1,3,-7,1,0,3,2,-7,2,0,3,3,-7,3,0,3,3,-7,4,0,3,3,-7,5,0,3,3,-7,6,0,11,2,-6,6,0,2,2,-5,-7,0,3,4,-5,-6,0,3,3,-5,-5,0,3,3,-5,-4,0,3,3,-5,6,0,2,2,-4,6,0,2,2,-3,6,0,2,2,-2,6,0,2,2,-1,3,0,1,2,-1,4,0,1,3,-1,5,0,1,3,-1,6,0,13,2,0,3,0,2,2,1,3,0,3,2,1,4,0,3,3,1,5,0,3,3,1,6,0,11,2,2,6,0,2,2,3,6,0,2,2,4,-7,0,1,4,4,-6,0,1,3,4,-5,0,1,3,4,-4,0,1,3,4,-3,0,1,3,4,-2,0,1,3,4,-1,0,1,3,4,0,0,1,3,4,1,0,1,3,4,2,0,1,3,4,3,0,1,3,4,4,0,1,3,4,5,0,1,3,4,6,0,13,2]} \ No newline at end of file +{"NavigationList":[{"Type":0,"Points":[-152,-88,-120,-88,-120,-24,-72,-24,-72,-40,-56,-40,-56,-88,56,-88,56,96,40,96,40,48,-8,48,-8,64,-24,64,-24,96,-152,96]}],"Floor":[-3,-4,0,0,8,-3,-3,0,0,8,-3,-2,0,0,8,-3,-1,0,0,8,-3,0,0,0,8,-3,1,0,0,8,-3,2,0,0,8,-3,3,0,0,8,-3,4,0,0,8,-3,5,0,0,8,-2,-2,0,0,8,-2,-4,0,0,8,-2,-3,0,0,8,-2,-1,0,0,8,-2,0,0,0,8,-2,1,0,0,8,-2,2,0,0,8,-1,-1,0,0,8,-1,-4,0,0,8,-1,-3,0,0,8,-1,-2,0,0,8,-1,0,0,0,8,-1,1,0,0,8,-1,2,0,0,8,0,0,0,0,8,0,-4,0,0,8,0,-3,0,0,8,0,-2,0,0,8,0,-1,0,0,8,0,1,0,0,8,0,2,0,0,8,1,1,0,0,8,1,-4,0,0,8,1,-3,0,0,8,1,-2,0,0,8,1,-1,0,0,8,1,0,0,0,8,1,2,0,0,8,2,1,0,0,8,2,-4,0,0,8,2,-3,0,0,8,2,-2,0,0,8,2,-1,0,0,8,2,0,0,0,8,2,2,0,0,8,2,3,0,0,8,2,4,0,0,8,2,5,0,0,8,-4,-4,0,0,8,-4,-3,0,0,8,-4,-2,0,0,8,-4,-1,0,0,8,-4,0,0,0,8,-4,1,0,0,8,-4,2,0,0,8,-4,3,0,0,8,-4,4,0,0,8,-4,5,0,0,8,3,-4,0,0,8,3,-3,0,0,8,3,-2,0,0,8,3,-1,0,0,8,3,0,0,0,8,3,1,0,0,8,3,2,0,0,8,3,3,0,0,8,3,4,0,0,8,3,5,0,0,8,-9,-4,0,0,8,-9,-3,0,0,8,-9,-2,0,0,8,-9,-1,0,0,8,-9,0,0,0,8,-9,1,0,0,8,-8,-4,0,0,8,-8,-3,0,0,8,-8,-2,0,0,8,-8,-1,0,0,8,-8,0,0,0,8,-10,1,0,0,8,-10,0,0,0,8,-10,-1,0,0,8,-10,-2,0,0,8,-10,-3,0,0,8,-10,-4,0,0,8,-10,-5,0,0,8,-9,-5,0,0,8,-9,-6,0,0,8,-8,-6,0,0,8,-8,-5,0,0,8,-7,-2,0,0,8,-6,-2,0,0,8,-5,-2,0,0,8,-7,-1,0,0,8,-6,-1,0,0,8,-5,-1,0,0,8,-7,0,0,0,8,-6,0,0,0,8,-5,0,0,0,8,-10,-6,0,0,8,-4,-5,0,0,8,-3,-5,0,0,8,-2,-5,0,0,8,-1,-5,0,0,8,0,-5,0,0,8,1,-5,0,0,8,2,-5,0,0,8,3,-5,0,0,8,3,-6,0,0,8,2,-6,0,0,8,1,-6,0,0,8,0,-6,0,0,8,-1,-6,0,0,8,-2,-6,0,0,8,-3,-6,0,0,8,-4,-6,0,0,8,-2,4,0,0,8,-2,3,0,0,8,-2,5,0,0,8,-5,1,0,0,8,-5,2,0,0,8,-5,3,0,0,8,-5,4,0,0,8,-5,5,0,0,8,-6,1,0,0,8,-6,2,0,0,8,-6,3,0,0,8,-6,4,0,0,8,-6,5,0,0,8,-8,1,0,0,8,-8,2,0,0,8,-7,2,0,0,8,-7,3,0,0,8,-7,1,0,0,8,-7,4,0,0,8,-7,5,0,0,8,-8,5,0,0,8,-9,5,0,0,8,-9,4,0,0,8,-10,2,0,0,8,-10,3,0,0,8,-10,4,0,0,8,-10,5,0,0,8,-8,4,0,0,8,-8,3,0,0,8,-9,3,0,0,8,-9,2,0,0,8,-1,3,0,0,8,-5,-3,0,0,8],"Middle":[-10,-7,0,2,7,-9,-7,0,2,7,-8,-7,0,2,7,-7,-3,0,1,7,-6,-3,0,3,7,-5,-4,0,3,7,-4,-7,0,2,7,-3,-7,0,2,7,-2,-7,0,2,7,-1,-7,0,2,7,0,-7,0,2,7,1,-7,0,2,7,2,-7,0,2,7,3,-7,0,2,7],"Top":[-11,-7,0,3,4,-11,-6,0,3,3,-11,-5,0,3,3,-11,-4,0,3,3,-11,-3,0,3,3,-11,-2,0,3,3,-11,-1,0,3,3,-11,0,0,3,3,-11,1,0,3,3,-11,2,0,3,3,-11,3,0,3,3,-11,4,0,3,3,-11,5,0,3,3,-11,6,0,11,2,-10,6,0,2,2,-9,6,0,2,2,-8,6,0,2,2,-7,-7,0,1,4,-7,-6,0,1,3,-7,-5,0,1,3,-7,-4,0,1,3,-7,6,0,2,2,-6,-4,0,3,4,-6,6,0,2,2,-5,-7,0,3,4,-5,-6,0,3,3,-5,-5,0,3,3,-5,6,0,2,2,-4,6,0,2,2,-3,6,0,2,2,-2,6,0,2,2,-1,4,0,1,2,-1,5,0,1,3,-1,6,0,13,2,0,3,0,1,2,0,4,0,13,2,1,3,0,3,2,1,4,0,3,3,1,5,0,3,3,1,6,0,11,2,2,6,0,2,2,3,6,0,2,2,4,-7,0,1,4,4,-6,0,1,3,4,-5,0,1,3,4,-4,0,1,3,4,-3,0,1,3,4,-2,0,1,3,4,-1,0,1,3,4,0,0,1,3,4,1,0,1,3,4,2,0,1,3,4,3,0,1,3,4,4,0,1,3,4,5,0,1,3,4,6,0,13,2]} \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0001.png b/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0001.png new file mode 100644 index 0000000..f15c822 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0001.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0001.png.import b/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0001.png.import new file mode 100644 index 0000000..7486e5b --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dwa4chrugc6b1" +path="res://.godot/imported/Collision0001.png-b3a9531219ad3848aa608212cbf871e9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/bullet/collision/Collision0001.png" +dest_files=["res://.godot/imported/Collision0001.png-b3a9531219ad3848aa608212cbf871e9.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0002.png b/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0002.png new file mode 100644 index 0000000..bd7564a --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0002.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0002.png.import b/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0002.png.import new file mode 100644 index 0000000..b6cbe7b --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/bullet/collision/Collision0002.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c6fw4bjkoeyxj" +path="res://.godot/imported/Collision0002.png-46f7f7e5a15512ebbac0e24f19ca4b5f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/bullet/collision/Collision0002.png" +dest_files=["res://.godot/imported/Collision0002.png-46f7f7e5a15512ebbac0e24f19ca4b5f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/common/Circle.png b/DungeonShooting_Godot/resource/sprite/common/Circle.png new file mode 100644 index 0000000..b441812 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Circle.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/common/Circle.png.import b/DungeonShooting_Godot/resource/sprite/common/Circle.png.import new file mode 100644 index 0000000..9929741 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Circle.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cgptnp74ive4r" +path="res://.godot/imported/Circle.png-f10b04321574b5b61f18782ad4666e8f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/common/Circle.png" +dest_files=["res://.godot/imported/Circle.png-f10b04321574b5b61f18782ad4666e8f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/common/Circle2.png b/DungeonShooting_Godot/resource/sprite/common/Circle2.png new file mode 100644 index 0000000..c27b68f --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Circle2.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/common/Circle2.png.import b/DungeonShooting_Godot/resource/sprite/common/Circle2.png.import new file mode 100644 index 0000000..c29b719 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Circle2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://hsevliqnq82n" +path="res://.godot/imported/Circle2.png-5d9ae3b57dcec8e8d491690a3375e573.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/common/Circle2.png" +dest_files=["res://.godot/imported/Circle2.png-5d9ae3b57dcec8e8d491690a3375e573.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/common/Effect1.png b/DungeonShooting_Godot/resource/sprite/common/Effect1.png new file mode 100644 index 0000000..51ef9a9 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Effect1.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/common/Effect1.png.import b/DungeonShooting_Godot/resource/sprite/common/Effect1.png.import new file mode 100644 index 0000000..cac194e --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Effect1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csud4e6kc3iku" +path="res://.godot/imported/Effect1.png-5593fe280744b1b0454af7db53a1e7f2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/common/Effect1.png" +dest_files=["res://.godot/imported/Effect1.png-5593fe280744b1b0454af7db53a1e7f2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/common/MeleeAttack1.png b/DungeonShooting_Godot/resource/sprite/common/MeleeAttack1.png new file mode 100644 index 0000000..aaa2799 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/MeleeAttack1.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/common/MeleeAttack1.png.import b/DungeonShooting_Godot/resource/sprite/common/MeleeAttack1.png.import new file mode 100644 index 0000000..a61597c --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/MeleeAttack1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://7jhe2mmctmr1" +path="res://.godot/imported/MeleeAttack1.png-8ffb69b4c92f5e98ed14834a32b5312e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/common/MeleeAttack1.png" +dest_files=["res://.godot/imported/MeleeAttack1.png-8ffb69b4c92f5e98ed14834a32b5312e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/common/Smoke.png b/DungeonShooting_Godot/resource/sprite/common/Smoke.png new file mode 100644 index 0000000..f358c57 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Smoke.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/common/Smoke.png.import b/DungeonShooting_Godot/resource/sprite/common/Smoke.png.import new file mode 100644 index 0000000..68e5d35 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Smoke.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://h7hkgbwj1li" +path="res://.godot/imported/Smoke.png-6be33f9e163b005a6c8b78ac10d1eda3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/common/Smoke.png" +dest_files=["res://.godot/imported/Smoke.png-6be33f9e163b005a6c8b78ac10d1eda3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/common/Smoke2.png b/DungeonShooting_Godot/resource/sprite/common/Smoke2.png new file mode 100644 index 0000000..af4aa83 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Smoke2.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/common/Smoke2.png.import b/DungeonShooting_Godot/resource/sprite/common/Smoke2.png.import new file mode 100644 index 0000000..b76138f --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Smoke2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://rk73piti0qot" +path="res://.godot/imported/Smoke2.png-53fc0d00a99e950add50888572b483ae.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/common/Smoke2.png" +dest_files=["res://.godot/imported/Smoke2.png-53fc0d00a99e950add50888572b483ae.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/common/Smoke3.png b/DungeonShooting_Godot/resource/sprite/common/Smoke3.png new file mode 100644 index 0000000..bbb2085 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Smoke3.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/common/Smoke3.png.import b/DungeonShooting_Godot/resource/sprite/common/Smoke3.png.import new file mode 100644 index 0000000..50fb4e9 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Smoke3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b07cxsgvpwlct" +path="res://.godot/imported/Smoke3.png-72a784fe79d416759eafa491453d043a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/common/Smoke3.png" +dest_files=["res://.godot/imported/Smoke3.png-72a784fe79d416759eafa491453d043a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/common/Smoke4.png b/DungeonShooting_Godot/resource/sprite/common/Smoke4.png new file mode 100644 index 0000000..89ff217 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Smoke4.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/common/Smoke4.png.import b/DungeonShooting_Godot/resource/sprite/common/Smoke4.png.import new file mode 100644 index 0000000..388cf2e --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/Smoke4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://du0f3km5jhxlg" +path="res://.godot/imported/Smoke4.png-b921bc0b8f3badacae30b598d888a3be.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/common/Smoke4.png" +dest_files=["res://.godot/imported/Smoke4.png-b921bc0b8f3badacae30b598d888a3be.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/common/debug_arrows.png b/DungeonShooting_Godot/resource/sprite/common/debug_arrows.png new file mode 100644 index 0000000..a92ff48 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/debug_arrows.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/common/debug_arrows.png.import b/DungeonShooting_Godot/resource/sprite/common/debug_arrows.png.import new file mode 100644 index 0000000..a33432f --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/common/debug_arrows.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bv0i11jk5te5u" +path="res://.godot/imported/debug_arrows.png-0130be43e2f8d11ebe79f2a44e759aa7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/common/debug_arrows.png" +dest_files=["res://.godot/imported/debug_arrows.png-0130be43e2f8d11ebe79f2a44e759aa7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/Circle.png b/DungeonShooting_Godot/resource/sprite/effects/Circle.png deleted file mode 100644 index b441812..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/Circle.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/Circle.png.import b/DungeonShooting_Godot/resource/sprite/effects/Circle.png.import deleted file mode 100644 index 7b5d4f7..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/Circle.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cgptnp74ive4r" -path="res://.godot/imported/Circle.png-a2c1c1644069aac7590ae57b452f8682.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/Circle.png" -dest_files=["res://.godot/imported/Circle.png-a2c1c1644069aac7590ae57b452f8682.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/Circle2.png b/DungeonShooting_Godot/resource/sprite/effects/Circle2.png deleted file mode 100644 index c27b68f..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/Circle2.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/Circle2.png.import b/DungeonShooting_Godot/resource/sprite/effects/Circle2.png.import deleted file mode 100644 index dfcc3c1..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/Circle2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://hsevliqnq82n" -path="res://.godot/imported/Circle2.png-ef3a2d65cdf8bc187c245a202bc736dd.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/Circle2.png" -dest_files=["res://.godot/imported/Circle2.png-ef3a2d65cdf8bc187c245a202bc736dd.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png b/DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png deleted file mode 100644 index 51ef9a9..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png.import b/DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png.import deleted file mode 100644 index ded10aa..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://csud4e6kc3iku" -path="res://.godot/imported/Effect1.png-b381c54ce9f36be8da8d9d5787e0d539.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/common/Effect1.png" -dest_files=["res://.godot/imported/Effect1.png-b381c54ce9f36be8da8d9d5787e0d539.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png b/DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png deleted file mode 100644 index f358c57..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png.import b/DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png.import deleted file mode 100644 index d7f7f6e..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://h7hkgbwj1li" -path="res://.godot/imported/Smoke.png-c890fc56df0c1a3ef083465f2627ab8b.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/common/Smoke.png" -dest_files=["res://.godot/imported/Smoke.png-c890fc56df0c1a3ef083465f2627ab8b.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke2.png b/DungeonShooting_Godot/resource/sprite/effects/common/Smoke2.png deleted file mode 100644 index af4aa83..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke2.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke2.png.import b/DungeonShooting_Godot/resource/sprite/effects/common/Smoke2.png.import deleted file mode 100644 index f9e9f57..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://rk73piti0qot" -path="res://.godot/imported/Smoke2.png-bfcd0e73871f709da66c76e16b1ccd07.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/common/Smoke2.png" -dest_files=["res://.godot/imported/Smoke2.png-bfcd0e73871f709da66c76e16b1ccd07.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke3.png b/DungeonShooting_Godot/resource/sprite/effects/common/Smoke3.png deleted file mode 100644 index bbb2085..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke3.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke3.png.import b/DungeonShooting_Godot/resource/sprite/effects/common/Smoke3.png.import deleted file mode 100644 index bd57c62..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b07cxsgvpwlct" -path="res://.godot/imported/Smoke3.png-3eaca71646686237d637b81d23e98c2c.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/common/Smoke3.png" -dest_files=["res://.godot/imported/Smoke3.png-3eaca71646686237d637b81d23e98c2c.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke4.png b/DungeonShooting_Godot/resource/sprite/effects/common/Smoke4.png deleted file mode 100644 index 89ff217..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke4.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke4.png.import b/DungeonShooting_Godot/resource/sprite/effects/common/Smoke4.png.import deleted file mode 100644 index 87dc2b0..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/common/Smoke4.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://du0f3km5jhxlg" -path="res://.godot/imported/Smoke4.png-45397cb49e84552c3d72ce5cedf341a4.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/common/Smoke4.png" -dest_files=["res://.godot/imported/Smoke4.png-45397cb49e84552c3d72ce5cedf341a4.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/debug_arrows.png b/DungeonShooting_Godot/resource/sprite/effects/debug_arrows.png deleted file mode 100644 index a92ff48..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/debug_arrows.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/debug_arrows.png.import b/DungeonShooting_Godot/resource/sprite/effects/debug_arrows.png.import deleted file mode 100644 index 0a070ab..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/debug_arrows.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bv0i11jk5te5u" -path="res://.godot/imported/debug_arrows.png-8070fefa9c5a4f250534aaddd14d315c.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/debug_arrows.png" -dest_files=["res://.godot/imported/debug_arrows.png-8070fefa9c5a4f250534aaddd14d315c.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0001.png b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0001.png deleted file mode 100644 index c20e52e..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0001.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0001.png.import b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0001.png.import deleted file mode 100644 index d32a45b..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0001.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ccdflg560oub6" -path="res://.godot/imported/Explode_circle0001.png-226d2b77cea80f656d4eb2869ee47062.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/explode/Explode_circle0001.png" -dest_files=["res://.godot/imported/Explode_circle0001.png-226d2b77cea80f656d4eb2869ee47062.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0002.png b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0002.png deleted file mode 100644 index b0fc911..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0002.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0002.png.import b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0002.png.import deleted file mode 100644 index af06c61..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0002.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cusp3s5t7qbuy" -path="res://.godot/imported/Explode_circle0002.png-8da697809ace63ffc638e19ab8be73b1.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/explode/Explode_circle0002.png" -dest_files=["res://.godot/imported/Explode_circle0002.png-8da697809ace63ffc638e19ab8be73b1.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0003.png b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0003.png deleted file mode 100644 index dab1f49..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0003.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0003.png.import b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0003.png.import deleted file mode 100644 index 92e039c..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_circle0003.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://4be6mi1egtiy" -path="res://.godot/imported/Explode_circle0003.png-f9ed8329fdef67dd1a7d2fe4a1d26e36.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/explode/Explode_circle0003.png" -dest_files=["res://.godot/imported/Explode_circle0003.png-f9ed8329fdef67dd1a7d2fe4a1d26e36.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_line0001.png b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_line0001.png deleted file mode 100644 index b631b3f..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_line0001.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_line0001.png.import b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_line0001.png.import deleted file mode 100644 index 0f10321..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_line0001.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cquv6nomd3tpf" -path="res://.godot/imported/Explode_line0001.png-449ac783735384f2465771c25c401693.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/explode/Explode_line0001.png" -dest_files=["res://.godot/imported/Explode_line0001.png-449ac783735384f2465771c25c401693.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_pit0001.png b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_pit0001.png deleted file mode 100644 index 281d9ea..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_pit0001.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_pit0001.png.import b/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_pit0001.png.import deleted file mode 100644 index 2536123..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/explode/Explode_pit0001.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://6p1iq7sgw8lt" -path="res://.godot/imported/Explode_pit0001.png-e0ae86a6c1b6531083be57c318c78f11.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/explode/Explode_pit0001.png" -dest_files=["res://.godot/imported/Explode_pit0001.png-e0ae86a6c1b6531083be57c318c78f11.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png b/DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png deleted file mode 100644 index f15c822..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png.import b/DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png.import deleted file mode 100644 index 1737a56..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dwa4chrugc6b1" -path="res://.godot/imported/Collision1.png-21b57f1716aaa61033dc15fa90c3af13.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/weapon/Collision1.png" -dest_files=["res://.godot/imported/Collision1.png-21b57f1716aaa61033dc15fa90c3af13.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png b/DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png deleted file mode 100644 index 83465d0..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png.import b/DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png.import deleted file mode 100644 index 890932d..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dx07ta0asnmuw" -path="res://.godot/imported/KnifeHit1.png-2f433b2240ee3b74ce7f49e4905f3ded.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/weapon/KnifeHit1.png" -dest_files=["res://.godot/imported/KnifeHit1.png-2f433b2240ee3b74ce7f49e4905f3ded.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png b/DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png deleted file mode 100644 index aaa2799..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png.import b/DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png.import deleted file mode 100644 index 1faa5b9..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://7jhe2mmctmr1" -path="res://.godot/imported/MeleeAttack1.png-fcea1547355ce99fe204cf5180b8c02d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/weapon/MeleeAttack1.png" -dest_files=["res://.godot/imported/MeleeAttack1.png-fcea1547355ce99fe204cf5180b8c02d.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png b/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png deleted file mode 100644 index 5c6d63a..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png.import b/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png.import deleted file mode 100644 index 66623d6..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b0jsyrbk4bydt" -path="res://.godot/imported/ShotFire.png-c837a3bb80e273a615c459f36fadc870.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/weapon/ShotFire.png" -dest_files=["res://.godot/imported/ShotFire.png-c837a3bb80e273a615c459f36fadc870.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire2.png b/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire2.png deleted file mode 100644 index 2a6b618..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire2.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire2.png.import b/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire2.png.import deleted file mode 100644 index 109241d..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cj8gb5dxnk8ov" -path="res://.godot/imported/ShotFire2.png-859bcfe4ad8b11b7eb348b8c54ee9e64.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/weapon/ShotFire2.png" -dest_files=["res://.godot/imported/ShotFire2.png-859bcfe4ad8b11b7eb348b8c54ee9e64.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0001.png b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0001.png new file mode 100644 index 0000000..c20e52e --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0001.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0001.png.import b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0001.png.import new file mode 100644 index 0000000..efa0875 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ccdflg560oub6" +path="res://.godot/imported/Explode_circle0001.png-64a4b88d5f395e1a72e3c084f32a6fe3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/explode/Explode_circle0001.png" +dest_files=["res://.godot/imported/Explode_circle0001.png-64a4b88d5f395e1a72e3c084f32a6fe3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0002.png b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0002.png new file mode 100644 index 0000000..b0fc911 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0002.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0002.png.import b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0002.png.import new file mode 100644 index 0000000..6f3e9dd --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0002.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cusp3s5t7qbuy" +path="res://.godot/imported/Explode_circle0002.png-b571428f3da033f1870876090f852b5e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/explode/Explode_circle0002.png" +dest_files=["res://.godot/imported/Explode_circle0002.png-b571428f3da033f1870876090f852b5e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0003.png b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0003.png new file mode 100644 index 0000000..dab1f49 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0003.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0003.png.import b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0003.png.import new file mode 100644 index 0000000..2363c21 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_circle0003.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://4be6mi1egtiy" +path="res://.godot/imported/Explode_circle0003.png-4321be8a4dc1201188548c1bf9ff88ee.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/explode/Explode_circle0003.png" +dest_files=["res://.godot/imported/Explode_circle0003.png-4321be8a4dc1201188548c1bf9ff88ee.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_line0001.png b/DungeonShooting_Godot/resource/sprite/explode/Explode_line0001.png new file mode 100644 index 0000000..b631b3f --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_line0001.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_line0001.png.import b/DungeonShooting_Godot/resource/sprite/explode/Explode_line0001.png.import new file mode 100644 index 0000000..17930b9 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_line0001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cquv6nomd3tpf" +path="res://.godot/imported/Explode_line0001.png-b37b4313423d54274710c5ed3d33789c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/explode/Explode_line0001.png" +dest_files=["res://.godot/imported/Explode_line0001.png-b37b4313423d54274710c5ed3d33789c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_pit0001.png b/DungeonShooting_Godot/resource/sprite/explode/Explode_pit0001.png new file mode 100644 index 0000000..281d9ea --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_pit0001.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/explode/Explode_pit0001.png.import b/DungeonShooting_Godot/resource/sprite/explode/Explode_pit0001.png.import new file mode 100644 index 0000000..f1551ac --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/explode/Explode_pit0001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://6p1iq7sgw8lt" +path="res://.godot/imported/Explode_pit0001.png-8fb768a27d312022da8befb9c8eb0639.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/explode/Explode_pit0001.png" +dest_files=["res://.godot/imported/Explode_pit0001.png-8fb768a27d312022da8befb9c8eb0639.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/role/enemy0002/Enemy0002_attack.png b/DungeonShooting_Godot/resource/sprite/role/enemy0002/Enemy0002_attack.png index 30c95c6..ed11edd 100644 --- a/DungeonShooting_Godot/resource/sprite/role/enemy0002/Enemy0002_attack.png +++ b/DungeonShooting_Godot/resource/sprite/role/enemy0002/Enemy0002_attack.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0001.png b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0001.png new file mode 100644 index 0000000..5c6d63a --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0001.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0001.png.import b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0001.png.import new file mode 100644 index 0000000..292d487 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b0jsyrbk4bydt" +path="res://.godot/imported/ShotFire0001.png-9969783210ca604614cbdd429dd7b849.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/shootFire/ShotFire0001.png" +dest_files=["res://.godot/imported/ShotFire0001.png-9969783210ca604614cbdd429dd7b849.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0002.png b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0002.png new file mode 100644 index 0000000..2a6b618 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0002.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0002.png.import b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0002.png.import new file mode 100644 index 0000000..99ecd51 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0002.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cj8gb5dxnk8ov" +path="res://.godot/imported/ShotFire0002.png-12459bc84060a207f5869b418ecc3c71.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/shootFire/ShotFire0002.png" +dest_files=["res://.godot/imported/ShotFire0002.png-12459bc84060a207f5869b418ecc3c71.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/weapon/knife1.png b/DungeonShooting_Godot/resource/sprite/weapon/knife1.png deleted file mode 100644 index cf38cf3..0000000 --- a/DungeonShooting_Godot/resource/sprite/weapon/knife1.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/knife1.png.import b/DungeonShooting_Godot/resource/sprite/weapon/knife1.png.import deleted file mode 100644 index e13d626..0000000 --- a/DungeonShooting_Godot/resource/sprite/weapon/knife1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bxhbsq0wb2yo1" -path="res://.godot/imported/knife1.png-7a8e87bb9fc40c8adf95391721186a58.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/weapon/knife1.png" -dest_files=["res://.godot/imported/knife1.png-7a8e87bb9fc40c8adf95391721186a58.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -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=1 diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/KnifeHit1.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/KnifeHit1.png new file mode 100644 index 0000000..83465d0 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/KnifeHit1.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/KnifeHit1.png.import b/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/KnifeHit1.png.import new file mode 100644 index 0000000..892f5c9 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/KnifeHit1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dx07ta0asnmuw" +path="res://.godot/imported/KnifeHit1.png-80077e3967f264ba53464cfdd643f301.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/weapon/weapon0004/KnifeHit1.png" +dest_files=["res://.godot/imported/KnifeHit1.png-80077e3967f264ba53464cfdd643f301.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/Weapon0004.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/Weapon0004.png new file mode 100644 index 0000000..cf38cf3 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/Weapon0004.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/Weapon0004.png.import b/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/Weapon0004.png.import new file mode 100644 index 0000000..13ac9e3 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0004/Weapon0004.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bxhbsq0wb2yo1" +path="res://.godot/imported/Weapon0004.png-6163b5909ac0076acb9640932b1b3e9e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/weapon/weapon0004/Weapon0004.png" +dest_files=["res://.godot/imported/Weapon0004.png-6163b5909ac0076acb9640932b1b3e9e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +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=1 diff --git a/DungeonShooting_Godot/resource/spriteFrames/bullet/Collision0001.tres b/DungeonShooting_Godot/resource/spriteFrames/bullet/Collision0001.tres new file mode 100644 index 0000000..5ac693b --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/bullet/Collision0001.tres @@ -0,0 +1,42 @@ +[gd_resource type="SpriteFrames" load_steps=6 format=3 uid="uid://pwg2tx7dmcvp"] + +[ext_resource type="Texture2D" uid="uid://dwa4chrugc6b1" path="res://resource/sprite/bullet/collision/Collision0001.png" id="1_fwdya"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_howuv"] +atlas = ExtResource("1_fwdya") +region = Rect2(0, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4qx75"] +atlas = ExtResource("1_fwdya") +region = Rect2(16, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_n6ula"] +atlas = ExtResource("1_fwdya") +region = Rect2(32, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_5lumy"] +atlas = ExtResource("1_fwdya") +region = Rect2(48, 0, 16, 16) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_howuv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4qx75") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_n6ula") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_5lumy") +}, { +"duration": 1.0, +"texture": null +}], +"loop": false, +"name": &"default", +"speed": 25.0 +}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/bullet/Collision0002.tres b/DungeonShooting_Godot/resource/spriteFrames/bullet/Collision0002.tres new file mode 100644 index 0000000..1da3ced --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/bullet/Collision0002.tres @@ -0,0 +1,42 @@ +[gd_resource type="SpriteFrames" load_steps=6 format=3 uid="uid://dkqd4513sog3f"] + +[ext_resource type="Texture2D" uid="uid://c6fw4bjkoeyxj" path="res://resource/sprite/bullet/collision/Collision0002.png" id="1_t062x"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_s52rj"] +atlas = ExtResource("1_t062x") +region = Rect2(0, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1edgh"] +atlas = ExtResource("1_t062x") +region = Rect2(16, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7sxvt"] +atlas = ExtResource("1_t062x") +region = Rect2(32, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_eske5"] +atlas = ExtResource("1_t062x") +region = Rect2(48, 0, 16, 16) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_s52rj") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1edgh") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_7sxvt") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_eske5") +}, { +"duration": 1.0, +"texture": null +}], +"loop": false, +"name": &"default", +"speed": 25.0 +}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/effect/KnifeHit1.tres b/DungeonShooting_Godot/resource/spriteFrames/effect/KnifeHit1.tres deleted file mode 100644 index 69b6d5a..0000000 --- a/DungeonShooting_Godot/resource/spriteFrames/effect/KnifeHit1.tres +++ /dev/null @@ -1,53 +0,0 @@ -[gd_resource type="SpriteFrames" load_steps=8 format=3 uid="uid://dj8o7ws03bik4"] - -[ext_resource type="Texture2D" uid="uid://dx07ta0asnmuw" path="res://resource/sprite/effects/weapon/KnifeHit1.png" id="1_0yl3h"] - -[sub_resource type="AtlasTexture" id="1"] -atlas = ExtResource("1_0yl3h") -region = Rect2(0, 0, 64, 68) - -[sub_resource type="AtlasTexture" id="2"] -atlas = ExtResource("1_0yl3h") -region = Rect2(64, 0, 64, 68) - -[sub_resource type="AtlasTexture" id="3"] -atlas = ExtResource("1_0yl3h") -region = Rect2(128, 0, 64, 68) - -[sub_resource type="AtlasTexture" id="4"] -atlas = ExtResource("1_0yl3h") -region = Rect2(192, 0, 64, 68) - -[sub_resource type="AtlasTexture" id="5"] -atlas = ExtResource("1_0yl3h") -region = Rect2(256, 0, 64, 68) - -[sub_resource type="AtlasTexture" id="6"] -atlas = ExtResource("1_0yl3h") -region = Rect2(320, 0, 64, 68) - -[resource] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("1") -}, { -"duration": 1.0, -"texture": SubResource("2") -}, { -"duration": 1.0, -"texture": SubResource("3") -}, { -"duration": 1.0, -"texture": SubResource("4") -}, { -"duration": 1.0, -"texture": SubResource("5") -}, { -"duration": 1.0, -"texture": SubResource("6") -}], -"loop": false, -"name": &"default", -"speed": 30.0 -}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/effect/weapon/Collision1.tres b/DungeonShooting_Godot/resource/spriteFrames/effect/weapon/Collision1.tres deleted file mode 100644 index f0b7085..0000000 --- a/DungeonShooting_Godot/resource/spriteFrames/effect/weapon/Collision1.tres +++ /dev/null @@ -1,42 +0,0 @@ -[gd_resource type="SpriteFrames" load_steps=6 format=3 uid="uid://pwg2tx7dmcvp"] - -[ext_resource type="Texture2D" uid="uid://dwa4chrugc6b1" path="res://resource/sprite/effects/weapon/Collision1.png" id="1_fwdya"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_howuv"] -atlas = ExtResource("1_fwdya") -region = Rect2(0, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_4qx75"] -atlas = ExtResource("1_fwdya") -region = Rect2(16, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_n6ula"] -atlas = ExtResource("1_fwdya") -region = Rect2(32, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_5lumy"] -atlas = ExtResource("1_fwdya") -region = Rect2(48, 0, 16, 16) - -[resource] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_howuv") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_4qx75") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_n6ula") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_5lumy") -}, { -"duration": 1.0, -"texture": null -}], -"loop": false, -"name": &"default", -"speed": 25.0 -}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/role/Enemy0002.tres b/DungeonShooting_Godot/resource/spriteFrames/role/Enemy0002.tres index 76aae0b..0f99c41 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/role/Enemy0002.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/role/Enemy0002.tres @@ -1,42 +1,62 @@ -[gd_resource type="SpriteFrames" load_steps=28 format=3 uid="uid://ctpkpxgcwb583"] +[gd_resource type="SpriteFrames" load_steps=33 format=3 uid="uid://ctpkpxgcwb583"] [ext_resource type="Texture2D" uid="uid://ba6ke6xp63lnv" path="res://resource/sprite/role/enemy0002/Enemy0002.png" id="1_bvqwm"] [ext_resource type="Texture2D" uid="uid://byvhnaggvvfex" path="res://resource/sprite/role/enemy0002/Enemy0002_attack.png" id="1_ery1t"] [ext_resource type="Texture2D" uid="uid://bwafpoxpkx3lu" path="res://resource/sprite/role/enemy0002/Enemy0002_idle.png" id="2_755ta"] [ext_resource type="Texture2D" uid="uid://dibftt2rj5omq" path="res://resource/sprite/role/enemy0002/Enemy0002_run.png" id="3_xwtnk"] -[sub_resource type="AtlasTexture" id="AtlasTexture_dndp7"] +[sub_resource type="AtlasTexture" id="AtlasTexture_d1dtv"] atlas = ExtResource("1_ery1t") region = Rect2(0, 0, 32, 32) -[sub_resource type="AtlasTexture" id="AtlasTexture_vs2pd"] +[sub_resource type="AtlasTexture" id="AtlasTexture_26knc"] atlas = ExtResource("1_ery1t") region = Rect2(32, 0, 32, 32) -[sub_resource type="AtlasTexture" id="AtlasTexture_0k6qn"] +[sub_resource type="AtlasTexture" id="AtlasTexture_t5gqm"] atlas = ExtResource("1_ery1t") region = Rect2(64, 0, 32, 32) -[sub_resource type="AtlasTexture" id="AtlasTexture_h5xlr"] +[sub_resource type="AtlasTexture" id="AtlasTexture_5png4"] atlas = ExtResource("1_ery1t") region = Rect2(96, 0, 32, 32) -[sub_resource type="AtlasTexture" id="AtlasTexture_djcbg"] +[sub_resource type="AtlasTexture" id="AtlasTexture_cfnm3"] atlas = ExtResource("1_ery1t") region = Rect2(128, 0, 32, 32) -[sub_resource type="AtlasTexture" id="AtlasTexture_10of8"] +[sub_resource type="AtlasTexture" id="AtlasTexture_leh3j"] atlas = ExtResource("1_ery1t") region = Rect2(160, 0, 32, 32) -[sub_resource type="AtlasTexture" id="AtlasTexture_5cxnc"] +[sub_resource type="AtlasTexture" id="AtlasTexture_631w6"] atlas = ExtResource("1_ery1t") region = Rect2(192, 0, 32, 32) -[sub_resource type="AtlasTexture" id="AtlasTexture_3f3fu"] +[sub_resource type="AtlasTexture" id="AtlasTexture_3o2tl"] atlas = ExtResource("1_ery1t") region = Rect2(224, 0, 32, 32) +[sub_resource type="AtlasTexture" id="AtlasTexture_3l40f"] +atlas = ExtResource("1_ery1t") +region = Rect2(256, 0, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jh6hg"] +atlas = ExtResource("1_ery1t") +region = Rect2(288, 0, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_b085l"] +atlas = ExtResource("1_ery1t") +region = Rect2(320, 0, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ch6qh"] +atlas = ExtResource("1_ery1t") +region = Rect2(352, 0, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_54fxr"] +atlas = ExtResource("1_ery1t") +region = Rect2(384, 0, 32, 32) + [sub_resource type="AtlasTexture" id="AtlasTexture_pbkbq"] atlas = ExtResource("2_755ta") region = Rect2(32, 0, 32, 32) @@ -101,28 +121,43 @@ animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_dndp7") +"texture": SubResource("AtlasTexture_d1dtv") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_vs2pd") +"texture": SubResource("AtlasTexture_26knc") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_0k6qn") +"texture": SubResource("AtlasTexture_t5gqm") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_h5xlr") +"texture": SubResource("AtlasTexture_5png4") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_djcbg") +"texture": SubResource("AtlasTexture_cfnm3") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_10of8") +"texture": SubResource("AtlasTexture_leh3j") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_5cxnc") +"texture": SubResource("AtlasTexture_631w6") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_3f3fu") +"texture": SubResource("AtlasTexture_3o2tl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_3l40f") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_jh6hg") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_b085l") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ch6qh") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_54fxr") }], "loop": false, "name": &"attack", diff --git a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004.tres b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004.tres index 57dbe94..28f90c2 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004.tres @@ -1,6 +1,7 @@ [gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://k2tktysa7j86"] -[ext_resource type="Texture2D" uid="uid://bxhbsq0wb2yo1" path="res://resource/sprite/weapon/knife1.png" id="1_jb24v"] +[ext_resource type="Texture2D" uid="uid://bxhbsq0wb2yo1" path="res://resource/sprite/weapon/weapon0004/Weapon0004.png" id="1_jb24v"] + [resource] animations = [{ diff --git a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004_hit.tres b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004_hit.tres new file mode 100644 index 0000000..878be23 --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004_hit.tres @@ -0,0 +1,53 @@ +[gd_resource type="SpriteFrames" load_steps=8 format=3 uid="uid://dj8o7ws03bik4"] + +[ext_resource type="Texture2D" uid="uid://dx07ta0asnmuw" path="res://resource/sprite/weapon/weapon0004/KnifeHit1.png" id="1_0yl3h"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("1_0yl3h") +region = Rect2(0, 0, 64, 68) + +[sub_resource type="AtlasTexture" id="2"] +atlas = ExtResource("1_0yl3h") +region = Rect2(64, 0, 64, 68) + +[sub_resource type="AtlasTexture" id="3"] +atlas = ExtResource("1_0yl3h") +region = Rect2(128, 0, 64, 68) + +[sub_resource type="AtlasTexture" id="4"] +atlas = ExtResource("1_0yl3h") +region = Rect2(192, 0, 64, 68) + +[sub_resource type="AtlasTexture" id="5"] +atlas = ExtResource("1_0yl3h") +region = Rect2(256, 0, 64, 68) + +[sub_resource type="AtlasTexture" id="6"] +atlas = ExtResource("1_0yl3h") +region = Rect2(320, 0, 64, 68) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("1") +}, { +"duration": 1.0, +"texture": SubResource("2") +}, { +"duration": 1.0, +"texture": SubResource("3") +}, { +"duration": 1.0, +"texture": SubResource("4") +}, { +"duration": 1.0, +"texture": SubResource("5") +}, { +"duration": 1.0, +"texture": SubResource("6") +}], +"loop": false, +"name": &"default", +"speed": 30.0 +}] diff --git a/DungeonShooting_Godot/scene/test/TestRoomFog.tscn b/DungeonShooting_Godot/scene/test/TestRoomFog.tscn index 87a0c1e..84daec1 100644 --- a/DungeonShooting_Godot/scene/test/TestRoomFog.tscn +++ b/DungeonShooting_Godot/scene/test/TestRoomFog.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=3 format=3 uid="uid://bgbjg8virrams"] -[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/common/Smoke.png" id="1_bty2r"] +[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="1_bty2r"] [ext_resource type="Texture2D" uid="uid://uhhfgdhpk7i4" path="res://icon.png" id="1_d62vx"] + [node name="TestRoomFog" type="Node2D"] [node name="PointLight2D" type="PointLight2D" parent="."] diff --git a/DungeonShooting_Godot/src/game/activity/bullet/normal/BoomBullet.cs b/DungeonShooting_Godot/src/game/activity/bullet/normal/BoomBullet.cs index e4ea58d..fa7e3b6 100644 --- a/DungeonShooting_Godot/src/game/activity/bullet/normal/BoomBullet.cs +++ b/DungeonShooting_Godot/src/game/activity/bullet/normal/BoomBullet.cs @@ -60,7 +60,7 @@ explode.RunPlay(BulletData.TriggerRole); if (AffiliationArea != null) { - var texture = ResourceManager.LoadTexture2D(ResourcePath.resource_sprite_effects_explode_Explode_pit0001_png); + var texture = ResourceManager.LoadTexture2D(ResourcePath.resource_sprite_explode_Explode_pit0001_png); var tempPos = AffiliationArea.RoomInfo.ToCanvasPosition(pos); AffiliationArea.RoomInfo.StaticImageCanvas.DrawImageInCanvas( texture, null, tempPos.X, tempPos.Y, Utils.Random.RandomRangeInt(0, 360), diff --git a/DungeonShooting_Godot/src/game/activity/bullet/normal/BrushBullet.cs b/DungeonShooting_Godot/src/game/activity/bullet/normal/BrushBullet.cs index 403bdd5..c685601 100644 --- a/DungeonShooting_Godot/src/game/activity/bullet/normal/BrushBullet.cs +++ b/DungeonShooting_Godot/src/game/activity/bullet/normal/BrushBullet.cs @@ -31,7 +31,7 @@ { base.Process(delta); //测试笔刷 - if ((EffectiveAltitude < 0 || Altitude <= EffectiveAltitude)) + if (EffectiveAltitude < 0 || Altitude <= EffectiveAltitude) { DrawLiquid(_brushData); } @@ -46,6 +46,13 @@ PlayDisappearEffect(ResourcePath.prefab_effect_bullet_BulletDisappear0002_tscn); } + public override void OnPlayCollisionEffect(KinematicCollision2D collision) + { + //测试笔刷 + DrawLiquid(_brushData); + PlayCollisionEffect(collision, ResourcePath.prefab_effect_bullet_BulletSmoke0002_tscn); + } + public override void OnLeavePool() { base.OnLeavePool(); diff --git a/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs b/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs index 4d5bf69..e7e0dc0 100644 --- a/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs +++ b/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs @@ -130,13 +130,7 @@ if (CurrentBounce > BulletData.BounceCount) //反弹次数超过限制 { //创建粒子特效 - var effect = ObjectManager.GetPoolItem(ResourcePath.prefab_effect_bullet_BulletSmoke0001_tscn); - var smoke = (Node2D)effect; - var rotated = AnimatedSprite.Position.Rotated(Rotation); - smoke.GlobalPosition = collision.GetPosition() + new Vector2(0, rotated.Y); - smoke.GlobalRotation = collision.GetNormal().Angle(); - smoke.AddToActivityRoot(RoomLayerEnum.YSortLayer); - effect.PlayEffect(); + OnPlayCollisionEffect(collision); DoReclaim(); } } @@ -224,6 +218,14 @@ } /// + /// 播放撞墙特效 + /// + public virtual void OnPlayCollisionEffect(KinematicCollision2D collision) + { + PlayCollisionEffect(collision, ResourcePath.prefab_effect_bullet_BulletSmoke0001_tscn); + } + + /// /// 播放子弹消失特效 /// public void PlayDisappearEffect(string path) @@ -235,6 +237,21 @@ effect.PlayEffect(); } + + /// + /// 播放子弹消失特效 + /// + public void PlayCollisionEffect(KinematicCollision2D collision, string path) + { + var effect = ObjectManager.GetPoolItem(path); + var smoke = (Node2D)effect; + var rotated = AnimatedSprite.Position.Rotated(Rotation); + smoke.GlobalPosition = collision.GetPosition() + new Vector2(0, rotated.Y); + smoke.GlobalRotation = collision.GetNormal().Angle(); + smoke.AddToActivityRoot(RoomLayerEnum.YSortLayer); + effect.PlayEffect(); + } + protected override void Process(float delta) { if (ActivityMaterial.DynamicCollision) @@ -267,6 +284,7 @@ public virtual void OnReclaim() { + Visible = false; if (Particles2D != null) { foreach (var particles2D in Particles2D) @@ -288,6 +306,7 @@ public virtual void OnLeavePool() { + Visible = true; MoveController.ClearForce(); StopAllCoroutine(); if (OnLeavePoolEvent != null) diff --git a/DungeonShooting_Godot/src/game/activity/role/enemy/NoWeaponEnemy.cs b/DungeonShooting_Godot/src/game/activity/role/enemy/NoWeaponEnemy.cs index a365d5d..db8f51d 100644 --- a/DungeonShooting_Godot/src/game/activity/role/enemy/NoWeaponEnemy.cs +++ b/DungeonShooting_Godot/src/game/activity/role/enemy/NoWeaponEnemy.cs @@ -34,9 +34,20 @@ AnimationPlayer.Play(AnimatorNames.Attack); } } - - public void ShootBullet() + + /// + /// 开始执行攻击逻辑 + /// + public virtual void OnAttack() { + //攻击特效 + var effect = ObjectManager.GetPoolItem(ResourcePath.prefab_effect_weapon_ShotFire3_tscn); + var node = (Node2D)effect; + node.GlobalPosition = FirePoint.GlobalPosition; + node.Rotation = MountPoint.Rotation; + node.AddToActivityRoot(RoomLayerEnum.YSortLayer); + effect.PlayEffect(); + var targetPosition = LookTarget.GetCenterPosition(); var bulletData = FireManager.GetBulletData(this, 0, ExcelConfig.BulletBase_Map["0006"]); for (var i = 0; i < 8; i++) @@ -67,7 +78,7 @@ { if (name == AnimatorNames.Attack) { - AttackTimer = 2f; + AttackTimer = 3f; } } } \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs b/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs index a54ce5a..4cc5b3c 100644 --- a/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs +++ b/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs @@ -84,7 +84,7 @@ //播放挥刀特效 SpecialEffectManager.Play( Master, - ResourcePath.resource_spriteFrames_effect_KnifeHit1_tres, "default", + ResourcePath.resource_sprite_weapon_weapon0004_KnifeHit1_png, "default", Master.MountPoint.Position, Master.MountPoint.Rotation + Mathf.DegToRad(Attribute.UpliftAngle + 60), AnimatedSprite.Scale, diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs index e554c0e..33f5a53 100644 --- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs +++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs @@ -20,6 +20,7 @@ public const string prefab_effect_bullet_BulletDisappear0001_tscn = "res://prefab/effect/bullet/BulletDisappear0001.tscn"; public const string prefab_effect_bullet_BulletDisappear0002_tscn = "res://prefab/effect/bullet/BulletDisappear0002.tscn"; public const string prefab_effect_bullet_BulletSmoke0001_tscn = "res://prefab/effect/bullet/BulletSmoke0001.tscn"; + public const string prefab_effect_bullet_BulletSmoke0002_tscn = "res://prefab/effect/bullet/BulletSmoke0002.tscn"; public const string prefab_effect_common_Effect1_tscn = "res://prefab/effect/common/Effect1.tscn"; public const string prefab_effect_enemy_EnemyBlood0001_tscn = "res://prefab/effect/enemy/EnemyBlood0001.tscn"; public const string prefab_effect_enemy_EnemyDead0001_tscn = "res://prefab/effect/enemy/EnemyDead0001.tscn"; @@ -28,6 +29,7 @@ public const string prefab_effect_weapon_MeleeAttack2_tscn = "res://prefab/effect/weapon/MeleeAttack2.tscn"; public const string prefab_effect_weapon_ShotFire_tscn = "res://prefab/effect/weapon/ShotFire.tscn"; public const string prefab_effect_weapon_ShotFire2_tscn = "res://prefab/effect/weapon/ShotFire2.tscn"; + public const string prefab_effect_weapon_ShotFire3_tscn = "res://prefab/effect/weapon/ShotFire3.tscn"; public const string prefab_map_RoomDoor_E_tscn = "res://prefab/map/RoomDoor_E.tscn"; public const string prefab_map_RoomDoor_N_tscn = "res://prefab/map/RoomDoor_N.tscn"; public const string prefab_map_RoomDoor_S_tscn = "res://prefab/map/RoomDoor_S.tscn"; @@ -177,6 +179,8 @@ public const string resource_sprite_brush_Brush3_png = "res://resource/sprite/brush/Brush3.png"; public const string resource_sprite_brush_Brush4_png = "res://resource/sprite/brush/Brush4.png"; public const string resource_sprite_brush_Brush5_png = "res://resource/sprite/brush/Brush5.png"; + public const string resource_sprite_bullet_collision_Collision0001_png = "res://resource/sprite/bullet/collision/Collision0001.png"; + public const string resource_sprite_bullet_collision_Collision0002_png = "res://resource/sprite/bullet/collision/Collision0002.png"; public const string resource_sprite_bullet_laser_Laser0001_png = "res://resource/sprite/bullet/laser/Laser0001.png"; public const string resource_sprite_bullet_normal_arrow_png = "res://resource/sprite/bullet/normal/arrow.png"; public const string resource_sprite_bullet_normal_bullet0001_png = "res://resource/sprite/bullet/normal/bullet0001.png"; @@ -185,22 +189,20 @@ public const string resource_sprite_bullet_normal_bullet0004_png = "res://resource/sprite/bullet/normal/bullet0004.png"; public const string resource_sprite_bullet_normal_bullet0005_png = "res://resource/sprite/bullet/normal/bullet0005.png"; public const string resource_sprite_bullet_normal_bullet2_png = "res://resource/sprite/bullet/normal/bullet2.png"; - public const string resource_sprite_effects_Circle_png = "res://resource/sprite/effects/Circle.png"; - public const string resource_sprite_effects_Circle2_png = "res://resource/sprite/effects/Circle2.png"; - public const string resource_sprite_effects_debug_arrows_png = "res://resource/sprite/effects/debug_arrows.png"; - public const string resource_sprite_effects_Explosion_png = "res://resource/sprite/effects/Explosion.png"; - public const string resource_sprite_effects_common_Effect1_png = "res://resource/sprite/effects/common/Effect1.png"; - public const string resource_sprite_effects_common_Smoke_png = "res://resource/sprite/effects/common/Smoke.png"; - public const string resource_sprite_effects_common_Smoke2_png = "res://resource/sprite/effects/common/Smoke2.png"; - public const string resource_sprite_effects_common_Smoke3_png = "res://resource/sprite/effects/common/Smoke3.png"; - public const string resource_sprite_effects_explode_Explode_circle0001_png = "res://resource/sprite/effects/explode/Explode_circle0001.png"; - public const string resource_sprite_effects_explode_Explode_line0001_png = "res://resource/sprite/effects/explode/Explode_line0001.png"; - public const string resource_sprite_effects_explode_Explode_pit0001_png = "res://resource/sprite/effects/explode/Explode_pit0001.png"; - public const string resource_sprite_effects_weapon_Collision1_png = "res://resource/sprite/effects/weapon/Collision1.png"; - public const string resource_sprite_effects_weapon_KnifeHit1_png = "res://resource/sprite/effects/weapon/KnifeHit1.png"; - public const string resource_sprite_effects_weapon_MeleeAttack1_png = "res://resource/sprite/effects/weapon/MeleeAttack1.png"; - public const string resource_sprite_effects_weapon_ShotFire_png = "res://resource/sprite/effects/weapon/ShotFire.png"; - public const string resource_sprite_effects_weapon_ShotFire2_png = "res://resource/sprite/effects/weapon/ShotFire2.png"; + public const string resource_sprite_common_Circle_png = "res://resource/sprite/common/Circle.png"; + public const string resource_sprite_common_Circle2_png = "res://resource/sprite/common/Circle2.png"; + public const string resource_sprite_common_debug_arrows_png = "res://resource/sprite/common/debug_arrows.png"; + public const string resource_sprite_common_Effect1_png = "res://resource/sprite/common/Effect1.png"; + public const string resource_sprite_common_MeleeAttack1_png = "res://resource/sprite/common/MeleeAttack1.png"; + public const string resource_sprite_common_Smoke_png = "res://resource/sprite/common/Smoke.png"; + public const string resource_sprite_common_Smoke2_png = "res://resource/sprite/common/Smoke2.png"; + public const string resource_sprite_common_Smoke3_png = "res://resource/sprite/common/Smoke3.png"; + public const string resource_sprite_common_Smoke4_png = "res://resource/sprite/common/Smoke4.png"; + public const string resource_sprite_explode_Explode_circle0001_png = "res://resource/sprite/explode/Explode_circle0001.png"; + public const string resource_sprite_explode_Explode_circle0002_png = "res://resource/sprite/explode/Explode_circle0002.png"; + public const string resource_sprite_explode_Explode_circle0003_png = "res://resource/sprite/explode/Explode_circle0003.png"; + public const string resource_sprite_explode_Explode_line0001_png = "res://resource/sprite/explode/Explode_line0001.png"; + public const string resource_sprite_explode_Explode_pit0001_png = "res://resource/sprite/explode/Explode_pit0001.png"; public const string resource_sprite_map_door_png = "res://resource/sprite/map/door.png"; public const string resource_sprite_map_door1_down_png = "res://resource/sprite/map/door1_down.png"; public const string resource_sprite_map_PreviewTransition_png = "res://resource/sprite/map/PreviewTransition.png"; @@ -276,6 +278,8 @@ public const string resource_sprite_shell_Shell0002_png = "res://resource/sprite/shell/Shell0002.png"; public const string resource_sprite_shell_Shell0003_png = "res://resource/sprite/shell/Shell0003.png"; public const string resource_sprite_shell_Shell0004_png = "res://resource/sprite/shell/Shell0004.png"; + public const string resource_sprite_shootFire_ShotFire0001_png = "res://resource/sprite/shootFire/ShotFire0001.png"; + public const string resource_sprite_shootFire_ShotFire0002_png = "res://resource/sprite/shootFire/ShotFire0002.png"; public const string resource_sprite_ui_font_bg_png = "res://resource/sprite/ui/font_bg.png"; public const string resource_sprite_ui_GUI_png = "res://resource/sprite/ui/GUI.png"; public const string resource_sprite_ui_commonIcon_Add_png = "res://resource/sprite/ui/commonIcon/Add.png"; @@ -338,11 +342,12 @@ public const string resource_sprite_weapon_gun6_png = "res://resource/sprite/weapon/gun6.png"; public const string resource_sprite_weapon_gun7_png = "res://resource/sprite/weapon/gun7.png"; public const string resource_sprite_weapon_gun8_png = "res://resource/sprite/weapon/gun8.png"; - public const string resource_sprite_weapon_knife1_png = "res://resource/sprite/weapon/knife1.png"; public const string resource_sprite_weapon_weapon0001_Weapon0001_png = "res://resource/sprite/weapon/weapon0001/Weapon0001.png"; public const string resource_sprite_weapon_weapon0002_Weapon0002_png = "res://resource/sprite/weapon/weapon0002/Weapon0002.png"; public const string resource_sprite_weapon_weapon0002_Weapon0002_reloading_png = "res://resource/sprite/weapon/weapon0002/Weapon0002_reloading.png"; public const string resource_sprite_weapon_weapon0003_Weapon0003_png = "res://resource/sprite/weapon/weapon0003/Weapon0003.png"; + public const string resource_sprite_weapon_weapon0004_KnifeHit1_png = "res://resource/sprite/weapon/weapon0004/KnifeHit1.png"; + public const string resource_sprite_weapon_weapon0004_Weapon0004_png = "res://resource/sprite/weapon/weapon0004/Weapon0004.png"; public const string resource_sprite_weapon_weapon0005_Weapon0005_png = "res://resource/sprite/weapon/weapon0005/Weapon0005.png"; public const string resource_sprite_weapon_weapon0006_Weapon0006_png = "res://resource/sprite/weapon/weapon0006/Weapon0006.png"; public const string resource_sprite_weapon_weapon0007_Weapon0007_png = "res://resource/sprite/weapon/weapon0007/Weapon0007.png"; @@ -355,8 +360,8 @@ public const string resource_spriteFrames_bullet_Bullet0003_tres = "res://resource/spriteFrames/bullet/Bullet0003.tres"; public const string resource_spriteFrames_bullet_Bullet0004_tres = "res://resource/spriteFrames/bullet/Bullet0004.tres"; public const string resource_spriteFrames_bullet_Bullet0005_tres = "res://resource/spriteFrames/bullet/Bullet0005.tres"; - public const string resource_spriteFrames_effect_KnifeHit1_tres = "res://resource/spriteFrames/effect/KnifeHit1.tres"; - public const string resource_spriteFrames_effect_weapon_Collision1_tres = "res://resource/spriteFrames/effect/weapon/Collision1.tres"; + public const string resource_spriteFrames_bullet_Collision0001_tres = "res://resource/spriteFrames/bullet/Collision0001.tres"; + public const string resource_spriteFrames_bullet_Collision0002_tres = "res://resource/spriteFrames/bullet/Collision0002.tres"; public const string resource_spriteFrames_other_RoomDoor_E_Down_tres = "res://resource/spriteFrames/other/RoomDoor_E_Down.tres"; public const string resource_spriteFrames_other_RoomDoor_E_Up_tres = "res://resource/spriteFrames/other/RoomDoor_E_Up.tres"; public const string resource_spriteFrames_other_RoomDoor_N_tres = "res://resource/spriteFrames/other/RoomDoor_N.tres"; @@ -391,6 +396,7 @@ public const string resource_spriteFrames_weapon_Weapon0002_tres = "res://resource/spriteFrames/weapon/Weapon0002.tres"; public const string resource_spriteFrames_weapon_Weapon0003_tres = "res://resource/spriteFrames/weapon/Weapon0003.tres"; public const string resource_spriteFrames_weapon_Weapon0004_tres = "res://resource/spriteFrames/weapon/Weapon0004.tres"; + public const string resource_spriteFrames_weapon_Weapon0004_hit_tres = "res://resource/spriteFrames/weapon/Weapon0004_hit.tres"; public const string resource_spriteFrames_weapon_Weapon0005_tres = "res://resource/spriteFrames/weapon/Weapon0005.tres"; public const string resource_spriteFrames_weapon_Weapon0006_tres = "res://resource/spriteFrames/weapon/Weapon0006.tres"; public const string resource_spriteFrames_weapon_Weapon0007_tres = "res://resource/spriteFrames/weapon/Weapon0007.tres";