diff --git a/Assets/MinimapStatrScript.cs b/Assets/MinimapStatrScript.cs new file mode 100644 index 00000000..ae4db1c6 --- /dev/null +++ b/Assets/MinimapStatrScript.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +public class MinimapStatrScript : MonoBehaviour +{ + [SerializeField] private FollowTarget _FollowTarget; + [SerializeField] private FollowYRotation _FollowYRotation; + + [SerializeField] private SelectCarGameScript _SelectCarGameScript; + + private void Start() + { + _FollowTarget.target = _SelectCarGameScript._CurrentCar.transform; + _FollowYRotation.target = _SelectCarGameScript._CurrentCar.transform; + } +} diff --git a/Assets/MinimapStatrScript.cs.meta b/Assets/MinimapStatrScript.cs.meta new file mode 100644 index 00000000..b7d6111a --- /dev/null +++ b/Assets/MinimapStatrScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 360a3284708e1bf41935c0de6925329f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Racing_Game/Data/Scripts/Start/Starter.cs b/Assets/Racing_Game/Data/Scripts/Start/Starter.cs index 23fafecf..74a88d30 100644 --- a/Assets/Racing_Game/Data/Scripts/Start/Starter.cs +++ b/Assets/Racing_Game/Data/Scripts/Start/Starter.cs @@ -19,25 +19,13 @@ public class Starter : MonoBehaviour { _timer.text = _starter.ToString(); - if (StaticDataMap.NumPlayer == 1) - { - DontMovePlayer[0].DeactivateInput(); - } - else - { - DontMovePlayer[0].DeactivateInput(); - DontMovePlayer[1].DeactivateInput(); - } - - _borders.enabled = true; - } void Update() { _starter -= Time.deltaTime; _timer.text = Mathf.Round(_starter).ToString(); - + if (_starter < 1f) { @@ -51,7 +39,7 @@ public class Starter : MonoBehaviour { DontMovePlayer[0].ActivateInput(); } - else + else if (StaticDataMap.NumPlayer == 2) { DontMovePlayer[0].ActivateInput(); DontMovePlayer[1].ActivateInput(); @@ -61,6 +49,22 @@ public class Starter : MonoBehaviour _borders.enabled = false; } } + else + { + + + if (StaticDataMap.NumPlayer == 1) + { + DontMovePlayer[0].DeactivateInput(); + } + else if (StaticDataMap.NumPlayer == 2) + { + DontMovePlayer[0].DeactivateInput(); + DontMovePlayer[1].DeactivateInput(); + } + + _borders.enabled = true; + } diff --git a/Assets/Racing_Game/Scence/Main/Main.unity b/Assets/Racing_Game/Scence/Main/Main.unity index 83931c3a..3a7c1656 100644 Binary files a/Assets/Racing_Game/Scence/Main/Main.unity and b/Assets/Racing_Game/Scence/Main/Main.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/1Map/FirstMap.unity b/Assets/Racing_Game/Scence/Maps/1Map/FirstMap.unity index 7821155a..a22e7ab3 100644 Binary files a/Assets/Racing_Game/Scence/Maps/1Map/FirstMap.unity and b/Assets/Racing_Game/Scence/Maps/1Map/FirstMap.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/3Map/Track-KIT.unity b/Assets/Racing_Game/Scence/Maps/3Map/Track-KIT.unity index 06d46133..d6f6b675 100644 Binary files a/Assets/Racing_Game/Scence/Maps/3Map/Track-KIT.unity and b/Assets/Racing_Game/Scence/Maps/3Map/Track-KIT.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/4Map/Track_C_HQ.unity b/Assets/Racing_Game/Scence/Maps/4Map/Track_C_HQ.unity index 53bb0a18..09e2101a 100644 Binary files a/Assets/Racing_Game/Scence/Maps/4Map/Track_C_HQ.unity and b/Assets/Racing_Game/Scence/Maps/4Map/Track_C_HQ.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/5Map/Track_D_Final.unity b/Assets/Racing_Game/Scence/Maps/5Map/Track_D_Final.unity index 3697dff9..6a3c7160 100644 Binary files a/Assets/Racing_Game/Scence/Maps/5Map/Track_D_Final.unity and b/Assets/Racing_Game/Scence/Maps/5Map/Track_D_Final.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/6Map/Autumn_4_day.unity b/Assets/Racing_Game/Scence/Maps/6Map/Autumn_4_day.unity index 4f4f99cc..25d23d1c 100644 Binary files a/Assets/Racing_Game/Scence/Maps/6Map/Autumn_4_day.unity and b/Assets/Racing_Game/Scence/Maps/6Map/Autumn_4_day.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/8Map/Race Track.unity b/Assets/Racing_Game/Scence/Maps/8Map/Race Track.unity index 6670c01e..3c7862d4 100644 Binary files a/Assets/Racing_Game/Scence/Maps/8Map/Race Track.unity and b/Assets/Racing_Game/Scence/Maps/8Map/Race Track.unity differ diff --git a/Assets/Racing_Game/Settings/Fantastic_PipelineAsset.asset b/Assets/Racing_Game/Settings/Fantastic_PipelineAsset.asset index 6fc02b4c..17ee5e85 100644 Binary files a/Assets/Racing_Game/Settings/Fantastic_PipelineAsset.asset and b/Assets/Racing_Game/Settings/Fantastic_PipelineAsset.asset differ diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Autumn_4_day.jpg b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Autumn_4_day.jpg new file mode 100644 index 00000000..294c6092 --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Autumn_4_day.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f65ff76779c0fd7fb61efad0e2bae9ebb3164ef63375b3769410528fb593395 +size 113088 diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Autumn_4_day.jpg.meta b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Autumn_4_day.jpg.meta new file mode 100644 index 00000000..6b16939a --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Autumn_4_day.jpg.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: b8784d53211d73441a62718afcd47292 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Race Track.jpg b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Race Track.jpg new file mode 100644 index 00000000..294c6092 --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Race Track.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f65ff76779c0fd7fb61efad0e2bae9ebb3164ef63375b3769410528fb593395 +size 113088 diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Race Track.jpg.meta b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Race Track.jpg.meta new file mode 100644 index 00000000..cee8072b --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Race Track.jpg.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 71c80e56cb5f5c543984724d30ce0ab7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/ThirdMap.png b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track-KIT.png similarity index 100% rename from Assets/Racing_Game/UI/MainUI/Sprites/Maps/ThirdMap.png rename to Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track-KIT.png diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/ThirdMap.png.meta b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track-KIT.png.meta similarity index 100% rename from Assets/Racing_Game/UI/MainUI/Sprites/Maps/ThirdMap.png.meta rename to Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track-KIT.png.meta diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_C_HQ.jpg b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_C_HQ.jpg new file mode 100644 index 00000000..294c6092 --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_C_HQ.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f65ff76779c0fd7fb61efad0e2bae9ebb3164ef63375b3769410528fb593395 +size 113088 diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_C_HQ.jpg.meta b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_C_HQ.jpg.meta new file mode 100644 index 00000000..91864d0f --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_C_HQ.jpg.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 6b6cc8027021c34418e256bca80f0413 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_D_Final.jpg b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_D_Final.jpg new file mode 100644 index 00000000..294c6092 --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_D_Final.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f65ff76779c0fd7fb61efad0e2bae9ebb3164ef63375b3769410528fb593395 +size 113088 diff --git a/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_D_Final.jpg.meta b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_D_Final.jpg.meta new file mode 100644 index 00000000..7745d25f --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Sprites/Maps/Track_D_Final.jpg.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: cb6006070fc4dd64a83aa00cb1fa2905 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: diff --git a/Assets/SelectCarGameScript.cs b/Assets/SelectCarGameScript.cs index 8cbe05c6..aaaf3551 100644 --- a/Assets/SelectCarGameScript.cs +++ b/Assets/SelectCarGameScript.cs @@ -9,12 +9,9 @@ public class SelectCarGameScript : MonoBehaviour [SerializeField] private int _Player; [SerializeField] private List _Cars; - private GameObject _CurrentCar; + public GameObject _CurrentCar; [SerializeField] private CinemachineVirtualCamera _CinemachineVC; - - [SerializeField] private FollowTarget _FollowTarget; - [SerializeField] private FollowYRotation _FollowYRotation; [SerializeField] private Starter _Starter; @@ -26,7 +23,7 @@ public class SelectCarGameScript : MonoBehaviour [SerializeField] private RCC_UIDashboardDisplay _RCC_UIDashboardDisplay; - private void Awake() + private void Start() { _Player -= 1; @@ -39,29 +36,27 @@ public class SelectCarGameScript : MonoBehaviour } } + _CinemachineVC.Follow = _CurrentCar.transform; + _CinemachineVC.LookAt = _CurrentCar.transform; + _DriftScore.playerRB = _CurrentCar.GetComponent(); //Debug.Log("Дрифт указан"); _CurrentCar.SetActive(true); - - _CinemachineVC.Follow = _CurrentCar.transform; - _CinemachineVC.LookAt = _CurrentCar.transform; - //Debug.Log("Машина отслеживается"); - - _FollowTarget.target = _CurrentCar.transform; - _FollowYRotation.target = _CurrentCar.transform; - //Debug.Log("Цель карты указана"); _Starter.DontMovePlayer[_Player] = _CurrentCar.GetComponent(); //Debug.Log("Игрок не двигается"); _Finish.playerInput[_Player] = _CurrentCar.GetComponent(); - - _RCC_DashboardInputs.vehicle = _CurrentCar.GetComponent(); _RCC_UIDashboardDisplay.vehicle = _CurrentCar.GetComponent(); //Debug.Log("Контроллеры управления указаны"); } + + //private void Start() + //{ + // _DriftScore.playerRB = _CurrentCar.GetComponent(); + //} } diff --git a/Assets/TestScript.cs b/Assets/TestScript.cs index fc19af06..bfa7d797 100644 --- a/Assets/TestScript.cs +++ b/Assets/TestScript.cs @@ -2,7 +2,7 @@ using UnityEngine; public class TestScript : MonoBehaviour { - void Awake() + private void Awake() { if (StaticDataMap.SelectedMap == null) { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index a5ffd8b8..b4da4f66 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