Переверстал меню, добавил кубок

This commit is contained in:
_sega 2026-01-16 12:22:03 +03:00
parent aca4e88b21
commit fc1be019ef
12 changed files with 415 additions and 361 deletions

View File

@ -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.070216894, g: 1, b: 0, a: 1}
- _GlowColor: {r: 0.6280117, g: 0, 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}

View File

@ -1979,9 +1979,9 @@ RectTransform:
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: -256, y: 12.5}
m_SizeDelta: {x: 512, y: 512}
m_Pivot: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 10.399994}
m_SizeDelta: {x: 409.6, y: 409.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &80780496
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2037,7 +2037,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &92182382
RectTransform:
m_ObjectHideFlags: 0
@ -2134,9 +2134,9 @@ RectTransform:
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: 250, y: 180}
m_SizeDelta: {x: 419.94, y: 385.97}
m_Pivot: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -15}
m_SizeDelta: {x: 335.952, y: 308.776}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &95872203
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2202,7 +2202,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
PriceKey: PricePVP
readyToBlink: 0
frequency: 4
frequency: -6
gradient:
serializedVersion: 2
key0: {r: 0.5294118, g: 0.8117648, b: 0.9490197, a: 0.039215688}
@ -5305,11 +5305,10 @@ GameObject:
m_Component:
- component: {fileID: 248271428}
- component: {fileID: 248271430}
- component: {fileID: 248271429}
- component: {fileID: 248271431}
- component: {fileID: 248271432}
m_Layer: 5
m_Name: Special prize label
m_Name: Special prize container
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -5324,106 +5323,19 @@ RectTransform:
m_GameObject: {fileID: 248271427}
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_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1279181195}
- {fileID: 831537983}
- {fileID: 285779265}
m_Father: {fileID: 382964715}
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: -207}
m_AnchoredPosition: {x: 0, y: -300}
m_SizeDelta: {x: 400, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &248271429
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 248271427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u041F\u0440\u0438\u0437:"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1ee9f3e03c52c304b8c831dc7aed5fa0, type: 2}
m_sharedMaterial: {fileID: 4262305343556741190, guid: 1ee9f3e03c52c304b8c831dc7aed5fa0, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 50
m_fontSizeBase: 50
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &248271430
CanvasRenderer:
m_ObjectHideFlags: 0
@ -5445,7 +5357,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
graphics:
- {fileID: 248271429}
- {fileID: 1279181196}
- {fileID: 831537984}
- {fileID: 285779266}
enabledColor: {r: 1, g: 1, b: 1, a: 1}
disabledColor: {r: 0, g: 0, b: 0, a: 0}
@ -6063,7 +5976,7 @@ GameObject:
- component: {fileID: 285779266}
- component: {fileID: 285779268}
m_Layer: 5
m_Name: Text (TMP)
m_Name: value
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -6135,8 +6048,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 50
m_fontSizeBase: 50
m_fontSize: 35
m_fontSizeBase: 35
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -8907,7 +8820,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u0411\u0415\u0421\u041F\u041B\u0410\u0422\u041D\u0410\u042F \u0418\u0413\u0420\u0410"
m_text: "\u0411\u0415\u0421\u041F\u041B\u0410\u0422\u041D\u0410\u042F<br>\u0418\u0413\u0420\u0410"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1ee9f3e03c52c304b8c831dc7aed5fa0, type: 2}
m_sharedMaterial: {fileID: 4262305343556741190, guid: 1ee9f3e03c52c304b8c831dc7aed5fa0, type: 2}
@ -8946,7 +8859,7 @@ MonoBehaviour:
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacing: -45
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
@ -9107,10 +9020,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 95872202}
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: -13, y: 218}
m_SizeDelta: {x: 512, y: 512}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -8.1, y: 18.4}
m_SizeDelta: {x: 409.6, y: 409.59998}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &464592720
MonoBehaviour:
@ -12854,7 +12767,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -49.22, y: -64.6}
m_AnchoredPosition: {x: -85.91, y: -64.6}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &599592679
@ -14664,7 +14577,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4842485611393041765, guid: 16a6b6e78ff4ce141b9763c43a35d74c, type: 3}
propertyPath: alphabetString
value: "\u0410\u0411\u0412\u0413\u0414\u0415\u0401\u0416\u0417\u0418\u0419\u041A\u041B\u041C\u041D\u041E\u041F\u0420\u0421\u0422\u0423\u0424\u0425\u0426\u0427\u0428\u0429\u042A\u042B\u042C\u042D\u042E\u042F01234567890123456789_"
value: "\u0410\u0411\u0412\u0413\u0414\u0415\u0401\u0416\u0417\u0418\u0419\u041A\u041B\u041C\u041D\u041E\u041F\u0420\u0421\u0422\u0423\u0424\u0425\u0426\u0427\u0428\u0429\u042A\u042B\u042C\u042D\u042E\u042F\u0430\u0431\u0432\u0433\u0434\u0435\u0451\u0436\u0437\u0438\u0439\u043A\u043B\u043C\u043D\u043E\u043F\u0440\u0441\u0442\u0443\u0444\u0445\u0446\u0447\u0448\u0449\u044A\u044B\u044C\u044D\u044E\u044F01234567890123456789_. "
objectReference: {fileID: 0}
- target: {fileID: 4842485611393041765, guid: 16a6b6e78ff4ce141b9763c43a35d74c, type: 3}
propertyPath: MaxSpeedLetterPerSecond
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7231252640966749575, guid: 16a6b6e78ff4ce141b9763c43a35d74c, type: 3}
propertyPath: m_Pivot.x
@ -22617,6 +22534,140 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831386344}
m_CullTransparentMesh: 1
--- !u!1 &831537982
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 831537983}
- component: {fileID: 831537985}
- component: {fileID: 831537984}
m_Layer: 5
m_Name: prize
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &831537983
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831537982}
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: 248271428}
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: -7.9}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &831537984
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831537982}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u041F\u0440\u0438\u0437:"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1ee9f3e03c52c304b8c831dc7aed5fa0, type: 2}
m_sharedMaterial: {fileID: 4262305343556741190, guid: 1ee9f3e03c52c304b8c831dc7aed5fa0, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 25
m_fontSizeBase: 25
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &831537985
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831537982}
m_CullTransparentMesh: 1
--- !u!1 &848956280
GameObject:
m_ObjectHideFlags: 0
@ -24692,7 +24743,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &961428703
RectTransform:
m_ObjectHideFlags: 0
@ -25729,7 +25780,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -25.4, y: -46}
m_SizeDelta: {x: 1251, y: 514}
m_SizeDelta: {x: 1125.9, y: 462.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1036986759
CanvasRenderer:
@ -25782,7 +25833,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
amplitude: 10
speed: 2
speed: 1.5
--- !u!1 &1037840203
GameObject:
m_ObjectHideFlags: 0
@ -31970,7 +32021,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -377.7}
m_AnchoredPosition: {x: 0, y: -299.5}
m_SizeDelta: {x: 500, y: 100}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1084639305
@ -33402,7 +33453,7 @@ GameObject:
- component: {fileID: 1171067470}
- component: {fileID: 1171067469}
m_Layer: 5
m_Name: Image
m_Name: "\u0417\u0430\u0447\u0435\u0440\u043A"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -34991,11 +35042,11 @@ RectTransform:
m_Children: []
m_Father: {fileID: 2047831684}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 26}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 62}
m_SizeDelta: {x: 500, y: 48.4}
m_Pivot: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1253636792
MonoBehaviour:
m_ObjectHideFlags: 0
@ -35066,8 +35117,8 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
@ -35470,6 +35521,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275487622}
m_CullTransparentMesh: 1
--- !u!1 &1279181194
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1279181195}
- component: {fileID: 1279181197}
- component: {fileID: 1279181196}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1279181195
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1279181194}
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: 248271428}
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: 70}
m_SizeDelta: {x: 120, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1279181196
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1279181194}
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: 9bad7d3befa7f5446a0d1f6b80048b02, 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 &1279181197
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1279181194}
m_CullTransparentMesh: 1
--- !u!1 &1279805982
GameObject:
m_ObjectHideFlags: 0
@ -35555,8 +35681,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -49453,7 +49579,7 @@ RectTransform:
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: -50}
m_AnchoredPosition: {x: 0, y: -70}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1796045837
@ -53360,7 +53486,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -384}
m_AnchoredPosition: {x: 0, y: -299.5}
m_SizeDelta: {x: 500, y: 100}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &2023548972
@ -53574,9 +53700,9 @@ RectTransform:
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: -250, y: 180}
m_SizeDelta: {x: 359.14, y: 385.97}
m_Pivot: {x: 1, y: 1}
m_AnchoredPosition: {x: -400, y: -15}
m_SizeDelta: {x: 287.312, y: 308.776}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2047831685
MonoBehaviour:
m_ObjectHideFlags: 0
@ -53642,7 +53768,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
PriceKey: PricePVE
readyToBlink: 0
frequency: 4
frequency: -6
gradient:
serializedVersion: 2
key0: {r: 0.91372555, g: 0.6392157, b: 0.21960786, a: 0.039215688}
@ -53950,11 +54076,11 @@ RectTransform:
m_Children: []
m_Father: {fileID: 95872202}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 26}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 62}
m_SizeDelta: {x: 500, y: 48.399994}
m_Pivot: {x: 1, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2081061933
MonoBehaviour:
m_ObjectHideFlags: 0
@ -54025,8 +54151,8 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 4
m_VerticalAlignment: 256
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0

View File

@ -1,5 +1,4 @@
using System.Collections;
using UnityEditor.Tilemaps;
using UnityEngine;
[RequireComponent(typeof(CanvasGroup))]

View File

@ -30,23 +30,23 @@ public class MenuState : IState
#region начальные и конечные позиции для элементов меню
//s - startPosition, e - endPosition
Vector2
//надпись 4вряд
sLabel = new Vector2(0, 300),
//надпись "ФИШКА"
sLabel = new Vector2(0, 320),
eLabel = new Vector2(0, 1000),
//Иконки режимов
sButton = new Vector2(250, 180),
eButton = new Vector2(2000, 180),
sButton = new Vector2(400, -15),
eButton = new Vector2(2000, -15),
//подсказка + лого + техподдержка
sLabel2 = new Vector2(0, -380),
eLabel2 = new Vector2(0, -1000),
//Доска
//ИГРОВОЕ ПОЛЕ
sBoard = new Vector2(-40, -0.5f),
eBoard = new Vector2(0, -0.5f),
sNoPrize = new Vector2(-0, -50f),
sNoPrize = new Vector2(-0, -70f),
eNoPrize = new Vector2(15, -409);
Vector3
sCoin = new Vector3(0, -1.93f, 0),

View File

@ -183,11 +183,13 @@ public class PositioningState : IState
}
}
//ВЫХОД ДА ПЕРВОГО ХОДА
bool exitPressed = In.GetButtonDown(ButtonPinMapping.startOnePlayer) || In.GetButtonDown(ButtonPinMapping.startTwoPlayers);
if (exitPressed && !gm.moveMade)
{
gm.stateMachine.ChangeState(new ClearFieldState(toMenu: true, CellState.Player1));
ComWrapper.ReturnCredits(gm.gameMode);
GameManager.instance.timerManager.StopAllTimers();
}
}

