From a8b2d970ffcaafb41f6858752cdd614b2081a385 Mon Sep 17 00:00:00 2001
From: gonzfer <gonzalovictoria6@gmail.com>
Date: Sat, 23 Jul 2022 00:56:54 +0200
Subject: [PATCH] Mas mejoras incluidas
---
.../TFG_Gonzalo_Data/Managed/Scripts.dll | Bin 45056 -> 44544 bytes
.../Plugins/x86_64/lib_burst_generated.dll | Bin 107008 -> 107008 bytes
.../TFG_Gonzalo_Data/globalgamemanagers | Bin 94504 -> 94504 bytes
.../Scripts/Actions/DinamicaComprension.cs | 2 +-
.../Assets/Scripts/Elementos/Micro.cs | 17 +++++++++++------
.../Logs/AssetImportWorker0.log | 0
.../shadercompiler-AssetImportWorker0.log | 0
7 files changed, 12 insertions(+), 7 deletions(-)
create mode 100644 TFG_Pruebas_Gonzalo/Logs/AssetImportWorker0.log
create mode 100644 TFG_Pruebas_Gonzalo/Logs/shadercompiler-AssetImportWorker0.log
diff --git a/TFG_Ejecutable/TFG_Gonzalo_Data/Managed/Scripts.dll b/TFG_Ejecutable/TFG_Gonzalo_Data/Managed/Scripts.dll
index ee39b06194d489a3dd387c630dd46902146dfee0..54dc2bad50ddf6c077cd1175f8a40bc45ba22a66 100644
GIT binary patch
delta 4879
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
delta 4908
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
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
GIT binary patch
delta 18
ZcmZoT!q#wvZ9)Unf33!*txb$|3js}A2r2*o
delta 18
ZcmZoT!q#wvZ9)T6zd~cv)+WZfg#bw#2e1GD
diff --git a/TFG_Ejecutable/TFG_Gonzalo_Data/globalgamemanagers b/TFG_Ejecutable/TFG_Gonzalo_Data/globalgamemanagers
index 42c24c44fcdba7d5ad9dfbb174c26f27259b1d0d..35ce4e644be4ea34bb2a615150d2e80e5e364bfd 100644
GIT binary patch
delta 34
qcmZ4Sh;_vy)`l&N0jUDUTkbTT-BIb;p!u=?=H80Z?Fp%jC%6G6%n+ae
delta 34
qcmZ4Sh;_vy)`l&N0jUDj)+y%3?naI?B5pL^nHin2Jt39x1UCTtX$~j=
diff --git a/TFG_Pruebas_Gonzalo/Assets/Scripts/Actions/DinamicaComprension.cs b/TFG_Pruebas_Gonzalo/Assets/Scripts/Actions/DinamicaComprension.cs
index 5d86770..62dd2e7 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 2ff3c65..b186651 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 0000000..e69de29
diff --git a/TFG_Pruebas_Gonzalo/Logs/shadercompiler-AssetImportWorker0.log b/TFG_Pruebas_Gonzalo/Logs/shadercompiler-AssetImportWorker0.log
new file mode 100644
index 0000000..e69de29
--
GitLab