Download as
Browse Code »

Commit 4992c93ecbab2fa29b59ecaf98483f08b156e981

Authored by Mateus Lustosa
1 parent 3451c726
Exists in devel

Logs

Showing 2 changed files with 21 additions and 9 deletions   Show diff stats
Assets/Scripts/PlayerManager.cs
  Diff comments   View file @4992c93
@@ -71,7 +71,7 @@ public class PlayerManager : GenericPlayerManager { @@ -71,7 +71,7 @@ public class PlayerManager : GenericPlayerManager {
71 protected void Update() { 71 protected void Update() {
72 if (toFinalize) 72 if (toFinalize)
73 { 73 {
74 - UnityEngine.Debug.Log("Update -> toFinalize == " + toFinalize); 74 + UnityEngine.Debug.Log("PM.U(): Update -> toFinalize == " + toFinalize);
75 Application.Quit(); 75 Application.Quit();
76 } 76 }
77 } 77 }
@@ -94,19 +94,19 @@ public class PlayerManager : GenericPlayerManager { @@ -94,19 +94,19 @@ public class PlayerManager : GenericPlayerManager {
94 while ((CameraCapture.frameNumber * 1000) / CameraCapture.frameRate < message.Time) 94 while ((CameraCapture.frameNumber * 1000) / CameraCapture.frameRate < message.Time)
95 yield return null; 95 yield return null;
96 96
97 - UnityEngine.Debug.Log("Loading " + message.Text); 97 + UnityEngine.Debug.Log("PM.MS(): Loading " + message.Text);
98 base.playQueued(message.Text); 98 base.playQueued(message.Text);
99 } 99 }
100 100
101 while (base.isPlaying() || base.isLoading()) 101 while (base.isPlaying() || base.isLoading())
102 yield return null; 102 yield return null;
103 103
104 - UnityEngine.Debug.Log("ALL DONE!"); 104 + UnityEngine.Debug.Log("PM.MS(): ALL DONE!");
105 server.sendFinalizeToCore(); 105 server.sendFinalizeToCore();
106 CameraCapture.capture = false; 106 CameraCapture.capture = false;
107 - UnityEngine.Debug.Log("CameraCapture.capture == " + CameraCapture.capture); 107 + UnityEngine.Debug.Log("PM.MS(): CameraCapture.capture == " + CameraCapture.capture);
108 toFinalize = true; 108 toFinalize = true;
109 - UnityEngine.Debug.Log("toFinalize == " + toFinalize); 109 + UnityEngine.Debug.Log("PM.MS(): toFinalize == " + toFinalize);
110 } 110 }
111 111
112 public override WWW loadAssetBundle(string aniName) 112 public override WWW loadAssetBundle(string aniName)
Assets/Scripts/PlayerManager/GenericPlayerManager.cs
  Diff comments   View file @4992c93
