From dc6b233e83cf6f2775c733ef2b31042465a60d16 Mon Sep 17 00:00:00 2001 From: se_ga Date: Thu, 16 Apr 2026 11:24:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B5=D1=81=D0=B5=D1=82=D1=8B=20?= =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D1=83?= =?UTF-8?q?=D1=81=D0=B8=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=20=D1=83?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BD=D0=B5=203=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=B0=D0=B6=D0=B4=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D1=81=D0=BE=D0=BD=D0=B0=D0=B6=D0=B0?= 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 | 40 ++++--------------- .../1Easy/1tosterM3_hard.asset | 2 +- .../1Easy/3doggyM3_hard.asset | 2 +- .../1Easy/4samuraiM3_hard.asset | 2 +- .../2Medium/1tosterM3_hard.asset | 2 +- .../2Medium/3doggyM3_hard.asset | 2 +- .../2Medium/4samuraiM3_hard.asset | 2 +- .../3Hard/1tosterM3_hard.asset | 2 +- .../3Hard/3doggyM3_hard.asset | 2 +- .../3Hard/4samuraiM3_hard.asset | 2 +- 11 files changed, 17 insertions(+), 43 deletions(-) diff --git a/Assets/Fonts/NEW/NexaRegular COOL.asset b/Assets/Fonts/NEW/NexaRegular COOL.asset index c0900d9..20d261b 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.26309127, b: 0, a: 1} + - _GlowColor: {r: 0, g: 0.9053116, 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 12fc0dc..c3cc0cc 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -70490,9 +70490,9 @@ RectTransform: - {fileID: 703337905} m_Father: {fileID: 7072048023201074136} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 895, y: -156.545} m_SizeDelta: {x: 350, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2944032316663602777 @@ -76703,32 +76703,6 @@ MonoBehaviour: NextPrizeView: {fileID: 1203032464936095846} DisabledColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} HsvSpeed: 0.2 - TimerRing: {fileID: 0} - TimerFillCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 2 - outSlope: 2 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - TimeToAccept: 2 ScalingSpeed: 1 SelectedScale: 1.05 IdleScale: 0.95 @@ -77114,9 +77088,9 @@ RectTransform: - {fileID: 457509956} m_Father: {fileID: 7072048023201074136} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 405, y: -156.545} m_SizeDelta: {x: 350, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8752651682790280933 @@ -77137,7 +77111,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &8872197949266842959 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/1tosterM3_hard.asset b/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/1tosterM3_hard.asset index bb01044..84de88d 100644 --- a/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/1tosterM3_hard.asset +++ b/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/1tosterM3_hard.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: 1tosterM3_hard m_EditorClassIdentifier: Description: "\u0442\u043E\u0441\u0442\u0435\u04403_\u043B\u0435\u0433\u043A\u0438\u0439" - Depth: 2 + Depth: 3 WinBonus: 1000 RowOfTwoBonus: 5 RowOfThree: 50 diff --git a/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/3doggyM3_hard.asset b/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/3doggyM3_hard.asset index 0abf4bd..bf1d997 100644 --- a/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/3doggyM3_hard.asset +++ b/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/3doggyM3_hard.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: 3doggyM3_hard m_EditorClassIdentifier: Description: "\u0441\u043E\u0431\u0430\u043A\u04303_\u043B\u0435\u0433\u043A\u0438\u0439" - Depth: 4 + Depth: 5 WinBonus: 1200 RowOfTwoBonus: 100 RowOfThree: 80 diff --git a/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/4samuraiM3_hard.asset b/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/4samuraiM3_hard.asset index 75799b3..4802882 100644 --- a/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/4samuraiM3_hard.asset +++ b/Assets/Scripts/CharacterS/DifficultyPresets/1Easy/4samuraiM3_hard.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: 4samuraiM3_hard m_EditorClassIdentifier: Description: "\u0441\u0430\u043C\u0443\u0440\u0430\u04393_\u043B\u0435\u0433\u043A\u0438\u0439" - Depth: 5 + Depth: 6 WinBonus: 1200 RowOfTwoBonus: 100 RowOfThree: 80 diff --git a/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/1tosterM3_hard.asset b/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/1tosterM3_hard.asset index a6ce4c7..841452c 100644 --- a/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/1tosterM3_hard.asset +++ b/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/1tosterM3_hard.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: 1tosterM3_hard m_EditorClassIdentifier: Description: "\u0442\u043E\u0441\u0442\u0435\u04403_\u0441\u0440\u0435\u0434\u043D\u0438\u0439" - Depth: 2 + Depth: 3 WinBonus: 1000 RowOfTwoBonus: 5 RowOfThree: 50 diff --git a/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/3doggyM3_hard.asset b/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/3doggyM3_hard.asset index 9a8fdd2..479d431 100644 --- a/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/3doggyM3_hard.asset +++ b/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/3doggyM3_hard.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: 3doggyM3_hard m_EditorClassIdentifier: Description: "\u0441\u043E\u0431\u0430\u043A\u04303_\u0441\u0440\u0435\u0434\u043D\u0438\u0439" - Depth: 4 + Depth: 5 WinBonus: 1200 RowOfTwoBonus: 100 RowOfThree: 80 diff --git a/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/4samuraiM3_hard.asset b/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/4samuraiM3_hard.asset index f9a9f21..f3c1235 100644 --- a/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/4samuraiM3_hard.asset +++ b/Assets/Scripts/CharacterS/DifficultyPresets/2Medium/4samuraiM3_hard.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: 4samuraiM3_hard m_EditorClassIdentifier: Description: "\u0441\u0430\u043C\u0443\u0440\u0430\u04393_\u0441\u0440\u0435\u0434\u043D\u0438\u0439" - Depth: 5 + Depth: 6 WinBonus: 1200 RowOfTwoBonus: 100 RowOfThree: 80 diff --git a/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/1tosterM3_hard.asset b/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/1tosterM3_hard.asset index e4593d9..fb8d169 100644 --- a/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/1tosterM3_hard.asset +++ b/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/1tosterM3_hard.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: 1tosterM3_hard m_EditorClassIdentifier: Description: "\u0442\u043E\u0441\u0442\u0435\u04403_\u0441\u043B\u043E\u0436\u043D\u044B\u0439" - Depth: 2 + Depth: 3 WinBonus: 1000 RowOfTwoBonus: 5 RowOfThree: 50 diff --git a/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/3doggyM3_hard.asset b/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/3doggyM3_hard.asset index 9ae6884..ccdd4d4 100644 --- a/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/3doggyM3_hard.asset +++ b/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/3doggyM3_hard.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: 3doggyM3_hard m_EditorClassIdentifier: Description: "\u0441\u043E\u0431\u0430\u043A\u04303_\u0441\u043B\u043E\u0436\u043D\u044B\u0439" - Depth: 4 + Depth: 5 WinBonus: 1200 RowOfTwoBonus: 100 RowOfThree: 80 diff --git a/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/4samuraiM3_hard.asset b/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/4samuraiM3_hard.asset index 4b12e14..9ab12fc 100644 --- a/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/4samuraiM3_hard.asset +++ b/Assets/Scripts/CharacterS/DifficultyPresets/3Hard/4samuraiM3_hard.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: 4samuraiM3_hard m_EditorClassIdentifier: Description: "\u0441\u0430\u043C\u0443\u0440\u0430\u04393_\u0441\u043B\u043E\u0436\u043D\u044B\u0439" - Depth: 5 + Depth: 6 WinBonus: 1200 RowOfTwoBonus: 100 RowOfThree: 80