From ee53fe9c89a94db01ecad6b4f7b2f5d4b775b82e Mon Sep 17 00:00:00 2001 From: se_ga Date: Fri, 20 Mar 2026 13:35:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B5=D1=81=D0=B5=D1=82=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B3=D1=80=D1=8B=20(DUMMY)?= =?UTF-8?q?=20=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=B2=20DifficultyManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Fonts/NEW/NexaRegular COOL.asset | 2 +- Assets/Scenes/GameScene3D.unity | 5 +---- Assets/Scripts/Core/GameManager.cs | 1 - Assets/Scripts/DifficultyManager.cs | 3 ++- Assets/Scripts/GameFSM/BotThinkingState.cs | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Assets/Fonts/NEW/NexaRegular COOL.asset b/Assets/Fonts/NEW/NexaRegular COOL.asset index 03eea19..773f85a 100644 --- a/Assets/Fonts/NEW/NexaRegular COOL.asset +++ b/Assets/Fonts/NEW/NexaRegular COOL.asset @@ -11349,7 +11349,7 @@ Material: - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - - _GlowColor: {r: 1, g: 0.0684407, b: 0, a: 1} + - _GlowColor: {r: 0, g: 0.7897656, b: 1, a: 1} - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - _OutlineColor: {r: 0.554717, g: 0.554717, b: 0.554717, a: 1} - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Scenes/GameScene3D.unity b/Assets/Scenes/GameScene3D.unity index 44016b4..367dda0 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -5860,11 +5860,7 @@ MonoBehaviour: rulesController: {fileID: 454272343} menuOpened: 1 gameMode: 0 - label: {fileID: 382964715} - buttonLeft: {fileID: 2047831684} - buttonRight: {fileID: 95872202} coinPanel: {fileID: 829871288} - label2: {fileID: 109738548} board: {fileID: 1551328425} noPrizeLabel: {fileID: 1796045835} mainMenu: {fileID: 1122363131} @@ -5984,6 +5980,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] currentOpponent: 0 + DummyPreset: {fileID: 11400000, guid: 35ba7f84d7557e8479f7f086269256f6, type: 2} --- !u!114 &259182286 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Core/GameManager.cs b/Assets/Scripts/Core/GameManager.cs index fb0e7a5..67c64cf 100644 --- a/Assets/Scripts/Core/GameManager.cs +++ b/Assets/Scripts/Core/GameManager.cs @@ -14,7 +14,6 @@ public class GameManager : MonoBehaviour public PlayerStatsService StatsService; public bool dummyBots = false; public int botsAmount = 5; - public DifficultyPreset dummyPreset; public DifficultyPreset MistressPreset; public int boardVersion = 1; diff --git a/Assets/Scripts/DifficultyManager.cs b/Assets/Scripts/DifficultyManager.cs index 5db1202..c8e6b8e 100644 --- a/Assets/Scripts/DifficultyManager.cs +++ b/Assets/Scripts/DifficultyManager.cs @@ -28,8 +28,9 @@ public class DifficultyManager : MonoBehaviour public UnityEvent OnVictory = new UnityEvent(); public int currentOpponent = 0; - public DifficultyPreset DifficultyPreset => CharacterController.CurrentCharacter.CurrentDifficultyPreset; + + public DifficultyPreset DummyPreset; public void IncreaseDifficulty() { diff --git a/Assets/Scripts/GameFSM/BotThinkingState.cs b/Assets/Scripts/GameFSM/BotThinkingState.cs index 22a0f4a..fa40ea2 100644 --- a/Assets/Scripts/GameFSM/BotThinkingState.cs +++ b/Assets/Scripts/GameFSM/BotThinkingState.cs @@ -32,7 +32,7 @@ public class BotThinkingState : IState DifficultyPreset currentPreset = CharacterController.CurrentCharacter.CurrentDifficultyPreset; //Debug.Log(currentPreset.Description); if (GameManager.instance.dummyBots) - currentPreset = GameManager.instance.dummyPreset; + currentPreset = DifficultyManager.Instance.DummyPreset; if (preset!= null) {