From 1da6535299a51269ff7d1aaabf0657d305828de7 Mon Sep 17 00:00:00 2001
From: rqchia <raymond.q.chia@student.uts.edu.au>
Date: Mon, 13 Nov 2023 14:17:32 +1100
Subject: [PATCH] default blocks + start anim bug fix
---
Assets/Scenes/Menu.unity | 16 +++++++-
Assets/Scripts/BlockHandler.cs | 60 ++++++++++++++++++++++++++----
Assets/Scripts/BlockObjectClass.cs | 3 ++
Assets/Scripts/RunCountdown.cs | 3 +-
EventLogs/20231113T141534.json | 1 +
Packages/manifest.json | 4 +-
Packages/packages-lock.json | 4 +-
ProjectSettings/ProjectVersion.txt | 4 +-
8 files changed, 78 insertions(+), 17 deletions(-)
create mode 100644 EventLogs/20231113T141534.json
diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
index 36f9bdf..18812ab 100644
--- a/Assets/Scenes/Menu.unity
+++ b/Assets/Scenes/Menu.unity
@@ -1709,7 +1709,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: "1\u200B"
+ m_text: "7\u200B"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -2082,7 +2082,7 @@ MonoBehaviour:
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_CustomCaretColor: 0
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
- m_Text: 1
+ m_Text: 7
m_CaretBlinkRate: 0.85
m_CaretWidth: 1
m_ReadOnly: 0
@@ -2908,6 +2908,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
+ - m_Target: {fileID: 1953068991}
+ 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 &1388192736
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/BlockHandler.cs b/Assets/Scripts/BlockHandler.cs
index 334f846..b199487 100644
--- a/Assets/Scripts/BlockHandler.cs
+++ b/Assets/Scripts/BlockHandler.cs
@@ -23,10 +23,11 @@ public class BlockHandler : MonoBehaviour
void Awake()
{
dropdown = this.GetComponent<TMP_Dropdown>();
- GameObject firstBlock = GetBlockObjectPrefab();
- blockStack.Add(firstBlock);
- blockStack[0].SetActive(true);
- runningBlock = blockStack[0];
+ TMP_InputField inputField;
+ inputField = nBlockInput.GetComponent<TMP_InputField>();
+ inputField.text = "7";
+
+ SetDefaultBlocks();
UpdateOptions();
SetRunningBlockIndex();
@@ -34,10 +35,15 @@ public class BlockHandler : MonoBehaviour
UpdateBlockStackRuntime();
}
+ void Start()
+ {
+
+ }
+
// Update is called once per frame
void Update()
{
-
+
}
public void UpdateOptions()
@@ -51,14 +57,14 @@ public class BlockHandler : MonoBehaviour
}
public void UpdateMaxNumBlocks()
- {
+ {
TMP_InputField inputField;
inputField = nBlockInput.GetComponent<TMP_InputField>();
maxNumBlocks = Int32.Parse(inputField.text);
if (maxNumBlocks <= 0)
{
maxNumBlocks = 1;
- }
+ }
}
public void SetRunningBlockIndex(int blockIndexInput = -1)
@@ -93,7 +99,7 @@ public class BlockHandler : MonoBehaviour
{
for (int i = numblockStack; i > maxNumBlocks; i--)
{
- blockStack.RemoveAt(i);
+ blockStack.RemoveAt(i-1);
}
}
SetRunningBlockIndex();
@@ -142,4 +148,42 @@ public class BlockHandler : MonoBehaviour
return block;
}
+ void SetDefaultBlocks(int defaultLen = -1)
+ {
+ bool isEmpty = !blockStack.Any();
+ if (!isEmpty)
+ {
+ foreach (var block in blockStack)
+ {
+ Destroy(block);
+ }
+ blockStack.Clear();
+ }
+ int[] bpms = new int[7] { 5, 7, 10, 12, 15, 17, 20 };
+ float runtime = 60.0f;
+ float ratio = 1.5f; // ratio of inhale : exhale period
+ float inhale = 0f;
+ float exhale = 0f;
+
+ int numDefaultBlocks = bpms.Length;
+ if (defaultLen > 0 && defaultLen < bpms.Length)
+ {
+ numDefaultBlocks = defaultLen;
+ }
+
+ for (int i = 0; i < numDefaultBlocks; i++)
+ {
+ inhale = runtime / (bpms[i] * (1+ratio));
+ exhale = inhale * ratio;
+ GameObject block = GetBlockObjectPrefab();
+ BlockObjectClass boc = block.GetComponent<BlockObjectClass>();
+ boc.SetInhalePeriod(inhale);
+ boc.SetExhalePeriod(exhale);
+ blockStack.Add(block);
+ blockStack[i].SetActive(false);
+ }
+ blockStack[0].SetActive(true);
+ runningBlock = blockStack[0];
+ }
+
}
diff --git a/Assets/Scripts/BlockObjectClass.cs b/Assets/Scripts/BlockObjectClass.cs
index 4341094..aa9fe04 100644
--- a/Assets/Scripts/BlockObjectClass.cs
+++ b/Assets/Scripts/BlockObjectClass.cs
@@ -63,6 +63,7 @@ public class BlockObjectClass : MonoBehaviour
else
{
InhalePeriod = inhalePeriod;
+ inhalePeriodTextInput.text = inhalePeriod.ToString();
}
}
@@ -75,6 +76,7 @@ public class BlockObjectClass : MonoBehaviour
else
{
ExhalePeriod = exhalePeriod;
+ exhalePeriodTextInput.text = exhalePeriod.ToString();
}
}
public void SetRuntime(float runtimeInput=-1f)
@@ -86,6 +88,7 @@ public class BlockObjectClass : MonoBehaviour
else
{
MaxRuntime = runtimeInput;
+ runtimeTextInput.text = runtimeInput.ToString();
}
}
}
diff --git a/Assets/Scripts/RunCountdown.cs b/Assets/Scripts/RunCountdown.cs
index 567883b..78093a0 100644
--- a/Assets/Scripts/RunCountdown.cs
+++ b/Assets/Scripts/RunCountdown.cs
@@ -8,6 +8,7 @@ public class RunCountdown : MonoBehaviour
public GameObject protocolHandlerObject;
ProtocolHandler protocolHandler;
+ int fontsize = 36;
int maxCountdownValue = 3;
int countdown = 3;
float timer = 0;
@@ -24,7 +25,7 @@ public class RunCountdown : MonoBehaviour
// Start is called before the first frame update
void Start()
{
- displayText.fontSize = 32;
+ displayText.fontSize = fontsize;
displayText.color = Color.red;
}
diff --git a/EventLogs/20231113T141534.json b/EventLogs/20231113T141534.json
new file mode 100644
index 0000000..9bc8780
--- /dev/null
+++ b/EventLogs/20231113T141534.json
@@ -0,0 +1 @@
+[{"timestamp":"13/11/2023 2:15:34 PM","inhalePeriod":"4.8","exhalePeriod":"7.2","eventTag":"Start"},{"timestamp":"13/11/2023 2:15:34 PM","inhalePeriod":"4.8","exhalePeriod":"7.2","eventTag":"Stop"}]
\ No newline at end of file
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 553406d..da30cd2 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -8,8 +8,8 @@
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ai.navigation": "1.1.5",
"com.unity.collab-proxy": "2.2.0",
- "com.unity.ide.rider": "3.0.25",
- "com.unity.ide.visualstudio": "2.0.21",
+ "com.unity.ide.rider": "3.0.26",
+ "com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.vscode": "1.2.5",
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.test-framework": "1.1.33",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 88b9dca..dffd9dc 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -113,7 +113,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
- "version": "3.0.25",
+ "version": "3.0.26",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -122,7 +122,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
- "version": "2.0.21",
+ "version": "2.0.22",
"depth": 0,
"source": "registry",
"dependencies": {
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index e4eac15..91206fd 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.12f1
-m_EditorVersionWithRevision: 2022.3.12f1 (4fe6e059c7ef)
+m_EditorVersion: 2022.3.13f1
+m_EditorVersionWithRevision: 2022.3.13f1 (5f90a5ebde0f)
--
GitLab