Download as
Browse Code »

Commit 48a02ab3551074014f3f24b9a7ad9513742eb650

Authored by Icaro Magalhaes
1 parent 07f37f8a
Exists in master

Corrige problemas de UI e de legenda. Release BUILD

Showing 3 changed files with 229 additions and 7 deletions   Show diff stats
Assets/Prefabs/Avatar.prefab.meta
  Diff comments   View file @48a02ab
@@ -4,5 +4,5 @@ timeCreated: 1434075139 @@ -4,5 +4,5 @@ timeCreated: 1434075139
4 licenseType: Pro 4 licenseType: Pro
5 NativeFormatImporter: 5 NativeFormatImporter:
6 userData: 6 userData:
7 - assetBundleName: 7 + assetBundleName: avatar
8 assetBundleVariant: 8 assetBundleVariant:
Assets/Scenes/Main.unity
  Diff comments   View file @48a02ab
@@ -201,6 +201,12 @@ Prefab: @@ -201,6 +201,12 @@ Prefab:
201 m_RemovedComponents: [] 201 m_RemovedComponents: []
202 m_ParentPrefab: {fileID: 100100000, guid: cd81d95d2fa8dc448b18a415b9009d43, type: 2} 202 m_ParentPrefab: {fileID: 100100000, guid: cd81d95d2fa8dc448b18a415b9009d43, type: 2}
203 m_IsPrefabParent: 0 203 m_IsPrefabParent: 0
  204 +--- !u!114 &1839061338 stripped
  205 +MonoBehaviour:
  206 + m_PrefabParentObject: {fileID: 11427452, guid: cd81d95d2fa8dc448b18a415b9009d43,
  207 + type: 2}
  208 + m_PrefabInternal: {fileID: 1610759364}
  209 + m_Script: {fileID: 11500000, guid: eeb6a455eb0dfd94aa6bc3484e5fecff, type: 3}
