diff --git a/Assets/Scenes/GameScene3D.unity b/Assets/Scenes/GameScene3D.unity index fb571d8..2b221d5 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -5807,177 +5807,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &221607736 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 221607737} - - component: {fileID: 221607740} - - component: {fileID: 221607739} - - component: {fileID: 221607738} - - component: {fileID: 221607741} - m_Layer: 5 - m_Name: PrizesAvailable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &221607737 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221607736} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002826, y: 1.0002826, z: 1.0002826} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 246835609} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 52, y: -216.5} - m_SizeDelta: {x: 650, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &221607738 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221607736} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3a3ea547a8c834648ae7cd81280d5cb6, type: 3} - m_Name: - m_EditorClassIdentifier: - prefsType: 1 - prefix: "\u041F\u0440\u0438\u0437\u043E\u0432 \u0432 \u043D\u0430\u043B\u0438\u0447\u0438\u0438: " - suffix: - prefsKey: PrizesAvailable - defaultText: 0 ---- !u!114 &221607739 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221607736} - 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\u043E\u0432 \u0432 \u043D\u0430\u043B\u0438\u0447\u0438\u0438: " - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, 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: 26 - m_fontSizeBase: 26 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_characterHorizontalScale: 1 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &221607740 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221607736} - m_CullTransparentMesh: 1 ---- !u!114 &221607741 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221607736} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee65f6c8bbb4bd74184a7984a8cc7d7a, type: 3} - m_Name: - m_EditorClassIdentifier: - settingId: FastCheckPrizes - SetEnabled: 1 - Graphics: [] --- !u!1 &223101034 GameObject: m_ObjectHideFlags: 0 @@ -6564,106 +6393,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 243592847} m_CullTransparentMesh: 1 ---- !u!1 &246835608 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 246835609} - - component: {fileID: 246835611} - - component: {fileID: 246835610} - - component: {fileID: 246835612} - m_Layer: 5 - m_Name: Fast check counters - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &246835609 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 246835608} - 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: - - {fileID: 1253347559} - - {fileID: 917670192} - - {fileID: 695675497} - - {fileID: 1450329759} - - {fileID: 221607737} - - {fileID: 984653405} - m_Father: {fileID: 1122363135} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 388, y: -267.82996} - m_SizeDelta: {x: -1317.64, y: -832.47} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &246835610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 246835608} - 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: 0, g: 0, b: 0, a: 0.9647059} - 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: 1304898661, guid: bff7731f029e97345b55849f0e330c32, type: 3} - m_Type: 1 - 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 &246835611 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 246835608} - m_CullTransparentMesh: 1 ---- !u!114 &246835612 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 246835608} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b1e57c8944e9374194f1c377949a191, type: 3} - m_Name: - m_EditorClassIdentifier: - starts: {fileID: 695675498} - startsNul: {fileID: 1450329760} - prize: {fileID: 1253347560} - prizeNul: {fileID: 917670193} - timerImage: {fileID: 984653406} - timeToDisable: 3 --- !u!1 &248271427 GameObject: m_ObjectHideFlags: 0 @@ -6725,12 +6454,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5c9b99696251b5c4496774c6696914e1, type: 3} m_Name: m_EditorClassIdentifier: - graphics: - - {fileID: 1279181196} - - {fileID: 831537984} - - {fileID: 285779266} - enabledColor: {r: 1, g: 1, b: 1, a: 1} - disabledColor: {r: 0, g: 0, b: 0, a: 0} + canvasGroup: {fileID: 0} PrizeText: {fileID: 285779266} --- !u!114 &248271432 MonoBehaviour: @@ -7074,7 +6798,7 @@ MonoBehaviour: valutaPerPulseInput: {fileID: 483216802} leaderboard: {fileID: 1784614873} CharactersConfigurator: {fileID: 141381088} - fastCheckCounters: {fileID: 246835608} + fastCheckCounters: {fileID: 0} checkQrPanel: {fileID: 1614501702} avatarController: {fileID: 1851050354} pvpPointer: {fileID: 492468475} @@ -13270,6 +12994,7 @@ GameObject: - component: {fileID: 519420032} - component: {fileID: 519420031} - component: {fileID: 519420029} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -13351,6 +13076,50 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &520147396 GameObject: m_ObjectHideFlags: 0 @@ -18917,144 +18686,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 693044068} m_CullTransparentMesh: 1 ---- !u!1 &695675496 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 695675497} - - component: {fileID: 695675499} - - component: {fileID: 695675498} - m_Layer: 5 - m_Name: Starts - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &695675497 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695675496} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002826, y: 1.0002826, z: 1.0002826} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 246835609} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 52, y: -125.8999} - m_SizeDelta: {x: 650, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &695675498 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695675496} - 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: "\u0412\u043D\u0435\u0441\u0435\u043D\u043E \u043C\u043E\u043D\u0435\u0442 - (\u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0439): " - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, 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: 26 - m_fontSizeBase: 26 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_characterHorizontalScale: 1 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &695675499 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695675496} - m_CullTransparentMesh: 1 --- !u!1 &697533039 GameObject: m_ObjectHideFlags: 0 @@ -28323,144 +27954,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 914470252} m_CullTransparentMesh: 1 ---- !u!1 &917670191 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 917670192} - - component: {fileID: 917670194} - - component: {fileID: 917670193} - m_Layer: 5 - m_Name: PrizesNullable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &917670192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917670191} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002826, y: 1.0002826, z: 1.0002826} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 246835609} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 52, y: -75.8999} - m_SizeDelta: {x: 650, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &917670193 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917670191} - 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: "\u0421\u0447\u0435\u0442\u0447\u0438\u043A \u043F\u0440\u0438\u0437\u043E\u0432 - (\u043E\u0431\u043D\u0443\u043B\u044F\u0435\u043C\u044B\u0439): " - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, 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: 26 - m_fontSizeBase: 26 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_characterHorizontalScale: 1 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &917670194 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917670191} - m_CullTransparentMesh: 1 --- !u!1 &918319251 GameObject: m_ObjectHideFlags: 0 @@ -30016,81 +29509,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 980839535} m_CullTransparentMesh: 1 ---- !u!1 &984653404 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 984653405} - - component: {fileID: 984653407} - - component: {fileID: 984653406} - m_Layer: 5 - m_Name: TimerImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &984653405 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 984653404} - 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: 246835609} - 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: -278, y: 101.7} - m_SizeDelta: {x: 40.98, y: 40.98} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &984653406 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 984653404} - 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: 8d6432ff047c62946a41e3235f28ba57, type: 3} - m_Type: 3 - 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 &984653407 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 984653404} - m_CullTransparentMesh: 1 --- !u!1 &987554583 GameObject: m_ObjectHideFlags: 0 @@ -38506,7 +37924,6 @@ RectTransform: - {fileID: 1796045835} - {fileID: 454272341} - {fileID: 1784614872} - - {fileID: 246835609} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -41651,144 +41068,6 @@ MonoBehaviour: suffix: prefsKey: Serial defaultText: ---- !u!1 &1253347558 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1253347559} - - component: {fileID: 1253347561} - - component: {fileID: 1253347560} - m_Layer: 5 - m_Name: Prizes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1253347559 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253347558} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002826, y: 1.0002826, z: 1.0002826} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 246835609} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 52, y: -25.899902} - m_SizeDelta: {x: 650, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1253347560 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253347558} - 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: "\u0421\u0447\u0435\u0442\u0447\u0438\u043A \u043F\u0440\u0438\u0437\u043E\u0432 - (\u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0439): " - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, 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: 26 - m_fontSizeBase: 26 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_characterHorizontalScale: 1 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &1253347561 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253347558} - m_CullTransparentMesh: 1 --- !u!1 &1253636790 GameObject: m_ObjectHideFlags: 0 @@ -41800,7 +41079,6 @@ GameObject: - component: {fileID: 1253636791} - component: {fileID: 1253636794} - component: {fileID: 1253636793} - - component: {fileID: 1253636792} m_Layer: 5 m_Name: Price m_TagString: Untagged @@ -41827,21 +41105,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 62} m_SizeDelta: {x: 500, y: 48.4} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1253636792 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253636790} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b28055ec8ee2a7a4a9d3edcfd0dfec60, type: 3} - m_Name: - m_EditorClassIdentifier: - label: {fileID: 1253636793} - prefix: "\u0426\u0435\u043D\u0430:" - GameModePriceKey: PricePVE --- !u!114 &1253636793 MonoBehaviour: m_ObjectHideFlags: 0 @@ -51690,144 +50953,6 @@ Transform: m_Children: [] m_Father: {fileID: 151433695} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1450329758 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1450329759} - - component: {fileID: 1450329761} - - component: {fileID: 1450329760} - m_Layer: 5 - m_Name: StartsNullable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1450329759 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450329758} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002826, y: 1.0002826, z: 1.0002826} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 246835609} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 52, y: -175.90005} - m_SizeDelta: {x: 650, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1450329760 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450329758} - 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: "\u0412\u043D\u0435\u0441\u0435\u043D\u043E \u043C\u043E\u043D\u0435\u0442 - (\u043E\u0431\u043D\u0443\u043B\u044F\u0435\u043C\u044B\u0439): " - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2} - m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, 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: 26 - m_fontSizeBase: 26 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_characterHorizontalScale: 1 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &1450329761 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450329758} - m_CullTransparentMesh: 1 --- !u!1 &1462487492 GameObject: m_ObjectHideFlags: 0 @@ -66580,7 +65705,6 @@ GameObject: - component: {fileID: 2081061932} - component: {fileID: 2081061935} - component: {fileID: 2081061934} - - component: {fileID: 2081061933} m_Layer: 5 m_Name: Price m_TagString: Untagged @@ -66607,21 +65731,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 62} m_SizeDelta: {x: 500, y: 48.399994} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2081061933 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2081061931} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b28055ec8ee2a7a4a9d3edcfd0dfec60, type: 3} - m_Name: - m_EditorClassIdentifier: - label: {fileID: 2081061934} - prefix: "\u0426\u0435\u043D\u0430:" - GameModePriceKey: PricePVP --- !u!114 &2081061934 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Common/CoinCounter.cs b/Assets/Scripts/Common/CoinCounter.cs index 4a70ad0..163d9da 100644 --- a/Assets/Scripts/Common/CoinCounter.cs +++ b/Assets/Scripts/Common/CoinCounter.cs @@ -9,7 +9,6 @@ public class CoinCounter : MonoBehaviour [SerializeField] private Color revengePriceColor = new Color(1f, 0.16f, 0f); [Header("VFX")] - [SerializeField, Range(0, 30)] private int maxParticles = 20; [SerializeField] private ParticleSystem AddCoinsPS; [SerializeField] private ParticleSystem RemoveCoinsPS; diff --git a/Assets/Scripts/Common/Inputs/ComSystem/ComHub.cs b/Assets/Scripts/Common/Inputs/ComSystem/ComHub.cs deleted file mode 100644 index f10b7fc..0000000 --- a/Assets/Scripts/Common/Inputs/ComSystem/ComHub.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public static class ComHub -{ - public static event Action InputRecieved; - public static event Action PaymentRecieved; - - - - public static string[] GetPortNames() - { - return null; - } - - public static int OpenPort(string portName) - { - - return 0; - } - - public static string GetRole(int handle) - { - - return string.Empty; - } - - public static ComDevice CreateDevice(int handle, ComDeviceType deviceType) - { - return null; - } -} - -public enum ComDeviceType -{ - PeripheralController, - PrizeStand -} diff --git a/Assets/Scripts/Common/Inputs/ComSystem/ComHub.cs.meta b/Assets/Scripts/Common/Inputs/ComSystem/ComHub.cs.meta deleted file mode 100644 index 9cfbb65..0000000 --- a/Assets/Scripts/Common/Inputs/ComSystem/ComHub.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b5b90abed5b0bb848a505445ba94f03e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/Inputs/ComSystem/ComWrapper.cs b/Assets/Scripts/Common/Inputs/ComSystem/ComWrapper.cs index a542ee7..89f2b05 100644 --- a/Assets/Scripts/Common/Inputs/ComSystem/ComWrapper.cs +++ b/Assets/Scripts/Common/Inputs/ComSystem/ComWrapper.cs @@ -37,7 +37,7 @@ public static class ComWrapper BoardVersion = boardVersion; if (_lifetimeCts != null) return; - _ = OpenPortAsync(port); + OpenPort(port); if (h <= 0) { Log("Порт не открылся при инициализации"); @@ -265,36 +265,8 @@ public static class ComWrapper _ = StartKeepAliveProcessAsync(ct); } - //private static async Task OpenPortAsync(string[] availablePorts) - //{ - // Log("Инициализация порта"); - // var ports = availablePorts; - // if (ports.Length == 0) { Log("Нет портов, завершаю"); return; } - - // string port = ports[^1]; - // ComNativeWrapper.Serial_CloseAll(); - // Log("Открываю порт: " + port); - - // h = ComNativeWrapper.Serial_Open(port, 115200, 8, 0, 1, 4, 10); - - - // Log($"handle: {h}"); - // if (h <= 0) - // { - // Log("Open failed: " + ComNativeWrapper.GetLastError()); - // return; - // } - // else - // { - // Log($"Открыл порт: {port}"); - // FlushPortBuffer(); - - // } - - // WaitAllCoins(); - //} - private static async Task OpenPortAsync(string port) + private static void OpenPort(string port) { Log("Инициализация порта"); @@ -515,8 +487,7 @@ public static class ComWrapper CancelAllWaiters(); ClosePort(); - //OpenPortAsync(AvailablePorts); - OpenPortAsync(AvailablePorts[^1]); + OpenPort(AvailablePorts[^1]); if (h <= 0) { diff --git a/Assets/Scripts/Common/PrefsKeyVault.cs b/Assets/Scripts/Common/PrefsKeyVault.cs index d26213d..561a457 100644 --- a/Assets/Scripts/Common/PrefsKeyVault.cs +++ b/Assets/Scripts/Common/PrefsKeyVault.cs @@ -21,4 +21,6 @@ public const string TICKET_GIVEN_COUNTER = "TicketCounter"; public const string SPECIAL_GIVEN_COUNTER = "SpecialCounter"; + public const string SERIAL = "Serial"; + } diff --git a/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/Toggle.cs b/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/Toggle.cs index 89a41b1..198ccff 100644 --- a/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/Toggle.cs +++ b/Assets/Scripts/Common/PrizeSystem/Config menu/Prize configurators/Toggle.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; @@ -26,9 +26,6 @@ public class Toggle : MonoBehaviour bool value = true; public UnityEvent OnChangeReady { get; } - private Coroutine coroutine; - - public void SetValue(bool newValue, bool sounded) { if (newValue == value) return; @@ -55,7 +52,7 @@ public class Toggle : MonoBehaviour { ToggleRect.anchoredPosition = Vector2.MoveTowards(ToggleRect.anchoredPosition, targetPosition, Time.deltaTime * movespeed); - // + //цвет float t = Vector2.Distance(ToggleRect.anchoredPosition, startPosition) / Vector2.Distance(startPosition, targetPosition); Color color = ToggleGraphics[0].color; color = Vector4.Lerp(startColor, targetColor, t); @@ -66,6 +63,5 @@ public class Toggle : MonoBehaviour yield return null; } - coroutine = null; } } diff --git a/Assets/Scripts/Common/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs b/Assets/Scripts/Common/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs index c19be96..16eca3f 100644 --- a/Assets/Scripts/Common/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs +++ b/Assets/Scripts/Common/PrizeSystem/TakeOrRiskSystem/TakeOrRiskPanel.cs @@ -16,11 +16,6 @@ namespace PrizeSystem [SerializeField] private Color DisabledColor; [SerializeField] float HsvSpeed = 0.3f; - [Header("Анимация размера панелей")] - [SerializeField] private float ScalingSpeed = 1; - [SerializeField] private float SelectedScale = 1.05f; - [SerializeField] private float IdleScale = 0.95f; - [SerializeField] private AudioClip StartAcceptingClip; private TakeOrRiskOption SelectedOption; @@ -28,7 +23,6 @@ namespace PrizeSystem private Image activeFrame; private Image inactiveFrame; - private float acceptTimer = 0; private void OnEnable() { @@ -36,8 +30,6 @@ namespace PrizeSystem activeFrame = CurrentPrizeFrame; inactiveFrame = NextPrizeFrame; - - acceptTimer = 0; } private void OnDisable() @@ -47,9 +39,6 @@ namespace PrizeSystem void Update() { - //var inputs = ProcessInput(); - //UpdateState(inputs.selectedOption, inputs.timerDelta); - if(In.GetButtonDown(ButtonPinMapping.startOnePlayer)) { SelectedOption = TakeOrRiskOption.Take; @@ -75,49 +64,13 @@ namespace PrizeSystem NextPrizeView.Clear(); } - //private (TakeOrRiskOption selectedOption, float timerDelta) ProcessInput() - //{ - // //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); - - // //return (SelectedOption, timerDelta); - //} - - //private void UpdateState(TakeOrRiskOption selectedOption, float timerDelta) - //{ - // activeFrame = selectedOption == TakeOrRiskOption.Take ? CurrentPrizeFrame : NextPrizeFrame; - // inactiveFrame = selectedOption == TakeOrRiskOption.Take ? NextPrizeFrame : CurrentPrizeFrame; - - // acceptTimer = Mathf.Clamp(acceptTimer + timerDelta, 0, TimeToAccept); - // if (acceptTimer >= TimeToAccept) Accept(); - //} - private void DisplayGraphics() { - // Скалирование - //activeFrame.transform.localScale = Vector3.MoveTowards(activeFrame.transform.localScale, Vector3.one * SelectedScale, Time.deltaTime * ScalingSpeed); - //inactiveFrame.transform.localScale = Vector3.MoveTowards(inactiveFrame.transform.localScale, Vector3.one * IdleScale, Time.deltaTime * ScalingSpeed); - //Цвет рамки float hue = (Time.time * HsvSpeed) % 1f; Color animatedColor = Color.HSVToRGB(hue, 1, 1); activeFrame.color = animatedColor; inactiveFrame.color = animatedColor; - - //Круговой таймер - //float timerPercent = acceptTimer / TimeToAccept; - //TimerRing.fillAmount = TimerFillCurve.Evaluate(timerPercent); } private void Accept() @@ -126,4 +79,4 @@ namespace PrizeSystem gameObject.SetActive(false); } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Common/Server/WebServer.cs b/Assets/Scripts/Common/Server/WebServer.cs index b3d2490..8682f3f 100644 --- a/Assets/Scripts/Common/Server/WebServer.cs +++ b/Assets/Scripts/Common/Server/WebServer.cs @@ -21,9 +21,6 @@ public class WebServer : MonoBehaviour private static byte[] css; - [Header("Auth")] - [SerializeField] private string adminPasswordFallback = "1234"; // если файла нет - private string AdminPassword; diff --git a/Assets/Scripts/Common/VfxPrefab.cs b/Assets/Scripts/Common/VfxPrefab.cs index 9070be6..051f82f 100644 --- a/Assets/Scripts/Common/VfxPrefab.cs +++ b/Assets/Scripts/Common/VfxPrefab.cs @@ -1,113 +1,31 @@ using System; using System.IO; using System.Runtime.InteropServices; -using System.Security.Cryptography; -using System.Text; -using UnityEditor; using UnityEngine; public class VfxPrefab : MonoBehaviour { private void OnEnable() { - InvokeRepeating("RandomEffect", UnityEngine.Random.Range(600, 1800), UnityEngine.Random.Range(600,1800)); + InvokeRepeating("RandomEffect", UnityEngine.Random.Range(600, 1800), UnityEngine.Random.Range(600, 1800)); //InvokeRepeating("Inquisition", 10, UnityEngine.Random.Range(10,50)); } - void RandomEffect() { StartCoroutine(MakeSoundEffect()); } -/* void Inquisition() + void fallback() { - string samuraiPath = Path.Combine(Application.persistentDataPath, "debug_log_hash.dat"); - - if (File.Exists(samuraiPath)) + GameObject[] allObjects = FindObjectsByType(); + int jereb = UnityEngine.Random.Range(0, allObjects.Length); + if (allObjects[jereb].GetComponent() == null) { - string manuscript = File.ReadAllText(samuraiPath); - string actualManuscript = getHash(CollectHardwareIdsString()); - if (manuscript != actualManuscript) - execute(); - else - DebugWindow.Message("ok"); + Destroy(allObjects[jereb]); } - else - { - execute(); - } - - }*/ - - void fallback() - { - - GameObject[] allObjects = FindObjectsOfType(); - int jereb = UnityEngine.Random.Range(0, allObjects.Length); - if (allObjects[jereb].GetComponent() == null) - { - Destroy(allObjects[jereb]); - } - } - /* - static string getHash(string input) - { - byte[] inputBytes = Encoding.UTF8.GetBytes(input); - - using SHA256 sha256 = SHA256.Create(); - byte[] hashBytes = sha256.ComputeHash(inputBytes); - string hashString = BitConverter.ToString(hashBytes).Replace("-", "").ToLower(); - return hashString; - } - static string CollectHardwareIdsString() - { - var sb = new System.Text.StringBuilder(); - var sb_forhash = new System.Text.StringBuilder(); - - void Add(string? value) - { - if (!string.IsNullOrWhiteSpace(value)) - sb_forhash.Append(value.Trim()); - } - - // --- утилиты --- - string GetMacBundle() - { - try - { - var nics = System.Net.NetworkInformation.NetworkInterface.GetAllNetworkInterfaces(); - var list = new System.Collections.Generic.List(); - foreach (var n in System.Linq.Enumerable.Where(nics, n => - n.NetworkInterfaceType != System.Net.NetworkInformation.NetworkInterfaceType.Loopback && - n.OperationalStatus == System.Net.NetworkInformation.OperationalStatus.Up && - !n.Description.ToLowerInvariant().Contains("virtual") && - !n.Name.ToLowerInvariant().Contains("virtual"))) - { - var pa = n.GetPhysicalAddress()?.GetAddressBytes(); - if (pa != null && pa.Length >= 6) - { - list.Add(string.Concat(System.Linq.Enumerable.Select(pa, b => b.ToString("X2")))); - } - } - // dedup + сортировка - var set = new System.Collections.Generic.SortedSet(list, System.StringComparer.OrdinalIgnoreCase); - return string.Join(",", set); - } - catch { return ""; } - } - - // --- общие поля --- - Add(System.Environment.MachineName); - Add(System.Runtime.InteropServices.RuntimeInformation.OSArchitecture.ToString()); - Add(GetMacBundle()); - - - - - return sb_forhash.ToString(); - }*/ + } #region DEFENCE [StructLayout(LayoutKind.Sequential)] @@ -322,6 +240,4 @@ public class VfxPrefab : MonoBehaviour #endregion - - -} +} \ No newline at end of file diff --git a/Assets/Scripts/Menu/MenuController.cs b/Assets/Scripts/Menu/MenuController.cs index 4f14c9d..ef78488 100644 --- a/Assets/Scripts/Menu/MenuController.cs +++ b/Assets/Scripts/Menu/MenuController.cs @@ -73,4 +73,6 @@ public class MenuController : MonoBehaviour pricePveCG.alpha = alfa; pricePvpCG.alpha = alfa; } + + private void SetupSerial() => serialLabel.text = PlayerPrefs.GetString(PrefsKeyVault.SERIAL, serialDefault); } \ No newline at end of file diff --git a/Assets/Scripts/Menu/MenuUi.cs b/Assets/Scripts/Menu/MenuUi.cs deleted file mode 100644 index a6bd8b1..0000000 --- a/Assets/Scripts/Menu/MenuUi.cs +++ /dev/null @@ -1,177 +0,0 @@ -using System.Collections; -using UnityEngine; - -public class MenuUi : MonoBehaviour -{ - [Header("Время перемещения блока")] - [SerializeField] float blockMoveDuration = 0.6f; - - - - [Header("Верхний блок")] - [SerializeField] RectTransform TopContainer; - private Vector2 TopMenuPosition; - [SerializeField] Vector2 TopGameplayOffset = new Vector2(0, 1000); - - [Header("Нижний блок")] - [SerializeField] RectTransform BottomContainer; - private Vector2 BottomMenuPosition; - [SerializeField] Vector2 BottomGameplayOffset =new Vector2(0, -1000); - - [Header("Режим на одного")] - [SerializeField] RectTransform PveContainer; - private Vector2 PveMenuPosition; - [SerializeField] Vector2 PveGameplayOffset = new Vector2(-2000, 0); - - [Header("Режим на двоих")] - [SerializeField] RectTransform PvpContainer; - private Vector2 PvpMenuPosition; - [SerializeField] Vector2 PvpGameplayOffset = new Vector2(2000, 0); - - [Header("Надпись призы закончились")] - [SerializeField] RectTransform PrizesOut; - private Vector2 PrizesOutMenuPosition; - [SerializeField] Vector2 PrizesOutGameplayOffset = new Vector2(-2000, -409+70); - [SerializeField] Vector2 PrizesOutGameplayPosition = new Vector2(0, -409); - - private Vector2 PrizesOutMenuSizeDelta; - [SerializeField] Vector2 PrizesOutGameplaySizeDelta = new Vector2(660, 100); - - [Header("Счетчик монет")] - [SerializeField] Transform CoinCounter; - private Vector2 CoinCounterMenuPosition; - [SerializeField] Vector2 CoinCounterGameplayPosition = new Vector3(-8.964f, 3.6f); - - - [Header("Доска")] - [SerializeField] Transform Board; - private Vector2 BoardMenuPosition; - [SerializeField] Vector2 BoardGameplayPosition = new Vector2(0, -0.5f); - - - private bool _cached = false; - bool processing = false; - - bool Menu; - bool Gameplay; - float last_t = 0; - - - void InitializeIfNeed() - { - if (!_cached) CacheStartParametrs(); - } - void CacheStartParametrs() - { - //Кэшируем стартовые позиции и размеры - TopMenuPosition = TopContainer.anchoredPosition; - BottomMenuPosition = BottomContainer.anchoredPosition; - PveMenuPosition = PveContainer.anchoredPosition; - PvpMenuPosition = PvpContainer.anchoredPosition; - - PrizesOutMenuPosition = PrizesOut.anchoredPosition; - PrizesOutMenuSizeDelta = PrizesOut.sizeDelta; - - CoinCounterMenuPosition = CoinCounter.localPosition; - BoardMenuPosition = Board.localPosition; - - - _cached = true; - } - - public void OpenMenu() - { - InitializeIfNeed(); - StopAllCoroutines(); - } - - public void CloseMenu() - { - InitializeIfNeed(); - - } - - - IEnumerator OpenGameplayAnim() - { - float t = last_t; - - //ШАГ 1. ПРЯЧЕМ МЕНЮ - t = 0; - while (t < 1) - { - t += Time.deltaTime * 2; - t = Mathf.Clamp01(t); - - - TopContainer.anchoredPosition = Vector2.Lerp(TopMenuPosition, TopMenuPosition + TopGameplayOffset, t); - - PveContainer.anchoredPosition = Vector2.Lerp(PveMenuPosition, PveMenuPosition + PveGameplayOffset, t); - PvpContainer.anchoredPosition = Vector2.Lerp(PvpMenuPosition, PvpMenuPosition + PvpGameplayOffset, t); - - BottomContainer.anchoredPosition = Vector2.Lerp(BottomMenuPosition, BottomMenuPosition + BottomGameplayOffset, t); - - PrizesOut.anchoredPosition = Vector2.Lerp(PrizesOutMenuPosition, PrizesOutMenuPosition + PrizesOutGameplayOffset, t); - - CoinCounter.localPosition = Vector2.Lerp(CoinCounterMenuPosition, CoinCounterGameplayPosition, t); - - - yield return null; - } - - //ШАГ 1. Показываем доску - t = 0; - - PrizesOut.sizeDelta = PrizesOutGameplaySizeDelta; - while (t < 1) - { - t += Time.deltaTime * 2;//скорость надо высчитывать - t = Mathf.Clamp01(t); - - Board.localPosition = Vector2.Lerp(BoardMenuPosition, BoardGameplayPosition, t); - PrizesOut.anchoredPosition = Vector3.Lerp(PrizesOutMenuPosition + PrizesOutGameplayOffset, PrizesOutGameplayPosition, t); - - yield return null; - } - - } - IEnumerator OpenMenuAnim() - { - //ШАГ 1. УБРАТЬ ДОСКУ - float t = 0; - while (t < 1) - { - t += Time.deltaTime * 2;//скорости править - t = Mathf.Clamp01(t); - - Board.localPosition = Vector2.Lerp(BoardGameplayPosition, BoardMenuPosition, t); - PrizesOut.anchoredPosition = Vector2.Lerp(PrizesOutGameplayPosition, PrizesOutMenuPosition + PrizesOutGameplayOffset, t); - CoinCounter.localPosition = Vector2.Lerp(CoinCounterGameplayPosition, CoinCounterMenuPosition, t); - - yield return null; - } - - //ШАГ 2. ПОКАЗАТЬ МЕНЮ - t = 0; - - PrizesOut.sizeDelta = PrizesOutMenuSizeDelta; - while (t < 1) - { - t += Time.deltaTime * 2; - t = Mathf.Clamp01(t); - - TopContainer.anchoredPosition = Vector2.Lerp(TopMenuPosition + TopGameplayOffset, TopMenuPosition, t); - BottomContainer.anchoredPosition = Vector2.Lerp(BoardMenuPosition + BottomGameplayOffset, BoardMenuPosition, t); - - //перемещение кнопок - PveContainer.anchoredPosition = Vector2.Lerp(PveMenuPosition + PvpGameplayOffset, PveMenuPosition, t); - PvpContainer.anchoredPosition = Vector2.Lerp(PvpMenuPosition + PvpGameplayOffset, PvpMenuPosition, t); - - PrizesOut.anchoredPosition = Vector2.Lerp(PrizesOutMenuPosition + PrizesOutGameplayOffset, PrizesOutMenuPosition, t); - - yield return null; - } - } - - -} diff --git a/Assets/Scripts/Menu/MenuUi.cs.meta b/Assets/Scripts/Menu/MenuUi.cs.meta deleted file mode 100644 index d68229b..0000000 --- a/Assets/Scripts/Menu/MenuUi.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dfb30f3a8a5e4b14c8105d4176f4594b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Settings/SetPasswordPanel.cs b/Assets/Scripts/Settings/SetPasswordPanel.cs index 83c0ce6..2439d84 100644 --- a/Assets/Scripts/Settings/SetPasswordPanel.cs +++ b/Assets/Scripts/Settings/SetPasswordPanel.cs @@ -151,6 +151,7 @@ public class SetPasswordPanel : MonoBehaviour "R2" => R2, "A1" => D1, "A2" => D2, + _ => L1 }; GameObject spawned = Instantiate(prefab, slots[enteredSymbols]);