Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit a3f9e7ab by Juan Carlos
Options

Commit antes de merge

parents f864c3a6 f510b065
Inline Side-by-side
Showing with 26 additions and 48 deletions
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: 13
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -93,8 +93,8 @@ MonoBehaviour: ...@@ -93,8 +93,8 @@ MonoBehaviour:
y: 0 y: 0
width: 379 width: 379
height: 573 height: 573
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}
...@@ -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: 14
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -240,10 +240,10 @@ MonoBehaviour: ...@@ -240,10 +240,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 573 height: 573
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: 15
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -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/Scenes
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Player/Scripts - Assets/Scenes
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\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: f02b0000
m_LastClickedID: 13626 m_LastClickedID: 11248
m_ExpandedIDs: 00000000662b00009634000000ca9a3b m_ExpandedIDs: 00000000222b000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -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: 00000000222b000070340000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -497,9 +497,9 @@ MonoBehaviour: ...@@ -497,9 +497,9 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: b6290000 m_SelectedIDs: 94330000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 20faffff m_ExpandedIDs: e6f0ffff32f1ffff72faffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -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: 451.576, y: 141.83812, z: -62.875}
speed: 2 speed: 2
m_Value: {x: -5.123681, y: 0.13753039, z: -4.2441635} m_Value: {x: 451.576, y: 141.83812, z: -62.875}
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: 482.1205
speed: 2 speed: 2
m_Value: 7.8685966 m_Value: 482.1205
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
......
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/9da155-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":-5.12368106842041,"y":0.1375303864479065,"z":-4.244163513183594},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.86859655380249,"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":451.57598876953127,"y":141.83811950683595,"z":-62.875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":482.1205139160156,"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/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: preprocess
insize=3608 outsize=1262 ok=1
Cmd: preprocess
insize=3652 outsize=1674 ok=1
Cmd: preprocess
insize=3606 outsize=1310 ok=1
Cmd: preprocess
insize=10875 outsize=4001 ok=1
Cmd: preprocess
insize=3615 outsize=2669 ok=1
Cmd: preprocess
insize=7844 outsize=2494 ok=1
Cmd: preprocess
insize=8019 outsize=2766 ok=1
Cmd: preprocess
insize=2420 outsize=1129 ok=1
Cmd: preprocess
insize=10864 outsize=3992 ok=1
Cmd: preprocess
insize=4453 outsize=3687 ok=1
Cmd: preprocess
insize=7870 outsize=2504 ok=1
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