diff --git a/DungeonShooting_Godot/prefab/bullet/laser/Laser0001.tscn b/DungeonShooting_Godot/prefab/bullet/laser/Laser0001.tscn index 04de455..c70e71e 100644 --- a/DungeonShooting_Godot/prefab/bullet/laser/Laser0001.tscn +++ b/DungeonShooting_Godot/prefab/bullet/laser/Laser0001.tscn @@ -17,7 +17,7 @@ shape = SubResource("RectangleShape2D_l4vuk") [node name="LineSprite" type="Sprite2D" parent="."] -modulate = Color(1.5, 1.5, 1.5, 1) +modulate = Color(1.6, 1.6, 1.6, 1) position = Vector2(0, 1.19209e-07) texture = ExtResource("2_uqalj") centered = false diff --git a/DungeonShooting_Godot/prefab/bullet/laser/Laser0002.tscn b/DungeonShooting_Godot/prefab/bullet/laser/Laser0002.tscn index c989324..07111c2 100644 --- a/DungeonShooting_Godot/prefab/bullet/laser/Laser0002.tscn +++ b/DungeonShooting_Godot/prefab/bullet/laser/Laser0002.tscn @@ -6,7 +6,7 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_l4vuk"] resource_local_to_scene = true -[node name="Laser0001" type="Area2D" node_paths=PackedStringArray("Particles2D")] +[node name="Laser0002" type="Area2D" node_paths=PackedStringArray("Particles2D")] collision_layer = 2 collision_mask = 0 monitorable = false @@ -17,7 +17,7 @@ shape = SubResource("RectangleShape2D_l4vuk") [node name="LineSprite" type="Sprite2D" parent="."] -modulate = Color(1.5, 1.5, 1.5, 1) +modulate = Color(1.6, 1.6, 1.6, 1) position = Vector2(0, 1.19209e-07) texture = ExtResource("2_ga23q") centered = false diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0001.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0001.tscn index 750cb3a..8fc5d32 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0001.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0001.tscn @@ -4,7 +4,6 @@ [ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_mxa72"] [ext_resource type="SpriteFrames" uid="uid://baoxep7vami72" path="res://resource/spriteFrames/bullet/Bullet0001.tres" id="3_q4a0o"] - [sub_resource type="ShaderMaterial" id="ShaderMaterial_w5w0i"] resource_local_to_scene = true shader = ExtResource("2_mxa72") diff --git a/DungeonShooting_Godot/prefab/prop/ActiveProp.tscn b/DungeonShooting_Godot/prefab/prop/ActiveProp.tscn index e087fc1..42d35bc 100644 --- a/DungeonShooting_Godot/prefab/prop/ActiveProp.tscn +++ b/DungeonShooting_Godot/prefab/prop/ActiveProp.tscn @@ -3,7 +3,6 @@ [ext_resource type="Script" path="res://src/game/activity/prop/ActiveProp.cs" id="1_n541c"] [ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_75di4"] - [sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"] resource_local_to_scene = true shader = ExtResource("2_75di4") diff --git a/DungeonShooting_Godot/prefab/prop/BuffProp.tscn b/DungeonShooting_Godot/prefab/prop/BuffProp.tscn index cbed4fb..1940118 100644 --- a/DungeonShooting_Godot/prefab/prop/BuffProp.tscn +++ b/DungeonShooting_Godot/prefab/prop/BuffProp.tscn @@ -3,7 +3,6 @@ [ext_resource type="Script" path="res://src/game/activity/prop/BuffProp.cs" id="1_nlcp6"] [ext_resource type="Shader" path="res://resource/shader/Blend.gdshader" id="2_imicp"] - [sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"] resource_local_to_scene = true shader = ExtResource("2_imicp") diff --git a/DungeonShooting_Godot/resource/map/tileSet/TileSet1/Main.png b/DungeonShooting_Godot/resource/map/tileSet/TileSet1/Main.png index 193d030..f131d0a 100644 --- a/DungeonShooting_Godot/resource/map/tileSet/TileSet1/Main.png +++ b/DungeonShooting_Godot/resource/map/tileSet/TileSet1/Main.png Binary files differ diff --git a/DungeonShooting_Godot/resource/map/tileSet/TileSet1/Test2.png b/DungeonShooting_Godot/resource/map/tileSet/TileSet1/Test2.png index 78244d5..6fb9d7b 100644 --- a/DungeonShooting_Godot/resource/map/tileSet/TileSet1/Test2.png +++ b/DungeonShooting_Godot/resource/map/tileSet/TileSet1/Test2.png Binary files differ diff --git a/DungeonShooting_Godot/scene/Dungeon.tscn b/DungeonShooting_Godot/scene/Dungeon.tscn index 8944b1e..213bd35 100644 --- a/DungeonShooting_Godot/scene/Dungeon.tscn +++ b/DungeonShooting_Godot/scene/Dungeon.tscn @@ -5,8 +5,12 @@ [sub_resource type="Environment" id="Environment_g06jj"] background_mode = 3 glow_enabled = true +glow_levels/1 = 1.0 +glow_levels/2 = 1.0 +glow_levels/4 = 1.0 +glow_levels/5 = 0.0 glow_normalized = true -glow_strength = 1.05 +glow_strength = 1.06 glow_blend_mode = 1 [node name="Dungeon" type="CanvasModulate"] diff --git a/DungeonShooting_Godot/scene/Hall.tscn b/DungeonShooting_Godot/scene/Hall.tscn index cd517b7..edfedb8 100644 --- a/DungeonShooting_Godot/scene/Hall.tscn +++ b/DungeonShooting_Godot/scene/Hall.tscn @@ -49,7 +49,6 @@ [ext_resource type="Texture2D" uid="uid://ms8v1g1nhqv3" path="res://resource/sprite/item/hall_c/item _07.png" id="49_yocgq"] [ext_resource type="Texture2D" uid="uid://rrxkyras3kdw" path="res://resource/sprite/item/hall_c/item _12.png" id="52_1n1p3"] - [sub_resource type="RectangleShape2D" id="RectangleShape2D_ru8u4"] size = Vector2(19, 10) @@ -124,7 +123,7 @@ ShowOffset = Vector2(2.08165e-12, 2) CollisionVisible = false -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0006" index="0"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0006" index="1"] position = Vector2(-11, -3) texture = ExtResource("7_30qwa") @@ -136,7 +135,7 @@ ShowOffset = Vector2(2.08165e-12, 2) CollisionVisible = false -[node name="ActivityInstance" type="Node2D" parent="ItemRoot/Item0008" index="0"] +[node name="ActivityInstance" type="Node2D" parent="ItemRoot/Item0008" index="1"] position = Vector2(2.5, -12) script = ExtResource("5_lowqi") Id = "item_0031" @@ -152,7 +151,7 @@ ShowOffset = Vector2(2.08165e-12, 2) CollisionVisible = false -[node name="Item26" type="Sprite2D" parent="ItemRoot/Item0013" index="0"] +[node name="Item26" type="Sprite2D" parent="ItemRoot/Item0013" index="1"] position = Vector2(18, -2) texture = ExtResource("8_61dkg") @@ -164,19 +163,19 @@ ShowOffset = Vector2(2.08165e-12, 2) CollisionVisible = false -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0017" index="0"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0017" index="1"] position = Vector2(-2, -13) texture = ExtResource("8_u3vry") -[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0017" index="1"] +[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0017" index="2"] position = Vector2(18, -11) texture = ExtResource("9_lhdr8") -[node name="Sprite2D3" type="Sprite2D" parent="ItemRoot/Item0017" index="2"] +[node name="Sprite2D3" type="Sprite2D" parent="ItemRoot/Item0017" index="3"] position = Vector2(-16, -2) texture = ExtResource("10_4eqn0") -[node name="Sprite2D4" type="Sprite2D" parent="ItemRoot/Item0017" index="3"] +[node name="Sprite2D4" type="Sprite2D" parent="ItemRoot/Item0017" index="4"] position = Vector2(10, -1) texture = ExtResource("11_tg3jo") @@ -202,11 +201,11 @@ DefaultLayer = 1 CollisionVisible = false -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0002" index="0"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0002" index="1"] position = Vector2(32, -2) texture = ExtResource("12_agfji") -[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0002" index="1"] +[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0002" index="2"] material = SubResource("ShaderMaterial_i7git") position = Vector2(0, -15) scale = Vector2(1, -1) @@ -224,7 +223,7 @@ Id = "item_0004" DefaultLayer = 1 -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0004" index="0"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0004" index="1"] position = Vector2(0, -17) texture = ExtResource("13_unnpl") @@ -259,15 +258,15 @@ Id = "item_0009" DefaultLayer = 1 -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0009" index="0"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0009" index="1"] position = Vector2(-24, -10) texture = ExtResource("15_h7524") -[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0009" index="1"] +[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0009" index="2"] position = Vector2(1, -10) texture = ExtResource("15_h7524") -[node name="Sprite2D3" type="Sprite2D" parent="ItemRoot/Item0009" index="2"] +[node name="Sprite2D3" type="Sprite2D" parent="ItemRoot/Item0009" index="3"] position = Vector2(37, -10) texture = ExtResource("15_h7524") @@ -301,7 +300,7 @@ Id = "item_0015" DefaultLayer = 1 -[node name="Slice04" type="Sprite2D" parent="ItemRoot/Item0015" index="0"] +[node name="Slice04" type="Sprite2D" parent="ItemRoot/Item0015" index="1"] position = Vector2(16, -9) texture = ExtResource("15_h7524") @@ -324,11 +323,11 @@ Id = "item_0019" DefaultLayer = 1 -[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0019" index="0"] +[node name="Sprite2D" type="Sprite2D" parent="ItemRoot/Item0019" index="1"] position = Vector2(-23, -7) texture = ExtResource("16_xj0e1") -[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0019" index="1"] +[node name="Sprite2D2" type="Sprite2D" parent="ItemRoot/Item0019" index="2"] position = Vector2(24, -8) texture = ExtResource("17_gwwce") diff --git a/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs b/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs index 02be8c1..d75c0b0 100644 --- a/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs +++ b/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs @@ -76,7 +76,7 @@ { base.OnInit(); OutlineColor = new Color(2.5f, 0, 0); - SetBlendColor(new Color(2.0f, 2.0f, 2.0f)); + SetBlendColor(new Color(2.5f, 2.5f, 2.5f)); } public virtual void InitData(BulletData data, uint attackLayer)