diff --git a/Zennysoft.Game.Ma/project.godot b/Zennysoft.Game.Ma/project.godot index acb1a7a8..4fd68885 100644 --- a/Zennysoft.Game.Ma/project.godot +++ b/Zennysoft.Game.Ma/project.godot @@ -228,7 +228,7 @@ AltAttack={ [internationalization] -locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue") +locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue", "res://src/dialog/Altar.dialogue") [layer_names] diff --git a/Zennysoft.Game.Ma/src/app/App.cs b/Zennysoft.Game.Ma/src/app/App.cs index f344f40a..58968408 100644 --- a/Zennysoft.Game.Ma/src/app/App.cs +++ b/Zennysoft.Game.Ma/src/app/App.cs @@ -196,7 +196,7 @@ public partial class App : Node, IApp private async void OnGallery() { GalleryMenu.Show(); - GalleryMenu.Item1Thumb.GrabFocus(); + GalleryMenu.PreviousButton.GrabFocus(); } public void OnQuit() => AppLogic.Input(new AppLogic.Input.QuitGame()); diff --git a/Zennysoft.Game.Ma/src/dialog/Altar.dialogue b/Zennysoft.Game.Ma/src/dialog/Altar.dialogue new file mode 100644 index 00000000..2a10d911 --- /dev/null +++ b/Zennysoft.Game.Ma/src/dialog/Altar.dialogue @@ -0,0 +1,3 @@ +~ no_exit +Altar: This is the text that shows when you try to leave +=> END \ No newline at end of file diff --git a/Zennysoft.Game.Ma/src/dialog/Altar.dialogue.import b/Zennysoft.Game.Ma/src/dialog/Altar.dialogue.import new file mode 100644 index 00000000..1415b755 --- /dev/null +++ b/Zennysoft.Game.Ma/src/dialog/Altar.dialogue.import @@ -0,0 +1,16 @@ +[remap] + +importer="dialogue_manager" +importer_version=15 +type="Resource" +uid="uid://bqnfw6r4085yv" +path="res://.godot/imported/Altar.dialogue-4c0a39657904bbae8a3f60621532f38d.tres" + +[deps] + +source_file="res://src/dialog/Altar.dialogue" +dest_files=["res://.godot/imported/Altar.dialogue-4c0a39657904bbae8a3f60621532f38d.tres"] + +[params] + +defaults=true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/Death Animation/HORSE-FACE Exploding.glb b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/Death Animation/HORSE-FACE Exploding.glb deleted file mode 100644 index cf1b9ae0..00000000 Binary files a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/Death Animation/HORSE-FACE Exploding.glb and /dev/null differ diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding.glb b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding.glb deleted file mode 100644 index 76c688a7..00000000 Binary files a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding.glb and /dev/null differ diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding.glb.import b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding.glb.import deleted file mode 100644 index 4ee673fc..00000000 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding.glb.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="scene" -importer_version=1 -type="PackedScene" -uid="uid://dqy21hc81trgg" -path="res://.godot/imported/OX FACE exploding.glb-720cbe989c703d3ef4275c053e0a33bc.scn" - -[deps] - -source_file="res://src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding.glb" -dest_files=["res://.godot/imported/OX FACE exploding.glb-720cbe989c703d3ef4275c053e0a33bc.scn"] - -[params] - -nodes/root_type="" -nodes/root_name="" -nodes/apply_root_scale=true -nodes/root_scale=1.0 -nodes/import_as_skeleton_bones=false -nodes/use_node_type_suffixes=true -meshes/ensure_tangents=true -meshes/generate_lods=true -meshes/create_shadow_meshes=true -meshes/light_baking=1 -meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false -skins/use_named_skins=true -animation/import=true -animation/fps=30 -animation/trimming=false -animation/remove_immutable_tracks=true -animation/import_rest_as_RESET=false -import_script/path="" -_subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Color.jpg b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Color.jpg deleted file mode 100644 index 1df5033c..00000000 Binary files a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Color.jpg and /dev/null differ diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg deleted file mode 100644 index 651139ad..00000000 Binary files a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg and /dev/null differ diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg.import b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg.import deleted file mode 100644 index 63de6259..00000000 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://denk7ylhfmh71" -path="res://.godot/imported/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg-7c27b77c6fa7b2ccd407918a129a5f60.ctex" -metadata={ -"vram_texture": false -} -generator_parameters={ -"md5": "ebbb46c4f552a8b17e6801dc6b95714a" -} - -[deps] - -source_file="res://src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg" -dest_files=["res://.godot/imported/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg-7c27b77c6fa7b2ccd407918a129a5f60.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=1 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=1 -roughness/src_normal="res://src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Displacement.jpg" -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=0 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_sensitive_areas.jpg b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_sensitive_areas.jpg deleted file mode 100644 index 512453f7..00000000 Binary files a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_sensitive_areas.jpg and /dev/null differ diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs b/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs index 76b1ed1d..ad174f8a 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs +++ b/Zennysoft.Game.Ma/src/map/dungeon/code/Altar.cs @@ -17,21 +17,33 @@ public partial class Altar : Node3D, IDungeonFloor [Node] private Marker3D PlayerSpawnPoint { get; set; } = default!; + [Node] private Area3D NoExitArea { get; set; } = default!; + public ImmutableList Rooms => []; + [Export] public Resource Dialogue { get; set; } = default!; + public bool FloorIsLoaded { get; set; } public override void _Ready() { - Show(); - Exit.AreaEntered += Exit_AreaEntered; - FloorIsLoaded = true; + Show(); + Exit.AreaEntered += Exit_AreaEntered; + NoExitArea.AreaEntered += NoExitArea_AreaEntered; + FloorIsLoaded = true; + } + + private void NoExitArea_AreaEntered(Area3D area) + { + DialogueController.ShowDialogue(Dialogue, "no_exit"); + //if (area.GetOwner() is IPlayer player) + // player.Deactivate(); } private void Exit_AreaEntered(Area3D area) { - if (area.GetOwner() is IPlayer) - ExitReached(); + if (area.GetOwner() is IPlayer) + ExitReached(); } public void ExitReached() => Game.FloorExitReached(); diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn index d0fee1bf..74784aca 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=58 format=4 uid="uid://dl6h1djc27ddl"] +[gd_scene load_steps=60 format=4 uid="uid://dl6h1djc27ddl"] [ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Altar.cs" id="1_5jip8"] +[ext_resource type="Resource" uid="uid://bqnfw6r4085yv" path="res://src/dialog/Altar.dialogue" id="2_3jpsj"] [ext_resource type="Texture2D" uid="uid://b27ksiyfefb33" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_outside_desert.png" id="2_fsslh"] [ext_resource type="Texture2D" uid="uid://cmfhbi07s4v5x" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_BOULDER_DARK.png" id="3_ownfb"] [ext_resource type="Texture2D" uid="uid://cfo5c1twdrnea" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_concrete_0025_color_1k.jpg" id="4_5ln1c"] @@ -724,8 +725,12 @@ dof_blur_far_enabled = true dof_blur_far_distance = 29.84 dof_blur_amount = 0.06 +[sub_resource type="BoxShape3D" id="BoxShape3D_tp2pi"] +size = Vector3(4.52301, 7.56061, 15.4608) + [node name="Floor0" type="Node3D"] script = ExtResource("1_5jip8") +Dialogue = ExtResource("2_3jpsj") [node name="Model" type="Node3D" parent="."] @@ -880,3 +885,12 @@ light_color = Color(0.741575, 0.674356, 0.615845, 1) light_energy = 3.762 shadow_enabled = true shadow_blur = 2.832 + +[node name="NoExitArea" type="Area3D" parent="."] +unique_name_in_owner = true +collision_layer = 0 +collision_mask = 64 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="NoExitArea"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 51.4926, -2.06593, -2.02953) +shape = SubResource("BoxShape3D_tp2pi") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/15. Boss Floor A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/15. Boss Floor A.tscn index a2629b43..6e0c7bca 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/15. Boss Floor A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/15. Boss Floor A.tscn @@ -4295,36 +4295,36 @@ script = ExtResource("1_0h3lb") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.327652, -16.1644, 0) [node name="2_001" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] -transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 28.0257) +transform = Transform3D(0.420615, 4.99653e-08, -2.03649e-08, -5.28814e-08, 0.350217, -0.232947, 1.07156e-08, -0.232947, -0.350217, -130.9, 19.1732, 28.0257) layers = 524288 mesh = SubResource("ArrayMesh_kw6od") skeleton = NodePath("") [node name="2_002" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] -transform = Transform3D(0.420615, 5.78354e-08, -1.39003e-08, -5.87984e-08, 0.389404, -0.159001, 8.99407e-09, -0.159001, -0.389404, -133.608, 19.3244, 6.98554) +transform = Transform3D(0.420615, 2.12659e-08, 2.99856e-08, -3.67611e-08, 0.243457, 0.342995, 1.45129e-11, 0.342995, -0.243457, -133.608, 19.3244, 6.98554) layers = 524288 mesh = SubResource("ArrayMesh_mug6s") skeleton = NodePath("") [node name="2_003" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] -transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 6.86731) +transform = Transform3D(0.420615, 4.99653e-08, -2.03649e-08, -5.28814e-08, 0.350217, -0.232947, 1.07156e-08, -0.232947, -0.350217, -130.9, 19.1732, 6.86731) layers = 524288 mesh = SubResource("ArrayMesh_xx38s") skeleton = NodePath("") [node name="2_004" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] -transform = Transform3D(0.420615, 5.78354e-08, -1.39003e-08, -5.87984e-08, 0.389404, -0.159001, 8.99407e-09, -0.159001, -0.389404, -133.608, 19.3244, 28.144) +transform = Transform3D(0.420615, 2.12659e-08, 2.99856e-08, -3.67611e-08, 0.243457, 0.342995, 1.45129e-11, 0.342995, -0.243457, -133.608, 19.3244, 28.144) layers = 524288 mesh = SubResource("ArrayMesh_ct7uo") skeleton = NodePath("") [node name="2_005" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] -transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 28.0257) +transform = Transform3D(0.420615, 4.99653e-08, -2.03649e-08, -5.28814e-08, 0.350217, -0.232947, 1.07156e-08, -0.232947, -0.350217, -130.9, 19.1732, 28.0257) mesh = SubResource("ArrayMesh_2l4dv") skeleton = NodePath("") [node name="2_006" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] -transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 28.0257) +transform = Transform3D(0.420615, 4.99653e-08, -2.03649e-08, -5.28814e-08, 0.350217, -0.232947, 1.07156e-08, -0.232947, -0.350217, -130.9, 19.1732, 28.0257) mesh = SubResource("ArrayMesh_k0kv6") skeleton = NodePath("") @@ -4853,11 +4853,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -240.071, 36.4279, 34.624) visible = false shape = SubResource("BoxShape3D_pkvyy") -[node name="HorseHeadStatue" parent="Room" instance=ExtResource("24_r1rk5")] +[node name="Horse Head" type="Node3D" parent="Room"] + +[node name="HorseHeadStatue" parent="Room/Horse Head" instance=ExtResource("24_r1rk5")] unique_name_in_owner = true transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -102.157, -2.30863, 13.3664) -[node name="HorseFace" parent="Room" instance=ExtResource("25_a482y")] +[node name="HorseFace" parent="Room/Horse Head" instance=ExtResource("25_a482y")] unique_name_in_owner = true transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -102.157, -0.510939, 13.3664) visible = false @@ -4865,13 +4867,17 @@ PrimaryAttackElementalType = null PrimaryAttackElementalDamageBonus = null InitialHP = null -[node name="OxFaceStatue" parent="Room" instance=ExtResource("26_futcf")] -unique_name_in_owner = true -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -101.555, -2.30863, 21.5833) +[node name="OxFace" type="Node3D" parent="Room"] +transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -102.157, -0.510939, 13.3664) -[node name="OxFace" parent="Room" instance=ExtResource("27_g6y6v")] +[node name="OxFaceStatue" parent="Room/OxFace" instance=ExtResource("26_futcf")] unique_name_in_owner = true -transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -101.703, -0.479859, 22.0955) +transform = Transform3D(6.66667, 0, 0, 0, 6.66667, 0, 0, 0, 6.66667, 54.7793, -11.9846, -4.01331) +visible = false + +[node name="OxFace" parent="Room/OxFace" instance=ExtResource("27_g6y6v")] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 58.194, 0.2072, -3.02661) visible = false PrimaryAttackElementalType = null PrimaryAttackElementalDamageBonus = null diff --git a/Zennysoft.Game.Ma/src/player/Player.cs b/Zennysoft.Game.Ma/src/player/Player.cs index bde3ae64..9ddcf6aa 100644 --- a/Zennysoft.Game.Ma/src/player/Player.cs +++ b/Zennysoft.Game.Ma/src/player/Player.cs @@ -179,6 +179,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide public void Deactivate() { + Velocity = Vector3.Zero; SetProcessInput(false); SetPhysicsProcess(false); SetHealthTimerStatus(false); diff --git a/Zennysoft.Game.Ma/src/ui/dialogue/DialogueBalloon.tscn b/Zennysoft.Game.Ma/src/ui/dialogue/DialogueBalloon.tscn index f54e4b3d..d5891079 100644 --- a/Zennysoft.Game.Ma/src/ui/dialogue/DialogueBalloon.tscn +++ b/Zennysoft.Game.Ma/src/ui/dialogue/DialogueBalloon.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://drrynjlwqt8wi"] +[gd_scene load_steps=21 format=3 uid="uid://drrynjlwqt8wi"] [ext_resource type="Script" uid="uid://5b3w40kwakl3" path="res://addons/dialogue_manager/example_balloon/ExampleBalloon.cs" id="1_okfmu"] [ext_resource type="FontFile" uid="uid://dit3vylt7hmmx" path="res://src/ui/fonts/FT88-Regular.ttf" id="2_c4c1f"] @@ -70,6 +70,8 @@ MarginContainer/constants/margin_right = 30 MarginContainer/constants/margin_top = 15 Panel/styles/panel = SubResource("StyleBoxFlat_uy0d5") +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_g5mp8"] + [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_8reha"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_cb5sp"] @@ -104,36 +106,31 @@ grow_vertical = 2 theme = SubResource("Theme_qq3yp") [node name="Panel" type="Panel" parent="Balloon"] -custom_minimum_size = Vector2(1000, 300) layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +theme_override_styles/panel = SubResource("StyleBoxEmpty_g5mp8") -[node name="Dialogue" type="AspectRatioContainer" parent="Balloon/Panel"] -custom_minimum_size = Vector2(500, 250) -layout_mode = 1 -anchors_preset = 12 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_top = -301.0 -offset_bottom = -25.0 -grow_horizontal = 2 -grow_vertical = 0 -size_flags_vertical = 3 -alignment_vertical = 2 +[node name="MarginContainer" type="MarginContainer" parent="Balloon/Panel"] +layout_mode = 2 +offset_top = 780.0 +offset_right = 1920.0 +offset_bottom = 1080.0 +theme_override_constants/margin_left = 150 +theme_override_constants/margin_top = 50 +theme_override_constants/margin_right = 50 +theme_override_constants/margin_bottom = 50 -[node name="VBoxContainer" type="VBoxContainer" parent="Balloon/Panel/Dialogue"] +[node name="VBoxContainer" type="VBoxContainer" parent="Balloon/Panel/MarginContainer"] layout_mode = 2 theme_override_constants/separation = 10 -[node name="CharacterLabel" type="RichTextLabel" parent="Balloon/Panel/Dialogue/VBoxContainer"] +[node name="CharacterLabel" type="RichTextLabel" parent="Balloon/Panel/MarginContainer/VBoxContainer"] unique_name_in_owner = true modulate = Color(1, 1, 1, 0.501961) -custom_minimum_size = Vector2(800, 60) layout_mode = 2 size_flags_vertical = 10 mouse_filter = 1 @@ -149,9 +146,8 @@ bbcode_enabled = true text = "Character" fit_content = true scroll_active = false -horizontal_alignment = 1 -[node name="DialogueLabel" parent="Balloon/Panel/Dialogue/VBoxContainer" instance=ExtResource("2_jm6sr")] +[node name="DialogueLabel" parent="Balloon/Panel/MarginContainer/VBoxContainer" instance=ExtResource("2_jm6sr")] unique_name_in_owner = true custom_minimum_size = Vector2(800, 200) layout_mode = 2 diff --git a/Zennysoft.Game.Ma/src/ui/gallery/Gallery.png b/Zennysoft.Game.Ma/src/ui/gallery/Gallery.png new file mode 100644 index 00000000..998bd5b2 Binary files /dev/null and b/Zennysoft.Game.Ma/src/ui/gallery/Gallery.png differ diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_sensitive_areas.jpg.import b/Zennysoft.Game.Ma/src/ui/gallery/Gallery.png.import similarity index 53% rename from Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_sensitive_areas.jpg.import rename to Zennysoft.Game.Ma/src/ui/gallery/Gallery.png.import index c50e9dd1..2fcd0083 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_sensitive_areas.jpg.import +++ b/Zennysoft.Game.Ma/src/ui/gallery/Gallery.png.import @@ -2,19 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b7j4obvb6auny" -path="res://.godot/imported/OX FACE exploding_sensitive_areas.jpg-ee5a222d58f7a9ef2ba4ad3f3b20c15d.ctex" +uid="uid://s3mtv6c2emph" +path="res://.godot/imported/Gallery.png-dbaaa8cf38dbf1813f7cad3c9671c040.ctex" metadata={ "vram_texture": false } -generator_parameters={ -"md5": "c546bcaed0372ad70a764720398d3fb4" -} [deps] -source_file="res://src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_sensitive_areas.jpg" -dest_files=["res://.godot/imported/OX FACE exploding_sensitive_areas.jpg-ee5a222d58f7a9ef2ba4ad3f3b20c15d.ctex"] +source_file="res://src/ui/gallery/Gallery.png" +dest_files=["res://.godot/imported/Gallery.png-dbaaa8cf38dbf1813f7cad3c9671c040.ctex"] [params] @@ -24,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" diff --git a/Zennysoft.Game.Ma/src/ui/gallery/GalleryMenu.cs b/Zennysoft.Game.Ma/src/ui/gallery/GalleryMenu.cs index 3070ebcd..664cc756 100644 --- a/Zennysoft.Game.Ma/src/ui/gallery/GalleryMenu.cs +++ b/Zennysoft.Game.Ma/src/ui/gallery/GalleryMenu.cs @@ -8,36 +8,15 @@ public partial class GalleryMenu : Control { public override void _Notification(int what) => this.Notify(what); - [Node] public Label Item1Label { get; set; } - [Node] public Label Item2Label { get; set; } - [Node] public Label Item3Label { get; set; } - [Node] public Label Item4Label { get; set; } - [Node] public Label Item5Label { get; set; } - [Node] public Label Item6Label { get; set; } - [Node] public Label Item7Label { get; set; } - [Node] public Label Item8Label { get; set; } - - [Node] public ColorRect Item1Thumb { get; set; } - [Node] public ColorRect Item2Thumb { get; set; } - [Node] public ColorRect Item3Thumb { get; set; } - [Node] public ColorRect Item4Thumb { get; set; } - [Node] public ColorRect Item5Thumb { get; set; } - [Node] public ColorRect Item6Thumb { get; set; } - [Node] public ColorRect Item7Thumb { get; set; } - [Node] public ColorRect Item8Thumb { get; set; } + [Node] public TextureButton PreviousButton { get; set; } + [Node] public TextureButton NextButton { get; set; } + [Node] public TextureButton BackButton { get; set; } public GalleryData GalleryData { get; set; } public void OnReady() { GalleryData = new GalleryData() { PlaceholderImage1 = true }; - if (GalleryData.PlaceholderImage1) - Item1Label.Text = "Placeholder"; - } - public void Load(GalleryData galleryData) - { - if (galleryData.PlaceholderImage1) - Item1Label.Text = "Placeholder"; } } diff --git a/Zennysoft.Game.Ma/src/ui/gallery/GalleryMenu.tscn b/Zennysoft.Game.Ma/src/ui/gallery/GalleryMenu.tscn index 8723353c..224f6843 100644 --- a/Zennysoft.Game.Ma/src/ui/gallery/GalleryMenu.tscn +++ b/Zennysoft.Game.Ma/src/ui/gallery/GalleryMenu.tscn @@ -2,13 +2,8 @@ [ext_resource type="Script" uid="uid://cl0fi7kgimquk" path="res://src/ui/gallery/GalleryMenu.cs" id="1_lvvvw"] [ext_resource type="LabelSettings" uid="uid://wc363u5t1yi2" path="res://src/ui/label_settings/HeadingFont.tres" id="1_qekcq"] - -[sub_resource type="Gradient" id="Gradient_6y3ag"] -offsets = PackedFloat32Array(0.0501636, 0.745911, 1) -colors = PackedColorArray(0.0770514, 0.225922, 0.0437089, 1, 0.198692, 0.388726, 0.192961, 1, 3.85046e-07, 0.276787, 0.0375416, 1) - -[sub_resource type="GradientTexture2D" id="GradientTexture2D_qekcq"] -gradient = SubResource("Gradient_6y3ag") +[ext_resource type="Texture2D" uid="uid://s3mtv6c2emph" path="res://src/ui/gallery/Gallery.png" id="2_lvvvw"] +[ext_resource type="Texture2D" uid="uid://b7nxeq5qft3xa" path="res://src/ui/gallery/Line 1.png" id="4_s04nx"] [node name="GalleryMenu" type="Control"] layout_mode = 3 @@ -28,221 +23,363 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = SubResource("GradientTexture2D_qekcq") +texture = ExtResource("2_lvvvw") [node name="MarginContainer" type="MarginContainer" parent="TextureRect"] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_left = 141.0 +offset_top = 212.0 +offset_right = -103.0 +offset_bottom = -130.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_constants/margin_left = 95 -theme_override_constants/margin_top = 33 -theme_override_constants/margin_right = 70 -theme_override_constants/margin_bottom = 100 [node name="VBoxContainer" type="VBoxContainer" parent="TextureRect/MarginContainer"] layout_mode = 2 theme_override_constants/separation = 10 -[node name="ColorRect" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer"] -custom_minimum_size = Vector2(427, 100) +[node name="MarginContainer" type="MarginContainer" parent="TextureRect/MarginContainer/VBoxContainer"] layout_mode = 2 -size_flags_horizontal = 0 -color = Color(0.0941176, 0.0941176, 0.0941176, 0.980392) - -[node name="MarginContainer" type="MarginContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_constants/margin_left = 15 - -[node name="Label" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect/MarginContainer"] -layout_mode = 2 -text = "Gallery" -label_settings = ExtResource("1_qekcq") - -[node name="ColorRect2" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer"] -layout_mode = 2 -size_flags_vertical = 3 -color = Color(0.0941176, 0.0941176, 0.0941176, 0.980392) - -[node name="MarginContainer" type="MarginContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 size_flags_vertical = 3 theme_override_constants/margin_left = 10 theme_override_constants/margin_top = 10 theme_override_constants/margin_right = 10 theme_override_constants/margin_bottom = 10 -[node name="ReferenceRect" type="ReferenceRect" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer"] +[node name="ReferenceRect" type="ReferenceRect" parent="TextureRect/MarginContainer/VBoxContainer/MarginContainer"] layout_mode = 2 -border_color = Color(1, 1, 1, 1) -border_width = 2.0 +border_color = Color(1, 1, 1, 0.737255) +border_width = 3.0 editor_only = false -[node name="MarginContainer" type="MarginContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect"] +[node name="MarginContainer2" type="MarginContainer" parent="TextureRect"] layout_mode = 0 -offset_right = 40.0 -offset_bottom = 40.0 -theme_override_constants/margin_left = 25 -theme_override_constants/margin_top = 80 -theme_override_constants/margin_right = 15 -theme_override_constants/margin_bottom = 10 +offset_left = 155.0 +offset_top = 225.0 +offset_right = 1814.0 +offset_bottom = 943.0 -[node name="VBoxContainer" type="VBoxContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="TextureRect/MarginContainer2"] layout_mode = 2 theme_override_constants/separation = 25 -[node name="VFlowContainer" type="VFlowContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer"] +[node name="VFlowContainer" type="VFlowContainer" parent="TextureRect/MarginContainer2/VBoxContainer"] layout_mode = 2 theme_override_constants/h_separation = 25 -[node name="Item1Thumb" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer"] +[node name="Item1Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer"] unique_name_in_owner = true -custom_minimum_size = Vector2(400, 200) +custom_minimum_size = Vector2(300, 200) layout_mode = 2 -[node name="Item2Thumb" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer"] +[node name="Item2Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer"] unique_name_in_owner = true -custom_minimum_size = Vector2(400, 200) +custom_minimum_size = Vector2(300, 200) layout_mode = 2 -[node name="Item3Thumb" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer"] +[node name="Item3Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer"] unique_name_in_owner = true -custom_minimum_size = Vector2(400, 200) +custom_minimum_size = Vector2(300, 200) layout_mode = 2 -[node name="Item4Thumb" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer"] +[node name="Item4Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer"] unique_name_in_owner = true -custom_minimum_size = Vector2(400, 200) +custom_minimum_size = Vector2(300, 200) layout_mode = 2 -[node name="VFlowContainer3" type="VFlowContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer"] +[node name="Item5Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer"] +unique_name_in_owner = true +custom_minimum_size = Vector2(300, 200) +layout_mode = 2 + +[node name="VFlowContainer3" type="VFlowContainer" parent="TextureRect/MarginContainer2/VBoxContainer"] layout_mode = 2 theme_override_constants/h_separation = 25 -[node name="CenterContainer" type="CenterContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer3"] -custom_minimum_size = Vector2(400, 0) +[node name="CenterContainer" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3"] +custom_minimum_size = Vector2(300, 0) layout_mode = 2 size_flags_vertical = 3 -[node name="Item1Label" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer3/CenterContainer"] +[node name="Item1Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3/CenterContainer"] unique_name_in_owner = true layout_mode = 2 text = "???" label_settings = ExtResource("1_qekcq") -[node name="CenterContainer2" type="CenterContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer3"] -custom_minimum_size = Vector2(400, 0) +[node name="CenterContainer2" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3"] +custom_minimum_size = Vector2(300, 0) layout_mode = 2 size_flags_vertical = 3 -[node name="Item2Label" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer3/CenterContainer2"] +[node name="Item2Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3/CenterContainer2"] unique_name_in_owner = true layout_mode = 2 text = "???" label_settings = ExtResource("1_qekcq") -[node name="CenterContainer3" type="CenterContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer3"] -custom_minimum_size = Vector2(400, 0) +[node name="CenterContainer3" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3"] +custom_minimum_size = Vector2(300, 0) layout_mode = 2 size_flags_vertical = 3 -[node name="Item3Label" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer3/CenterContainer3"] +[node name="Item3Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3/CenterContainer3"] unique_name_in_owner = true layout_mode = 2 text = "???" label_settings = ExtResource("1_qekcq") -[node name="CenterContainer4" type="CenterContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer3"] -custom_minimum_size = Vector2(400, 0) +[node name="CenterContainer4" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3"] +custom_minimum_size = Vector2(300, 0) layout_mode = 2 size_flags_vertical = 3 -[node name="Item4Label" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer3/CenterContainer4"] +[node name="Item4Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3/CenterContainer4"] unique_name_in_owner = true layout_mode = 2 text = "???" label_settings = ExtResource("1_qekcq") -[node name="VFlowContainer2" type="VFlowContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer"] +[node name="CenterContainer5" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3"] +custom_minimum_size = Vector2(300, 0) +layout_mode = 2 +size_flags_vertical = 3 + +[node name="Item4Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer3/CenterContainer5"] +layout_mode = 2 +text = "???" +label_settings = ExtResource("1_qekcq") + +[node name="VFlowContainer2" type="VFlowContainer" parent="TextureRect/MarginContainer2/VBoxContainer"] layout_mode = 2 theme_override_constants/h_separation = 25 -[node name="Item5Thumb" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer2"] -unique_name_in_owner = true -custom_minimum_size = Vector2(400, 200) +[node name="Item1Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer2"] +custom_minimum_size = Vector2(300, 200) layout_mode = 2 -[node name="Item6Thumb" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer2"] -unique_name_in_owner = true -custom_minimum_size = Vector2(400, 200) +[node name="Item2Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer2"] +custom_minimum_size = Vector2(300, 200) layout_mode = 2 -[node name="Item7Thumb" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer2"] -unique_name_in_owner = true -custom_minimum_size = Vector2(400, 200) +[node name="Item3Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer2"] +custom_minimum_size = Vector2(300, 200) layout_mode = 2 -[node name="Item8Thumb" type="ColorRect" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer2"] -unique_name_in_owner = true -custom_minimum_size = Vector2(400, 200) +[node name="Item4Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer2"] +custom_minimum_size = Vector2(300, 200) layout_mode = 2 -[node name="VFlowContainer4" type="VFlowContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer"] +[node name="Item5Thumb" type="ColorRect" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer2"] +custom_minimum_size = Vector2(300, 200) +layout_mode = 2 + +[node name="VFlowContainer4" type="VFlowContainer" parent="TextureRect/MarginContainer2/VBoxContainer"] layout_mode = 2 theme_override_constants/h_separation = 25 -[node name="CenterContainer" type="CenterContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer4"] -custom_minimum_size = Vector2(400, 0) +[node name="CenterContainer" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4"] +custom_minimum_size = Vector2(300, 0) layout_mode = 2 size_flags_vertical = 3 -[node name="Item5Label" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer4/CenterContainer"] -unique_name_in_owner = true +[node name="Item1Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4/CenterContainer"] layout_mode = 2 text = "???" label_settings = ExtResource("1_qekcq") -[node name="CenterContainer2" type="CenterContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer4"] -custom_minimum_size = Vector2(400, 0) +[node name="CenterContainer2" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4"] +custom_minimum_size = Vector2(300, 0) layout_mode = 2 size_flags_vertical = 3 -[node name="Item6Label" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer4/CenterContainer2"] -unique_name_in_owner = true +[node name="Item2Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4/CenterContainer2"] layout_mode = 2 text = "???" label_settings = ExtResource("1_qekcq") -[node name="CenterContainer3" type="CenterContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer4"] -custom_minimum_size = Vector2(400, 0) +[node name="CenterContainer3" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4"] +custom_minimum_size = Vector2(300, 0) layout_mode = 2 size_flags_vertical = 3 -[node name="Item7Label" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer4/CenterContainer3"] -unique_name_in_owner = true +[node name="Item3Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4/CenterContainer3"] layout_mode = 2 text = "???" label_settings = ExtResource("1_qekcq") -[node name="CenterContainer4" type="CenterContainer" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer4"] -custom_minimum_size = Vector2(400, 0) +[node name="CenterContainer4" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4"] +custom_minimum_size = Vector2(300, 0) layout_mode = 2 size_flags_vertical = 3 -[node name="Item8Label" type="Label" parent="TextureRect/MarginContainer/VBoxContainer/ColorRect2/MarginContainer/ReferenceRect/MarginContainer/VBoxContainer/VFlowContainer4/CenterContainer4"] -unique_name_in_owner = true +[node name="Item4Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4/CenterContainer4"] layout_mode = 2 text = "???" label_settings = ExtResource("1_qekcq") + +[node name="CenterContainer5" type="CenterContainer" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4"] +custom_minimum_size = Vector2(300, 0) +layout_mode = 2 +size_flags_vertical = 3 + +[node name="Item4Label" type="Label" parent="TextureRect/MarginContainer2/VBoxContainer/VFlowContainer4/CenterContainer5"] +layout_mode = 2 +text = "???" +label_settings = ExtResource("1_qekcq") + +[node name="ItemButton1" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="ItemButton2" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="ItemButton3" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="ItemButton4" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="ItemButton5" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="ItemButton6" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="ItemButton7" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="ItemButton8" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="ItemButton9" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="ItemButton10" type="TextureButton" parent="."] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 1621.0 +offset_top = 1030.0 +offset_right = 1730.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="PreviousButton" type="TextureButton" parent="."] +unique_name_in_owner = true +layout_mode = 0 +offset_left = 974.0 +offset_top = 1030.0 +offset_right = 1157.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="NextButton" type="TextureButton" parent="."] +unique_name_in_owner = true +layout_mode = 0 +offset_left = 1320.0 +offset_top = 1030.0 +offset_right = 1417.0 +offset_bottom = 1034.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true + +[node name="BackButton" type="TextureButton" parent="."] +unique_name_in_owner = true +layout_mode = 0 +offset_left = 257.0 +offset_top = 589.0 +offset_right = 366.0 +offset_bottom = 593.0 +texture_focused = ExtResource("4_s04nx") +stretch_mode = 0 +flip_h = true diff --git a/Zennysoft.Game.Ma/src/ui/gallery/Line 1.png b/Zennysoft.Game.Ma/src/ui/gallery/Line 1.png new file mode 100644 index 00000000..359f9394 Binary files /dev/null and b/Zennysoft.Game.Ma/src/ui/gallery/Line 1.png differ diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Color.jpg.import b/Zennysoft.Game.Ma/src/ui/gallery/Line 1.png.import similarity index 52% rename from Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Color.jpg.import rename to Zennysoft.Game.Ma/src/ui/gallery/Line 1.png.import index f709032b..39055679 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Color.jpg.import +++ b/Zennysoft.Game.Ma/src/ui/gallery/Line 1.png.import @@ -2,19 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://r6t27ocau3ji" -path="res://.godot/imported/OX FACE exploding_Metal054C_1K-JPG_Color.jpg-8bd2e459ce882fcac771c75a013b7295.ctex" +uid="uid://b7nxeq5qft3xa" +path="res://.godot/imported/Line 1.png-3c500857f00bf60ba9b0e6058df44adf.ctex" metadata={ "vram_texture": false } -generator_parameters={ -"md5": "a736e2bfd0819e969c4fbfc879bc7b02" -} [deps] -source_file="res://src/enemy/enemy_types/15. ox_face/Death Animation/OX FACE exploding_Metal054C_1K-JPG_Color.jpg" -dest_files=["res://.godot/imported/OX FACE exploding_Metal054C_1K-JPG_Color.jpg-8bd2e459ce882fcac771c75a013b7295.ctex"] +source_file="res://src/ui/gallery/Line 1.png" +dest_files=["res://.godot/imported/Line 1.png-3c500857f00bf60ba9b0e6058df44adf.ctex"] [params] @@ -24,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" diff --git a/Zennysoft.Game.Ma/src/vfx/InvertPlayer.tres b/Zennysoft.Game.Ma/src/vfx/InvertPlayer.tres index 714d22ca..34c74593 100644 --- a/Zennysoft.Game.Ma/src/vfx/InvertPlayer.tres +++ b/Zennysoft.Game.Ma/src/vfx/InvertPlayer.tres @@ -1,4 +1,4 @@ -[gd_resource type="VisualShader" load_steps=4 format=3 uid="uid://dj8qw2316m8ju"] +[gd_resource type="VisualShader" load_steps=4 format=3 uid="uid://c2866rxef3h3x"] [sub_resource type="VisualShaderNodeVec3Constant" id="VisualShaderNodeVec3Constant_jppg4"] @@ -37,7 +37,6 @@ void fragment() { } " -graph_offset = Vector2(-584.421, 209.987) flags/wireframe = true nodes/fragment/2/node = SubResource("VisualShaderNodeVec3Constant_jppg4") nodes/fragment/2/position = Vector2(-340, 280)