diff --git a/.idea/.idea.Doggo-Nogo/.idea/workspace.xml b/.idea/.idea.Doggo-Nogo/.idea/workspace.xml index ef5a0a4..d419393 100644 --- a/.idea/.idea.Doggo-Nogo/.idea/workspace.xml +++ b/.idea/.idea.Doggo-Nogo/.idea/workspace.xml @@ -5,43 +5,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/Assets/Scenes/Simple RT.unity b/Assets/Scenes/Simple RT.unity index f2cdd20..fc89a94 100644 --- a/Assets/Scenes/Simple RT.unity +++ b/Assets/Scenes/Simple RT.unity @@ -1367,7 +1367,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 447.81503, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1026645577 @@ -1628,7 +1628,7 @@ GameObject: - component: {fileID: 1143177681} - component: {fileID: 1143177683} m_Layer: 5 - m_Name: Score Change + m_Name: Trial Score m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2119,6 +2119,82 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &1444371653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1444371657} + - component: {fileID: 1444371656} + - component: {fileID: 1444371655} + - component: {fileID: 1444371654} + m_Layer: 0 + m_Name: Level1Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1444371654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444371653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb7389c5bff54cb2afa59dc310cd7fa2, type: 3} + m_Name: + m_EditorClassIdentifier: + feedbackView: {fileID: 1969894689} +--- !u!114 &1444371655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444371653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dda70d39806c4774b5b002a36b9126c9, type: 3} + m_Name: + m_EditorClassIdentifier: + gameConfig: {fileID: 11400000, guid: db0760b0c4e5b468f8881330a088a884, type: 2} + boneView: {fileID: 1390488369} +--- !u!114 &1444371656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444371653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64c1dadaddd042178e017e8fb41d34c6, type: 3} + m_Name: + m_EditorClassIdentifier: + gameConfig: {fileID: 11400000, guid: db0760b0c4e5b468f8881330a088a884, type: 2} + uiController: {fileID: 1444371654} + boneView: {fileID: 1390488369} +--- !u!4 &1444371657 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444371653} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1479691775 GameObject: m_ObjectHideFlags: 0 @@ -8065,7 +8141,7 @@ GameObject: - component: {fileID: 1786151914} - component: {fileID: 1786151916} m_Layer: 5 - m_Name: Score + m_Name: Total Score m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8283,6 +8359,155 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1921795055} m_CullTransparentMesh: 1 +--- !u!1 &1969894687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1969894690} + - component: {fileID: 1969894689} + - component: {fileID: 1969894688} + m_Layer: 0 + m_Name: Feedback + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1969894688 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969894687} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 301504729e7c748988b710176ec0b7a5, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1969894689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969894687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68875e3fa6ecc4b859480efe2663b639, type: 3} + m_Name: + m_EditorClassIdentifier: + scoreText: {fileID: 1786151914} + scoreChange: {fileID: 1143177681} + feedbackText: {fileID: 1479691777} + healthBar: {fileID: 0} + dogView: {fileID: 1504777854} + boneView: {fileID: 1390488369} + backgroundMusic: {fileID: 1969894688} + changingLevel: 0 +--- !u!4 &1969894690 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969894687} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1995774759 GameObject: m_ObjectHideFlags: 0 @@ -8372,8 +8597,68 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1001 &7260254825786627293 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7331681004479383633, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7945155197457443849, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} + propertyPath: m_Name + value: GameManager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c13e346eed48142f4b01bdb9f1774afa, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 519420032} + - {fileID: 7260254825786627293} + - {fileID: 1444371657} + - {fileID: 1969894690} diff --git a/Assets/Scripts/Controllers/Level1/Level1UIController.cs b/Assets/Scripts/Controllers/Level1/Level1UIController.cs index 898f08f..1973462 100644 --- a/Assets/Scripts/Controllers/Level1/Level1UIController.cs +++ b/Assets/Scripts/Controllers/Level1/Level1UIController.cs @@ -37,7 +37,7 @@ private void HandleTrialCompleted(TrialResult result) private void HandleInvalidResponse(string reason) { // Probably no need for this event - that's extracted elsewhere. - //feedbackView.ShowInvalidResponse(reason); + // feedbackView.ShowInvalidResponse(reason); } } \ No newline at end of file