Revize da24cc5e

Generator a snaha o learning phase

workdir/Asociace/Assembly-CSharp.csproj

@@ -134 +134 @@
     <Compile Include="Assets\Scripts\_Template\OutputData\DataCollector.cs" />
     <Compile Include="Assets\Scripts\_Template\OutputData\TaskResults.cs" />
     <Compile Include="Assets\Scripts\Tools\Platform.cs" />
+    <Compile Include="Assets\Scripts\Data\Input\Exam.cs" />
+    <Compile Include="Assets\Scripts\Data\Input\Pair.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Assets\Libs\TextMesh Pro\Resources\Shaders\TMPro.cginc" />

workdir/Asociace/Assets/Scenes/Task.unity

@@ -276 +276 @@
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &255239378
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 255239379}
+  - component: {fileID: 255239381}
+  - component: {fileID: 255239380}
+  m_Layer: 5
+  m_Name: Dash
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &255239379
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 255239378}
+  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: []
+  m_Father: {fileID: 2016511102}
+  m_RootOrder: 2
+  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: -50, y: 160}
+  m_SizeDelta: {x: 220, y: 200}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &255239380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 255239378}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, 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_FontData:
+    m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+    m_FontSize: 150
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 150
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u2014"
+--- !u!222 &255239381
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 255239378}
+  m_CullTransparentMesh: 0
 --- !u!1 &291388078
 GameObject:
   m_ObjectHideFlags: 0
@@ -305 +385 @@
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 178914314}
+  - {fileID: 2016511102}
   m_Father: {fileID: 52936798}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -391 +472 @@
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 304498249}
   m_CullTransparentMesh: 0
+--- !u!1 &310863374
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 310863375}
+  - component: {fileID: 310863377}
+  - component: {fileID: 310863376}
+  m_Layer: 5
+  m_Name: Right Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &310863375
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 310863374}
+  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: []
+  m_Father: {fileID: 2016511102}
+  m_RootOrder: 1
+  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: 480, y: 160}
+  m_SizeDelta: {x: 700, y: 170}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &310863376
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 310863374}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &310863377
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 310863374}
+  m_CullTransparentMesh: 0
 --- !u!1 &361082131
 GameObject:
   m_ObjectHideFlags: 0
@@ -1952 +2113 @@
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 401.0656, y: 0}
-  m_SizeDelta: {x: 802.1312, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1729012035
 MonoBehaviour:
@@ -2049 +2210 @@
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &1851563705
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1851563706}
+  - component: {fileID: 1851563708}
+  - component: {fileID: 1851563707}
+  m_Layer: 5
+  m_Name: Left Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1851563706
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1851563705}
+  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: []
+  m_Father: {fileID: 2016511102}
+  m_RootOrder: 0
+  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: -580, y: 160}
+  m_SizeDelta: {x: 700, y: 170}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1851563707
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1851563705}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &1851563708
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1851563705}
+  m_CullTransparentMesh: 0
 --- !u!1 &1896176078
 GameObject:
   m_ObjectHideFlags: 0
@@ -2183 +2424 @@
   border: {fileID: 1357186458}
   examining: {fileID: 1967963960}
   LinearTimer: {fileID: 178914313}
+  TextObjects: {fileID: 2016511101}
 --- !u!114 &1896176084
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2247 +2489 @@
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &2016511101
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2016511102}
+  m_Layer: 5
+  m_Name: Text Objects
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2016511102
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2016511101}
+  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: 1851563706}
+  - {fileID: 310863375}
+  - {fileID: 255239379}
+  m_Father: {fileID: 291388079}
+  m_RootOrder: 1
+  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: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2033945652
 GameObject:
   m_ObjectHideFlags: 0

workdir/Asociace/Assets/Scripts/Data/Input/Exam.cs

