diff --git a/DungeonShooting_ExcelTool/ExcelGenerator.cs b/DungeonShooting_ExcelTool/ExcelGenerator.cs index e589d0a..2e241f9 100644 --- a/DungeonShooting_ExcelTool/ExcelGenerator.cs +++ b/DungeonShooting_ExcelTool/ExcelGenerator.cs @@ -61,6 +61,10 @@ } Console.WriteLine($"一共检测到excel表共{excelDataList.Count}张."); + if (excelDataList.Count == 0) + { + return true; + } if (Directory.Exists(CodeOutPath)) { @@ -282,6 +286,10 @@ { Dictionary data = null; var row = sheet1.GetRow(i); + if (row == null) + { + continue; + } for (int j = 0; j < columnCount; j++) { var cell = row.GetCell(j); diff --git a/DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.dll b/DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.dll index b71926b..cf56fac 100644 --- a/DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.dll +++ b/DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.dll Binary files differ diff --git a/DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.pdb b/DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.pdb index ea251e3..1168e49 100644 --- a/DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.pdb +++ b/DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.pdb Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx index dba30a6..96d2e05 100644 --- a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx index 888248b..1e1dde8 100644 --- a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx Binary files differ diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor.tscn deleted file mode 100644 index 45c4063..0000000 --- a/DungeonShooting_Godot/prefab/map/RoomDoor.tscn +++ /dev/null @@ -1,62 +0,0 @@ -[gd_scene load_steps=10 format=3 uid="uid://dswcawdc85pgq"] - -[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/map1/door1_down.png" id="3_knmoy"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_x5aop"] -resource_local_to_scene = true -shader = ExtResource("2_d8jnk") -shader_parameter/blend = Color(0, 0, 0, 0.470588) -shader_parameter/schedule = 1 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_f8vun"] -resource_local_to_scene = true -shader = ExtResource("2_d8jnk") -shader_parameter/blend = Color(1, 1, 1, 1) -shader_parameter/schedule = 0 - -[sub_resource type="AtlasTexture" id="AtlasTexture_wfl7i"] -atlas = ExtResource("3_knmoy") -region = Rect2(32, 0, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_j20kt"] -atlas = ExtResource("3_knmoy") -region = Rect2(32, 32, 16, 48) - -[sub_resource type="SpriteFrames" id="SpriteFrames_ugstb"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_wfl7i") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_j20kt") -}], -"loop": true, -"name": &"default", -"speed": 5.0 -}] - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_lvvwj"] -resource_local_to_scene = true -size = Vector2(32, 23) - -[node name="RoomDoor" type="Node"] -script = ExtResource("1_8es7a") -collision_layer = 1 -z_index = 15 - -[node name="ShadowSprite" type="Sprite2D" parent="."] -z_index = -1 -material = SubResource("ShaderMaterial_x5aop") -position = Vector2(0, 8) - -[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] -material = SubResource("ShaderMaterial_f8vun") -position = Vector2(0, -8) -sprite_frames = SubResource("SpriteFrames_ugstb") - -[node name="Collision" type="CollisionShape2D" parent="."] -position = Vector2(0, -3.5) -shape = SubResource("RectangleShape2D_lvvwj") diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn index 1dbb2a8..6ade137 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn @@ -1,19 +1,18 @@ -[gd_scene load_steps=7 format=3] +[gd_scene load_steps=7 format=3 uid="uid://yhewdkpru0up"] -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_im6r2"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_b0axw"] -[ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/RoomDoor_EW.tres" id="3_07nn2"] - +[ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_4c6sw"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_lwx51"] +[ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/RoomDoor_EW.tres" id="3_pjvd8"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true -shader = ExtResource("2_b0axw") +shader = ExtResource("2_lwx51") shader_parameter/blend = Color(0, 0, 0, 0.470588) shader_parameter/schedule = 1 [sub_resource type="ShaderMaterial" id="ShaderMaterial_t4ayq"] resource_local_to_scene = true -shader = ExtResource("2_b0axw") +shader = ExtResource("2_lwx51") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 @@ -21,10 +20,11 @@ resource_local_to_scene = true size = Vector2(14, 40) -[node name="RoomDoor_N" type="Node"] -script = ExtResource("1_im6r2") -IsStatic = true -collision_layer = 1 +[node name="RoomDoor_N" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")] +script = ExtResource("1_4c6sw") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") [node name="ShadowSprite" type="Sprite2D" parent="."] z_index = -1 @@ -33,7 +33,7 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") position = Vector2(0, -8) -sprite_frames = ExtResource("3_07nn2") +sprite_frames = ExtResource("3_pjvd8") animation = &"closeDoor" autoplay = "default" diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn index 2312ec2..54aa32f 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn @@ -1,19 +1,18 @@ -[gd_scene load_steps=7 format=3] +[gd_scene load_steps=7 format=3 uid="uid://cbtj6bsaqqomt"] -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_2ymo1"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_544pm"] -[ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/RoomDoor_NS.tres" id="3_7b7or"] - +[ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_220be"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_h5ru6"] +[ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/RoomDoor_NS.tres" id="3_apluc"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true -shader = ExtResource("2_544pm") +shader = ExtResource("2_h5ru6") shader_parameter/blend = Color(0, 0, 0, 0.470588) shader_parameter/schedule = 1 [sub_resource type="ShaderMaterial" id="ShaderMaterial_t4ayq"] resource_local_to_scene = true -shader = ExtResource("2_544pm") +shader = ExtResource("2_h5ru6") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 @@ -21,10 +20,11 @@ resource_local_to_scene = true size = Vector2(32, 23) -[node name="RoomDoor_N" type="Node"] -script = ExtResource("1_2ymo1") -IsStatic = true -collision_layer = 1 +[node name="RoomDoor_N" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")] +script = ExtResource("1_220be") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") [node name="ShadowSprite" type="Sprite2D" parent="."] z_index = -1 @@ -33,7 +33,7 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") position = Vector2(0, -8) -sprite_frames = ExtResource("3_7b7or") +sprite_frames = ExtResource("3_apluc") animation = &"openDoor" autoplay = "default" diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn index de76043..e3b5afb 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn @@ -1,19 +1,18 @@ -[gd_scene load_steps=7 format=3] +[gd_scene load_steps=7 format=3 uid="uid://bvfnnqo71knb"] -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_g2uu2"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_kqw3x"] -[ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/RoomDoor_NS.tres" id="3_o0nxg"] - +[ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_f3qbq"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_6vvcd"] +[ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/RoomDoor_NS.tres" id="3_at5v2"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true -shader = ExtResource("2_kqw3x") +shader = ExtResource("2_6vvcd") shader_parameter/blend = Color(0, 0, 0, 0.470588) shader_parameter/schedule = 1 [sub_resource type="ShaderMaterial" id="ShaderMaterial_t4ayq"] resource_local_to_scene = true -shader = ExtResource("2_kqw3x") +shader = ExtResource("2_6vvcd") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 @@ -21,10 +20,11 @@ resource_local_to_scene = true size = Vector2(32, 23) -[node name="RoomDoor_N" type="Node"] -script = ExtResource("1_g2uu2") -IsStatic = true -collision_layer = 1 +[node name="RoomDoor_N" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")] +script = ExtResource("1_f3qbq") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") [node name="ShadowSprite" type="Sprite2D" parent="."] z_index = -1 @@ -33,7 +33,7 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") position = Vector2(0, -8) -sprite_frames = ExtResource("3_o0nxg") +sprite_frames = ExtResource("3_at5v2") autoplay = "default" [node name="Collision" type="CollisionShape2D" parent="."] diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn index 57849d5..e32ebf8 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn @@ -1,19 +1,18 @@ -[gd_scene load_steps=7 format=3] +[gd_scene load_steps=7 format=3 uid="uid://wmedlesabvr3"] -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_ivf53"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_wsh33"] -[ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/RoomDoor_EW.tres" id="3_ptoof"] - +[ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_agux2"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_wx2w3"] +[ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/RoomDoor_EW.tres" id="3_a2hvw"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true -shader = ExtResource("2_wsh33") +shader = ExtResource("2_wx2w3") shader_parameter/blend = Color(0, 0, 0, 0.470588) shader_parameter/schedule = 1 [sub_resource type="ShaderMaterial" id="ShaderMaterial_t4ayq"] resource_local_to_scene = true -shader = ExtResource("2_wsh33") +shader = ExtResource("2_wx2w3") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 @@ -21,10 +20,11 @@ resource_local_to_scene = true size = Vector2(14, 40) -[node name="RoomDoor_N" type="Node"] -script = ExtResource("1_ivf53") -IsStatic = true -collision_layer = 1 +[node name="RoomDoor_N" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")] +script = ExtResource("1_agux2") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") [node name="ShadowSprite" type="Sprite2D" parent="."] z_index = -1 @@ -33,7 +33,7 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") position = Vector2(0, -8) -sprite_frames = ExtResource("3_ptoof") +sprite_frames = ExtResource("3_a2hvw") autoplay = "default" [node name="Collision" type="CollisionShape2D" parent="."] diff --git a/DungeonShooting_Godot/prefab/role/Player.tscn b/DungeonShooting_Godot/prefab/role/Player.tscn index 6e091b3..6e8ec65 100644 --- a/DungeonShooting_Godot/prefab/role/Player.tscn +++ b/DungeonShooting_Godot/prefab/role/Player.tscn @@ -1,72 +1,72 @@ [gd_scene load_steps=24 format=3 uid="uid://cp2uhtlb6h7k2"] -[ext_resource type="Script" path="res://src/game/role/Player.cs" id="1_sq1r0"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_v6n5s"] -[ext_resource type="Texture2D" uid="uid://bhwhhg2dfsr26" path="res://resource/sprite/role/role2.png" id="3_vci0q"] -[ext_resource type="Script" path="res://src/game/role/MountRotation.cs" id="4_uh4x0"] +[ext_resource type="Script" path="res://src/game/role/Player.cs" id="1_4exnp"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_8fdt4"] +[ext_resource type="Texture2D" uid="uid://bhwhhg2dfsr26" path="res://resource/sprite/role/role2.png" id="3_66v5o"] +[ext_resource type="Script" path="res://src/game/role/MountRotation.cs" id="4_r0uet"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_vejn8"] resource_local_to_scene = true -shader = ExtResource("2_v6n5s") +shader = ExtResource("2_8fdt4") shader_parameter/blend = Color(0, 0, 0, 0.470588) shader_parameter/schedule = 1 [sub_resource type="ShaderMaterial" id="ShaderMaterial_0gb8j"] resource_local_to_scene = true -shader = ExtResource("2_v6n5s") +shader = ExtResource("2_8fdt4") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 [sub_resource type="AtlasTexture" id="AtlasTexture_tmewn"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(0, 0, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_dvg4a"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(0, 24, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_kvuct"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(16, 24, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_5op76"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(32, 24, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_helyc"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(48, 24, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_67mn8"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(48, 48, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_jeywq"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(32, 48, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_oycx8"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(16, 48, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_tjg1t"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(0, 48, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_2ltxw"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(0, 48, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_x1va1"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(16, 48, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_ic2p5"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(32, 48, 16, 24) [sub_resource type="AtlasTexture" id="AtlasTexture_j3hdu"] -atlas = ExtResource("3_vci0q") +atlas = ExtResource("3_66v5o") region = Rect2(48, 48, 16, 24) [sub_resource type="SpriteFrames" id="SpriteFrames_3poqo"] @@ -140,10 +140,9 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_n68nu"] size = Vector2(10, 16.5) -[node name="Player" type="CharacterBody2D" node_paths=PackedStringArray("HurtArea", "MountPoint", "BackMountPoint", "InteractiveArea", "ShadowSprite", "AnimatedSprite", "Collision")] -script = ExtResource("1_sq1r0") +[node name="Player" type="CharacterBody2D" node_paths=PackedStringArray("HurtArea", "BackMountPoint", "InteractiveArea", "ShadowSprite", "AnimatedSprite", "Collision")] +script = ExtResource("1_4exnp") HurtArea = NodePath("HurtArea") -MountPoint = NodePath("MountPoint") BackMountPoint = NodePath("BackMountPoint") InteractiveArea = NodePath("InteractiveArea") ShadowSprite = NodePath("ShadowSprite") @@ -187,4 +186,4 @@ [node name="MountPoint" type="Marker2D" parent="."] position = Vector2(1, -6) -script = ExtResource("4_uh4x0") +script = ExtResource("4_r0uet") diff --git a/DungeonShooting_Godot/prefab/ui/EditorTools.tscn b/DungeonShooting_Godot/prefab/ui/EditorTools.tscn index 87c510a..27e37f9 100644 --- a/DungeonShooting_Godot/prefab/ui/EditorTools.tscn +++ b/DungeonShooting_Godot/prefab/ui/EditorTools.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://kw3o772vpne"] -[ext_resource type="Script" path="res://src/game/ui/editorTools/EditorToolsPanel.cs" id="1_kqvmy"] +[ext_resource type="Script" path="res://src/game/ui/editorTools/EditorToolsPanel.cs" id="1_43d6l"] [node name="EditorTools" type="Control"] layout_mode = 3 @@ -11,7 +11,7 @@ grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -script = ExtResource("1_kqvmy") +script = ExtResource("1_43d6l") [node name="ScrollContainer" type="ScrollContainer" parent="."] layout_mode = 0 diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon.tscn index 97c86e5..c659747 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"] +[gd_scene load_steps=9 format=3 uid="uid://cxltmhhp4rbyk"] -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_vfmla"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_5ox1n"] +[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_76n4k"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_qy88l"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"] resource_local_to_scene = true -shader = ExtResource("2_5ox1n") +shader = ExtResource("2_qy88l") 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("2_5ox1n") +shader = ExtResource("2_qy88l") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 @@ -57,7 +57,7 @@ } [node name="Weapon" type="Node"] -script = ExtResource("1_vfmla") +script = ExtResource("1_76n4k") collision_layer = 4 [node name="ShadowSprite" type="Sprite2D" parent="."] diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn new file mode 100644 index 0000000..0add557 --- /dev/null +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn @@ -0,0 +1,88 @@ +[gd_scene load_steps=9 format=3 uid="uid://byy386hv6bko0"] + +[ext_resource type="Script" path="res://src/game/item/weapon/gun/Gun.cs" id="1_0ildu"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_yhdim"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"] +resource_local_to_scene = true +shader = ExtResource("2_yhdim") +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("2_yhdim") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_3p5jk"] +size = Vector2(19.5, 8.75) + +[sub_resource type="Animation" id="Animation_x136i"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("AnimatedSprite:material:shader_parameter/schedule") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0] +} + +[sub_resource type="Animation" id="Animation_3piau"] +resource_name = "floodlight" +length = 3.0 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("AnimatedSprite:material:shader_parameter/schedule") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 2.3, 2.6, 2.7, 3), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 0, +"values": [0, 0, 0.5, 0.5, 0] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_trkjd"] +_data = { +"RESET": SubResource("Animation_x136i"), +"floodlight": SubResource("Animation_3piau") +} + +[node name="Weapon0001" type="CharacterBody2D" node_paths=PackedStringArray("FirePoint", "ShellPoint", "AnimationPlayer", "ShadowSprite", "AnimatedSprite", "Collision")] +collision_layer = 4 +script = ExtResource("1_0ildu") +FirePoint = NodePath("FirePoint") +ShellPoint = NodePath("ShellPoint") +AnimationPlayer = NodePath("AnimationPlayer") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") + +[node name="ShadowSprite" type="Sprite2D" parent="."] +z_index = -1 +material = SubResource("ShaderMaterial_cbiyh") + +[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +material = SubResource("ShaderMaterial_o36tv") + +[node name="ShellPoint" type="Marker2D" parent="."] +position = Vector2(0, -2) + +[node name="FirePoint" type="Marker2D" parent="."] +position = Vector2(10, -2) + +[node name="Collision" type="CollisionShape2D" parent="."] +shape = SubResource("RectangleShape2D_3p5jk") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +"": SubResource("AnimationLibrary_trkjd") +} diff --git a/DungeonShooting_Godot/prefab/weapon/WeaponPreview.tscn b/DungeonShooting_Godot/prefab/weapon/WeaponPreview.tscn index be64274..db28219 100644 --- a/DungeonShooting_Godot/prefab/weapon/WeaponPreview.tscn +++ b/DungeonShooting_Godot/prefab/weapon/WeaponPreview.tscn @@ -1,22 +1,22 @@ [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_kc66u"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_e70v8"] -[ext_resource type="SpriteFrames" uid="uid://djdvlmqsn8bie" path="res://resource/spriteFrames/Weapon0005.tres" id="3_53icg"] +[ext_resource type="PackedScene" uid="uid://byy386hv6bko0" path="res://prefab/weapon/Weapon0001.tscn" id="1_m6dhx"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_3enxv"] +[ext_resource type="SpriteFrames" uid="uid://djdvlmqsn8bie" path="res://resource/spriteFrames/Weapon0005.tres" id="3_rmwmt"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_ki13x"] resource_local_to_scene = true -shader = ExtResource("2_e70v8") +shader = ExtResource("2_3enxv") 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_e70v8") +shader = ExtResource("2_3enxv") shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0 -[node name="WeaponPreview" instance=ExtResource("1_kc66u")] +[node name="WeaponPreview" instance=ExtResource("1_m6dhx")] [node name="ShadowSprite" parent="." index="0"] material = SubResource("ShaderMaterial_ki13x") @@ -24,7 +24,7 @@ [node name="AnimatedSprite" parent="." index="1"] material = SubResource("ShaderMaterial_5ojsm") position = Vector2(9, 0) -sprite_frames = ExtResource("3_53icg") +sprite_frames = ExtResource("3_rmwmt") [node name="ShellPoint" parent="." index="2"] position = Vector2(7, -3.5) diff --git a/DungeonShooting_Godot/prefab/weapon/bullet/Bullet0001.tscn b/DungeonShooting_Godot/prefab/weapon/bullet/Bullet0001.tscn new file mode 100644 index 0000000..8c2a3c7 --- /dev/null +++ b/DungeonShooting_Godot/prefab/weapon/bullet/Bullet0001.tscn @@ -0,0 +1,66 @@ +[gd_scene load_steps=9 format=3 uid="uid://bj4kmvt8jg1cf"] + +[ext_resource type="Script" path="res://src/game/item/bullet/Bullet.cs" id="1_82ma0"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_p12d3"] +[ext_resource type="Texture2D" uid="uid://bu0b11hiuecxy" path="res://resource/sprite/bullet/bullet.png" id="3_hjgpe"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_5a4f2"] +resource_local_to_scene = true +shader = ExtResource("2_p12d3") +shader_parameter/blend = Color(0, 0, 0, 0.470588) +shader_parameter/schedule = 1 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_o0655"] +resource_local_to_scene = true +shader = ExtResource("2_p12d3") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0 + +[sub_resource type="SpriteFrames" id="SpriteFrames_5wvmf"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("3_hjgpe") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_c0onq"] +size = Vector2(44.72, 12) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_lcqb8"] +size = Vector2(11, 4) + +[node name="Bullet0001" type="CharacterBody2D" node_paths=PackedStringArray("CollisionArea", "ShadowSprite", "AnimatedSprite", "Collision")] +collision_layer = 2 +script = ExtResource("1_82ma0") +CollisionArea = NodePath("CollisionArea") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") + +[node name="ShadowSprite" type="Sprite2D" parent="."] +z_index = -1 +material = SubResource("ShaderMaterial_5a4f2") + +[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +modulate = Color(1.8, 1.8, 1.8, 1) +material = SubResource("ShaderMaterial_o0655") +sprite_frames = SubResource("SpriteFrames_5wvmf") + +[node name="CollisionArea" type="Area2D" parent="."] +visible = false +collision_layer = 0 +collision_mask = 0 +monitorable = false + +[node name="CollisionShape2D" type="CollisionShape2D" parent="CollisionArea"] +position = Vector2(2.93353, 0) +scale = Vector2(0.226586, 0.333333) +shape = SubResource("RectangleShape2D_c0onq") + +[node name="Collision" type="CollisionShape2D" parent="."] +position = Vector2(2.5, 0) +shape = SubResource("RectangleShape2D_lcqb8") diff --git a/DungeonShooting_Godot/prefab/weapon/bullet/Bullet0002.tscn b/DungeonShooting_Godot/prefab/weapon/bullet/Bullet0002.tscn new file mode 100644 index 0000000..f951e9f --- /dev/null +++ b/DungeonShooting_Godot/prefab/weapon/bullet/Bullet0002.tscn @@ -0,0 +1,65 @@ +[gd_scene load_steps=9 format=3 uid="uid://bqkj0rn72ppge"] + +[ext_resource type="Script" path="res://src/game/item/bullet/Bullet.cs" id="1_wphe7"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_l3yjy"] +[ext_resource type="Texture2D" uid="uid://ctsvj4y1t538u" path="res://resource/sprite/bullet/bullet3.png" id="3_nf7ic"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_5a4f2"] +resource_local_to_scene = true +shader = ExtResource("2_l3yjy") +shader_parameter/blend = Color(0, 0, 0, 0.470588) +shader_parameter/schedule = 1 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_o0655"] +resource_local_to_scene = true +shader = ExtResource("2_l3yjy") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0 + +[sub_resource type="SpriteFrames" id="SpriteFrames_5wvmf"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("3_nf7ic") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_c0onq"] +size = Vector2(44.72, 12) + +[sub_resource type="CircleShape2D" id="CircleShape2D_e2yn3"] +radius = 3.0 + +[node name="Bullet0002" type="CharacterBody2D" node_paths=PackedStringArray("CollisionArea", "ShadowSprite", "AnimatedSprite", "Collision")] +collision_layer = 2 +script = ExtResource("1_wphe7") +CollisionArea = NodePath("CollisionArea") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") + +[node name="ShadowSprite" type="Sprite2D" parent="."] +z_index = -1 +material = SubResource("ShaderMaterial_5a4f2") + +[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +modulate = Color(1.8, 1.8, 1.8, 1) +material = SubResource("ShaderMaterial_o0655") +sprite_frames = SubResource("SpriteFrames_5wvmf") + +[node name="CollisionArea" type="Area2D" parent="."] +visible = false +collision_layer = 0 +collision_mask = 0 +monitorable = false + +[node name="CollisionShape2D" type="CollisionShape2D" parent="CollisionArea"] +position = Vector2(2.93353, 0) +scale = Vector2(0.226586, 0.333333) +shape = SubResource("RectangleShape2D_c0onq") + +[node name="Collision" type="CollisionShape2D" parent="."] +shape = SubResource("CircleShape2D_e2yn3") diff --git a/DungeonShooting_Godot/prefab/weapon/bullet/Bullet1.tscn b/DungeonShooting_Godot/prefab/weapon/bullet/Bullet1.tscn deleted file mode 100644 index e0b78f3..0000000 --- a/DungeonShooting_Godot/prefab/weapon/bullet/Bullet1.tscn +++ /dev/null @@ -1,64 +0,0 @@ -[gd_scene load_steps=9 format=3] - -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_nwypj"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2"] -[ext_resource type="Texture2D" uid="uid://bu0b11hiuecxy" path="res://resource/sprite/bullet/bullet.png" id="3"] - - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_5a4f2"] -resource_local_to_scene = true -shader = ExtResource("2") -shader_parameter/blend = Color(0, 0, 0, 0.470588) -shader_parameter/schedule = 1 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_o0655"] -resource_local_to_scene = true -shader = ExtResource("2") -shader_parameter/blend = Color(1, 1, 1, 1) -shader_parameter/schedule = 0 - -[sub_resource type="SpriteFrames" id="SpriteFrames_5wvmf"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("3") -}], -"loop": true, -"name": &"default", -"speed": 5.0 -}] - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_c0onq"] -size = Vector2(44.72, 12) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_lcqb8"] -size = Vector2(11, 4) - -[node name="Bullet" type="Node"] -script = ExtResource("1_nwypj") -collision_layer = 2 -collision_mask = 1 - -[node name="ShadowSprite" type="Sprite2D" parent="."] -z_index = -1 -material = SubResource("ShaderMaterial_5a4f2") - -[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] -modulate = Color(1.8, 1.8, 1.8, 1) -material = SubResource("ShaderMaterial_o0655") -sprite_frames = SubResource("SpriteFrames_5wvmf") - -[node name="CollisionArea" type="Area2D" parent="."] -visible = false -collision_layer = 0 -collision_mask = 0 -monitorable = false - -[node name="CollisionShape2D" type="CollisionShape2D" parent="CollisionArea"] -position = Vector2(2.93353, 0) -scale = Vector2(0.226586, 0.333333) -shape = SubResource("RectangleShape2D_c0onq") - -[node name="Collision" type="CollisionShape2D" parent="."] -position = Vector2(2.5, 0) -shape = SubResource("RectangleShape2D_lcqb8") diff --git a/DungeonShooting_Godot/prefab/weapon/bullet/Bullet2.tscn b/DungeonShooting_Godot/prefab/weapon/bullet/Bullet2.tscn deleted file mode 100644 index 66f2c73..0000000 --- a/DungeonShooting_Godot/prefab/weapon/bullet/Bullet2.tscn +++ /dev/null @@ -1,62 +0,0 @@ -[gd_scene load_steps=9 format=3 uid="uid://bqkj0rn72ppge"] - -[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_nwypj"] -[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2"] -[ext_resource type="Texture2D" uid="uid://ctsvj4y1t538u" path="res://resource/sprite/bullet/bullet3.png" id="3_l53o1"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_5a4f2"] -resource_local_to_scene = true -shader = ExtResource("2") -shader_parameter/blend = Color(0, 0, 0, 0.470588) -shader_parameter/schedule = 1 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_o0655"] -resource_local_to_scene = true -shader = ExtResource("2") -shader_parameter/blend = Color(1, 1, 1, 1) -shader_parameter/schedule = 0 - -[sub_resource type="SpriteFrames" id="SpriteFrames_5wvmf"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("3_l53o1") -}], -"loop": true, -"name": &"default", -"speed": 5.0 -}] - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_c0onq"] -size = Vector2(44.72, 12) - -[sub_resource type="CircleShape2D" id="CircleShape2D_e2yn3"] -radius = 3.0 - -[node name="Bullet" type="Node"] -script = ExtResource("1_nwypj") -collision_layer = 2 -collision_mask = 1 - -[node name="ShadowSprite" type="Sprite2D" parent="."] -z_index = -1 -material = SubResource("ShaderMaterial_5a4f2") - -[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] -modulate = Color(1.8, 1.8, 1.8, 1) -material = SubResource("ShaderMaterial_o0655") -sprite_frames = SubResource("SpriteFrames_5wvmf") - -[node name="CollisionArea" type="Area2D" parent="."] -visible = false -collision_layer = 0 -collision_mask = 0 -monitorable = false - -[node name="CollisionShape2D" type="CollisionShape2D" parent="CollisionArea"] -position = Vector2(2.93353, 0) -scale = Vector2(0.226586, 0.333333) -shape = SubResource("RectangleShape2D_c0onq") - -[node name="Collision" type="CollisionShape2D" parent="."] -shape = SubResource("CircleShape2D_e2yn3") diff --git a/DungeonShooting_Godot/prefab/weapon/shell/Shell0001.tscn b/DungeonShooting_Godot/prefab/weapon/shell/Shell0001.tscn new file mode 100644 index 0000000..b11de73 --- /dev/null +++ b/DungeonShooting_Godot/prefab/weapon/shell/Shell0001.tscn @@ -0,0 +1,44 @@ +[gd_scene load_steps=7 format=3 uid="uid://bj4yr6ru8nhwr"] + +[ext_resource type="Script" path="res://src/game/item/shell/Shell.cs" id="1_ph0ad"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_k705i"] +[ext_resource type="Texture2D" uid="uid://dto03bc2qbhnj" path="res://resource/sprite/shell/shellCase.png" id="3_0fth1"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"] +resource_local_to_scene = true +shader = ExtResource("2_k705i") +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_k705i") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0 + +[sub_resource type="SpriteFrames" id="SpriteFrames_4huvy"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("3_0fth1") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[node name="Shell0001" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")] +script = ExtResource("1_ph0ad") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") + +[node name="ShadowSprite" type="Sprite2D" parent="."] +z_index = -1 +material = SubResource("ShaderMaterial_px12l") + +[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +material = SubResource("ShaderMaterial_7e6fo") +sprite_frames = SubResource("SpriteFrames_4huvy") + +[node name="Collision" type="CollisionShape2D" parent="."] diff --git a/DungeonShooting_Godot/prefab/weapon/shell/ShellCase.tscn b/DungeonShooting_Godot/prefab/weapon/shell/ShellCase.tscn deleted file mode 100644 index c5f1ed3..0000000 --- a/DungeonShooting_Godot/prefab/weapon/shell/ShellCase.tscn +++ /dev/null @@ -1,41 +0,0 @@ -[gd_scene load_steps=7 format=3 uid="uid://bj4yr6ru8nhwr"] - -[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_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_6in5k") -shader_parameter/blend = Color(1, 1, 1, 1) -shader_parameter/schedule = 0 - -[sub_resource type="SpriteFrames" id="SpriteFrames_4huvy"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("3_k84jh") -}], -"loop": true, -"name": &"default", -"speed": 5.0 -}] - -[node name="ShellCase" type="Node"] -script = ExtResource("1_5wgsd") - -[node name="ShadowSprite" type="Sprite2D" parent="."] -z_index = -1 -material = SubResource("ShaderMaterial_px12l") - -[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] -material = SubResource("ShaderMaterial_7e6fo") -sprite_frames = SubResource("SpriteFrames_4huvy") - -[node name="Collision" type="CollisionShape2D" parent="."] diff --git a/DungeonShooting_Godot/resource/config/ActivityObject.json b/DungeonShooting_Godot/resource/config/ActivityObject.json index c24050f..230ffe4 100644 --- a/DungeonShooting_Godot/resource/config/ActivityObject.json +++ b/DungeonShooting_Godot/resource/config/ActivityObject.json @@ -3,5 +3,45 @@ "Id": "role0001", "Type": 3, "Prefab": "res://prefab/role/Player.tscn" + }, + { + "Id": "weapon0001", + "Type": 5, + "Prefab": "res://prefab/weapon/Weapon0001.tscn" + }, + { + "Id": "bullet0001", + "Type": 6, + "Prefab": "res://prefab/weapon/bullet/Bullet0001.tscn" + }, + { + "Id": "bullet0002", + "Type": 6, + "Prefab": "res://prefab/weapon/bullet/Bullet0002.tscn" + }, + { + "Id": "shell0001", + "Type": 7, + "Prefab": "res://prefab/weapon/shell/Shell0001.tscn" + }, + { + "Id": "other_door_e", + "Type": 9, + "Prefab": "res://prefab/map/RoomDoor_E.tscn" + }, + { + "Id": "other_door_w", + "Type": 9, + "Prefab": "res://prefab/map/RoomDoor_W.tscn" + }, + { + "Id": "other_door_s", + "Type": 9, + "Prefab": "res://prefab/map/RoomDoor_S.tscn" + }, + { + "Id": "other_door_n", + "Type": 9, + "Prefab": "res://prefab/map/RoomDoor_N.tscn" } ] \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.gdshader b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.gdshader deleted file mode 100644 index e69de29..0000000 --- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.gdshader +++ /dev/null diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn index 6945a80..80a0813 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn +++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn @@ -1,50 +1,17 @@ [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_m8ci8"] -[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="2_d1gn1"] -[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_w7xdh"] +[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_uyixn"] +[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="2_8m22j"] +[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_16tk5"] [node name="Room1" type="TileMap"] -tile_set = ExtResource("1_m8ci8") +tile_set = ExtResource("1_uyixn") 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("2_d1gn1") +script = ExtResource("2_8m22j") [node name="Player" type="Node2D" parent="."] position = Vector2(80, 47) -script = ExtResource("3_w7xdh") +script = ExtResource("3_16tk5") Type = 1 Altitude = 0 - -[node name="ActivityMark" type="Node2D" parent="."] -position = Vector2(126, 21) -script = ExtResource("3_w7xdh") -Type = 5 -ItemExpression = "0002(ResidueAmmo:15,CurrAmmon:0)" - -[node name="ActivityMark5" type="Node2D" parent="."] -position = Vector2(78, 24) -script = ExtResource("3_w7xdh") -Type = 5 -ItemExpression = "0005(ResidueAmmo:30,CurrAmmon:10)" - -[node name="ActivityMark2" type="Node2D" parent="."] -position = Vector2(39, 75) -script = ExtResource("3_w7xdh") -Type = 5 -ItemExpression = "0001(ResidueAmmo:15,CurrAmmon:0)" -WaveNumber = 2 - -[node name="ActivityMark3" type="Node2D" parent="."] -position = Vector2(128, 74) -script = ExtResource("3_w7xdh") -Type = 5 -ItemExpression = "0003(ResidueAmmo:12,CurrAmmon:15)" -WaveNumber = 3 - -[node name="ActivityMark4" type="Node2D" parent="."] -position = Vector2(39, 23) -script = ExtResource("3_w7xdh") -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 324790e..ab19dea 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/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1_vsl1x"] +[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1_5j3le"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_yvgyd"] -texture = ExtResource("1_vsl1x") +texture = ExtResource("1_5j3le") 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/spriteFrames/RoomDoor_EW.tres b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres index b372c0e..8fa6c2a 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres @@ -1,85 +1,85 @@ [gd_resource type="SpriteFrames" load_steps=22 format=3 uid="uid://3ps6h2f54qa5"] -[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_dgkkn"] +[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_7f8h7"] [sub_resource type="AtlasTexture" id="AtlasTexture_5m6ya"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(144, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_kmhtl"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(128, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_umaop"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(112, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_aqex7"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(96, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_hdocg"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(80, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_aiymw"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(64, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_8f7dv"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(32, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_iv82l"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(16, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_ycmnv"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(0, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_o7xw0"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(144, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_j8iw2"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(0, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_823if"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(16, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_7hyae"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(32, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_6lhu3"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(48, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_a026j"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(64, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_wfjf7"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(80, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_rhj60"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(96, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_06y08"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(112, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_1200j"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(128, 48, 16, 48) [sub_resource type="AtlasTexture" id="AtlasTexture_mbnbx"] -atlas = ExtResource("1_dgkkn") +atlas = ExtResource("1_7f8h7") region = Rect2(144, 48, 16, 48) [resource] diff --git a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres index 85b32f9..48f90e2 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres @@ -1,81 +1,81 @@ [gd_resource type="SpriteFrames" load_steps=21 format=3 uid="uid://xs72aopsgpg6"] -[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_wt0g7"] +[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_ugffo"] [sub_resource type="AtlasTexture" id="AtlasTexture_77i3w"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(256, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_112lq"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(224, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_2ojr8"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(192, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_q58ag"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(160, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_ghweb"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(128, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_28y4l"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(96, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_0fk5y"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(64, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_eu8jg"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(32, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_rw4x5"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(0, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_5dlkq"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(256, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_dnc85"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(0, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_8wepo"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(32, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_s2c1g"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(64, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_umj5m"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(96, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_sceep"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(128, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_0vntu"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(160, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_66ox7"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(192, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_o2uxo"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(224, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_m6v3e"] -atlas = ExtResource("1_wt0g7") +atlas = ExtResource("1_ugffo") region = Rect2(256, 0, 32, 32) [resource] diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres index f99a360..878ec09 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_p8d4w"] +[ext_resource type="FontFile" uid="uid://cad0in7dtweo5" path="res://resource/font/VonwaonBitmap-16px.ttf" id="1_4q7uh"] [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_d82m3"] +[sub_resource type="Image" id="Image_5qnx0"] 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_d82m3") +image = SubResource("Image_5qnx0") [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_gqp1k"] +[sub_resource type="Image" id="Image_b0spx"] 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_gqp1k") +image = SubResource("Image_b0spx") [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_kk46c"] +[sub_resource type="Image" id="Image_sem6x"] 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_kk46c") +image = SubResource("Image_sem6x") [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_fsu1c"] +[sub_resource type="Image" id="Image_xueq6"] 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_fsu1c") +image = SubResource("Image_xueq6") [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_cc3ol"] +[sub_resource type="Image" id="Image_o6wbf"] 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_cc3ol") +image = SubResource("Image_o6wbf") [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_p8d4w") +default_font = ExtResource("1_4q7uh") 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_p8d4w") +Button/fonts/font = ExtResource("1_4q7uh") 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_p8d4w") +Label/fonts/font = ExtResource("1_4q7uh") 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_p8d4w") +LineEdit/fonts/font = ExtResource("1_4q7uh") 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 d07845e..5ff8d02 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="1_2e8hl"] -[ext_resource type="Script" path="res://src/game/camera/GameCamera.cs" id="2_gb3lm"] +[ext_resource type="Script" path="res://src/game/GameApplication.cs" id="1_sm6n8"] +[ext_resource type="Script" path="res://src/game/camera/GameCamera.cs" id="2_00ruf"] [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("1_2e8hl") +script = ExtResource("1_sm6n8") 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("2_gb3lm") +script = ExtResource("2_00ruf") [node name="GlobalNodeRoot" type="Node2D" parent="."] diff --git a/DungeonShooting_Godot/scene/test/TestReadExcel.tscn b/DungeonShooting_Godot/scene/test/TestReadExcel.tscn index 06a29bb..1ab48cd 100644 --- a/DungeonShooting_Godot/scene/test/TestReadExcel.tscn +++ b/DungeonShooting_Godot/scene/test/TestReadExcel.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://deq562id5sngp"] -[ext_resource type="Script" path="res://src/test/TestReadExcel.cs" id="1_namis"] +[ext_resource type="Script" path="res://src/test/TestReadExcel.cs" id="1_y8vrr"] [node name="TestReadExcel" type="Node2D"] -script = ExtResource("1_namis") +script = ExtResource("1_y8vrr") diff --git a/DungeonShooting_Godot/src/config/ExcelConfig_ActivityObject.cs b/DungeonShooting_Godot/src/config/ExcelConfig_ActivityObject.cs index 4e12fe9..eb255ef 100644 --- a/DungeonShooting_Godot/src/config/ExcelConfig_ActivityObject.cs +++ b/DungeonShooting_Godot/src/config/ExcelConfig_ActivityObject.cs @@ -18,11 +18,11 @@ /// Test(测试对象): 2
/// Role(角色): 3
/// Enemy(敌人): 4
- /// Weapon(武器): 3
- /// Bullet(子弹): 3
- /// Shell(弹壳): 3
- /// Effect(特效): 3
- /// Other(其它类型): 3 + /// Weapon(武器): 5
+ /// Bullet(子弹): 6
+ /// Shell(弹壳): 7
+ /// Effect(特效): 8
+ /// Other(其它类型): 9 /// [JsonInclude] public int Type { get; private set; } diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_EditorTool.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_EditorTool.cs index 932c480..e005b7f 100644 --- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_EditorTool.cs +++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_EditorTool.cs @@ -126,7 +126,6 @@ foreach (var propertyInfo in tempList) { - GD.Print("propertyInfo2: " + propertyInfo.Name); var value = propertyInfo.GetValue(this); if (value == null || ((Node)value).GetParent() == null) { diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs index ce51394..0fb50f7 100644 --- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs +++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs @@ -6,5 +6,13 @@ private static void _InitRegister() { _activityRegisterMap.Add("role0001", "res://prefab/role/Player.tscn"); + _activityRegisterMap.Add("weapon0001", "res://prefab/weapon/Weapon0001.tscn"); + _activityRegisterMap.Add("bullet0001", "res://prefab/weapon/bullet/Bullet0001.tscn"); + _activityRegisterMap.Add("bullet0002", "res://prefab/weapon/bullet/Bullet0002.tscn"); + _activityRegisterMap.Add("shell0001", "res://prefab/weapon/shell/Shell0001.tscn"); + _activityRegisterMap.Add("other_door_e", "res://prefab/map/RoomDoor_E.tscn"); + _activityRegisterMap.Add("other_door_w", "res://prefab/map/RoomDoor_W.tscn"); + _activityRegisterMap.Add("other_door_s", "res://prefab/map/RoomDoor_S.tscn"); + _activityRegisterMap.Add("other_door_n", "res://prefab/map/RoomDoor_N.tscn"); } } diff --git a/DungeonShooting_Godot/src/game/GameApplication.cs b/DungeonShooting_Godot/src/game/GameApplication.cs index 5ac3f40..4273b82 100644 --- a/DungeonShooting_Godot/src/game/GameApplication.cs +++ b/DungeonShooting_Godot/src/game/GameApplication.cs @@ -98,7 +98,7 @@ DungeonConfig = new DungeonConfig(); DungeonConfig.GroupName = "testGroup"; - DungeonConfig.RoomCount = 20; + DungeonConfig.RoomCount = 0; } public override void _EnterTree() diff --git a/DungeonShooting_Godot/src/game/item/bullet/Bullet.cs b/DungeonShooting_Godot/src/game/item/bullet/Bullet.cs index 4ae5688..bb20329 100644 --- a/DungeonShooting_Godot/src/game/item/bullet/Bullet.cs +++ b/DungeonShooting_Godot/src/game/item/bullet/Bullet.cs @@ -3,12 +3,14 @@ /// /// 子弹类 /// +[Tool, GlobalClass] public partial class Bullet : ActivityObject { /// /// 碰撞区域 /// - public Area2D CollisionArea { get; private set; } + [Export, ExportFillNode] + public Area2D CollisionArea { get; set; } /// /// 发射该子弹的武器 @@ -27,7 +29,6 @@ public void Init(Weapon weapon, float speed, float maxDistance, Vector2 position, float rotation, uint targetLayer) { Weapon = weapon; - CollisionArea = GetNode("CollisionArea"); CollisionArea.CollisionMask = targetLayer; CollisionArea.AreaEntered += OnArea2dEntered; diff --git a/DungeonShooting_Godot/src/game/item/shell/Shell.cs b/DungeonShooting_Godot/src/game/item/shell/Shell.cs new file mode 100644 index 0000000..310ee81 --- /dev/null +++ b/DungeonShooting_Godot/src/game/item/shell/Shell.cs @@ -0,0 +1,22 @@ + +using Godot; + +/// +/// 弹壳类 +/// +[Tool, GlobalClass] +public partial class Shell : ActivityObject +{ + public override void OnInit() + { + base.OnInit(); + ShadowOffset = new Vector2(0, 1); + ThrowCollisionSize = new Vector2(5, 5); + } + + protected override void OnThrowOver() + { + EnableBehavior = false; + Collision.QueueFree(); + } +} \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/item/shell/ShellCase.cs b/DungeonShooting_Godot/src/game/item/shell/ShellCase.cs deleted file mode 100644 index 18e64a2..0000000 --- a/DungeonShooting_Godot/src/game/item/shell/ShellCase.cs +++ /dev/null @@ -1,21 +0,0 @@ - -using Godot; - -/// -/// 弹壳类 -/// -public partial class ShellCase : ActivityObject -{ - public override void OnInit() - { - base.OnInit(); - ShadowOffset = new Vector2(0, 1); - ThrowCollisionSize = new Vector2(5, 5); - } - - protected override void OnThrowOver() - { - EnableBehavior = false; - Collision.QueueFree(); - } -} \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs index 1aceed4..e1c254e 100644 --- a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs +++ b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs @@ -42,12 +42,14 @@ /// /// 武器管的开火点 /// - public Marker2D FirePoint { get; private set; } + [Export, ExportFillNode] + public Marker2D FirePoint { get; set; } /// /// 弹壳抛出的点 /// - public Marker2D ShellPoint { get; private set; } + [Export, ExportFillNode] + public Marker2D ShellPoint { get; set; } /// /// 武器的当前散射半径 @@ -101,7 +103,8 @@ /// /// 动画播放器 /// - public AnimationPlayer AnimationPlayer { get; private set; } + [Export, ExportFillNode] + public AnimationPlayer AnimationPlayer { get; set; } /// /// 是否自动播放 SpriteFrames 的动画 @@ -166,10 +169,6 @@ _originWeaponAttribute = attribute; _weaponAttribute = attribute; - AnimationPlayer = GetNode("AnimationPlayer"); - FirePoint = GetNode("FirePoint"); - ShellPoint = GetNode("ShellPoint"); - //设置动画 if (attribute.SpriteFrames != null) { diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs index 2d9839d..02a4733 100644 --- a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs +++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs @@ -3,6 +3,7 @@ /// /// 普通的枪 /// +[Tool, GlobalClass] public partial class Gun : Weapon { //步枪属性数据 diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs index 43cde9b..f256ecf 100644 --- a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs +++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs @@ -1,5 +1,6 @@ using Godot; +[Tool, GlobalClass] public partial class Shotgun : Weapon { diff --git a/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs b/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs index 99f4f09..82f5b95 100644 --- a/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs +++ b/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs @@ -1,6 +1,7 @@ using Godot; +[Tool, GlobalClass] public partial class Knife : Weapon { private class KnifeAttribute : WeaponAttribute diff --git a/DungeonShooting_Godot/src/game/room/DungeonManager.cs b/DungeonShooting_Godot/src/game/room/DungeonManager.cs index 2aa87c3..4be4fd2 100644 --- a/DungeonShooting_Godot/src/game/room/DungeonManager.cs +++ b/DungeonShooting_Godot/src/game/room/DungeonManager.cs @@ -256,22 +256,22 @@ switch (doorInfo.Direction) { case DoorDirection.E: - door = ActivityObject.Create(ActivityIdPrefix.Other + "door_e"); + door = ActivityObject.Create(ActivityIdPrefix.Other + "_door_e"); door.Position = (doorInfo.OriginPosition + new Vector2(0.5f, 2)) * GameConfig.TileCellSize; door.ZIndex = GameConfig.TopMapLayer; break; case DoorDirection.W: - door = ActivityObject.Create(ActivityIdPrefix.Other + "door_w"); + door = ActivityObject.Create(ActivityIdPrefix.Other + "_door_w"); door.Position = (doorInfo.OriginPosition + new Vector2(-0.5f, 2)) * GameConfig.TileCellSize; door.ZIndex = GameConfig.TopMapLayer; break; case DoorDirection.S: - door = ActivityObject.Create(ActivityIdPrefix.Other + "door_s"); + door = ActivityObject.Create(ActivityIdPrefix.Other + "_door_s"); door.Position = (doorInfo.OriginPosition + new Vector2(2f, 1.5f)) * GameConfig.TileCellSize; door.ZIndex = GameConfig.TopMapLayer; break; case DoorDirection.N: - door = ActivityObject.Create(ActivityIdPrefix.Other + "door_n"); + door = ActivityObject.Create(ActivityIdPrefix.Other + "_door_n"); door.Position = (doorInfo.OriginPosition + new Vector2(2f, -0.5f)) * GameConfig.TileCellSize; door.ZIndex = GameConfig.MiddleMapLayer; break; diff --git a/DungeonShooting_Godot/src/game/room/RoomDoor.cs b/DungeonShooting_Godot/src/game/room/RoomDoor.cs index b1f4055..86f06b9 100644 --- a/DungeonShooting_Godot/src/game/room/RoomDoor.cs +++ b/DungeonShooting_Godot/src/game/room/RoomDoor.cs @@ -4,6 +4,7 @@ /// /// 房间的门, 门有两种状态, 打开和关闭 /// +[Tool, GlobalClass] public partial class RoomDoor : ActivityObject { ///