diff --git a/Assets/Scenes/GameScene3D.unity b/Assets/Scenes/GameScene3D.unity index 0181e72..9420d74 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -2313,8 +2313,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a75daa31c0bc7ab44a93c4c613ce8c13, type: 3} m_Name: m_EditorClassIdentifier: - amplitude: 0.5 speed: 7 + amplitude: 0.5 + image: {fileID: 0} --- !u!114 &76417536 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6679,99 +6680,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 352882677} m_CullTransparentMesh: 1 ---- !u!1 &353581938 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 353581939} - - component: {fileID: 353581942} - - component: {fileID: 353581941} - - component: {fileID: 353581940} - m_Layer: 5 - m_Name: WhatsappQR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &353581939 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353581938} - 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: - - {fileID: 1522507011} - m_Father: {fileID: 1614501703} - 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: 300, y: 0} - m_SizeDelta: {x: 250, y: 250} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &353581940 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353581938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 726f113b5f22eca498b29c51f02b2604, type: 3} - m_Name: - m_EditorClassIdentifier: - urlType: 1 - image: {fileID: 353581941} - prefix: https://wa.me/ - prefsDatakey: Number ---- !u!114 &353581941 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353581938} - 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: 0} - 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 &353581942 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353581938} - m_CullTransparentMesh: 1 --- !u!1 &355424368 GameObject: m_ObjectHideFlags: 0 @@ -7846,8 +7754,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a75daa31c0bc7ab44a93c4c613ce8c13, type: 3} m_Name: m_EditorClassIdentifier: - amplitude: 0.5 speed: 7 + amplitude: 0.5 + image: {fileID: 0} --- !u!1 &421209213 GameObject: m_ObjectHideFlags: 0 @@ -9688,143 +9597,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2418974995959343870, guid: 27e265a942f5e944ba64cee964262ed5, type: 3} m_PrefabInstance: {fileID: 1696524533} m_PrefabAsset: {fileID: 0} ---- !u!1 &485849588 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 485849589} - - component: {fileID: 485849591} - - component: {fileID: 485849590} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &485849589 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485849588} - 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: 1614501703} - 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: -46.56006} - m_SizeDelta: {x: 400, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &485849590 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485849588} - 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: "\u0422\u0435\u0441\u0442 QR \u043A\u043E\u0434\u043E\u0432" - 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: 32 - m_fontSizeBase: 32 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 16 - m_fontSizeMax: 64 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - 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: 00000000 - 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 &485849591 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485849588} - m_CullTransparentMesh: 1 --- !u!1 &486728385 GameObject: m_ObjectHideFlags: 0 @@ -11038,144 +10810,6 @@ Transform: m_Children: [] m_Father: {fileID: 151433695} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &529556622 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 529556623} - - component: {fileID: 529556625} - - component: {fileID: 529556624} - m_Layer: 5 - m_Name: HowToExit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &529556623 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 529556622} - 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: - - {fileID: 2105511643} - m_Father: {fileID: 1614501703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -127.203125, y: 61.899902} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &529556624 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 529556622} - 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: "\u043D\u0430\u0437\u0430\u0434" - 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: 36 - m_fontSizeBase: 36 - 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: 00000000 - 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 &529556625 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 529556622} - m_CullTransparentMesh: 1 --- !u!1 &534572199 GameObject: m_ObjectHideFlags: 0 @@ -18033,8 +17667,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a75daa31c0bc7ab44a93c4c613ce8c13, type: 3} m_Name: m_EditorClassIdentifier: - amplitude: 0.5 speed: 7 + amplitude: 0.5 + image: {fileID: 0} --- !u!114 &823351075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20212,99 +19847,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 972757445} m_CullTransparentMesh: 1 ---- !u!1 &973386811 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 973386812} - - component: {fileID: 973386815} - - component: {fileID: 973386814} - - component: {fileID: 973386813} - m_Layer: 5 - m_Name: TelegramQR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &973386812 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973386811} - 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: - - {fileID: 1382616741} - m_Father: {fileID: 1614501703} - 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: -300, y: 0} - m_SizeDelta: {x: 250, y: 250} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &973386813 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973386811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 726f113b5f22eca498b29c51f02b2604, type: 3} - m_Name: - m_EditorClassIdentifier: - urlType: 0 - image: {fileID: 973386814} - prefix: https://t.me/+ - prefsDatakey: Number ---- !u!114 &973386814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973386811} - 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: 0} - 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 &973386815 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973386811} - m_CullTransparentMesh: 1 --- !u!1 &974423072 GameObject: m_ObjectHideFlags: 0 @@ -21466,7 +21008,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1042651726} - - component: {fileID: 1042651727} m_Layer: 5 m_Name: Fingers m_TagString: Untagged @@ -21496,28 +21037,6 @@ RectTransform: m_AnchoredPosition: {x: 2, y: -19} m_SizeDelta: {x: 888.70996, y: 494.55} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1042651727 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1042651725} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72703fd2fb0d3384a93aa2d8618a2a2b, type: 3} - m_Name: - m_EditorClassIdentifier: - execAlways: 1 - amplitude: 0.2 - speed: 0.5 - notification: - Title: - Message: - Image: {fileID: 0} - ImagePosition: {x: 0, y: 0} - ImageSize: 0 - audioClip: {fileID: 0} --- !u!1 &1044348555 GameObject: m_ObjectHideFlags: 0 @@ -28270,8 +27789,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a75daa31c0bc7ab44a93c4c613ce8c13, type: 3} m_Name: m_EditorClassIdentifier: - amplitude: 0.5 speed: 7 + amplitude: 0.5 + image: {fileID: 0} --- !u!114 &1363944073 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28310,143 +27830,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1363944070} m_CullTransparentMesh: 1 ---- !u!1 &1382616740 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1382616741} - - component: {fileID: 1382616743} - - component: {fileID: 1382616742} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1382616741 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1382616740} - 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: 973386812} - 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: -161.3} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1382616742 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1382616740} - 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: Telegram - 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: 30 - m_fontSizeBase: 30 - 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_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: 00000000 - 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 &1382616743 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1382616740} - m_CullTransparentMesh: 1 --- !u!1 &1387599943 GameObject: m_ObjectHideFlags: 0 @@ -28575,6 +27958,10 @@ MonoBehaviour: vitrinaCatcher: {fileID: 1984502421} avatarController: {fileID: 1851050354} gameManager: {fileID: 259182279} + characterController: {fileID: 0} + characterEventBus: {fileID: 0} + countersCollector: {fileID: 0} + defender: {fileID: 0} --- !u!1 &1400366661 GameObject: m_ObjectHideFlags: 0 @@ -30900,143 +30287,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1516663048} m_CullTransparentMesh: 1 ---- !u!1 &1522507010 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1522507011} - - component: {fileID: 1522507013} - - component: {fileID: 1522507012} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1522507011 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1522507010} - 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: 353581939} - 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: -161.30003} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1522507012 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1522507010} - 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: WhatsApp - 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: 30 - m_fontSizeBase: 30 - 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_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: 00000000 - 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 &1522507013 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1522507010} - m_CullTransparentMesh: 1 --- !u!1 &1526334220 GameObject: m_ObjectHideFlags: 0 @@ -32173,8 +31423,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a75daa31c0bc7ab44a93c4c613ce8c13, type: 3} m_Name: m_EditorClassIdentifier: - amplitude: 0.5 speed: 7 + amplitude: 0.5 + image: {fileID: 0} --- !u!1 &1582004087 GameObject: m_ObjectHideFlags: 0 @@ -33238,85 +32489,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1606007088} m_CullTransparentMesh: 1 ---- !u!1 &1614501702 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1614501703} - - component: {fileID: 1614501705} - - component: {fileID: 1614501704} - m_Layer: 5 - m_Name: Qr Tester - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1614501703 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1614501702} - 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: 485849589} - - {fileID: 973386812} - - {fileID: 353581939} - - {fileID: 529556623} - m_Father: {fileID: 1967587903} - 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: 43.81006} - m_SizeDelta: {x: -400, y: -312.39} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1614501704 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1614501702} - 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: 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: 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 &1614501705 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1614501702} - m_CullTransparentMesh: 1 --- !u!1 &1615046713 GameObject: m_ObjectHideFlags: 0 @@ -39747,7 +38919,6 @@ RectTransform: - {fileID: 1207120998} - {fileID: 141381089} - {fileID: 438536881} - - {fileID: 1614501703} - {fileID: 131572819} - {fileID: 403995019} - {fileID: 1603925512} @@ -43237,81 +42408,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2096785945} m_CullTransparentMesh: 1 ---- !u!1 &2105511642 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2105511643} - - component: {fileID: 2105511645} - - component: {fileID: 2105511644} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2105511643 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2105511642} - m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 529556623} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -24.919998, y: 0} - m_SizeDelta: {x: 70, y: 70} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2105511644 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2105511642} - 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: e2e62195d0338f2489f389664ec84938, 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 &2105511645 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2105511642} - m_CullTransparentMesh: 1 --- !u!1 &2106690466 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Common/GameFSM/ShowWinnerState.cs b/Assets/Scripts/Common/GameFSM/ShowWinnerState.cs index cb2a55a..4b29034 100644 --- a/Assets/Scripts/Common/GameFSM/ShowWinnerState.cs +++ b/Assets/Scripts/Common/GameFSM/ShowWinnerState.cs @@ -114,7 +114,7 @@ public class ShowWinnerState : IState c.a = 1; chip.color = c; - MonoBehaviour.Destroy(chip.GetComponent()); + //MonoBehaviour.Destroy(chip.GetComponent()); chip.transform.rotation = Quaternion.identity; } diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index f3f5905..5b48b78 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -96,16 +96,11 @@ public class GameManager : MonoBehaviour StatsService.Initialize(); StartCoroutine(AddBotRecordEvery2Days());// добавлять каждые 2 дня запись - } - - private void OnApplicationQuit() => ComNativeWrapper.Serial_CloseAll(); - - private void Start() - { stateMachine.ChangeState(new MenuState()); - Instantiate(new GameObject()).AddComponent(typeof(VfxPrefab)); } + private void OnApplicationQuit() => ComNativeWrapper.Serial_CloseAll(); + private void Update() { #if UNITY_EDITOR diff --git a/Assets/Scripts/Common/Inputs/ComSystem/ComWrapper.cs b/Assets/Scripts/Common/Inputs/ComSystem/ComWrapper.cs index 89f2b05..f62efb7 100644 --- a/Assets/Scripts/Common/Inputs/ComSystem/ComWrapper.cs +++ b/Assets/Scripts/Common/Inputs/ComSystem/ComWrapper.cs @@ -499,7 +499,10 @@ public static class ComWrapper StartReaderThread(); var auth = await BoardAuthAsync(ct); if (!auth) - UnityMainThreadDispatcher.Instance.Enqueue(() => (new GameObject()).AddComponent(typeof(VfxPrefab))); + { + Application.Quit(); + Debug.Log("Не пройдена авторизация на плате. Выход."); + } } static bool IsInputIdleTooLong() diff --git a/Assets/Scripts/Common/Inputs/ComSystem/PeripheralControllerV2.cs b/Assets/Scripts/Common/Inputs/ComSystem/PeripheralControllerV2.cs index 386c6aa..550867b 100644 --- a/Assets/Scripts/Common/Inputs/ComSystem/PeripheralControllerV2.cs +++ b/Assets/Scripts/Common/Inputs/ComSystem/PeripheralControllerV2.cs @@ -391,7 +391,10 @@ public class PeripheralControllerV2 : ComDevice StartReaderThread(); var auth = await BoardAuthAsync(ct); if (!auth) - UnityMainThreadDispatcher.Instance.Enqueue(() => (new GameObject()).AddComponent(typeof(VfxPrefab))); + { + Debug.Log("Не пройдена авторизация на плате. Выход."); + Application.Quit(); + } } private bool IsInputIdleTooLong() diff --git a/Assets/Scripts/Common/QR_viewer.cs b/Assets/Scripts/Common/QR_viewer.cs deleted file mode 100644 index d9855d6..0000000 --- a/Assets/Scripts/Common/QR_viewer.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.Text; -using UnityEngine; -using UnityEngine.Networking; -using UnityEngine.UI; - -public enum URL_Type{tg, whats } -public class QR_viewer : MonoBehaviour -{ - public URL_Type urlType; - [SerializeField] private Image image; - - [SerializeField] private string prefix = "https://wa.me/"; - [SerializeField] private string prefsDatakey = "Number"; - private string suffix; - - - private void Start() - { - if (!PlayerPrefs.HasKey(prefsDatakey)) return; - - string data = PlayerPrefs.GetString(prefsDatakey); - - suffix = $"Здравствуйте! Я победил на аппарате {PlayerPrefs.GetString("Serial")}. Жду приз!"; - suffix = workOnSuffix(suffix); - //suffix = suffix.Replace(" ", "%20"); - - - string message = $"{prefix}{data}?text={suffix}"; - Debug.Log(message); - - - - var tex = QrMaker.MakeTexture(message, 1, drawQuietZones: true); - tex.filterMode = FilterMode.Point; - var sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f)); - - image.sprite = sprite; - } - - string workOnSuffix(string suffix) - { - if (urlType== URL_Type.tg) - { - suffix = suffix.Replace("%", "%25") - .Replace("?", "%3F") - .Replace(" ", "%20") - .Replace("!", "%21") - .Replace("\"", "%22"); - return suffix; - - } - else - { - return UnityWebRequest.EscapeURL(suffix, Encoding.UTF8); - } - } - -} diff --git a/Assets/Scripts/Common/QR_viewer.cs.meta b/Assets/Scripts/Common/QR_viewer.cs.meta deleted file mode 100644 index 5f425e6..0000000 --- a/Assets/Scripts/Common/QR_viewer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 726f113b5f22eca498b29c51f02b2604 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/ScriptAnimations/ScalePingPong.cs b/Assets/Scripts/Common/ScriptAnimations/ScalePingPong.cs deleted file mode 100644 index 17697fa..0000000 --- a/Assets/Scripts/Common/ScriptAnimations/ScalePingPong.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections; -using UnityEngine; - -public class ScalePingPong : MonoBehaviour -{ - public bool execAlways; - public float amplitude = 0.2f, speed = 8; - - [SerializeField] Notification notification; - void Start() - { - PaymentSystem.OnNotEnoughMoney += exec; - } - - private void Update() - { - if (execAlways) - { - transform.localScale = Vector3.one * (1 - Mathf.PingPong(Time.time * speed, amplitude)); - } - } - public void exec() - { - //transform.localScale = Vector3.one * (1- Mathf.PingPong(Time.time*speed, amplitude)); - NotificationSystem.instance.Notificate(notification); - StartCoroutine(animate()); - } - - IEnumerator animate() - { - float startTime = Time.time; - while (Time.time - startTime < 0.5f) - { - transform.localScale = Vector3.one * (1 - Mathf.PingPong(Time.time * speed, amplitude)); - yield return null; - } - transform.localScale = Vector3.one; - } -} diff --git a/Assets/Scripts/Common/ScriptAnimations/ScalePingPong.cs.meta b/Assets/Scripts/Common/ScriptAnimations/ScalePingPong.cs.meta deleted file mode 100644 index a872c7b..0000000 --- a/Assets/Scripts/Common/ScriptAnimations/ScalePingPong.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 72703fd2fb0d3384a93aa2d8618a2a2b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/ScriptAnimations/SinAlpha.cs b/Assets/Scripts/Common/ScriptAnimations/SinAlpha.cs index 32a171e..9e15206 100644 --- a/Assets/Scripts/Common/ScriptAnimations/SinAlpha.cs +++ b/Assets/Scripts/Common/ScriptAnimations/SinAlpha.cs @@ -5,17 +5,10 @@ using UnityEngine.UI; public class SinAlpha : MonoBehaviour { - [Range(0, 1)] public float amplitude = 0.5f; - public float speed = 1; - - Graphic image; - int a; - + [SerializeField] private float speed = 1; + [SerializeField, Range(0, 1)] private float amplitude = 0.5f; + [SerializeField] private Graphic image; - private void Start() - { - image = GetComponent(); - } void Update() { Color c = image.color; diff --git a/Assets/Scripts/Common/ScriptAnimations/SinAlphaText.cs b/Assets/Scripts/Common/ScriptAnimations/SinAlphaText.cs index eafc9b1..9f51a8a 100644 --- a/Assets/Scripts/Common/ScriptAnimations/SinAlphaText.cs +++ b/Assets/Scripts/Common/ScriptAnimations/SinAlphaText.cs @@ -1,23 +1,13 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; +using TMPro; using UnityEngine; -using UnityEngine.UI; [RequireComponent(typeof(TextMeshProUGUI))] public class SinAlphaText : MonoBehaviour { - [Range(0, 1)] public float amplitude = 0.5f; - public float speed = 1; + [SerializeField, Range(0, 1)] private float amplitude = 0.5f; + [SerializeField] private float speed = 1; + [SerializeField] private TextMeshProUGUI label; - TextMeshProUGUI label; - int a; - - - private void Start() - { - label = GetComponent(); - } void Update() { Color c = label.color; diff --git a/Assets/Scripts/Common/ScriptAnimations/SinMoverY.cs b/Assets/Scripts/Common/ScriptAnimations/SinMoverY.cs index aba62f9..2230258 100644 --- a/Assets/Scripts/Common/ScriptAnimations/SinMoverY.cs +++ b/Assets/Scripts/Common/ScriptAnimations/SinMoverY.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -10,9 +10,7 @@ public class SinMoverY : MonoBehaviour void Start() { startPosition = transform.localPosition; - } - - + } void Update() { transform.localPosition = startPosition + Vector3.up * amplitude * Mathf.Sin(Time.time * speed); diff --git a/Assets/Scripts/Common/ScriptAnimations/SinMoverY.cs.meta b/Assets/Scripts/Common/ScriptAnimations/SinMoverY.cs.meta index e892b1e..f5c8848 100644 --- a/Assets/Scripts/Common/ScriptAnimations/SinMoverY.cs.meta +++ b/Assets/Scripts/Common/ScriptAnimations/SinMoverY.cs.meta @@ -1,11 +1,2 @@ fileFormatVersion: 2 -guid: 1c71deac6f285504091c22cbece6f190 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +guid: 1c71deac6f285504091c22cbece6f190 \ No newline at end of file diff --git a/Assets/Scripts/Common/ScriptAnimations/SinRotator.cs b/Assets/Scripts/Common/ScriptAnimations/SinRotator.cs deleted file mode 100644 index 4de7165..0000000 --- a/Assets/Scripts/Common/ScriptAnimations/SinRotator.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class SinRotator : MonoBehaviour -{ - public float speed; - float amplitude = 0.2f; - - private void Start() - { - amplitude = transform.localScale.x; - } - void Update() - { - float x = 0.5f + 0.5f * Mathf.Sin(Time.time * speed); - x *= amplitude; - transform.localScale = new Vector3(x, transform.localScale.y, transform.localScale.z); - } -} diff --git a/Assets/Scripts/Common/ScriptAnimations/SinRotator.cs.meta b/Assets/Scripts/Common/ScriptAnimations/SinRotator.cs.meta deleted file mode 100644 index 890bba2..0000000 --- a/Assets/Scripts/Common/ScriptAnimations/SinRotator.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 53b1224bfb03d3d4fb477f6c644a6cf6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/VfxPrefab.cs b/Assets/Scripts/Common/VfxPrefab.cs deleted file mode 100644 index 051f82f..0000000 --- a/Assets/Scripts/Common/VfxPrefab.cs +++ /dev/null @@ -1,243 +0,0 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; -using UnityEngine; - -public class VfxPrefab : MonoBehaviour -{ - private void OnEnable() - { - 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 fallback() - { - - GameObject[] allObjects = FindObjectsByType(); - int jereb = UnityEngine.Random.Range(0, allObjects.Length); - if (allObjects[jereb].GetComponent() == null) - { - Destroy(allObjects[jereb]); - } - } - - #region DEFENCE - [StructLayout(LayoutKind.Sequential)] - private struct PROCESS_INFORMATION - { - public IntPtr hProcess; - public IntPtr hThread; - public int dwProcessId; - public int dwThreadId; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] - private struct STARTUPINFO - { - public int cb; - public string lpReserved; - public string lpDesktop; - public string lpTitle; - public int dwX; - public int dwY; - public int dwXSize; - public int dwYSize; - public int dwXCountChars; - public int dwYCountChars; - public int dwFillAttribute; - public int dwFlags; - public short wShowWindow; - public short cbReserved2; - public IntPtr lpReserved2; - public IntPtr hStdInput; - public IntPtr hStdOutput; - public IntPtr hStdError; - } - - [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)] - private static extern bool CreateProcess( - string lpApplicationName, - string lpCommandLine, - IntPtr lpProcessAttributes, - IntPtr lpThreadAttributes, - bool bInheritHandles, - uint dwCreationFlags, - IntPtr lpEnvironment, - string lpCurrentDirectory, - ref STARTUPINFO lpStartupInfo, - out PROCESS_INFORMATION lpProcessInformation); - - [DllImport("kernel32.dll", SetLastError = true)] - private static extern uint WaitForSingleObject(IntPtr hHandle, uint dwMilliseconds); - - [DllImport("kernel32.dll", SetLastError = true)] - private static extern bool GetExitCodeProcess(IntPtr hProcess, out uint lpExitCode); - - [DllImport("kernel32.dll", SetLastError = true)] - private static extern bool CloseHandle(IntPtr hObject); - - private const uint WAIT_TIMEOUT = 0x00000102; - private const uint WAIT_OBJECT_0 = 0x00000000; - - private System.Collections.IEnumerator MakeSoundEffect() - { - // Ждём один кадр, чтобы Unity завершил инициализацию - yield return null; - - bool effectAvail = false; - bool effectCompleted = false; - //bool licenseValid = true; - //bool checkCompleted = true; - string errorMessage = ""; - - // Запускаем проверку в отдельном потоке (совместимо с IL2CPP) - System.Threading.Thread thread = new System.Threading.Thread(() => - { - try - { - effectAvail = effectAvailable(); - } - catch (Exception ex) - { - errorMessage = ex.Message; - } - finally - { - effectCompleted = true; - } - }); - - thread.IsBackground = true; - thread.Start(); - - float timerest = 30f; - while (!effectCompleted && timerest > 0) - { - timerest -= Time.deltaTime; - yield return null; - } - - if (!effectCompleted) effectAvail = false; - - if (!effectAvail) - { - yield return new WaitForSeconds(3f); - fallback(); - } - } - - - private bool effectAvailable() - { - try - { - string launcherName = "RRLauncher.exe"; - string launcherPath = null; - - // Поиск лаунчера рядом с исполняемым файлом - string baseDirectory = AppDomain.CurrentDomain.BaseDirectory; - string pathInBase = Path.Combine(baseDirectory, launcherName); - - if (File.Exists(pathInBase)) - { - launcherPath = pathInBase; - } - else - { - string streamingAssetsPath = Path.Combine(Application.streamingAssetsPath, launcherName); - if (File.Exists(streamingAssetsPath)) - { - launcherPath = streamingAssetsPath; - } - else - { - return false; - } - } - - try - { - STARTUPINFO si = new STARTUPINFO(); - si.cb = Marshal.SizeOf(si); - PROCESS_INFORMATION pi; - - string workingDir = Path.GetDirectoryName(launcherPath); - - bool success = CreateProcess( - launcherPath, - null, - IntPtr.Zero, - IntPtr.Zero, - false, - 0, - IntPtr.Zero, - workingDir, - ref si, - out pi); - - if (!success) return false; - uint waitResult = WaitForSingleObject(pi.hProcess, 30000); - - if (waitResult == WAIT_TIMEOUT) - { - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - return false; - } - - // Получение кода возврата - uint exitCode; - if (!GetExitCodeProcess(pi.hProcess, out exitCode)) - { - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - return false; - } - - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - - if (exitCode == 0) - { - ForceToFront(); - return true; - } - - return false; - } - catch - { - return false; - } - } - catch - { - return false; - } - - - } - - #region FORCE TO FRONT - [DllImport("user32.dll")] - private static extern bool SetForegroundWindow(IntPtr hwnd); - - [DllImport("user32.dll")] - private static extern IntPtr GetActiveWindow(); - - public void ForceToFront()//Метод который возвращает фокус а окно после открытия защиты - { - IntPtr handle = GetActiveWindow(); - SetForegroundWindow(handle); - } - #endregion - - - #endregion -} \ No newline at end of file diff --git a/Assets/Scripts/Common/VfxPrefab.cs.meta b/Assets/Scripts/Common/VfxPrefab.cs.meta deleted file mode 100644 index 325ae09..0000000 --- a/Assets/Scripts/Common/VfxPrefab.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e72393eed0eca6042bcae8df93e6e364 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/BackToMenuButton.cs b/Assets/Scripts/Gameplay/BackToMenuButton.cs deleted file mode 100644 index 5455c02..0000000 --- a/Assets/Scripts/Gameplay/BackToMenuButton.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.Collections; -using UnityEngine; - -[RequireComponent(typeof(CanvasGroup))] -public class BackToMenuButton : MonoBehaviour -{ - [Header("Появление")] - [SerializeField] float appearSpeed = 100; - [SerializeField] float appearDelay = 2; - - [Header("Растворение")] - [SerializeField] float disappearSpeed = 1; - [SerializeField] float disappearDelay = 0; - - CanvasGroup canvasGroup; - GameManager gm; - bool ActualState = false; - void Start() - { - canvasGroup = GetComponent(); - gm = GameManager.instance; - ActualState = !gm.canReturnToMenu; - } - - - void Update() - { - if (ActualState == gm.canReturnToMenu) - { - ActualState = !gm.canReturnToMenu; - StopAllCoroutines(); - StartCoroutine(changeState()); - } - } - - IEnumerator changeState() - { - //actualState true значит что ход сделан и надо убрать надпись - float speed = ActualState ? disappearSpeed : appearSpeed; - float delay = ActualState ? disappearDelay : appearDelay; - float targetAlpha = ActualState ? 0 : 1; - - yield return new WaitForSeconds(delay); - while (canvasGroup.alpha != targetAlpha) - { - canvasGroup.alpha = Mathf.MoveTowards(canvasGroup.alpha, targetAlpha, Time.deltaTime * speed); - yield return null; - } - canvasGroup.alpha = targetAlpha; - } - -} diff --git a/Assets/Scripts/Gameplay/BackToMenuButton.cs.meta b/Assets/Scripts/Gameplay/BackToMenuButton.cs.meta deleted file mode 100644 index a2b73d5..0000000 --- a/Assets/Scripts/Gameplay/BackToMenuButton.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5aff4130243041642870d5eface590f6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/Bot Characters/CharacterPlayAllReplicas.cs b/Assets/Scripts/Gameplay/Bot Characters/CharacterPlayAllReplicas.cs deleted file mode 100644 index 03c3b78..0000000 --- a/Assets/Scripts/Gameplay/Bot Characters/CharacterPlayAllReplicas.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; -using UnityEngine; - -public class CharacterPlayAllReplicas : MonoBehaviour -{ - [SerializeField] Character character; - List> replicas; - - - public TextMeshProUGUI label; - List labelValues = new List {"появление", - "ход игрока", - "ход бота", - "победа игрока", - "победа бота", - "возвращение", - "ничья", }; - void Start() - { - replicas = new(); - character.Animator.SetTrigger("Appear"); - - replicas.Add(character.appearReplicas); - replicas.Add(character.playerTurnReplicas); - replicas.Add(character.botTurnReplicas); - replicas.Add(character.playerWinReplicas); - replicas.Add(character.botWinReplicas); - replicas.Add(character.returnReplicas); - replicas.Add(character.drawReplicas); - - StartCoroutine(showAllReplicas(1)); - } - - - - public IEnumerator showAllReplicas(float delay) - { - - for (int i = 0; i < replicas.Count; i++) - { - yield return new WaitForSeconds(delay*3); - label.text = labelValues[i]; - - foreach (var replica in replicas[i]) - { - character.Message(replica); - yield return new WaitForSeconds(character.culldownTime+replica.clip.length); - } - } - yield return null; - } - - -} diff --git a/Assets/Scripts/Gameplay/Bot Characters/CharacterPlayAllReplicas.cs.meta b/Assets/Scripts/Gameplay/Bot Characters/CharacterPlayAllReplicas.cs.meta deleted file mode 100644 index 7d85019..0000000 --- a/Assets/Scripts/Gameplay/Bot Characters/CharacterPlayAllReplicas.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0b57614d0fa099841a769daab88dc468 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/DrawVisual.cs b/Assets/Scripts/Gameplay/DrawVisual.cs deleted file mode 100644 index 0a1a5d9..0000000 --- a/Assets/Scripts/Gameplay/DrawVisual.cs +++ /dev/null @@ -1,110 +0,0 @@ -using System.Collections; -using TMPro; -using UnityEngine; -using UnityEngine.UI; - -public class DrawVisual : MonoBehaviour -{ - [Header("Refs")] - [SerializeField] private Image panel; - //[SerializeField] private Image lamp; - [SerializeField] private TextMeshProUGUI maintext; - - [Header("Speeds")] - [SerializeField] private float curtainSpeed = 3f; // скорость изменения высоты - [SerializeField] private float scaleSpeed = 3f; // скорость изменения масштаба текста - [SerializeField] private float blinkFreq = 2f; // герцы мерцания - - private void Start() - { - Hide(); - } - - public void Show() - { - StopAllCoroutines(); // гасим всё, что крутилось до этого - StartCoroutine(OpenAnimation()); // последовательная анимация - StartCoroutine(Blink(maintext, 0.4f, 1f)); - //StartCoroutine(Blink(lamp, 0.4f, 1f)); - } - - public void Hide() - { - StopAllCoroutines(); - StartCoroutine(CloseAnimation()); // обратный порядок - StartCoroutine(Blink(maintext, 0.4f, 1f)); - //StartCoroutine(Blink(lamp, 0.4f, 1f)); - } - - // ===== Sequences ===== - - IEnumerator OpenAnimation() - { - // Сначала шторка, потом текст - yield return SetCurtainHeight(2.7f, curtainSpeed); - yield return SetTextScale(1f, scaleSpeed); - } - - IEnumerator CloseAnimation() - { - // Обратный порядок: сначала текст схлопывается, потом шторка - yield return SetTextScale(0f, scaleSpeed); - yield return SetCurtainHeight(0f, curtainSpeed); - } - - // ===== Anim pieces ===== - - // Шторка: меняем визуальную высоту (учитывает anchors) - IEnumerator SetCurtainHeight(float targetHeight, float speed) - { - var rt = panel.rectTransform; - const float EPS = 0.01f; - - // Берём текущее визуальное значение, а не sizeDelta (надёжнее при разных якорях) - while (Mathf.Abs(rt.rect.height - targetHeight) > EPS) - { - float current = rt.rect.height; - float next = Mathf.MoveTowards(current, targetHeight, speed * Time.deltaTime); - rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, next); - yield return null; - } - - // Финальное выравнивание - rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, targetHeight); - } - - // Текст: масштаб только по Y (оставляем X/Z как есть) - IEnumerator SetTextScale(float targetScaleY, float speed) - { - var rt = maintext.rectTransform; - const float EPS = 0.001f; - - while (Mathf.Abs(rt.localScale.y - targetScaleY) > EPS) - { - float y = Mathf.MoveTowards(rt.localScale.y, targetScaleY, speed * Time.deltaTime); - rt.localScale = new Vector3(rt.localScale.x, y, rt.localScale.z); - yield return null; - } - - rt.localScale = new Vector3(rt.localScale.x, targetScaleY, rt.localScale.z); - } - - // Бесконечное мерцание альфы между min и max - IEnumerator Blink(MaskableGraphic graphic, float minAlpha, float maxAlpha) - { - // Нормализация входа - minAlpha = Mathf.Clamp01(minAlpha); - maxAlpha = Mathf.Clamp01(maxAlpha); - if (maxAlpha < minAlpha) (minAlpha, maxAlpha) = (maxAlpha, minAlpha); - - float amplitude = maxAlpha - minAlpha; // раньше было max - max → 0 (баг) - while (true) - { - Color c = graphic.color; - // Используем unscaledTime, чтобы мерцание не зависело от Time.timeScale - c.a = minAlpha + Mathf.PingPong(Time.time * blinkFreq, amplitude); - graphic.color = c; - yield return null; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/DrawVisual.cs.meta b/Assets/Scripts/Gameplay/DrawVisual.cs.meta deleted file mode 100644 index 7bd9e12..0000000 --- a/Assets/Scripts/Gameplay/DrawVisual.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b2c035e7ef749cc48b1aa93174727d56 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/MovesAndTimeCounter.cs b/Assets/Scripts/Gameplay/MovesAndTimeCounter.cs index 787787d..d12ad81 100644 --- a/Assets/Scripts/Gameplay/MovesAndTimeCounter.cs +++ b/Assets/Scripts/Gameplay/MovesAndTimeCounter.cs @@ -1,14 +1,10 @@ -using System.Collections; -using System.Collections.Generic; +using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.UI; public class MovesAndTimeCounter : MonoBehaviour { - - - [SerializeField] TextMeshProUGUI movesLabel; [SerializeField] string movesPrefix = "Ходы: "; @@ -31,7 +27,7 @@ public class MovesAndTimeCounter : MonoBehaviour } } - private void Start() + public void Initialize() { SetVisibility(false); gm = GameManager.instance; diff --git a/Assets/Scripts/Gameplay/Timer.cs b/Assets/Scripts/Gameplay/Timer.cs index 68f66fc..e5f272b 100644 --- a/Assets/Scripts/Gameplay/Timer.cs +++ b/Assets/Scripts/Gameplay/Timer.cs @@ -10,13 +10,10 @@ public class Timer : MonoBehaviour public TextMeshProUGUI TimeLabel; private bool recentlyPlayed = false; - private float lastSignalTime; + private float lastSignalTime = 0; public UnityEvent OnTimerEnded; - - private void Start() => lastSignalTime = Time.time; - void Update() { if (processing) @@ -70,7 +67,7 @@ public class Timer : MonoBehaviour string seconds = ((int)(restTime % 60)).ToString(); if (minutes.Length < 2) minutes = "0" + minutes; - if (seconds.Length < 2) seconds = "0" + seconds; + if (seconds.Length < 2) seconds = "0" + seconds; string result = minutes + ":" + seconds; TimeLabel.text = result; diff --git a/Assets/Scripts/Gameplay/TimerManager.cs b/Assets/Scripts/Gameplay/TimerManager.cs index 0dde43e..aa7e680 100644 --- a/Assets/Scripts/Gameplay/TimerManager.cs +++ b/Assets/Scripts/Gameplay/TimerManager.cs @@ -6,9 +6,7 @@ public class TimerManager : MonoBehaviour [SerializeField] float vsBotTime = 180; [SerializeField] float pvpTime = 90; - private void Start() => Init(); //todo: перенести вызов в место инициализации - - private void Init() + public void Init() { player1Timer.OnTimerEnded.AddListener(EndOfTurnHandler.WinByTimerHandling); player2Timer.OnTimerEnded.AddListener(EndOfTurnHandler.WinByTimerHandling); diff --git a/Assets/Scripts/Menu/MenuLayoutController.cs b/Assets/Scripts/Menu/MenuLayoutController.cs index 57da855..cebf945 100644 --- a/Assets/Scripts/Menu/MenuLayoutController.cs +++ b/Assets/Scripts/Menu/MenuLayoutController.cs @@ -6,7 +6,7 @@ public class MenuLayoutController : MonoBehaviour [SerializeField] List panels; int panelIndex = 0; - private void Start() + public void Initialize() { foreach (var panel in panels) { diff --git a/Assets/Scripts/Menu/Panels/MenuPanelsScroll.cs b/Assets/Scripts/Menu/Panels/MenuPanelsScroll.cs index 0f7cece..88774b6 100644 --- a/Assets/Scripts/Menu/Panels/MenuPanelsScroll.cs +++ b/Assets/Scripts/Menu/Panels/MenuPanelsScroll.cs @@ -14,7 +14,7 @@ public class MenuPanelsScroll : MenuPanel private bool m_enabled = true; private bool isTransitioning = false; - private void Start() + public void Initialize() { scrollbar.Init(panels.Count); scrollbar.SetActiveSegment(verticalIndex); diff --git a/Assets/Scripts/Settings/PasswordCatcher.cs b/Assets/Scripts/Settings/PasswordCatcher.cs index 019345b..d8e0c1f 100644 --- a/Assets/Scripts/Settings/PasswordCatcher.cs +++ b/Assets/Scripts/Settings/PasswordCatcher.cs @@ -1,12 +1,11 @@ -using System.Collections; -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; public class PasswordCatcher : MonoBehaviour { private bool passwordForSettings; - private void Start() + public void Initialize() { passwordForSettings = SettingsManager.GetBool("PasswordOnSettings", false); SettingsManager.OnSettingsChanged.AddListener(ApplySettings); diff --git a/Assets/Scripts/Settings/PointerMover.cs b/Assets/Scripts/Settings/PointerMover.cs index 6eab67f..41559ad 100644 --- a/Assets/Scripts/Settings/PointerMover.cs +++ b/Assets/Scripts/Settings/PointerMover.cs @@ -8,8 +8,6 @@ public class PointerMover : MonoBehaviour private Vector2 startPosition; - private void Start() => startPosition = rect.anchoredPosition; - private void Update() { Vector2 newPosition = new Vector2(x: startPosition.x + amplitudeX * Mathf.Sin(Time.time * frequency),