Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
This commit is contained in:
@@ -115,13 +115,10 @@ public sealed class PersistentWwiseFadeInPlayer : MonoBehaviour
|
||||
OctoSceneFade fade =
|
||||
root.GetComponentInChildren<OctoSceneFade>(true);
|
||||
|
||||
if (fade != null)
|
||||
return fade;
|
||||
if (fade != null) return fade;
|
||||
}
|
||||
}
|
||||
|
||||
// Essential when OctoSceneFade is itself persistent
|
||||
// or not contained in the newly loaded scene.
|
||||
return OctoSceneFade.Instance;
|
||||
}
|
||||
|
||||
@@ -146,16 +143,7 @@ public sealed class PersistentWwiseFadeInPlayer : MonoBehaviour
|
||||
|
||||
private void OnFadeIn()
|
||||
{
|
||||
if (_fadeInEvent == null)
|
||||
{
|
||||
Debug.LogWarning(
|
||||
$"[{nameof(PersistentWwiseFadeInPlayer)}] " +
|
||||
"No Wwise Event assigned.",
|
||||
this
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
if (_fadeInEvent == null) return;
|
||||
|
||||
_fadeInEvent.Post(gameObject);
|
||||
}
|
||||
|
||||
@@ -39,7 +39,9 @@ PlayerSettings:
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
m_SplashScreenLogos: []
|
||||
m_SplashScreenLogos:
|
||||
- logo: {fileID: 21300000, guid: 5e88f363c3083d74d93420ce5783fec0, type: 3}
|
||||
duration: 2
|
||||
m_VirtualRealitySplashScreen: {fileID: 0}
|
||||
m_HolographicTrackingLossScreen: {fileID: 0}
|
||||
defaultScreenWidth: 1024
|
||||
@@ -297,7 +299,14 @@ PlayerSettings:
|
||||
AndroidAppBundleSizeToValidate: 150
|
||||
AndroidReportGooglePlayAppDependencies: 1
|
||||
androidSymbolsSizeThreshold: 800
|
||||
m_BuildTargetIcons: []
|
||||
m_BuildTargetIcons:
|
||||
- m_BuildTarget:
|
||||
m_Icons:
|
||||
- serializedVersion: 2
|
||||
m_Icon: {fileID: 2800000, guid: 7d2472d66eed2e446a79641cee51879a, type: 3}
|
||||
m_Width: 128
|
||||
m_Height: 128
|
||||
m_Kind: 0
|
||||
m_BuildTargetPlatformIcons:
|
||||
- m_BuildTarget: iPhone
|
||||
m_Icons:
|
||||
|
||||
Reference in New Issue
Block a user