204 --- !u!1001 &1943160035 210 --- !u!1001 &1943160035
205 Prefab: 211 Prefab:
206 m_ObjectHideFlags: 0 212 m_ObjectHideFlags: 0
@@ -306,7 +312,7 @@ Prefab: @@ -306,7 +312,7 @@ Prefab:
306 objectReference: {fileID: 0} 312 objectReference: {fileID: 0}
307 - target: {fileID: 22465524, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2} 313 - target: {fileID: 22465524, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
308 propertyPath: m_AnchoredPosition.x 314 propertyPath: m_AnchoredPosition.x
309 - value: -196 315 + value: -178
310 objectReference: {fileID: 0} 316 objectReference: {fileID: 0}
311 - target: {fileID: 22465524, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2} 317 - target: {fileID: 22465524, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
312 propertyPath: m_SizeDelta.x 318 propertyPath: m_SizeDelta.x
@@ -332,6 +338,214 @@ Prefab: @@ -332,6 +338,214 @@ Prefab:
332 propertyPath: m_AnchorMax.y 338 propertyPath: m_AnchorMax.y
333 value: .5 339 value: .5
334 objectReference: {fileID: 0} 340 objectReference: {fileID: 0}
  341 + - target: {fileID: 22474902, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  342 + propertyPath: m_AnchoredPosition.y
  343 + value: 21.75
  344 + objectReference: {fileID: 0}
  345 + - target: {fileID: 22474902, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  346 + propertyPath: m_AnchoredPosition.x
  347 + value: 0
  348 + objectReference: {fileID: 0}
  349 + - target: {fileID: 22474902, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  350 + propertyPath: m_SizeDelta.x
  351 + value: 1
  352 + objectReference: {fileID: 0}
  353 + - target: {fileID: 22474902, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  354 + propertyPath: m_SizeDelta.y
  355 + value: 43.5
  356 + objectReference: {fileID: 0}
  357 + - target: {fileID: 11421050, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  358 + propertyPath: m_PreserveAspect
  359 + value: 0
  360 + objectReference: {fileID: 0}
  361 + - target: {fileID: 22474902, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  362 + propertyPath: m_AnchorMin.y
  363 + value: 0
  364 + objectReference: {fileID: 0}
  365 + - target: {fileID: 22474902, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  366 + propertyPath: m_AnchorMax.y
  367 + value: 0
  368 + objectReference: {fileID: 0}
  369 + - target: {fileID: 165578, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  370 + propertyPath: m_StaticEditorFlags
  371 + value: 4294967295
  372 + objectReference: {fileID: 0}
  373 + - target: {fileID: 193898, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  374 + propertyPath: m_StaticEditorFlags
  375 + value: 4294967295
  376 + objectReference: {fileID: 0}
  377 + - target: {fileID: 119688, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  378 + propertyPath: m_StaticEditorFlags
  379 + value: 4294967295
  380 + objectReference: {fileID: 0}
  381 + - target: {fileID: 170998, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  382 + propertyPath: m_StaticEditorFlags
  383 + value: 4294967295
  384 + objectReference: {fileID: 0}
  385 + - target: {fileID: 107366, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  386 + propertyPath: m_StaticEditorFlags
  387 + value: 4294967295
  388 + objectReference: {fileID: 0}
  389 + - target: {fileID: 143508, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  390 + propertyPath: m_StaticEditorFlags
  391 + value: 4294967295
  392 + objectReference: {fileID: 0}
  393 + - target: {fileID: 130142, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  394 + propertyPath: m_StaticEditorFlags
  395 + value: 4294967295
  396 + objectReference: {fileID: 0}
  397 + - target: {fileID: 132472, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  398 + propertyPath: m_StaticEditorFlags
  399 + value: 4294967295
  400 + objectReference: {fileID: 0}
  401 + - target: {fileID: 117460, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  402 + propertyPath: m_StaticEditorFlags
  403 + value: 4294967295
  404 + objectReference: {fileID: 0}
  405 + - target: {fileID: 102362, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  406 + propertyPath: m_StaticEditorFlags
  407 + value: 4294967295
  408 + objectReference: {fileID: 0}
  409 + - target: {fileID: 173336, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  410 + propertyPath: m_StaticEditorFlags
  411 + value: 4294967295
  412 + objectReference: {fileID: 0}
  413 + - target: {fileID: 131276, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  414 + propertyPath: m_StaticEditorFlags
  415 + value: 4294967295
  416 + objectReference: {fileID: 0}
  417 + - target: {fileID: 22483228, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  418 + propertyPath: m_AnchorMin.x
  419 + value: .5
  420 + objectReference: {fileID: 0}
  421 + - target: {fileID: 22483228, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  422 + propertyPath: m_AnchorMax.x
  423 + value: .5
  424 + objectReference: {fileID: 0}
  425 + - target: {fileID: 22483228, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  426 + propertyPath: m_AnchoredPosition.x
  427 + value: 172
  428 + objectReference: {fileID: 0}
  429 + - target: {fileID: 22483228, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  430 + propertyPath: m_AnchorMin.y
  431 + value: .5
  432 + objectReference: {fileID: 0}
  433 + - target: {fileID: 22483228, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  434 + propertyPath: m_AnchorMax.y
  435 + value: .5
  436 + objectReference: {fileID: 0}
  437 + - target: {fileID: 22483228, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  438 + propertyPath: m_SizeDelta.x
  439 + value: 25
  440 + objectReference: {fileID: 0}
  441 + - target: {fileID: 22483228, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  442 + propertyPath: m_SizeDelta.y
  443 + value: 24
  444 + objectReference: {fileID: 0}
  445 + - target: {fileID: 22474902, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  446 + propertyPath: m_AnchorMin.x
  447 + value: 0
  448 + objectReference: {fileID: 0}
  449 + - target: {fileID: 22474902, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  450 + propertyPath: m_AnchorMax.x
  451 + value: 1
  452 + objectReference: {fileID: 0}
  453 + - target: {fileID: 22483228, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  454 + propertyPath: m_AnchoredPosition.y
  455 + value: 0
  456 + objectReference: {fileID: 0}
  457 + - target: {fileID: 11487552, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  458 + propertyPath: m_PreserveAspect
  459 + value: 0
  460 + objectReference: {fileID: 0}
  461 + - target: {fileID: 11487614, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  462 + propertyPath: m_PreserveAspect
  463 + value: 0
  464 + objectReference: {fileID: 0}
  465 + - target: {fileID: 11402004, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  466 + propertyPath: m_PreserveAspect
  467 + value: 0
  468 + objectReference: {fileID: 0}
  469 + - target: {fileID: 22452620, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  470 + propertyPath: m_AnchoredPosition.x
  471 + value: 137
  472 + objectReference: {fileID: 0}
  473 + - target: {fileID: 22458334, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  474 + propertyPath: m_AnchoredPosition.x
  475 + value: -103
  476 + objectReference: {fileID: 0}
  477 + - target: {fileID: 22481960, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  478 + propertyPath: m_AnchoredPosition.x
  479 + value: -138
  480 + objectReference: {fileID: 0}
  481 + - target: {fileID: 22465894, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  482 + propertyPath: m_AnchoredPosition.x
  483 + value: 16
  484 + objectReference: {fileID: 0}
  485 + - target: {fileID: 177790, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  486 + propertyPath: m_IsActive
  487 + value: 0
  488 + objectReference: {fileID: 0}
  489 + - target: {fileID: 11436708, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  490 + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
  491 + value:
  492 + objectReference: {fileID: 1839061338}
  493 + - target: {fileID: 11436708, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  494 + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
  495 + value: start_inputfield_web_play
  496 + objectReference: {fileID: 0}
  497 + - target: {fileID: 22483792, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  498 + propertyPath: m_AnchoredPosition.x
  499 + value: 57.2999992
  500 + objectReference: {fileID: 0}
  501 + - target: {fileID: 22483792, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  502 + propertyPath: m_AnchoredPosition.y
  503 + value: -137.100006
  504 + objectReference: {fileID: 0}
  505 + - target: {fileID: 22483792, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  506 + propertyPath: m_AnchorMin.x
  507 + value: 0
  508 + objectReference: {fileID: 0}
  509 + - target: {fileID: 22483792, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  510 + propertyPath: m_AnchorMax.x
  511 + value: 0
  512 + objectReference: {fileID: 0}
  513 + - target: {fileID: 22483792, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  514 + propertyPath: m_AnchorMin.y
  515 + value: .5
  516 + objectReference: {fileID: 0}
  517 + - target: {fileID: 22483792, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  518 + propertyPath: m_AnchorMax.y
  519 + value: .5
  520 + objectReference: {fileID: 0}
  521 + - target: {fileID: 22483792, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  522 + propertyPath: m_SizeDelta.y
  523 + value: 31.3999939
  524 + objectReference: {fileID: 0}
  525 + - target: {fileID: 11460436, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  526 + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
  527 + value:
  528 + objectReference: {fileID: 1839061338}
  529 + - target: {fileID: 11460436, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  530 + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
  531 + value: setSlider
  532 + objectReference: {fileID: 0}
  533 + - target: {fileID: 11415218, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  534 + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
  535 + value:
  536 + objectReference: {fileID: 1839061338}
  537 + - target: {fileID: 11415218, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  538 + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
  539 + value: stop_animations
  540 + objectReference: {fileID: 0}
  541 + - target: {fileID: 11451458, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  542 + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
  543 + value:
  544 + objectReference: {fileID: 1839061338}
  545 + - target: {fileID: 11451458, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
  546 + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
  547 + value: start_web_play
  548 + objectReference: {fileID: 0}
335 m_RemovedComponents: [] 549 m_RemovedComponents: []
336 m_ParentPrefab: {fileID: 100100000, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2} 550 m_ParentPrefab: {fileID: 100100000, guid: a310db7b56d86974ca7dc72c28f6a7f6, type: 2}
337 m_IsPrefabParent: 0 551 m_IsPrefabParent: 0
Assets/Scripts/PlayerManager.cs
  Diff comments   View file @48a02ab
@@ -45,7 +45,9 @@ public class PlayerManager : MonoBehaviour { @@ -45,7 +45,9 @@ public class PlayerManager : MonoBehaviour {
45 } 45 }
46 46
47 void Update(){ 47 void Update(){
48 - foreach(AnimationState anim in COMPONENT_ANIMATION){ anim.speed = hSliderValue;} 48 + if(COMPONENT_ANIMATION.isPlaying)
  49 + foreach(AnimationState anim in COMPONENT_ANIMATION)
  50 + anim.speed = hSliderValue;
49 } 51 }
50 52
51 //define a velocidade das animacoes com base no slider da GUI 53 //define a velocidade das animacoes com base no slider da GUI
@@ -61,8 +63,6 @@ public class PlayerManager : MonoBehaviour { @@ -61,8 +63,6 @@ public class PlayerManager : MonoBehaviour {
61 63
62 foreach( char letter in alphabet ){ 64 foreach( char letter in alphabet ){
63 65
64 - Subtitles.WORDS.Add(""+letter);  
65 -  
66 aniClip = Resources.Load<AnimationClip> ("ANIMS/"+letter); 66 aniClip = Resources.Load<AnimationClip> ("ANIMS/"+letter);
67 67
68 if( aniClip ) COMPONENT_ANIMATION.AddClip(aniClip, ""+letter); 68 if( aniClip ) COMPONENT_ANIMATION.AddClip(aniClip, ""+letter);
@@ -104,7 +104,14 @@ public class PlayerManager : MonoBehaviour { @@ -104,7 +104,14 @@ public class PlayerManager : MonoBehaviour {
104 104
105 IEnumerator webPlay(String glosa, int version) { 105 IEnumerator webPlay(String glosa, int version) {
106 106
  107 +
  108 +
107 stop_animations( ); 109 stop_animations( );
  110 +
  111 + Subtitles.WORDS.Clear();
  112 + foreach( char letter in alphabet ) Subtitles.WORDS.Add(""+letter);
  113 +
  114 +
108 stringPos = glosa.Split(' '); 115 stringPos = glosa.Split(' ');
109 String BaseURL = "http://150.165.205.9/anims/WEBGL/"; 116 String BaseURL = "http://150.165.205.9/anims/WEBGL/";
110 117
@@ -123,6 +130,7 @@ public class PlayerManager : MonoBehaviour { @@ -123,6 +130,7 @@ public class PlayerManager : MonoBehaviour {
123 // Se ja estiver carregado: reproduz animaçao 130 // Se ja estiver carregado: reproduz animaçao
124 if (loadedAssetBundles.Contains(aniName)){ 131 if (loadedAssetBundles.Contains(aniName)){
125 132
  133 + Subtitles.WORDS.Add(aniName);
126 COMPONENT_ANIMATION.CrossFadeQueued(aniName, 0.6F, QueueMode.CompleteOthers); 134 COMPONENT_ANIMATION.CrossFadeQueued(aniName, 0.6F, QueueMode.CompleteOthers);
127 135
128 }else if (nonexistentAssetBundles.Contains(aniName)){//se nao estiver, soletra 136 }else if (nonexistentAssetBundles.Contains(aniName)){//se nao estiver, soletra
@@ -137,7 +145,7 @@ public class PlayerManager : MonoBehaviour { @@ -137,7 +145,7 @@ public class PlayerManager : MonoBehaviour {
137 if (www.error != null){//soletra se o ww inexistir 145 if (www.error != null){//soletra se o ww inexistir
138 //throw new Exception("Erro no WWW: " + www.error); 146 //throw new Exception("Erro no WWW: " + www.error);
139 147
140 - Debug.Log("Sinal nao disponivel em banco de sinais. SOLETRANDO!"); 148 + Debug.Log("Sinal nao disponivel em banco de sinais. SOLETRANDO "+aniName);
141 149
142 foreach (char letter in aniName) 150 foreach (char letter in aniName)
143 COMPONENT_ANIMATION.CrossFadeQueued(""+letter, 0.6F, QueueMode.CompleteOthers); 151 COMPONENT_ANIMATION.CrossFadeQueued(""+letter, 0.6F, QueueMode.CompleteOthers);
@@ -156,7 +164,7 @@ public class PlayerManager : MonoBehaviour { @@ -156,7 +164,7 @@ public class PlayerManager : MonoBehaviour {
156 COMPONENT_ANIMATION.CrossFadeQueued(aniName, 0.6F, QueueMode.CompleteOthers); // 0.4 164 COMPONENT_ANIMATION.CrossFadeQueued(aniName, 0.6F, QueueMode.CompleteOthers); // 0.4
157 165
158 166
159 - Subtitles.WORDS.Add(aniName.ToUpper( )); loadedAssetBundles.Add(aniName); 167 + Subtitles.WORDS.Add(aniName); loadedAssetBundles.Add(aniName);
160 168
161 }else{ 169 }else{
162 foreach (char letter in aniName) 170 foreach (char letter in aniName)