¡¡Varios arreglos!!

1. Disparo enemigo, habia una posibilidad de que disparase de espaldas, ahora esta asegurado bajo una condicion de rotación. 2. Interruptor S2N2 (luces) no era oportuno encenderlo con un disparo. 3. Tilemap interruptor bloque S2N2 mejor pintado y colocado.... 4. Cables mejor pintados, siguiendo paredes y en su gameobject.... 5. Colision disparo enemigo vs disparo jugador eliminado. 6. Drop comprueba que el gamemanager exite/está activo. (Tratando de no dejar baterias sueltas) 8. Paredes que se rompen bajo el layer 'Pared'. 9. Menos errores por consola. Como acceder a objetos que aun no existen. 10. Acceder a DeathScreen lo hace automatico GameManager o en su defecto la inicialización del nivel 2. 11. Ajustes en Order in layer, salian baterias debajo de las estaciones. 12. Cámara del minimapa mejorado, se ven enemigos, luces y puertas.
Proyectos1-FDI-UCM · May 28, 2020 · 28c80c7 · 28c80c7
1 parent 780c8bd
commit 28c80c7
Show file tree

Hide file tree

Showing 11 changed files with 1,839 additions and 1,228 deletions.
diff --git a/Assets/Prefab/Disparo Robot.prefab b/Assets/Prefab/Disparo Robot.prefab
@@ -16,7 +16,7 @@ GameObject:
   - component: {fileID: 1122578849641198671}
   - component: {fileID: 8142876719729418086}
   - component: {fileID: 1813565054805806712}
-  m_Layer: 11
+  m_Layer: 20
   m_Name: Disparo Robot
   m_TagString: Enemigo
   m_Icon: {fileID: 0}

diff --git a/Assets/Prefab/Minimapa Prefabs/Minimap Camera Global.prefab b/Assets/Prefab/Minimapa Prefabs/Minimap Camera Global.prefab
@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 5278054246925283242}
   - component: {fileID: 5278054246925283245}
   m_Layer: 0
-  m_Name: Minimap Camera (1)
+  m_Name: Minimap Camera Global
   m_TagString: MainCamera
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -63,7 +63,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 480256
+    m_Bits: 2235393
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: 920d9d7bb1765714fbab45a397f28909, type: 2}
   m_TargetDisplay: 0

diff --git a/Assets/Prefab/Minimapa Prefabs/Textos Minimapa.prefab b/Assets/Prefab/Minimapa Prefabs/Textos Minimapa.prefab
@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 1803529801591491595}
   - component: {fileID: 1803529801591491597}
   - component: {fileID: 1803529801591491594}
-  m_Layer: 18
+  m_Layer: 21
   m_Name: S2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -101,7 +101,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1803529801697284959}
-  m_Layer: 18
+  m_Layer: 21
   m_Name: Textos Minimapa
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -137,7 +137,7 @@ GameObject:
   - component: {fileID: 1803529801871538002}
   - component: {fileID: 1803529801871538004}
   - component: {fileID: 1803529801871538005}
-  m_Layer: 18
+  m_Layer: 21
   m_Name: S1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -229,7 +229,7 @@ GameObject:
   - component: {fileID: 1803529802423515233}
   - component: {fileID: 1803529802423515235}
   - component: {fileID: 1803529802423515232}
-  m_Layer: 18
+  m_Layer: 21
   m_Name: Hub
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -321,7 +321,7 @@ GameObject:
   - component: {fileID: 1803529803000816751}
   - component: {fileID: 1803529803000816737}
   - component: {fileID: 1803529803000816750}
-  m_Layer: 18
+  m_Layer: 21
   m_Name: S3
   m_TagString: Untagged
   m_Icon: {fileID: 0}

diff --git a/Assets/Scenes/Nivel 1.unity b/Assets/Scenes/Nivel 1.unity
@@ -4758,12 +4758,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 416436701}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &416698061 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5155901382704199664, guid: 36da19d3a1604be409553476197655c8,
-    type: 3}
-  m_PrefabInstance: {fileID: 661154054}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &427841884
 GameObject:
   m_ObjectHideFlags: 0
@@ -21010,6 +21004,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2304546807006178909, guid: 36da19d3a1604be409553476197655c8,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 296.3
+      objectReference: {fileID: 0}
     - target: {fileID: 2304546806340691655, guid: 36da19d3a1604be409553476197655c8,
         type: 3}
       propertyPath: m_SizeDelta.x
@@ -21036,6 +21035,11 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 12800000, guid: 828734ed92a6f3047b8e2c91beacb4c2,
         type: 3}
+    - target: {fileID: 2304546807006178910, guid: 36da19d3a1604be409553476197655c8,
+        type: 3}
+      propertyPath: m_Name
+      value: NextLevelButton
+      objectReference: {fileID: 0}
     - target: {fileID: 2304546806340691654, guid: 36da19d3a1604be409553476197655c8,
         type: 3}
       propertyPath: m_Text
@@ -21056,45 +21060,10 @@ PrefabInstance:
       propertyPath: m_Color.b
       value: 0.3260057
       objectReference: {fileID: 0}
