Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
avvy
mobile-app
Commits
40434fb9
Commit
40434fb9
authored
3 years ago
by
Vyacheslav Kapustyanyj
Browse files
Options
Download
Plain Diff
Merge branch 'dev' into small_ui_fix
parents
81412f1e
43dca9b3
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Assets/AvvyLand/Scripts/ECS/Components/Main/StartSequenceMode/StartSequenceModeSingleton.cs
+4
-0
...ents/Main/StartSequenceMode/StartSequenceModeSingleton.cs
Assets/AvvyLand/Scripts/ECS/Systems/InitSystemGroup/MainApplicationSystem.cs
+5
-2
...ipts/ECS/Systems/InitSystemGroup/MainApplicationSystem.cs
Assets/AvvyLand/Tests/Execute/TestCreateBlockViewSystem.cs
+1
-4
Assets/AvvyLand/Tests/Execute/TestCreateBlockViewSystem.cs
with
10 additions
and
6 deletions
+10
-6
Assets/AvvyLand/Scripts/ECS/Components/Main/StartSequenceMode/StartSequenceModeSingleton.cs
View file @
40434fb9
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Assets/AvvyLand/Scripts/ECS/Systems/InitSystemGroup/MainApplicationSystem.cs
View file @
40434fb9
...
...
@@ -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
))
{
...
...
This diff is collapsed.
Click to expand it.
Assets/AvvyLand/Tests/Execute/TestCreateBlockViewSystem.cs
View file @
40434fb9
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
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help