diff --git a/Assets/Resources/Prefabs/UI/Ingame/GameInterruptHandler 1.prefab b/Assets/Resources/Prefabs/UI/Ingame/GameInterruptHandler 1.prefab
index 407386fb8cb2dd789be52e51d6029af7ce1f1640..b76cdf61cd4462654248337213ca490cbac47ded 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/GameInterruptHandler 1.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/GameInterruptHandler 1.prefab
@@ -652,7 +652,6 @@ GameObject:
- component: {fileID: 1890902105104818822}
- component: {fileID: 253680107904048160}
- component: {fileID: 3765769912446980037}
- - component: {fileID: 2507922410908587213}
m_Layer: 5
m_Name: ContinueGameBttn
m_TagString: Untagged
@@ -793,18 +792,6 @@ MonoBehaviour:
checkTimeToStop: 1
ResetUI: 1
switchToScene_ID_: 0
---- !u!114 &2507922410908587213
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1143048432719133824}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f97f86e35ec33249a4142489b6b91f9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &1203942290910476770
GameObject:
m_ObjectHideFlags: 0
@@ -2051,6 +2038,7 @@ GameObject:
- component: {fileID: 6071219117004371699}
- component: {fileID: 6019274550833334662}
- component: {fileID: 6652188390175341001}
+ - component: {fileID: 1714824322481546373}
m_Layer: 0
m_Name: GameInterruptHandler 1
m_TagString: Untagged
@@ -2154,6 +2142,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
checkTimeToStop: 0
+--- !u!114 &1714824322481546373
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3618627260122670347}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f97f86e35ec33249a4142489b6b91f9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &3693229676046000754
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Buttons/CloseApp.prefab b/Assets/Resources/Prefabs/UI/MainMenue/Buttons/CloseApp.prefab
index f33fa2bf9491450fc0b4f576f1d9b4fee51f5bae..d25db6e4bbdf914eafd1bb5800c4b7d24f09fc5b 100644
--- a/Assets/Resources/Prefabs/UI/MainMenue/Buttons/CloseApp.prefab
+++ b/Assets/Resources/Prefabs/UI/MainMenue/Buttons/CloseApp.prefab
@@ -13,7 +13,6 @@ GameObject:
- component: {fileID: 1152992420021197455}
- component: {fileID: 5031216677676712002}
- component: {fileID: 7333915092170114842}
- - component: {fileID: 1428870501719489577}
m_Layer: 5
m_Name: CloseApp
m_TagString: Untagged
@@ -136,18 +135,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e0a2f387d2035cf48b215c7f20fe7256, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!114 &1428870501719489577
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5311706989751107744}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f97f86e35ec33249a4142489b6b91f9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &5792649319984793529
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab
index e8e4db7660349f1180bbec90247d0c0ae658004f..e99213a3935eb1e6f8c490260b0ec62490539959 100644
--- a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab
+++ b/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab
@@ -118,7 +118,6 @@ GameObject:
- component: {fileID: 1539889184517358079}
- component: {fileID: 4319291372979813101}
- component: {fileID: 5044558849358145419}
- - component: {fileID: 3995283974672372640}
m_Layer: 5
m_Name: StartBttn
m_TagString: Untagged
@@ -269,18 +268,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
backTo_GObj: {fileID: 5366996316012566051}
parentM_GObj: {fileID: 5366996315580957714}
---- !u!114 &3995283974672372640
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1569447476718916670}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f97f86e35ec33249a4142489b6b91f9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &1680130686926169435
GameObject:
m_ObjectHideFlags: 0
@@ -2577,7 +2564,6 @@ GameObject:
- component: {fileID: 5366996315033671816}
- component: {fileID: 5366996315033671819}
- component: {fileID: 5366996315033671818}
- - component: {fileID: 1192297535216650409}
m_Layer: 5
m_Name: LastUsIP
m_TagString: Untagged
@@ -2714,18 +2700,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
parentM_GObj: {fileID: 5366996315580957714}
optionsNetwM_GObj: {fileID: 5366996316012566051}
---- !u!114 &1192297535216650409
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5366996315033671828}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f97f86e35ec33249a4142489b6b91f9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &5366996315062296223
GameObject:
m_ObjectHideFlags: 0
@@ -2819,6 +2793,7 @@ GameObject:
- component: {fileID: 5366996315580957712}
- component: {fileID: 5366996315580957715}
- component: {fileID: 5366996315580957719}
+ - component: {fileID: 3987228552946735393}
m_Layer: 5
m_Name: ASMenue_MnCtrl
m_TagString: Untagged
@@ -2925,6 +2900,18 @@ MonoBehaviour:
myself_GObj: {fileID: 5366996315580957714}
child1_GObj: {fileID: 5366996316036003404}
GObj_text: {fileID: 0}
+--- !u!114 &3987228552946735393
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5366996315580957714}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f97f86e35ec33249a4142489b6b91f9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &5366996315724472122
GameObject:
m_ObjectHideFlags: 0
@@ -2938,7 +2925,6 @@ GameObject:
- component: {fileID: 5366996315724472126}
- component: {fileID: 5366996315724472121}
- component: {fileID: 5366996315724472120}
- - component: {fileID: 4547555780043314295}
m_Layer: 5
m_Name: OptionsMB
m_TagString: Untagged
@@ -3075,18 +3061,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
backTo_GObj: {fileID: 5366996315080589334}
parentM_GObj: {fileID: 5366996315580957714}
---- !u!114 &4547555780043314295
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5366996315724472122}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f97f86e35ec33249a4142489b6b91f9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &5366996316012566051
GameObject:
m_ObjectHideFlags: 0
@@ -4263,7 +4237,6 @@ GameObject:
- component: {fileID: 7397368052520181056}
- component: {fileID: 5907588964791076665}
- component: {fileID: 4517224002155843072}
- - component: {fileID: 8822043323715143453}
m_Layer: 5
m_Name: CloseApp_1
m_TagString: Untagged
@@ -4386,18 +4359,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e0a2f387d2035cf48b215c7f20fe7256, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!114 &8822043323715143453
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6994320742785054220}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f97f86e35ec33249a4142489b6b91f9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &7644366856448033181
GameObject:
m_ObjectHideFlags: 0
@@ -5673,6 +5634,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 1.2109375
objectReference: {fileID: 0}
+ - target: {fileID: 266457293858355247, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 266457293881304180, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 266457293908317022, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchoredPosition.y
@@ -5698,6 +5669,11 @@ PrefabInstance:
propertyPath: m_Text
value: Touch area visibility 0%
objectReference: {fileID: 0}
+ - target: {fileID: 266457294040690726, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 266457294111085866, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchoredPosition.y
@@ -5893,6 +5869,11 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 266457294837486647, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 266457294844198693, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchoredPosition.x
diff --git a/Assets/Scenes/Menues/LaunchMenue.unity b/Assets/Scenes/Menues/LaunchMenue.unity
index 6c89f859e3890a17d3183673436c9f0c31b581c8..045cb5a06010d6258afab4912c1fda55d4f9859d 100644
--- a/Assets/Scenes/Menues/LaunchMenue.unity
+++ b/Assets/Scenes/Menues/LaunchMenue.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+ m_IndirectSpecularColor: {r: 0.44631976, g: 0.49611664, b: 0.5744803, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3108,7 +3108,8 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- m_RemovedComponents: []
+ m_RemovedComponents:
+ - {fileID: 3995283974672372640, guid: d55296411d4f39e43804eb54bbc798fc, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: d55296411d4f39e43804eb54bbc798fc, type: 3}
--- !u!1001 &8065997490532208083
PrefabInstance:
diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index cb9c4fe2a611ce77e76eef8b4d6c7338d098793a..67c9fecf6c840a9b3d4ca735eadd035c698042fa 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.44100717, g: 0.4898312, b: 0.5698877, a: 1}
+ m_IndirectSpecularColor: {r: 0.44084534, g: 0.48955458, b: 0.56959116, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
diff --git a/Assets/Scripts/UI/SetButtonColours_default.cs b/Assets/Scripts/UI/SetButtonColours_default.cs
index 0e4d6b7096397ee3655a02a5246bb2f8559a63d4..ff5d13674d62f20720b2f9e610f826724bd7f835 100644
--- a/Assets/Scripts/UI/SetButtonColours_default.cs
+++ b/Assets/Scripts/UI/SetButtonColours_default.cs
@@ -1,35 +1,40 @@
using UnityEngine;
-using UnityEngine.UI; //andr
-using static StreamingAssetLoader;
+using UnityEngine.UI;
using static UIconfig;
public class SetButtonColours_default : MonoBehaviour
{
-
- private ColorBlock tempColB;
void Start()
{
- ButtonDefaulColour();
+ RecursivelySetAllButtonsOfMenueToDefaultColors(gameObject);
}
- private void Update()
- {
-
- }
- public void ButtonDefaulColour()
+ /// <summary>
+ /// Recursively go through all button components of GameObjects including and below @gameObject.
+ /// Set their colors to the default values, defined in UIconfig.
+ /// </summary>
+ public static void RecursivelySetAllButtonsOfMenueToDefaultColors(GameObject gameObject)
{
-
- tempColB = GetComponent<Button>().colors;
- tempColB.pressedColor = colPressed;
- tempColB.selectedColor = colSelect;
- tempColB.highlightedColor = bttnColHighlightet;
- tempColB.normalColor = bttnColNormal;
- GetComponent<Button>().colors = tempColB;
-
-
+ // first check, wether the object has a button component
+ Button button = gameObject.GetComponent<Button>();
+ if (button != null)
+ {
+ ColorBlock tempColB = button.colors;
+ tempColB.pressedColor = colPressed;
+ tempColB.selectedColor = colSelect;
+ tempColB.highlightedColor = bttnColHighlightet;
+ tempColB.normalColor = bttnColNormal;
+ button.colors = tempColB;
+ }
+
+ // now recursively call for all children
+ for (int i = 0; i < gameObject.transform.childCount; i++)
+ {
+ RecursivelySetAllButtonsOfMenueToDefaultColors(gameObject.transform.GetChild(i).gameObject);
+ }
}
}