Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 295991ee by David Colmenero Chica
Options

Merge remote-tracking branch 'origin/Sistema_de_guardado' into Release

parents 0f52df63 edf0b45b
Inline Side-by-side
Showing with 56 additions and 53 deletions
Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs
...@@ -75,6 +75,7 @@ public class Coleccionables : MonoBehaviour ...@@ -75,6 +75,7 @@ public class Coleccionables : MonoBehaviour
private void Start() private void Start()
{ {
if (niActual == 0) {
for (int i = 0; i < pColecNivel1.Length; i++) for (int i = 0; i < pColecNivel1.Length; i++)
{ {
if (pColecNivel1[i] != new Vector3(0, 0, 0)) if (pColecNivel1[i] != new Vector3(0, 0, 0))
...@@ -83,6 +84,8 @@ public class Coleccionables : MonoBehaviour ...@@ -83,6 +84,8 @@ public class Coleccionables : MonoBehaviour
Instantiate(prefabColeccionable, pColecNivel1[i], Quaternion.identity); Instantiate(prefabColeccionable, pColecNivel1[i], Quaternion.identity);
} }
} }
}
Modificado(); Modificado();
} }
......
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -21,7 +21,7 @@ MonoBehaviour: ...@@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4 m_ShowMode: 4
m_Title: m_Title:
m_RootView: {fileID: 6} m_RootView: {fileID: 6}
m_MinSize: {x: 950, y: 544} m_MinSize: {x: 950, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
...@@ -44,10 +44,10 @@ MonoBehaviour: ...@@ -44,10 +44,10 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
m_MinSize: {x: 679, y: 494} m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14002, y: 14044} m_MaxSize: {x: 14004, y: 14044}
vertical: 0 vertical: 0
controlID: 42 controlID: 52
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -67,8 +67,8 @@ MonoBehaviour: ...@@ -67,8 +67,8 @@ MonoBehaviour:
y: 0 y: 0
width: 389 width: 389
height: 947 height: 947
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 14}
...@@ -92,9 +92,9 @@ MonoBehaviour: ...@@ -92,9 +92,9 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 379 width: 379
height: 573 height: 605
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 202, y: 222}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 15} m_ActualView: {fileID: 15}
m_Panes: m_Panes:
- {fileID: 15} - {fileID: 15}
...@@ -116,9 +116,9 @@ MonoBehaviour: ...@@ -116,9 +116,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 573 y: 605
width: 1531 width: 1531
height: 374 height: 342
m_MinSize: {x: 232, y: 272} m_MinSize: {x: 232, y: 272}
m_MaxSize: {x: 10002, y: 10022} m_MaxSize: {x: 10002, y: 10022}
m_ActualView: {fileID: 13} m_ActualView: {fileID: 13}
...@@ -215,10 +215,10 @@ MonoBehaviour: ...@@ -215,10 +215,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 947 height: 947
m_MinSize: {x: 404, y: 494} m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 10002, y: 14044}
vertical: 1 vertical: 1
controlID: 43 controlID: 53
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -239,11 +239,11 @@ MonoBehaviour: ...@@ -239,11 +239,11 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 1531 width: 1531
height: 573 height: 605
m_MinSize: {x: 404, y: 222} m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8004, y: 4022} m_MaxSize: {x: 8006, y: 4022}
vertical: 0 vertical: 0
controlID: 44 controlID: 54
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -262,7 +262,7 @@ MonoBehaviour: ...@@ -262,7 +262,7 @@ MonoBehaviour:
x: 379 x: 379
y: 0 y: 0
width: 1152 width: 1152
height: 573 height: 605
m_MinSize: {x: 204, y: 222} m_MinSize: {x: 204, y: 222}
m_MaxSize: {x: 4004, y: 4022} m_MaxSize: {x: 4004, y: 4022}
m_ActualView: {fileID: 16} m_ActualView: {fileID: 16}
...@@ -293,10 +293,10 @@ MonoBehaviour: ...@@ -293,10 +293,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 379 x: 468
y: 73 y: 181
width: 1150 width: 973
height: 554 height: 501
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
--- !u!114 &13 --- !u!114 &13
MonoBehaviour: MonoBehaviour:
...@@ -320,9 +320,9 @@ MonoBehaviour: ...@@ -320,9 +320,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 646 y: 678
width: 1531 width: 1531
height: 355 height: 323
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SearchFilter: m_SearchFilter:
m_NameFilter: m_NameFilter:
...@@ -336,20 +336,20 @@ MonoBehaviour: ...@@ -336,20 +336,20 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Player/Scripts - Assets/Scripts
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Player/Scripts - Assets/Scripts
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\Videojuegos_Proyecto
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 3a350000 m_SelectedIDs: 16330000
m_LastClickedID: 13626 m_LastClickedID: 13078
m_ExpandedIDs: 00000000662b00009634000000ca9a3b m_ExpandedIDs: 000000005e2b000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -365,7 +365,7 @@ MonoBehaviour: ...@@ -365,7 +365,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5} m_ClientGUIView: {fileID: 0}
m_SearchString: m_SearchString:
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
...@@ -377,7 +377,7 @@ MonoBehaviour: ...@@ -377,7 +377,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000662b0000 m_ExpandedIDs: 000000005e2b0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -492,14 +492,14 @@ MonoBehaviour: ...@@ -492,14 +492,14 @@ MonoBehaviour:
x: 0 x: 0
y: 73 y: 73
width: 379 width: 379
height: 554 height: 586
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: b6290000 m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 20faffff m_ExpandedIDs: 28faffff703d0000983d0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -515,14 +515,14 @@ MonoBehaviour: ...@@ -515,14 +515,14 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 0} m_ClientGUIView: {fileID: 4}
m_SearchString: m_SearchString:
m_ExpandedScenes: [] m_ExpandedScenes: []
m_CurrenRootInstanceID: 0 m_CurrenRootInstanceID: 0
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_CurrentSortingName: TransformSorting m_CurrentSortingName: TransformSorting
m_WindowGUID: 882b1ffbccde250418ab8e4c9d2d3ed7 m_WindowGUID: e4f845058af2fed45a9fd11aeb1bc7f9
--- !u!114 &16 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -547,10 +547,10 @@ MonoBehaviour: ...@@ -547,10 +547,10 @@ MonoBehaviour:
x: 379 x: 379
y: 73 y: 73
width: 1150 width: 1150
height: 554 height: 586
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: 9da1557899ac30346918b300a279c884 m_WindowGUID: 43dad88c062228f459455f7a9fa529fd
m_Gizmos: 1 m_Gizmos: 1
m_SceneIsLit: 1 m_SceneIsLit: 1
m_SceneLighting: 1 m_SceneLighting: 1
...@@ -559,9 +559,9 @@ MonoBehaviour: ...@@ -559,9 +559,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: -5.123681, y: 0.13753039, z: -4.2441635} m_Target: {x: 578.6107, y: 285.79947, z: -120.5}
speed: 2 speed: 2
m_Value: {x: -5.123681, y: 0.13753039, z: -4.2441635} m_Value: {x: 578.6107, y: 285.79947, z: -120.5}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -594,9 +594,9 @@ MonoBehaviour: ...@@ -594,9 +594,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 7.8685966 m_Target: 610.695
speed: 2 speed: 2
m_Value: 7.8685966 m_Value: 610.695
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -645,7 +645,7 @@ MonoBehaviour: ...@@ -645,7 +645,7 @@ MonoBehaviour:
x: 379 x: 379
y: 73 y: 73
width: 1150 width: 1150
height: 554 height: 586
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_VSyncEnabled: 0 m_VSyncEnabled: 0
m_MaximizeOnPlay: 0 m_MaximizeOnPlay: 0
...@@ -660,8 +660,8 @@ MonoBehaviour: ...@@ -660,8 +660,8 @@ MonoBehaviour:
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -575 m_HBaseRangeMin: -575
m_HBaseRangeMax: 575 m_HBaseRangeMax: 575
m_VBaseRangeMin: -268.5 m_VBaseRangeMin: -284.5
m_VBaseRangeMax: 268.5 m_VBaseRangeMax: 284.5
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
...@@ -680,9 +680,9 @@ MonoBehaviour: ...@@ -680,9 +680,9 @@ MonoBehaviour:
x: 0 x: 0
y: 17 y: 17
width: 1150 width: 1150
height: 537 height: 569
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 575, y: 268.5} m_Translation: {x: 575, y: 284.5}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
...@@ -690,14 +690,14 @@ MonoBehaviour: ...@@ -690,14 +690,14 @@ MonoBehaviour:
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -575 x: -575
y: -268.5 y: -284.5
width: 1150 width: 1150
height: 537 height: 569
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 1 m_defaultScale: 1
m_TargetTexture: {fileID: 0} m_TargetTexture: {fileID: 0}
m_CurrentColorSpace: 0 m_CurrentColorSpace: 0
m_LastWindowPixelSize: {x: 1150, y: 554} m_LastWindowPixelSize: {x: 1150, y: 586}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
...@@ -724,7 +724,7 @@ MonoBehaviour: ...@@ -724,7 +724,7 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 646 y: 678
width: 1531 width: 1531
height: 355 height: 323
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment