Commit 40434fb9 authored by Vyacheslav Kapustyanyj's avatar Vyacheslav Kapustyanyj
Browse files

Merge branch 'dev' into small_ui_fix

parents 81412f1e 43dca9b3
No related merge requests found
Showing with 10 additions and 6 deletions
+10 -6
......@@ -15,6 +15,9 @@ namespace AvvyLand.Scripts.ECS.Components.Main.StartSequenceMode
CurrentStartSequenceStep = StartSequenceStep.CheckPermission;
break;
case StartSequenceStep.CheckPermission:
CurrentStartSequenceStep = StartSequenceStep.StartArSession;
break;
case StartSequenceStep.StartArSession:
CurrentStartSequenceStep = StartSequenceStep.CheckToS;
break;
case StartSequenceStep.CheckToS:
......@@ -42,6 +45,7 @@ namespace AvvyLand.Scripts.ECS.Components.Main.StartSequenceMode
{
None,
CheckPermission,
StartArSession,
CheckToS,
BeAware,
Age,
......
......@@ -51,8 +51,7 @@ namespace AvvyLand.Scripts.ECS.Systems.InitSystemGroup
StartSequenceMode();
StartAR();
var isConnectedToGrid = HasSingleton<NetworkConnectedTag>();
Entities
......@@ -112,6 +111,10 @@ namespace AvvyLand.Scripts.ECS.Systems.InitSystemGroup
SetStartSequenceStep(startSequenceEntity, new CheckPermissionOnStartSequenceComponent());
}
break;
case StartSequenceStep.StartArSession:
StartAR();
EntityManager.SetComponentData(startSequenceEntity, new StartSequenceModeSingleton{CurrentStartSequenceStep = StartSequenceStep.CheckToS});
break;
case StartSequenceStep.CheckToS:
if (!EntityManager.HasComponent<CheckToSOnStartSequenceComponent>(startSequenceEntity))
{
......
using System.Collections;
using System.Collections.Generic;
using AvvyLand.Scripts.ECS.Components.Exectue;
using AvvyLand.Scripts.ECS.Components.Exectue;
using AvvyLand.Scripts.ECS.Components.Model;
using NUnit.Framework;
using Unity.Entities;
using Unity.Entities.Tests;
using Unity.Mathematics;
using Unity.Transforms;
using UnityEngine;
namespace AvvyLand.Tests.Execute
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment