From 0345388ff67f8286a95b15497d2cebaf4dd951bd Mon Sep 17 00:00:00 2001 From: Icaro Magalhaes Date: Wed, 1 Jul 2015 18:30:50 -0300 Subject: [PATCH] Modifica script inspetor para requisição web --- Assets/Resources/ANIMS/anims/LAVID.anim.meta | 4 ++-- Assets/Resources/ANIMS/anims/MAIS.anim.meta | 4 ++-- Assets/Resources/ANIMS/anims/SUCESSO.anim.meta | 4 ++-- Assets/Resources/ANIMS/anims/UFPB.anim.meta | 4 ++-- Assets/Resources/ANIMS/anims/VLIBRAS.anim.meta | 4 ++-- Assets/Scene.unity | 6 +++--- Assets/Scripts/InspectorScript.cs | 37 +++++++++++++++++++++++++++---------- ProjectSettings/ProjectSettings.asset | 2 +- 8 files changed, 41 insertions(+), 24 deletions(-) diff --git a/Assets/Resources/ANIMS/anims/LAVID.anim.meta b/Assets/Resources/ANIMS/anims/LAVID.anim.meta index 2d4ad24..09d501c 100644 --- a/Assets/Resources/ANIMS/anims/LAVID.anim.meta +++ b/Assets/Resources/ANIMS/anims/LAVID.anim.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: d33e6748a760ebf47a327a945f49a5ff -timeCreated: 1435101905 +guid: 1fd14751dcfa1884fb52c97c589c87ef +timeCreated: 1435780468 licenseType: Pro NativeFormatImporter: userData: diff --git a/Assets/Resources/ANIMS/anims/MAIS.anim.meta b/Assets/Resources/ANIMS/anims/MAIS.anim.meta index 7fb8135..e5eae6a 100644 --- a/Assets/Resources/ANIMS/anims/MAIS.anim.meta +++ b/Assets/Resources/ANIMS/anims/MAIS.anim.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 036a4442639e0f7439b54cb981522e5c -timeCreated: 1435101904 +guid: 40bf2f48a19e903438161148ab945f8f +timeCreated: 1435780520 licenseType: Pro NativeFormatImporter: userData: diff --git a/Assets/Resources/ANIMS/anims/SUCESSO.anim.meta b/Assets/Resources/ANIMS/anims/SUCESSO.anim.meta index 384dc22..be058a2 100644 --- a/Assets/Resources/ANIMS/anims/SUCESSO.anim.meta +++ b/Assets/Resources/ANIMS/anims/SUCESSO.anim.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 6c1cd30dbfa30ef48931b49b4e94020c -timeCreated: 1435101905 +guid: 7fec89616c9ddf8459f7abae66587203 +timeCreated: 1435780613 licenseType: Pro NativeFormatImporter: userData: diff --git a/Assets/Resources/ANIMS/anims/UFPB.anim.meta b/Assets/Resources/ANIMS/anims/UFPB.anim.meta index 563a7dd..72320a7 100644 --- a/Assets/Resources/ANIMS/anims/UFPB.anim.meta +++ b/Assets/Resources/ANIMS/anims/UFPB.anim.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7cdcfb276b45c9a4f82302307f877b67 -timeCreated: 1435101905 +guid: a90c01c36d2ad98419b6b0a24aa0f0ee +timeCreated: 1435780677 licenseType: Pro NativeFormatImporter: userData: diff --git a/Assets/Resources/ANIMS/anims/VLIBRAS.anim.meta b/Assets/Resources/ANIMS/anims/VLIBRAS.anim.meta index b4c2b30..9aa67ed 100644 --- a/Assets/Resources/ANIMS/anims/VLIBRAS.anim.meta +++ b/Assets/Resources/ANIMS/anims/VLIBRAS.anim.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 0b1416e62b69c204d9a4a3db38ebcccd -timeCreated: 1435101904 +guid: 03acdd3f7575f944b99290b41c3f543d +timeCreated: 1435780430 licenseType: Pro NativeFormatImporter: userData: diff --git a/Assets/Scene.unity b/Assets/Scene.unity index c5d815f..a5c02e8 100644 --- a/Assets/Scene.unity +++ b/Assets/Scene.unity @@ -134,7 +134,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 491010, guid: 00197fc9877daa14c963e5917de36124, type: 2} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11171278, guid: 00197fc9877daa14c963e5917de36124, type: 2} propertyPath: m_Animations.Array.data[0] @@ -193,7 +193,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 426230, guid: cd81d95d2fa8dc448b18a415b9009d43, type: 2} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: cd81d95d2fa8dc448b18a415b9009d43, type: 2} @@ -235,7 +235,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22403302, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 22403302, guid: 12db97f21fb2a7d4cb537ec5395de1b9, type: 2} propertyPath: m_AnchoredPosition.x diff --git a/Assets/Scripts/InspectorScript.cs b/Assets/Scripts/InspectorScript.cs index e8bd131..ad76a57 100644 --- a/Assets/Scripts/InspectorScript.cs +++ b/Assets/Scripts/InspectorScript.cs @@ -1,6 +1,5 @@ //Log Dir http://docs.unity3d.com/Manual/LogFiles.html using UnityEngine; -using UnityEditor; using System.Collections; using System.Collections.Generic; using System; @@ -29,10 +28,6 @@ public class InspectorScript : MonoBehaviour { void Start( ){ - - - - try{ Debug.Log("Inicializando: "+coreInitialize( )); }catch(Exception e){ Debug.Log (e.ToString());} ICARO = GameObject.FindGameObjectWithTag("avatar"); @@ -47,8 +42,6 @@ public class InspectorScript : MonoBehaviour { void addAlpha( ){ - - foreach( char letter in alfabeto ){ aniClip = Resources.Load ("ANIMS/alpha/"+letter); @@ -183,12 +176,36 @@ public class InspectorScript : MonoBehaviour { } - void onGui(){ + void OnGUI(){ if( GUI.Button(new Rect(10, 10, 50, 50), "TESTE") ){ - Debug.Log("Clicked the button with an image"); + int version = 1; + + //StartCoroutine( bundleCatch(glosa.ToLower(), version) ); + StartCoroutine( bundleCatch("ABOBRINHA", version) ); } - + + + } + + IEnumerator bundleCatch( String token, int version ){ string BaseURL = "http://150.165.205.9/anims/"; + + WWW www = WWW.LoadFromCacheOrDownload(BaseURL+token, version); + yield return www; + if (www.error != null) throw new Exception("Erro no WWW! Se liga nego: " + www.error); + + UnityEngine.Object[] bundleBaixado = www.assetBundle.LoadAllAssets(); + + foreach(UnityEngine.Object animacao in bundleBaixado){ + + COMPONENT_ANIMATION.AddClip(animacao as AnimationClip, animacao.name); + + Debug.Log(animacao.name+" - "+animacao.GetType()); + + COMPONENT_ANIMATION.CrossFadeQueued(animacao.name, 0.6f, QueueMode.CompleteOthers); + + } + } } \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 599b046..b4d8258 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -402,7 +402,7 @@ PlayerSettings: WebGL::audioCompressionFormat: 4 WebGL::exceptionSupport: 0 WebGL::memorySize: 256 - iOS::Architecture: 2 + iOS::Architecture: 0 iOS::ScriptingBackend: 0 boolPropertyNames: - WebGL::dataCaching -- libgit2 0.21.2