From e654f843a6510edf667fab8fde491436a17a0456 Mon Sep 17 00:00:00 2001 From: 1-Gleb4ik-1 <153512091+1-Gleb4ik-1@users.noreply.github.com> Date: Thu, 20 Aug 2026 13:51:46 +0500 Subject: [PATCH] classic-mode-and-infinity-mode --- autoload/SceneManager.cs | 1 + project.godot | 2 +- scenes/game/cards/Card.cs | 26 +- scenes/game/cards/Card.tscn | 4 + scenes/ui/game_guide/PlayGuide.cs | 16 + scenes/ui/game_guide/PlayGuide.cs.uid | 1 + scenes/ui/game_guide/PlayGuide.tscn | 87 ++ scenes/ui/game_ui/GameUI.cs | 425 +++++++++- scenes/ui/game_ui/GameUI.tscn | 8 +- scenes/ui/mode_select/ModeSelect.cs | 11 +- scenes/ui/pause/PausePopup.cs | 3 + scripts/game_meh/Main.cs | 762 ++++++++++++++++++ scripts/game_meh/Main.cs.uid | 1 + ...275\320\260\321\206\320\270\321\217 1.mp3" | Bin 0 -> 43200 bytes ...\260\321\206\320\270\321\217 1.mp3.import" | 19 + .../\320\272\320\273\320\270\320\272 1.mp3" | Bin 0 -> 27840 bytes ...\272\320\273\320\270\320\272 1.mp3.import" | 19 + ...202\320\276\321\207\320\272\321\203 1.mp3" | Bin 0 -> 27840 bytes ...\276\321\207\320\272\321\203 1.mp3.import" | 19 + ...275\320\260\321\206\320\270\321\217 1.mp3" | Bin 0 -> 43200 bytes ...\260\321\206\320\270\321\217 1.mp3.import" | 19 + ...0\276\320\261\320\265\320\264\320\260.wav" | Bin 0 -> 582200 bytes ...20\261\320\265\320\264\320\260.wav.import" | 24 + ...0\266\320\265\320\275\320\270\321\217.mp3" | Bin 0 -> 165302 bytes ...20\265\320\275\320\270\321\217.mp3.import" | 19 + ...0\270\320\263\321\200\321\213\321\210.wav" | Bin 0 -> 37100 bytes ...20\263\321\200\321\213\321\210.wav.import" | 24 + 27 files changed, 1461 insertions(+), 29 deletions(-) create mode 100644 scenes/ui/game_guide/PlayGuide.cs create mode 100644 scenes/ui/game_guide/PlayGuide.cs.uid create mode 100644 scenes/ui/game_guide/PlayGuide.tscn create mode 100644 scripts/game_meh/Main.cs create mode 100644 scripts/game_meh/Main.cs.uid create mode 100644 "sounds/\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3" create mode 100644 "sounds/\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import" create mode 100644 "sounds/\320\272\320\273\320\270\320\272 1.mp3" create mode 100644 "sounds/\320\272\320\273\320\270\320\272 1.mp3.import" create mode 100644 "sounds/\320\275\320\260\320\262\320\265\320\264\320\265\320\275\320\270\320\265 \320\275\320\260 \320\272\320\260\321\200\321\202\320\276\321\207\320\272\321\203 1.mp3" create mode 100644 "sounds/\320\275\320\260\320\262\320\265\320\264\320\265\320\275\320\270\320\265 \320\275\320\260 \320\272\320\260\321\200\321\202\320\276\321\207\320\272\321\203 1.mp3.import" create mode 100644 "sounds/\320\275\320\265\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3" create mode 100644 "sounds/\320\275\320\265\320\262\320\265\321\200\320\275\320\260\321\217 \320\272\320\276\320\274\320\261\320\270\320\275\320\260\321\206\320\270\321\217 1.mp3.import" create mode 100644 "sounds/\320\277\320\276\320\261\320\265\320\264\320\260.wav" create mode 100644 "sounds/\320\277\320\276\320\261\320\265\320\264\320\260.wav.import" create mode 100644 "sounds/\320\277\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\276\321\201\321\202\320\270\320\266\320\265\320\275\320\270\321\217.mp3" create mode 100644 "sounds/\320\277\320\276\320\273\321\203\321\207\320\265\320\275\320\270\320\265 \320\264\320\276\321\201\321\202\320\270\320\266\320\265\320\275\320\270\321\217.mp3.import" create mode 100644 "sounds/\320\277\321\200\320\276\320\270\320\263\321\200\321\213\321\210.wav" create mode 100644 "sounds/\320\277\321\200\320\276\320\270\320\263\321\200\321\213\321\210.wav.import" diff --git a/autoload/SceneManager.cs b/autoload/SceneManager.cs index 8649f26..0970293 100644 --- a/autoload/SceneManager.cs +++ b/autoload/SceneManager.cs @@ -8,6 +8,7 @@ public partial class SceneManager : Node public const string GameUI = "res://scenes/ui/game_ui/GameUI.tscn"; public const string PausePopup = "res://scenes/ui/pause/PausePopup.tscn"; public const string GameOver = "res://scenes/ui/game_over/GameOver.tscn"; + public const string GameGuide = "res://scenes/ui/game_guide/PlayGuide.tscn"; private Node _currentScene; diff --git a/project.godot b/project.godot index 160485d..7d00823 100644 --- a/project.godot +++ b/project.godot @@ -10,7 +10,7 @@ config_version=5 [application] -config/name="PatternShift" +config/name="PatternShiftV7" run/main_scene="uid://bllyklhjrkoao" config/features=PackedStringArray("4.7", "C#", "GL Compatibility") config/icon="uid://dse0xvs2tbsqe" diff --git a/scenes/game/cards/Card.cs b/scenes/game/cards/Card.cs index 83b1492..f3b79a3 100644 --- a/scenes/game/cards/Card.cs +++ b/scenes/game/cards/Card.cs @@ -3,6 +3,8 @@ public partial class Card : Control { + private AudioStreamPlayer _sound; + private AudioStreamPlayer _sound2; private Panel _background; private VBoxContainer _shapesContainer; private TextureRect _shapeTemplate; @@ -11,6 +13,7 @@ public partial class Card : Control private GpuParticles2D _selectionParticles; private Vector2 _baseScale = Vector2.One; private int _originalZIndex = 0; + public int CCount = 0; public enum ShapeType { Rectangle, Triangle, Hexagon } public enum FillType { Empty, Striped, Solid } @@ -40,11 +43,11 @@ public CardStyleParams(float width, float height, int separation) { ColorType.Purple, new Color("#9C27B0") } }; - private ShapeType _shape = ShapeType.Rectangle; - private ColorType _color = ColorType.Blue; - private FillType _fill = FillType.Empty; - private int _count = 1; - private bool _isSelected = false; + public ShapeType _shape = ShapeType.Rectangle; + public ColorType _color = ColorType.Blue; + public FillType _fill = FillType.Empty; + public int _count = 1; + public bool _isSelected = false; private float _currentScale = 1.0f; public override void _Ready() @@ -55,6 +58,10 @@ public override void _Ready() _highlight = GetNode("Highlight"); _clickArea = GetNode