From 06e2eb7f74c54cef29fce352f85b4816e5622e1e Mon Sep 17 00:00:00 2001 From: se_ga Date: Fri, 3 Apr 2026 10:37:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D1=82=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8=20=D0=B7=D0=B0=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=B8=D0=BB=D0=B8=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B4=D0=BE=D0=BB=D0=B6=D0=B8=D1=82=D1=8C=20=D0=B2=20=D1=81?= =?UTF-8?q?=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=81=20=D0=BC=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=BC=20?= =?UTF-8?q?=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=D0=B5=D1=80=D0=BE=D0=B2?= 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 | 298 +++++++++++++++--- .../TakeOrRiskSystem/PrizeView.prefab | 54 +++- .../TakeOrRiskSystem/TakeOrRiskPanel.cs | 14 +- 4 files changed, 305 insertions(+), 63 deletions(-) diff --git a/Assets/Fonts/NEW/NexaRegular COOL.asset b/Assets/Fonts/NEW/NexaRegular COOL.asset index 5492f47..25a4dbb 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: 0.7198019, g: 0, b: 1, a: 1} + - _GlowColor: {r: 0.44538426, g: 1, b: 0, 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 8269c1a..d5671dc 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -16446,6 +16446,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 662223607} m_CullTransparentMesh: 1 +--- !u!1 &668427084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 668427085} + - component: {fileID: 668427087} + - component: {fileID: 668427086} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &668427085 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668427084} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2720328458227109517} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 65} + m_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &668427086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668427084} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: aa46adafa643d084abe86ac0f3697446, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &668427087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668427084} + m_CullTransparentMesh: 1 --- !u!1 &670562164 GameObject: m_ObjectHideFlags: 0 @@ -18248,7 +18323,7 @@ GameObject: - component: {fileID: 776951567} - component: {fileID: 776951566} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -18270,8 +18345,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 711.4, y: 50} + m_AnchoredPosition: {x: 0, y: 164.99998} + m_SizeDelta: {x: 350, y: 50} m_Pivot: {x: 0.5, y: 1} --- !u!114 &776951566 MonoBehaviour: @@ -18293,8 +18368,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u0417\u0430\u0431\u0440\u0430\u0442\u044C \u044D\u0442\u043E\u0442 \u043F\u0440\u0438\u0437 - \u0438 \u0432\u044B\u0439\u0442\u0438" + m_text: "\u0417\u0430\u0431\u0440\u0430\u0442\u044C \u043F\u0440\u0438\u0437" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} @@ -18321,8 +18395,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 32 - m_fontSizeBase: 32 + m_fontSize: 44.8 + m_fontSizeBase: 44.8 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 16 @@ -33810,6 +33884,81 @@ MonoBehaviour: ImagePosition: {x: -172.5, y: 9.9} ImageSize: 445 audioClip: {fileID: 8300000, guid: eb50ade20b1f1fa44937e7d6ae2193a3, type: 3} +--- !u!1 &1079482313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1079482314} + - component: {fileID: 1079482316} + - component: {fileID: 1079482315} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1079482314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079482313} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8549428697360486891} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 65} + m_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1079482315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079482313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6e622d073fff38b468edb48bec60df75, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1079482316 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079482313} + m_CullTransparentMesh: 1 --- !u!1 &1079625008 GameObject: m_ObjectHideFlags: 0 @@ -34232,6 +34381,22 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2720328458227109517} m_Modifications: + - target: {fileID: 2248773965054470075, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2248773965054470075, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2248773965054470075, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchoredPosition.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 2248773965054470075, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} - target: {fileID: 2875758851730211012, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_Name value: PrizeView @@ -34262,11 +34427,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_SizeDelta.x - value: 350 + value: 300 objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_SizeDelta.y - value: 350 + value: 50 objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_LocalPosition.x @@ -34302,7 +34467,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -125.799995 objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -34320,27 +34485,27 @@ PrefabInstance: propertyPath: m_CullTransparentMesh value: 1 objectReference: {fileID: 0} + - target: {fileID: 6664003626657907884, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6664003626657907884, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6664003626657907884, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchoredPosition.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 6664003626657907884, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} ---- !u!224 &1083634612 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} - m_PrefabInstance: {fileID: 1083634611} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1083634613 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1203032466002125781, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} - m_PrefabInstance: {fileID: 1083634611} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 006a8f6ee593bb94d96ebb190f38e418, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::PrizeView --- !u!1 &1084639303 GameObject: m_ObjectHideFlags: 0 @@ -51534,7 +51699,7 @@ GameObject: - component: {fileID: 1617932517} - component: {fileID: 1617932516} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -51556,8 +51721,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 711.4, y: 50} + m_AnchoredPosition: {x: 0, y: 165} + m_SizeDelta: {x: 350, y: 50} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1617932516 MonoBehaviour: @@ -51579,8 +51744,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u0411\u043E\u0440\u043E\u0442\u044C\u0441\u044F \u0437\u0430 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 - \u043F\u0440\u0438\u0437" + m_text: "\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} @@ -51607,8 +51771,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 32 - m_fontSizeBase: 32 + m_fontSize: 44.8 + m_fontSizeBase: 44.8 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 16 @@ -58587,6 +58751,22 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8549428697360486891} m_Modifications: + - target: {fileID: 2248773965054470075, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2248773965054470075, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2248773965054470075, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchoredPosition.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 2248773965054470075, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} - target: {fileID: 2875758851730211012, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_Name value: PrizeView @@ -58617,11 +58797,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_SizeDelta.x - value: 350 + value: 300 objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_SizeDelta.y - value: 350 + value: 50 objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_LocalPosition.x @@ -58657,7 +58837,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -125.8 objectReference: {fileID: 0} - target: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -58671,6 +58851,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6664003626657907884, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6664003626657907884, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6664003626657907884, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchoredPosition.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 6664003626657907884, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -63326,6 +63522,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 006a8f6ee593bb94d96ebb190f38e418, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::PrizeView +--- !u!114 &1203032464936095846 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1203032466002125781, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + m_PrefabInstance: {fileID: 1083634611} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 006a8f6ee593bb94d96ebb190f38e418, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PrizeView --- !u!224 &1207022060260024352 RectTransform: m_ObjectHideFlags: 0 @@ -68663,13 +68870,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1083634612} + - {fileID: 668427085} - {fileID: 1617932515} + - {fileID: 4769901411034318339} m_Father: {fileID: 7072048023201074136} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 325, y: -212.98} + m_AnchoredPosition: {x: 975, y: -212.98} m_SizeDelta: {x: 350, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2818249828079342868 @@ -74199,6 +74407,11 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} m_PrefabInstance: {fileID: 1985746125} m_PrefabAsset: {fileID: 0} +--- !u!224 &4769901411034318339 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4769901412115232176, guid: f8172e74629723c4e993e8ac2f322bdf, type: 3} + m_PrefabInstance: {fileID: 1083634611} + m_PrefabAsset: {fileID: 0} --- !u!222 &4842424254261898494 CanvasRenderer: m_ObjectHideFlags: 0 @@ -75079,8 +75292,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2720328458227109517} - {fileID: 8549428697360486891} + - {fileID: 2720328458227109517} m_Father: {fileID: 8917489125503085284} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -75352,7 +75565,7 @@ MonoBehaviour: CurrentPrizeFrame: {fileID: 2944032316663602777} NextPrizeFrame: {fileID: 1501477561599320377} CurrentPrizeView: {fileID: 1203032464621942552} - NextPrizeView: {fileID: 1083634613} + NextPrizeView: {fileID: 1203032464936095846} DisabledColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} HsvSpeed: 0.3 TimerRing: {fileID: 3146362536925492841} @@ -75836,13 +76049,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4769901410267373949} + - {fileID: 1079482314} - {fileID: 776951565} + - {fileID: 4769901410267373949} m_Father: {fileID: 7072048023201074136} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 975, y: -212.98} + m_AnchoredPosition: {x: 325, y: -212.98} m_SizeDelta: {x: 350, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8752651682790280933 diff --git a/Assets/Scripts/PrizeSystem/TakeOrRiskSystem/PrizeView.prefab b/Assets/Scripts/PrizeSystem/TakeOrRiskSystem/PrizeView.prefab index ee88af7..548ce43 100644 --- a/Assets/Scripts/PrizeSystem/TakeOrRiskSystem/PrizeView.prefab +++ b/Assets/Scripts/PrizeSystem/TakeOrRiskSystem/PrizeView.prefab @@ -33,9 +33,9 @@ RectTransform: m_Father: {fileID: 4769901412115232176} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -100.149994} - m_SizeDelta: {x: -20, y: -220.29999} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 240, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5458870206668225629 CanvasRenderer: @@ -65,7 +65,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: New Text + m_text: "\u0412\u0438\u0442\u0440\u0438\u043D\u0430 \u044F\u0447\u0435\u0439\u043A\u0438 + 1\u04312\u04313\u04313\u0431" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} @@ -92,15 +93,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 18 + m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 16 m_fontSizeMax: 64 m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -144,6 +145,7 @@ GameObject: m_Component: - component: {fileID: 4769901412115232176} - component: {fileID: 1203032466002125781} + - component: {fileID: 1039815927586283176} m_Layer: 5 m_Name: PrizeView m_TagString: Untagged @@ -170,7 +172,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 350} + m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1203032466002125781 MonoBehaviour: @@ -202,6 +204,32 @@ MonoBehaviour: - prizeType: 6 sprite: {fileID: 21300000, guid: 6e622d073fff38b468edb48bec60df75, type: 3} defaultSprite: {fileID: 21300000, guid: 6e622d073fff38b468edb48bec60df75, type: 3} +--- !u!114 &1039815927586283176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2875758851730211012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &3995041484942668027 GameObject: m_ObjectHideFlags: 0 @@ -234,10 +262,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4769901412115232176} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 39.1} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &755257399479335942 CanvasRenderer: diff --git a/Assets/Scripts/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs b/Assets/Scripts/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs index 1429ac6..6b8db6d 100644 --- a/Assets/Scripts/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs +++ b/Assets/Scripts/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs @@ -37,7 +37,7 @@ namespace PrizeSystem private void OnEnable() { - SelectedOption = TakeOrRiskOption.Risk; + SelectedOption = TakeOrRiskOption.Take; activeFrame = CurrentPrizeFrame; inactiveFrame = NextPrizeFrame; @@ -71,16 +71,16 @@ namespace PrizeSystem private (TakeOrRiskOption selectedOption, float timerDelta) ProcessInput() { - if (In.GetButtonAnyPlayer(PlayerAction.left) && SelectedOption != TakeOrRiskOption.Risk) - { - SoundManager.instance.playSwitch(); - SelectedOption = TakeOrRiskOption.Risk; - } - if (In.GetButtonAnyPlayer(PlayerAction.right) && SelectedOption != TakeOrRiskOption.Take) + if (In.GetButtonAnyPlayer(PlayerAction.left) && SelectedOption != TakeOrRiskOption.Take) { SoundManager.instance.playSwitch(); SelectedOption = TakeOrRiskOption.Take; } + if (In.GetButtonAnyPlayer(PlayerAction.right) && SelectedOption != TakeOrRiskOption.Risk) + { + SoundManager.instance.playSwitch(); + SelectedOption = TakeOrRiskOption.Risk; + } if(In.GetButtonDownAnyPlayer(PlayerAction.down)) SoundManager.instance.playClip(StartAcceptingClip); float timerDelta = Time.deltaTime * (In.GetButtonAnyPlayer(PlayerAction.down) ? 1 : -1);