@@ -320,6 +320,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -320,6 +320,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
320 { 320 {
321 lock (LOCKER_PLAY) 321 lock (LOCKER_PLAY)
322 { 322 {
  323 + Debug.Log("GPM.pQ(" + gloss + ")");
323 setGlossWaiting(true); 324 setGlossWaiting(true);
324 StartCoroutine("loadAndPlay", gloss); 325 StartCoroutine("loadAndPlay", gloss);
325 } 326 }
@@ -330,6 +331,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -330,6 +331,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
330 { 331 {
331 lock (LOCKER_PLAY) 332 lock (LOCKER_PLAY)
332 { 333 {
  334 + Debug.Log("GPM.pN(" + gloss + ")");
333 stopAll(); 335 stopAll();
334 StartCoroutine("loadAndPlay", gloss); 336 StartCoroutine("loadAndPlay", gloss);
335 } 337 }
@@ -427,7 +429,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -427,7 +429,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
427 this.subtitles.updateLetterSpeed(); 429 this.subtitles.updateLetterSpeed();
428 } 430 }
429 431
430 - UnityEngine.Debug.Log("Animação \"" + animName + "\" inexistente."); 432 + UnityEngine.Debug.Log("GPM.sW(" + word + "): Animação \"" + animName + "\" inexistente.");
431 } 433 }
432 else 434 else
433 { 435 {
@@ -475,6 +477,8 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -475,6 +477,8 @@ public abstract class GenericPlayerManager : MonoBehaviour {
475 { 477 {
476 lock (LOCKER_LOADING) 478 lock (LOCKER_LOADING)
477 { 479 {
  480 + Debug.Log("GPM.lAP(" + gloss + ")");
  481 +
478 this.randomAnimations.lockFor("loadAndPlay"); 482 this.randomAnimations.lockFor("loadAndPlay");
479 this.loading = true; 483 this.loading = true;
480 setGlossWaiting(false); 484 setGlossWaiting(false);
@@ -494,6 +498,8 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -494,6 +498,8 @@ public abstract class GenericPlayerManager : MonoBehaviour {
494 498
495 foreach (string aniName in stringPos) 499 foreach (string aniName in stringPos)
496 { 500 {
  501 + Debug.Log("GPM.lAP(" + gloss + "): Animation name: " + aniName);
  502 +
497 wordsCount++; 503 wordsCount++;
498 if (String.IsNullOrEmpty(aniName)) continue; 504 if (String.IsNullOrEmpty(aniName)) continue;
499 505
@@ -507,12 +513,14 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -507,12 +513,14 @@ public abstract class GenericPlayerManager : MonoBehaviour {
507 513
508 if (www != null) 514 if (www != null)
509 { 515 {
  516 + Debug.Log("GPM:lAP(" + gloss + "): www != null");
510 yield return www; 517 yield return www;
511 518
512 AssetBundle bundle = null; 519 AssetBundle bundle = null;
513 520
514 if (www.error == null) 521 if (www.error == null)
515 { 522 {
  523 + Debug.Log("GPM:lAP(" + gloss + "): www.error == null");
516 bundle = www.assetBundle; 524 bundle = www.assetBundle;
517 525
518 if (bundle != null && ! String.IsNullOrEmpty(bundle.mainAsset.name)) 526 if (bundle != null && ! String.IsNullOrEmpty(bundle.mainAsset.name))
@@ -527,9 +535,9 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -527,9 +535,9 @@ public abstract class GenericPlayerManager : MonoBehaviour {
527 loadedAssetBundles.Add(aniName); 535 loadedAssetBundles.Add(aniName);
528 loaded = true; 536 loaded = true;
529 537
530 - Debug.Log("Bundle \"" + aniName + "\" loaded!"); 538 + Debug.Log("GPM:lAP(" + gloss + "): Bundle \"" + aniName + "\" loaded!");
531 } 539 }
532 - else UnityEngine.Debug.Log ("Sinal \"" + aniName + "\" foi não carregado corretamente."); 540 + else Debug.Log ("GPM:lAP(" + gloss + "): Sinal \"" + aniName + "\" foi não carregado corretamente.");
533 } 541 }
534 } 542 }
535 else onConnectionError(gloss, aniName); 543 else onConnectionError(gloss, aniName);
@@ -567,7 +575,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -567,7 +575,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
567 if ( ! nonexistent) 575 if ( ! nonexistent)
568 nonexistentAssetBundles.Add(aniName); 576 nonexistentAssetBundles.Add(aniName);
569 577
570 - UnityEngine.Debug.Log("~~ To spell: " + aniName); 578 + UnityEngine.Debug.Log("GPM:lAP(" + gloss + "): To spell: " + aniName);
571 579
572 if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) 580 if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName))
573 { 581 {
@@ -607,6 +615,8 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -607,6 +615,8 @@ public abstract class GenericPlayerManager : MonoBehaviour {
607 { 615 {
608 lock (LOCKER_PLAYING) 616 lock (LOCKER_PLAYING)
609 { 617 {
  618 + UnityEngine.Debug.Log("GPM:hS()");
  619 +
610 this.randomAnimations.lockFor("handleStates"); 620 this.randomAnimations.lockFor("handleStates");
611 this.playing = true; 621 this.playing = true;
612 onPlayingStateChange(); 622 onPlayingStateChange();
@@ -631,6 +641,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -631,6 +641,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
631 // Se estiver sendo reproduzida 641 // Se estiver sendo reproduzida
632 if (COMPONENT_ANIMATION.IsPlaying(reference.name)) 642 if (COMPONENT_ANIMATION.IsPlaying(reference.name))
633 { 643 {
  644 + Debug.Log("GPM:hS(): Playing " + reference.name);
634 this.subtitles.setText(reference.subtitle); 645 this.subtitles.setText(reference.subtitle);
635 646
636 // Animação seguinte 647 // Animação seguinte
@@ -684,6 +695,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -684,6 +695,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
684 695
685 lock (this.animQueue) { isNotEmpty = this.animQueue.Count > 0; } 696 lock (this.animQueue) { isNotEmpty = this.animQueue.Count > 0; }
686 } 697 }
  698 + UnityEngine.Debug.Log("GPM:sH(): All done.");
687 699
688 this.subtitles.setText(""); 700 this.subtitles.setText("");
689 701