From 30ab581b85f8046a672bfc49bf510237c7fca2ff Mon Sep 17 00:00:00 2001
From: rchia16 <ray.chia92@gmail.com>
Date: Wed, 8 Nov 2023 17:50:52 +1100
Subject: [PATCH] attempted persistence
---
Assets/Scenes/BreathingProtocol.unity | 446 +++++++++++++++++--
Assets/Scenes/Menu.unity | 160 ++++---
Assets/{ => Scripts}/ProtocolHandler.cs | 34 +-
Assets/{ => Scripts}/ProtocolHandler.cs.meta | 0
Assets/Scripts/SceneLoaderClass.cs | 51 +++
Assets/Scripts/SceneLoaderClass.cs.meta | 11 +
ProjectSettings/EditorBuildSettings.asset | 7 +-
7 files changed, 622 insertions(+), 87 deletions(-)
rename Assets/{ => Scripts}/ProtocolHandler.cs (67%)
rename Assets/{ => Scripts}/ProtocolHandler.cs.meta (100%)
create mode 100644 Assets/Scripts/SceneLoaderClass.cs
create mode 100644 Assets/Scripts/SceneLoaderClass.cs.meta
diff --git a/Assets/Scenes/BreathingProtocol.unity b/Assets/Scenes/BreathingProtocol.unity
index 962b6fd..223bcb3 100644
--- a/Assets/Scenes/BreathingProtocol.unity
+++ b/Assets/Scenes/BreathingProtocol.unity
@@ -123,6 +123,139 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &2298784
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2298785}
+ - component: {fileID: 2298788}
+ - component: {fileID: 2298787}
+ - component: {fileID: 2298786}
+ m_Layer: 5
+ m_Name: Button
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2298785
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2298784}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1331087313}
+ m_Father: {fileID: 706484908}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -168.9, y: -50.5}
+ m_SizeDelta: {x: 76.2803, y: 24.4921}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2298786
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2298784}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 2298787}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1017534067}
+ m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
+ m_MethodName: set_enabled
+ m_Mode: 6
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &2298787
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2298784}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &2298788
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2298784}
+ m_CullTransparentMesh: 1
--- !u!1 &519420028
GameObject:
m_ObjectHideFlags: 0
@@ -215,7 +348,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1912239087
+--- !u!1 &706484904
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -223,22 +356,153 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1912239089}
- - component: {fileID: 1912239088}
+ - component: {fileID: 706484908}
+ - component: {fileID: 706484907}
+ - component: {fileID: 706484906}
+ - component: {fileID: 706484905}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &706484905
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 706484904}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &706484906
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 706484904}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ 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 &706484907
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 706484904}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_VertexColorAlwaysGammaSpace: 0
+ m_AdditionalShaderChannelsFlag: 25
+ m_UpdateRectTransformForStandalone: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &706484908
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 706484904}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 2298785}
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!1 &1017534065
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1017534066}
+ - component: {fileID: 1017534068}
+ - component: {fileID: 1017534067}
m_Layer: 0
- m_Name: OutlineCircle
+ m_Name: CentreCircle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!212 &1912239088
+--- !u!4 &1017534066
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1017534065}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.099999994, y: 0.099999994, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1912239089}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1017534067
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1017534065}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 90fe0aef7f0c12d4a9073232e5cfa2b1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ blockObj: {fileID: 5953652883336373052, guid: 33940c6653f8c7743a09e6d66a285ead, type: 3}
+--- !u!212 &1017534068
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1912239087}
+ m_GameObject: {fileID: 1017534065}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -252,7 +516,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: 660393769bbb1c448bc924dc46f3ed42, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -273,8 +537,8 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: f0100137a2a101249969bfa914d98ec6, type: 3}
- m_Color: {r: 0, g: 0.4339623, b: 0.1321848, a: 1}
+ m_Sprite: {fileID: 21300000, guid: d2d919b8be7f9544aa3fc34ec9389b45, type: 3}
+ m_Color: {r: 0.46262014, g: 0.8679245, b: 0.58676744, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -284,23 +548,141 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!4 &1912239089
-Transform:
+--- !u!1 &1331087312
+GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1912239087}
- serializedVersion: 2
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1331087313}
+ - component: {fileID: 1331087315}
+ - component: {fileID: 1331087314}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1331087313
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1331087312}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.1, y: 0.1, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1953068990}
- m_Father: {fileID: 0}
+ m_Children: []
+ m_Father: {fileID: 2298785}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1953068988
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1331087314
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1331087312}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: Button
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4281479730
+ m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 24
+ m_fontSizeBase: 24
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1331087315
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1331087312}
+ m_CullTransparentMesh: 1
+--- !u!1 &1912239087
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -308,22 +690,22 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1953068990}
- - component: {fileID: 1953068989}
+ - component: {fileID: 1912239089}
+ - component: {fileID: 1912239088}
m_Layer: 0
- m_Name: CentreCircle
+ m_Name: OutlineCircle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!212 &1953068989
+--- !u!212 &1912239088
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1953068988}
+ m_GameObject: {fileID: 1912239087}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -337,7 +719,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 660393769bbb1c448bc924dc46f3ed42, type: 2}
+ - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -358,8 +740,8 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: d2d919b8be7f9544aa3fc34ec9389b45, type: 3}
- m_Color: {r: 0.46262014, g: 0.8679245, b: 0.58676744, a: 1}
+ m_Sprite: {fileID: 21300000, guid: f0100137a2a101249969bfa914d98ec6, type: 3}
+ m_Color: {r: 0, g: 0.4339623, b: 0.1321848, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -369,20 +751,21 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!4 &1953068990
+--- !u!4 &1912239089
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1953068988}
+ m_GameObject: {fileID: 1912239087}
serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 0.1, z: 0}
m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1912239089}
+ m_Children:
+ - {fileID: 1017534066}
+ m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2036898555
GameObject:
@@ -459,3 +842,4 @@ SceneRoots:
- {fileID: 519420032}
- {fileID: 1912239089}
- {fileID: 2036898558}
+ - {fileID: 706484908}
diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
index fbd3030..97a0558 100644
--- a/Assets/Scenes/Menu.unity
+++ b/Assets/Scenes/Menu.unity
@@ -1590,52 +1590,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 828931910}
m_CullTransparentMesh: 1
---- !u!1 &869075939
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 869075941}
- - component: {fileID: 869075940}
- m_Layer: 0
- m_Name: ProtocolHandler
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &869075940
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 869075939}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4086a0d1049524d4ca4421406fc81727, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- numCyclesInput: {fileID: 1992066360}
- blockControl: {fileID: 1785070519}
---- !u!4 &869075941
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 869075939}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 629.43994, y: 438.92883, z: -6.8732853}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1113057184
GameObject:
m_ObjectHideFlags: 0
@@ -2485,7 +2439,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 379892acc53108d45bdbe28f2e3223fd, type: 3}
m_Name:
m_EditorClassIdentifier:
- protocolGameObject: {fileID: 869075939}
+ protocolGameObject: {fileID: 1600482173}
--- !u!1 &1380475412
GameObject:
m_ObjectHideFlags: 0
@@ -2605,7 +2559,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 869075940}
+ - m_Target: {fileID: 1600482174}
m_TargetAssemblyTypeName: ProtocolHandler, Assembly-CSharp
m_MethodName: SetBlockStack
m_Mode: 1
@@ -2617,6 +2571,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
+ - m_Target: {fileID: 1993962873}
+ m_TargetAssemblyTypeName: SceneLoaderClass, Assembly-CSharp
+ m_MethodName: LoadRunScene
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!114 &1388192736
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2884,7 +2850,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- - m_Target: {fileID: 869075940}
+ - m_Target: {fileID: 1600482174}
m_TargetAssemblyTypeName: ProtocolHandler, Assembly-CSharp
m_MethodName: UpdateTotalRuntime
m_Mode: 1
@@ -3268,6 +3234,52 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1534377887}
m_CullTransparentMesh: 1
+--- !u!1 &1600482173
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1600482175}
+ - component: {fileID: 1600482174}
+ m_Layer: 0
+ m_Name: ProtocolHandler
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1600482174
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1600482173}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4086a0d1049524d4ca4421406fc81727, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ numCyclesInput: {fileID: 1992066360}
+ blockControl: {fileID: 1785070519}
+--- !u!4 &1600482175
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1600482173}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 629.43994, y: 438.92883, z: -6.8732853}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1609426705
GameObject:
m_ObjectHideFlags: 0
@@ -4222,7 +4234,7 @@ MonoBehaviour:
m_OnEndEdit:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 869075940}
+ - m_Target: {fileID: 0}
m_TargetAssemblyTypeName: ProtocolHandler, Assembly-CSharp
m_MethodName: UpdateNumCycles
m_Mode: 1
@@ -4308,6 +4320,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1992066360}
m_CullTransparentMesh: 1
+--- !u!1 &1993962872
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1993962874}
+ - component: {fileID: 1993962873}
+ m_Layer: 0
+ m_Name: SceneLoader
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1993962873
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1993962872}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5ad3403954b930245bcb454625932882, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ gameObjectToMove: {fileID: 1600482173}
+--- !u!4 &1993962874
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1993962872}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0.3704251, y: -0.23480365, z: 0.03030179}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2036898555
GameObject:
m_ObjectHideFlags: 0
@@ -4539,4 +4596,5 @@ SceneRoots:
- {fileID: 1912239089}
- {fileID: 473153907}
- {fileID: 2036898558}
- - {fileID: 869075941}
+ - {fileID: 1600482175}
+ - {fileID: 1993962874}
diff --git a/Assets/ProtocolHandler.cs b/Assets/Scripts/ProtocolHandler.cs
similarity index 67%
rename from Assets/ProtocolHandler.cs
rename to Assets/Scripts/ProtocolHandler.cs
index 0541dd9..1d9bee6 100644
--- a/Assets/ProtocolHandler.cs
+++ b/Assets/Scripts/ProtocolHandler.cs
@@ -6,6 +6,7 @@ using TMPro;
public class ProtocolHandler : MonoBehaviour
{
+ public static ProtocolHandler Instance;
public GameObject numCyclesInput;
public GameObject blockControl;
public float TotalRuntime { get; private set; }
@@ -16,12 +17,23 @@ public class ProtocolHandler : MonoBehaviour
int currentBlockIndex = 0;
int currentCycle = 0;
- float timeBetweenBlocks = 3f; // seconds, not implemented
-
+ static float timeBetweenBlocks = 3f; // seconds, not implemented
+
+ private void Awake()
+ {
+ if (Instance != null)
+ {
+ Destroy(gameObject);
+ return;
+ }
+ Instance = this;
+ DontDestroyOnLoad(gameObject);
+ }
+
// Start is called before the first frame update
void Start()
{
- UpdateTotalRuntime();
+
}
// Update is called once per frame
@@ -56,4 +68,20 @@ public class ProtocolHandler : MonoBehaviour
i++;
}
}
+
+ public void PrintBlockStack()
+ {
+ int i = 0;
+ foreach (var block in blockStack)
+ {
+ BlockObjectClass boc = block.GetComponent<BlockObjectClass>();
+ Debug.Log("boc " + i + " inhale: " + boc.InhalePeriod);
+ i++;
+ }
+ }
+}
+
+public class ProtocolVariables
+{
+ List<BlockObjectClass>
}
\ No newline at end of file
diff --git a/Assets/ProtocolHandler.cs.meta b/Assets/Scripts/ProtocolHandler.cs.meta
similarity index 100%
rename from Assets/ProtocolHandler.cs.meta
rename to Assets/Scripts/ProtocolHandler.cs.meta
diff --git a/Assets/Scripts/SceneLoaderClass.cs b/Assets/Scripts/SceneLoaderClass.cs
new file mode 100644
index 0000000..02c598b
--- /dev/null
+++ b/Assets/Scripts/SceneLoaderClass.cs
@@ -0,0 +1,51 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class SceneLoaderClass : MonoBehaviour
+{
+ public static SceneLoaderClass Instance;
+ public GameObject gameObjectToMove;
+ string breathingProtocol = "Scenes/BreathingProtocol";
+ string menu = "Scenes/Menu";
+ private void Awake()
+ {
+ if (Instance != null)
+ {
+ Destroy(gameObject);
+ return;
+ }
+ Instance = this;
+ DontDestroyOnLoad(gameObject);
+ }
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ Scene currentScene = SceneManager.GetActiveScene();
+ Debug.Log(currentScene.name);
+ if (currentScene.name == "BreathingProtocol")
+ {
+ GameObject go = GameObject.Find("ProtocolHandler");
+ go.GetComponent<ProtocolHandler>().PrintBlockStack();
+ }
+ }
+
+ public void LoadRunScene()
+ {
+ // Scene scene = SceneManager.GetSceneByName(breathingProtocol);
+ // SceneManager.MoveGameObjectToScene(gameObjectToMove, scene);
+ SceneManager.LoadScene(breathingProtocol);
+ }
+
+ public void LoadMenuScene()
+ {
+ SceneManager.LoadScene(menu);
+ }
+}
diff --git a/Assets/Scripts/SceneLoaderClass.cs.meta b/Assets/Scripts/SceneLoaderClass.cs.meta
new file mode 100644
index 0000000..aee6b2b
--- /dev/null
+++ b/Assets/Scripts/SceneLoaderClass.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5ad3403954b930245bcb454625932882
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 82ab0f5..19fa47c 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,6 +6,9 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
- path: Assets/Scenes/SampleScene.unity
- guid: 2cda990e2423bbf4892e6590ba056729
+ path: Assets/Scenes/Menu.unity
+ guid: 6a224ba0dce085d46999c919e7d1a15e
+ - enabled: 1
+ path: Assets/Scenes/BreathingProtocol.unity
+ guid: d1388fd2d072a0c4eabdb89a7ed3a5a0
m_configObjects: {}
--
GitLab