View File

@ -89,6 +89,7 @@ public class ComWrapper : MonoBehaviour
int gamemodePrice = PlayerPrefs.GetInt(gamemodePriceKey, 10);
Balance += gamemodePrice;
PlayerPrefs.SetInt("CoinsCount", Balance);
onCoinAdded?.Invoke(Balance);
}

View File

@ -321,10 +321,10 @@ public class RulesPrizePanel : MonoBehaviour
private string GetPrizeInstruction(Prize prize)
{
string HopperInstruction = "Заберите приз в окошке выдачи";
string TicketInstruction = "Заберите билеты в окошке выдачи";
string SpecialInstruction = "Чтобы выиграть главный суперприз нужно победить всех соперников. Если вы прошли все уровни, отсканируйте qr-код (он появится после победы) и свяжитесь с администратором для получения приза.";
string MarblesInstruction = "Заберите марблс в окошке выдачи";
string HopperInstruction = "<b>Приз</b><br>Заберите маленький приз в окошке выдачи";
string TicketInstruction = "<b>Билет</b><br>Заберите билеты в окошке выдачи";
string SpecialInstruction = "<b>Суперприз</b><br>Чтобы выиграть главный суперприз нужно победить всех соперников. Если вы прошли все уровни, отсканируйте qr-код (он появится после победы) и свяжитесь с администратором для получения приза. Обязательно сфотографируйте победный экран!";
string MarblesInstruction = "<b>Марблс</b><br>Заберите марблс в окошке выдачи";
return prize.PrizeType switch
{

View File

@ -1,6 +1,5 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;

View File

@ -33,7 +33,6 @@ public class Timer : MonoBehaviour
{
restTime = 0;
StopTimer();
//ExitByTime();
OnTimerEnded?.Invoke();
}
@ -68,14 +67,6 @@ public class Timer : MonoBehaviour
public void StopTimer()
{
processing = false;
}
void ExitByTime() // надо это в другое место зашивать
{
//stateMachine.ChangeState(new ClearFieldState(true, CellState.Player1));
//stateMachine.ChangeState(new CheckState(true));
}
void UiDraw()
{

File diff suppressed because one or more lines are too long

BIN
Assets/кубок.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

127
Assets/кубок.png.meta Normal file
View File

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 9bad7d3befa7f5446a0d1f6b80048b02
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 1
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant: