diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index ec652d2..913fa41 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -5989,7 +5989,7 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 896} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 3000} m_Pivot: {x: 0.5, y: 1} --- !u!114 &970584910 diff --git a/Assets/Scripts/Player Manager/GenericPlayerManager.cs b/Assets/Scripts/Player Manager/GenericPlayerManager.cs index 0d12e9c..c1b994d 100644 --- a/Assets/Scripts/Player Manager/GenericPlayerManager.cs +++ b/Assets/Scripts/Player Manager/GenericPlayerManager.cs @@ -252,6 +252,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { * @return WWW - request. */ protected abstract WWW loadAssetBundle(string aniName); + protected abstract WWW loadAssetBundle(string aniName, bool force); /** * Called when a bundle request causes error. @@ -486,7 +487,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { if ( ! loaded) { - WWW bundleRequest = loadAssetBundle(aniName); + WWW bundleRequest = loadAssetBundle(aniName, this.flags.Contains(aniName)); if (bundleRequest != null) { diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index b6a14c6..5f2c233 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -134,9 +134,9 @@ public class PlayerManager : GenericPlayerManager { setRegion(""); } - protected override WWW loadAssetBundle(string aniName) + protected override WWW loadAssetBundle(string aniName, bool force) { - if (this.regionHash == 1 && this.signs != null && !this.signs.Contains(aniName)) + if (!force && this.regionHash == 1 && this.signs != null && !this.signs.Contains(aniName)) return null; string address = BASE_URL + this.regionPath + WWW.EscapeURL(aniName); @@ -145,6 +145,10 @@ public class PlayerManager : GenericPlayerManager { return WWW.LoadFromCacheOrDownload(address, this.regionHash); } + protected override WWW loadAssetBundle(string aniName) { + return loadAssetBundle(aniName, false); + } + public override void onPlayingStateChange() { this.screenManager.changeStates(base.isPlaying(), base.isPaused(), ! String.IsNullOrEmpty(base.gloss)); } diff --git a/Assets/Scripts/Trie/Trie.cs b/Assets/Scripts/Trie/Trie.cs index 2d11ee7..1d48f10 100644 --- a/Assets/Scripts/Trie/Trie.cs +++ b/Assets/Scripts/Trie/Trie.cs @@ -55,7 +55,14 @@ namespace LAViD.Structures foreach (char c in word) { - node = node.children[this.keys[c]]; + try { + node = node.children[this.keys[c]]; + } + catch (KeyNotFoundException) { + PlayerLogger.Log("T", "C", "Did not find character '" + c + "' of '" + word + "'."); + return false; + } + if (node == null) break; } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8c77e87..429588c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -95,7 +95,7 @@ PlayerSettings: 16:9: 1 Others: 1 bundleIdentifier: com.lavid.vlibrasdroid - bundleVersion: 3.1.3 + bundleVersion: 3.1.5 preloadedAssets: [] metroEnableIndependentInputSource: 0 xboxOneDisableKinectGpuReservation: 0 -- libgit2 0.21.2