Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 0f52df63 by Álvaro Morales García
Options

Merge branch 'CreaciónEnemigos' into Release 

# Conflicts:
#	Videojuegos_Proyecto/Assembly-CSharp.csproj
#	Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
#	Videojuegos_Proyecto/Library/CurrentLayout.dwlt
#	Videojuegos_Proyecto/Library/InspectorExpandedItems.asset
#	Videojuegos_Proyecto/Library/SceneVisibilityState.asset
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Assembly-CSharp.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Assembly-CSharp.pdb
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Cinemachine.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Cinemachine.pdb
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.pdb
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.pdb
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/com.unity.cinemachine.editor.pdb
#	Videojuegos_Proyecto/Library/ShaderCache/EditorEncounteredVariants
#	Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-mainStage.json
#	Videojuegos_Proyecto/Library/assetDatabase3
#	Videojuegos_Proyecto/Library/metadata/83/83299b57272fb804c817b85932e4f27a
#	Videojuegos_Proyecto/Library/metadata/83/83299b57272fb804c817b85932e4f27a.info
#	Videojuegos_Proyecto/Library/metadata/e9/e9aa5391aec7a334ea457e001519f57f
#	Videojuegos_Proyecto/Library/metadata/e9/e9aa5391aec7a334ea457e001519f57f.info
#	Videojuegos_Proyecto/Library/metadata/f8/f83185ffeec126d4e9d9c0b3db8e288d
#	Videojuegos_Proyecto/Library/metadata/f8/f83185ffeec126d4e9d9c0b3db8e288d.info
#	Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log
#	Videojuegos_Proyecto/ProjectSettings/TagManager.asset
#	Videojuegos_Proyecto/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache
parents f510b065 452f27b1
Inline Side-by-side
Showing with 303 additions and 5 deletions
Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3326548381514800793
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3326548381514800795}
- component: {fileID: 3326548381514800792}
- component: {fileID: 3326548381514800794}
- component: {fileID: 3326548381514800797}
- component: {fileID: 4435491010459611782}
m_Layer: 0
m_Name: EnemigoEjemplo
m_TagString: Enemigo
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3326548381514800795
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -10.025, y: -2.108, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3326548381514800792
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 86ce912717672b8429c58e6960c12e25, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.28, y: 1.28}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &3326548381514800794
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.06306815, y: 0.00000017881393}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1.28, y: 1.28}
newSize: {x: 1.28, y: 1.28}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1.1034093, y: 0.7418183}
m_EdgeRadius: 0
--- !u!50 &3326548381514800797
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!114 &4435491010459611782
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82ace38098eedee4bb60e1b360991384, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 0.8
Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 4cad856fb8f87054e8cb7d66b4d1e74e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scripts/CrearEnemigos.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CrearEnemigos : MonoBehaviour
{
public GameObject enemigo;
// Start is called before the first frame update
void Start()
{
Instantiate(enemigo, new Vector3(13, -1.5f, 0), transform.rotation);
Instantiate(enemigo, new Vector3(20, 0.5f, 0), transform.rotation);
Instantiate(enemigo, new Vector3(43, 0.5f, 0), transform.rotation);
Instantiate(enemigo, new Vector3(54, 2.5f, 0), transform.rotation);
Instantiate(enemigo, new Vector3(67, -1.5f, 0), transform.rotation);
}
// Update is called once per frame
void Update()
{
}
}
Videojuegos_Proyecto/Assets/Scripts/CrearEnemigos.cs.meta 0 → 100644
fileFormatVersion: 2
guid: 1907c97001aad5943a7c511192d2d99c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scripts/Enemigo1Move.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Enemigo1Move : MonoBehaviour
{
// Transforms to act as start and end markers for the journey.
private Vector3 startMarker;
private Vector3 endMarker;
// Movement speed in units per second.
public float speed = 1.0F;
private float _timePassed;
void Start()
{
startMarker = this.transform.position;
endMarker = startMarker + new Vector3(3, 0, 0);
_timePassed = 0;
}
// Move to the target end position.
void Update()
{
_timePassed += Time.deltaTime;
// Set our position as a fraction of the distance between the markers.
transform.position = Vector3.Lerp(startMarker, endMarker, Mathf.PingPong(_timePassed, 1));
}
}
Videojuegos_Proyecto/Assets/Scripts/Enemigo1Move.cs.meta 0 → 100644
fileFormatVersion: 2
guid: 82ace38098eedee4bb60e1b360991384
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using System;
using UnityEngine;
public class Jugador : MonoBehaviour
{
private int vidas;
private float tInvulnerable;
// Start is called before the first frame update
void Start()
{
vidas = 3;
tInvulnerable = 0;
}
// Update is called once per frame
void Update()
{
tInvulnerable -= Time.deltaTime;
}
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.tag == "Enemigo" && tInvulnerable<=0)
{
Dañado();
}
}
void Dañado()
{
vidas--;
tInvulnerable = 1.5f;
Debug.Log(vidas);
}
}
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs.meta 0 → 100644
fileFormatVersion: 2
guid: fb387e14ec85d764aa2bdac5ed1eb3cb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/StateCache/Hierarchy/a6872e-38c9ae1c49230e24a8.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[5415114670227481229],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/a6872e-4cad856fb8f87054e8.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/Hierarchy/a6872e-mainStage.json
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-3012,-1236],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-38c9ae1c49230e24a8.json 0 → 100644
{"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":-7.9800004959106449,"y":-0.7299999594688416,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.5357775688171388,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-4cad856fb8f87054e8.json 0 → 100644
{"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":-10.024999618530274,"y":-2.1080000400543215,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.0049948692321779,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-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":-1.695264458656311,"y":-0.24087099730968476,"z":-0.708984375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.626546859741211,"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":28.342342376708986,"y":4.5864763259887699,"z":-130.97265625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":22.36540412902832,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe1.log
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=1 insize=1302 outsize=218 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Cmd: compileSnippet
api=4 type=0 insize=1596 outsize=1894 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe2.log
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=0 insize=1302 outsize=1414 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe3.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: compileSnippet
api=4 type=1 insize=1596 outsize=6814 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR 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