Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 3b725901 by Álvaro Morales García
Options

Pequeños cambios

parent f9acbf51
Expand all
Inline Side-by-side
Showing with 221 additions and 41 deletions
Videojuegos_Proyecto/Assets/Player/Prefabs/DisparoBlanca.prefab
......@@ -28,8 +28,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9101462949979880529}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: -0.1779, y: 0.2695, z: 0}
m_LocalScale: {x: 0.1, y: 0.1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
......@@ -71,7 +71,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 8a239ba9e303e21428ca79f5c55f41bb, type: 3}
m_Sprite: {fileID: 21300000, guid: a5fae8eb193e6c24e93b4113814f4bb7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......
Videojuegos_Proyecto/Assets/Player/Sprites/negra3.png.meta 0 → 100644
fileFormatVersion: 2
guid: a5fae8eb193e6c24e93b4113814f4bb7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: ddf2d0c0afddab64a9ee1af5e22de508
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Player/Sprites/pngocean.com 1.png.meta 0 → 100644
fileFormatVersion: 2
guid: 6d905f38f24652647b184fd858e38ac5
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: fe73bfbeaef607546b76116881b734fd
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
......@@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 6}
m_MinSize: {x: 950, y: 300}
m_MinSize: {x: 950, y: 544}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2
MonoBehaviour:
......@@ -44,10 +44,10 @@ MonoBehaviour:
y: 30
width: 1366
height: 635
m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044}
m_MinSize: {x: 679, y: 494}
m_MaxSize: {x: 14002, y: 14044}
vertical: 0
controlID: 37
controlID: 77
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -67,8 +67,8 @@ MonoBehaviour:
y: 0
width: 277
height: 635
m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4002, y: 4022}
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
......@@ -93,8 +93,8 @@ MonoBehaviour:
y: 0
width: 202
height: 363
m_MinSize: {x: 202, y: 222}
m_MaxSize: {x: 4002, y: 4022}
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
......@@ -216,10 +216,10 @@ MonoBehaviour:
y: 0
width: 1089
height: 635
m_MinSize: {x: 406, y: 494}
m_MinSize: {x: 404, y: 494}
m_MaxSize: {x: 10002, y: 14044}
vertical: 1
controlID: 14
controlID: 78
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -241,10 +241,10 @@ MonoBehaviour:
y: 0
width: 1089
height: 363
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
m_MinSize: {x: 404, y: 222}
m_MaxSize: {x: 8004, y: 4022}
vertical: 0
controlID: 15
controlID: 79
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -339,20 +339,20 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
- Assets/Scenes
- Assets/Player/Sprites
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scenes
- Assets/Player/Sprites
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\alvmo\Documents\NetBeansProjects\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 23}
m_SelectedIDs: 682b0000
m_LastClickedID: 11112
m_ExpandedIDs: 00000000842a0000ec33000000ca9a3b
scrollPos: {x: 0, y: 87}
m_SelectedIDs: a4340000
m_LastClickedID: 13476
m_ExpandedIDs: 00000000862a0000f63300002434000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -380,7 +380,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000842a0000ec330000
m_ExpandedIDs: 00000000862a0000f6330000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -408,7 +408,7 @@ MonoBehaviour:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000a83200001c2c0000462b00004afc0000a23500000000000010d50200
m_ExpandedInstanceIDs: c6230000a83200001c2c0000462b00004afc0000a23500000000000010d502008e350000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -500,9 +500,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 922a0000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 389cfeff729cfeffaa9cfeffdedcffffb6deffffaaefffffb6f0ffffe4f1ffffdcf2ffffe4faffff8cfbfffff4ffffff003e0000063e0000123e0000623e0000ec450000f2450000fe450000524600007a490000804900008c490000de490000
m_ExpandedIDs: a015ffff8cfbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -562,9 +562,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -3.4533415, y: 0.89867437, z: -0.96062917}
m_Target: {x: 39.53891, y: -2.0391202, z: -2.5148938}
speed: 2
m_Value: {x: -3.4533415, y: 0.89867437, z: -0.96062917}
m_Value: {x: 39.53891, y: -2.0391202, z: -2.5148938}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
......@@ -597,9 +597,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 24.953445
m_Target: 81.23611
speed: 2
m_Value: 24.953445
m_Value: 81.23611
m_Ortho:
m_Target: 1
speed: 2
......@@ -727,7 +727,7 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 526
y: 436
width: 1089
height: 163
height: 253
m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt
sceneSetups:
- path: Assets/Scenes/MenuExtras.unity
- path: Assets/Scenes/SampleScene.unity
isLoaded: 1
isActive: 1
isSubScene: 0
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-1f95e6a67b369a549b.json
{"m_ExpandedPrefabGameObjectFileIDs":[6213653338870642002],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
{"m_ExpandedPrefabGameObjectFileIDs":[6213653338870642002],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":8347778951151406034,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-1f95e6a67b369a549b.json
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-6.057436943054199,"y":0.5859655737876892,"z":-0.08586958050727844},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":4.033257961273193,"orthographic":true}
\ No newline at end of file
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-6.02180814743042,"y":0.2661614716053009,"z":-8.6142578125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":4.577881336212158,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-4eada546b3029f24ea.json
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":1.5761827230453492,"orthographic":true}
\ No newline at end of file
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":0.02359018102288246,"y":-0.17453987896442414,"z":-0.34406721591949465},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":2.084542751312256,"orthographic":true}
\ No newline at end of file
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":-3.453341484069824,"y":0.8986743688583374,"z":-0.9606291651725769},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":24.953445434570314,"orthographic":true}
\ No newline at end of file
{"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}
\ No newline at end of file
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