Commit 6671ee87 by Juan Carlos

Commit antes de merge

parent 16b2820d
Showing with 540 additions and 68 deletions
......@@ -210,6 +210,11 @@ public class Player2D : MonoBehaviour
if (collision.gameObject.tag == "Suelo") {
animator.SetBool("enSuelo",true);
}
if (collision.gameObject.tag == "PlataformaMovil")
{
this.transform.parent = collision.transform;
animator.SetBool("enSuelo", true);
}
}
private void OnCollisionExit2D(Collision2D collision)
......@@ -218,6 +223,11 @@ public class Player2D : MonoBehaviour
{
animator.SetBool("enSuelo", false);
}
if (collision.gameObject.tag == "PlataformaMovil")
{
this.transform.parent = null;
animator.SetBool("enSuelo", false);
}
}
private void OnCollisionEnter2D(Collision2D collision)
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3506645774624741308
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3506645774624741311}
- component: {fileID: 3506645774624741310}
- component: {fileID: 3506645774624741249}
- component: {fileID: 3506645774624741248}
m_Layer: 0
m_Name: PlataformaMovil
m_TagString: PlataformaMovil
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3506645774624741311
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774624741308}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.69, y: 1.13, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children:
- {fileID: 3506645774830780250}
- {fileID: 3506645774975261461}
- {fileID: 3506645774993472176}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &3506645774624741310
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774624741308}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -0.039361082, y: 0.34875077}
- {x: -0.61194646, y: 0.34669754}
- {x: -0.60642487, y: 0.08567735}
- {x: -0.19861779, y: -0.3428315}
- {x: 0.21033613, y: -0.33837044}
- {x: 0.6187403, y: 0.08757107}
- {x: 0.61469674, y: 0.34837842}
--- !u!114 &3506645774624741249
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774624741308}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f29022129ca26934fb77dbee300bc42a, type: 3}
m_Name:
m_EditorClassIdentifier:
from: {fileID: 3506645774624741311}
to: {fileID: 3506645774993472176}
--- !u!114 &3506645774624741248
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774624741308}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1f000698e303f8c4f8f8771e3676104e, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 3506645774993472176}
velocidad: 2
--- !u!1 &3506645774830780251
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3506645774830780250}
- component: {fileID: 3506645774830780253}
m_Layer: 0
m_Name: sprites_31
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3506645774830780250
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774830780251}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.3, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3506645774624741311}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3506645774830780253
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774830780251}
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: -1369878811986984067, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3506645774975261458
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3506645774975261461}
- component: {fileID: 3506645774975261460}
m_Layer: 0
m_Name: sprites_33
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3506645774975261461
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774975261458}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.3, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3506645774624741311}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3506645774975261460
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774975261458}
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: -4056437433907239288, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3506645774993472177
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3506645774993472176}
- component: {fileID: 3506645774993472179}
m_Layer: 0
m_Name: Target
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3506645774993472176
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774993472177}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.82, y: 1.23, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3506645774624741311}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3506645774993472179
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3506645774993472177}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f29022129ca26934fb77dbee300bc42a, type: 3}
m_Name:
m_EditorClassIdentifier:
from: {fileID: 3506645774624741311}
to: {fileID: 3506645774993472176}
fileFormatVersion: 2
guid: 5cd9747849d838a4aada38cf44f702fc
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -5771,6 +5771,75 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 642ab671e3040d74096e03fcf1c4e181, type: 3}
--- !u!1001 &3506645774601717601
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3506645774624741308, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_Name
value: PlataformaMovil
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalPosition.x
value: -7.69
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.13
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_RootOrder
value: 19
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3506645774624741311, guid: 5cd9747849d838a4aada38cf44f702fc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5cd9747849d838a4aada38cf44f702fc, type: 3}
--- !u!1001 &3974070068923422014
PrefabInstance:
m_ObjectHideFlags: 0
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class DibujarLinea : MonoBehaviour
{
public Transform from;
public Transform to;
// Start is called before the first frame update
private void OnDrawGizmosSelected()
{
if (from != null && to != null) {
Gizmos.color = Color.cyan;
Gizmos.DrawLine(from.position, to.position);
}
}
}
fileFormatVersion: 2
guid: f29022129ca26934fb77dbee300bc42a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PlataformaMovil : MonoBehaviour
{
public Transform target;
public float velocidad;
private Vector3 start, end;
// Start is called before the first frame update
void Start()
{
if (target!=null) {
target.parent = null;
start = transform.position;
end = target.position;
}
}
// Update is called once per frame
void Update()
{
}
private void FixedUpdate()
{
if (target != null) {
float fixedSpeed= velocidad*Time.deltaTime;
transform.position = Vector3.MoveTowards(transform.position, target.position, fixedSpeed);
}
if (transform.position == target.position) {
target.position = (target.position == start) ? end : start;
}
}
}
fileFormatVersion: 2
guid: 1f000698e303f8c4f8f8771e3676104e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -47,7 +47,7 @@ MonoBehaviour:
m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044}
vertical: 0
controlID: 102
controlID: 79
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -63,9 +63,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1531
x: 1471
y: 0
width: 389
width: 449
height: 947
m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4002, y: 4022}
......@@ -91,8 +91,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 237
height: 651
width: 431
height: 539
m_MinSize: {x: 202, y: 222}
m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 15}
......@@ -116,9 +116,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 651
width: 1531
height: 296
y: 539
width: 1471
height: 408
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: 1531
width: 1471
height: 947
m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044}
vertical: 1
controlID: 36
controlID: 14
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -239,12 +239,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1531
height: 651
width: 1471
height: 539
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
vertical: 0
controlID: 37
controlID: 15
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -260,10 +260,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 237
x: 431
y: 0
width: 1294
height: 651
width: 1040
height: 539
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: -3172
m_LastSelectedObjectID: -6966
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -323,9 +323,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 724
width: 1531
height: 277
y: 612
width: 1471
height: 389
m_ViewDataDictionary: {fileID: 0}
m_SearchFilter:
m_NameFilter:
......@@ -339,20 +339,20 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
- Assets/Scenes
- Assets/Prefabs
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scenes
- Assets/Prefabs
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_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 47}
m_SelectedIDs: 542b0000
m_LastClickedID: 11092
m_ExpandedIDs: 00000000782a0000b8330000e233000000ca9a3b
scrollPos: {x: 0, y: 0}
m_SelectedIDs: fc370000
m_LastClickedID: 14332
m_ExpandedIDs: 00000000ba2d00009236000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -368,7 +368,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 0}
m_ClientGUIView: {fileID: 5}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
......@@ -380,7 +380,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000782a0000b8330000
m_ExpandedIDs: 00000000ba2d000092360000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -407,8 +407,8 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000a8320000
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000a83200001c2c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -456,9 +456,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1531
x: 1471
y: 73
width: 387
width: 447
height: 928
m_ViewDataDictionary: {fileID: 0}
m_OpenAddComponentMenu: 0
......@@ -494,29 +494,29 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73
width: 237
height: 632
width: 431
height: 520
m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_SelectedIDs: 42e60000
m_LastClickedID: 0
m_ExpandedIDs: c0d0feffead0feff14d2feff28d2feff9edafeffbedafeffcedafeff1adcfeff44dcfeff4cdcfeff5edcfeffc2e4feffdae4feffeae4feff5ce5feff86e5feffb0e6feffc4e6feff3aeffeff5aeffeff6aeffeff0afafeff34fafeff5efbfeff72fbfeffe803ffff0804ffff1804ffff9621ffffc021ffffea22fffffe22ffff742bffff942bffffa42bffffde2cffff062dffff122dffff282dffff9035ffffac35ffffc035fffffe35ffff1a3fffff8c3fffffb43fffffe240fffffa40ffff7449ffff9849ffffac49ffff744bffff0e4fffff3a4fffff424fffff544fffff624fffff7a4fffff924fffff1050ffff3c50ffff6651ffff7a51ffff8851ffffa251ffffbc51ffffd093ffffdafaffff76fbffff
m_ExpandedIDs: 24ecffff8cf8ffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: CanvasDeDesbloqueoDePartitura
m_OriginalName: CanvasDeDesbloqueoDePartitura
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 350356
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 4}
m_SearchString:
......@@ -547,10 +547,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 237
x: 431
y: 73
width: 1292
height: 632
width: 1038
height: 520
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: 568.84766, y: 269.5895, z: -126.383606}
m_Target: {x: 1.1207032, y: -0.07353383, z: -217.16423}
speed: 2
m_Value: {x: 568.84766, y: 269.5895, z: -126.383606}
m_Value: {x: 1.1207032, y: -0.07353383, z: -217.16423}
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: 781.94403
m_Target: 12.716508
speed: 2
m_Value: 781.94403
m_Value: 12.716508
m_Ortho:
m_Target: 1
speed: 2
......@@ -645,10 +645,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 237
x: 431
y: 73
width: 1292
height: 632
width: 1038
height: 520
m_ViewDataDictionary: {fileID: 0}
m_VSyncEnabled: 0
m_MaximizeOnPlay: 0
......@@ -661,10 +661,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -646
m_HBaseRangeMax: 646
m_VBaseRangeMin: -307.5
m_VBaseRangeMax: 307.5
m_HBaseRangeMin: -519
m_HBaseRangeMax: 519
m_VBaseRangeMin: -251.5
m_VBaseRangeMax: 251.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
......@@ -682,25 +682,25 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 17
width: 1292
height: 615
width: 1038
height: 503
m_Scale: {x: 1, y: 1}
m_Translation: {x: 646, y: 307.5}
m_Translation: {x: 519, y: 251.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -646
y: -307.5
width: 1292
height: 615
x: -519
y: -251.5
width: 1038
height: 503
m_MinimalGUI: 1
m_defaultScale: 1
m_TargetTexture: {fileID: 0}
m_CurrentColorSpace: 0
m_LastWindowPixelSize: {x: 1292, y: 632}
m_LastWindowPixelSize: {x: 1038, y: 520}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
......
sceneSetups:
- path: Assets/Scenes/MenuInicial.unity
- path: Assets/Scenes/SampleScene.unity
isLoaded: 1
isActive: 1
isSubScene: 0
08d706ab721ea600.08d706b42d4b3d00
\ 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":568.84765625,"y":269.5895080566406,"z":-126.38360595703125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":781.9440307617188,"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":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
Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
......@@ -16,6 +16,7 @@ TagManager:
- PowerUpEffect
- PU_Ataque
- HitBoxMelee
- PlataformaMovil
layers:
- Default
- TransparentFX
......
bd4977dc556ee78d367aa7d458ceb6a267e5ee8e
64b7f895d8feabda1ea51b5fa18d34499e2e0f1d
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