From bfbf2401f74e024070cf78f95d2382999d626c66 Mon Sep 17 00:00:00 2001
From: Unknown <basti778@gmx.net>
Date: Tue, 2 Nov 2021 07:37:55 +0100
Subject: [PATCH] change color on single question
---
Assets/Scenes/GuidedThrowingScene.unity | 401 +++++++++---------
.../Scripts/UIScripts/QuestionnaireManager.cs | 2 +
.../UIScripts/QuestionnaireUIHandler.cs | 13 +
3 files changed, 216 insertions(+), 200 deletions(-)
diff --git a/Assets/Scenes/GuidedThrowingScene.unity b/Assets/Scenes/GuidedThrowingScene.unity
index aa1d636c..2179d673 100644
--- a/Assets/Scenes/GuidedThrowingScene.unity
+++ b/Assets/Scenes/GuidedThrowingScene.unity
@@ -2896,169 +2896,6 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 35f06a454fbeac847901ea2fcf780c8c, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06be398b1a54e6f4e9d7e081bd79e6d3, type: 3}
---- !u!43 &723322208
-Mesh:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name:
- serializedVersion: 10
- m_SubMeshes:
- - serializedVersion: 2
- firstByte: 0
- indexCount: 24
- topology: 0
- baseVertex: 0
- firstVertex: 0
- vertexCount: 8
- localAABB:
- m_Center: {x: 0, y: 0.01, z: 0}
- m_Extent: {x: 1.65, y: 0, z: 1.275}
- m_Shapes:
- vertices: []
- shapes: []
- channels: []
- fullWeights: []
- m_BindPose: []
- m_BoneNameHashes:
- m_RootBoneNameHash: 0
- m_BonesAABB: []
- m_VariableBoneCountWeights:
- m_Data:
- m_MeshCompression: 0
- m_IsReadable: 1
- m_KeepVertices: 1
- m_KeepIndices: 1
- m_IndexFormat: 0
- m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400
- m_VertexData:
- serializedVersion: 3
- m_VertexCount: 8
- m_Channels:
- - stream: 0
- offset: 0
- format: 0
- dimension: 3
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 12
- format: 0
- dimension: 4
- - stream: 0
- offset: 28
- format: 0
- dimension: 2
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- m_DataSize: 288
- _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f
- m_CompressedMesh:
- m_Vertices:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_UV:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Normals:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Tangents:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Weights:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_NormalSigns:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_TangentSigns:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_FloatColors:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_BoneIndices:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_Triangles:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_UVInfo: 0
- m_LocalAABB:
- m_Center: {x: 0, y: 0.01, z: 0}
- m_Extent: {x: 1.65, y: 0, z: 1.275}
- m_MeshUsageFlags: 0
- m_BakedConvexCollisionMesh:
- m_BakedTriangleCollisionMesh:
- m_MeshMetrics[0]: 1
- m_MeshMetrics[1]: 1
- m_MeshOptimizationFlags: 1
- m_StreamData:
- offset: 0
- size: 0
- path:
--- !u!1 &758489909
GameObject:
m_ObjectHideFlags: 0
@@ -3274,6 +3111,7 @@ MonoBehaviour:
deleteButton: {fileID: 376034851}
nextButton: {fileID: 758489909}
nextButtonText: {fileID: 1609551669}
+ QuestionnaireBackground: {fileID: 848772043}
selectedMat: {fileID: 2100000, guid: 66fd54a6a91bcfa46ad36fe266a18b52, type: 2}
defaultMat: {fileID: 2100000, guid: e496c156aaf82804a90d72331f1fe2cf, type: 2}
questionText: {fileID: 1927940424}
@@ -3831,7 +3669,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.24252403, g: 0.2501837, b: 0.4716981, a: 0.92941177}
+ m_Color: {r: 0, g: 0.02895247, b: 0.8396226, a: 0.92941177}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -4395,7 +4233,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 1718457529}
+ - {fileID: 2064797896}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -4423,7 +4261,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 954810121}
- m_Mesh: {fileID: 723322208}
+ m_Mesh: {fileID: 1444969637}
--- !u!1 &954809397
GameObject:
m_ObjectHideFlags: 0
@@ -6766,6 +6604,169 @@ Transform:
m_Father: {fileID: 955010963}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!43 &1444969637
+Mesh:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ serializedVersion: 10
+ m_SubMeshes:
+ - serializedVersion: 2
+ firstByte: 0
+ indexCount: 24
+ topology: 0
+ baseVertex: 0
+ firstVertex: 0
+ vertexCount: 8
+ localAABB:
+ m_Center: {x: 0, y: 0.01, z: 0}
+ m_Extent: {x: 1.65, y: 0, z: 1.275}
+ m_Shapes:
+ vertices: []
+ shapes: []
+ channels: []
+ fullWeights: []
+ m_BindPose: []
+ m_BoneNameHashes:
+ m_RootBoneNameHash: 0
+ m_BonesAABB: []
+ m_VariableBoneCountWeights:
+ m_Data:
+ m_MeshCompression: 0
+ m_IsReadable: 1
+ m_KeepVertices: 1
+ m_KeepIndices: 1
+ m_IndexFormat: 0
+ m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400
+ m_VertexData:
+ serializedVersion: 3
+ m_VertexCount: 8
+ m_Channels:
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 3
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 12
+ format: 0
+ dimension: 4
+ - stream: 0
+ offset: 28
+ format: 0
+ dimension: 2
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ m_DataSize: 288
+ _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f
+ m_CompressedMesh:
+ m_Vertices:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_UV:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Normals:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Tangents:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Weights:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_NormalSigns:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_TangentSigns:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_FloatColors:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_BoneIndices:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_Triangles:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_UVInfo: 0
+ m_LocalAABB:
+ m_Center: {x: 0, y: 0.01, z: 0}
+ m_Extent: {x: 1.65, y: 0, z: 1.275}
+ m_MeshUsageFlags: 0
+ m_BakedConvexCollisionMesh:
+ m_BakedTriangleCollisionMesh:
+ m_MeshMetrics[0]: 1
+ m_MeshMetrics[1]: 1
+ m_MeshOptimizationFlags: 1
+ m_StreamData:
+ offset: 0
+ size: 0
+ path:
--- !u!1001 &1447036887
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8056,40 +8057,6 @@ SphereCollider:
type: 3}
m_PrefabInstance: {fileID: 2611299300477793533}
m_PrefabAsset: {fileID: 0}
---- !u!21 &1718457529
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Sprites/Default
- m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords:
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _AlphaTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Floats:
- - PixelSnap: 0
- - _EnableExternalAlpha: 0
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _Flip: {r: 1, g: 1, b: 1, a: 1}
- - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &1725504905
GameObject:
m_ObjectHideFlags: 0
@@ -14171,6 +14138,40 @@ PrefabInstance:
- {fileID: 1793230290420724063, guid: 091280db79adc1b4e868e127b09da936, type: 3}
- {fileID: 2958851842460913177, guid: 091280db79adc1b4e868e127b09da936, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 091280db79adc1b4e868e127b09da936, type: 3}
+--- !u!21 &2064797896
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Sprites/Default
+ m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _AlphaTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - PixelSnap: 0
+ - _EnableExternalAlpha: 0
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Flip: {r: 1, g: 1, b: 1, a: 1}
+ - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &2109987833
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/UIScripts/QuestionnaireManager.cs b/Assets/Scripts/UIScripts/QuestionnaireManager.cs
index 7e49febe..4bb1f19f 100644
--- a/Assets/Scripts/UIScripts/QuestionnaireManager.cs
+++ b/Assets/Scripts/UIScripts/QuestionnaireManager.cs
@@ -59,6 +59,7 @@ public class QuestionnaireManager : MonoBehaviour
internal void PrepareFAMQuestionaire()
{
questionsToAsk.Clear();
+ QuestionnaireUIHandler.instance.SetBackgroundColor(false);
foreach (Question q in QuestionnaireUIHandler.instance.FAM)
{
questionsToAsk.AddLast(q);
@@ -68,6 +69,7 @@ public class QuestionnaireManager : MonoBehaviour
internal void PrepareSingleQuestion()
{
questionsToAsk.Clear();
+ QuestionnaireUIHandler.instance.SetBackgroundColor(true);
questionsToAsk.AddLast(QuestionnaireUIHandler.instance.singleQuestion);
}
diff --git a/Assets/Scripts/UIScripts/QuestionnaireUIHandler.cs b/Assets/Scripts/UIScripts/QuestionnaireUIHandler.cs
index 60bafb4b..93b5e73f 100644
--- a/Assets/Scripts/UIScripts/QuestionnaireUIHandler.cs
+++ b/Assets/Scripts/UIScripts/QuestionnaireUIHandler.cs
@@ -22,6 +22,7 @@ public class QuestionnaireUIHandler : MonoBehaviour
public GameObject deleteButton;
public GameObject nextButton;
public GameObject nextButtonText;
+ public Image QuestionnaireBackground;
public Material selectedMat;
public Material defaultMat;
@@ -90,6 +91,18 @@ public class QuestionnaireUIHandler : MonoBehaviour
}
+ public void SetBackgroundColor(bool singleQuestion)
+ {
+ if (singleQuestion)
+ {
+ QuestionnaireBackground.color = new Color(182, 0, 200);s
+ }
+ else
+ {
+ //QuestionnaireBackground.color = new Color(62, 64, 120);
+ QuestionnaireBackground.color = new Color(0, 8, 245);
+ }
+ }
public void toggleQuestionnaireElements(bool on)
{
--
GitLab