create menu UI
@@ -13379,3 +13379,100 @@ Symbol file LoadedFromMemory doesn't match image D:\UnityProjects\CPPK-AR\Librar
|
|||||||
Symbol file LoadedFromMemory doesn't match image D:\UnityProjects\CPPK-AR\Library\PackageCache\com.unity.visualscripting@1.7.8\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll
|
Symbol file LoadedFromMemory doesn't match image D:\UnityProjects\CPPK-AR\Library\PackageCache\com.unity.visualscripting@1.7.8\Editor\VisualScripting.Core\Dependencies\YamlDotNet\Unity.VisualScripting.YamlDotNet.dll
|
||||||
[usbmuxd] Stop listen thread
|
[usbmuxd] Stop listen thread
|
||||||
[usbmuxd] Listen thread exiting
|
[usbmuxd] Listen thread exiting
|
||||||
|
2022-11-12
|
||||||
|
Rendering UV GBuffer for StationPechatnici_LM0 51
|
||||||
|
RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
|
||||||
|
Rendering UV normal...
|
||||||
|
Rendering faceted UV normal...
|
||||||
|
Rendering UV pos...
|
||||||
|
Rendering smooth UV pos...
|
||||||
|
Rendering UV GBuffer for StationPechatnici_LMA1 51
|
||||||
|
RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
|
||||||
|
Rendering UV normal...
|
||||||
|
Rendering faceted UV normal...
|
||||||
|
Rendering UV pos...
|
||||||
|
Rendering smooth UV pos...
|
||||||
|
Rendering UV GBuffer for StationPechatnici_LMA2 51
|
||||||
|
RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
|
||||||
|
Rendering UV normal...
|
||||||
|
Rendering faceted UV normal...
|
||||||
|
Rendering UV pos...
|
||||||
|
Rendering smooth UV pos...
|
||||||
|
Rendering UV GBuffer for StationPechatnici_LMA3 51
|
||||||
|
RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
|
||||||
|
Rendering UV normal...
|
||||||
|
Rendering faceted UV normal...
|
||||||
|
Rendering UV pos...
|
||||||
|
Rendering smooth UV pos...
|
||||||
|
Rendering UV GBuffer for StationPechatnici_LMA4 51
|
||||||
|
RGBA32F...RGBA8...RGBA8_SRGB...RGBA16F...states...
|
||||||
|
Rendering UV normal...
|
||||||
|
Rendering faceted UV normal...
|
||||||
|
Rendering UV pos...
|
||||||
|
Rendering smooth UV pos...
|
||||||
|
Done
|
||||||
|
Running ftraceRTX fixpos12 "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "uvpos_StationPechatnici_LMA1.lz4" 2 0 1 0
|
||||||
|
Running ftraceRTX fixpos12 "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "uvpos_StationPechatnici_LMA2.lz4" 2 0 2 0
|
||||||
|
Running ftraceRTX fixpos12 "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "uvpos_StationPechatnici_LMA3.lz4" 2 0 3 0
|
||||||
|
Running ftraceRTX fixpos12 "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "uvpos_StationPechatnici_LM0.lz4" 2 0 0 0
|
||||||
|
Running ftraceRTX fixpos12 "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "uvpos_StationPechatnici_LMA4.lz4" 2 0 4 0
|
||||||
|
Running ftraceRTX ao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA1_ao" 8 16 1
|
||||||
|
Running ftraceRTX ao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA2_ao" 8 16 2
|
||||||
|
Running ftraceRTX ao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA3_ao" 8 16 3
|
||||||
|
Running ftraceRTX ao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LM0_ao" 8 16 0
|
||||||
|
Running ftraceRTX ao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA4_ao" 8 16 4
|
||||||
|
Running ftraceRTX sun "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "light_-1786324120_1" 4 0 1 direct0.bin
|
||||||
|
Running ftraceRTX addmul "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA1" 4 0 1 comp_1.bin
|
||||||
|
Running ftraceRTX sun "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "light_-1786324120_2" 4 0 2 direct0.bin
|
||||||
|
Running ftraceRTX addmul "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA2" 4 0 2 comp_2.bin
|
||||||
|
Running ftraceRTX sun "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "light_-1786324120_3" 4 0 3 direct0.bin
|
||||||
|
Running ftraceRTX addmul "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA3" 4 0 3 comp_3.bin
|
||||||
|
Running ftraceRTX sun "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "light_-1786324120_0" 4 0 0 direct0.bin
|
||||||
|
Running ftraceRTX addmul "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LM0" 4 0 0 comp_0.bin
|
||||||
|
Running ftraceRTX sun "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "light_-1786324120_4" 4 0 4 direct0.bin
|
||||||
|
Running ftraceRTX addmul "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA4" 4 0 4 comp_4.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA1_diffuse" 4 16 1 "gi_StationPechatnici_LMA10.bin" "StationPechatnici_LMA1_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA2_diffuse" 4 16 2 "gi_StationPechatnici_LMA20.bin" "StationPechatnici_LMA2_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA3_diffuse" 4 16 3 "gi_StationPechatnici_LMA30.bin" "StationPechatnici_LMA3_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LM0_diffuse" 4 16 0 "gi_StationPechatnici_LM00.bin" "StationPechatnici_LM0_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA4_diffuse" 4 16 4 "gi_StationPechatnici_LMA40.bin" "StationPechatnici_LMA4_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA1_diffuse" 4 16 1 "gi_StationPechatnici_LMA11.bin" "StationPechatnici_LMA1_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA2_diffuse" 4 16 2 "gi_StationPechatnici_LMA21.bin" "StationPechatnici_LMA2_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA3_diffuse" 4 16 3 "gi_StationPechatnici_LMA31.bin" "StationPechatnici_LMA3_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LM0_diffuse" 4 16 0 "gi_StationPechatnici_LM01.bin" "StationPechatnici_LM0_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA4_diffuse" 4 16 4 "gi_StationPechatnici_LMA41.bin" "StationPechatnici_LMA4_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA1_diffuse" 4 16 1 "gi_StationPechatnici_LMA12.bin" "StationPechatnici_LMA1_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA2_diffuse" 4 16 2 "gi_StationPechatnici_LMA22.bin" "StationPechatnici_LMA2_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA3_diffuse" 4 16 3 "gi_StationPechatnici_LMA32.bin" "StationPechatnici_LMA3_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LM0_diffuse" 4 16 0 "gi_StationPechatnici_LM02.bin" "StationPechatnici_LM0_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA4_diffuse" 4 16 4 "gi_StationPechatnici_LMA42.bin" "StationPechatnici_LMA4_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA1_diffuse" 4 16 1 "gi_StationPechatnici_LMA13.bin" "StationPechatnici_LMA1_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA2_diffuse" 4 16 2 "gi_StationPechatnici_LMA23.bin" "StationPechatnici_LMA2_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA3_diffuse" 4 16 3 "gi_StationPechatnici_LMA33.bin" "StationPechatnici_LMA3_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LM0_diffuse" 4 16 0 "gi_StationPechatnici_LM03.bin" "StationPechatnici_LM0_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA4_diffuse" 4 16 4 "gi_StationPechatnici_LMA43.bin" "StationPechatnici_LMA4_diffuse0_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA1_final" 4 16 1 "gi_StationPechatnici_LMA14.bin" "StationPechatnici_LMA1_lights_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA2_final" 4 16 2 "gi_StationPechatnici_LMA24.bin" "StationPechatnici_LMA2_lights_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA3_final" 4 16 3 "gi_StationPechatnici_LMA34.bin" "StationPechatnici_LMA3_lights_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LM0_final" 4 16 0 "gi_StationPechatnici_LM04.bin" "StationPechatnici_LM0_lights_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX texgi "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA4_final" 4 16 4 "gi_StationPechatnici_LMA44.bin" "StationPechatnici_LMA4_lights_HDR.lz4" vbTraceTex.bin
|
||||||
|
Running ftraceRTX addao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA1_final_HDR.lz4" 4 0 1 addao_1.bin
|
||||||
|
Running denoiserOIDN c "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA1_final_HDR.lz4" "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA1_final_HDR.lz4" 1024 0
|
||||||
|
Running seamfixer "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "1" "StationPechatnici_LMA1_final_HDR.lz4"
|
||||||
|
Running ftraceRTX addao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA2_final_HDR.lz4" 4 0 2 addao_2.bin
|
||||||
|
Running denoiserOIDN c "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA2_final_HDR.lz4" "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA2_final_HDR.lz4" 1024 0
|
||||||
|
Running seamfixer "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "2" "StationPechatnici_LMA2_final_HDR.lz4"
|
||||||
|
Running ftraceRTX addao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA3_final_HDR.lz4" 4 0 3 addao_3.bin
|
||||||
|
Running denoiserOIDN c "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA3_final_HDR.lz4" "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA3_final_HDR.lz4" 512 0
|
||||||
|
Running seamfixer "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "3" "StationPechatnici_LMA3_final_HDR.lz4"
|
||||||
|
Running ftraceRTX addao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LM0_final_HDR.lz4" 4 0 0 addao_0.bin
|
||||||
|
Running denoiserOIDN c "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LM0_final_HDR.lz4" "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LM0_final_HDR.lz4" 1024 0
|
||||||
|
Running seamfixer "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "0" "StationPechatnici_LM0_final_HDR.lz4"
|
||||||
|
Running ftraceRTX addao "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "StationPechatnici_LMA4_final_HDR.lz4" 4 0 4 addao_4.bin
|
||||||
|
Running denoiserOIDN c "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA4_final_HDR.lz4" "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA4_final_HDR.lz4" 512 0
|
||||||
|
Running seamfixer "C:\Users\VLADIM~1\AppData\Local\Temp\frender" "4" "StationPechatnici_LMA4_final_HDR.lz4"
|
||||||
|
Running halffloat2hdr "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA1_final_HDR.lz4" "D:/UnityProjects/CPPK-AR/Assets/Scenes/StationPechatnici/StationPechatnici_LMA1_final.hdr" 1024
|
||||||
|
Running halffloat2hdr "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA2_final_HDR.lz4" "D:/UnityProjects/CPPK-AR/Assets/Scenes/StationPechatnici/StationPechatnici_LMA2_final.hdr" 1024
|
||||||
|
Running halffloat2hdr "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA3_final_HDR.lz4" "D:/UnityProjects/CPPK-AR/Assets/Scenes/StationPechatnici/StationPechatnici_LMA3_final.hdr" 1024
|
||||||
|
Running halffloat2hdr "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LM0_final_HDR.lz4" "D:/UnityProjects/CPPK-AR/Assets/Scenes/StationPechatnici/StationPechatnici_LM0_final.hdr" 1024
|
||||||
|
Running halffloat2hdr "C:\Users\VLADIM~1\AppData\Local\Temp\frender/StationPechatnici_LMA4_final_HDR.lz4" "D:/UnityProjects/CPPK-AR/Assets/Scenes/StationPechatnici/StationPechatnici_LMA4_final.hdr" 1024
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ public enum Location
|
|||||||
Sherbinka,
|
Sherbinka,
|
||||||
BulevardSlavyanski,
|
BulevardSlavyanski,
|
||||||
Solnechaya,
|
Solnechaya,
|
||||||
Shukenskaya,
|
Shukinskaya,
|
||||||
AprelevkaDepo
|
AprelevkaDepo
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -23,37 +23,44 @@ public class GameSystem : MonoBehaviour
|
|||||||
public static GameSystem Instance { get; private set; }
|
public static GameSystem Instance { get; private set; }
|
||||||
public List<IGameComponent> gameComponents { get; private set; } = new List<IGameComponent>();
|
public List<IGameComponent> gameComponents { get; private set; } = new List<IGameComponent>();
|
||||||
|
|
||||||
|
[SerializeField] UIMainMenu mainMenu;
|
||||||
|
[Space]
|
||||||
[SerializeField] GameObject[] sigletonComponents;
|
[SerializeField] GameObject[] sigletonComponents;
|
||||||
[SerializeField] CanvasGroup loadingCanvas;
|
|
||||||
|
|
||||||
public event Action OnSceneLoaded;
|
public event Action OnSceneLoaded;
|
||||||
|
|
||||||
public Dictionary<string, string> locationsName { get; private set; } = new()
|
public Dictionary<string, Location> locationsName { get; private set; } = new()
|
||||||
{
|
{
|
||||||
{"StationPechatnici", "Станция Печатники"},
|
{"StationPechatnici", Location.Pechatniki},
|
||||||
{"", "Станция Щербинка"},
|
{"1", Location.Sherbinka},
|
||||||
{"", "Станция Славянский бульвар"},
|
{"2", Location.BulevardSlavyanski},
|
||||||
{"StationSolnechnaya", "Станция Солнечная"},
|
{"StationSolnechnaya", Location.Solnechaya},
|
||||||
{"StationShchukinskaya", "Станция Щукенская"},
|
{"StationShchukinskaya", Location.Shukinskaya},
|
||||||
{"", "Депо Апрелевка"}
|
{"3", Location.AprelevkaDepo}
|
||||||
};
|
};
|
||||||
|
|
||||||
public void LoadScene(string sceneName)
|
public async void LoadScene(string sceneName)
|
||||||
{
|
{
|
||||||
if(!loadingCanvas.gameObject.activeSelf)
|
mainMenu.UpdateLocationMenu(locationsName[sceneName]);
|
||||||
loadingCanvas.gameObject.SetActive(true);
|
|
||||||
|
var qrReader = FindObjectOfType<QRCodeReader>();
|
||||||
loadingCanvas.DOFade(1, .5f).OnComplete(async() =>
|
qrReader.camTexture.Stop();
|
||||||
|
|
||||||
|
var sceneLoadingOperation = SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Single);
|
||||||
|
while(!sceneLoadingOperation.isDone) await Task.Yield();
|
||||||
|
|
||||||
|
OnSceneLoaded?.Invoke();
|
||||||
|
|
||||||
|
FindObjectOfType<SceneHandler>().OnSceneLoaded += ()=>
|
||||||
{
|
{
|
||||||
var qrReader = FindObjectOfType<QRCodeReader>();
|
mainMenu.gameObject.SetActive(true);
|
||||||
qrReader.camTexture.Stop();
|
};
|
||||||
|
}
|
||||||
|
|
||||||
var sceneLoadingOperation = SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Single);
|
public void LeaveScene()
|
||||||
while(!sceneLoadingOperation.isDone) await Task.Yield();
|
{
|
||||||
|
var sceneLoadingOperation = SceneManager.LoadSceneAsync("MainMenu",
|
||||||
OnSceneLoaded?.Invoke();
|
LoadSceneMode.Single);
|
||||||
loadingCanvas.gameObject.SetActive(false);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddGameComponent(IGameComponent component)
|
public void AddGameComponent(IGameComponent component)
|
||||||
@@ -80,7 +87,6 @@ public class GameSystem : MonoBehaviour
|
|||||||
}
|
}
|
||||||
|
|
||||||
DontDestroyOnLoad(this);
|
DontDestroyOnLoad(this);
|
||||||
QRCodeReader.Instance.OnQRCodeRead += LoadScene;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
using ZXing;
|
using ZXing;
|
||||||
|
using DG.Tweening;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
@@ -11,8 +12,7 @@ public class QRCodeReader : MonoBehaviour
|
|||||||
{
|
{
|
||||||
public static QRCodeReader Instance { get; private set; }
|
public static QRCodeReader Instance { get; private set; }
|
||||||
|
|
||||||
public event Action<string> OnQRCodeRead;
|
[SerializeField] CanvasGroup loadingCanvas;
|
||||||
|
|
||||||
[SerializeField] AspectRatioFitter aspectRatioFitter;
|
[SerializeField] AspectRatioFitter aspectRatioFitter;
|
||||||
public RawImage rawImage;
|
public RawImage rawImage;
|
||||||
public GameObject scanFrame;
|
public GameObject scanFrame;
|
||||||
@@ -105,6 +105,13 @@ public class QRCodeReader : MonoBehaviour
|
|||||||
|
|
||||||
yield return new WaitForSeconds(1);
|
yield return new WaitForSeconds(1);
|
||||||
|
|
||||||
OnQRCodeRead?.Invoke(result.Text);
|
if(!loadingCanvas.gameObject.activeSelf)
|
||||||
|
loadingCanvas.gameObject.SetActive(true);
|
||||||
|
|
||||||
|
loadingCanvas.DOFade(1, .5f).OnComplete(() =>
|
||||||
|
{
|
||||||
|
FindObjectOfType<GameSystem>()
|
||||||
|
.LoadScene(result.Text);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@@ -14,8 +15,7 @@ public class SceneHandler : MonoBehaviour
|
|||||||
[SerializeField] float endPositionValue;
|
[SerializeField] float endPositionValue;
|
||||||
[Space]
|
[Space]
|
||||||
[SerializeField] GameObject[] disableOnStart;
|
[SerializeField] GameObject[] disableOnStart;
|
||||||
[Space]
|
public event Action OnSceneLoaded;
|
||||||
[SerializeField] UnityEvent OnSceneLoaded;
|
|
||||||
|
|
||||||
async Task Start()
|
async Task Start()
|
||||||
{
|
{
|
||||||
@@ -63,10 +63,4 @@ public class SceneHandler : MonoBehaviour
|
|||||||
|
|
||||||
OnSceneLoaded?.Invoke();
|
OnSceneLoaded?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LeaveScene()
|
|
||||||
{
|
|
||||||
var sceneLoadingOperation = SceneManager.LoadSceneAsync("MainMenu",
|
|
||||||
LoadSceneMode.Single);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public class UICanvas : MonoBehaviour
|
|||||||
public void Hide()
|
public void Hide()
|
||||||
{
|
{
|
||||||
canvasGroup.DOFade(0, .4f);
|
canvasGroup.DOFade(0, .4f);
|
||||||
|
gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnEnable()
|
void OnEnable()
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
public class UIMainMenu : UICanvas
|
||||||
|
{
|
||||||
|
[SerializeField] private Text stationName;
|
||||||
|
|
||||||
|
public void UpdateLocationMenu(Location location)
|
||||||
|
{
|
||||||
|
switch(location)
|
||||||
|
{
|
||||||
|
case(Location.AprelevkaDepo):
|
||||||
|
stationName.text = "Депо Апрелевка";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case(Location.BulevardSlavyanski):
|
||||||
|
stationName.text = "станция Славянский бульвар";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case(Location.Pechatniki):
|
||||||
|
stationName.text = "Станция Печатники";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case(Location.Sherbinka):
|
||||||
|
stationName.text = "Станция Щербинка";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case(Location.Shukinskaya):
|
||||||
|
stationName.text = "Станция Щукинская";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case(Location.Solnechaya):
|
||||||
|
stationName.text = "Станция Солнечная";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b526cb7cf627f194d853a5f25f4a9fd8
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
After Width: | Height: | Size: 32 KiB |
@@ -0,0 +1,159 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6f6d993eef18ccb4d89aa6690a4037a1
|
||||||
|
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: 1024
|
||||||
|
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:
|
||||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.6 KiB |