From ae269b64ce367913082be0a6ad30c4e0c62637f6 Mon Sep 17 00:00:00 2001 From: freewu32 <2217332562@qq.com> Date: Thu, 3 Sep 2020 12:13:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A04f=E6=A5=BC=E5=B1=82=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Main.tscn | 44 +++++++------- src/levels/Level1.tscn | 6 +- src/levels/Level2.tscn | 5 -- src/levels/Level4.tscn | 133 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 160 insertions(+), 28 deletions(-) create mode 100644 src/levels/Level4.tscn diff --git a/Main.tscn b/Main.tscn index a31c2a4..e1daf3b 100644 --- a/Main.tscn +++ b/Main.tscn @@ -101,9 +101,9 @@ __meta__ = { } [node name="LevelLabel" type="Label" parent="HUD/HeaderBackground/GridContainer"] -margin_left = 36.0 +margin_left = 40.0 margin_top = 5.0 -margin_right = 124.0 +margin_right = 122.0 margin_bottom = 27.0 size_flags_horizontal = 3 custom_fonts/font = ExtResource( 8 ) @@ -114,8 +114,8 @@ __meta__ = { } [node name="Location2" type="TextureRect" parent="HUD/HeaderBackground/GridContainer"] -margin_left = 128.0 -margin_right = 160.0 +margin_left = 130.0 +margin_right = 162.0 margin_bottom = 32.0 texture = SubResource( 2 ) __meta__ = { @@ -123,7 +123,7 @@ __meta__ = { } [node name="HpLabel" type="Label" parent="HUD/HeaderBackground/GridContainer"] -margin_left = 164.0 +margin_left = 170.0 margin_top = 5.0 margin_right = 252.0 margin_bottom = 27.0 @@ -136,8 +136,8 @@ __meta__ = { } [node name="Location3" type="TextureRect" parent="HUD/HeaderBackground/GridContainer"] -margin_left = 256.0 -margin_right = 288.0 +margin_left = 260.0 +margin_right = 292.0 margin_bottom = 32.0 texture = SubResource( 3 ) __meta__ = { @@ -145,9 +145,9 @@ __meta__ = { } [node name="AtkLabel" type="Label" parent="HUD/HeaderBackground/GridContainer"] -margin_left = 292.0 +margin_left = 300.0 margin_top = 5.0 -margin_right = 380.0 +margin_right = 382.0 margin_bottom = 27.0 size_flags_horizontal = 3 custom_fonts/font = ExtResource( 8 ) @@ -176,9 +176,9 @@ __meta__ = { } [node name="DefLabel" type="Label" parent="HUD/HeaderBackground/GridContainer2"] -margin_left = 36.0 +margin_left = 40.0 margin_top = 5.0 -margin_right = 124.0 +margin_right = 122.0 margin_bottom = 27.0 size_flags_horizontal = 3 custom_fonts/font = ExtResource( 8 ) @@ -189,8 +189,8 @@ __meta__ = { } [node name="Location2" type="TextureRect" parent="HUD/HeaderBackground/GridContainer2"] -margin_left = 128.0 -margin_right = 160.0 +margin_left = 130.0 +margin_right = 162.0 margin_bottom = 32.0 texture = SubResource( 5 ) __meta__ = { @@ -198,7 +198,7 @@ __meta__ = { } [node name="ExpLabel" type="Label" parent="HUD/HeaderBackground/GridContainer2"] -margin_left = 164.0 +margin_left = 170.0 margin_top = 5.0 margin_right = 252.0 margin_bottom = 27.0 @@ -221,7 +221,7 @@ __meta__ = { } [node name="YellowKeyCount" type="Label" parent="HUD/HeaderBackground/GridContainer3"] -margin_right = 28.0 +margin_right = 25.0 margin_bottom = 32.0 size_flags_horizontal = 3 size_flags_vertical = 7 @@ -234,8 +234,8 @@ __meta__ = { } [node name="BlueKeyCount" type="Label" parent="HUD/HeaderBackground/GridContainer3"] -margin_left = 32.0 -margin_right = 60.0 +margin_left = 33.0 +margin_right = 58.0 margin_bottom = 32.0 size_flags_horizontal = 3 size_flags_vertical = 7 @@ -248,8 +248,8 @@ __meta__ = { } [node name="RedKeyCount" type="Label" parent="HUD/HeaderBackground/GridContainer3"] -margin_left = 64.0 -margin_right = 92.0 +margin_left = 66.0 +margin_right = 91.0 margin_bottom = 32.0 size_flags_horizontal = 3 size_flags_vertical = 7 @@ -291,7 +291,7 @@ __meta__ = { } [node name="BookButton" type="TextureButton" parent="HUD/BottomBackground/VBoxContainer"] -margin_right = 40.0 +margin_right = 36.0 margin_bottom = 32.0 size_flags_horizontal = 3 texture_normal = SubResource( 7 ) @@ -326,14 +326,14 @@ texture_normal = SubResource( 11 ) [node name="SaveButton" type="TextureButton" parent="HUD/BottomBackground/VBoxContainer"] margin_left = 44.0 -margin_right = 84.0 +margin_right = 80.0 margin_bottom = 32.0 size_flags_horizontal = 3 texture_normal = SubResource( 12 ) [node name="LoadButton" type="TextureButton" parent="HUD/BottomBackground/VBoxContainer"] margin_left = 88.0 -margin_right = 128.0 +margin_right = 124.0 margin_bottom = 32.0 size_flags_horizontal = 3 texture_normal = SubResource( 13 ) diff --git a/src/levels/Level1.tscn b/src/levels/Level1.tscn index 0f4fb29..eee87b8 100644 --- a/src/levels/Level1.tscn +++ b/src/levels/Level1.tscn @@ -89,6 +89,7 @@ position = Vector2( 114.1, 432 ) [node name="Monster" parent="Items" instance=ExtResource( 6 )] position = Vector2( 112, 144 ) +frame = 0 [node name="Monster2" parent="Items" instance=ExtResource( 6 )] position = Vector2( 144, 144 ) @@ -109,7 +110,7 @@ animation = "bluePriest" [node name="Monster11" parent="Items" instance=ExtResource( 6 )] position = Vector2( 304, 304 ) animation = "bat" -frame = 1 +frame = 0 [node name="Monster7" parent="Items" instance=ExtResource( 6 )] position = Vector2( 80, 240 ) @@ -121,12 +122,15 @@ animation = "skeletonSoilder" [node name="Monster5" parent="Items" instance=ExtResource( 6 )] position = Vector2( 306.1, 464 ) +frame = 0 [node name="Monster6" parent="Items" instance=ExtResource( 6 )] position = Vector2( 368, 464 ) +frame = 0 [node name="Monster3" parent="Items" instance=ExtResource( 6 )] position = Vector2( 176, 144 ) +frame = 0 [node name="Stairs" parent="Items" instance=ExtResource( 3 )] position = Vector2( 48, 144 ) diff --git a/src/levels/Level2.tscn b/src/levels/Level2.tscn index 184279b..4a8609c 100644 --- a/src/levels/Level2.tscn +++ b/src/levels/Level2.tscn @@ -19,12 +19,10 @@ extents = Vector2( 16, 16 ) [sub_resource type="AtlasTexture" id=2] -flags = 4 atlas = ExtResource( 12 ) region = Rect2( 0, 64, 32, 32 ) [sub_resource type="AtlasTexture" id=3] -flags = 4 atlas = ExtResource( 12 ) region = Rect2( 32, 64, 32, 32 ) @@ -190,12 +188,10 @@ position = Vector2( 48, 464 ) [node name="MonsterSprite" parent="Items" instance=ExtResource( 14 )] position = Vector2( 208, 176 ) animation = "blueGuard" -frame = 0 [node name="MonsterSprite2" parent="Items" instance=ExtResource( 14 )] position = Vector2( 272, 176 ) animation = "blueGuard" -frame = 0 [node name="Thief" type="StaticBody2D" parent="."] position = Vector2( 112, 336 ) @@ -210,7 +206,6 @@ shape = SubResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="Thief"] frames = SubResource( 4 ) animation = "thief" -frame = 1 playing = true [node name="AnimationPlayer" type="AnimationPlayer" parent="Thief"] diff --git a/src/levels/Level4.tscn b/src/levels/Level4.tscn new file mode 100644 index 0000000..c67194d --- /dev/null +++ b/src/levels/Level4.tscn @@ -0,0 +1,133 @@ +[gd_scene load_steps=15 format=2] + +[ext_resource path="res://src/level/LevelInstance.gd" type="Script" id=1] +[ext_resource path="res://src/navigation/NavigationTileMap.gd" type="Script" id=2] +[ext_resource path="res://src/navigation/NavigationTileset.tres" type="TileSet" id=3] +[ext_resource path="res://src/door/YellowDoor.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/door/BlueDoor.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/monster/Monster.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/props/YellowKey.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/props/BlueKey.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/props/BlueDrug.tscn" type="PackedScene" id=9] +[ext_resource path="res://src/props/RedDrug.tscn" type="PackedScene" id=10] +[ext_resource path="res://src/stairs/StairsUp.tscn" type="PackedScene" id=11] +[ext_resource path="res://src/props/RedGemstone.tscn" type="PackedScene" id=12] +[ext_resource path="res://src/stairs/StairsDown.tscn" type="PackedScene" id=13] +[ext_resource path="res://src/player/Player.tscn" type="PackedScene" id=14] + +[node name="Level4" type="Node2D"] +script = ExtResource( 1 ) + +[node name="NavigationTileMap" type="TileMap" parent="."] +tile_set = ExtResource( 3 ) +cell_size = Vector2( 32, 32 ) +cell_quadrant_size = 1 +format = 1 +tile_data = PoolIntArray( 196608, 1, 0, 196609, 1, 0, 196610, 1, 0, 196611, 1, 0, 196612, 1, 0, 196613, 1, 0, 196614, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196618, 1, 0, 196619, 1, 0, 196620, 1, 0, 262144, 1, 0, 262145, 2, 0, 262146, 2, 0, 262147, 2, 0, 262148, 1, 0, 262149, 2, 0, 262150, 2, 0, 262151, 2, 0, 262152, 1, 0, 262153, 2, 0, 262154, 2, 0, 262155, 2, 0, 262156, 1, 0, 327680, 1, 0, 327681, 2, 0, 327682, 2, 0, 327683, 2, 0, 327684, 1, 0, 327685, 2, 0, 327686, 2, 0, 327687, 2, 0, 327688, 1, 0, 327689, 2, 0, 327690, 2, 0, 327691, 2, 0, 327692, 1, 0, 393216, 1, 0, 393217, 2, 0, 393218, 2, 0, 393219, 2, 0, 393220, 1, 0, 393221, 2, 0, 393222, 2, 0, 393223, 2, 0, 393224, 1, 0, 393225, 2, 0, 393226, 2, 0, 393227, 2, 0, 393228, 1, 0, 458752, 1, 0, 458753, 1, 0, 458754, 2, 0, 458755, 1, 0, 458756, 1, 0, 458757, 1, 0, 458758, 2, 0, 458759, 1, 0, 458760, 1, 0, 458761, 1, 0, 458762, 2, 0, 458763, 1, 0, 458764, 1, 0, 524288, 1, 0, 524289, 2, 0, 524290, 2, 0, 524291, 2, 0, 524292, 2, 0, 524293, 2, 0, 524294, 2, 0, 524295, 2, 0, 524296, 2, 0, 524297, 2, 0, 524298, 2, 0, 524299, 2, 0, 524300, 1, 0, 589824, 1, 0, 589825, 2, 0, 589826, 2, 0, 589827, 2, 0, 589828, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 589832, 1, 0, 589833, 1, 0, 589834, 1, 0, 589835, 1, 0, 589836, 1, 0, 655360, 1, 0, 655361, 2, 0, 655362, 2, 0, 655363, 2, 0, 655364, 2, 0, 655365, 2, 0, 655366, 2, 0, 655367, 2, 0, 655368, 2, 0, 655369, 2, 0, 655370, 2, 0, 655371, 2, 0, 655372, 1, 0, 720896, 1, 0, 720897, 2, 0, 720898, 1, 0, 720899, 1, 0, 720900, 2, 0, 720901, 1, 0, 720902, 1, 0, 720903, 1, 0, 720904, 2, 0, 720905, 1, 0, 720906, 1, 0, 720907, 2, 0, 720908, 1, 0, 786432, 1, 0, 786433, 2, 0, 786434, 1, 0, 786435, 2, 0, 786436, 2, 0, 786437, 2, 0, 786438, 1, 0, 786439, 2, 0, 786440, 2, 0, 786441, 2, 0, 786442, 1, 0, 786443, 2, 0, 786444, 1, 0, 851968, 1, 0, 851969, 2, 0, 851970, 1, 0, 851971, 2, 0, 851972, 2, 0, 851973, 2, 0, 851974, 1, 0, 851975, 2, 0, 851976, 2, 0, 851977, 2, 0, 851978, 1, 0, 851979, 2, 0, 851980, 1, 0, 917504, 1, 0, 917505, 2, 0, 917506, 1, 0, 917507, 2, 0, 917508, 2, 0, 917509, 2, 0, 917510, 1, 0, 917511, 2, 0, 917512, 2, 0, 917513, 2, 0, 917514, 1, 0, 917515, 2, 0, 917516, 1, 0, 983040, 1, 0, 983041, 1, 0, 983042, 1, 0, 983043, 1, 0, 983044, 1, 0, 983045, 1, 0, 983046, 1, 0, 983047, 1, 0, 983048, 1, 0, 983049, 1, 0, 983050, 1, 0, 983051, 1, 0, 983052, 1, 0 ) +script = ExtResource( 2 ) +navigation_cell_index = 2 +wall_cell_index = 1 +changed_cells = { + +} + +[node name="Items" type="Node2D" parent="."] + +[node name="YellowDoor" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 272, 368 ) + +[node name="YellowDoor2" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 368, 368 ) + +[node name="YellowDoor3" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 144, 368 ) + +[node name="YellowDoor4" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 48, 368 ) + +[node name="YellowDoor5" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 144, 272 ) + +[node name="YellowDoor6" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 80, 240 ) + +[node name="YellowDoor7" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 336, 240 ) + +[node name="BlueDoor" parent="Items" instance=ExtResource( 5 )] +position = Vector2( 208, 240 ) + +[node name="YellowKey" parent="Items" instance=ExtResource( 7 )] + +[node name="YellowKey2" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 176, 464 ) + +[node name="YellowKey3" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 112, 464 ) + +[node name="YellowKey4" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 112, 176 ) + +[node name="YellowKey5" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 304, 176 ) + +[node name="PlayerProps2" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 80, 144 ) + +[node name="MonsterSprite" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 112, 336 ) + +[node name="MonsterSprite4" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 144, 464 ) +frame = 0 + +[node name="MonsterSprite6" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 272, 464 ) + +[node name="MonsterSprite7" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 272, 400 ) +animation = "bluePriest" + +[node name="MonsterSprite8" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 80, 208 ) +animation = "bluePriest" + +[node name="MonsterSprite9" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 304, 272 ) +animation = "skeleton" + +[node name="MonsterSprite10" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 336, 208 ) +animation = "skeletonSoilder" + +[node name="MonsterSprite5" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 112, 432 ) + +[node name="MonsterSprite2" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 48, 336 ) +animation = "redSlime" + +[node name="MonsterSprite3" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 208, 272 ) +animation = "redSlime" + +[node name="PlayerProps4" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 306.1, 432 ) + +[node name="PlayerProps6" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 48, 176 ) + +[node name="RedGemstone" parent="Items" instance=ExtResource( 12 )] +position = Vector2( 237.9, 432 ) + +[node name="PlayerProps5" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 368, 176 ) + +[node name="Stairs2" parent="Items" instance=ExtResource( 13 )] +position = Vector2( 368, 464 ) + +[node name="Stairs" parent="Items" instance=ExtResource( 11 )] +position = Vector2( 48, 464 ) + +[node name="Player" parent="." instance=ExtResource( 14 )] +position = Vector2( 368, 437.1 )