diff --git a/Assets/Fonts/NEW/NexaRegular COOL.asset b/Assets/Fonts/NEW/NexaRegular COOL.asset index a79aef7..bfeb5d3 100644 --- a/Assets/Fonts/NEW/NexaRegular COOL.asset +++ b/Assets/Fonts/NEW/NexaRegular COOL.asset @@ -11349,7 +11349,7 @@ Material: - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - - _GlowColor: {r: 0, g: 0.41374302, b: 1, a: 1} + - _GlowColor: {r: 0, g: 0.32679558, b: 1, a: 1} - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - _OutlineColor: {r: 0.554717, g: 0.554717, b: 0.554717, a: 1} - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Prefabs/ChipBot.prefab b/Assets/Prefabs/ChipBot.prefab index 9c671b5..49df3ef 100644 --- a/Assets/Prefabs/ChipBot.prefab +++ b/Assets/Prefabs/ChipBot.prefab @@ -115,7 +115,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.15, y: 1.15, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1891433078102213312} diff --git a/Assets/Prefabs/ChipPlayer1.prefab b/Assets/Prefabs/ChipPlayer1.prefab index 830c574..24db8b1 100644 --- a/Assets/Prefabs/ChipPlayer1.prefab +++ b/Assets/Prefabs/ChipPlayer1.prefab @@ -28,9 +28,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4478126490810938235} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.15, y: 1.15, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1661318112489111391} diff --git a/Assets/Prefabs/ChipPlayer2.prefab b/Assets/Prefabs/ChipPlayer2.prefab index fb677ce..59d8571 100644 --- a/Assets/Prefabs/ChipPlayer2.prefab +++ b/Assets/Prefabs/ChipPlayer2.prefab @@ -114,7 +114,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.15, y: 1.15, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1891433078102213312} diff --git a/Assets/Scenes/GameScene3D.unity b/Assets/Scenes/GameScene3D.unity index a864426..93bb428 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -5926,8 +5926,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0427b50b8b84b5641a0188046aaee227, type: 3} m_Name: m_EditorClassIdentifier: - Rows: 7 - Cols: 7 + Rows: 5 + Cols: 6 botsAmount: 5 boardVersion: 1 stateMachine: {fileID: 259182281} @@ -5975,8 +5975,8 @@ MonoBehaviour: winPanel: {fileID: 1029921558} currentPlayer: 1 currentColumnIndex: 0 - stepX: 1.215 - stepY: 1.24 + stepX: 1.444 + stepY: 1.48 startY: 5 moveMade: 0 chipXSpeed: 50 @@ -16934,11 +16934,11 @@ Transform: m_GameObject: {fileID: 687989433} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.641001, y: 4.176, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -3.5960007, y: 1.9109998, z: 0} + m_LocalScale: {x: 1.4894733, y: 1.4894733, z: 1.4894733} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1346276943} + m_Father: {fileID: 1551328425} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &693044068 GameObject: @@ -17865,6 +17865,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 746197055} m_CullTransparentMesh: 1 +--- !u!1 &751469592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 751469593} + - component: {fileID: 751469594} + m_Layer: 0 + m_Name: pole_6x5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &751469593 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 751469592} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1.04, z: 0} + m_LocalScale: {x: 1.4894733, y: 1.4894733, z: 1.4894733} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1751843760} + - {fileID: 1378069366} + m_Father: {fileID: 1551328425} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &751469594 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 751469592} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 500331691 + m_SortingLayer: 3 + m_SortingOrder: 21 + m_Sprite: {fileID: 21300000, guid: 14f1034d45abde34eacd201c98d09c4b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.24, y: 10.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &755891855 GameObject: m_ObjectHideFlags: 0 @@ -33356,8 +33442,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.049999237, y: 4.4900007} - m_SizeDelta: {x: -1, y: 0.4100001} + m_AnchoredPosition: {x: -0.049999, y: 3.6678} + m_SizeDelta: {x: -1, y: 0.5238} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1072006380 MonoBehaviour: @@ -40270,7 +40356,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1346276943 Transform: m_ObjectHideFlags: 0 @@ -40283,11 +40369,7 @@ Transform: m_LocalPosition: {x: 0.004, y: -1.149, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1751843760} - - {fileID: 1378069366} - - {fileID: 1749880614} - - {fileID: 687989434} + m_Children: [] m_Father: {fileID: 1551328425} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1346276944 @@ -40805,12 +40887,12 @@ Transform: m_GameObject: {fileID: 1378069365} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.004, y: 0.694, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0.39275622, z: 0} + m_LocalScale: {x: 0.67137825, y: 0.67137825, z: 0.67137825} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 825470170} - m_Father: {fileID: 1346276943} + m_Father: {fileID: 751469593} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!199 &1378069367 ParticleSystemRenderer: @@ -49252,6 +49334,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1346276943} + - {fileID: 687989434} + - {fileID: 751469593} - {fileID: 2081516970} - {fileID: 266844764} - {fileID: 1413855152} @@ -52866,107 +52950,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1746408321} m_CullTransparentMesh: 1 ---- !u!1 &1749880613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1749880614} - - component: {fileID: 1749880617} - - component: {fileID: 1749880616} - - component: {fileID: 1749880615} - m_Layer: 0 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1749880614 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1749880613} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 8.86, y: 7.83, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1346276943} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.0040016174, y: 0.9340001} - m_SizeDelta: {x: 1, y: 0.94} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1749880615 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1749880613} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1749880616 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1749880613} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!223 &1749880617 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1749880613} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 519420031} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: -2009484265 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!1 &1751843759 GameObject: m_ObjectHideFlags: 0 @@ -52993,12 +52976,12 @@ Transform: m_GameObject: {fileID: 1751843759} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.042600922, y: 0.0654, z: 0} - m_LocalScale: {x: 1.0805469, y: 1.2613384, z: 1} + m_LocalPosition: {x: -0.02591582, y: -0.1875, z: 0} + m_LocalScale: {x: 0.72545564, y: 0.81592566, z: 0.67137825} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1050612130} - m_Father: {fileID: 1346276943} + m_Father: {fileID: 751469593} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1751843761 SpriteRenderer: @@ -54286,8 +54269,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 8.7609} - m_SizeDelta: {x: 9.91, y: 2.6268} + m_AnchoredPosition: {x: -0.0103, y: 8.06} + m_SizeDelta: {x: 9.8895, y: 2.6268} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1788801327 MonoBehaviour: diff --git a/Assets/Scripts/GameFSM/PositioningState.cs b/Assets/Scripts/GameFSM/PositioningState.cs index fe677e4..7603680 100644 --- a/Assets/Scripts/GameFSM/PositioningState.cs +++ b/Assets/Scripts/GameFSM/PositioningState.cs @@ -51,6 +51,7 @@ public class PositioningState : IState //настройка указателя куда упадет фишка chipPointer = new GameObject("Pointer").transform; chipPointer.position = new Vector3(100, 100); + chipPointer.localScale = new Vector2(1.15f, 1.15f); chipPointer.gameObject.SetActive(false); pointerRend = chipPointer.AddComponent(); pointerRend.enabled = false; diff --git a/Assets/Scripts/Inputs/ComSystem/ComWrapper.cs b/Assets/Scripts/Inputs/ComSystem/ComWrapper.cs index a6e923b..9df6160 100644 --- a/Assets/Scripts/Inputs/ComSystem/ComWrapper.cs +++ b/Assets/Scripts/Inputs/ComSystem/ComWrapper.cs @@ -32,27 +32,6 @@ public static class ComWrapper private static int _lastInputTick = 0; private const int INPUT_IDLE_BEFORE_PING_MS = 60_000;//1 минута - - - //public static void Initialize(string[] availablePorts, int boardVersion)//Добавить логгер в конструктор - //{ - // BoardVersion = boardVersion; - // AvailablePorts = availablePorts; - - // if (_lifetimeCts != null) return; - // _ = OpenPortAsync(AvailablePorts); - // if (h <= 0) - // { - // Log("Порт не открылся при инициализации"); - // return; - // } - // UnityMainThreadDispatcher.Initialize(); - // _lifetimeCts = new CancellationTokenSource(); - - - // StartReaderThread(); - // _ = SetupBoardAsync(_lifetimeCts.Token); - //} public static void Initialize(string port, int boardVersion)//Добавить логгер в конструктор { BoardVersion = boardVersion; diff --git a/Assets/Sprites/Graphics/pole_6x5.png b/Assets/Sprites/Graphics/pole_6x5.png new file mode 100644 index 0000000..ed49218 Binary files /dev/null and b/Assets/Sprites/Graphics/pole_6x5.png differ diff --git a/Assets/Sprites/Graphics/pole_6x5.png.meta b/Assets/Sprites/Graphics/pole_6x5.png.meta new file mode 100644 index 0000000..458b237 --- /dev/null +++ b/Assets/Sprites/Graphics/pole_6x5.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 14f1034d45abde34eacd201c98d09c4b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: