Commit 79af892ffe0d8feb3bd198f5ef389a42896c7cd2
1 parent
3d5ebe93
Exists in
dict
Fix special character spelling
Showing
5 changed files
with
18 additions
and
6 deletions
Show diff stats
Assets/Scenes/Main.unity
... | ... | @@ -5989,7 +5989,7 @@ RectTransform: |
5989 | 5989 | m_RootOrder: 0 |
5990 | 5990 | m_AnchorMin: {x: 0, y: 0} |
5991 | 5991 | m_AnchorMax: {x: 1, y: 0} |
5992 | - m_AnchoredPosition: {x: 0, y: 896} | |
5992 | + m_AnchoredPosition: {x: 0, y: 0} | |
5993 | 5993 | m_SizeDelta: {x: 0, y: 3000} |
5994 | 5994 | m_Pivot: {x: 0.5, y: 1} |
5995 | 5995 | --- !u!114 &970584910 | ... | ... |
Assets/Scripts/Player Manager/GenericPlayerManager.cs
... | ... | @@ -252,6 +252,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
252 | 252 | * @return WWW - request. |
253 | 253 | */ |
254 | 254 | protected abstract WWW loadAssetBundle(string aniName); |
255 | + protected abstract WWW loadAssetBundle(string aniName, bool force); | |
255 | 256 | |
256 | 257 | /** |
257 | 258 | * Called when a bundle request causes error. |
... | ... | @@ -486,7 +487,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { |
486 | 487 | |
487 | 488 | if ( ! loaded) |
488 | 489 | { |
489 | - WWW bundleRequest = loadAssetBundle(aniName); | |
490 | + WWW bundleRequest = loadAssetBundle(aniName, this.flags.Contains(aniName)); | |
490 | 491 | |
491 | 492 | if (bundleRequest != null) |
492 | 493 | { | ... | ... |
Assets/Scripts/PlayerManager.cs
... | ... | @@ -134,9 +134,9 @@ public class PlayerManager : GenericPlayerManager { |
134 | 134 | setRegion(""); |
135 | 135 | } |
136 | 136 | |
137 | - protected override WWW loadAssetBundle(string aniName) | |
137 | + protected override WWW loadAssetBundle(string aniName, bool force) | |
138 | 138 | { |
139 | - if (this.regionHash == 1 && this.signs != null && !this.signs.Contains(aniName)) | |
139 | + if (!force && this.regionHash == 1 && this.signs != null && !this.signs.Contains(aniName)) | |
140 | 140 | return null; |
141 | 141 | |
142 | 142 | string address = BASE_URL + this.regionPath + WWW.EscapeURL(aniName); |
... | ... | @@ -145,6 +145,10 @@ public class PlayerManager : GenericPlayerManager { |
145 | 145 | return WWW.LoadFromCacheOrDownload(address, this.regionHash); |
146 | 146 | } |
147 | 147 | |
148 | + protected override WWW loadAssetBundle(string aniName) { | |
149 | + return loadAssetBundle(aniName, false); | |
150 | + } | |
151 | + | |
148 | 152 | public override void onPlayingStateChange() { |
149 | 153 | this.screenManager.changeStates(base.isPlaying(), base.isPaused(), ! String.IsNullOrEmpty(base.gloss)); |
150 | 154 | } | ... | ... |
Assets/Scripts/Trie/Trie.cs
... | ... | @@ -55,7 +55,14 @@ namespace LAViD.Structures |
55 | 55 | |
56 | 56 | foreach (char c in word) |
57 | 57 | { |
58 | - node = node.children[this.keys[c]]; | |
58 | + try { | |
59 | + node = node.children[this.keys[c]]; | |
60 | + } | |
61 | + catch (KeyNotFoundException) { | |
62 | + PlayerLogger.Log("T", "C", "Did not find character '" + c + "' of '" + word + "'."); | |
63 | + return false; | |
64 | + } | |
65 | + | |
59 | 66 | if (node == null) break; |
60 | 67 | } |
61 | 68 | ... | ... |
ProjectSettings/ProjectSettings.asset