@@ +1 @@
+using System;
+using System.Text;
+using Tools;
+using UnityEngine;
+
+namespace Data.Input
+{
+
+    /// <summary>
+    /// Class represents the exam part of the game
+    /// </summary>
+    public class Exam
+    {
+        /// <summary>
+        /// Array of all options
+        /// </summary>
+        private string[] Options;
+
+        /// <summary>
+        /// The correct part of the pair
+        /// </summary>
+        private readonly string CorrectWord;
+
+        /// <summary>
+        /// The displaying part of the pair
+        /// </summary>
+        private readonly string WordToDisplay;
+
+        /// <summary>
+        /// The original string without any edit
+        /// </summary>
+        private readonly string OriginalDisplayingWord;
+
+        public Exam(Pair pair, int round)
+        {
+            string[] pairItems = new string[] { pair.t1, pair.t2 };
+            int rn = General.GetRandomInt(pairItems.Length);
+
+            this.CorrectWord = pairItems[rn];
+            this.WordToDisplay = pairItems[1 - rn];
+            this.OriginalDisplayingWord = WordToDisplay;
+            this.WordToDisplay = HideChars(this.WordToDisplay, round);
+
+            InitializeOptions();
+        }
+
+        /// <summary>
+        /// Initializes array and sets all options.
+        /// </summary>
+        private void InitializeOptions()
+        {
+            this.Options = new string[Constants.OPTIONS_NUMBER];
+
+            for (int i = 0; i < Constants.OPTIONS_NUMBER; i++)
+            {
+                string tmp;
+                do
+                {
+                    int rn = General.GetRandomInt(RoundDataGenerator.Instance.AllPairs.Count);
+                    tmp = new string[] { RoundDataGenerator.Instance.AllPairs[rn].t1, RoundDataGenerator.Instance.AllPairs[rn].t2 }[General.GetRandomInt(2)];
+                } while (Array.IndexOf(this.Options, tmp) > -1 || tmp.Equals(this.CorrectWord) || tmp.Equals(this.WordToDisplay));
+
+                this.Options[i] = tmp;
+            }
+
+            this.Options[General.GetRandomInt(Constants.OPTIONS_NUMBER)] = this.CorrectWord;
+        }
+
+        /// <summary>
+        /// Hides some characters from the pair option
+        /// </summary>
+        /// <param name="s">the string</param>
+        /// <returns>the string with hidden characters</returns>
+        private string HideChars(string s, int round)
+        {
+            StringBuilder str = new StringBuilder(s);
+            for (int i = 0; i < Task.Configuration.RoundsCharsToHide[round]; i++)
+            {
+                str[General.GetRandomInt(str.Length)] = Constants.HIDDEN_CHAR;
+            }
+            return str.ToString();
+        }
+
+        /// <summary>
+        /// Returns the results
+        /// </summary>
+        /// <returns>correct word</returns>
+        public string GetCorrectWord()
+        {
+            return this.CorrectWord;
+        }
+
+        /// <summary>
+        /// returns word to be displayed
+        /// </summary>
+        /// <returns>word to be displayed</returns>
+        public string GetDisplayingWord()
+        {
+            return this.WordToDisplay;
+        }
+
+        /// <summary>
+        /// returns word to be displayed
+        /// </summary>
+        /// <returns>word to be displayed</returns>
+        public string GetOriginalDisplayingWord()
+        {
+            return this.OriginalDisplayingWord;
+        }
+
+        /// <summary>
+        /// Returns all options in one part
+        /// </summary>
+        /// <returns></returns>
+        public string[] GetOptions()
+        {
+            return this.Options;
+        }
+
+        public string GetPair()
+        {
+            return "(" + this.OriginalDisplayingWord + "," + this.CorrectWord + ")";
+        }
+
+    }
+
+}

workdir/Asociace/Assets/Scripts/Data/Input/Exam.cs.meta

@@ +1 @@
+fileFormatVersion: 2
+guid: b39597a5f325f79459e6a6d1cdb98e6a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

workdir/Asociace/Assets/Scripts/Data/Input/Pair.cs