-    - target: {fileID: 2304546806980640730, guid: 36da19d3a1604be409553476197655c8,
-        type: 3}
-      propertyPath: m_Text
-      value: RESUME
-      objectReference: {fileID: 0}
-    - target: {fileID: 6112853490691310856, guid: 36da19d3a1604be409553476197655c8,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6112853490691310856, guid: 36da19d3a1604be409553476197655c8,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6112853490691310856, guid: 36da19d3a1604be409553476197655c8,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6112853490691310856, guid: 36da19d3a1604be409553476197655c8,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6112853489688561716, guid: 36da19d3a1604be409553476197655c8,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6112853489688561716, guid: 36da19d3a1604be409553476197655c8,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2304546807006178909, guid: 36da19d3a1604be409553476197655c8,
+    - target: {fileID: 2304546807006178908, guid: 36da19d3a1604be409553476197655c8,
         type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 296.3
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: Level2
       objectReference: {fileID: 0}
     - target: {fileID: 2304546807300887733, guid: 36da19d3a1604be409553476197655c8,
         type: 3}
@@ -21126,20 +21095,45 @@ PrefabInstance:
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
       value: UnityEngine.Object, UnityEngine
       objectReference: {fileID: 0}
-    - target: {fileID: 2304546807006178910, guid: 36da19d3a1604be409553476197655c8,
+    - target: {fileID: 2304546806585463055, guid: 36da19d3a1604be409553476197655c8,
         type: 3}
-      propertyPath: m_Name
-      value: NextLevelButton
+      propertyPath: m_Text
+      value: NEXT LEVEL
       objectReference: {fileID: 0}
-    - target: {fileID: 2304546807006178908, guid: 36da19d3a1604be409553476197655c8,
+    - target: {fileID: 2304546806980640730, guid: 36da19d3a1604be409553476197655c8,
         type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: Level2
+      propertyPath: m_Text
+      value: RESUME
       objectReference: {fileID: 0}
-    - target: {fileID: 2304546806585463055, guid: 36da19d3a1604be409553476197655c8,
+    - target: {fileID: 6112853490691310856, guid: 36da19d3a1604be409553476197655c8,
         type: 3}
-      propertyPath: m_Text
-      value: NEXT LEVEL
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6112853490691310856, guid: 36da19d3a1604be409553476197655c8,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6112853490691310856, guid: 36da19d3a1604be409553476197655c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6112853490691310856, guid: 36da19d3a1604be409553476197655c8,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6112853489688561716, guid: 36da19d3a1604be409553476197655c8,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6112853489688561716, guid: 36da19d3a1604be409553476197655c8,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 36da19d3a1604be409553476197655c8, type: 3}
@@ -37651,6 +37645,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1803529802423515233, guid: 07e651383cc54324e8921b516a6a3379,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -23.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 1803529802423515233, guid: 07e651383cc54324e8921b516a6a3379,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1.5
+      objectReference: {fileID: 0}
     - target: {fileID: 1803529801871538002, guid: 07e651383cc54324e8921b516a6a3379,
         type: 3}
       propertyPath: m_LocalPosition.y
@@ -37681,16 +37685,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.y
       value: 13.7
       objectReference: {fileID: 0}
-    - target: {fileID: 1803529802423515233, guid: 07e651383cc54324e8921b516a6a3379,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -23.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 1803529802423515233, guid: 07e651383cc54324e8921b516a6a3379,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 1.5
-      objectReference: {fileID: 0}
     - target: {fileID: 1803529801591491594, guid: 07e651383cc54324e8921b516a6a3379,
         type: 3}
       propertyPath: m_RichText
@@ -37730,11 +37724,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 935425228326059536, guid: 245c2e845f659d44e91e7bad6e44f906,
-        type: 3}
-      propertyPath: DeathUI
-      value: 
-      objectReference: {fileID: 416698061}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 245c2e845f659d44e91e7bad6e44f906, type: 3}
 --- !u!1 &1824666513
@@ -41569,7 +41558,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2064948799}
   - component: {fileID: 2064948800}
-  m_Layer: 0
+  m_Layer: 1
   m_Name: fondo
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -41972,24 +41961,6 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
-  - first: {x: -66, y: -37, z: 0}
-    second:
-      m_TileIndex: 18
-      m_TileSpriteIndex: 18
-      m_TileMatrixIndex: 2
-      m_TileColorIndex: 0
-      m_ObjectToInstantiate: {fileID: 0}
-      m_TileFlags: 1
-      m_ColliderType: 1
-  - first: {x: -65, y: -37, z: 0}
-    second:
-      m_TileIndex: 18
-      m_TileSpriteIndex: 18
-      m_TileMatrixIndex: 2
-      m_TileColorIndex: 0
-      m_ObjectToInstantiate: {fileID: 0}
-      m_TileFlags: 1
-      m_ColliderType: 1
   - first: {x: -63, y: -36, z: 0}
     second:
       m_TileIndex: 18
@@ -44440,7 +44411,7 @@ Tilemap:
     m_Data: {fileID: 11400000, guid: 7adac2d79a1af6245840248c561fd606, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: e8571cb07626ef14686a81c0dadfd3a2, type: 2}
-  - m_RefCount: 164
+  - m_RefCount: 162
     m_Data: {fileID: 11400000, guid: 71cda74edca14f04888d521092565280, type: 2}
   - m_RefCount: 0
     m_Data: {fileID: 0}
@@ -44496,7 +44467,7 @@ Tilemap:
   - m_RefCount: 1
     m_Data: {fileID: -1805566089831790840, guid: 812a0e89a3e6b7d45aba23e0fac6a0e3,
       type: 3}
-  - m_RefCount: 164
+  - m_RefCount: 162
     m_Data: {fileID: -379739839765990595, guid: 812a0e89a3e6b7d45aba23e0fac6a0e3,
       type: 3}
   - m_RefCount: 1
@@ -44539,7 +44510,7 @@ Tilemap:
       e31: 0
       e32: 0
       e33: 1
-  - m_RefCount: 50
+  - m_RefCount: 48
     m_Data:
       e00: -1
       e01: 0
@@ -44612,7 +44583,7 @@ Tilemap:
       e32: 0
       e33: 1
   m_TileColorArray:
-  - m_RefCount: 283
+  - m_RefCount: 281
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}