Problemas

Proyectos1-FDI-UCM · May 26, 2024 · efc0816 · efc0816
1 parent 8aef5b7
commit efc0816
Show file tree

Hide file tree

Showing 26 changed files with 9 additions and 9 deletions.
diff --git a/GodsTrials/Assets/Scenes/CinematicaFinal.unity b/GodsTrials/Assets/Scenes/CinematicaFinal.unity
@@ -1891,7 +1891,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e0833fd8e42d46a4e94e29febf5286b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isMenu: 0
+  isMenu: 1
 --- !u!114 &1890674999
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/GodsTrials/Assets/Scenes/Credits.unity b/GodsTrials/Assets/Scenes/Credits.unity
@@ -935,7 +935,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e0833fd8e42d46a4e94e29febf5286b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isMenu: 0
+  isMenu: 1
 --- !u!114 &1911520475
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/GodsTrials/Assets/Scenes/Final.unity b/GodsTrials/Assets/Scenes/Final.unity
@@ -201,7 +201,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7621074646420745668, guid: 91ed7fffa8158314d907ff71526d9060, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -470,7 +470,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d6ff00a30f610564e88279a1cd279b5a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  "da\xF1o": {fileID: 346822940}
+  dano: {fileID: 0}
   dolor: {fileID: 8300000, guid: 30802f62299ac7e40aed01b993919546, type: 3}
   hercules: {fileID: 346822924}
   vida: 3

diff --git a/GodsTrials/Assets/Scenes/MainMenu.unity b/GodsTrials/Assets/Scenes/MainMenu.unity
@@ -2220,7 +2220,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1826480170
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2678,7 +2678,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7621074646420745668, guid: 91ed7fffa8158314d907ff71526d9060, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7707742197809821074, guid: 91ed7fffa8158314d907ff71526d9060, type: 3}
       propertyPath: m_AnchoredPosition.x

diff --git a/GodsTrials/Assets/Scenes/OptionsMenu.unity b/GodsTrials/Assets/Scenes/OptionsMenu.unity
@@ -2249,7 +2249,7 @@ MonoBehaviour:
   carro: {fileID: 0}
   pez: {fileID: 0}
   ralla: {fileID: 0}
-  gameManager: {fileID: 0}
+  gameManager: {fileID: 1323167371}
   monedas: {fileID: 0}
   BotonesMuerte: {fileID: 0}
   buttonClickFXClip: {fileID: 8300000, guid: 8a2751738d21289498cd86cac3e8c871, type: 3}

diff --git a/GodsTrials/Assets/Scenes/Texto Inicial.unity b/GodsTrials/Assets/Scenes/Texto Inicial.unity
@@ -510,7 +510,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e0833fd8e42d46a4e94e29febf5286b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isMenu: 0
+  isMenu: 1
 --- !u!114 &651661894
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/Managed/Assembly-CSharp.dll b/GodsTrials/GodsTrialsBuild/God's Trials_Data/Managed/Assembly-CSharp.dll
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/boot.config b/GodsTrials/GodsTrialsBuild/God's Trials_Data/boot.config
@@ -1,4 +1,4 @@
 wait-for-native-debugger=0
 hdr-display-enabled=0
 gc-max-time-slice=3
-build-guid=492e2a3c71594e719100aba64df9c0a5
+build-guid=e25484e2d93a41bda4bb7e2d7673e4a1
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/globalgamemanagers b/GodsTrials/GodsTrialsBuild/God's Trials_Data/globalgamemanagers
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/globalgamemanagers.assets b/GodsTrials/GodsTrialsBuild/God's Trials_Data/globalgamemanagers.assets
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level0 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level0
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level1 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level1
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level10 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level10
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level11 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level11
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level13 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level13
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level2 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level2
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level4 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level4
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level6 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level6
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level7 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level7
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level8 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level8
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/level9 b/GodsTrials/GodsTrialsBuild/God's Trials_Data/level9
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets1.assets b/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets1.assets
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets10.assets b/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets10.assets
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets10.resource b/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets10.resource
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets6.assets b/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets6.assets
diff --git a/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets8.assets b/GodsTrials/GodsTrialsBuild/God's Trials_Data/sharedassets8.assets