diff --git a/DungeonShooting_Godot/DungeonShooting.csproj b/DungeonShooting_Godot/DungeonShooting.csproj index 51b8a45..a312223 100644 --- a/DungeonShooting_Godot/DungeonShooting.csproj +++ b/DungeonShooting_Godot/DungeonShooting.csproj @@ -1,6 +1,6 @@ - + - net6.0 + net7.0 true diff --git a/DungeonShooting_Godot/prefab/bullet/Bullet0001.tscn b/DungeonShooting_Godot/prefab/bullet/Bullet0001.tscn index 3ee607f..7300e12 100644 --- a/DungeonShooting_Godot/prefab/bullet/Bullet0001.tscn +++ b/DungeonShooting_Godot/prefab/bullet/Bullet0001.tscn @@ -51,6 +51,7 @@ material = SubResource("ShaderMaterial_w5w0i") [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +modulate = Color(3, 3, 3, 1) material = SubResource("ShaderMaterial_qhkgc") sprite_frames = SubResource("SpriteFrames_5wvmf") diff --git a/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn b/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn index 89c2130..7327234 100644 --- a/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn +++ b/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn @@ -43,6 +43,7 @@ material = SubResource("ShaderMaterial_v77gw") [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +modulate = Color(3, 3, 3, 1) material = SubResource("ShaderMaterial_p0wfd") sprite_frames = ExtResource("3_uvuj8") diff --git a/DungeonShooting_Godot/prefab/bullet/Bullet0003.tscn b/DungeonShooting_Godot/prefab/bullet/Bullet0003.tscn index 4890b1e..4d6c9f9 100644 --- a/DungeonShooting_Godot/prefab/bullet/Bullet0003.tscn +++ b/DungeonShooting_Godot/prefab/bullet/Bullet0003.tscn @@ -40,6 +40,7 @@ material = SubResource("ShaderMaterial_v77gw") [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +modulate = Color(3, 3, 3, 1) material = SubResource("ShaderMaterial_p0wfd") sprite_frames = ExtResource("3_qvo0u") diff --git a/DungeonShooting_Godot/project.godot b/DungeonShooting_Godot/project.godot index e7f84b4..6dccd9a 100644 --- a/DungeonShooting_Godot/project.godot +++ b/DungeonShooting_Godot/project.godot @@ -12,7 +12,7 @@ config/name="DungeonShooting" run/main_scene="res://scene/Main.tscn" -config/features=PackedStringArray("4.1", "C#") +config/features=PackedStringArray("4.2", "C#") config/icon="res://icon.png" [debug] @@ -212,6 +212,7 @@ textures/canvas_textures/default_texture_filter=0 environment/defaults/default_clear_color=Color(0.109804, 0.0666667, 0.0901961, 1) +viewport/hdr_2d=true 2d/snapping/use_gpu_pixel_snap=true environment/default_environment="res://default_env.tres" diff --git a/DungeonShooting_Godot/resource/Enviromenent.tres b/DungeonShooting_Godot/resource/Enviromenent.tres deleted file mode 100644 index 1210cfb..0000000 --- a/DungeonShooting_Godot/resource/Enviromenent.tres +++ /dev/null @@ -1,10 +0,0 @@ -[gd_resource type="Environment" format=3 uid="uid://cu80ujuqcj7gx"] - -[resource] -background_mode = 3 -glow_enabled = true -glow_levels/3 = 2.0 -glow_normalized = true -glow_strength = 1.6 -glow_blend_mode = 1 -glow_hdr_threshold = 1.1 diff --git a/DungeonShooting_Godot/scene/Main.tscn b/DungeonShooting_Godot/scene/Main.tscn index b034a25..b2179bb 100644 --- a/DungeonShooting_Godot/scene/Main.tscn +++ b/DungeonShooting_Godot/scene/Main.tscn @@ -39,6 +39,7 @@ [node name="SubViewport" type="SubViewport" parent="ViewCanvas/SubViewportContainer"] handle_input_locally = false +use_hdr_2d = true canvas_item_default_texture_filter = 0 size = Vector2i(480, 270) render_target_update_mode = 4 diff --git a/DungeonShooting_Godot/scene/World.tscn b/DungeonShooting_Godot/scene/World.tscn index 23a0ef2..6c303cb 100644 --- a/DungeonShooting_Godot/scene/World.tscn +++ b/DungeonShooting_Godot/scene/World.tscn @@ -1,8 +1,14 @@ -[gd_scene load_steps=3 format=3 uid="uid://bqf2vks5ggnsp"] +[gd_scene load_steps=4 format=3 uid="uid://bqf2vks5ggnsp"] [ext_resource type="Script" path="res://src/game/room/World.cs" id="1_kt3mm"] [ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="2_p6iui"] +[sub_resource type="Environment" id="Environment_g06jj"] +background_mode = 3 +glow_enabled = true +glow_normalized = true +glow_blend_mode = 1 + [node name="World" type="Node2D" node_paths=PackedStringArray("NormalLayer", "YSortLayer", "TileRoot", "StaticSpriteRoot", "AffiliationAreaRoot")] script = ExtResource("1_kt3mm") NormalLayer = NodePath("NormalLayer") @@ -12,6 +18,9 @@ AffiliationAreaRoot = NodePath("AffiliationAreaRoot") metadata/_edit_vertical_guides_ = [] +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_g06jj") + [node name="TileRoot" type="TileMap" parent="."] y_sort_enabled = true tile_set = ExtResource("2_p6iui")