@@ +1 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Data.Input
+{
+    public class Pair
+    {
+
+        /// <summary>
+        /// Text of first word
+        /// </summary>
+        public string t1;
+
+        /// <summary>
+        /// Text of second word
+        /// </summary>
+        public string t2;
+
+        public Pair(string s)
+        {
+            string[] tmp = s.Trim().Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+            this.t1 = tmp[0].ToUpper();
+            this.t2 = tmp[1].ToUpper();
+        }
+
+        public override string ToString()
+        {
+            return "(" + this.t1 + "," + this.t2 + ")";
+        }
+    }
+}

workdir/Asociace/Assets/Scripts/Data/Input/Pair.cs.meta

@@ +1 @@
+fileFormatVersion: 2
+guid: a90f0bf1e25b43c4f86d924e2d9629d6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

workdir/Asociace/Assets/Scripts/Tools/General.cs

@@ -234 +234 @@
             }
             return true;
         }
+
+        public static int GetRandomInt(int limit)
+        {
+            return random.Next(limit);
+        }
     }
 }

workdir/Asociace/Assets/Scripts/Tools/RealTime.cs

@@ -18 +18 @@
         /// </summary>
         private static Stopwatch gameTime;
 
+        /// <summary>
+        /// Display time of the current pair
+        /// </summary>
+        private static Stopwatch pairDisplayTime;
+
         public static float TotalTime => totalTime.Time();
 
         public static float GameTime => gameTime.Time();
@@ -28 +33 @@
         {
             totalTime = new Stopwatch();
             gameTime = new Stopwatch();
+            pairDisplayTime = new Stopwatch();
             totalTime.Start();
         }
 
@@ -87 +93 @@
                 }
                 return counter + DiffBetweenCurrAndStartTime();
             }
+
+            public void Reset()
+            {
+                counter = 0;
+            }
             
             public void Start()
             {

workdir/Asociace/Assets/Scripts/Ui/Components/TimeBar.cs

@@ -25 +25 @@
         /// </summary>
         private static float startGameTime;
 
+        public static bool learningPart;
+
         static TimeBar()
         {
             currentMaxTime = -1;
+            learningPart = false;
         }
 
         private void Start()

workdir/Asociace/Assets/Scripts/_Template/InputData/RoundData.cs

@@ -1 +1 @@
 
+using System.Collections.Generic;
+
 namespace Data.Input
 {
     /// <summary>
@@ -6 +8 @@
     /// </summary>
     public class RoundData
     {
+        public List<Exam> RoundPairs;
+
         public RoundData()
         {
+            this.RoundPairs = new List<Exam>();
         }
     }
 }

workdir/Asociace/Assets/Scripts/_Template/InputData/RoundDataGenerator.cs

@@ -1 +1 @@
 
+using System.Collections.Generic;
+using Tools;
+
 namespace Data.Input
 {
     /// <summary>
@@ -11 +14 @@
         /// </summary>
         public static RoundDataGenerator Instance { get; }
         static RoundDataGenerator() => Instance = new RoundDataGenerator();
-        private RoundDataGenerator() { }
+
+        public List<Pair> AllPairs;
+
+        private RoundDataGenerator() {
+            AllPairs = new List<Pair>();
+            foreach (string s in Task.Configuration.PairsStrings)
+                AllPairs.Add(new Pair(s));
+        }
 
         /// <summary>
         /// Generated round data.
         /// </summary>
         private RoundData[] rounds;
-        
+
         /// <summary>
         /// Prepare data for all rounds of the task.
         /// </summary>
         public void GenerateRoundData()
         {
-            rounds = new RoundData[Task.Configuration.NumOfRounds];
-            for (int i = 0; i < rounds.Length; i++)
+            for (int round = 0; round < Task.Configuration.NumOfRounds; round++)
             {
-                rounds[i] = new RoundData();
+                List<Pair> pairs = new List<Pair>();
+                Task.Configuration.Rounds[round] = new RoundData();
+                for (int i = 0; i < Task.Configuration.RoundsPairsNumber[round]; i++)
+                {
+                    Pair tmp;
+                    do
+                    {
+                        tmp = AllPairs[General.GetRandomInt(AllPairs.Count)];
+                    } while (pairs.Contains(tmp));
+
+                    pairs.Add(tmp);
+                    Task.Configuration.Rounds[round].RoundPairs.Add(new Exam(tmp, round));
+                }
             }
         }
     }

workdir/Asociace/Assets/Scripts/_Template/OutputData/DataCollector.cs

@@ -26 +26 @@
         /// </summary>
         public static int Round => Instance.gameResults.rounds.Count - 1;
 
+        /// <summary>
+        /// Index of current showing pair
+        /// </summary>
+        public int currentPairIndex;
+
         /// <summary>
         /// If the last round is currently in progress.
         /// </summary>
@@ -50 +55 @@
             currentRound = null;
             actionId = 1;
             currentCovering = null;
+            currentPairIndex = 0;
         }
 
         /// <summary>

