diff --git a/Carter Games/The Cart/Modules/CarterGames.Cart.Modules.asmdef b/Carter Games/The Cart/Modules/CarterGames.Cart.Modules.asmdef
index 1e05e222..8ca01732 100644
--- a/Carter Games/The Cart/Modules/CarterGames.Cart.Modules.asmdef
+++ b/Carter Games/The Cart/Modules/CarterGames.Cart.Modules.asmdef
@@ -5,7 +5,6 @@
"GUID:6055be8ebefd69e48b49212b09b47b2f",
"GUID:70913f3dbaf500447ac3cab07477430f",
"GUID:f9eb8297e33d3b14ea4786f5a0c2ac04",
- "GUID:d4f8f3098ca064117a9b67941bfedd91",
"GUID:6d41763603f56404492cef226e63cb07"
],
"includePlatforms": [],
@@ -15,12 +14,6 @@
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
- "versionDefines": [
- {
- "name": "com.unity.remote-config",
- "expression": "",
- "define": "UNITY_REMOTECONFIG"
- }
- ],
+ "versionDefines": [],
"noEngineReferences": false
}
\ No newline at end of file
diff --git a/Carter Games/The Cart/Modules/Delayed Events/Code/Runtime/DelayedEvt.cs b/Carter Games/The Cart/Modules/Delayed Events/Code/Runtime/DelayedEvt.cs
index 788b5c95..1ad615bc 100644
--- a/Carter Games/The Cart/Modules/Delayed Events/Code/Runtime/DelayedEvt.cs
+++ b/Carter Games/The Cart/Modules/Delayed Events/Code/Runtime/DelayedEvt.cs
@@ -44,7 +44,7 @@ public sealed class DelayedEvt : EvtBase
/// Should the event be tied to unscaled time? Def: True
public void Raise(float seconds, bool unscaledTime = true)
{
- RuntimeTimerStandard.SetCountdown(seconds, RaiseAction, unscaledTime);
+ RuntimeTimer.Set(seconds, RaiseAction, unscaledTime);
}
}
@@ -65,7 +65,7 @@ public sealed class DelayedEvt : EvtBase
/// Should the event be tied to unscaled time? Def: True
public void Raise(float seconds, T param, bool unscaledTime = true)
{
- RuntimeTimerStandard.SetCountdown(seconds, () => RaiseAction(param), unscaledTime);
+ RuntimeTimer.Set(seconds, () => RaiseAction(param), unscaledTime);
}
}
@@ -87,7 +87,7 @@ public sealed class DelayedEvt : EvtBase
/// Should the event be tied to unscaled time? Def: True
public void Raise(float seconds, T1 param, T2 param2, bool unscaledTime = true)
{
- RuntimeTimerStandard.SetCountdown(seconds, () => RaiseAction(param, param2), unscaledTime);
+ RuntimeTimer.Set(seconds, () => RaiseAction(param, param2), unscaledTime);
}
}
@@ -110,7 +110,7 @@ public sealed class DelayedEvt : EvtBase
/// Should the event be tied to unscaled time? Def: True
public void Raise(float seconds, T1 param, T2 param2, T3 param3, bool unscaledTime = true)
{
- RuntimeTimerStandard.SetCountdown(seconds, () => RaiseAction(param, param2, param3), unscaledTime);
+ RuntimeTimer.Set(seconds, () => RaiseAction(param, param2, param3), unscaledTime);
}
}
@@ -134,7 +134,7 @@ public sealed class DelayedEvt : EvtBase
/// Should the event be tied to unscaled time? Def: True
public void Raise(float seconds, T1 param, T2 param2, T3 param3, T4 param4, bool unscaledTime = true)
{
- RuntimeTimerStandard.SetCountdown(seconds, () => RaiseAction(param, param2, param3, param4), unscaledTime);
+ RuntimeTimer.Set(seconds, () => RaiseAction(param, param2, param3, param4), unscaledTime);
}
}
@@ -159,7 +159,7 @@ public sealed class DelayedEvt : EvtBase
/// Should the event be tied to unscaled time? Def: True
public void Raise(float seconds, T1 param, T2 param2, T3 param3, T4 param4, T5 param5, bool unscaledTime = true)
{
- RuntimeTimerStandard.SetCountdown(seconds, () => RaiseAction(param, param2, param3, param4, param5), unscaledTime);
+ RuntimeTimer.Set(seconds, () => RaiseAction(param, param2, param3, param4, param5), unscaledTime);
}
}
@@ -185,7 +185,7 @@ public sealed class DelayedEvt : EvtBase
/// Should the event be tied to unscaled time? Def: True
public void Raise(float seconds, T1 param, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, bool unscaledTime = true)
{
- RuntimeTimerStandard.SetCountdown(seconds, () => RaiseAction(param, param2, param3, param4, param5, param6), unscaledTime);
+ RuntimeTimer.Set(seconds, () => RaiseAction(param, param2, param3, param4, param5, param6), unscaledTime);
}
}
@@ -212,7 +212,7 @@ public sealed class DelayedEvt : EvtBaseShould the event be tied to unscaled time? Def: True
public void Raise(float seconds, T1 param, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, bool unscaledTime = true)
{
- RuntimeTimerStandard.SetCountdown(seconds, () => RaiseAction(param, param2, param3, param4, param5, param6, param7), unscaledTime);
+ RuntimeTimer.Set(seconds, () => RaiseAction(param, param2, param3, param4, param5, param6, param7), unscaledTime);
}
}
@@ -240,7 +240,7 @@ public sealed class DelayedEvt : EvtBaseShould the event be tied to unscaled time? Def: True
public void Raise(float seconds, T1 param, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8, bool unscaledTime = true)
{
- RuntimeTimerStandard.SetCountdown(seconds, () => RaiseAction(param, param2, param3, param4, param5, param6, param7, param8), unscaledTime);
+ RuntimeTimer.Set(seconds, () => RaiseAction(param, param2, param3, param4, param5, param6, param7, param8), unscaledTime);
}
}
}
diff --git a/Carter Games/The Cart/Modules/Localization/Code/Runtime/Settings/DataAssetSettingsLocalization.cs b/Carter Games/The Cart/Modules/Localization/Code/Runtime/Settings/DataAssetSettingsLocalization.cs
index c2ef7da7..2b792a61 100644
--- a/Carter Games/The Cart/Modules/Localization/Code/Runtime/Settings/DataAssetSettingsLocalization.cs
+++ b/Carter Games/The Cart/Modules/Localization/Code/Runtime/Settings/DataAssetSettingsLocalization.cs
@@ -61,6 +61,7 @@ private void OnValidate()
{
// Sets the default language if one is not defined.
if (!string.IsNullOrEmpty(currentLanguage.DisplayName) && !string.IsNullOrEmpty(currentLanguage.Code)) return;
+ if (DataAccess.GetAsset() == null) return;
if (DataAccess.GetAsset().Languages.Count <= 0) return;
currentLanguage = DataAccess.GetAsset().Languages[0];
}