From 07a083d5c1d23346c6ff47ce281c45ce84e7a64f Mon Sep 17 00:00:00 2001
From: unknown <john.schihada@hotmail.com>
Date: Mon, 7 Dec 2020 12:00:52 +0100
Subject: [PATCH] Fix: For applying changes to globalSettings-file while
playing
---
Assets/Scenes/TreeWorld_02.unity | 2 +-
.../Scripts/InteractionEngine/ImageHintAnimation.cs | 13 ++++++++++---
.../InteractionEngine/MeshRendererHintAnimation.cs | 13 ++++++++++---
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/Assets/Scenes/TreeWorld_02.unity b/Assets/Scenes/TreeWorld_02.unity
index a858cd6f..d33b4cd8 100644
--- a/Assets/Scenes/TreeWorld_02.unity
+++ b/Assets/Scenes/TreeWorld_02.unity
@@ -44230,7 +44230,7 @@ PrefabInstance:
- target: {fileID: 8372521933355871045, guid: c1d50ceff6c06de40b71063574eba754,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -0.000030517578
+ value: -0.000091552734
objectReference: {fileID: 0}
- target: {fileID: 8372521933459236753, guid: c1d50ceff6c06de40b71063574eba754,
type: 3}
diff --git a/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs b/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs
index 1c4cb824..5ec730c4 100644
--- a/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs
+++ b/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs
@@ -20,9 +20,7 @@ void Start()
if (imageToChange != null)
imageToChangeDefaultColor = imageToChange.color;
- animationStartColor = globalSettings.hintAnimationStartColor;
- animationEndColor = globalSettings.hintAnimationEndColor;
- animateDuration = globalSettings.hintAnimationDuration;
+ updateAnimationParameters();
}
// Update is called once per frame
@@ -38,7 +36,10 @@ void Update()
public void AnimationTrigger()
{
if (imageToChange != null)
+ {
+ updateAnimationParameters();
animating = true;
+ }
}
private void Animate()
@@ -55,4 +56,10 @@ private void Animate()
}
}
+
+ private void updateAnimationParameters() {
+ animationStartColor = globalSettings.hintAnimationStartColor;
+ animationEndColor = globalSettings.hintAnimationEndColor;
+ animateDuration = globalSettings.hintAnimationDuration;
+ }
}
diff --git a/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs b/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs
index e28d56ec..2b7753f4 100644
--- a/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs
+++ b/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs
@@ -19,9 +19,7 @@ void Start()
if (meshRendererToChange != null)
meshRendererToChangeDefaultColor = meshRendererToChange.material.color;
- animationStartColor = globalSettings.hintAnimationStartColor;
- animationEndColor = globalSettings.hintAnimationEndColor;
- animateDuration = globalSettings.hintAnimationDuration;
+ updateAnimationParameters();
}
// Update is called once per frame
@@ -35,7 +33,10 @@ void Update()
public void AnimationTrigger() {
if (meshRendererToChange != null)
+ {
+ updateAnimationParameters();
animating = true;
+ }
}
private void Animate() {
@@ -48,6 +49,12 @@ private void Animate() {
else {
meshRendererToChange.material.color = Color.Lerp(animationStartColor, animationEndColor, Mathf.PingPong(Time.time, 1));
}
+ }
+ private void updateAnimationParameters()
+ {
+ animationStartColor = globalSettings.hintAnimationStartColor;
+ animationEndColor = globalSettings.hintAnimationEndColor;
+ animateDuration = globalSettings.hintAnimationDuration;
}
}
--
GitLab