workdir/Asociace/Assets/Scripts/_Template/TaskMainCamera.cs

@@ -8 +8 @@
 using Ui.Components;
 using Ui.GuiStrings;
 using Ui.Panels;
+using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -88 +89 @@
         /// </summary>
         public GameObject LinearTimer;
 
+        /// <summary>
+        /// Gameobjects containing all text objects.
+        /// </summary>
+        public GameObject TextObjects;
+
         protected override void Awake()
         {
             base.Awake();
@@ -105 +111 @@
             StartCoroutine(UncoverStage(StartFirstRound));
         }
 
+
         /// <summary>
         /// Function that starts the tutorial or the first round of the task according to <see cref="SceneManager.TutorialIsRunning"/>.
         /// </summary>
@@ -427 +434 @@
 
         private void LearningPhase()
         {
-            
+
         }
 
-        /// <summary>
-        /// Function controls linear timer. It changes fill amount and color based on remaining time.
-        /// </summary>
-        /// <param name="time">elapsed display time of one pair</param>
-        private void LinearTimerControl(float time)
+        private void AfterOptionClickControl(bool correct, string clickID = null)
         {
-            Image frontRadialTimer = LinearTimer.transform.GetChild(1).gameObject.GetComponent<Image>();
-            float percentage = (Task.Configuration.PairDisplayTime - time) / Task.Configuration.PairDisplayTime;
-            frontRadialTimer.color = Color.Lerp(Constants.RED_COLOR, Constants.GREEN_COLOR, percentage);
-            frontRadialTimer.fillAmount = percentage;
+            //DisableAllButtons();
+
+            var rightText = TextObjects.transform.GetChild(1).GetComponent<Text>();
+            rightText.text = Task.Configuration.Rounds[DataCollector.Round].RoundPairs[DataCollector.Instance.currentPairIndex].GetCorrectWord();
+            rightText.color = new Color(0.1f, 0.50f, 0);
+            TextObjects.transform.GetChild(0).GetComponent<Text>().text = (Task.Configuration.Rounds[DataCollector.Round].RoundPairs[DataCollector.Instance.currentPairIndex].GetOriginalDisplayingWord());
+            //Audio.GetComponent<AudioPlayer>().Play(correct);
+            DataCollector.Instance.currentPairIndex++;
+            /*
+
+            if (currentPairIndex == InputParams.RoundsPairsNumber[round])
+            {
+                ShowSolution(clickID);
+            }
+            else
+            {
+                solutionOfOnePairShowing = WaitAndContinue2();
+                Continue.gameObject.SetActive(true);
+                Continue.GetComponentInChildren<Text>().text = ConfigFiles.Inputs.Data.Continue.ToString();
+                StartCoroutine(solutionOfOnePairShowing);
+            }
+            */
         }
     }
 }