diff --git a/Scenes/NoteManager/Assets/Arrow_Outline.png b/Scenes/NoteManager/Assets/Arrow_Outline.png deleted file mode 100644 index c15bebb1..00000000 Binary files a/Scenes/NoteManager/Assets/Arrow_Outline.png and /dev/null differ diff --git a/Scenes/NoteManager/Assets/BottomNoteOutline.png b/Scenes/NoteManager/Assets/BottomNoteOutline.png new file mode 100644 index 00000000..bc936801 Binary files /dev/null and b/Scenes/NoteManager/Assets/BottomNoteOutline.png differ diff --git a/Scenes/NoteManager/Assets/BottomNoteOutline.png.import b/Scenes/NoteManager/Assets/BottomNoteOutline.png.import new file mode 100644 index 00000000..a0471559 --- /dev/null +++ b/Scenes/NoteManager/Assets/BottomNoteOutline.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bh68528ekvjbk" +path="res://.godot/imported/BottomNoteOutline.png-dc150bdd190bb985754ca1468a3ef9c6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Scenes/NoteManager/Assets/BottomNoteOutline.png" +dest_files=["res://.godot/imported/BottomNoteOutline.png-dc150bdd190bb985754ca1468a3ef9c6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Scenes/NoteManager/Assets/LeftNoteOutline.png b/Scenes/NoteManager/Assets/LeftNoteOutline.png new file mode 100644 index 00000000..193b3324 Binary files /dev/null and b/Scenes/NoteManager/Assets/LeftNoteOutline.png differ diff --git a/Scenes/NoteManager/Assets/LeftNoteOutline.png.import b/Scenes/NoteManager/Assets/LeftNoteOutline.png.import new file mode 100644 index 00000000..15797272 --- /dev/null +++ b/Scenes/NoteManager/Assets/LeftNoteOutline.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://s84c7d50wjvn" +path="res://.godot/imported/LeftNoteOutline.png-3862cf3f2ce1e27b8968108f0bab1d60.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Scenes/NoteManager/Assets/LeftNoteOutline.png" +dest_files=["res://.godot/imported/LeftNoteOutline.png-3862cf3f2ce1e27b8968108f0bab1d60.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Scenes/NoteManager/Assets/New_Arrow.png b/Scenes/NoteManager/Assets/New_Arrow.png deleted file mode 100644 index 053319db..00000000 Binary files a/Scenes/NoteManager/Assets/New_Arrow.png and /dev/null differ diff --git a/Scenes/NoteManager/Assets/Note.png b/Scenes/NoteManager/Assets/Note.png new file mode 100644 index 00000000..9d5c2b8e Binary files /dev/null and b/Scenes/NoteManager/Assets/Note.png differ diff --git a/Scenes/NoteManager/Assets/New_Arrow.png.import b/Scenes/NoteManager/Assets/Note.png.import similarity index 67% rename from Scenes/NoteManager/Assets/New_Arrow.png.import rename to Scenes/NoteManager/Assets/Note.png.import index 6ee119f2..b1b6b6c5 100644 --- a/Scenes/NoteManager/Assets/New_Arrow.png.import +++ b/Scenes/NoteManager/Assets/Note.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://hfxynr5jdgsp" -path="res://.godot/imported/New_Arrow.png-b9cc790fe65b856a0cee80c6a83cb011.ctex" +uid="uid://2jj65hqoi8su" +path="res://.godot/imported/Note.png-2e674f71d2a373c4546b38b47d74eb69.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Scenes/NoteManager/Assets/New_Arrow.png" -dest_files=["res://.godot/imported/New_Arrow.png-b9cc790fe65b856a0cee80c6a83cb011.ctex"] +source_file="res://Scenes/NoteManager/Assets/Note.png" +dest_files=["res://.godot/imported/Note.png-2e674f71d2a373c4546b38b47d74eb69.ctex"] [params] diff --git a/Scenes/NoteManager/Assets/NoteWIthOutline.png b/Scenes/NoteManager/Assets/NoteWIthOutline.png new file mode 100644 index 00000000..4e95b968 Binary files /dev/null and b/Scenes/NoteManager/Assets/NoteWIthOutline.png differ diff --git a/Scenes/NoteManager/Assets/NoteWIthOutline.png.import b/Scenes/NoteManager/Assets/NoteWIthOutline.png.import new file mode 100644 index 00000000..e9bef490 --- /dev/null +++ b/Scenes/NoteManager/Assets/NoteWIthOutline.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://coav3xvksq4jy" +path="res://.godot/imported/NoteWIthOutline.png-00b7213af7b9958e4dcd747d842ce073.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Scenes/NoteManager/Assets/NoteWIthOutline.png" +dest_files=["res://.godot/imported/NoteWIthOutline.png-00b7213af7b9958e4dcd747d842ce073.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Scenes/NoteManager/Assets/RightNoteOutline.png b/Scenes/NoteManager/Assets/RightNoteOutline.png new file mode 100644 index 00000000..377e7bac Binary files /dev/null and b/Scenes/NoteManager/Assets/RightNoteOutline.png differ diff --git a/Scenes/NoteManager/Assets/RightNoteOutline.png.import b/Scenes/NoteManager/Assets/RightNoteOutline.png.import new file mode 100644 index 00000000..c0783e0a --- /dev/null +++ b/Scenes/NoteManager/Assets/RightNoteOutline.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dslb58tkhgroj" +path="res://.godot/imported/RightNoteOutline.png-2ceb3dbfbab26c238d24a42d793fe330.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Scenes/NoteManager/Assets/RightNoteOutline.png" +dest_files=["res://.godot/imported/RightNoteOutline.png-2ceb3dbfbab26c238d24a42d793fe330.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Scenes/NoteManager/Assets/TopNoteOutline.png b/Scenes/NoteManager/Assets/TopNoteOutline.png new file mode 100644 index 00000000..35518bb5 Binary files /dev/null and b/Scenes/NoteManager/Assets/TopNoteOutline.png differ diff --git a/Scenes/NoteManager/Assets/Arrow_Outline.png.import b/Scenes/NoteManager/Assets/TopNoteOutline.png.import similarity index 66% rename from Scenes/NoteManager/Assets/Arrow_Outline.png.import rename to Scenes/NoteManager/Assets/TopNoteOutline.png.import index d96ddd56..d3cb3171 100644 --- a/Scenes/NoteManager/Assets/Arrow_Outline.png.import +++ b/Scenes/NoteManager/Assets/TopNoteOutline.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cgq2ar3pdmkac" -path="res://.godot/imported/Arrow_Outline.png-dbc89009df5f433f3228bbd1180824d6.ctex" +uid="uid://br6xfjuq6c2nk" +path="res://.godot/imported/TopNoteOutline.png-9589b0c47ba2f4dac012050482888434.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Scenes/NoteManager/Assets/Arrow_Outline.png" -dest_files=["res://.godot/imported/Arrow_Outline.png-dbc89009df5f433f3228bbd1180824d6.ctex"] +source_file="res://Scenes/NoteManager/Assets/TopNoteOutline.png" +dest_files=["res://.godot/imported/TopNoteOutline.png-9589b0c47ba2f4dac012050482888434.ctex"] [params] diff --git a/Scenes/NoteManager/HoldArrow.tscn b/Scenes/NoteManager/HoldArrow.tscn index 7b749f03..ffe7dbc6 100644 --- a/Scenes/NoteManager/HoldArrow.tscn +++ b/Scenes/NoteManager/HoldArrow.tscn @@ -1,21 +1,18 @@ -[gd_scene load_steps=5 format=3 uid="uid://b3owchvgq1l87"] +[gd_scene load_steps=4 format=3 uid="uid://b3owchvgq1l87"] -[ext_resource type="Texture2D" uid="uid://hfxynr5jdgsp" path="res://Scenes/NoteManager/Assets/New_Arrow.png" id="1_nn8ao"] +[ext_resource type="Texture2D" uid="uid://2jj65hqoi8su" path="res://Scenes/NoteManager/Assets/Note.png" id="1_el0uw"] [ext_resource type="Script" uid="uid://ci5tt447bivmk" path="res://Scenes/NoteManager/Scripts/HoldArrow.cs" id="2_hehcu"] -[ext_resource type="Texture2D" uid="uid://cgq2ar3pdmkac" path="res://Scenes/NoteManager/Assets/Arrow_Outline.png" id="3_pvvea"] [ext_resource type="Texture2D" uid="uid://dbnvl0gbhl5b4" path="res://Scenes/NoteManager/Assets/Arrow_Trail.png" id="4_xgcwb"] [node name="Right-arrow" type="Sprite2D" node_paths=PackedStringArray("_trail", "OutlineSprite", "IconSprite")] z_index = 2 -rotation = 3.14159 -texture = ExtResource("1_nn8ao") +texture = ExtResource("1_el0uw") script = ExtResource("2_hehcu") _trail = NodePath("CometTail/TrailRemote/Trail") OutlineSprite = NodePath("Outline") IconSprite = NodePath("Icon") [node name="Outline" type="Sprite2D" parent="."] -texture = ExtResource("3_pvvea") [node name="Icon" type="Sprite2D" parent="."] diff --git a/Scenes/NoteManager/NoteArrow.tscn b/Scenes/NoteManager/NoteArrow.tscn index dc5521ce..ae606faf 100644 --- a/Scenes/NoteManager/NoteArrow.tscn +++ b/Scenes/NoteManager/NoteArrow.tscn @@ -1,16 +1,14 @@ -[gd_scene load_steps=4 format=3 uid="uid://ck3bfqy30rjbq"] +[gd_scene load_steps=3 format=3 uid="uid://ck3bfqy30rjbq"] -[ext_resource type="Texture2D" uid="uid://hfxynr5jdgsp" path="res://Scenes/NoteManager/Assets/New_Arrow.png" id="1_wq1hy"] +[ext_resource type="Texture2D" uid="uid://2jj65hqoi8su" path="res://Scenes/NoteManager/Assets/Note.png" id="1_t5o3d"] [ext_resource type="Script" uid="uid://cfdthf532wby7" path="res://Scenes/NoteManager/Scripts/NoteArrow.cs" id="2_lbl4b"] -[ext_resource type="Texture2D" uid="uid://cgq2ar3pdmkac" path="res://Scenes/NoteManager/Assets/Arrow_Outline.png" id="3_5g4ja"] [node name="Right-arrow" type="Sprite2D" node_paths=PackedStringArray("OutlineSprite", "IconSprite")] -texture = ExtResource("1_wq1hy") +texture = ExtResource("1_t5o3d") script = ExtResource("2_lbl4b") OutlineSprite = NodePath("Outline") IconSprite = NodePath("Icon") [node name="Outline" type="Sprite2D" parent="."] -texture = ExtResource("3_5g4ja") [node name="Icon" type="Sprite2D" parent="."] diff --git a/Scenes/NoteManager/NoteManager.tscn b/Scenes/NoteManager/NoteManager.tscn index fc5e75d8..2e5da20d 100644 --- a/Scenes/NoteManager/NoteManager.tscn +++ b/Scenes/NoteManager/NoteManager.tscn @@ -1,61 +1,65 @@ -[gd_scene load_steps=7 format=3 uid="uid://bn8txx53xlguw"] +[gd_scene load_steps=10 format=3 uid="uid://bn8txx53xlguw"] [ext_resource type="Script" uid="uid://bok6bnyemsgck" path="res://Scenes/NoteManager/Scripts/InputHandler.cs" id="1_2oeuf"] -[ext_resource type="Texture2D" uid="uid://hfxynr5jdgsp" path="res://Scenes/NoteManager/Assets/New_Arrow.png" id="2_pb1qk"] +[ext_resource type="Texture2D" uid="uid://2jj65hqoi8su" path="res://Scenes/NoteManager/Assets/Note.png" id="2_shvru"] [ext_resource type="Script" uid="uid://coukobemtvmah" path="res://Scenes/NoteManager/Scripts/NoteChecker.cs" id="3_0cioe"] -[ext_resource type="Texture2D" uid="uid://cgq2ar3pdmkac" path="res://Scenes/NoteManager/Assets/Arrow_Outline.png" id="4_3mttx"] +[ext_resource type="Texture2D" uid="uid://br6xfjuq6c2nk" path="res://Scenes/NoteManager/Assets/TopNoteOutline.png" id="4_adgij"] [ext_resource type="Texture2D" uid="uid://b0tvsewgnf2x7" path="res://icon.svg" id="4_foklt"] [ext_resource type="PackedScene" uid="uid://bcf6vs4aqoxr5" path="res://Scenes/ChartViewport/HitParticles.tscn" id="5_jv1tr"] +[ext_resource type="Texture2D" uid="uid://s84c7d50wjvn" path="res://Scenes/NoteManager/Assets/LeftNoteOutline.png" id="7_hm3i3"] +[ext_resource type="Texture2D" uid="uid://dslb58tkhgroj" path="res://Scenes/NoteManager/Assets/RightNoteOutline.png" id="9_osoy2"] +[ext_resource type="Texture2D" uid="uid://bh68528ekvjbk" path="res://Scenes/NoteManager/Assets/BottomNoteOutline.png" id="11_ymppf"] [node name="noteManager" type="Node2D"] script = ExtResource("1_2oeuf") [node name="noteCheckers" type="Node2D" parent="."] -[node name="arrowLeft" type="Sprite2D" parent="noteCheckers"] -position = Vector2(0, 29) -rotation = 3.14159 -texture = ExtResource("2_pb1qk") +[node name="arrowLeft" type="Sprite2D" parent="noteCheckers" node_paths=PackedStringArray("Outline")] +position = Vector2(0, 27) +texture = ExtResource("2_shvru") script = ExtResource("3_0cioe") +Outline = NodePath("Outline") [node name="Outline" type="Sprite2D" parent="noteCheckers/arrowLeft"] -modulate = Color(0, 0, 0, 1) -texture = ExtResource("4_3mttx") +self_modulate = Color(0.45, 0.45, 0.45, 1) +texture = ExtResource("4_adgij") [node name="HitParticles" parent="noteCheckers/arrowLeft" instance=ExtResource("5_jv1tr")] -[node name="arrowUp" type="Sprite2D" parent="noteCheckers"] +[node name="arrowUp" type="Sprite2D" parent="noteCheckers" node_paths=PackedStringArray("Outline")] position = Vector2(0, 68) -rotation = -1.5708 -texture = ExtResource("2_pb1qk") +texture = ExtResource("2_shvru") script = ExtResource("3_0cioe") +Outline = NodePath("Outline") [node name="Outline" type="Sprite2D" parent="noteCheckers/arrowUp"] -modulate = Color(0, 0, 0, 1) -texture = ExtResource("4_3mttx") +self_modulate = Color(0.45, 0.45, 0.45, 1) +texture = ExtResource("7_hm3i3") [node name="HitParticles" parent="noteCheckers/arrowUp" instance=ExtResource("5_jv1tr")] -[node name="arrowDown" type="Sprite2D" parent="noteCheckers"] +[node name="arrowDown" type="Sprite2D" parent="noteCheckers" node_paths=PackedStringArray("Outline")] position = Vector2(0, 112) -rotation = 1.5708 -texture = ExtResource("2_pb1qk") +texture = ExtResource("2_shvru") script = ExtResource("3_0cioe") +Outline = NodePath("Outline") [node name="Outline" type="Sprite2D" parent="noteCheckers/arrowDown"] -modulate = Color(0, 0, 0, 1) -texture = ExtResource("4_3mttx") +self_modulate = Color(0.45, 0.45, 0.45, 1) +texture = ExtResource("9_osoy2") [node name="HitParticles" parent="noteCheckers/arrowDown" instance=ExtResource("5_jv1tr")] -[node name="arrowRight" type="Sprite2D" parent="noteCheckers"] -position = Vector2(0, 151) -texture = ExtResource("2_pb1qk") +[node name="arrowRight" type="Sprite2D" parent="noteCheckers" node_paths=PackedStringArray("Outline")] +position = Vector2(0, 153) +texture = ExtResource("2_shvru") script = ExtResource("3_0cioe") +Outline = NodePath("Outline") [node name="Outline" type="Sprite2D" parent="noteCheckers/arrowRight"] -modulate = Color(0, 0, 0, 1) -texture = ExtResource("4_3mttx") +self_modulate = Color(0.45, 0.45, 0.45, 1) +texture = ExtResource("11_ymppf") [node name="HitParticles" parent="noteCheckers/arrowRight" instance=ExtResource("5_jv1tr")] diff --git a/Scenes/NoteManager/Scripts/InputHandler.cs b/Scenes/NoteManager/Scripts/InputHandler.cs index bb6f21a9..682895b6 100644 --- a/Scenes/NoteManager/Scripts/InputHandler.cs +++ b/Scenes/NoteManager/Scripts/InputHandler.cs @@ -99,7 +99,7 @@ public void FeedbackEffect(ArrowType arrow, Timing timed) switch (timed) { case Timing.Perfect: - particleAmount = 10; + particleAmount = 30; break; case Timing.Good: particleAmount = 7; diff --git a/Scenes/NoteManager/Scripts/NoteArrow.cs b/Scenes/NoteManager/Scripts/NoteArrow.cs index 566fd2e5..fe3b6c7e 100644 --- a/Scenes/NoteManager/Scripts/NoteArrow.cs +++ b/Scenes/NoteManager/Scripts/NoteArrow.cs @@ -35,7 +35,7 @@ public virtual void Init(CheckerData parentChecker, ArrowData arrowData, double _beatTime = beatTime; Position = new Vector2(GetNewPosX(), parentChecker.Node.GlobalPosition.Y); - RotationDegrees = parentChecker.Node.RotationDegrees; + OutlineSprite.Texture = parentChecker.Node.Outline.Texture; IconSprite.Texture = arrowData.NoteRef.Texture; IconSprite.Rotation = -Rotation; OutlineSprite.Modulate = parentChecker.Color; diff --git a/Scenes/NoteManager/Scripts/NoteChecker.cs b/Scenes/NoteManager/Scripts/NoteChecker.cs index f6e19e0b..6beb0f66 100644 --- a/Scenes/NoteManager/Scripts/NoteChecker.cs +++ b/Scenes/NoteManager/Scripts/NoteChecker.cs @@ -10,11 +10,14 @@ public partial class NoteChecker : Sprite2D private float _fadeTime = 2.0f; public HitParticles Particles; + [Export] + public Sprite2D Outline; + public override void _Process(double delta) { - SelfModulate = _isPressed - ? Modulate.Lerp(_color, _fadeTime) - : SelfModulate.Lerp( + Modulate = _isPressed + ? SelfModulate.Lerp(_color.Lightened(.5f), _fadeTime) + : Modulate.Lerp( new Color(_color.R * 0.5f, _color.G * 0.5f, _color.B * 0.5f, 1), (float)delta * _fadeTime ); @@ -30,6 +33,6 @@ public void SetColor(Color color) _color = color; Particles = GetNode("HitParticles"); Particles.Modulate = color; - SelfModulate = new Color(_color.R * 0.5f, _color.G * 0.5f, _color.B * 0.5f, 1); + Modulate = new Color(_color.R * 0.5f, _color.G * 0.5f, _color.B * 0.5f, 1); } } diff --git a/Scenes/UI/Options/HowToPlay.tscn b/Scenes/UI/Options/HowToPlay.tscn index 1883ffcf..04ff7993 100644 --- a/Scenes/UI/Options/HowToPlay.tscn +++ b/Scenes/UI/Options/HowToPlay.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=11 format=3 uid="uid://cavxn51vwbew3"] [ext_resource type="Script" uid="uid://chu2uvshtv2vv" path="res://Scenes/UI/Options/Scripts/HowToPlay.cs" id="1_kqayr"] -[ext_resource type="Texture2D" uid="uid://xtygvpk7s8e4" path="res://SharedAssets/NoteArrow_Black_Outline.png" id="2_4i384"] [ext_resource type="Texture2D" uid="uid://ck16vyh1q68ri" path="res://Scenes/UI/Assets/UI_ForestBackground.png" id="2_ma418"] [ext_resource type="Texture2D" uid="uid://dp3vkn65j4o3s" path="res://Scenes/UI/Assets/HowToPlay_Combo_Bar.png" id="3_7006y"] [ext_resource type="Theme" uid="uid://d37e3tpsbxwak" path="res://Scenes/UI/Assets/GeneralTheme.tres" id="3_xqve7"] [ext_resource type="Texture2D" uid="uid://cr82n7aojboaw" path="res://Scenes/UI/Assets/UI_CenterFrameLight.png" id="4_4vscx"] [ext_resource type="Texture2D" uid="uid://caw70lr5e1yiq" path="res://Classes/Notes/Assets/Note_PlayerDouble.png" id="4_m6low"] [ext_resource type="Texture2D" uid="uid://cdf3g3174du4r" path="res://Classes/Notes/Assets/Note_PlayerHeal.png" id="5_8kiq2"] +[ext_resource type="Texture2D" uid="uid://coav3xvksq4jy" path="res://Scenes/NoteManager/Assets/NoteWIthOutline.png" id="5_xqve7"] [ext_resource type="Texture2D" uid="uid://c3chrsxrulapd" path="res://Classes/Notes/Assets/Note_PlayerBasic.png" id="6_uonw3"] [ext_resource type="Texture2D" uid="uid://dg0lmu0pip4lr" path="res://Classes/Notes/Assets/Note_PlayerVampire.png" id="7_rbdrm"] @@ -81,22 +81,19 @@ patch_margin_bottom = 5 [node name="Left" type="Sprite2D" parent="Control/MarginContainer"] position = Vector2(27.0001, 62) -rotation = -3.14159 -texture = ExtResource("2_4i384") +texture = ExtResource("5_xqve7") [node name="Up" type="Sprite2D" parent="Control/MarginContainer"] position = Vector2(27.0001, 102) -rotation = -1.5708 -texture = ExtResource("2_4i384") +texture = ExtResource("5_xqve7") [node name="Down" type="Sprite2D" parent="Control/MarginContainer"] position = Vector2(27.0001, 145) -rotation = 1.5708 -texture = ExtResource("2_4i384") +texture = ExtResource("5_xqve7") [node name="Right" type="Sprite2D" parent="Control/MarginContainer"] position = Vector2(27.0001, 186) -texture = ExtResource("2_4i384") +texture = ExtResource("5_xqve7") [node name="Label" type="Label" parent="Control/MarginContainer"] layout_mode = 2 @@ -169,22 +166,19 @@ text = "HOW_TO_PLAY_BLOCK3" [node name="Left" type="Sprite2D" parent="Control/MarginContainer3"] position = Vector2(27.0001, 62) -rotation = -3.14159 -texture = ExtResource("2_4i384") +texture = ExtResource("5_xqve7") [node name="Up" type="Sprite2D" parent="Control/MarginContainer3"] position = Vector2(27.0001, 102) -rotation = -1.5708 -texture = ExtResource("2_4i384") +texture = ExtResource("5_xqve7") [node name="Down" type="Sprite2D" parent="Control/MarginContainer3"] position = Vector2(27.0001, 145) -rotation = 1.5708 -texture = ExtResource("2_4i384") +texture = ExtResource("5_xqve7") [node name="Right" type="Sprite2D" parent="Control/MarginContainer3"] position = Vector2(27.0001, 186) -texture = ExtResource("2_4i384") +texture = ExtResource("5_xqve7") [node name="DoubleNote" type="Sprite2D" parent="Control/MarginContainer3"] position = Vector2(27, 60) diff --git a/Scenes/UI/Remapping/Remap.tscn b/Scenes/UI/Remapping/Remap.tscn index adbf744d..b4c06a2f 100644 --- a/Scenes/UI/Remapping/Remap.tscn +++ b/Scenes/UI/Remapping/Remap.tscn @@ -1,11 +1,15 @@ -[gd_scene load_steps=19 format=3 uid="uid://bew23sumjs0fg"] +[gd_scene load_steps=23 format=3 uid="uid://bew23sumjs0fg"] [ext_resource type="Script" uid="uid://lnlfcp1n0mad" path="res://Scenes/UI/Remapping/ControlSettings.cs" id="1_ir12b"] [ext_resource type="Texture2D" uid="uid://ck16vyh1q68ri" path="res://Scenes/UI/Assets/UI_ForestBackground.png" id="2_tqdi0"] [ext_resource type="Theme" uid="uid://d37e3tpsbxwak" path="res://Scenes/UI/Assets/GeneralTheme.tres" id="3_wr01w"] +[ext_resource type="Texture2D" uid="uid://br6xfjuq6c2nk" path="res://Scenes/NoteManager/Assets/TopNoteOutline.png" id="4_4nu1q"] [ext_resource type="Texture2D" uid="uid://8u3xvcma81d" path="res://Scenes/UI/Assets/UI_CrystalFrame.png" id="4_8jqfi"] [ext_resource type="Texture2D" uid="uid://xtygvpk7s8e4" path="res://SharedAssets/NoteArrow_Black_Outline.png" id="4_se2m3"] +[ext_resource type="Texture2D" uid="uid://bh68528ekvjbk" path="res://Scenes/NoteManager/Assets/BottomNoteOutline.png" id="5_s0mtp"] [ext_resource type="Texture2D" uid="uid://ucxkeg8mkugt" path="res://Scenes/UI/Remapping/Assets/A.png" id="6_rrvpi"] +[ext_resource type="Texture2D" uid="uid://s84c7d50wjvn" path="res://Scenes/NoteManager/Assets/LeftNoteOutline.png" id="6_sl0ys"] +[ext_resource type="Texture2D" uid="uid://dslb58tkhgroj" path="res://Scenes/NoteManager/Assets/RightNoteOutline.png" id="7_3xifn"] [ext_resource type="Texture2D" uid="uid://e4dr0lk7ll0e" path="res://Scenes/UI/Remapping/Assets/W.png" id="7_kgn1x"] [ext_resource type="Texture2D" uid="uid://bhjl3xnuwauu0" path="res://Scenes/UI/Remapping/Assets/S.png" id="8_40ke1"] [ext_resource type="Texture2D" uid="uid://bpic7oh05r5fp" path="res://Scenes/UI/Remapping/Assets/D.png" id="9_qhhwk"] @@ -152,25 +156,22 @@ theme = ExtResource("3_wr01w") [node name="Left" type="Sprite2D" parent="Panel/TabContainer/CONTROLS_KEYBOARD"] z_index = 1 position = Vector2(81, 39) -rotation = -3.14159 -texture = ExtResource("4_se2m3") +texture = ExtResource("4_4nu1q") [node name="Right" type="Sprite2D" parent="Panel/TabContainer/CONTROLS_KEYBOARD"] z_index = 1 position = Vector2(279, 39) -texture = ExtResource("4_se2m3") +texture = ExtResource("5_s0mtp") [node name="Up" type="Sprite2D" parent="Panel/TabContainer/CONTROLS_KEYBOARD"] z_index = 1 position = Vector2(82, 115) -rotation = -1.5708 -texture = ExtResource("4_se2m3") +texture = ExtResource("6_sl0ys") [node name="Down" type="Sprite2D" parent="Panel/TabContainer/CONTROLS_KEYBOARD"] z_index = 1 position = Vector2(280, 114) -rotation = 1.5708 -texture = ExtResource("4_se2m3") +texture = ExtResource("7_3xifn") [node name="TEMPSecondaryButtonText" type="Label" parent="Panel/TabContainer/CONTROLS_KEYBOARD"] z_index = 1 diff --git a/Scenes/UI/TitleScreen/TitleScreenEffects.tscn b/Scenes/UI/TitleScreen/TitleScreenEffects.tscn index c1398f02..670edb8d 100644 --- a/Scenes/UI/TitleScreen/TitleScreenEffects.tscn +++ b/Scenes/UI/TitleScreen/TitleScreenEffects.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://dkaxidh7xlvfc"] [ext_resource type="Texture2D" uid="uid://iqbqsiyjd3uq" path="res://Scenes/UI/TitleScreen/Assets/2D_Shadow_Map.webp" id="1_07rxh"] -[ext_resource type="Texture2D" uid="uid://hfxynr5jdgsp" path="res://Scenes/NoteManager/Assets/New_Arrow.png" id="2_ty17s"] +[ext_resource type="Texture2D" uid="uid://coav3xvksq4jy" path="res://Scenes/NoteManager/Assets/NoteWIthOutline.png" id="2_ltons"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_4croe"] particle_flag_disable_z = true @@ -34,7 +34,7 @@ light_mask = 0 z_index = -1 z_as_relative = false position = Vector2(643, 154) -texture = ExtResource("2_ty17s") +texture = ExtResource("2_ltons") lifetime = 15.0 randomness = 1.0 process_material = SubResource("ParticleProcessMaterial_4croe")