diff --git a/DungeonShooting_Godot/DungeonShooting.csproj.old.3 b/DungeonShooting_Godot/DungeonShooting.csproj.old.3 new file mode 100644 index 0000000..4546f15 --- /dev/null +++ b/DungeonShooting_Godot/DungeonShooting.csproj.old.3 @@ -0,0 +1,11 @@ + + + net6.0 + true + + + + + + + \ No newline at end of file diff --git a/DungeonShooting_Godot/DungeonShooting.csproj.old.4 b/DungeonShooting_Godot/DungeonShooting.csproj.old.4 new file mode 100644 index 0000000..69ed320 --- /dev/null +++ b/DungeonShooting_Godot/DungeonShooting.csproj.old.4 @@ -0,0 +1,11 @@ + + + net6.0 + true + + + + + + + \ No newline at end of file diff --git a/DungeonShooting_Godot/prefab/effect/activityObject/EnemyDebris.tscn b/DungeonShooting_Godot/prefab/effect/activityObject/EnemyDebris.tscn index a8066f9..17ee682 100644 --- a/DungeonShooting_Godot/prefab/effect/activityObject/EnemyDebris.tscn +++ b/DungeonShooting_Godot/prefab/effect/activityObject/EnemyDebris.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_h7exw"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_vlp01"] -[ext_resource type="Texture2D" uid="uid://d2f55lu60x64i" path="res://resource/sprite/effects/activityObject/Enemy0001_Debris.png" id="3_ohnrx"] +[ext_resource type="Texture2D" uid="uid://d2f55lu60x64i" path="res://resource/sprite/role/enemy0001/enemy0001_Debris.png" id="3_ohnrx"] [ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/Smoke.png" id="4_e30nm"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_s1mj2"] diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor.tscn index dcdc944..45c4063 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_8es7a"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_d8jnk"] -[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/door1_down.png" id="3_knmoy"] +[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="3_knmoy"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_x5aop"] resource_local_to_scene = true diff --git a/DungeonShooting_Godot/prefab/role/Enemy.tscn b/DungeonShooting_Godot/prefab/role/Enemy.tscn index 5808653..1bdec61 100644 --- a/DungeonShooting_Godot/prefab/role/Enemy.tscn +++ b/DungeonShooting_Godot/prefab/role/Enemy.tscn @@ -1,78 +1,78 @@ [gd_scene load_steps=20 format=3 uid="uid://dbrig6dq441wo"] -[ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/Role.tscn" id="1_qkqsa"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_1ah5y"] -[ext_resource type="Texture2D" uid="uid://chd2vtesap5cf" path="res://resource/sprite/role/role1.png" id="3_tqhbo"] +[ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/Role.tscn" id="1_urmtb"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_o06sk"] +[ext_resource type="Texture2D" uid="uid://chd2vtesap5cf" path="res://resource/sprite/role/enemy0001/enemy0001.png" id="3_7qr11"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_8vxx6"] resource_local_to_scene = true -shader = ExtResource("2_1ah5y") +shader = ExtResource("2_o06sk") shader_parameter/blend = Color(0, 0, 0, 0.470588) shader_parameter/schedule = 1 [sub_resource type="ShaderMaterial" id="ShaderMaterial_k8mt5"] resource_local_to_scene = true -shader = ExtResource("2_1ah5y") +shader = ExtResource("2_o06sk") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 -[sub_resource type="AtlasTexture" id="AtlasTexture_gx4d0"] -atlas = ExtResource("3_tqhbo") +[sub_resource type="AtlasTexture" id="AtlasTexture_0rmv6"] +atlas = ExtResource("3_7qr11") region = Rect2(0, 0, 16, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_da1qy"] -atlas = ExtResource("3_tqhbo") +[sub_resource type="AtlasTexture" id="AtlasTexture_3ira8"] +atlas = ExtResource("3_7qr11") region = Rect2(0, 24, 16, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_qr6u5"] -atlas = ExtResource("3_tqhbo") +[sub_resource type="AtlasTexture" id="AtlasTexture_7fx5y"] +atlas = ExtResource("3_7qr11") region = Rect2(16, 24, 16, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_yxi4p"] -atlas = ExtResource("3_tqhbo") +[sub_resource type="AtlasTexture" id="AtlasTexture_5wd43"] +atlas = ExtResource("3_7qr11") region = Rect2(32, 24, 16, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_1g0j1"] -atlas = ExtResource("3_tqhbo") +[sub_resource type="AtlasTexture" id="AtlasTexture_kbrex"] +atlas = ExtResource("3_7qr11") region = Rect2(48, 24, 16, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_mqoog"] -atlas = ExtResource("3_tqhbo") -region = Rect2(48, 48, 16, 24) - -[sub_resource type="AtlasTexture" id="AtlasTexture_6n45h"] -atlas = ExtResource("3_tqhbo") -region = Rect2(32, 48, 16, 24) - -[sub_resource type="AtlasTexture" id="AtlasTexture_7bfvr"] -atlas = ExtResource("3_tqhbo") -region = Rect2(16, 48, 16, 24) - -[sub_resource type="AtlasTexture" id="AtlasTexture_jep37"] -atlas = ExtResource("3_tqhbo") +[sub_resource type="AtlasTexture" id="AtlasTexture_bhiip"] +atlas = ExtResource("3_7qr11") region = Rect2(0, 48, 16, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_n0mff"] -atlas = ExtResource("3_tqhbo") -region = Rect2(0, 48, 16, 24) - -[sub_resource type="AtlasTexture" id="AtlasTexture_snkia"] -atlas = ExtResource("3_tqhbo") +[sub_resource type="AtlasTexture" id="AtlasTexture_41c1u"] +atlas = ExtResource("3_7qr11") region = Rect2(16, 48, 16, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_l4qvj"] -atlas = ExtResource("3_tqhbo") +[sub_resource type="AtlasTexture" id="AtlasTexture_1o2v8"] +atlas = ExtResource("3_7qr11") region = Rect2(32, 48, 16, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_yxje3"] -atlas = ExtResource("3_tqhbo") +[sub_resource type="AtlasTexture" id="AtlasTexture_niadr"] +atlas = ExtResource("3_7qr11") region = Rect2(48, 48, 16, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_j73hc"] +atlas = ExtResource("3_7qr11") +region = Rect2(48, 48, 16, 24) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3bgji"] +atlas = ExtResource("3_7qr11") +region = Rect2(32, 48, 16, 24) + +[sub_resource type="AtlasTexture" id="AtlasTexture_besw3"] +atlas = ExtResource("3_7qr11") +region = Rect2(16, 48, 16, 24) + +[sub_resource type="AtlasTexture" id="AtlasTexture_350uy"] +atlas = ExtResource("3_7qr11") +region = Rect2(0, 48, 16, 24) + [sub_resource type="SpriteFrames" id="SpriteFrames_m7t3e"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_gx4d0") +"texture": SubResource("AtlasTexture_0rmv6") }], "loop": true, "name": &"default", @@ -80,16 +80,16 @@ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_da1qy") +"texture": SubResource("AtlasTexture_3ira8") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_qr6u5") +"texture": SubResource("AtlasTexture_7fx5y") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_yxi4p") +"texture": SubResource("AtlasTexture_5wd43") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_1g0j1") +"texture": SubResource("AtlasTexture_kbrex") }], "loop": true, "name": &"idle", @@ -97,16 +97,16 @@ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_mqoog") +"texture": SubResource("AtlasTexture_bhiip") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_6n45h") +"texture": SubResource("AtlasTexture_41c1u") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_7bfvr") +"texture": SubResource("AtlasTexture_1o2v8") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_jep37") +"texture": SubResource("AtlasTexture_niadr") }], "loop": true, "name": &"reverseRun", @@ -114,23 +114,23 @@ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_n0mff") +"texture": SubResource("AtlasTexture_j73hc") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_snkia") +"texture": SubResource("AtlasTexture_3bgji") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_l4qvj") +"texture": SubResource("AtlasTexture_besw3") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_yxje3") +"texture": SubResource("AtlasTexture_350uy") }], "loop": true, "name": &"run", "speed": 10.0 }] -[node name="Enemy" instance=ExtResource("1_qkqsa")] +[node name="Enemy" instance=ExtResource("1_urmtb")] collision_layer = 16 collision_mask = 25 @@ -141,7 +141,6 @@ material = SubResource("ShaderMaterial_k8mt5") sprite_frames = SubResource("SpriteFrames_m7t3e") animation = &"run" -frame_progress = 0.424118 [node name="ViewRay" type="RayCast2D" parent="." index="6"] position = Vector2(0, -8) diff --git a/DungeonShooting_Godot/prefab/role/Role.tscn b/DungeonShooting_Godot/prefab/role/Role.tscn index 21cdeb8..357cae8 100644 --- a/DungeonShooting_Godot/prefab/role/Role.tscn +++ b/DungeonShooting_Godot/prefab/role/Role.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=9 format=3 uid="uid://cyrcv2jdgr8cf"] -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_hm41b"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_q6jwp"] -[ext_resource type="Script" path="res://src/game/role/MountRotation.cs" id="4"] +[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_7dvg8"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_xadty"] +[ext_resource type="Script" path="res://src/game/role/MountRotation.cs" id="3_wi3uj"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_v2kfw"] resource_local_to_scene = true -shader = ExtResource("2_q6jwp") +shader = ExtResource("2_xadty") shader_parameter/blend = Color(0, 0, 0, 0.470588) shader_parameter/schedule = 1 [sub_resource type="ShaderMaterial" id="ShaderMaterial_yif6x"] resource_local_to_scene = true -shader = ExtResource("2_q6jwp") +shader = ExtResource("2_xadty") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 @@ -26,7 +26,7 @@ size = Vector2(10, 16.5) [node name="Role" type="Node"] -script = ExtResource("1_hm41b") +script = ExtResource("1_7dvg8") [node name="ShadowSprite" type="Sprite2D" parent="."] z_index = -1 @@ -63,5 +63,5 @@ shape = SubResource("RectangleShape2D_n68nu") [node name="MountPoint" type="Marker2D" parent="."] -position = Vector2(1, -7) -script = ExtResource("4") +position = Vector2(1, -6) +script = ExtResource("3_wi3uj") diff --git a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn index c202ded..9259402 100644 --- a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn +++ b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=14 format=3 uid="uid://bvpmtfupny8iu"] -[ext_resource type="Script" path="res://src/game/ui/roomUI/RoomUIPanel.cs" id="1_u48k1"] -[ext_resource type="Texture2D" uid="uid://k621mhhkg65f" path="res://resource/sprite/ui/mapBar.png" id="2"] -[ext_resource type="Texture2D" uid="uid://b67i86mtqrn32" path="res://resource/sprite/ui/icon/icon_bullet.png" id="2_004n3"] -[ext_resource type="Texture2D" uid="uid://dxstii6f4l8m0" path="res://resource/sprite/ui/keyboard/e.png" id="3_ajp3c"] -[ext_resource type="Texture2D" uid="uid://u5ul7fu8wv1a" path="res://resource/sprite/ui/healthBar.png" id="4"] -[ext_resource type="Texture2D" uid="uid://cukrx5yyqw86o" path="res://resource/sprite/ui/reloadBar.png" id="4_npp5n"] -[ext_resource type="Texture2D" uid="uid://xafbhgrxmosy" path="res://resource/sprite/gun/gun4.png" id="5"] -[ext_resource type="Texture2D" uid="uid://cx3i1nkcc4307" path="res://resource/sprite/ui/reloadBarBlock.png" id="5_t7fdk"] -[ext_resource type="Texture2D" uid="uid://bxd75tme0v3pb" path="res://resource/sprite/ui/hpBar.png" id="6"] -[ext_resource type="Texture2D" uid="uid://h25j6uka74tv" path="res://resource/sprite/ui/shieldBar.png" id="7"] -[ext_resource type="Texture2D" uid="uid://djcdjrs07ighv" path="res://resource/sprite/ui/hpSlot.png" id="8"] -[ext_resource type="Texture2D" uid="uid://dnpguajopuyd7" path="res://resource/sprite/ui/shieldSlot.png" id="9"] +[ext_resource type="Script" path="res://src/game/ui/roomUI/RoomUIPanel.cs" id="1_tfcrp"] +[ext_resource type="Texture2D" uid="uid://b67i86mtqrn32" path="res://resource/sprite/ui/icon/icon_bullet.png" id="2_a2ohq"] +[ext_resource type="Texture2D" uid="uid://dxstii6f4l8m0" path="res://resource/sprite/ui/keyboard/e.png" id="3_h7n2a"] +[ext_resource type="Texture2D" uid="uid://cukrx5yyqw86o" path="res://resource/sprite/ui/reloadBar.png" id="4_nt6mj"] +[ext_resource type="Texture2D" uid="uid://cx3i1nkcc4307" path="res://resource/sprite/ui/reloadBarBlock.png" id="5_wob8d"] +[ext_resource type="Texture2D" uid="uid://u5ul7fu8wv1a" path="res://resource/sprite/ui/healthBar.png" id="6_e4f48"] +[ext_resource type="Texture2D" uid="uid://djcdjrs07ighv" path="res://resource/sprite/ui/hpSlot.png" id="7_kk5l8"] +[ext_resource type="Texture2D" uid="uid://bxd75tme0v3pb" path="res://resource/sprite/ui/hpBar.png" id="8_j85pm"] +[ext_resource type="Texture2D" uid="uid://dnpguajopuyd7" path="res://resource/sprite/ui/shieldSlot.png" id="9_spw0e"] +[ext_resource type="Texture2D" uid="uid://h25j6uka74tv" path="res://resource/sprite/ui/shieldBar.png" id="10_8lm6q"] +[ext_resource type="Texture2D" uid="uid://k621mhhkg65f" path="res://resource/sprite/ui/mapBar.png" id="11_yaqsk"] +[ext_resource type="Texture2D" uid="uid://xafbhgrxmosy" path="res://resource/sprite/gun/gun4.png" id="12_o2big"] [sub_resource type="Gradient" id="1"] colors = PackedColorArray(0.4, 0.498039, 1, 1, 0.4, 0.498039, 1, 0.313726) @@ -24,7 +24,7 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 -script = ExtResource("1_u48k1") +script = ExtResource("1_tfcrp") [node name="InteractiveTipBar" type="Node2D" parent="."] z_index = 10 @@ -33,12 +33,12 @@ [node name="Icon" type="Sprite2D" parent="InteractiveTipBar"] position = Vector2(0, -25) -texture = ExtResource("2_004n3") +texture = ExtResource("2_a2ohq") [node name="InteractiveIcon" type="Sprite2D" parent="InteractiveTipBar"] visible = false position = Vector2(0, -30) -texture = ExtResource("3_ajp3c") +texture = ExtResource("3_h7n2a") [node name="Line2D" type="Line2D" parent="InteractiveTipBar"] points = PackedVector2Array(0, -17, 0, -15.0938, 0, 0) @@ -52,10 +52,10 @@ [node name="Slot" type="Sprite2D" parent="ReloadBar"] position = Vector2(0, -24) -texture = ExtResource("4_npp5n") +texture = ExtResource("4_nt6mj") [node name="Block" type="Sprite2D" parent="ReloadBar/Slot"] -texture = ExtResource("5_t7fdk") +texture = ExtResource("5_wob8d") [node name="Control" type="Control" parent="."] anchors_preset = 0 @@ -72,7 +72,7 @@ offset_right = 14.0 offset_bottom = 14.0 scale = Vector2(4, 4) -texture = ExtResource("4") +texture = ExtResource("6_e4f48") [node name="HpSlot" type="NinePatchRect" parent="Control/HealthBar"] layout_mode = 0 @@ -80,7 +80,7 @@ offset_top = 1.0 offset_right = 66.0 offset_bottom = 9.0 -texture = ExtResource("8") +texture = ExtResource("7_kk5l8") patch_margin_left = 1 patch_margin_top = 1 patch_margin_right = 2 @@ -92,7 +92,7 @@ offset_top = 2.0 offset_right = 51.0 offset_bottom = 6.0 -texture = ExtResource("6") +texture = ExtResource("8_j85pm") expand_mode = 1 [node name="ShieldSlot" type="NinePatchRect" parent="Control/HealthBar"] @@ -101,7 +101,7 @@ offset_top = 8.0 offset_right = 65.0 offset_bottom = 13.0 -texture = ExtResource("9") +texture = ExtResource("9_spw0e") patch_margin_left = 1 patch_margin_top = 1 patch_margin_right = 1 @@ -113,7 +113,7 @@ offset_top = 1.0 offset_right = 51.0 offset_bottom = 4.0 -texture = ExtResource("7") +texture = ExtResource("10_8lm6q") expand_mode = 1 [node name="MapBar" type="TextureRect" parent="Control"] @@ -126,7 +126,7 @@ offset_bottom = 44.0 grow_horizontal = 0 scale = Vector2(4, 4) -texture = ExtResource("2") +texture = ExtResource("11_yaqsk") [node name="GunBar" type="Control" parent="Control"] anchors_preset = 0 @@ -147,7 +147,8 @@ offset_right = -66.0 offset_bottom = -66.0 scale = Vector2(4, 4) -texture = ExtResource("5") +texture = ExtResource("12_o2big") +stretch_mode = 3 [node name="BulletText" type="Label" parent="Control/GunBar"] layout_mode = 0 diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon.tscn index f2e3b95..e241f18 100644 --- a/DungeonShooting_Godot/prefab/weapon/Weapon.tscn +++ b/DungeonShooting_Godot/prefab/weapon/Weapon.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=9 format=3 uid="uid://byy386hv6bko0"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1"] -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_dtam7"] +[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_oxboq"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_sncbp"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"] resource_local_to_scene = true -shader = ExtResource("1") +shader = ExtResource("2_sncbp") shader_parameter/blend = Color(0, 0, 0, 0.470588) shader_parameter/schedule = 1 [sub_resource type="ShaderMaterial" id="ShaderMaterial_o36tv"] resource_local_to_scene = true -shader = ExtResource("1") +shader = ExtResource("2_sncbp") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 @@ -57,7 +57,7 @@ } [node name="Weapon" type="Node"] -script = ExtResource("1_dtam7") +script = ExtResource("1_oxboq") collision_layer = 4 [node name="ShadowSprite" type="Sprite2D" parent="."] @@ -66,19 +66,14 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_o36tv") -position = Vector2(0.4, -2.6) - -[node name="OriginPoint" type="Marker2D" parent="."] -position = Vector2(-3, 0) [node name="ShellPoint" type="Marker2D" parent="."] position = Vector2(0, -2) [node name="FirePoint" type="Marker2D" parent="."] -position = Vector2(10, -1) +position = Vector2(10, -2) [node name="Collision" type="CollisionShape2D" parent="."] -position = Vector2(0.6, 0.2) shape = SubResource("RectangleShape2D_3p5jk") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] diff --git a/DungeonShooting_Godot/prefab/weapon/WeaponPreview.tscn b/DungeonShooting_Godot/prefab/weapon/WeaponPreview.tscn new file mode 100644 index 0000000..c8164df --- /dev/null +++ b/DungeonShooting_Godot/prefab/weapon/WeaponPreview.tscn @@ -0,0 +1,36 @@ +[gd_scene load_steps=6 format=3 uid="uid://csd4sk65m46qh"] + +[ext_resource type="PackedScene" uid="uid://byy386hv6bko0" path="res://prefab/weapon/Weapon.tscn" id="1_byp1d"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_hn05o"] +[ext_resource type="SpriteFrames" uid="uid://5m0qs7m4er5u" path="res://resource/spriteFrames/Weapon0001.tres" id="3_ee7rd"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ki13x"] +resource_local_to_scene = true +shader = ExtResource("2_hn05o") +shader_parameter/blend = Color(0, 0, 0, 0.470588) +shader_parameter/schedule = 1 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_5ojsm"] +resource_local_to_scene = true +shader = ExtResource("2_hn05o") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0 + +[node name="WeaponPreview" instance=ExtResource("1_byp1d")] + +[node name="ShadowSprite" parent="." index="0"] +material = SubResource("ShaderMaterial_ki13x") + +[node name="AnimatedSprite" parent="." index="1"] +material = SubResource("ShaderMaterial_5ojsm") +position = Vector2(4, 0) +sprite_frames = ExtResource("3_ee7rd") + +[node name="ShellPoint" parent="." index="2"] +position = Vector2(5, -2.5) + +[node name="FirePoint" parent="." index="3"] +position = Vector2(18, -1.5) + +[node name="Collision" parent="." index="4"] +position = Vector2(4, 0) diff --git a/DungeonShooting_Godot/prefab/weapon/shell/ShellCase.tscn b/DungeonShooting_Godot/prefab/weapon/shell/ShellCase.tscn index 48d475e..c5f1ed3 100644 --- a/DungeonShooting_Godot/prefab/weapon/shell/ShellCase.tscn +++ b/DungeonShooting_Godot/prefab/weapon/shell/ShellCase.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=7 format=3 uid="uid://bj4yr6ru8nhwr"] -[ext_resource type="Texture2D" uid="uid://dto03bc2qbhnj" path="res://resource/sprite/shell/shellCase.png" id="1"] -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_nmhqm"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2"] +[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_5wgsd"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_6in5k"] +[ext_resource type="Texture2D" uid="uid://dto03bc2qbhnj" path="res://resource/sprite/shell/shellCase.png" id="3_k84jh"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"] resource_local_to_scene = true -shader = ExtResource("2") +shader = ExtResource("2_6in5k") shader_parameter/blend = Color(0, 0, 0, 0.470588) shader_parameter/schedule = 1 [sub_resource type="ShaderMaterial" id="ShaderMaterial_7e6fo"] resource_local_to_scene = true -shader = ExtResource("2") +shader = ExtResource("2_6in5k") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 @@ -20,7 +20,7 @@ animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("1") +"texture": ExtResource("3_k84jh") }], "loop": true, "name": &"default", @@ -28,7 +28,7 @@ }] [node name="ShellCase" type="Node"] -script = ExtResource("1_nmhqm") +script = ExtResource("1_5wgsd") [node name="ShadowSprite" type="Sprite2D" parent="."] z_index = -1 diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn index 5c2022c..9cad5e8 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn +++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn @@ -1,44 +1,44 @@ [gd_scene load_steps=4 format=3 uid="uid://dmeb88jotqro6"] -[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_gh7sf"] -[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_pf56w"] -[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"] +[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_tsopp"] +[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="2_0esgy"] +[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_2xj23"] [node name="Room1" type="TileMap"] -tile_set = ExtResource("1_gh7sf") +tile_set = ExtResource("1_tsopp") format = 2 layer_0/tile_data = PackedInt32Array(327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 131081, 0, 8, 65545, 0, 8, 9, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, 327687, 0, 8, 262151, 0, 8, 196615, 0, 8, 131079, 0, 8, 65543, 0, 8, 7, 0, 8, 327686, 0, 8, 262150, 0, 8, 196614, 0, 8, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, 65539, 0, 8, 3, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, 327681, 0, 8, 262145, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, 327680, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, 131071, 196608, 3, 65535, 196608, 3, -1, 196608, 4, -65536, 131072, 7, -65535, 131072, 7, 196607, 196608, 3, 262143, 196608, 3, 327679, 196608, 3, 393215, 196608, 3, 393217, 131072, 2, 393216, 131072, 2, 458751, 720896, 2, -65534, 131072, 7, 393218, 131072, 2, -65533, 131072, 7, 393219, 131072, 2, -65532, 131072, 7, 393220, 131072, 2, -65531, 131072, 7, 393221, 131072, 2, -65530, 131072, 7, 393222, 131072, 2, -65529, 131072, 7, 393223, 131072, 2, -65528, 131072, 7, 393224, 131072, 2, -65527, 131072, 7, 393225, 131072, 2, 10, 65536, 3, 65546, 65536, 3, -65526, 65536, 4, 131082, 65536, 3, 196618, 65536, 3, 262154, 65536, 3, 327690, 65536, 3, 393226, 851968, 2) -script = ExtResource("dungeonRoomTemplate") +script = ExtResource("2_0esgy") [node name="Player" type="Node2D" parent="."] position = Vector2(80, 47) -script = ExtResource("3_pf56w") +script = ExtResource("3_2xj23") Type = 1 Altitude = 0 [node name="ActivityMark" type="Node2D" parent="."] position = Vector2(126, 21) -script = ExtResource("3_pf56w") +script = ExtResource("3_2xj23") Type = 5 ItemExpression = "0002(ResidueAmmo:15,CurrAmmon:0)" [node name="ActivityMark2" type="Node2D" parent="."] position = Vector2(39, 75) -script = ExtResource("3_pf56w") +script = ExtResource("3_2xj23") Type = 5 ItemExpression = "0001(ResidueAmmo:15,CurrAmmon:0)" WaveNumber = 2 [node name="ActivityMark3" type="Node2D" parent="."] position = Vector2(128, 74) -script = ExtResource("3_pf56w") +script = ExtResource("3_2xj23") Type = 5 ItemExpression = "0003(ResidueAmmo:12,CurrAmmon:15)" WaveNumber = 3 [node name="ActivityMark4" type="Node2D" parent="."] position = Vector2(39, 23) -script = ExtResource("3_pf56w") +script = ExtResource("3_2xj23") Type = 5 ItemExpression = "0004(ResidueAmmo:15,CurrAmmon:0)" WaveNumber = 4 diff --git a/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres b/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres index a8fe7bb..ed27721 100644 --- a/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres +++ b/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres @@ -1,9 +1,9 @@ [gd_resource type="TileSet" load_steps=3 format=3 uid="uid://b00g22o1cqhe8"] -[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1_uvtye"] +[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1_pa3ef"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_yvgyd"] -texture = ExtResource("1_uvtye") +texture = ExtResource("1_pa3ef") 0:0/0 = 0 0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 0:0/0/physics_layer_0/angular_velocity = 0.0 diff --git a/DungeonShooting_Godot/resource/map/tileset/TileSet_old.tres b/DungeonShooting_Godot/resource/map/tileset/TileSet_old.tres index 8f15fc4..b082db6 100644 --- a/DungeonShooting_Godot/resource/map/tileset/TileSet_old.tres +++ b/DungeonShooting_Godot/resource/map/tileset/TileSet_old.tres @@ -1,6 +1,6 @@ [gd_resource type="TileSet" load_steps=3 format=3 uid="uid://bn21mn0gu6jel"] -[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1_vqd0o"] +[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1_vqd0o"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_rkmbu"] texture = ExtResource("1_vqd0o") diff --git a/DungeonShooting_Godot/resource/sprite/effects/activityObject/Enemy0001_Debris.png b/DungeonShooting_Godot/resource/sprite/effects/activityObject/Enemy0001_Debris.png deleted file mode 100644 index 60d644b..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/activityObject/Enemy0001_Debris.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/effects/activityObject/Enemy0001_Debris.png.import b/DungeonShooting_Godot/resource/sprite/effects/activityObject/Enemy0001_Debris.png.import deleted file mode 100644 index d1d4d8d..0000000 --- a/DungeonShooting_Godot/resource/sprite/effects/activityObject/Enemy0001_Debris.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d2f55lu60x64i" -path="res://.godot/imported/Enemy0001_Debris.png-30decaa1bf8df6ac221700eb59622276.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/effects/activityObject/Enemy0001_Debris.png" -dest_files=["res://.godot/imported/Enemy0001_Debris.png-30decaa1bf8df6ac221700eb59622276.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/environment/craftpix-net-248911/16x16.png b/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/16x16.png deleted file mode 100644 index 25987fc..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/16x16.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/16x16.png.import b/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/16x16.png.import deleted file mode 100644 index f96e7a9..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/16x16.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://brk1udnii78hm" -path="res://.godot/imported/16x16.png-6e9ff775940a8533671e6598dc2d886d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/craftpix-net-248911/16x16.png" -dest_files=["res://.godot/imported/16x16.png-6e9ff775940a8533671e6598dc2d886d.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/environment/craftpix-net-248911/A Note to the Dev.txt b/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/A Note to the Dev.txt deleted file mode 100644 index 6596983..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/A Note to the Dev.txt +++ /dev/null @@ -1,15 +0,0 @@ -Ho ho, the title got you, huh! :) - -Hello, thank you for your purchase! - -I'm Caio, the Clockwork Raven Studios artist, owner, and i hope this product live up to your expectations, i want you to know that your interest in my projects is what makes me work on it even harder. - -In case if it doesn't take up too much of your time, I would like to see what you're thinking about it in the comments, in the page of the store that you purchased the product, this helps me a lot! - -You can also see my progress in the creation of new assets and/or make suggestions, follow my twitter here: https://twitter.com/cwrstudios - -If you like my work, i would recommend you to take a look at my Patreon, you get spoilers of my upcoming assets, a community and everything i already made for only $5, and for staying as a Patron you'll always receive my new assets for free! - -My Patreon: https://www.patreon.com/clockworkravenstudios - -Regards, Caio \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/All Tileset/16x16.png b/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/All Tileset/16x16.png deleted file mode 100644 index 25987fc..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/All Tileset/16x16.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/All Tileset/16x16.png.import b/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/All Tileset/16x16.png.import deleted file mode 100644 index 89dc5e9..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/All Tileset/16x16.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bgmkr3k6dfdsw" -path="res://.godot/imported/16x16.png-03810c2e769fb05274c12adf666f9aa1.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/craftpix-net-248911/All Tileset/16x16.png" -dest_files=["res://.godot/imported/16x16.png-03810c2e769fb05274c12adf666f9aa1.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/environment/craftpix-net-248911/EsRson.gif b/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/EsRson.gif deleted file mode 100644 index 493642d..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/EsRson.gif +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/Palette/Pallete.txt b/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/Palette/Pallete.txt deleted file mode 100644 index ad6e6d8..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/Palette/Pallete.txt +++ /dev/null @@ -1 +0,0 @@ -This palette belongs to Kerrie Lake, and can be found and downloaded for free here: https://lospec.com/palette-list/resurrect-64 \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/Rww2te.gif b/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/Rww2te.gif deleted file mode 100644 index 977edd3..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/Rww2te.gif +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/license.txt b/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/license.txt deleted file mode 100644 index 673e1aa..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/craftpix-net-248911/license.txt +++ /dev/null @@ -1 +0,0 @@ -https://craftpix.net/file-licenses/ \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png deleted file mode 100644 index 26c54b7..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png.import b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png.import deleted file mode 100644 index 37b8a2e..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dj8nrd5od4fcl" -path="res://.godot/imported/16x16 dungeon ii wall reconfig v04 spritesheet.png-912443f06cd2aff252dec097396c5d34.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png" -dest_files=["res://.godot/imported/16x16 dungeon ii wall reconfig v04 spritesheet.png-912443f06cd2aff252dec097396c5d34.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/environment/itch-io-DungeonTileset4/bow/arrow.png b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/arrow.png deleted file mode 100644 index 4baebfb..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/arrow.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/arrow.png.import b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/arrow.png.import deleted file mode 100644 index 75f2ce4..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/arrow.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bqwt06ei11krp" -path="res://.godot/imported/arrow.png-d945c13a6ca437c3e71d6adb0e3d6c2d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/itch-io-DungeonTileset4/bow/arrow.png" -dest_files=["res://.godot/imported/arrow.png-d945c13a6ca437c3e71d6adb0e3d6c2d.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/environment/itch-io-DungeonTileset4/bow/bow.png b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/bow.png deleted file mode 100644 index 0654ef2..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/bow.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/bow.png.import b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/bow.png.import deleted file mode 100644 index 2dc8fb2..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/bow.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://br2qjnk51rgr3" -path="res://.godot/imported/bow.png-cf7ed3be40c3c132dffe693ed3eaea62.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/itch-io-DungeonTileset4/bow/bow.png" -dest_files=["res://.godot/imported/bow.png-cf7ed3be40c3c132dffe693ed3eaea62.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/environment/itch-io-DungeonTileset4/bow/effect/hit0.png b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit0.png deleted file mode 100644 index a4457f0..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit0.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit0.png.import b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit0.png.import deleted file mode 100644 index 9e87455..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit0.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://0rl2vt3wp2u0" -path="res://.godot/imported/hit0.png-f6ae5bf8aa634586ba35cd298657e88f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit0.png" -dest_files=["res://.godot/imported/hit0.png-f6ae5bf8aa634586ba35cd298657e88f.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/environment/itch-io-DungeonTileset4/bow/effect/hit1.png b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit1.png deleted file mode 100644 index fc1e151..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit1.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit1.png.import b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit1.png.import deleted file mode 100644 index 7acc467..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://buhvcxo2t0w8e" -path="res://.godot/imported/hit1.png-dff71ff18aaf926e3783079227be8aa0.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit1.png" -dest_files=["res://.godot/imported/hit1.png-dff71ff18aaf926e3783079227be8aa0.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/environment/itch-io-DungeonTileset4/bow/effect/hit2.png b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit2.png deleted file mode 100644 index acf1526..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit2.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit2.png.import b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit2.png.import deleted file mode 100644 index e6b134d..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://pe45t3xwk3oq" -path="res://.godot/imported/hit2.png-08913f6ef3702516923e214eb44be2a2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit2.png" -dest_files=["res://.godot/imported/hit2.png-08913f6ef3702516923e214eb44be2a2.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/environment/itch-io-DungeonTileset4/bow/effect/hit3.png b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit3.png deleted file mode 100644 index 272462c..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit3.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit3.png.import b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit3.png.import deleted file mode 100644 index 397381d..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://1cipr03e74qk" -path="res://.godot/imported/hit3.png-3e0b6dd0e6800e136aa13a83ec93ddc3.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit3.png" -dest_files=["res://.godot/imported/hit3.png-3e0b6dd0e6800e136aa13a83ec93ddc3.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/environment/itch-io-DungeonTileset4/bow/effect/hit4.png b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit4.png deleted file mode 100644 index aa1f261..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit4.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit4.png.import b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit4.png.import deleted file mode 100644 index b05e5f8..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit4.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://jnlqxbb6pk8n" -path="res://.godot/imported/hit4.png-13aa48a76ab50428f2595b5c50c88cf3.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit4.png" -dest_files=["res://.godot/imported/hit4.png-13aa48a76ab50428f2595b5c50c88cf3.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/environment/itch-io-DungeonTileset4/website.txt b/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/website.txt deleted file mode 100644 index cea76c3..0000000 --- a/DungeonShooting_Godot/resource/sprite/environment/itch-io-DungeonTileset4/website.txt +++ /dev/null @@ -1 +0,0 @@ -https://aekae13.itch.io/16x16-dungeon-walls-reconfig \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/sprite/gun/out/default.png b/DungeonShooting_Godot/resource/sprite/gun/out/default.png deleted file mode 100644 index e806751..0000000 --- a/DungeonShooting_Godot/resource/sprite/gun/out/default.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/gun/out/default.png.import b/DungeonShooting_Godot/resource/sprite/gun/out/default.png.import deleted file mode 100644 index e81938b..0000000 --- a/DungeonShooting_Godot/resource/sprite/gun/out/default.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://gxnb77x23of3" -path="res://.godot/imported/default.png-e5a685da8f657e6b9105cc7f2f935dc9.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/gun/out/default.png" -dest_files=["res://.godot/imported/default.png-e5a685da8f657e6b9105cc7f2f935dc9.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/gun/weapon0001/weapon0001.png b/DungeonShooting_Godot/resource/sprite/gun/weapon0001/weapon0001.png new file mode 100644 index 0000000..6522910 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/gun/weapon0001/weapon0001.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/gun/weapon0001/weapon0001.png.import b/DungeonShooting_Godot/resource/sprite/gun/weapon0001/weapon0001.png.import new file mode 100644 index 0000000..b4c2034 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/gun/weapon0001/weapon0001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://civvcowt2wklr" +path="res://.godot/imported/weapon0001.png-6f3807222cc10bbb7eddc649cd3775c0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/gun/weapon0001/weapon0001.png" +dest_files=["res://.godot/imported/weapon0001.png-6f3807222cc10bbb7eddc649cd3775c0.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/map/door1_down.png b/DungeonShooting_Godot/resource/sprite/map/door1_down.png deleted file mode 100644 index faeba59..0000000 --- a/DungeonShooting_Godot/resource/sprite/map/door1_down.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/map/door1_down.png.import b/DungeonShooting_Godot/resource/sprite/map/door1_down.png.import deleted file mode 100644 index de95af2..0000000 --- a/DungeonShooting_Godot/resource/sprite/map/door1_down.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dviv44fhwvkb1" -path="res://.godot/imported/door1_down.png-59ffc0993731fd627318f9402b22d199.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/map/door1_down.png" -dest_files=["res://.godot/imported/door1_down.png-59ffc0993731fd627318f9402b22d199.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/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png b/DungeonShooting_Godot/resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png new file mode 100644 index 0000000..26c54b7 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png.import b/DungeonShooting_Godot/resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png.import new file mode 100644 index 0000000..2f22127 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dj8nrd5od4fcl" +path="res://.godot/imported/16x16 dungeon ii wall reconfig v04 spritesheet.png-ff78c744bd80f7a90af72583d38712d5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png" +dest_files=["res://.godot/imported/16x16 dungeon ii wall reconfig v04 spritesheet.png-ff78c744bd80f7a90af72583d38712d5.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/map/map1/door1_down.png b/DungeonShooting_Godot/resource/sprite/map/map1/door1_down.png new file mode 100644 index 0000000..faeba59 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/map/map1/door1_down.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/map/map1/door1_down.png.import b/DungeonShooting_Godot/resource/sprite/map/map1/door1_down.png.import new file mode 100644 index 0000000..b7e352f --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/map/map1/door1_down.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dviv44fhwvkb1" +path="res://.godot/imported/door1_down.png-0738db3503e6a0f8ce04f89dbe063801.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/map/map1/door1_down.png" +dest_files=["res://.godot/imported/door1_down.png-0738db3503e6a0f8ce04f89dbe063801.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/map/map1/website.txt b/DungeonShooting_Godot/resource/sprite/map/map1/website.txt new file mode 100644 index 0000000..cea76c3 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/map/map1/website.txt @@ -0,0 +1 @@ +https://aekae13.itch.io/16x16-dungeon-walls-reconfig \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png new file mode 100644 index 0000000..f902601 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png.import b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png.import new file mode 100644 index 0000000..b20c9a6 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://chd2vtesap5cf" +path="res://.godot/imported/enemy0001.png-1247a3ddf8a1a163d812cad12c4340fd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/role/enemy0001/enemy0001.png" +dest_files=["res://.godot/imported/enemy0001.png-1247a3ddf8a1a163d812cad12c4340fd.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/enemy0001/enemy0001_Debris.png b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001_Debris.png new file mode 100644 index 0000000..60d644b --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001_Debris.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001_Debris.png.import b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001_Debris.png.import new file mode 100644 index 0000000..56388a2 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/role/enemy0001/enemy0001_Debris.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2f55lu60x64i" +path="res://.godot/imported/enemy0001_Debris.png-297a2fb6680cb862a9a085cf58f8268c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/role/enemy0001/enemy0001_Debris.png" +dest_files=["res://.godot/imported/enemy0001_Debris.png-297a2fb6680cb862a9a085cf58f8268c.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/role1.png b/DungeonShooting_Godot/resource/sprite/role/role1.png deleted file mode 100644 index f902601..0000000 --- a/DungeonShooting_Godot/resource/sprite/role/role1.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role1.png.import b/DungeonShooting_Godot/resource/sprite/role/role1.png.import deleted file mode 100644 index a0ffc06..0000000 --- a/DungeonShooting_Godot/resource/sprite/role/role1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://chd2vtesap5cf" -path="res://.godot/imported/role1.png-958d620452f56d0f9929cebb052b8bfc.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/role/role1.png" -dest_files=["res://.godot/imported/role1.png-958d620452f56d0f9929cebb052b8bfc.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/role2.png b/DungeonShooting_Godot/resource/sprite/role/role2.png index 4002f4f..cc2133d 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role2.png +++ b/DungeonShooting_Godot/resource/sprite/role/role2.png Binary files differ diff --git a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres index 75c0d73..b372c0e 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres @@ -1,6 +1,6 @@ [gd_resource type="SpriteFrames" load_steps=22 format=3 uid="uid://3ps6h2f54qa5"] -[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/door1_down.png" id="1_dgkkn"] +[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_dgkkn"] [sub_resource type="AtlasTexture" id="AtlasTexture_5m6ya"] atlas = ExtResource("1_dgkkn") diff --git a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres index fbe73fa..85b32f9 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres @@ -1,6 +1,6 @@ [gd_resource type="SpriteFrames" load_steps=21 format=3 uid="uid://xs72aopsgpg6"] -[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/door1_down.png" id="1_wt0g7"] +[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_wt0g7"] [sub_resource type="AtlasTexture" id="AtlasTexture_77i3w"] atlas = ExtResource("1_wt0g7") diff --git a/DungeonShooting_Godot/resource/spriteFrames/Weapon0001.tres b/DungeonShooting_Godot/resource/spriteFrames/Weapon0001.tres index 89e5665..f221be0 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/Weapon0001.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/Weapon0001.tres @@ -1,12 +1,12 @@ [gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://5m0qs7m4er5u"] -[ext_resource type="Texture2D" uid="uid://xafbhgrxmosy" path="res://resource/sprite/gun/gun4.png" id="1_narkm"] +[ext_resource type="Texture2D" uid="uid://civvcowt2wklr" path="res://resource/sprite/gun/weapon0001/weapon0001.png" id="1_derf1"] [resource] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("1_narkm") +"texture": ExtResource("1_derf1") }], "loop": true, "name": &"default", diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres index 239941b..8b96b5d 100644 --- a/DungeonShooting_Godot/resource/theme/mainTheme.tres +++ b/DungeonShooting_Godot/resource/theme/mainTheme.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" load_steps=78 format=3 uid="uid://ds668te2rph30"] -[ext_resource type="FontFile" uid="uid://cad0in7dtweo5" path="res://resource/font/VonwaonBitmap-16px.ttf" id="1_sqmbn"] +[ext_resource type="FontFile" uid="uid://cad0in7dtweo5" path="res://resource/font/VonwaonBitmap-16px.ttf" id="1_h2ixh"] [sub_resource type="StyleBoxFlat" id="1"] content_margin_left = 6.0 @@ -352,7 +352,7 @@ [sub_resource type="ImageTexture" id="58"] -[sub_resource type="Image" id="Image_7h717"] +[sub_resource type="Image" id="Image_dbhbp"] 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_7h717") +image = SubResource("Image_dbhbp") [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_fs85e"] +[sub_resource type="Image" id="Image_0nlsw"] 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_fs85e") +image = SubResource("Image_0nlsw") [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_sfen6"] +[sub_resource type="Image" id="Image_kdcku"] 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_sfen6") +image = SubResource("Image_kdcku") [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_jeucq"] +[sub_resource type="Image" id="Image_jkvvb"] 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_jeucq") +image = SubResource("Image_jkvvb") [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_2rf3n"] +[sub_resource type="Image" id="Image_u72q8"] 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_2rf3n") +image = SubResource("Image_u72q8") [sub_resource type="StyleBoxFlat" id="57"] content_margin_left = 6.0 @@ -506,7 +506,7 @@ region_rect = Rect2(0, 0, 12, 12) [resource] -default_font = ExtResource("1_sqmbn") +default_font = ExtResource("1_h2ixh") default_font_size = 32 Button/colors/font_color = Color(0.780392, 0.780392, 0.780392, 1) Button/colors/font_color_disabled = Color(1, 1, 1, 0.3) @@ -516,7 +516,7 @@ Button/colors/icon_color_hover = Color(1.15, 1.15, 1.15, 1) Button/colors/icon_color_pressed = Color(0.135294, 0.496079, 1.04176, 1) Button/constants/hseparation = 2 -Button/fonts/font = ExtResource("1_sqmbn") +Button/fonts/font = ExtResource("1_h2ixh") Button/styles/disabled = SubResource("1") Button/styles/focus = SubResource("2") Button/styles/hover = SubResource("3") @@ -618,7 +618,7 @@ Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 -Label/fonts/font = ExtResource("1_sqmbn") +Label/fonts/font = ExtResource("1_h2ixh") Label/styles/normal = SubResource("54") LineEdit/colors/clear_button_color = Color(0.780392, 0.780392, 0.780392, 1) LineEdit/colors/clear_button_color_pressed = Color(0.117647, 0.431373, 0.905882, 1) @@ -629,7 +629,7 @@ LineEdit/colors/read_only = Color(1, 1, 1, 0.3) LineEdit/colors/selection_color = Color(0.117647, 0.431373, 0.905882, 0.4) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = ExtResource("1_sqmbn") +LineEdit/fonts/font = ExtResource("1_h2ixh") LineEdit/icons/clear = SubResource("56") LineEdit/styles/focus = SubResource("2") LineEdit/styles/normal = SubResource("4") diff --git a/DungeonShooting_Godot/scene/Main.tscn b/DungeonShooting_Godot/scene/Main.tscn index 21417bf..93fb731 100644 --- a/DungeonShooting_Godot/scene/Main.tscn +++ b/DungeonShooting_Godot/scene/Main.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://lbe753cb8heb"] -[ext_resource type="Script" path="res://src/game/GameApplication.cs" id="3"] -[ext_resource type="Script" path="res://src/game/camera/GameCamera.cs" id="4_3gsi2"] +[ext_resource type="Script" path="res://src/game/GameApplication.cs" id="1_7qxy0"] +[ext_resource type="Script" path="res://src/game/camera/GameCamera.cs" id="2_ipvhp"] [sub_resource type="Shader" id="1"] code = "shader_type canvas_item; @@ -21,7 +21,7 @@ shader_parameter/offset = Vector2(0, 0) [node name="Main" type="Node2D" node_paths=PackedStringArray("SubViewport", "SubViewportContainer", "SceneRoot", "GlobalNodeRoot")] -script = ExtResource("3") +script = ExtResource("1_7qxy0") SubViewport = NodePath("ViewCanvas/SubViewportContainer/SubViewport") SubViewportContainer = NodePath("ViewCanvas/SubViewportContainer") SceneRoot = NodePath("ViewCanvas/SubViewportContainer/SubViewport/SceneRoot") @@ -49,6 +49,6 @@ process_callback = 0 limit_smoothed = true editor_draw_drag_margin = true -script = ExtResource("4_3gsi2") +script = ExtResource("2_ipvhp") [node name="GlobalNodeRoot" type="Node2D" parent="."] diff --git a/DungeonShooting_Godot/scene/World.tscn b/DungeonShooting_Godot/scene/World.tscn index 6fc6f5b..e986861 100644 --- a/DungeonShooting_Godot/scene/World.tscn +++ b/DungeonShooting_Godot/scene/World.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://bqf2vks5ggnsp"] -[ext_resource type="Script" path="res://src/game/room/World.cs" id="1_xc5pm"] -[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="2_n61nn"] +[ext_resource type="Script" path="res://src/game/room/World.cs" id="1_6b8pf"] +[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="2_ur13e"] [sub_resource type="Environment" id="Environment_ji6mi"] background_mode = 3 @@ -9,7 +9,7 @@ glow_intensity = 4.74 [node name="World" type="Node2D" node_paths=PackedStringArray("NormalLayer", "YSortLayer", "TileRoot")] -script = ExtResource("1_xc5pm") +script = ExtResource("1_6b8pf") NormalLayer = NodePath("NormalLayer") YSortLayer = NodePath("YSortLayer") TileRoot = NodePath("TileRoot") @@ -20,7 +20,7 @@ [node name="TileRoot" type="TileMap" parent="."] y_sort_enabled = true -tile_set = ExtResource("2_n61nn") +tile_set = ExtResource("2_ur13e") format = 2 layer_0/name = "Floor" layer_0/z_index = -10 diff --git a/DungeonShooting_Godot/scene/test/TestGenerateDungeon.tscn b/DungeonShooting_Godot/scene/test/TestGenerateDungeon.tscn index 710b7e2..da0143e 100644 --- a/DungeonShooting_Godot/scene/test/TestGenerateDungeon.tscn +++ b/DungeonShooting_Godot/scene/test/TestGenerateDungeon.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=5 format=3 uid="uid://5bbx1u0od3jm"] [ext_resource type="Script" path="res://src/test/TestGenerateDungeon.cs" id="1"] -[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="2"] +[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="2"] + [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_rvg0t"] texture = ExtResource("2") diff --git a/DungeonShooting_Godot/scene/test/TestNavigation.tscn b/DungeonShooting_Godot/scene/test/TestNavigation.tscn deleted file mode 100644 index 4a0bddb..0000000 --- a/DungeonShooting_Godot/scene/test/TestNavigation.tscn +++ /dev/null @@ -1,79 +0,0 @@ -[gd_scene load_steps=8 format=2] - -[ext_resource path="res://src/test/TestNavigation.cs" type="Script" id=1] -[ext_resource path="res://icon.png" type="Texture2D" id=2] -[ext_resource path="res://resource/sprite/environment/craftpix-net-248911/16x16.png" type="Texture2D" id=3] - -[sub_resource type="NavigationPolygon" id=2] -vertices = PackedVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) -polygons = [ PackedInt32Array( 0, 1, 2, 3 ) ] - -[sub_resource type="TileSet" id=3] -0/name = "16x16.png 0" -0/texture = ExtResource( 3 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 1, 1, 1, 1 ) -0/region = Rect2( 0, 0, 16, 16 ) -0/tile_mode = 0 -0/occluder_offset = Vector2( 0, 0 ) -0/navigation_offset = Vector2( 0, 0 ) -0/navigation = SubResource( 2 ) -0/shape_offset = Vector2( 0, 0 ) -0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -0/shape_one_way = false -0/shape_one_way_margin = 0.0 -0/shapes = [ ] -0/z_index = 0 - -[sub_resource type="NavigationPolygon" id=4] -vertices = PackedVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) -polygons = [ PackedInt32Array( 0, 1, 2, 3 ) ] - -[sub_resource type="TileSet" id=5] -0/name = "16x16.png 0" -0/texture = ExtResource( 3 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 1, 1, 1, 1 ) -0/region = Rect2( 32, 0, 16, 16 ) -0/tile_mode = 0 -0/occluder_offset = Vector2( 0, 0 ) -0/navigation_offset = Vector2( 0, 0 ) -0/navigation = SubResource( 4 ) -0/shape_offset = Vector2( 0, 0 ) -0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -0/shape_one_way = false -0/shape_one_way_margin = 0.0 -0/shapes = [ ] -0/z_index = 0 - -[node name="TestNavigation" type="Node2D"] -scale = Vector2( 4, 4 ) -script = ExtResource( 1 ) - -[node name="Marker2D" type="Marker2D" parent="."] -z_index = -3 - -[node name="Node2D" type="Node2D" parent="Marker2D"] - -[node name="Node2D" type="Node2D" parent="Marker2D/Node2D"] - -[node name="TileMap" type="TileMap" parent="Marker2D/Node2D/Node2D"] -tile_set = SubResource( 3 ) -cell_size = Vector2( 16, 16 ) -bake_navigation = true -format = 1 -tile_data = PackedInt32Array( 131074, 0, 0, 131075, 0, 0, 131076, 0, 0, 131077, 0, 0, 131078, 0, 0, 196610, 0, 0, 196611, 0, 0, 196612, 0, 0, 196613, 0, 0, 196614, 0, 0, 262146, 0, 0, 262147, 0, 0, 262148, 0, 0, 262149, 0, 0, 262150, 0, 0, 327682, 0, 0, 327683, 0, 0, 327684, 0, 0, 327685, 0, 0, 327686, 0, 0, 327699, 0, 0, 327700, 0, 0, 327701, 0, 0, 327702, 0, 0, 327703, 0, 0, 327704, 0, 0, 327705, 0, 0, 393218, 0, 0, 393219, 0, 0, 393220, 0, 0, 393221, 0, 0, 393222, 0, 0, 393223, 0, 0, 393224, 0, 0, 393225, 0, 0, 393226, 0, 0, 393227, 0, 0, 393228, 0, 0, 393229, 0, 0, 393235, 0, 0, 393236, 0, 0, 393237, 0, 0, 393238, 0, 0, 393239, 0, 0, 393240, 0, 0, 393241, 0, 0, 458754, 0, 0, 458755, 0, 0, 458756, 0, 0, 458757, 0, 0, 458758, 0, 0, 458759, 0, 0, 458760, 0, 0, 458761, 0, 0, 458762, 0, 0, 458763, 0, 0, 458764, 0, 0, 458765, 0, 0, 458771, 0, 0, 458772, 0, 0, 458773, 0, 0, 458774, 0, 0, 458775, 0, 0, 458776, 0, 0, 458777, 0, 0, 524299, 0, 0, 524300, 0, 0, 524301, 0, 0, 524307, 0, 0, 524308, 0, 0, 524309, 0, 0, 524310, 0, 0, 524311, 0, 0, 524312, 0, 0, 524313, 0, 0, 589835, 0, 0, 589836, 0, 0, 589837, 0, 0, 589843, 0, 0, 589844, 0, 0, 589845, 0, 0, 589846, 0, 0, 589847, 0, 0, 589848, 0, 0, 589849, 0, 0, 589850, 0, 0, 589851, 0, 0, 655371, 0, 0, 655372, 0, 0, 655373, 0, 0, 655379, 0, 0, 655380, 0, 0, 655381, 0, 0, 655382, 0, 0, 655383, 0, 0, 655384, 0, 0, 655385, 0, 0, 655386, 0, 0, 655387, 0, 0, 720897, 0, 0, 720898, 0, 0, 720899, 0, 0, 720900, 0, 0, 720901, 0, 0, 720902, 0, 0, 720903, 0, 0, 720904, 0, 0, 720905, 0, 0, 720906, 0, 0, 720907, 0, 0, 720908, 0, 0, 720909, 0, 0, 720915, 0, 0, 720916, 0, 0, 720917, 0, 0, 720918, 0, 0, 720919, 0, 0, 720920, 0, 0, 720921, 0, 0, 720922, 0, 0, 720923, 0, 0, 786433, 0, 0, 786434, 0, 0, 786435, 0, 0, 786436, 0, 0, 786437, 0, 0, 786438, 0, 0, 786439, 0, 0, 786440, 0, 0, 786441, 0, 0, 786442, 0, 0, 786443, 0, 0, 786444, 0, 0, 786445, 0, 0, 786446, 0, 0, 786447, 0, 0, 786448, 0, 0, 786449, 0, 0, 786450, 0, 0, 786451, 0, 0, 786452, 0, 0, 786453, 0, 0, 786454, 0, 0, 786455, 0, 0, 786456, 0, 0, 786457, 0, 0, 786458, 0, 0, 786459, 0, 0, 851979, 0, 0, 851980, 0, 0, 851981, 0, 0, 851982, 0, 0, 851983, 0, 0, 851984, 0, 0, 851985, 0, 0, 851986, 0, 0, 851987, 0, 0, 851988, 0, 0, 851989, 0, 0, 851990, 0, 0, 851991, 0, 0, 851992, 0, 0, 851993, 0, 0, 851994, 0, 0, 851995, 0, 0, 917515, 0, 0, 917516, 0, 0, 917517, 0, 0, 917518, 0, 0, 917519, 0, 0, 917520, 0, 0, 917521, 0, 0, 917522, 0, 0, 917523, 0, 0, 917524, 0, 0, 917525, 0, 0, 917526, 0, 0, 917527, 0, 0, 917528, 0, 0, 917529, 0, 0, 917530, 0, 0, 917531, 0, 0, 983051, 0, 0, 983052, 0, 0, 983053, 0, 0, 983054, 0, 0, 983055, 0, 0, 983056, 0, 0, 983057, 0, 0, 983058, 0, 0, 983059, 0, 0, 983060, 0, 0, 983061, 0, 0, 983062, 0, 0, 983063, 0, 0, 983064, 0, 0, 983065, 0, 0, 983066, 0, 0, 983067, 0, 0 ) - -[node name="Node2D2" type="Node2D" parent="Marker2D/Node2D"] - -[node name="TileMap" type="TileMap" parent="Marker2D/Node2D/Node2D2"] -tile_set = SubResource( 5 ) -cell_size = Vector2( 16, 16 ) -bake_navigation = true -format = 1 -tile_data = PackedInt32Array( 131088, 0, 0, 131089, 0, 0, 131090, 0, 0, 131091, 0, 0, 131092, 0, 0, 196622, 0, 0, 196623, 0, 0, 196624, 0, 0, 196628, 0, 0, 262156, 0, 0, 262157, 0, 0, 262158, 0, 0, 262164, 0, 0, 327692, 0, 0, 524302, 0, 0, 524303, 0, 0, 524304, 0, 0, 524305, 0, 0, 524306, 0, 0, 589838, 0, 0, 589839, 0, 0, 589840, 0, 0, 589841, 0, 0, 589842, 0, 0 ) - -[node name="Sprite2D" type="Sprite2D" parent="Marker2D"] -position = Vector2( 33, 32 ) -scale = Vector2( 0.2, 0.2 ) -texture = ExtResource( 2 ) diff --git a/DungeonShooting_Godot/scene/test/TestTileLayer.tscn b/DungeonShooting_Godot/scene/test/TestTileLayer.tscn index 90c2b63..ddc8bc6 100644 --- a/DungeonShooting_Godot/scene/test/TestTileLayer.tscn +++ b/DungeonShooting_Godot/scene/test/TestTileLayer.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=13 format=3 uid="uid://d1m4kunwifxax"] -[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1"] -[ext_resource type="Texture2D" uid="uid://chd2vtesap5cf" path="res://resource/sprite/role/role1.png" id="2"] +[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1"] +[ext_resource type="Texture2D" uid="uid://chd2vtesap5cf" path="res://resource/sprite/role/enemy0001/enemy0001.png" id="2"] [ext_resource type="Texture2D" uid="uid://5geiuvv6hyov" path="res://resource/sprite/gun/gun2.png" id="3"] [ext_resource type="Texture2D" uid="uid://dto03bc2qbhnj" path="res://resource/sprite/shell/shellCase.png" id="4"] + [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_ch2b5"] texture = ExtResource("1") margins = Vector2i(80, 144) diff --git a/DungeonShooting_Godot/src/framework/common/Utils.cs b/DungeonShooting_Godot/src/framework/common/Utils.cs index 48e3f3d..ce86420 100644 --- a/DungeonShooting_Godot/src/framework/common/Utils.cs +++ b/DungeonShooting_Godot/src/framework/common/Utils.cs @@ -15,7 +15,8 @@ { var dateTime = DateTime.Now; var num = dateTime.Year * 100000 + dateTime.Month * 100000 + dateTime.Day * 100000 + dateTime.Hour * 10000 + dateTime.Minute * 100 + dateTime.Second; - _random = new Random(num); + _random = new Random(0); + //_random = new Random(num); GD.Print("随机种子为: ", num); } diff --git a/DungeonShooting_Godot/src/framework/map/DungeonTile.cs b/DungeonShooting_Godot/src/framework/map/DungeonTile.cs index eaabe0c..b1f513e 100644 --- a/DungeonShooting_Godot/src/framework/map/DungeonTile.cs +++ b/DungeonShooting_Godot/src/framework/map/DungeonTile.cs @@ -92,20 +92,21 @@ { node.Position = roomInfo.GetWorldPosition() + (node.GlobalPosition - offset); } + + i--; + childCount--; } - - i--; - childCount--; } //物体标记 var activityMarks = tileInstance.GetMarks(); foreach (var activityMark in activityMarks) { + var pos = activityMark.Position; activityMark.GetParent().RemoveChild(activityMark); activityMark.Owner = null; //_tileRoot.AddChild(activityMark); - activityMark.Position = roomInfo.GetWorldPosition() + (activityMark.GlobalPosition - offset); + activityMark.Position = roomInfo.GetWorldPosition() + (pos - offset); activityMark.TileRoot = _tileRoot; //执行预处理操作 activityMark.Pretreatment(); diff --git a/DungeonShooting_Godot/src/game/GameApplication.cs b/DungeonShooting_Godot/src/game/GameApplication.cs index 704edb3..f1e07f6 100644 --- a/DungeonShooting_Godot/src/game/GameApplication.cs +++ b/DungeonShooting_Godot/src/game/GameApplication.cs @@ -95,7 +95,7 @@ DungeonConfig = new DungeonConfig(); DungeonConfig.GroupName = "testGroup"; - DungeonConfig.RoomCount = 20; + DungeonConfig.RoomCount = 5; } public override void _EnterTree() diff --git a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs index 065717e..ba90eb7 100644 --- a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs +++ b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs @@ -45,11 +45,6 @@ public Marker2D FirePoint { get; private set; } /// - /// 武器管的原点 - /// - public Marker2D OriginPoint { get; private set; } - - /// /// 弹壳抛出的点 /// public Marker2D ShellPoint { get; private set; } @@ -173,7 +168,6 @@ AnimationPlayer = GetNode("AnimationPlayer"); FirePoint = GetNode("FirePoint"); - OriginPoint = GetNode("OriginPoint"); ShellPoint = GetNode("ShellPoint"); //设置动画 @@ -181,11 +175,12 @@ { AnimatedSprite.SpriteFrames = ResourceManager.Load(attribute.SpriteFrames); } - AnimatedSprite.Position = Attribute.CenterPosition; + AnimatedSprite.Position = Attribute.ThrowSpritePosition; //开火位置 - FirePoint.Position = new Vector2(Attribute.FirePosition.X, -Attribute.FirePosition.Y); - OriginPoint.Position = new Vector2(0, -Attribute.FirePosition.Y); + FirePoint.Position = Attribute.FirePosition; + //弹壳投抛起始位置 + ShellPoint.Position = Attribute.ShellPosition; if (Attribute.AmmoCapacity > Attribute.MaxAmmoCapacity) { @@ -654,7 +649,7 @@ var tempAngle = Mathf.RadToDeg(tempRotation); //开火时枪口角度 - var fireRotation = Mathf.DegToRad(Master.MountPoint.RealAngle) + tempRotation; + var fireRotation = Mathf.DegToRad(Master.MountPoint.RealRotationDegrees) + tempRotation; //创建子弹 for (int i = 0; i < bulletCount; i++) { @@ -990,7 +985,7 @@ /// public float GetRealGlobalRotation() { - return Mathf.DegToRad(Master.MountPoint.RealAngle) + Rotation; + return Mathf.DegToRad(Master.MountPoint.RealRotationDegrees) + Rotation; } /// @@ -1060,7 +1055,7 @@ _weaponAttribute = _originWeaponAttribute; } //握把位置 - AnimatedSprite.Position = Attribute.HoldPosition; + AnimatedSprite.Position = Attribute.SpritePosition; //停止动画 AnimationPlayer.Stop(); //清除泛白效果 @@ -1084,7 +1079,7 @@ Master = null; CollisionLayer = _tempLayer; _weaponAttribute = _originWeaponAttribute; - AnimatedSprite.Position = Attribute.CenterPosition; + AnimatedSprite.Position = Attribute.ThrowSpritePosition; //清除 Ai 拾起标记 RemoveSign(SignNames.AiFindWeaponSign); OnRemove(); @@ -1112,6 +1107,28 @@ OnConceal(); } + //-------------------------- ----- 子弹相关 ----------------------------- + + /// + /// 投抛弹壳的默认实现方式, shellId为弹壳id, 不需要前缀 + /// + protected ActivityObject ThrowShell(string shellId) + { + var shellPosition = Master.MountPoint.Position + ShellPoint.Position; + var startPos = ShellPoint.GlobalPosition; + var startHeight = -shellPosition.Y; + startPos.Y += startHeight; + var direction = GlobalRotationDegrees + Utils.RandomRangeInt(-30, 30) + 180; + var verticalSpeed = Utils.RandomRangeInt(60, 120); + var velocity = new Vector2(Utils.RandomRangeInt(20, 60), 0).Rotated(direction * Mathf.Pi / 180); + var rotate = Utils.RandomRangeInt(-720, 720); + var shell = Create(ActivityIdPrefix.Shell + shellId); + shell.Rotation = Master.MountPoint.RealRotation; + shell.InheritVelocity(Master); + shell.Throw(startPos, startHeight, verticalSpeed, velocity, rotate); + return shell; + } + //-------------------------------- Ai相关 ----------------------------- /// diff --git a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs index 6c58a92..e0b61e4 100644 --- a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs +++ b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs @@ -131,17 +131,17 @@ /// public float MinDistance = 800; /// - /// 武器精灵的旋转中心坐标 - /// - public Vector2 CenterPosition = new Vector2(0, 0); - /// /// 开火位置 /// public Vector2 FirePosition = new Vector2(11, 0); /// - /// 握把位置 + /// 精灵位置 /// - public Vector2 HoldPosition = new Vector2(4, -3); + public Vector2 SpritePosition = new Vector2(4, -3); + /// + /// 弹壳投抛起始位置 + /// + public Vector2 ShellPosition = new Vector2(5, -2.5f); /// /// 重量 /// @@ -175,6 +175,10 @@ /// public string BulletId = ActivityIdPrefix.Bullet + "0001"; /// + /// 武器精灵投抛时的旋转中心坐标 + /// + public Vector2 ThrowSpritePosition = new Vector2(0, 0); + /// /// 投抛状态下物体碰撞器大小 /// public Vector2 ThrowCollisionSize = new Vector2(20, 15); @@ -227,9 +231,9 @@ attr.ScatteringRangeBackSpeed = ScatteringRangeBackSpeed; attr.MaxDistance = MaxDistance; attr.MinDistance = MinDistance; - attr.CenterPosition = CenterPosition; attr.FirePosition = FirePosition; - attr.HoldPosition = HoldPosition; + attr.ShellPosition = ShellPosition; + attr.SpritePosition = SpritePosition; attr.Weight = Weight; attr.MaxBacklash = MaxBacklash; attr.MinBacklash = MinBacklash; @@ -239,6 +243,7 @@ attr.UpliftAngleRestore = UpliftAngleRestore; attr.AiTargetLockingTime = AiTargetLockingTime; attr.BulletId = BulletId; + attr.ThrowSpritePosition = ThrowSpritePosition; attr.ThrowCollisionSize = ThrowCollisionSize; return attr; } diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs index 0dec8e8..b8ef2bf 100644 --- a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs +++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs @@ -16,7 +16,7 @@ Icon = ResourcePath.resource_sprite_gun_gun4_png; SpriteFrames = ResourcePath.resource_spriteFrames_Weapon0001_tres; Weight = 40; - CenterPosition = new Vector2(0.4f, -2.6f); + ThrowSpritePosition = new Vector2(0.4f, -2.6f); StartFiringSpeed = 480; StartScatteringRange = 30; FinalScatteringRange = 90; @@ -41,7 +41,10 @@ //抬起角度 UpliftAngle = 10; //开火位置 - FirePosition = new Vector2(20F, 2.5F); + FirePosition = new Vector2(19, -1.5f); + //握把位置 + SpritePosition = new Vector2(4, 0); + //ShellPosition = new Vector2(4, -2.5f); AiUseAttribute = Clone(); AiUseAttribute.AiTargetLockingTime = 0.5f; @@ -61,7 +64,7 @@ Icon = ResourcePath.resource_sprite_gun_gun3_png; SpriteFrames = ResourcePath.resource_spriteFrames_Weapon0003_tres; Weight = 20; - CenterPosition = new Vector2(0.4f, -2.6f); + ThrowSpritePosition = new Vector2(0.4f, -2.6f); WeightType = WeaponWeightType.DeputyWeapon; StartFiringSpeed = 300; FinalFiringSpeed = 300; @@ -101,15 +104,7 @@ protected override void OnFire() { //创建一个弹壳 - var startPos = Master.GlobalPosition; - var startHeight = 6; - var direction = GlobalRotationDegrees + Utils.RandomRangeInt(-30, 30) + 180; - var verticalSpeed = Utils.RandomRangeInt(60, 120); - var velocity = new Vector2(Utils.RandomRangeInt(20, 60), 0).Rotated(direction * Mathf.Pi / 180); - var rotate = Utils.RandomRangeInt(-720, 720); - var shell = Create(ActivityIdPrefix.Shell + "0001"); - shell.InheritVelocity(Master); - shell.Throw(startPos, startHeight, verticalSpeed, velocity, rotate); + ThrowShell("0001"); if (Master == Player.Current) { diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs index e5e3648..549a8ee 100644 --- a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs +++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs @@ -12,7 +12,7 @@ Icon = ResourcePath.resource_sprite_gun_gun2_png; SpriteFrames = ResourcePath.resource_spriteFrames_Weapon0002_tres; Weight = 40; - CenterPosition = new Vector2(0.4f, -2.6f); + ThrowSpritePosition = new Vector2(0.4f, -2.6f); StartFiringSpeed = 400; StartScatteringRange = 30; FinalScatteringRange = 90; @@ -65,15 +65,7 @@ protected override void OnFire() { //创建一个弹壳 - var startPos = Master.GlobalPosition; - var startHeight = 6; - var direction = GlobalRotationDegrees + Utils.RandomRangeInt(-30, 30) + 180; - var verticalSpeed = Utils.RandomRangeInt(60, 120); - var velocity = new Vector2(Utils.RandomRangeInt(20, 60), 0).Rotated(direction * Mathf.Pi / 180); - var rotate = Utils.RandomRangeInt(-720, 720); - var shell = Create(ActivityIdPrefix.Shell + "0001"); - shell.InheritVelocity(Master); - shell.Throw(startPos, startHeight, verticalSpeed, velocity, rotate); + ThrowShell("0001"); if (Master == Player.Current) { diff --git a/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs b/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs index c6a328b..8171d86 100644 --- a/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs +++ b/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs @@ -21,7 +21,7 @@ AmmoCapacity = 180; MaxAmmoCapacity = AmmoCapacity; //握把位置 - HoldPosition = new Vector2(10, 0); + SpritePosition = new Vector2(10, 0); MaxDistance = MinDistance = 35; //后坐力改为向前, 模拟手伸长的效果 MaxBacklash = -8; diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs index 0d83f1d..057f5e4 100644 --- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs +++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs @@ -66,21 +66,6 @@ public const string resource_sprite_effects_KnifeHit1_png = "res://resource/sprite/effects/KnifeHit1.png"; public const string resource_sprite_effects_ShotFire_png = "res://resource/sprite/effects/ShotFire.png"; public const string resource_sprite_effects_Smoke_png = "res://resource/sprite/effects/Smoke.png"; - public const string resource_sprite_effects_activityObject_Enemy0001_Debris_png = "res://resource/sprite/effects/activityObject/Enemy0001_Debris.png"; - public const string resource_sprite_environment_craftpixnet248911_16x16_png = "res://resource/sprite/environment/craftpix-net-248911/16x16.png"; - public const string resource_sprite_environment_craftpixnet248911_ANotetotheDev_txt = "res://resource/sprite/environment/craftpix-net-248911/A Note to the Dev.txt"; - public const string resource_sprite_environment_craftpixnet248911_license_txt = "res://resource/sprite/environment/craftpix-net-248911/license.txt"; - public const string resource_sprite_environment_craftpixnet248911_AllTileset_16x16_png = "res://resource/sprite/environment/craftpix-net-248911/All Tileset/16x16.png"; - public const string resource_sprite_environment_craftpixnet248911_Palette_Pallete_txt = "res://resource/sprite/environment/craftpix-net-248911/Palette/Pallete.txt"; - public const string resource_sprite_environment_itchioDungeonTileset4_16x16dungeoniiwallreconfigv04spritesheet_png = "res://resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png"; - public const string resource_sprite_environment_itchioDungeonTileset4_website_txt = "res://resource/sprite/environment/itch-io-DungeonTileset4/website.txt"; - public const string resource_sprite_environment_itchioDungeonTileset4_bow_arrow_png = "res://resource/sprite/environment/itch-io-DungeonTileset4/bow/arrow.png"; - public const string resource_sprite_environment_itchioDungeonTileset4_bow_bow_png = "res://resource/sprite/environment/itch-io-DungeonTileset4/bow/bow.png"; - public const string resource_sprite_environment_itchioDungeonTileset4_bow_effect_hit0_png = "res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit0.png"; - public const string resource_sprite_environment_itchioDungeonTileset4_bow_effect_hit1_png = "res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit1.png"; - public const string resource_sprite_environment_itchioDungeonTileset4_bow_effect_hit2_png = "res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit2.png"; - public const string resource_sprite_environment_itchioDungeonTileset4_bow_effect_hit3_png = "res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit3.png"; - public const string resource_sprite_environment_itchioDungeonTileset4_bow_effect_hit4_png = "res://resource/sprite/environment/itch-io-DungeonTileset4/bow/effect/hit4.png"; public const string resource_sprite_gun_bow_png = "res://resource/sprite/gun/bow.png"; public const string resource_sprite_gun_gun1_png = "res://resource/sprite/gun/gun1.png"; public const string resource_sprite_gun_gun2_png = "res://resource/sprite/gun/gun2.png"; @@ -91,9 +76,10 @@ public const string resource_sprite_gun_gun7_png = "res://resource/sprite/gun/gun7.png"; public const string resource_sprite_gun_gun8_png = "res://resource/sprite/gun/gun8.png"; public const string resource_sprite_gun_knife1_png = "res://resource/sprite/gun/knife1.png"; - public const string resource_sprite_gun_out_default_png = "res://resource/sprite/gun/out/default.png"; - public const string resource_sprite_map_door1_down_png = "res://resource/sprite/map/door1_down.png"; - public const string resource_sprite_role_role1_png = "res://resource/sprite/role/role1.png"; + public const string resource_sprite_gun_weapon0001_weapon0001_png = "res://resource/sprite/gun/weapon0001/weapon0001.png"; + public const string resource_sprite_map_map1_16x16dungeoniiwallreconfigv04spritesheet_png = "res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png"; + public const string resource_sprite_map_map1_door1_down_png = "res://resource/sprite/map/map1/door1_down.png"; + public const string resource_sprite_map_map1_website_txt = "res://resource/sprite/map/map1/website.txt"; public const string resource_sprite_role_role10_png = "res://resource/sprite/role/role10.png"; public const string resource_sprite_role_role2_png = "res://resource/sprite/role/role2.png"; public const string resource_sprite_role_role3_png = "res://resource/sprite/role/role3.png"; @@ -103,6 +89,8 @@ public const string resource_sprite_role_role7_png = "res://resource/sprite/role/role7.png"; public const string resource_sprite_role_role8_png = "res://resource/sprite/role/role8.png"; public const string resource_sprite_role_role9_png = "res://resource/sprite/role/role9.png"; + public const string resource_sprite_role_enemy0001_enemy0001_png = "res://resource/sprite/role/enemy0001/enemy0001.png"; + public const string resource_sprite_role_enemy0001_enemy0001_Debris_png = "res://resource/sprite/role/enemy0001/enemy0001_Debris.png"; public const string resource_sprite_shell_shellCase_png = "res://resource/sprite/shell/shellCase.png"; public const string resource_sprite_ui_CursorCenter_png = "res://resource/sprite/ui/CursorCenter.png"; public const string resource_sprite_ui_cursors_png = "res://resource/sprite/ui/cursors.png"; @@ -136,7 +124,6 @@ public const string scene_test_TestCommpont_tscn = "res://scene/test/TestCommpont.tscn"; public const string scene_test_TestExpression_tscn = "res://scene/test/TestExpression.tscn"; public const string scene_test_TestGenerateDungeon_tscn = "res://scene/test/TestGenerateDungeon.tscn"; - public const string scene_test_TestNavigation_tscn = "res://scene/test/TestNavigation.tscn"; public const string scene_test_TestNavigation2_tscn = "res://scene/test/TestNavigation2.tscn"; public const string scene_test_TestNavigationPolygon_tscn = "res://scene/test/TestNavigationPolygon.tscn"; public const string scene_test_TestNewTileMap_tscn = "res://scene/test/TestNewTileMap.tscn"; diff --git a/DungeonShooting_Godot/src/game/role/MountRotation.cs b/DungeonShooting_Godot/src/game/role/MountRotation.cs index 32c1e1c..4b4dacb 100644 --- a/DungeonShooting_Godot/src/game/role/MountRotation.cs +++ b/DungeonShooting_Godot/src/game/role/MountRotation.cs @@ -19,7 +19,12 @@ /// /// 当前节点真实的旋转角度, 角度制 /// - public float RealAngle { get; private set; } + public float RealRotationDegrees { get; private set; } + + /// + /// 当前节点真实的旋转角度, 弧度制 + /// + public float RealRotation => Mathf.DegToRad(RealRotationDegrees); /// /// 设置看向的目标点 @@ -45,7 +50,7 @@ angle = Mathf.Clamp(angle, -100, 100); } - RealAngle = angle; + RealRotationDegrees = angle; // if (Master.GlobalPosition.X >= target.X) // { diff --git a/DungeonShooting_Godot/src/game/role/Role.cs b/DungeonShooting_Godot/src/game/role/Role.cs index e730a5e..abe3dc2 100644 --- a/DungeonShooting_Godot/src/game/role/Role.cs +++ b/DungeonShooting_Godot/src/game/role/Role.cs @@ -443,7 +443,7 @@ return; } - var temp = weapon.Attribute.HoldPosition; + var temp = weapon.Attribute.SpritePosition; if (Face == FaceDirection.Left) { temp.Y = -temp.Y; diff --git a/DungeonShooting_Godot/src/game/room/DungeonManager.cs b/DungeonShooting_Godot/src/game/room/DungeonManager.cs index 9806ca5..689b707 100644 --- a/DungeonShooting_Godot/src/game/room/DungeonManager.cs +++ b/DungeonShooting_Godot/src/game/room/DungeonManager.cs @@ -140,6 +140,7 @@ var player = ActivityObject.Create(ActivityIdPrefix.Role + "0001"); if (playerBirthMark != null) { + //player.Position = new Vector2(50, 50); player.Position = playerBirthMark.Position; } player.Name = "Player";