Попытки вправить ошибку(неуспешно)(полечилось полным реимпортом)
This commit is contained in:
parent
4a2a591b52
commit
3f9d96061b
@ -18,3 +18,4 @@ MonoBehaviour:
|
||||
- {fileID: 11400000, guid: f3ba6285779c8ed4c9ffffc341cdc859, type: 2}
|
||||
- {fileID: 11400000, guid: 1b133c7e56db2ee42865eb9745ee343d, type: 2}
|
||||
- {fileID: 11400000, guid: 7ee806f333696e741a42c7a48caa09ca, type: 2}
|
||||
- {fileID: 11400000, guid: af8822c40125b444ea5a7da23a4184b0, type: 2}
|
||||
|
||||
@ -571,6 +571,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::MainBootstrap
|
||||
window: {fileID: 12486307}
|
||||
DebugCanvas: {fileID: 1070121181}
|
||||
ConfigCatalog: {fileID: 11400000, guid: 930163f4c11229d4caeb5c77721033ad, type: 2}
|
||||
InputType: 1
|
||||
gm: {fileID: 1456733151}
|
||||
@ -579,7 +580,7 @@ MonoBehaviour:
|
||||
Screen_Camera: {fileID: 1655591480}
|
||||
soundManager: {fileID: 1073889037}
|
||||
logging: 0
|
||||
debugMode: 0
|
||||
debugMode: 1
|
||||
--- !u!4 &560058346
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -813,8 +814,6 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 1070121185}
|
||||
- component: {fileID: 1070121184}
|
||||
- component: {fileID: 1070121183}
|
||||
- component: {fileID: 1070121182}
|
||||
m_Layer: 5
|
||||
m_Name: DebugCanvas
|
||||
m_TagString: Untagged
|
||||
@ -822,46 +821,6 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1070121182
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1070121181}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &1070121183
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1070121181}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
|
||||
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: 0
|
||||
--- !u!223 &1070121184
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -873,16 +832,16 @@ Canvas:
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 1
|
||||
m_Camera: {fileID: 1655591480}
|
||||
m_PlaneDistance: 100
|
||||
m_PlaneDistance: 1.02
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_VertexColorAlwaysGammaSpace: 1
|
||||
m_UseReflectionProbes: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_UpdateRectTransformForStandalone: 1
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 100
|
||||
m_TargetDisplay: 0
|
||||
@ -1284,6 +1243,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::YawOnlyTracker
|
||||
cameraTransform: {fileID: 1518557137}
|
||||
sensitivity: 1.8
|
||||
offset: 0
|
||||
--- !u!114 &1518557141
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -12,6 +12,8 @@ using UnityEngine.XR;
|
||||
public class MainBootstrap : MonoBehaviour
|
||||
{
|
||||
[SerializeField] TextMeshProUGUI window;
|
||||
[SerializeField] GameObject DebugCanvas;
|
||||
|
||||
[SerializeField] private ConfigCatalog ConfigCatalog;
|
||||
[SerializeField] private In.InputType InputType;
|
||||
[SerializeField] private GameManager gm;
|
||||
@ -28,20 +30,28 @@ public class MainBootstrap : MonoBehaviour
|
||||
[SerializeField] private bool logging;
|
||||
[SerializeField] private bool debugMode;
|
||||
|
||||
CancellationTokenSource cts;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
cts = new CancellationTokenSource();
|
||||
InitializeAsync(cts.Token).Forget();
|
||||
}
|
||||
|
||||
private async void Awake()
|
||||
private void OnApplicationQuit()
|
||||
{
|
||||
cts?.Cancel();
|
||||
cts.Dispose();
|
||||
}
|
||||
|
||||
private async UniTask InitializeAsync(CancellationToken ct)
|
||||
{
|
||||
XRSettings.useOcclusionMesh = false;
|
||||
|
||||
window.text += "Инициализация диспетчера...\n";
|
||||
UnityMainThreadDispatcher.Initialize();
|
||||
await Delay(1000);
|
||||
window.text += "Диспетчер инициализирован...\n";
|
||||
await Delay(1000);
|
||||
|
||||
|
||||
window.text += "Проверка лицензии...\n";
|
||||
|
||||
bool ok = await Defender.Instance.CheckLicenseAsync();
|
||||
if (ok)
|
||||
{
|
||||
@ -52,7 +62,7 @@ public class MainBootstrap : MonoBehaviour
|
||||
window.text += "Нет лицензии\n";
|
||||
await Delay(2000);
|
||||
Application.Quit();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
InitializeMangers();
|
||||
@ -64,24 +74,21 @@ public class MainBootstrap : MonoBehaviour
|
||||
LightSystem.SetLightActive(true);
|
||||
await Delay(500);
|
||||
|
||||
if (!debugMode)
|
||||
{
|
||||
window.text += "Регулировка перископа...\n";
|
||||
PeriscopeManager.Init(GameManager.globalCts);
|
||||
PeriscopeManager.MoveUpToEnd();
|
||||
await PeriscopeWait(PeriscopeManager.config.MoveUpToEndTimeMs, window.text);
|
||||
}
|
||||
window.text += "Регулировка перископа...\n";
|
||||
PeriscopeManager.Init(GameManager.globalCts);
|
||||
PeriscopeManager.MoveUpToEnd();
|
||||
int time = debugMode ? 0 : PeriscopeManager.config.MoveUpToEndTimeMs;
|
||||
await PeriscopeWait(time, window.text, this.GetCancellationTokenOnDestroy());
|
||||
|
||||
await Delay(1000);
|
||||
window.text += "Заходим в игру...\n";
|
||||
await Delay(1000);
|
||||
|
||||
if(debugMode)
|
||||
if (debugMode)
|
||||
{
|
||||
window.text = "DEBUG_MODE";
|
||||
window.canvas.gameObject.name = "DEBUG_CANVAS";
|
||||
DontDestroyOnLoad(window.canvas.gameObject);
|
||||
|
||||
DontDestroyOnLoad(DebugCanvas);
|
||||
}
|
||||
SceneLoader.LoadScene("MenuOneRegime");
|
||||
}
|
||||
@ -135,11 +142,11 @@ public class MainBootstrap : MonoBehaviour
|
||||
|
||||
CamerasManager.Initialize(CamerasPivot, VR_Camera, Screen_Camera);
|
||||
|
||||
|
||||
|
||||
ComPortController.Initialize(ControllerConfig.LoadOrCreate(), ComPortController.InputType.Decimal);
|
||||
ComPortController.PaymentReceived += WalletManager.OnCoin;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
WalletManager.Initialize(ConfigCatalog.WalletManagerConfig);
|
||||
@ -179,7 +186,7 @@ public class MainBootstrap : MonoBehaviour
|
||||
|
||||
private async UniTask Delay(int ms)
|
||||
{
|
||||
if(debugMode) return;
|
||||
if (debugMode) return;
|
||||
await UniTask.Delay(ms);
|
||||
}
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@ public class BezierWay : MonoBehaviour
|
||||
/// <summary>
|
||||
/// Кэширует все дочерние объекты как точки кривой
|
||||
/// </summary>
|
||||
[ContextMenu("Cache Points")]
|
||||
//[ContextMenu("Cache Points")]
|
||||
public void CachePoints()
|
||||
{
|
||||
_points.Clear();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user