diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx index 4eda85d..1e87def 100644 --- a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx index 73dc578..85c2bfe 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/Weapon.xlsx b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx index 675749f..0438bd3 100644 --- a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx Binary files differ diff --git a/DungeonShooting_Godot/prefab/shell/Shell0002.tscn b/DungeonShooting_Godot/prefab/shell/Shell0002.tscn new file mode 100644 index 0000000..edc3418 --- /dev/null +++ b/DungeonShooting_Godot/prefab/shell/Shell0002.tscn @@ -0,0 +1,34 @@ +[gd_scene load_steps=6 format=3 uid="uid://cdhinm8rnppxt"] + +[ext_resource type="Script" path="res://src/game/activity/shell/Shell.cs" id="1_qi64y"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_s28nu"] +[ext_resource type="SpriteFrames" uid="uid://cj8psdl2pova6" path="res://resource/spriteFrames/Shell0002.tres" id="3_r560h"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"] +resource_local_to_scene = true +shader = ExtResource("2_s28nu") +shader_parameter/blend = Color(0, 0, 0, 0.470588) +shader_parameter/schedule = 1.0 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_7e6fo"] +resource_local_to_scene = true +shader = ExtResource("2_s28nu") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0.0 + +[node name="Shell0002" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")] +collision_layer = 128 +script = ExtResource("1_qi64y") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") + +[node name="ShadowSprite" type="Sprite2D" parent="."] +z_index = -1 +material = SubResource("ShaderMaterial_px12l") + +[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +material = SubResource("ShaderMaterial_7e6fo") +sprite_frames = ExtResource("3_r560h") + +[node name="Collision" type="CollisionShape2D" parent="."] diff --git a/DungeonShooting_Godot/prefab/shell/Shell0003.tscn b/DungeonShooting_Godot/prefab/shell/Shell0003.tscn new file mode 100644 index 0000000..42221a6 --- /dev/null +++ b/DungeonShooting_Godot/prefab/shell/Shell0003.tscn @@ -0,0 +1,34 @@ +[gd_scene load_steps=6 format=3 uid="uid://ba5sxxjaappbj"] + +[ext_resource type="Script" path="res://src/game/activity/shell/Shell.cs" id="1_5hfb2"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_586dn"] +[ext_resource type="SpriteFrames" uid="uid://kc1jwvwdg660" path="res://resource/spriteFrames/Shell0003.tres" id="3_j2kre"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"] +resource_local_to_scene = true +shader = ExtResource("2_586dn") +shader_parameter/blend = Color(0, 0, 0, 0.470588) +shader_parameter/schedule = 1.0 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_7e6fo"] +resource_local_to_scene = true +shader = ExtResource("2_586dn") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0.0 + +[node name="Shell0003" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")] +collision_layer = 128 +script = ExtResource("1_5hfb2") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") + +[node name="ShadowSprite" type="Sprite2D" parent="."] +z_index = -1 +material = SubResource("ShaderMaterial_px12l") + +[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +material = SubResource("ShaderMaterial_7e6fo") +sprite_frames = ExtResource("3_j2kre") + +[node name="Collision" type="CollisionShape2D" parent="."] diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn index 2aa969b..6bfbeb4 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn @@ -75,7 +75,7 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_o36tv") sprite_frames = ExtResource("3_4h3je") -animation = &"equip" +animation = &"beLoaded" [node name="ShellPoint" type="Marker2D" parent="AnimatedSprite"] position = Vector2(-3, -2) diff --git a/DungeonShooting_Godot/resource/config/ActivityObject.json b/DungeonShooting_Godot/resource/config/ActivityObject.json index 81bc791..8551ca6 100644 --- a/DungeonShooting_Godot/resource/config/ActivityObject.json +++ b/DungeonShooting_Godot/resource/config/ActivityObject.json @@ -66,6 +66,18 @@ "Remark": "" }, { + "Id": "shell0002", + "Type": 7, + "Prefab": "res://prefab/shell/Shell0002.tscn", + "Remark": "" + }, + { + "Id": "shell0003", + "Type": 7, + "Prefab": "res://prefab/shell/Shell0003.tscn", + "Remark": "" + }, + { "Id": "effect0001", "Type": 8, "Prefab": "res://prefab/effect/activityObject/Effect0001.tscn", diff --git a/DungeonShooting_Godot/resource/config/Sound.json b/DungeonShooting_Godot/resource/config/Sound.json index 19ebaaf..43673b4 100644 --- a/DungeonShooting_Godot/resource/config/Sound.json +++ b/DungeonShooting_Godot/resource/config/Sound.json @@ -96,98 +96,98 @@ "Remark": "\u9730\u5F39\u67AA" }, { - "Id": "equip0001", - "Path": "res://resource/sound/sfx/equip/Equip0001.ogg", + "Id": "beLoaded0001", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0001.ogg", "Volume": 1, "Remark": "" }, { - "Id": "equip0002", - "Path": "res://resource/sound/sfx/equip/Equip0002.ogg", + "Id": "beLoaded0002", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0002.ogg", "Volume": 1, "Remark": "" }, { - "Id": "equip0003", - "Path": "res://resource/sound/sfx/equip/Equip0003.ogg", + "Id": "beLoaded0003", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0003.ogg", "Volume": 1, "Remark": "" }, { - "Id": "equip0004", - "Path": "res://resource/sound/sfx/equip/Equip0004.ogg", + "Id": "beLoaded0004", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0004.ogg", "Volume": 1, "Remark": "\u9730\u5F39\u67AA" }, { - "Id": "equip0005", - "Path": "res://resource/sound/sfx/equip/Equip0005.ogg", + "Id": "beLoaded0005", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0005.ogg", "Volume": 1, "Remark": "\u9730\u5F39\u67AA" }, { - "Id": "equip0006", - "Path": "res://resource/sound/sfx/equip/Equip0006.ogg", + "Id": "beLoaded0006", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0006.ogg", "Volume": 1, "Remark": "\u9730\u5F39\u67AA" }, { - "Id": "equip0007", - "Path": "res://resource/sound/sfx/equip/Equip0007.ogg", + "Id": "beLoaded0007", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0007.ogg", "Volume": 1, "Remark": "\u72D9\u51FB\u67AA" }, { - "Id": "equip0008", - "Path": "res://resource/sound/sfx/equip/Equip0008.ogg", + "Id": "beLoaded0008", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0008.ogg", "Volume": 1, "Remark": "\u72D9\u51FB\u67AA" }, { - "Id": "equip0009", - "Path": "res://resource/sound/sfx/equip/Equip0009.ogg", + "Id": "beLoaded0009", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0009.ogg", "Volume": 1, "Remark": "\u72D9\u51FB\u67AA" }, { - "Id": "equip0010", - "Path": "res://resource/sound/sfx/equip/Equip0010.ogg", + "Id": "beLoaded0010", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0010.ogg", "Volume": 1, "Remark": "\u6B65\u67AA" }, { - "Id": "equip0011", - "Path": "res://resource/sound/sfx/equip/Equip0011.ogg", + "Id": "beLoaded0011", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0011.ogg", "Volume": 1, "Remark": "\u6B65\u67AA" }, { - "Id": "equip0012", - "Path": "res://resource/sound/sfx/equip/Equip0012.ogg", + "Id": "beLoaded0012", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0012.ogg", "Volume": 1, "Remark": "\u6B65\u67AA" }, { - "Id": "equip0013", - "Path": "res://resource/sound/sfx/equip/Equip0013.ogg", + "Id": "beLoaded0013", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0013.ogg", "Volume": 1, "Remark": "\u6B65\u67AA" }, { - "Id": "equip0014", - "Path": "res://resource/sound/sfx/equip/Equip0014.ogg", + "Id": "beLoaded0014", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0014.ogg", "Volume": 1, "Remark": "\u624B\u67AA" }, { - "Id": "equip0015", - "Path": "res://resource/sound/sfx/equip/Equip0015.ogg", + "Id": "beLoaded0015", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0015.ogg", "Volume": 1, "Remark": "\u624B\u67AA" }, { - "Id": "equip0016", - "Path": "res://resource/sound/sfx/equip/Equip0016.ogg", + "Id": "beLoaded0016", + "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0016.ogg", "Volume": 1, "Remark": "\u51B2\u950B\u67AA" } diff --git a/DungeonShooting_Godot/resource/config/Weapon.json b/DungeonShooting_Godot/resource/config/Weapon.json index 6855a9c..de93e9d 100644 --- a/DungeonShooting_Godot/resource/config/Weapon.json +++ b/DungeonShooting_Godot/resource/config/Weapon.json @@ -18,6 +18,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, "TriggerInterval": 0, @@ -40,6 +42,7 @@ "DefaultAngle": 0, "UpliftAngleRestore": 1, "BulletId": "bullet0001", + "ShellId": "shell0001", "BulletMinDeviationAngle": 0, "BulletMaxDeviationAngle": 0, "BulletMaxSpeed": 350, @@ -55,10 +58,10 @@ "BeginReloadSoundDelayTime": 0.2, "__ReloadSound": "", "ReloadSoundDelayTime": 0, - "__ReloadFinishSound": "equip0011", + "__ReloadFinishSound": "beLoaded0011", "ReloadFinishSoundAdvanceTime": 0.4, - "__EquipSound": "", - "EquipSoundDelayTime": 0, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "0002", "AiTargetLockingTime": 0, @@ -84,6 +87,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0, "MinContinuousCount": 3, "MaxContinuousCount": 3, "TriggerInterval": 3, @@ -106,6 +111,7 @@ "DefaultAngle": 0, "UpliftAngleRestore": 1, "BulletId": "bullet0001", + "ShellId": "shell0001", "BulletMinDeviationAngle": 0, "BulletMaxDeviationAngle": 0, "BulletMaxSpeed": 350, @@ -121,10 +127,10 @@ "BeginReloadSoundDelayTime": 0.2, "__ReloadSound": "", "ReloadSoundDelayTime": 0, - "__ReloadFinishSound": "equip0011", + "__ReloadFinishSound": "beLoaded0011", "ReloadFinishSoundAdvanceTime": 0.4, - "__EquipSound": "", - "EquipSoundDelayTime": 0, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 0.5, @@ -150,11 +156,13 @@ "AloneReloadCanShoot": true, "LooseShoot": false, "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0.6, "MinContinuousCount": 1, "MaxContinuousCount": 1, "TriggerInterval": 0, - "StartFiringSpeed": 55, - "FinalFiringSpeed": 55, + "StartFiringSpeed": 120, + "FinalFiringSpeed": 120, "FiringSpeedAddSpeed": 0, "FiringSpeedBackSpeed": 0, "MinFireBulletCount": 5, @@ -170,8 +178,9 @@ "BacklashRegressionSpeed": 35, "UpliftAngle": 15, "DefaultAngle": 0, - "UpliftAngleRestore": 2.5, + "UpliftAngleRestore": 1, "BulletId": "bullet0002", + "ShellId": "shell0002", "BulletMinDeviationAngle": -10, "BulletMaxDeviationAngle": 10, "BulletMaxSpeed": 280, @@ -189,8 +198,8 @@ "ReloadSoundDelayTime": 0, "__ReloadFinishSound": "reloadFinish0002", "ReloadFinishSoundAdvanceTime": 0.3, - "__EquipSound": "equip0005", - "EquipSoundDelayTime": 0.4, + "__BeLoadedSound": "beLoaded0005", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "0004", "AiTargetLockingTime": 0, @@ -216,11 +225,13 @@ "AloneReloadCanShoot": true, "LooseShoot": false, "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0.6, "MinContinuousCount": 1, "MaxContinuousCount": 1, "TriggerInterval": 3.5, - "StartFiringSpeed": 55, - "FinalFiringSpeed": 55, + "StartFiringSpeed": 120, + "FinalFiringSpeed": 120, "FiringSpeedAddSpeed": 0, "FiringSpeedBackSpeed": 0, "MinFireBulletCount": 5, @@ -236,8 +247,9 @@ "BacklashRegressionSpeed": 35, "UpliftAngle": 15, "DefaultAngle": 0, - "UpliftAngleRestore": 2.5, + "UpliftAngleRestore": 1, "BulletId": "bullet0002", + "ShellId": "shell0002", "BulletMinDeviationAngle": -10, "BulletMaxDeviationAngle": 10, "BulletMaxSpeed": 280, @@ -255,8 +267,8 @@ "ReloadSoundDelayTime": 0, "__ReloadFinishSound": "reloadFinish0002", "ReloadFinishSoundAdvanceTime": 0.3, - "__EquipSound": "equip0005", - "EquipSoundDelayTime": 0.4, + "__BeLoadedSound": "beLoaded0005", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 0.4, @@ -282,6 +294,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, "TriggerInterval": 0.1, @@ -304,6 +318,7 @@ "DefaultAngle": 0, "UpliftAngleRestore": 1, "BulletId": "bullet0001", + "ShellId": "shell0001", "BulletMinDeviationAngle": 0, "BulletMaxDeviationAngle": 0, "BulletMaxSpeed": 350, @@ -319,10 +334,10 @@ "BeginReloadSoundDelayTime": 0, "__ReloadSound": "", "ReloadSoundDelayTime": 0, - "__ReloadFinishSound": "equip0015", + "__ReloadFinishSound": "beLoaded0015", "ReloadFinishSoundAdvanceTime": 0.43, - "__EquipSound": "", - "EquipSoundDelayTime": 0, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "0006", "AiTargetLockingTime": 0, @@ -348,6 +363,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, "TriggerInterval": 2, @@ -370,6 +387,7 @@ "DefaultAngle": 0, "UpliftAngleRestore": 1, "BulletId": "bullet0001", + "ShellId": "shell0001", "BulletMinDeviationAngle": 0, "BulletMaxDeviationAngle": 0, "BulletMaxSpeed": 350, @@ -385,10 +403,10 @@ "BeginReloadSoundDelayTime": 0, "__ReloadSound": "", "ReloadSoundDelayTime": 0, - "__ReloadFinishSound": "equip0015", + "__ReloadFinishSound": "beLoaded0015", "ReloadFinishSoundAdvanceTime": 0.43, - "__EquipSound": "", - "EquipSoundDelayTime": 0, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 1, @@ -414,6 +432,8 @@ "AloneReloadCanShoot": false, "LooseShoot": true, "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, "TriggerInterval": 0, @@ -436,6 +456,7 @@ "DefaultAngle": 0, "UpliftAngleRestore": 1, "BulletId": "bullet0001", + "ShellId": "", "BulletMinDeviationAngle": 0, "BulletMaxDeviationAngle": 0, "BulletMaxSpeed": 350, @@ -453,8 +474,8 @@ "ReloadSoundDelayTime": 0, "__ReloadFinishSound": "", "ReloadFinishSoundAdvanceTime": 0, - "__EquipSound": "", - "EquipSoundDelayTime": 0, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "0008", "AiTargetLockingTime": 0, @@ -480,6 +501,8 @@ "AloneReloadCanShoot": false, "LooseShoot": true, "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, "TriggerInterval": 3, @@ -502,6 +525,7 @@ "DefaultAngle": 0, "UpliftAngleRestore": 1, "BulletId": "bullet0001", + "ShellId": "", "BulletMinDeviationAngle": 0, "BulletMaxDeviationAngle": 0, "BulletMaxSpeed": 350, @@ -519,8 +543,8 @@ "ReloadSoundDelayTime": 0, "__ReloadFinishSound": "", "ReloadFinishSoundAdvanceTime": 0, - "__EquipSound": "", - "EquipSoundDelayTime": 0, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 0.7, @@ -546,11 +570,13 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, + "AutoBeLoaded": false, + "BeLoadedTime": 0.9, "MinContinuousCount": 1, "MaxContinuousCount": 1, "TriggerInterval": 0, - "StartFiringSpeed": 45, - "FinalFiringSpeed": 45, + "StartFiringSpeed": 150, + "FinalFiringSpeed": 150, "FiringSpeedAddSpeed": 0, "FiringSpeedBackSpeed": 0, "MinFireBulletCount": 1, @@ -566,8 +592,9 @@ "BacklashRegressionSpeed": 20, "UpliftAngle": 15, "DefaultAngle": 0, - "UpliftAngleRestore": 4, + "UpliftAngleRestore": 1, "BulletId": "bullet0001", + "ShellId": "shell0003", "BulletMinDeviationAngle": 0, "BulletMaxDeviationAngle": 0, "BulletMaxSpeed": 600, @@ -583,10 +610,10 @@ "BeginReloadSoundDelayTime": 0.3, "__ReloadSound": "", "ReloadSoundDelayTime": 0, - "__ReloadFinishSound": "equip0007", + "__ReloadFinishSound": "beLoaded0007", "ReloadFinishSoundAdvanceTime": 1, - "__EquipSound": "equip0007", - "EquipSoundDelayTime": 0.5, + "__BeLoadedSound": "beLoaded0007", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 0.6, @@ -612,6 +639,8 @@ "AloneReloadCanShoot": false, "LooseShoot": false, "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0, "MinContinuousCount": 1, "MaxContinuousCount": 1, "TriggerInterval": 0, @@ -634,6 +663,7 @@ "DefaultAngle": 0, "UpliftAngleRestore": 1, "BulletId": "bullet0002", + "ShellId": "shell0001", "BulletMinDeviationAngle": 0, "BulletMaxDeviationAngle": 0, "BulletMaxSpeed": 320, @@ -649,10 +679,10 @@ "BeginReloadSoundDelayTime": 0.2, "__ReloadSound": "", "ReloadSoundDelayTime": 0, - "__ReloadFinishSound": "equip0016", + "__ReloadFinishSound": "beLoaded0016", "ReloadFinishSoundAdvanceTime": 0.5, - "__EquipSound": "", - "EquipSoundDelayTime": 0, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 0.5, diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0001.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0001.ogg new file mode 100644 index 0000000..5921758 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0001.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0001.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0001.ogg.import new file mode 100644 index 0000000..5d6ab60 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0001.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://6nqv378nbpeo" +path="res://.godot/imported/BeLoaded0001.ogg-2ff56e92b77feed853599c53c84f22ee.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0001.ogg" +dest_files=["res://.godot/imported/BeLoaded0001.ogg-2ff56e92b77feed853599c53c84f22ee.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0002.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0002.ogg new file mode 100644 index 0000000..69130e6 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0002.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0002.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0002.ogg.import new file mode 100644 index 0000000..5e94026 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0002.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c4noep75aaunu" +path="res://.godot/imported/BeLoaded0002.ogg-253b08c8a73e3687870f11ebc8aba210.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0002.ogg" +dest_files=["res://.godot/imported/BeLoaded0002.ogg-253b08c8a73e3687870f11ebc8aba210.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0003.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0003.ogg new file mode 100644 index 0000000..997de27 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0003.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0003.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0003.ogg.import new file mode 100644 index 0000000..d983a20 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0003.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cbjsb1q0vwp2" +path="res://.godot/imported/BeLoaded0003.ogg-fc4c538184d37fd5b31fdce1877496f3.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0003.ogg" +dest_files=["res://.godot/imported/BeLoaded0003.ogg-fc4c538184d37fd5b31fdce1877496f3.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0004.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0004.ogg new file mode 100644 index 0000000..5d48d01 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0004.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0004.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0004.ogg.import new file mode 100644 index 0000000..4a93594 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0004.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dyqpao6qt2ai8" +path="res://.godot/imported/BeLoaded0004.ogg-6671da21522b7a79765f13b95621bc59.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0004.ogg" +dest_files=["res://.godot/imported/BeLoaded0004.ogg-6671da21522b7a79765f13b95621bc59.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0005.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0005.ogg new file mode 100644 index 0000000..8b80080 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0005.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0005.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0005.ogg.import new file mode 100644 index 0000000..f7c3a59 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0005.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://crkg7drgexn17" +path="res://.godot/imported/BeLoaded0005.ogg-4a985ecfe7314c72fc74c1212e1869fb.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0005.ogg" +dest_files=["res://.godot/imported/BeLoaded0005.ogg-4a985ecfe7314c72fc74c1212e1869fb.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0006.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0006.ogg new file mode 100644 index 0000000..d33e2b6 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0006.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0006.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0006.ogg.import new file mode 100644 index 0000000..7098f8a --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0006.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cuj4um0rdufdm" +path="res://.godot/imported/BeLoaded0006.ogg-8792516111f8fc6f284f9e98e5639b4f.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0006.ogg" +dest_files=["res://.godot/imported/BeLoaded0006.ogg-8792516111f8fc6f284f9e98e5639b4f.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0007.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0007.ogg new file mode 100644 index 0000000..7e9fb5c --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0007.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0007.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0007.ogg.import new file mode 100644 index 0000000..f0c24cf --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0007.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c7rc70p15fef8" +path="res://.godot/imported/BeLoaded0007.ogg-3831dab02c9546c0870047a2bf0ea4e6.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0007.ogg" +dest_files=["res://.godot/imported/BeLoaded0007.ogg-3831dab02c9546c0870047a2bf0ea4e6.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0008.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0008.ogg new file mode 100644 index 0000000..946dbb9 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0008.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0008.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0008.ogg.import new file mode 100644 index 0000000..970b03f --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0008.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dcyfcmbjv0r8o" +path="res://.godot/imported/BeLoaded0008.ogg-818cfd02e76b463cf478ce9c44c920e4.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0008.ogg" +dest_files=["res://.godot/imported/BeLoaded0008.ogg-818cfd02e76b463cf478ce9c44c920e4.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0009.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0009.ogg new file mode 100644 index 0000000..5ce800d --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0009.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0009.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0009.ogg.import new file mode 100644 index 0000000..c02699f --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0009.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ccw8aat5fmax" +path="res://.godot/imported/BeLoaded0009.ogg-addfb5d1e86639fa5d0f0c5ff69691dd.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0009.ogg" +dest_files=["res://.godot/imported/BeLoaded0009.ogg-addfb5d1e86639fa5d0f0c5ff69691dd.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0010.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0010.ogg new file mode 100644 index 0000000..6f5c2ab --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0010.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0010.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0010.ogg.import new file mode 100644 index 0000000..0ae31e6 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0010.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b5bkgwbs5m4k8" +path="res://.godot/imported/BeLoaded0010.ogg-c8354aca73bc5b6f2defbdefb49b3328.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0010.ogg" +dest_files=["res://.godot/imported/BeLoaded0010.ogg-c8354aca73bc5b6f2defbdefb49b3328.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0011.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0011.ogg new file mode 100644 index 0000000..7d22ebb --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0011.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0011.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0011.ogg.import new file mode 100644 index 0000000..d755f46 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0011.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bnmu7lter1gnw" +path="res://.godot/imported/BeLoaded0011.ogg-4cfb144c12ac624bee6c157d5d7637d5.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0011.ogg" +dest_files=["res://.godot/imported/BeLoaded0011.ogg-4cfb144c12ac624bee6c157d5d7637d5.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0012.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0012.ogg new file mode 100644 index 0000000..3fa5bd9 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0012.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0012.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0012.ogg.import new file mode 100644 index 0000000..8b98e6a --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0012.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dw7ake5awg0a1" +path="res://.godot/imported/BeLoaded0012.ogg-8c91014c7d35be28f3facb1179e155f4.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0012.ogg" +dest_files=["res://.godot/imported/BeLoaded0012.ogg-8c91014c7d35be28f3facb1179e155f4.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0013.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0013.ogg new file mode 100644 index 0000000..cf52506 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0013.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0013.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0013.ogg.import new file mode 100644 index 0000000..81e08ae --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0013.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b6q1gajro6p15" +path="res://.godot/imported/BeLoaded0013.ogg-0181328a9127c3d6ddac59c6fcc263a3.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0013.ogg" +dest_files=["res://.godot/imported/BeLoaded0013.ogg-0181328a9127c3d6ddac59c6fcc263a3.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0014.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0014.ogg new file mode 100644 index 0000000..867acdf --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0014.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0014.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0014.ogg.import new file mode 100644 index 0000000..c31f147 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0014.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://mt1wov5snirq" +path="res://.godot/imported/BeLoaded0014.ogg-10f3e3f7917315e22cf8b19f5b70431d.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0014.ogg" +dest_files=["res://.godot/imported/BeLoaded0014.ogg-10f3e3f7917315e22cf8b19f5b70431d.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0015.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0015.ogg new file mode 100644 index 0000000..a037fbd --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0015.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0015.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0015.ogg.import new file mode 100644 index 0000000..d435c58 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0015.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://da50b6io6t0bo" +path="res://.godot/imported/BeLoaded0015.ogg-2014969459848c2c8e882f751d9e8e29.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0015.ogg" +dest_files=["res://.godot/imported/BeLoaded0015.ogg-2014969459848c2c8e882f751d9e8e29.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0016.ogg b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0016.ogg new file mode 100644 index 0000000..ba60496 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0016.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0016.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0016.ogg.import new file mode 100644 index 0000000..a210876 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/beLoaded/BeLoaded0016.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://0yb17oy4453o" +path="res://.godot/imported/BeLoaded0016.ogg-e9b658fa28da317bbabcdbd1c5347a09.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/beLoaded/BeLoaded0016.ogg" +dest_files=["res://.godot/imported/BeLoaded0016.ogg-e9b658fa28da317bbabcdbd1c5347a09.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0001.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0001.ogg deleted file mode 100644 index 5921758..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0001.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0001.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0001.ogg.import deleted file mode 100644 index 928b9c7..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0001.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dip1xa8wpxdjo" -path="res://.godot/imported/Equip0001.ogg-ce76c2685b56ca81c64a249c091b676f.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0001.ogg" -dest_files=["res://.godot/imported/Equip0001.ogg-ce76c2685b56ca81c64a249c091b676f.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0002.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0002.ogg deleted file mode 100644 index 69130e6..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0002.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0002.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0002.ogg.import deleted file mode 100644 index 25b9130..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0002.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dkrjt31o0eucf" -path="res://.godot/imported/Equip0002.ogg-3affe904bd55131140861c56f81ffb69.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0002.ogg" -dest_files=["res://.godot/imported/Equip0002.ogg-3affe904bd55131140861c56f81ffb69.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0003.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0003.ogg deleted file mode 100644 index 997de27..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0003.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0003.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0003.ogg.import deleted file mode 100644 index 07ab5c4..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0003.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://djrsm2nwhxcug" -path="res://.godot/imported/Equip0003.ogg-3b4a3d3213381cdf73dc7aef46753102.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0003.ogg" -dest_files=["res://.godot/imported/Equip0003.ogg-3b4a3d3213381cdf73dc7aef46753102.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0004.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0004.ogg deleted file mode 100644 index 5d48d01..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0004.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0004.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0004.ogg.import deleted file mode 100644 index 502517f..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0004.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://lf1ylcyoem5j" -path="res://.godot/imported/Equip0004.ogg-5a399a5e1e60fa268b1938640db45ef5.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0004.ogg" -dest_files=["res://.godot/imported/Equip0004.ogg-5a399a5e1e60fa268b1938640db45ef5.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0005.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0005.ogg deleted file mode 100644 index 8b80080..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0005.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0005.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0005.ogg.import deleted file mode 100644 index bd4eef6..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0005.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://cthbancmpyj7" -path="res://.godot/imported/Equip0005.ogg-8817a0fa1fd401c9c0d472a9d6beb42a.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0005.ogg" -dest_files=["res://.godot/imported/Equip0005.ogg-8817a0fa1fd401c9c0d472a9d6beb42a.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0006.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0006.ogg deleted file mode 100644 index d33e2b6..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0006.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0006.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0006.ogg.import deleted file mode 100644 index 878e90d..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0006.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://b8md3alwndnnd" -path="res://.godot/imported/Equip0006.ogg-44403eb376aa14102739085a04ea347c.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0006.ogg" -dest_files=["res://.godot/imported/Equip0006.ogg-44403eb376aa14102739085a04ea347c.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0007.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0007.ogg deleted file mode 100644 index 7e9fb5c..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0007.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0007.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0007.ogg.import deleted file mode 100644 index 1263481..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0007.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://b6tnjh0oopl72" -path="res://.godot/imported/Equip0007.ogg-493fa63577155645da0dec1fcb92abfd.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0007.ogg" -dest_files=["res://.godot/imported/Equip0007.ogg-493fa63577155645da0dec1fcb92abfd.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0008.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0008.ogg deleted file mode 100644 index 946dbb9..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0008.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0008.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0008.ogg.import deleted file mode 100644 index 210a331..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0008.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://c75bbsct7ba2x" -path="res://.godot/imported/Equip0008.ogg-e295816880102ab69cc8358aa6afd48d.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0008.ogg" -dest_files=["res://.godot/imported/Equip0008.ogg-e295816880102ab69cc8358aa6afd48d.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0009.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0009.ogg deleted file mode 100644 index 5ce800d..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0009.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0009.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0009.ogg.import deleted file mode 100644 index 2dd8440..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0009.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dm5wxqo12bxml" -path="res://.godot/imported/Equip0009.ogg-c7f72aa52ad71fde004dd112cdf74ddf.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0009.ogg" -dest_files=["res://.godot/imported/Equip0009.ogg-c7f72aa52ad71fde004dd112cdf74ddf.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0010.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0010.ogg deleted file mode 100644 index 6f5c2ab..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0010.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0010.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0010.ogg.import deleted file mode 100644 index 8325eb0..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0010.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://c1qs6eghrnns0" -path="res://.godot/imported/Equip0010.ogg-1c2884443139ff20df30370181107612.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0010.ogg" -dest_files=["res://.godot/imported/Equip0010.ogg-1c2884443139ff20df30370181107612.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0011.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0011.ogg deleted file mode 100644 index 7d22ebb..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0011.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0011.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0011.ogg.import deleted file mode 100644 index f222a80..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0011.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://cdaw7ubg43yq4" -path="res://.godot/imported/Equip0011.ogg-836b37d079b40d32ddef1ca1b4449399.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0011.ogg" -dest_files=["res://.godot/imported/Equip0011.ogg-836b37d079b40d32ddef1ca1b4449399.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0012.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0012.ogg deleted file mode 100644 index 3fa5bd9..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0012.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0012.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0012.ogg.import deleted file mode 100644 index be6d010..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0012.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://d10jiojh35j72" -path="res://.godot/imported/Equip0012.ogg-7946a787c8709277f5993a50699304fe.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0012.ogg" -dest_files=["res://.godot/imported/Equip0012.ogg-7946a787c8709277f5993a50699304fe.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0013.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0013.ogg deleted file mode 100644 index cf52506..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0013.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0013.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0013.ogg.import deleted file mode 100644 index 0c86295..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0013.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://bwh74gdjikflw" -path="res://.godot/imported/Equip0013.ogg-731f9499790489e4de06466a632e81b6.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0013.ogg" -dest_files=["res://.godot/imported/Equip0013.ogg-731f9499790489e4de06466a632e81b6.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0014.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0014.ogg deleted file mode 100644 index 867acdf..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0014.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0014.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0014.ogg.import deleted file mode 100644 index e36585b..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0014.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://cys7pyrn1ymtk" -path="res://.godot/imported/Equip0014.ogg-adda0907dd891c1b7dba47fb2e7ebcbf.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0014.ogg" -dest_files=["res://.godot/imported/Equip0014.ogg-adda0907dd891c1b7dba47fb2e7ebcbf.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0015.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0015.ogg deleted file mode 100644 index a037fbd..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0015.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0015.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0015.ogg.import deleted file mode 100644 index 5b16332..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0015.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://b4w0okt3ajiqk" -path="res://.godot/imported/Equip0015.ogg-60c78f2d270234a19bd53c4e83d20957.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0015.ogg" -dest_files=["res://.godot/imported/Equip0015.ogg-60c78f2d270234a19bd53c4e83d20957.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0016.ogg b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0016.ogg deleted file mode 100644 index ba60496..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0016.ogg +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0016.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0016.ogg.import deleted file mode 100644 index 4364c9e..0000000 --- a/DungeonShooting_Godot/resource/sound/sfx/equip/Equip0016.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://xomfara07whg" -path="res://.godot/imported/Equip0016.ogg-d42ff1d28121c9f7725960dffc932a7c.oggvorbisstr" - -[deps] - -source_file="res://resource/sound/sfx/equip/Equip0016.ogg" -dest_files=["res://.godot/imported/Equip0016.ogg-d42ff1d28121c9f7725960dffc932a7c.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sprite/shell/Shell0001.png b/DungeonShooting_Godot/resource/sprite/shell/Shell0001.png index 7a926c6..57ad71d 100644 --- a/DungeonShooting_Godot/resource/sprite/shell/Shell0001.png +++ b/DungeonShooting_Godot/resource/sprite/shell/Shell0001.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/shell/Shell0002.png b/DungeonShooting_Godot/resource/sprite/shell/Shell0002.png new file mode 100644 index 0000000..0f99570 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/shell/Shell0002.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/shell/Shell0002.png.import b/DungeonShooting_Godot/resource/sprite/shell/Shell0002.png.import new file mode 100644 index 0000000..c2fdedf --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/shell/Shell0002.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://biiplgrnviefe" +path="res://.godot/imported/Shell0002.png-268d613a3220c7d9889281c385bbb110.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/shell/Shell0002.png" +dest_files=["res://.godot/imported/Shell0002.png-268d613a3220c7d9889281c385bbb110.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/shell/Shell0003.png b/DungeonShooting_Godot/resource/sprite/shell/Shell0003.png new file mode 100644 index 0000000..f777c80 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/shell/Shell0003.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/shell/Shell0003.png.import b/DungeonShooting_Godot/resource/sprite/shell/Shell0003.png.import new file mode 100644 index 0000000..35a53c8 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/shell/Shell0003.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://tq8vhc2kycax" +path="res://.godot/imported/Shell0003.png-4e1f53d86540103929b2b7e189be424f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/shell/Shell0003.png" +dest_files=["res://.godot/imported/Shell0003.png-4e1f53d86540103929b2b7e189be424f.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/Shell0002.tres b/DungeonShooting_Godot/resource/spriteFrames/Shell0002.tres new file mode 100644 index 0000000..cda2547 --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/Shell0002.tres @@ -0,0 +1,14 @@ +[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://cj8psdl2pova6"] + +[ext_resource type="Texture2D" uid="uid://biiplgrnviefe" path="res://resource/sprite/shell/Shell0002.png" id="1_gpa8q"] + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_gpa8q") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/Shell0003.tres b/DungeonShooting_Godot/resource/spriteFrames/Shell0003.tres new file mode 100644 index 0000000..99ecb0e --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/Shell0003.tres @@ -0,0 +1,14 @@ +[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://kc1jwvwdg660"] + +[ext_resource type="Texture2D" uid="uid://tq8vhc2kycax" path="res://resource/sprite/shell/Shell0003.png" id="1_qhaf7"] + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_qhaf7") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/Weapon0002.tres b/DungeonShooting_Godot/resource/spriteFrames/Weapon0002.tres index c3e68b2..4186037 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/Weapon0002.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/Weapon0002.tres @@ -31,14 +31,6 @@ animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("1_2tglc") -}], -"loop": true, -"name": &"default", -"speed": 5.0 -}, { -"frames": [{ -"duration": 1.0, "texture": SubResource("AtlasTexture_b4jme") }, { "duration": 1.0, @@ -57,6 +49,14 @@ "texture": SubResource("AtlasTexture_p0dy6") }], "loop": false, -"name": &"equip", +"name": &"beLoaded", "speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_2tglc") +}], +"loop": true, +"name": &"default", +"speed": 5.0 }] diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres index c33db4e..46b8c1e 100644 --- a/DungeonShooting_Godot/resource/theme/mainTheme.tres +++ b/DungeonShooting_Godot/resource/theme/mainTheme.tres @@ -352,7 +352,7 @@ [sub_resource type="ImageTexture" id="58"] -[sub_resource type="Image" id="Image_ji00c"] +[sub_resource type="Image" id="Image_7cp2c"] data = { "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), "format": "RGBA8", @@ -362,7 +362,7 @@ } [sub_resource type="ImageTexture" id="60"] -image = SubResource("Image_ji00c") +image = SubResource("Image_7cp2c") [sub_resource type="StyleBoxTexture" id="61"] content_margin_left = 2.0 @@ -372,7 +372,7 @@ texture = SubResource("60") region_rect = Rect2(0, 0, 12, 12) -[sub_resource type="Image" id="Image_g5vbn"] +[sub_resource type="Image" id="Image_nb7g2"] data = { "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), "format": "RGBA8", @@ -382,7 +382,7 @@ } [sub_resource type="ImageTexture" id="63"] -image = SubResource("Image_g5vbn") +image = SubResource("Image_nb7g2") [sub_resource type="StyleBoxTexture" id="64"] content_margin_left = 2.0 @@ -392,7 +392,7 @@ texture = SubResource("63") region_rect = Rect2(0, 0, 12, 12) -[sub_resource type="Image" id="Image_1firp"] +[sub_resource type="Image" id="Image_bsp3h"] data = { "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), "format": "RGBA8", @@ -402,7 +402,7 @@ } [sub_resource type="ImageTexture" id="66"] -image = SubResource("Image_1firp") +image = SubResource("Image_bsp3h") [sub_resource type="StyleBoxTexture" id="67"] content_margin_left = 2.0 @@ -412,7 +412,7 @@ texture = SubResource("66") region_rect = Rect2(0, 0, 12, 12) -[sub_resource type="Image" id="Image_8rrrg"] +[sub_resource type="Image" id="Image_l2654"] data = { "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), "format": "RGBA8", @@ -422,7 +422,7 @@ } [sub_resource type="ImageTexture" id="69"] -image = SubResource("Image_8rrrg") +image = SubResource("Image_l2654") [sub_resource type="StyleBoxTexture" id="70"] content_margin_left = 0.0 @@ -446,7 +446,7 @@ content_margin_right = 4.0 content_margin_bottom = 4.0 -[sub_resource type="Image" id="Image_inqjn"] +[sub_resource type="Image" id="Image_61eau"] data = { "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 228, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 228, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 18, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 17, 255, 255, 255, 186, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 191, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 186, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 189, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 77, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 77, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), "format": "RGBA8", @@ -456,7 +456,7 @@ } [sub_resource type="ImageTexture" id="56"] -image = SubResource("Image_inqjn") +image = SubResource("Image_61eau") [sub_resource type="StyleBoxFlat" id="57"] content_margin_left = 6.0 diff --git a/DungeonShooting_Godot/src/config/ExcelConfig.cs b/DungeonShooting_Godot/src/config/ExcelConfig.cs index a1bd2b5..b0abf46 100644 --- a/DungeonShooting_Godot/src/config/ExcelConfig.cs +++ b/DungeonShooting_Godot/src/config/ExcelConfig.cs @@ -131,9 +131,9 @@ item.ReloadFinishSound = Sound_Map[item.__ReloadFinishSound]; } - if (!string.IsNullOrEmpty(item.__EquipSound)) + if (!string.IsNullOrEmpty(item.__BeLoadedSound)) { - item.EquipSound = Sound_Map[item.__EquipSound]; + item.BeLoadedSound = Sound_Map[item.__BeLoadedSound]; } if (item.__OtherSoundMap != null) diff --git a/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs b/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs index acbe1e3..6bdc8a2 100644 --- a/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs +++ b/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs @@ -119,13 +119,25 @@ public float MinChargeTime; /// - /// 连续发射最小次数, 仅当 ContinuousShoot 为 false 时生效 + /// 单次射击后是否自动执行上膛操作, 必须将 'ContinuousShoot' 设置为 false + /// + [JsonInclude] + public bool AutoBeLoaded; + + /// + /// 上膛时间, 如果时间为0, 则不会播放上膛动画和音效, 可以视为没有上膛动作, 必须将 'ContinuousShoot' 设置为 false + /// + [JsonInclude] + public float BeLoadedTime; + + /// + /// 连续发射最小次数, 仅当 'ContinuousShoot' 为 false 时生效 /// [JsonInclude] public int MinContinuousCount; /// - /// 连续发射最大次数, 仅当 ContinuousShoot 为 false 时生效 + /// 连续发射最大次数, 仅当 'ContinuousShoot' 为 false 时生效 /// [JsonInclude] public int MaxContinuousCount; @@ -143,7 +155,7 @@ public float StartFiringSpeed; /// - /// 最终射速, 最终每分钟能开火次数, 仅当 ContinuousShoot 为 true 时生效 + /// 最终射速, 最终每分钟能开火次数, 仅当 'ContinuousShoot' 为 true 时生效 /// [JsonInclude] public float FinalFiringSpeed; @@ -251,6 +263,12 @@ public string BulletId; /// + /// 默认抛出的弹壳 + /// + [JsonInclude] + public string ShellId; + + /// /// 子弹最小偏移角度
/// 用于设置子弹偏移朝向, 该属性和射半径效果类似, 但与其不同的是, 散射半径是用来控制枪口朝向的, 而该属性是控制子弹朝向的, 可用于制作霰弹枪子弹效果 /// @@ -335,13 +353,13 @@ /// /// 上膛音效 /// - public Sound EquipSound; + public Sound BeLoadedSound; /// - /// 上膛音效延时时间 + /// 上膛音效延时时间, 这个时间应该小于'BeLoadedTime' /// [JsonInclude] - public float EquipSoundDelayTime; + public float BeLoadedSoundDelayTime; /// /// 其他音效 @@ -400,6 +418,8 @@ inst.AloneReloadCanShoot = AloneReloadCanShoot; inst.LooseShoot = LooseShoot; inst.MinChargeTime = MinChargeTime; + inst.AutoBeLoaded = AutoBeLoaded; + inst.BeLoadedTime = BeLoadedTime; inst.MinContinuousCount = MinContinuousCount; inst.MaxContinuousCount = MaxContinuousCount; inst.TriggerInterval = TriggerInterval; @@ -422,6 +442,7 @@ inst.DefaultAngle = DefaultAngle; inst.UpliftAngleRestore = UpliftAngleRestore; inst.BulletId = BulletId; + inst.ShellId = ShellId; inst.BulletMinDeviationAngle = BulletMinDeviationAngle; inst.BulletMaxDeviationAngle = BulletMaxDeviationAngle; inst.BulletMaxSpeed = BulletMaxSpeed; @@ -436,8 +457,8 @@ inst.ReloadSoundDelayTime = ReloadSoundDelayTime; inst.ReloadFinishSound = ReloadFinishSound; inst.ReloadFinishSoundAdvanceTime = ReloadFinishSoundAdvanceTime; - inst.EquipSound = EquipSound; - inst.EquipSoundDelayTime = EquipSoundDelayTime; + inst.BeLoadedSound = BeLoadedSound; + inst.BeLoadedSoundDelayTime = BeLoadedSoundDelayTime; inst.OtherSoundMap = OtherSoundMap; inst.AiUseAttribute = AiUseAttribute; inst.AiTargetLockingTime = AiTargetLockingTime; @@ -461,7 +482,7 @@ public string __ReloadFinishSound; [JsonInclude] - public string __EquipSound; + public string __BeLoadedSound; [JsonInclude] public Dictionary __OtherSoundMap; diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs index 450fbb2..5e7e2a9 100644 --- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs +++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs @@ -25,6 +25,8 @@ public const string Id_bullet0001 = "bullet0001"; public const string Id_bullet0002 = "bullet0002"; public const string Id_shell0001 = "shell0001"; + public const string Id_shell0002 = "shell0002"; + public const string Id_shell0003 = "shell0003"; /// /// 敌人死亡碎片 /// @@ -59,6 +61,8 @@ _activityRegisterMap.Add("bullet0001", "res://prefab/bullet/Bullet0001.tscn"); _activityRegisterMap.Add("bullet0002", "res://prefab/bullet/Bullet0002.tscn"); _activityRegisterMap.Add("shell0001", "res://prefab/shell/Shell0001.tscn"); + _activityRegisterMap.Add("shell0002", "res://prefab/shell/Shell0002.tscn"); + _activityRegisterMap.Add("shell0003", "res://prefab/shell/Shell0003.tscn"); _activityRegisterMap.Add("effect0001", "res://prefab/effect/activityObject/Effect0001.tscn"); _activityRegisterMap.Add("other_door_e", "res://prefab/map/RoomDoor_E.tscn"); _activityRegisterMap.Add("other_door_w", "res://prefab/map/RoomDoor_W.tscn"); diff --git a/DungeonShooting_Godot/src/game/AnimatorNames.cs b/DungeonShooting_Godot/src/game/AnimatorNames.cs index b26f934..5ea58e8 100644 --- a/DungeonShooting_Godot/src/game/AnimatorNames.cs +++ b/DungeonShooting_Godot/src/game/AnimatorNames.cs @@ -47,5 +47,5 @@ /// /// 子弹上膛 /// - public const string Equip = "equip"; + public const string BeLoaded = "beLoaded"; } \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs index 59583fa..38ce299 100644 --- a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs +++ b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs @@ -9,11 +9,6 @@ public abstract partial class Weapon : ActivityObject { /// - /// 开火回调事件 - /// - public event Action FireEvent; - - /// /// 武器属性数据 /// public ExcelConfig.Weapon Attribute => _weaponAttribute; @@ -203,6 +198,12 @@ //是否播放过换弹完成音效 private bool _playReloadFinishSoundFlag = false; + //上膛状态,-1: 等待执行自动上膛 , 0: 未上膛, 1: 上膛中, 2: 已经完成上膛 + private sbyte _beLoadedState = 2; + + //上膛计时器 + private float _beLoadedStateTimer = -1; + // ---------------------------------------------- private uint _tempLayer; @@ -289,6 +290,20 @@ /// /// 开火时枪口旋转角度 protected abstract void OnShoot(float fireRotation); + + /// + /// 上膛开始时调用 + /// + protected virtual void OnBeginBeLoaded() + { + } + + /// + /// 上膛结束时调用 + /// + protected virtual void OnBeLoadedFinish() + { + } /// /// 当按下扳机时调用 @@ -308,7 +323,7 @@ /// 开始蓄力时调用, /// 注意, 该函数仅在 Attribute.LooseShoot == false 时才能被调用 /// - protected virtual void OnStartCharge() + protected virtual void OnBeginCharge() { } @@ -335,6 +350,13 @@ } /// + /// 单独装弹完成时调用 + /// + protected virtual void OnAloneReloadStateFinish() + { + } + + /// /// 当武器被拾起时调用 /// /// 拾起该武器的角色 @@ -425,11 +447,26 @@ _upTimer = 0; _looseShootFlag = false; _chargeTime = 0; + _beLoadedStateTimer = -1; } } else //正在使用中 { _dirtyFlag = true; + + //上膛 + if (_beLoadedState == 1) + { + _beLoadedStateTimer -= delta; + //上膛完成 + if (_beLoadedStateTimer <= 0) + { + _beLoadedStateTimer = -1; + _beLoadedState = 2; + OnBeLoadedFinish(); + } + } + //换弹 if (Reloading) { @@ -516,7 +553,7 @@ } } - // 攻击的计时器 + //攻击的计时器 if (_attackTimer > 0) { _attackTimer -= delta; @@ -526,6 +563,11 @@ _attackTimer = 0; //枪口默认角度 RotationDegrees = -Attribute.DefaultAngle; + //自动上膛 + if (_beLoadedState == -1) + { + BeLoadedHandler(); + } } } else if (_delayedTime > 0) //攻击延时 @@ -567,6 +609,12 @@ { //连发开火 TriggerFire(); + //连发最后一发打完了 + if (_continuousCount <= 0) + { + //执行上膛逻辑 + RunBeLoaded(); + } } //散射值销退 @@ -613,99 +661,121 @@ //是否第一帧按下 var justDown = _downTimer == 0; - //是否能发射 - var flag = false; - if (_continuousCount <= 0) //不能处于连发状态下 + + if (_beLoadedState == 0 || _beLoadedState == -1) //需要执行上膛操作 { - if (Attribute.ContinuousShoot) //自动射击 + if (_attackTimer <= 0 && justDown) { - if (_triggerTimer > 0) + BeLoadedHandler(); + } + } + else if (_beLoadedState == 1) //上膛中 + { + + } + else //上膛完成 + { + //是否能发射 + var flag = false; + if (_continuousCount <= 0) //不能处于连发状态下 + { + if (Attribute.ContinuousShoot) //自动射击 { - if (_continuousShootFlag) + if (_triggerTimer > 0) + { + if (_continuousShootFlag) + { + flag = true; + } + } + else + { + flag = true; + if (_delayedTime <= 0 && _attackTimer <= 0) + { + _continuousShootFlag = true; + } + } + } + else //半自动 + { + if (justDown && _triggerTimer <= 0 && _attackTimer <= 0) { flag = true; } } - else + } + + if (flag) + { + var fireFlag = true; //是否能开火 + if (Reloading) //换弹中 { - flag = true; + fireFlag = false; + if (CurrAmmo > 0 && Attribute.AloneReload && Attribute.AloneReloadCanShoot) + { + //检查是否允许停止换弹 + if (_aloneReloadState == 2 || _aloneReloadState == 1) + { + //强制结束 + _aloneReloadStop = true; + } + } + } + else if (CurrAmmo <= 0) //子弹不够 + { + fireFlag = false; + if (justDown) + { + //第一帧按下, 触发换弹 + Reload(); + } + } + + if (fireFlag) + { + if (justDown) + { + //开火前延时 + if (!Attribute.LooseShoot) + { + _delayedTime = Attribute.DelayedTime; + } + //扳机按下间隔 + _triggerTimer = Attribute.TriggerInterval; + //连发数量 + if (!Attribute.ContinuousShoot) + { + _continuousCount = + Utils.RandomRangeInt(Attribute.MinContinuousCount, Attribute.MaxContinuousCount); + } + } + if (_delayedTime <= 0 && _attackTimer <= 0) { - _continuousShootFlag = true; - } - } - } - else //半自动 - { - if (justDown && _triggerTimer <= 0 && _attackTimer <= 0) - { - flag = true; - } - } - } + if (Attribute.LooseShoot) //松发开火 + { + _looseShootFlag = true; + OnBeginCharge(); + } + else + { + //开火 + TriggerFire(); - if (flag) - { - var fireFlag = true; //是否能开火 - if (Reloading) //换弹中 - { - fireFlag = false; - if (CurrAmmo > 0 && Attribute.AloneReload && Attribute.AloneReloadCanShoot) - { - //检查是否允许停止换弹 - if (_aloneReloadState == 2 || _aloneReloadState == 1) - { - //强制结束 - _aloneReloadStop = true; + //非连射模式 + if (!Attribute.ContinuousShoot && _continuousCount <= 0) + { + //执行上膛逻辑 + RunBeLoaded(); + } + } } - } - } - else if (CurrAmmo <= 0) //子弹不够 - { - fireFlag = false; - if (justDown) - { - //第一帧按下, 触发换弹 - Reload(); - } - } - if (fireFlag) - { - if (justDown) - { - //开火前延时 - if (!Attribute.LooseShoot) - { - _delayedTime = Attribute.DelayedTime; - } - //扳机按下间隔 - _triggerTimer = Attribute.TriggerInterval; - //连发数量 - if (!Attribute.ContinuousShoot) - { - _continuousCount = - Utils.RandomRangeInt(Attribute.MinContinuousCount, Attribute.MaxContinuousCount); - } + _attackFlag = true; } - if (_delayedTime <= 0 && _attackTimer <= 0) - { - if (Attribute.LooseShoot) //松发开火 - { - _looseShootFlag = true; - OnStartCharge(); - } - else - { - //开火 - TriggerFire(); - } - } - - _attackFlag = true; } - } _triggerFlag = true; @@ -770,6 +840,12 @@ if (_chargeTime >= Attribute.MinChargeTime) //判断蓄力是否够了 { TriggerFire(); + //非连射模式 + if (!Attribute.ContinuousShoot && _continuousCount <= 0) + { + //执行上膛逻辑 + RunBeLoaded(); + } } else //不能攻击 { @@ -787,7 +863,6 @@ private void TriggerFire() { _noAttackTime = 0; - _continuousCount = _continuousCount > 0 ? _continuousCount - 1 : 0; //减子弹数量 if (_playerWeaponAttribute != _weaponAttribute) //Ai使用该武器, 有一定概率不消耗弹药 @@ -802,6 +877,15 @@ CurrAmmo -= UseAmmoCount(); } + if (CurrAmmo == 0) + { + _continuousCount = 0; + } + else + { + _continuousCount = _continuousCount > 0 ? _continuousCount - 1 : 0; + } + //开火间隙 _fireInterval = 60 / Attribute.StartFiringSpeed; //攻击冷却 @@ -819,22 +903,6 @@ //触发开火函数 OnFire(); - //播放上膛动画 - if (IsAutoPlaySpriteFrames) - { - if (Attribute.EquipSoundDelayTime <= 0) - { - PlaySpriteAnimation(AnimatorNames.Equip); - } - else - { - CallDelay(Attribute.EquipSoundDelayTime, PlaySpriteAnimation, AnimatorNames.Equip); - } - } - - //播放上膛音效 - PlayEquipSound(); - //开火发射的子弹数量 var bulletCount = Utils.RandomRangeInt(Attribute.MaxFireBulletCount, Attribute.MinFireBulletCount); //武器口角度 @@ -868,11 +936,6 @@ -max, max ); Position = new Vector2(_currBacklashLength, 0).Rotated(Rotation); - - if (FireEvent != null) - { - FireEvent(this); - } } /// @@ -1053,22 +1116,45 @@ } //播放上膛音效 - private void PlayEquipSound() + private void PlayBeLoadedSound() { - if (Attribute.EquipSound != null) + if (Attribute.BeLoadedSound != null) { var position = GameApplication.Instance.ViewToGlobalPosition(GlobalPosition); - if (Attribute.EquipSoundDelayTime <= 0) + if (Attribute.BeLoadedSoundDelayTime <= 0) { - SoundManager.PlaySoundEffectPosition(Attribute.EquipSound.Path, position, Attribute.EquipSound.Volume); + SoundManager.PlaySoundEffectPosition(Attribute.BeLoadedSound.Path, position, Attribute.BeLoadedSound.Volume); } else { - SoundManager.PlaySoundEffectPositionDelay(Attribute.EquipSound.Path, position, Attribute.EquipSoundDelayTime, Attribute.EquipSound.Volume); + SoundManager.PlaySoundEffectPositionDelay(Attribute.BeLoadedSound.Path, position, Attribute.BeLoadedSoundDelayTime, Attribute.BeLoadedSound.Volume); } } } + //执行上膛逻辑 + private void RunBeLoaded() + { + if (Attribute.AutoBeLoaded) + { + if (_attackTimer <= 0) + { + //执行自动上膛 + BeLoadedHandler(); + } + else if (CurrAmmo > 0) + { + //等待执行自动上膛 + _beLoadedState = -1; + } + } + else if (CurrAmmo > 0) + { + //手动上膛 + _beLoadedState = 0; + } + } + //单独换弹处理 private void AloneReloadHandler() { @@ -1114,6 +1200,43 @@ private void AloneReloadStateFinish() { // GD.Print("单独装弹完成."); + OnAloneReloadStateFinish(); + } + + //上膛处理 + private void BeLoadedHandler() + { + //开始上膛 + OnBeginBeLoaded(); + + //上膛时间为0, 直接结束上膛 + if (Attribute.BeLoadedTime <= 0) + { + //直接上膛完成 + _beLoadedState = 2; + OnBeLoadedFinish(); + return; + } + + //上膛中 + _beLoadedState = 1; + _beLoadedStateTimer = Attribute.BeLoadedTime; + + //播放上膛动画 + if (IsAutoPlaySpriteFrames) + { + if (Attribute.BeLoadedSoundDelayTime <= 0) + { + PlaySpriteAnimation(AnimatorNames.BeLoaded); + } + else + { + CallDelay(Attribute.BeLoadedSoundDelayTime, PlaySpriteAnimation, AnimatorNames.BeLoaded); + } + } + + //播放上膛音效 + PlayBeLoadedSound(); } //停止当前的换弹状态 diff --git a/DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs b/DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs index 198698d..b8c0485 100644 --- a/DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs +++ b/DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs @@ -9,7 +9,7 @@ protected override void OnFire() { //创建一个弹壳 - ThrowShell(ActivityObject.Ids.Id_shell0001); + ThrowShell(Attribute.ShellId); if (Master == Player.Current) { diff --git a/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs b/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs index 8d97533..588d1d2 100644 --- a/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs +++ b/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs @@ -40,7 +40,7 @@ } } - protected override void OnStartCharge() + protected override void OnBeginCharge() { //开始蓄力时武器角度上抬120度 RotationDegrees = -120;