diff --git a/resource/map/dungeon_test.tmx b/resource/map/dungeon_test.tmx index e640faa..304a2b9 100644 --- a/resource/map/dungeon_test.tmx +++ b/resource/map/dungeon_test.tmx @@ -1,10 +1,10 @@ - + - + 129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, 129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, @@ -48,11 +48,11 @@ 129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129 - + 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,39,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,41,51,39,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,41,51,51, +51,51,39,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,14,51,12,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,41,51,51, 51,51,52,118,119,119,119,119,119,119,119,119,119,119,119,119,119,120,50,51,52,19,19,19,19,19,19,19,19,19,19,19,19,19,19,118,120,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, @@ -63,8 +63,8 @@ 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,70,35,35,35,35,35,35,35,35,35,35,36,0,0,34,35,74,51,70,35,36,0,0,34,35,35,35,35,35,35,35,35,35,35,35,74,51,51, -51,51,39,99,99,99,99,99,99,99,99,99,99,100,0,0,98,99,99,99,99,99,100,0,0,98,99,99,99,99,99,99,99,99,99,99,99,41,51,51, +51,51,44,35,35,35,35,35,35,35,35,35,35,36,0,0,34,35,46,51,44,35,36,0,0,34,35,35,35,35,35,35,35,35,35,35,35,46,51,51, +51,51,12,99,99,99,99,99,99,99,99,99,99,100,0,0,98,99,99,99,99,99,100,0,0,98,99,99,99,99,99,99,99,99,99,99,99,14,51,51, 51,51,52,19,19,19,19,19,19,19,19,19,19,20,0,0,18,19,19,19,19,19,20,0,0,18,19,19,19,19,19,19,19,19,19,19,19,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, @@ -72,8 +72,8 @@ 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,70,35,35,36,0,0,34,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,36,0,0,34,35,35,74,51,51, -51,51,39,99,99,100,0,0,98,99,99,99,99,99,99,99,99,99,41,51,39,99,99,99,99,99,99,99,99,99,99,100,0,0,98,99,99,41,51,51, +51,51,44,35,35,36,0,0,34,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,36,0,0,34,35,35,46,51,51, +51,51,12,99,99,100,0,0,98,99,99,99,99,99,99,99,99,99,41,51,39,99,99,99,99,99,99,99,99,99,99,100,0,0,98,99,99,14,51,51, 51,51,52,19,19,20,0,0,117,118,118,118,118,118,118,118,118,119,50,51,52,19,19,19,19,19,19,19,19,19,19,20,0,0,18,19,19,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, @@ -87,9 +87,15 @@ 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, 51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,70,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,74,51,70,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,74,51,51, +51,51,44,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,46,51,44,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,46,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 + + + + + + diff --git a/resource/map/itch-io-DungeonTileset4.tsx b/resource/map/itch-io-DungeonTileset4.tsx index 2baca03..bf48d8a 100644 --- a/resource/map/itch-io-DungeonTileset4.tsx +++ b/resource/map/itch-io-DungeonTileset4.tsx @@ -1,6 +1,16 @@ + + + + + + + + + + @@ -31,12 +41,12 @@ - + - + @@ -56,16 +66,6 @@ - - - - - - - - - - @@ -119,16 +119,16 @@ + + - - + + - - diff --git a/scene/Gui.tscn b/scene/Gui.tscn deleted file mode 100644 index bbc0bfc..0000000 --- a/scene/Gui.tscn +++ /dev/null @@ -1,41 +0,0 @@ -[gd_scene load_steps=8 format=2] - -[ext_resource path="res://sprite/ui/GUI.png" type="Texture" id=1] -[ext_resource path="res://sprite/gun/UK.png" type="Texture" id=2] -[ext_resource path="res://sprite/gun/USSR.png" type="Texture" id=3] -[ext_resource path="res://sprite/gun/US.png" type="Texture" id=4] -[ext_resource path="res://sprite/gun/gun8.png" type="Texture" id=5] -[ext_resource path="res://sprite/role/role8.png" type="Texture" id=6] - -[sub_resource type="StreamTexture" id=1] -load_path = "res://.import/Germany.png-1c15272161506821b82d1124fa8fcd21.stex" - -[node name="Gui" type="Sprite"] -position = Vector2( 165, 201 ) -texture = ExtResource( 1 ) - -[node name="Role8" type="Sprite" parent="."] -position = Vector2( 242, -152 ) -texture = ExtResource( 6 ) - -[node name="Germany" type="Sprite" parent="."] -position = Vector2( 185.5, -17.6 ) -texture = SubResource( 1 ) - -[node name="Us" type="Sprite" parent="."] -position = Vector2( 223.5, 24.4 ) -texture = ExtResource( 4 ) - -[node name="Ussr" type="Sprite" parent="."] -position = Vector2( 185.5, -120.6 ) -texture = ExtResource( 3 ) - -[node name="Uk" type="Sprite" parent="."] -position = Vector2( 186.5, -72.6 ) -texture = ExtResource( 2 ) - -[node name="gun" type="Sprite" parent="."] -position = Vector2( 220, -170 ) -scale = Vector2( 0.8, 0.8 ) -texture = ExtResource( 5 ) -offset = Vector2( 4, -3 ) diff --git a/scene/Room.tscn b/scene/Room.tscn index a29c2ad..2941b91 100644 --- a/scene/Room.tscn +++ b/scene/Room.tscn @@ -10,18 +10,18 @@ MouseCursor = ExtResource( 4 ) UIPath = NodePath("") -[node name="dungeon_test" parent="." instance=ExtResource( 2 )] +[node name="MapRoot" type="Node2D" parent="."] + +[node name="dungeon_test" parent="MapRoot" instance=ExtResource( 2 )] [node name="Camera2D" type="Camera2D" parent="."] position = Vector2( 196, 128 ) current = true -limit_left = 0 -limit_top = 0 -limit_right = 640 -limit_bottom = 640 +process_mode = 0 drag_margin_h_enabled = true drag_margin_v_enabled = true smoothing_enabled = true +smoothing_speed = 8.0 editor_draw_limits = true editor_draw_drag_margin = true diff --git a/src/RoomManager.cs b/src/RoomManager.cs index ea3cc86..7c2d6a0 100644 --- a/src/RoomManager.cs +++ b/src/RoomManager.cs @@ -24,5 +24,10 @@ // 初始化鼠标 Cursor = MouseCursor.Instance(); AddChild(Cursor); + + //初始化地图 + var node = GetNode("MapRoot").GetChild(0).GetNode("Config"); + Color color = (Color) node.GetMeta("ClearColor"); + VisualServer.SetDefaultClearColor(color); } } \ No newline at end of file