Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 436f35d4 by David Colmenero Chica
Options

Coleccionables recolocados

parent 3b725901
Expand all
Inline Side-by-side
Showing with 102 additions and 102 deletions
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
...@@ -10804,6 +10804,11 @@ PrefabInstance: ...@@ -10804,6 +10804,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: GameManager value: GameManager
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3174322665456641310, guid: c299a511f2a249142ac36667ddcf3b49,
type: 3}
propertyPath: posicionesColecNivel1.Array.size
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7736364748447018736, guid: c299a511f2a249142ac36667ddcf3b49, - target: {fileID: 7736364748447018736, guid: c299a511f2a249142ac36667ddcf3b49,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
...@@ -10859,11 +10864,6 @@ PrefabInstance: ...@@ -10859,11 +10864,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3174322665456641310, guid: c299a511f2a249142ac36667ddcf3b49,
type: 3}
propertyPath: posicionesColecNivel1.Array.size
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1646803205624574402, guid: c299a511f2a249142ac36667ddcf3b49, - target: {fileID: 1646803205624574402, guid: c299a511f2a249142ac36667ddcf3b49,
type: 3} type: 3}
propertyPath: enemigo propertyPath: enemigo
......
Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs
...@@ -56,10 +56,10 @@ public class Coleccionables : MonoBehaviour ...@@ -56,10 +56,10 @@ public class Coleccionables : MonoBehaviour
{ enemigosTotales[0] = GameObject.Find("Enemigos").transform.childCount; } { enemigosTotales[0] = GameObject.Find("Enemigos").transform.childCount; }
nombreImagenPartitura[0] = "Partitura-completa-1"; nombreImagenPartitura[0] = "Partitura-completa-1";
coleccTotales[0] = 6; //El ultimo coleccionable se consigue al derrotar a todos los enemigos, asi que aqui abajo hay el numero de coleccTotales - 1 de coleccionables coleccTotales[0] = 6; //El ultimo coleccionable se consigue al derrotar a todos los enemigos, asi que aqui abajo hay el numero de coleccTotales - 1 de coleccionables
posicionesColecNivel1[0] = new Vector3(-5.48f, 0.01f, 0); posicionesColecNivel1[0] = new Vector3(-3.78f, 0.37f, 0);
posicionesColecNivel1[1] = new Vector3(-3.08f, 0.01f, 0); posicionesColecNivel1[1] = new Vector3( 19.49f, -0.04f, 0);
posicionesColecNivel1[2] = new Vector3(-1.78f, -1.78f, 0); posicionesColecNivel1[2] = new Vector3( 62.65f, -1.73f, 0);
posicionesColecNivel1[3] = new Vector3( 1.48f, -1.78f, 0); posicionesColecNivel1[3] = new Vector3( 76.86f, 2.23f, 0);
posicionesColecNivel1[4] = new Vector3( 58.42f, 1.85f, 0); posicionesColecNivel1[4] = new Vector3( 58.42f, 1.85f, 0);
// } // }
......
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -16,12 +16,12 @@ MonoBehaviour: ...@@ -16,12 +16,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 43 y: 43
width: 1366 width: 1920
height: 685 height: 997
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: 394}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
...@@ -42,12 +42,12 @@ MonoBehaviour: ...@@ -42,12 +42,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 30 y: 30
width: 1366 width: 1920
height: 635 height: 947
m_MinSize: {x: 679, y: 494} m_MinSize: {x: 681, y: 344}
m_MaxSize: {x: 14002, y: 14044} m_MaxSize: {x: 12006, y: 8044}
vertical: 0 vertical: 0
controlID: 77 controlID: 134
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -63,10 +63,10 @@ MonoBehaviour: ...@@ -63,10 +63,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1089 x: 1589
y: 0 y: 0
width: 277 width: 331
height: 635 height: 947
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
...@@ -91,10 +91,10 @@ MonoBehaviour: ...@@ -91,10 +91,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 202 width: 341
height: 363 height: 630
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,18 +116,18 @@ MonoBehaviour: ...@@ -116,18 +116,18 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 363 y: 630
width: 1089 width: 1589
height: 272 height: 317
m_MinSize: {x: 232, y: 272} m_MinSize: {x: 102, y: 122}
m_MaxSize: {x: 10002, y: 10022} m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 13} m_ActualView: {fileID: 18}
m_Panes: m_Panes:
- {fileID: 13} - {fileID: 13}
- {fileID: 18} - {fileID: 18}
- {fileID: 12} - {fileID: 12}
m_Selected: 0 m_Selected: 1
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -148,9 +148,9 @@ MonoBehaviour: ...@@ -148,9 +148,9 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1366 width: 1920
height: 685 height: 997
m_MinSize: {x: 950, y: 300} m_MinSize: {x: 950, y: 394}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &7 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
...@@ -169,7 +169,7 @@ MonoBehaviour: ...@@ -169,7 +169,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1366 width: 1920
height: 30 height: 30
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
...@@ -190,8 +190,8 @@ MonoBehaviour: ...@@ -190,8 +190,8 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 665 y: 977
width: 1366 width: 1920
height: 20 height: 20
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
...@@ -214,12 +214,12 @@ MonoBehaviour: ...@@ -214,12 +214,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1089 width: 1589
height: 635 height: 947
m_MinSize: {x: 404, y: 494} m_MinSize: {x: 406, y: 344}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 8006, y: 8044}
vertical: 1 vertical: 1
controlID: 78 controlID: 60
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -239,12 +239,12 @@ MonoBehaviour: ...@@ -239,12 +239,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1089 width: 1589
height: 363 height: 630
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: 79 controlID: 61
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -260,10 +260,10 @@ MonoBehaviour: ...@@ -260,10 +260,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 202 x: 341
y: 0 y: 0
width: 887 width: 1248
height: 363 height: 630
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}
...@@ -300,7 +300,7 @@ MonoBehaviour: ...@@ -300,7 +300,7 @@ MonoBehaviour:
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_LastSelectedObjectID: -8524 m_LastSelectedObjectID: 16334
--- !u!114 &13 --- !u!114 &13
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -323,9 +323,9 @@ MonoBehaviour: ...@@ -323,9 +323,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 436 y: 703
width: 1089 width: 1589
height: 253 height: 298
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SearchFilter: m_SearchFilter:
m_NameFilter: m_NameFilter:
...@@ -339,20 +339,20 @@ MonoBehaviour: ...@@ -339,20 +339,20 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Player/Sprites - Assets/MainMenu/Scripts
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Player/Sprites - Assets/MainMenu/Scripts
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\alvmo\Documents\NetBeansProjects\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: 87} scrollPos: {x: 0, y: 0}
m_SelectedIDs: a4340000 m_SelectedIDs: a4370000
m_LastClickedID: 13476 m_LastClickedID: 14244
m_ExpandedIDs: 00000000862a0000f63300002434000000ca9a3b m_ExpandedIDs: 00000000ec2c0000243500004836000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -380,7 +380,7 @@ MonoBehaviour: ...@@ -380,7 +380,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000862a0000f6330000 m_ExpandedIDs: 00000000ec2c000048360000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -405,8 +405,8 @@ MonoBehaviour: ...@@ -405,8 +405,8 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs: e2250000
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 9698
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000a83200001c2c0000462b00004afc0000a23500000000000010d502008e350000 m_ExpandedInstanceIDs: c6230000a83200001c2c0000462b00004afc0000a23500000000000010d502008e350000
m_RenameOverlay: m_RenameOverlay:
...@@ -456,10 +456,10 @@ MonoBehaviour: ...@@ -456,10 +456,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1089 x: 1589
y: 73 y: 73
width: 275 width: 329
height: 616 height: 928
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OpenAddComponentMenu: 0 m_OpenAddComponentMenu: 0
m_ObjectsLockedBeforeSerialization: [] m_ObjectsLockedBeforeSerialization: []
...@@ -494,15 +494,15 @@ MonoBehaviour: ...@@ -494,15 +494,15 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 73 y: 73
width: 202 width: 341
height: 344 height: 611
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: m_SelectedIDs: e2250000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: a015ffff8cfbffff m_ExpandedIDs: 966fffff6a77ffffe0f8ffff02400000984b0600
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -547,10 +547,10 @@ MonoBehaviour: ...@@ -547,10 +547,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 202 x: 341
y: 73 y: 73
width: 885 width: 1246
height: 344 height: 611
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: de700f5d540e3c347973605f7564e740 m_WindowGUID: de700f5d540e3c347973605f7564e740
...@@ -562,9 +562,9 @@ MonoBehaviour: ...@@ -562,9 +562,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 39.53891, y: -2.0391202, z: -2.5148938} m_Target: {x: -9.11, y: -1.52, z: 0}
speed: 2 speed: 2
m_Value: {x: 39.53891, y: -2.0391202, z: -2.5148938} m_Value: {x: -9.11, y: -1.52, z: 0}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -597,9 +597,9 @@ MonoBehaviour: ...@@ -597,9 +597,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: 81.23611 m_Target: 3.535777
speed: 2 speed: 2
m_Value: 81.23611 m_Value: 3.535777
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -645,10 +645,10 @@ MonoBehaviour: ...@@ -645,10 +645,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 202 x: 341
y: 73 y: 73
width: 885 width: 1246
height: 344 height: 611
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_VSyncEnabled: 0 m_VSyncEnabled: 0
m_MaximizeOnPlay: 0 m_MaximizeOnPlay: 0
...@@ -661,10 +661,10 @@ MonoBehaviour: ...@@ -661,10 +661,10 @@ MonoBehaviour:
m_VRangeLocked: 0 m_VRangeLocked: 0
hZoomLockedByDefault: 0 hZoomLockedByDefault: 0
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -442.5 m_HBaseRangeMin: -623
m_HBaseRangeMax: 442.5 m_HBaseRangeMax: 623
m_VBaseRangeMin: -163.5 m_VBaseRangeMin: -297
m_VBaseRangeMax: 163.5 m_VBaseRangeMax: 297
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
...@@ -682,25 +682,25 @@ MonoBehaviour: ...@@ -682,25 +682,25 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 17 y: 17
width: 885 width: 1246
height: 327 height: 594
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 442.5, y: 163.5} m_Translation: {x: 623, y: 297}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -442.5 x: -623
y: -163.5 y: -297
width: 885 width: 1246
height: 327 height: 594
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: 885, y: 344} m_LastWindowPixelSize: {x: 1246, y: 611}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
...@@ -727,7 +727,7 @@ MonoBehaviour: ...@@ -727,7 +727,7 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 436 y: 703
width: 1089 width: 1589
height: 253 height: 298
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt
sceneSetups: sceneSetups:
- path: Assets/Scenes/SampleScene.unity - path: Assets/Scenes/MenuInicial.unity
isLoaded: 1 isLoaded: 1
isActive: 1 isActive: 1
isSubScene: 0 isSubScene: 0
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-mainStage.json
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":39.538909912109378,"y":-2.0391201972961427,"z":-2.5148937702178957},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":81.2361068725586,"orthographic":true} {"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-9.109999656677246,"y":-1.5199999809265137,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.5357770919799806,"orthographic":true}
\ No newline at end of file \ No newline at end of file
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log
Base path: C:/Program Files/Unity/Editor/Data Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Videojuegos_Proyecto/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache
ce645e206ec2202807a47845b14e4a701aad2fea b53cdf989b86d9e12466e046a477e52697f710ad
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