Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 9253c261 by Juan Carlos
Options

Merge branch 'Montaje_Nivel' into Release

parents cb24184f 02ba42a7
Expand all
Inline Side-by-side
Showing with 181 additions and 89 deletions
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
......@@ -32,6 +32,7 @@ public class Player2D : MonoBehaviour
public TextMeshProUGUI nColeccionablesCanvas;
// Start is called before the first frame update
void Start()
{
......@@ -244,6 +245,12 @@ public class Player2D : MonoBehaviour
Destroy(collision.gameObject);
}
if (collision.gameObject.tag == "PlataformaMovil")
{
rb2d.velocity = new Vector3(0f,0f,0f);
this.transform.parent = collision.transform;
animator.SetBool("enSuelo", true);
}
}
public void EmpezarAnimacionVida() {
......
Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo.prefab → Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo (1).prefab
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3326548381514800793
--- !u!1 &3200009508600319088
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -8,39 +8,41 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3326548381514800795}
- component: {fileID: 3326548381514800792}
- component: {fileID: 3326548381514800794}
- component: {fileID: 3326548381514800797}
- component: {fileID: 4435491010459611782}
- component: {fileID: 3200009508600319095}
- component: {fileID: 3200009508600319092}
- component: {fileID: 3200009508600319093}
- component: {fileID: 3200009508600319090}
- component: {fileID: 3200009508600319091}
- component: {fileID: 3200009508600319094}
m_Layer: 8
m_Name: EnemigoEjemplo
m_Name: EnemigoEjemplo (1)
m_TagString: Enemigo
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3326548381514800795
--- !u!4 &3200009508600319095
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_GameObject: {fileID: 3200009508600319088}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -10.025, y: -2.108, z: 0}
m_LocalPosition: {x: 3.1891563, y: -1.52, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 3200009508671793467}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3326548381514800792
--- !u!212 &3200009508600319092
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_GameObject: {fileID: 3200009508600319088}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
......@@ -82,13 +84,13 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &3326548381514800794
--- !u!61 &3200009508600319093
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_GameObject: {fileID: 3200009508600319088}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
......@@ -108,14 +110,14 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1.1034093, y: 0.7418183}
m_EdgeRadius: 0
--- !u!50 &3326548381514800797
--- !u!50 &3200009508600319090
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_GameObject: {fileID: 3200009508600319088}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
......@@ -123,19 +125,19 @@ Rigidbody2D:
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!114 &4435491010459611782
--- !u!114 &3200009508600319091
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326548381514800793}
m_GameObject: {fileID: 3200009508600319088}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82ace38098eedee4bb60e1b360991384, type: 3}
......@@ -143,4 +145,64 @@ MonoBehaviour:
m_EditorClassIdentifier:
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3}
speed: 0.8
target: {fileID: 3200009508671793467}
speed: 2
--- !u!114 &3200009508600319094
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3200009508600319088}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f29022129ca26934fb77dbee300bc42a, type: 3}
m_Name:
m_EditorClassIdentifier:
from: {fileID: 3200009508600319095}
to: {fileID: 3200009508671793467}
--- !u!1 &3200009508671793464
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3200009508671793467}
- component: {fileID: 3200009508671793466}
m_Layer: 8
m_Name: Target
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3200009508671793467
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3200009508671793464}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.55, y: 3.96, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3200009508600319095}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3200009508671793466
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3200009508671793464}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f29022129ca26934fb77dbee300bc42a, type: 3}
m_Name:
m_EditorClassIdentifier:
from: {fileID: 3200009508671793467}
to: {fileID: 3200009508600319095}
Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo.prefab.meta → Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo (1).prefab.meta
fileFormatVersion: 2
guid: 4cad856fb8f87054e8cb7d66b4d1e74e
guid: b26aa03f0b39dd64fbf73b37f73c30e3
PrefabImporter:
externalObjects: {}
userData:
......
Videojuegos_Proyecto/Assets/Scripts/CrearEnemigos.cs
......@@ -13,7 +13,7 @@ public class CrearEnemigos : MonoBehaviour
{
if (SceneManager.GetActiveScene().name != "SeleccionNivel" && SceneManager.GetActiveScene().name != "MenuExtras") {
Instantiate(enemigo, new Vector3(13, -1.5f, 0), Quaternion.identity);
//Instantiate(enemigo, new Vector3(13, -1.5f, 0), Quaternion.identity);
//Instantiate(enemigo, new Vector3(20, 0.5f, 0), Quaternion.identity);
//Instantiate(enemigo, new Vector3(43, 0.5f, 0), Quaternion.identity);
//Instantiate(enemigo, new Vector3(54, 2.5f, 0), Quaternion.identity);
......
Videojuegos_Proyecto/Assets/Scripts/Enemigo1Move.cs
......@@ -7,9 +7,13 @@ public class Enemigo1Move : MonoBehaviour
public GameObject prefabColeccionable;
private int vida = 1;
private Vector3 start, end;
public Transform target;
// Transforms to act as start and end markers for the journey.
private Vector3 startMarker;
private Vector3 endMarker;
//RECUPERAR ESTADO ANTERIOR
//private Vector3 startMarker;
//private Vector3 endMarker;
// Movement speed in units per second.
public float speed = 1.0F;
......@@ -18,17 +22,36 @@ public class Enemigo1Move : MonoBehaviour
void Start()
{
startMarker = this.transform.position;
endMarker = startMarker + new Vector3(3, 0, 0);
_timePassed = 0;
if (target != null) {
target.parent = null;
start = transform.position;
end = target.position;
}
//RECUPERAR ESTADO ANTERIOR
//startMarker = this.transform.position;
//endMarker = startMarker + new Vector3(3, 0, 0);
//_timePassed = 0;
}
// Move to the target end position.
void Update()
{
_timePassed += speed*Time.deltaTime;
//RECUPERAR ESTADO ANTERIOR
//_timePassed += speed*Time.deltaTime;
// Set our position as a fraction of the distance between the markers.
transform.position = Vector3.Lerp(startMarker, endMarker, Mathf.PingPong(_timePassed, 1));
//transform.position = Vector3.Lerp(startMarker, endMarker, Mathf.PingPong(_timePassed, 1));
}
private void FixedUpdate()
{
if (target != null) {
float fixedSpeed = speed*Time.deltaTime;
transform.position = Vector3.MoveTowards(transform.position, target.position, fixedSpeed);
}
if (transform.position == target.position) {
target.position = (target.position == start) ? end : start;
}
}
private void OnTriggerEnter2D(Collider2D collision)
......
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
......@@ -47,7 +47,7 @@ MonoBehaviour:
m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044}
vertical: 0
controlID: 79
controlID: 146
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -63,9 +63,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1471
x: 1373
y: 0
width: 449
width: 547
height: 947
m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4002, y: 4022}
......@@ -91,10 +91,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 431
height: 539
m_MinSize: {x: 202, y: 222}
m_MaxSize: {x: 4002, y: 4022}
width: 401
height: 675
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
......@@ -116,9 +116,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 539
width: 1471
height: 408
y: 675
width: 1373
height: 272
m_MinSize: {x: 232, y: 272}
m_MaxSize: {x: 10002, y: 10022}
m_ActualView: {fileID: 13}
......@@ -214,12 +214,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1471
width: 1373
height: 947
m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044}
vertical: 1
controlID: 14
controlID: 123
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -239,12 +239,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1471
height: 539
width: 1373
height: 675
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
vertical: 0
controlID: 15
controlID: 124
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -260,10 +260,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 431
x: 401
y: 0
width: 1040
height: 539
width: 972
height: 675
m_MinSize: {x: 204, y: 222}
m_MaxSize: {x: 4004, y: 4022}
m_ActualView: {fileID: 16}
......@@ -300,7 +300,7 @@ MonoBehaviour:
m_ViewDataDictionary: {fileID: 0}
m_LockTracker:
m_IsLocked: 0
m_LastSelectedObjectID: -6966
m_LastSelectedObjectID: -5470
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -323,9 +323,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 612
width: 1471
height: 389
y: 748
width: 1373
height: 253
m_ViewDataDictionary: {fileID: 0}
m_SearchFilter:
m_NameFilter:
......@@ -339,20 +339,20 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
- Assets/Prefabs
- Assets/Scripts
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Prefabs
- Assets/Scripts
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: fc370000
m_LastClickedID: 14332
m_ExpandedIDs: 00000000ba2d00009236000000ca9a3b
m_SelectedIDs: 4c320000
m_LastClickedID: 12876
m_ExpandedIDs: 00000000742a0000b633000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -380,7 +380,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000ba2d000092360000
m_ExpandedIDs: 00000000742a0000b6330000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -456,9 +456,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1471
x: 1373
y: 73
width: 447
width: 545
height: 928
m_ViewDataDictionary: {fileID: 0}
m_OpenAddComponentMenu: 0
......@@ -494,15 +494,15 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73
width: 431
height: 520
width: 401
height: 656
m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 42e60000
m_LastClickedID: 0
m_ExpandedIDs: 24ecffff8cf8ffff
m_SelectedIDs: 063d0000
m_LastClickedID: 15622
m_ExpandedIDs: 8cfbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -547,10 +547,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 431
x: 401
y: 73
width: 1038
height: 520
width: 970
height: 656
m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0
m_WindowGUID: de700f5d540e3c347973605f7564e740
......@@ -562,9 +562,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 1.1207032, y: -0.07353383, z: -217.16423}
m_Target: {x: 21.264292, y: -1.434914, z: -259.25}
speed: 2
m_Value: {x: 1.1207032, y: -0.07353383, z: -217.16423}
m_Value: {x: 21.264292, y: -1.434914, z: -259.25}
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: 12.716508
m_Target: 29.002615
speed: 2
m_Value: 12.716508
m_Value: 27.753698
m_Ortho:
m_Target: 1
speed: 2
......@@ -645,10 +645,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 431
x: 401
y: 73
width: 1038
height: 520
width: 970
height: 656
m_ViewDataDictionary: {fileID: 0}
m_VSyncEnabled: 0
m_MaximizeOnPlay: 0
......@@ -661,10 +661,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -519
m_HBaseRangeMax: 519
m_VBaseRangeMin: -251.5
m_VBaseRangeMax: 251.5
m_HBaseRangeMin: -485
m_HBaseRangeMax: 485
m_VBaseRangeMin: -319.5
m_VBaseRangeMax: 319.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
......@@ -682,25 +682,25 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 17
width: 1038
height: 503
width: 970
height: 639
m_Scale: {x: 1, y: 1}
m_Translation: {x: 519, y: 251.5}
m_Translation: {x: 485, y: 319.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -519
y: -251.5
width: 1038
height: 503
x: -485
y: -319.5
width: 970
height: 639
m_MinimalGUI: 1
m_defaultScale: 1
m_TargetTexture: {fileID: 0}
m_CurrentColorSpace: 0
m_LastWindowPixelSize: {x: 1038, y: 520}
m_LastWindowPixelSize: {x: 970, y: 656}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
......
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":1.1207032203674317,"y":-0.07353383302688599,"z":-217.1642303466797},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":12.716507911682129,"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":21.264291763305665,"y":-1.434913992881775,"z":-259.25},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":29.002614974975587,"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