diff --git a/TFG_Ejecutable/TFG_Gonzalo_Data/Managed/Scripts.dll b/TFG_Ejecutable/TFG_Gonzalo_Data/Managed/Scripts.dll index ee39b06194d489a3dd387c630dd46902146dfee0..54dc2bad50ddf6c077cd1175f8a40bc45ba22a66 100644 Binary files a/TFG_Ejecutable/TFG_Gonzalo_Data/Managed/Scripts.dll and b/TFG_Ejecutable/TFG_Gonzalo_Data/Managed/Scripts.dll differ diff --git a/TFG_Ejecutable/TFG_Gonzalo_Data/Plugins/x86_64/lib_burst_generated.dll b/TFG_Ejecutable/TFG_Gonzalo_Data/Plugins/x86_64/lib_burst_generated.dll index 94e1520220e403782344a81d76fdc85e73f02d4b..5f8a1baea2459bdba4de6731891d2223dc499280 100644 Binary files a/TFG_Ejecutable/TFG_Gonzalo_Data/Plugins/x86_64/lib_burst_generated.dll and b/TFG_Ejecutable/TFG_Gonzalo_Data/Plugins/x86_64/lib_burst_generated.dll differ diff --git a/TFG_Ejecutable/TFG_Gonzalo_Data/globalgamemanagers b/TFG_Ejecutable/TFG_Gonzalo_Data/globalgamemanagers index 42c24c44fcdba7d5ad9dfbb174c26f27259b1d0d..35ce4e644be4ea34bb2a615150d2e80e5e364bfd 100644 Binary files a/TFG_Ejecutable/TFG_Gonzalo_Data/globalgamemanagers and b/TFG_Ejecutable/TFG_Gonzalo_Data/globalgamemanagers differ diff --git a/TFG_Pruebas_Gonzalo/Assets/Scripts/Actions/DinamicaComprension.cs b/TFG_Pruebas_Gonzalo/Assets/Scripts/Actions/DinamicaComprension.cs index 5d867701dbcbaa6574c017a222bea1b3bc8ffecc..62dd2e702e15f9006792d236cee9cf4fedb3edb5 100644 --- a/TFG_Pruebas_Gonzalo/Assets/Scripts/Actions/DinamicaComprension.cs +++ b/TFG_Pruebas_Gonzalo/Assets/Scripts/Actions/DinamicaComprension.cs @@ -145,7 +145,7 @@ public class DinamicaComprension : Actions public void PrimeraIntervencion() { - Escritor.Instance.save("Entrada_Comprension", nombreDinamica); + Escritor.Instance.save(d.getDiccionario("Entrada_Comprension"), nombreDinamica); audioIntro.Play(); locutor.setEstado("PersonajeHablando", true); StartCoroutine(EsperaPrimeraIntervencion(audioIntro.clip.length)); diff --git a/TFG_Pruebas_Gonzalo/Assets/Scripts/Elementos/Micro.cs b/TFG_Pruebas_Gonzalo/Assets/Scripts/Elementos/Micro.cs index 2ff3c6560d03c4aec5e1b54cd638ef1b08a39288..b186651431b4740f61b4331bfea4a44b269a9cd1 100644 --- a/TFG_Pruebas_Gonzalo/Assets/Scripts/Elementos/Micro.cs +++ b/TFG_Pruebas_Gonzalo/Assets/Scripts/Elementos/Micro.cs @@ -88,7 +88,7 @@ public class Micro : MonoBehaviour animator = GetComponent<Animator>(); animator.SetBool("MicroPulsado", true); pulsado = true; - UsandoMicro(); + //UsandoMicro(); } public void setConectado(bool estado) @@ -105,7 +105,7 @@ public class Micro : MonoBehaviour pulsado = false; altavoz.setReproducir(true); altavoz.setConectado(true); - NoUsarMicro(); + //NoUsarMicro(); } @@ -113,25 +113,30 @@ public class Micro : MonoBehaviour { //altavoz.setReproducir(true); //altavoz.setConectado(true); - if(guardarAudio) Microphone.End(selectedDevice); + + //var filePath = "./Gonzalo/Grabaciones/data.wav"; //SavWav.Save("filePath", audioSource); //audioClip = audioSource.clip; + string fecha = DateTime.Now.ToString("dd-MM-yyyy-hh-mm-ss"); + + + //var filepath = "./Gonzalo/Grabaciones/" + fecha + ".wav"; if(guardarAudio) SavWav.Save(audioClip); - - //Escritor.Instance.setInfoAdicional(true, filepath); Escritor.Instance.save(d.getDiccionario("Fin_Grabacion"), nombreDinamica); - //Escritor.Instance.setInfoAdicional(false, ""); + + } public void UsandoMicro() { + Escritor.Instance.save(d.getDiccionario("Comienzo_Grabacion"), nombreDinamica); diff --git a/TFG_Pruebas_Gonzalo/Logs/AssetImportWorker0.log b/TFG_Pruebas_Gonzalo/Logs/AssetImportWorker0.log new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/TFG_Pruebas_Gonzalo/Logs/shadercompiler-AssetImportWorker0.log b/TFG_Pruebas_Gonzalo/Logs/shadercompiler-AssetImportWorker0.log new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391