vladimir-d/cppk-ar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

last update

Browse Source
This commit is contained in:
vladimir-d
2022-12-28 13:43:10 +05:00
parent de27cee945
commit 9486dbcb03
12 changed files with 4653 additions and 2003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Logo.unity
+4306 -58
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/MainMenu.unity
-1914
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/MainMenu.unity.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 9fc0d4010bbf28b4594072e72b8655ab
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/GameSystem.cs
+3
View File
@@ -26,6 +26,7 @@ public class GameSystem : MonoBehaviour
[Space] [Space]
[SerializeField] UIMainMenu mainMenu; [SerializeField] UIMainMenu mainMenu;
[SerializeField] UICanvas trainsMenu; [SerializeField] UICanvas trainsMenu;
[SerializeField] UICanvas aboutMenu;
[Space] [Space]
public UICanvas trainEP2D; public UICanvas trainEP2D;
public UICanvas train2; public UICanvas train2;
@@ -101,6 +102,7 @@ public class GameSystem : MonoBehaviour
FindObjectOfType<SceneHandler>().OnSceneLoaded.AddListener(()=> FindObjectOfType<SceneHandler>().OnSceneLoaded.AddListener(()=>
{ {
mainMenu.gameObject.SetActive(true); mainMenu.gameObject.SetActive(true);
aboutMenu.gameObject.SetActive(true);
}); });
} }
@@ -167,6 +169,7 @@ public class GameSystem : MonoBehaviour
DontDestroyOnLoad(item.gameObject); DontDestroyOnLoad(item.gameObject);
Instance = this; Instance = this;
Screen.sleepTimeout = 0;
} }
void Start() void Start()
Assets/Scripts/LogoHandler.cs
+8 -7
View File
@@ -3,29 +3,30 @@ using System.Collections.Generic;
using DG.Tweening; using DG.Tweening;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.Events;
[RequireComponent(typeof(CanvasGroup))] [RequireComponent(typeof(CanvasGroup))]
public class LogoHandler : MonoBehaviour public class LogoHandler : MonoBehaviour
{ {
[SerializeField] private CanvasGroup logo; [SerializeField] private CanvasGroup logo;
[SerializeField] UnityEvent OnTimerEnded;
private CanvasGroup canvasGroup; private CanvasGroup canvasGroup;
IEnumerator Start() IEnumerator Start()
{ {
DontDestroyOnLoad(gameObject); DontDestroyOnLoad(gameObject);
canvasGroup = GetComponent<CanvasGroup>(); canvasGroup = GetComponent<CanvasGroup>();
var sceneLoading = SceneManager.LoadSceneAsync(1, LoadSceneMode.Single);
while(!sceneLoading.isDone)
yield return null;
yield return new WaitForSeconds(2); yield return new WaitForSeconds(2);
logo.DOFade(0, .4f) logo.DOFade(0, .4f)
.OnComplete(() => canvasGroup .OnComplete(() => canvasGroup
.DOFade(0, .8f) .DOFade(0, .8f)
.OnComplete(() => Destroy(this.gameObject))); .OnComplete(() =>
{
OnTimerEnded?.Invoke();
Destroy(this.gameObject);
}));
} }
} }
Assets/Scripts/QRCodeReader.cs
+12 -11
View File
@@ -63,21 +63,24 @@ public class QRCodeReader : MonoBehaviour
var ratio = (float)camTexture.width / (float)camTexture.height; var ratio = (float)camTexture.width / (float)camTexture.height;
aspectRatioFitter.aspectRatio = ratio; aspectRatioFitter.aspectRatio = ratio;
float scaleY = 1; float scaleY = -1;
if(Application.platform == RuntimePlatform.Android) if(Application.platform == RuntimePlatform.Android)
{
scaleY = camTexture.videoVerticallyMirrored ? -1f : 1f; scaleY = camTexture.videoVerticallyMirrored ? -1f : 1f;
rawImage.rectTransform.localScale = new Vector3(1f, scaleY, 1f);
} rawImage.rectTransform.localScale = new Vector3(1f, scaleY, 1f);
else
{
ratio = (float)camTexture.height / (float)camTexture.width;
rawImage.rectTransform.localScale = new Vector3(1f, -1f, 1f);
}
ScanningQRCode(); ScanningQRCode();
} }
// void Update()
// {
// cameraCrop = new Texture2D(camTexture.width, camTexture.height);
// cameraCrop.SetPixels32(camTexture.GetPixels32());
// cameraCrop.Apply();
// cropImage.texture = cameraCrop;
// }
public void ScanningQRCode() public void ScanningQRCode()
{ {
if(c_QRScanningRoutine != null) if(c_QRScanningRoutine != null)
@@ -112,8 +115,6 @@ public class QRCodeReader : MonoBehaviour
yield return new WaitForSeconds(.5f); yield return new WaitForSeconds(.5f);
} }
yield return new WaitForSeconds(1);
if(!loadingCanvas.gameObject.activeSelf) if(!loadingCanvas.gameObject.activeSelf)
loadingCanvas.gameObject.SetActive(true); loadingCanvas.gameObject.SetActive(true);
Assets/Textures/UI/Buttons/TouchToMove.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

Assets/Textures/UI/Buttons/TouchToMove.png.meta
+159
View File
@@ -0,0 +1,159 @@
fileFormatVersion: 2
guid: 47609843f50a7d84abff86cffc829cfc
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
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
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 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
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
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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Textures/map.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 MiB

Assets/Textures/map.png.meta
+159
View File
@@ -0,0 +1,159 @@
fileFormatVersion: 2
guid: 5b35ae2c39ae57e448add169d5d39d38
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
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: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 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
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
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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
ProjectSettings/EditorBuildSettings.asset
+3 -3
View File
@@ -8,9 +8,9 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/Logo.unity path: Assets/Scenes/Logo.unity
guid: 48f2769d0bee0ac40b5b1bedc2881531 guid: 48f2769d0bee0ac40b5b1bedc2881531
- enabled: 1 - enabled: 0
path: Assets/Scenes/MainMenu.unity path:
guid: 9fc0d4010bbf28b4594072e72b8655ab guid: 00000000000000000000000000000000
- enabled: 1 - enabled: 1
path: Assets/Scenes/StationPechatnici.unity path: Assets/Scenes/StationPechatnici.unity
guid: 4673b932605c35649a4fe32e73982ce8 guid: 4673b932605c35649a4fe32e73982ce8
ProjectSettings/ProjectSettings.asset
+3 -3
View File
@@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1 16:10: 1
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 1 bundleVersion: 1.1
preloadedAssets: preloadedAssets:
- {fileID: 11400000, guid: 31cae119f440ee64ba43351a4dacc12b, type: 2} - {fileID: 11400000, guid: 31cae119f440ee64ba43351a4dacc12b, type: 2}
metroInputSource: 0 metroInputSource: 0
@@ -160,10 +160,10 @@ PlayerSettings:
iPhone: com.graffinteractive.cppkar iPhone: com.graffinteractive.cppkar
buildNumber: buildNumber:
Standalone: 0 Standalone: 0
iPhone: 7 iPhone: 10
tvOS: 0 tvOS: 0
overrideDefaultApplicationIdentifier: 1 overrideDefaultApplicationIdentifier: 1
AndroidBundleVersionCode: 10 AndroidBundleVersionCode: 11
AndroidMinSdkVersion: 24 AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 31 AndroidTargetSdkVersion: 31
AndroidPreferredInstallLocation: 1 AndroidPreferredInstallLocation: 1