diff --git a/Assets/Scenes/TreeWorld_02.unity b/Assets/Scenes/TreeWorld_02.unity
index 487511c7b14ed981626208bd59e3bc10eaac3973..be0721dbb87b871abd156f634fe3ca4033afdb0f 100644
--- a/Assets/Scenes/TreeWorld_02.unity
+++ b/Assets/Scenes/TreeWorld_02.unity
@@ -16986,6 +16986,24 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c6308cb7062fac34e8e50600086b12a1, type: 3}
+--- !u!224 &854389896 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 8372521933548676730, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ m_PrefabInstance: {fileID: 8372521932706434296}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &854389897 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ m_PrefabInstance: {fileID: 8372521932706434296}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!4 &860975976 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8903058273634951509, guid: f1fc5bb90ac285e4486771552d63bcb8,
@@ -19240,6 +19258,79 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f02116c209ecd9e488fc4d2cd8996133, type: 3}
+--- !u!1 &990986557
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 990986558}
+ - component: {fileID: 990986560}
+ - component: {fileID: 990986559}
+ m_Layer: 5
+ m_Name: TMP SubMeshUI [LiberationSans SDF Material + ARIALUNI SDF Atlas]
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &990986558
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 990986557}
+ 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_Children: []
+ m_Father: {fileID: 854389896}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ 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 &990986559
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 990986557}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_fontAsset: {fileID: 11400000, guid: e102aafbe9ad5444aa6caf6c496a8c72, type: 2}
+ m_spriteAsset: {fileID: 0}
+ m_material: {fileID: 0}
+ m_sharedMaterial: {fileID: 0}
+ m_isDefaultMaterial: 0
+ m_padding: 1.63
+ m_canvasRenderer: {fileID: 990986560}
+ m_TextComponent: {fileID: 854389897}
+ m_materialReferenceIndex: 1
+--- !u!222 &990986560
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 990986557}
+ m_CullTransparentMesh: 0
--- !u!4 &992660458 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
@@ -22726,6 +22817,79 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 637749364}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1147651016
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1147651017}
+ - component: {fileID: 1147651019}
+ - component: {fileID: 1147651018}
+ m_Layer: 5
+ m_Name: TMP SubMeshUI [LiberationSans SDF Material + LiberationSans SDF Atlas]
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1147651017
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1147651016}
+ 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_Children: []
+ m_Father: {fileID: 854389896}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ 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 &1147651018
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1147651016}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_fontAsset: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
+ m_spriteAsset: {fileID: 0}
+ m_material: {fileID: 0}
+ m_sharedMaterial: {fileID: 0}
+ m_isDefaultMaterial: 0
+ m_padding: 1.934
+ m_canvasRenderer: {fileID: 1147651019}
+ m_TextComponent: {fileID: 854389897}
+ m_materialReferenceIndex: 2
+--- !u!222 &1147651019
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1147651016}
+ m_CullTransparentMesh: 0
--- !u!1001 &1154015547
PrefabInstance:
m_ObjectHideFlags: 0
@@ -33155,6 +33319,27 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 80447605}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1668016310 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 4170768673112361096, guid: 2ba8d552442ba664e8e567adee683a11,
+ type: 3}
+ m_PrefabInstance: {fileID: 2120427836}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1668016311
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1668016310}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b012182d8506771469478402aa91edbf, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ hintAnimationStartColor: {r: 0.98039216, g: 0.99215686, b: 0.03137255, a: 1}
+ hintAnimationEndColor: {r: 1, g: 0.52156866, b: 0.007843138, a: 1}
+ hintAnimationDuration: 5
--- !u!1001 &1668987013
PrefabInstance:
m_ObjectHideFlags: 0
@@ -43881,6 +44066,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1351929472977244411, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4004370943283418987, guid: c1d50ceff6c06de40b71063574eba754,
type: 3}
propertyPath: m_Name
@@ -44107,6 +44297,63 @@ PrefabInstance:
propertyPath: m_textInfo.lineCount
value: 2
objectReference: {fileID: 0}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_fontAsset
+ value:
+ objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee,
+ type: 2}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_sharedMaterial
+ value:
+ objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_text
+ value: "Hier kommt der Scroll Beschreibungstext hin \u22BEC (AC \u27C2 BC)
+ \u2220 und 221F f\xFCr \u221F\n"
+ objectReference: {fileID: 0}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_textInfo.characterCount
+ value: 74
+ objectReference: {fileID: 0}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_textInfo.spaceCount
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_firstOverflowCharacterIndex
+ value: -1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_textInfo.wordCount
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_textInfo.materialCount
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_subTextObjects.Array.data[1]
+ value:
+ objectReference: {fileID: 990986559}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_isRightToLeft
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8372521933548676731, guid: c1d50ceff6c06de40b71063574eba754,
+ type: 3}
+ propertyPath: m_subTextObjects.Array.data[2]
+ value:
+ objectReference: {fileID: 1147651018}
- target: {fileID: 8372521933580734050, guid: c1d50ceff6c06de40b71063574eba754,
type: 3}
propertyPath: m_AnchorMax.x
diff --git a/Assets/Scripts/GlobalSettings.cs b/Assets/Scripts/GlobalSettings.cs
new file mode 100644
index 0000000000000000000000000000000000000000..aecd9596d2d8743ff2281a2fc09d1a1e597b1042
--- /dev/null
+++ b/Assets/Scripts/GlobalSettings.cs
@@ -0,0 +1,22 @@
+using UnityEngine;
+
+public class GlobalSettings : MonoBehaviour
+{
+ public static GlobalSettings globalSettings;
+
+ //Make sure when using RGBA-Colors, the A-value of animationStartColor
+ //and animationEndColor is the same OR try with value = 255
+ public Color hintAnimationStartColor;
+ public Color hintAnimationEndColor;
+ public float hintAnimationDuration;
+
+ void Awake()
+ {
+ if (globalSettings != null)
+ GameObject.Destroy(globalSettings);
+ else
+ globalSettings = this;
+
+ DontDestroyOnLoad(this);
+ }
+}
diff --git a/Assets/Scripts/GlobalSettings.cs.meta b/Assets/Scripts/GlobalSettings.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..251e15840248637718c9f8ef3b0ca89f13e76dcc
--- /dev/null
+++ b/Assets/Scripts/GlobalSettings.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b012182d8506771469478402aa91edbf
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/InteractionEngine/FactSpawner.cs b/Assets/Scripts/InteractionEngine/FactSpawner.cs
index 04584573d1ab8614da4f6fa9323b13eda2a15828..186d029e0998e17ee86deee7ea869fc133d3b11a 100644
--- a/Assets/Scripts/InteractionEngine/FactSpawner.cs
+++ b/Assets/Scripts/InteractionEngine/FactSpawner.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections;
-using System.Collections.Generic;
using TMPro;
using UnityEngine;
using static CommunicationEvents;
+using static GlobalSettings;
public class FactSpawner : MonoBehaviour
{
@@ -246,7 +246,7 @@ public IEnumerator animateNonExistingFact(Fact fact) {
MeshRendererHintAnimation animator = returnedFact.Representation.GetComponentInChildren<MeshRendererHintAnimation>();
animator.AnimationTrigger();
- yield return new WaitForSeconds(animator.animateDuration);
+ yield return new WaitForSeconds(globalSettings.hintAnimationDuration);
GameObject.Destroy(returnedFact.Representation);
}
diff --git a/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs b/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs
index d65bb0a428e13b4e3bcbfd0490383b97521793c0..1c4cb8247968b44461700e6cf25db8797db39d55 100644
--- a/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs
+++ b/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs
@@ -1,14 +1,16 @@
using UnityEngine;
using UnityEngine.UI;
+using static GlobalSettings;
public class ImageHintAnimation : MonoBehaviour
{
public Image imageToChange;
private Color imageToChangeDefaultColor;
- public Color animationStartColor;
- public Color animationEndColor;
+
+ private Color animationStartColor;
+ private Color animationEndColor;
- public float animateDuration;
+ private float animateDuration;
private bool animating = false;
private float timer = 0;
@@ -17,6 +19,10 @@ void Start()
{
if (imageToChange != null)
imageToChangeDefaultColor = imageToChange.color;
+
+ animationStartColor = globalSettings.hintAnimationStartColor;
+ animationEndColor = globalSettings.hintAnimationEndColor;
+ animateDuration = globalSettings.hintAnimationDuration;
}
// Update is called once per frame
diff --git a/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs b/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs
index f383b0c681fddd9db44479ade3c1c11c145c96dd..e28d56ec803ccf069a8502119a1fc0a8a77e16f7 100644
--- a/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs
+++ b/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs
@@ -1,15 +1,15 @@
using UnityEngine;
+using static GlobalSettings;
public class MeshRendererHintAnimation : MonoBehaviour
{
public MeshRenderer meshRendererToChange;
private Color meshRendererToChangeDefaultColor;
- //Make sure when using RGBA-Colors, the A-value of animationStartColor
- //and animationEndColor is the same OR try with value = 255
- public Color animationStartColor;
- public Color animationEndColor;
+
+ private Color animationStartColor;
+ private Color animationEndColor;
- public float animateDuration;
+ private float animateDuration;
private bool animating = false;
private float timer = 0;
@@ -18,6 +18,10 @@ void Start()
{
if (meshRendererToChange != null)
meshRendererToChangeDefaultColor = meshRendererToChange.material.color;
+
+ animationStartColor = globalSettings.hintAnimationStartColor;
+ animationEndColor = globalSettings.hintAnimationEndColor;
+ animateDuration = globalSettings.hintAnimationDuration;
}
// Update is called once per frame
diff --git a/Assets/Scripts/InventoryStuff/DisplayScrolls.cs b/Assets/Scripts/InventoryStuff/DisplayScrolls.cs
index 97a36516710065b0251c28e80f5b7a72fddf1817..9d31aa2ed098ce491d5e1dddadabc99fee58e5f4 100644
--- a/Assets/Scripts/InventoryStuff/DisplayScrolls.cs
+++ b/Assets/Scripts/InventoryStuff/DisplayScrolls.cs
@@ -55,6 +55,7 @@ void Start()
}
IEnumerator getScrollsfromServer() {
+ //Try /scroll/listAll endpoint when scroll/list is not working
UnityWebRequest request = UnityWebRequest.Get(CommunicationEvents.ServerAdress + "/scroll/list");
//Postman-Echo-Mock
//UnityWebRequest request = UnityWebRequest.Get("https://019a8ea5-843a-498b-8d0c-778669aef987.mock.pstmn.io/get");