Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 31a86fd9 by Juan Carlos
Options

Conflicto arreglado

parent 84f56ba1
Expand all
Inline Side-by-side
Showing with 56 additions and 113 deletions
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
...@@ -5030,18 +5030,10 @@ RectTransform: ...@@ -5030,18 +5030,10 @@ RectTransform:
m_GameObject: {fileID: 1879684539} m_GameObject: {fileID: 1879684539}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
<<<<<<< HEAD
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1648845514} m_Father: {fileID: 1648845514}
m_RootOrder: 0 m_RootOrder: 0
=======
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1891953901}
m_Father: {fileID: 0}
m_RootOrder: 12
>>>>>>> origin/Release
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
......
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,17 +44,10 @@ MonoBehaviour: ...@@ -44,17 +44,10 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
<<<<<<< HEAD
m_MinSize: {x: 681, y: 494}
m_MaxSize: {x: 14004, y: 14044}
vertical: 0
controlID: 116
=======
m_MinSize: {x: 683, y: 494} m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044} m_MaxSize: {x: 14004, y: 14044}
vertical: 0 vertical: 0
controlID: 31 controlID: 98
>>>>>>> origin/Release
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -99,7 +92,7 @@ MonoBehaviour: ...@@ -99,7 +92,7 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 379 width: 379
height: 605 height: 573
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15} m_ActualView: {fileID: 15}
...@@ -123,9 +116,9 @@ MonoBehaviour: ...@@ -123,9 +116,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 605 y: 573
width: 1531 width: 1531
height: 342 height: 374
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}
...@@ -222,14 +215,10 @@ MonoBehaviour: ...@@ -222,14 +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
<<<<<<< HEAD
controlID: 117
=======
controlID: 32 controlID: 32
>>>>>>> origin/Release
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -250,19 +239,11 @@ MonoBehaviour: ...@@ -250,19 +239,11 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 1531 width: 1531
<<<<<<< HEAD
height: 573 height: 573
m_MinSize: {x: 404, y: 222}
m_MaxSize: {x: 8004, y: 4022}
vertical: 0
controlID: 118
=======
height: 605
m_MinSize: {x: 406, y: 222} m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022} m_MaxSize: {x: 8006, y: 4022}
vertical: 0 vertical: 0
controlID: 33 controlID: 33
>>>>>>> origin/Release
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -281,7 +262,7 @@ MonoBehaviour: ...@@ -281,7 +262,7 @@ MonoBehaviour:
x: 379 x: 379
y: 0 y: 0
width: 1152 width: 1152
height: 605 height: 573
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}
...@@ -339,9 +320,9 @@ MonoBehaviour: ...@@ -339,9 +320,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 678 y: 646
width: 1531 width: 1531
height: 323 height: 355
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SearchFilter: m_SearchFilter:
m_NameFilter: m_NameFilter:
...@@ -355,34 +336,20 @@ MonoBehaviour: ...@@ -355,34 +336,20 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
<<<<<<< HEAD - Assets/Scenes
- Assets/MainMenu/Scripts
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/MainMenu/Scripts - Assets/Scenes
=======
- Assets
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets
>>>>>>> origin/Release
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\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}
<<<<<<< HEAD m_SelectedIDs: 4c2b0000
m_SelectedIDs: c2340000 m_LastClickedID: 11084
m_LastClickedID: 13506 m_ExpandedIDs: 00000000722a0000b033000000ca9a3b
m_ExpandedIDs: 000000003a2a0000503200000833000000ca9a3b
=======
m_SelectedIDs: f62a0000
m_LastClickedID: 10998
m_ExpandedIDs: 00000000f62a00002234000000ca9a3b
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -398,7 +365,7 @@ MonoBehaviour: ...@@ -398,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}
...@@ -410,11 +377,7 @@ MonoBehaviour: ...@@ -410,11 +377,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
<<<<<<< HEAD m_ExpandedIDs: 00000000722a0000b0330000
m_ExpandedIDs: 000000003a2a0000083300009a330000
=======
m_ExpandedIDs: 00000000f62a0000023300002234000026340000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -441,12 +404,8 @@ MonoBehaviour: ...@@ -441,12 +404,8 @@ MonoBehaviour:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 0
<<<<<<< HEAD m_ExpandedInstanceIDs: c6230000
m_ExpandedInstanceIDs: c6230000382b000000000000982a0000
=======
m_ExpandedInstanceIDs: c62300009a350000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -462,7 +421,7 @@ MonoBehaviour: ...@@ -462,7 +421,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_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
m_InstanceID: 0 m_InstanceID: 0
...@@ -472,7 +431,7 @@ MonoBehaviour: ...@@ -472,7 +431,7 @@ MonoBehaviour:
m_NewAssetIndexInList: -1 m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0} m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64 m_GridSize: 64
m_DirectoriesAreaWidth: 186 m_DirectoriesAreaWidth: 115
--- !u!114 &14 --- !u!114 &14
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -533,41 +492,37 @@ MonoBehaviour: ...@@ -533,41 +492,37 @@ MonoBehaviour:
x: 0 x: 0
y: 73 y: 73
width: 379 width: 379
height: 586 height: 554
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:
m_LastClickedID: 0 m_LastClickedID: 0
<<<<<<< HEAD m_ExpandedIDs: 84fbfffff43d0000
m_ExpandedIDs: 38ddffff04deffff74fbffff6a3d0000aa3d0000526a00007a6a0000
=======
m_ExpandedIDs: a4c9ffffaad2ffff50d3ffff38faffffea4f0000ee4f0000fa4f0000385000004a500000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: LimiteCaida (3) m_Name:
m_OriginalName: LimiteCaida (3) m_OriginalName:
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: -13824 m_UserData: 0
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 0 m_OriginalEventType: 11
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 4} m_ClientGUIView: {fileID: 0}
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: e4f845058af2fed45a9fd11aeb1bc7f9 m_WindowGUID: defd79de2c582ea45ab6fa9ed58148b9
--- !u!114 &16 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -592,10 +547,10 @@ MonoBehaviour: ...@@ -592,10 +547,10 @@ MonoBehaviour:
x: 379 x: 379
y: 73 y: 73
width: 1150 width: 1150
height: 586 height: 554
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: 43dad88c062228f459455f7a9fa529fd m_WindowGUID: de700f5d540e3c347973605f7564e740
m_Gizmos: 1 m_Gizmos: 1
m_SceneIsLit: 1 m_SceneIsLit: 1
m_SceneLighting: 1 m_SceneLighting: 1
...@@ -604,15 +559,9 @@ MonoBehaviour: ...@@ -604,15 +559,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
<<<<<<< HEAD m_Target: {x: 1.1666665, y: 2.5232317, z: -0.69594526}
m_Target: {x: 23.56093, y: 0.9978786, z: -1191.5251}
speed: 2
m_Value: {x: 23.367008, y: 0.9777405, z: -1191.4423}
=======
m_Target: {x: 561.2166, y: 345.9716, z: -107.875}
speed: 2 speed: 2
m_Value: {x: 561.2166, y: 345.9716, z: -107.875} m_Value: {x: 1.1666665, y: 2.5232317, z: -0.69594526}
>>>>>>> origin/Release
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -645,15 +594,9 @@ MonoBehaviour: ...@@ -645,15 +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:
<<<<<<< HEAD m_Target: 16.958813
m_Target: 19.232332
speed: 2
m_Value: 18.404146
=======
m_Target: 768.7896
speed: 2 speed: 2
m_Value: 768.7896 m_Value: 16.958813
>>>>>>> origin/Release
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -702,7 +645,7 @@ MonoBehaviour: ...@@ -702,7 +645,7 @@ MonoBehaviour:
x: 379 x: 379
y: 73 y: 73
width: 1150 width: 1150
height: 586 height: 554
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_VSyncEnabled: 0 m_VSyncEnabled: 0
m_MaximizeOnPlay: 0 m_MaximizeOnPlay: 0
...@@ -717,8 +660,8 @@ MonoBehaviour: ...@@ -717,8 +660,8 @@ MonoBehaviour:
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -575 m_HBaseRangeMin: -575
m_HBaseRangeMax: 575 m_HBaseRangeMax: 575
m_VBaseRangeMin: -284.5 m_VBaseRangeMin: -268.5
m_VBaseRangeMax: 284.5 m_VBaseRangeMax: 268.5
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
...@@ -737,9 +680,9 @@ MonoBehaviour: ...@@ -737,9 +680,9 @@ MonoBehaviour:
x: 0 x: 0
y: 17 y: 17
width: 1150 width: 1150
height: 569 height: 537
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 575, y: 284.5} m_Translation: {x: 575, y: 268.5}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
...@@ -747,14 +690,14 @@ MonoBehaviour: ...@@ -747,14 +690,14 @@ MonoBehaviour:
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -575 x: -575
y: -284.5 y: -268.5
width: 1150 width: 1150
height: 569 height: 537
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: 586} m_LastWindowPixelSize: {x: 1150, y: 554}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
...@@ -781,7 +724,7 @@ MonoBehaviour: ...@@ -781,7 +724,7 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 678 y: 646
width: 1531 width: 1531
height: 323 height: 355
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt
sceneSetups: sceneSetups:
- path: Assets/Scenes/MenuExtras.unity - path: Assets/Scenes/SampleScene.unity
isLoaded: 1 isLoaded: 1
isActive: 1 isActive: 1
isSubScene: 0 isSubScene: 0
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-mainStage.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-mainStage.json 0 → 100644
{"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":1.1666665077209473,"y":2.5232317447662355,"z":-0.6959452629089356},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":16.958812713623048,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log
Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Videojuegos_Proyecto/ProjectSettings/EditorSettings.asset
...@@ -8,6 +8,8 @@ EditorSettings: ...@@ -8,6 +8,8 @@ EditorSettings:
m_SerializationMode: 2 m_SerializationMode: 2
m_LineEndingsForNewScripts: 0 m_LineEndingsForNewScripts: 0
m_DefaultBehaviorMode: 1 m_DefaultBehaviorMode: 1
m_PrefabRegularEnvironment: {fileID: 0}
m_PrefabUIEnvironment: {fileID: 0}
m_SpritePackerMode: 4 m_SpritePackerMode: 4
m_SpritePackerPaddingPower: 1 m_SpritePackerPaddingPower: 1
m_EtcTextureCompressorBehavior: 1 m_EtcTextureCompressorBehavior: 1
...@@ -16,6 +18,8 @@ EditorSettings: ...@@ -16,6 +18,8 @@ EditorSettings:
m_EtcTextureBestCompressor: 4 m_EtcTextureBestCompressor: 4
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
m_ProjectGenerationRootNamespace: m_ProjectGenerationRootNamespace:
m_UserGeneratedProjectSuffix:
m_CollabEditorSettings: m_CollabEditorSettings:
inProgressEnabled: 1 inProgressEnabled: 1
m_EnableTextureStreamingInEditMode: 1
m_EnableTextureStreamingInPlayMode: 1
m_AsyncShaderCompilation: 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