Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 458746b9 by Álvaro Morales García
Options

Arreglos2

parent ba12d1e1
Inline Side-by-side
Showing with 209 additions and 34 deletions
Videojuegos_Proyecto/Assembly-CSharp.csproj
......@@ -82,6 +82,7 @@
<Compile Include="Assets\Scripts\Musica.cs" />
<Compile Include="Assets\Scripts\PlataformaMovil.cs" />
<Compile Include="Assets\Scripts\PowerUp.cs" />
<Compile Include="Assets\Scripts\ReproducirExtra.cs" />
<Compile Include="Assets\Scripts\ZonaFinal.cs" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" />
......
Videojuegos_Proyecto/Assets/Prefabs/GameManager.prefab
......@@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 7736364748447018736}
- component: {fileID: 3174322665456641310}
- component: {fileID: 8228429523814113897}
- component: {fileID: -8015309000698621888}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
......@@ -63,7 +63,7 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0}
--- !u!114 &8228429523814113897
--- !u!114 &-8015309000698621888
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......
Videojuegos_Proyecto/Assets/Scenes/MenuExtras.unity
......@@ -990,7 +990,8 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 0}
m_SourcePrefab: {fileID: 100100000, guid: c299a511f2a249142ac36667ddcf3b49, type: 3}
--- !u!114 &804031676 stripped
MonoBehaviour:
......@@ -1082,6 +1083,7 @@ GameObject:
- component: {fileID: 951091444}
- component: {fileID: 951091443}
- component: {fileID: 951091442}
- component: {fileID: 951091445}
m_Layer: 5
m_Name: ButtonBack
m_TagString: Untagged
......@@ -1152,6 +1154,17 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 951091445}
m_MethodName: ContinuarMusica
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 423268877}
m_MethodName: VolverAlMenuAnterior
m_Mode: 1
......@@ -1202,6 +1215,18 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 951091440}
m_CullTransparentMesh: 0
--- !u!114 &951091445
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 951091440}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30ae3737221aad74781a5782c57dcb2a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1024443105
GameObject:
m_ObjectHideFlags: 0
......@@ -1276,6 +1301,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024443105}
m_CullTransparentMesh: 0
--- !u!1001 &1059197209
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2114081506731414285, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_Name
value: Musica
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.8107114
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.2284359
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.z
value: -161.03223
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e30a5e6158f5374184178db3778780b, type: 3}
--- !u!1 &1244365442
GameObject:
m_ObjectHideFlags: 0
......@@ -1288,8 +1382,9 @@ GameObject:
- component: {fileID: 1244365445}
- component: {fileID: 1244365444}
- component: {fileID: 1244365443}
- component: {fileID: 1244365447}
m_Layer: 5
m_Name: Button
m_Name: Reproducir
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -1338,6 +1433,17 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1244365447}
m_MethodName: PararMusica
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 1
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 423268877}
m_MethodName: ReproducirCancion
m_Mode: 3
......@@ -1408,6 +1514,18 @@ RectTransform:
m_AnchoredPosition: {x: 325, y: -31}
m_SizeDelta: {x: 331.95, y: 69.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1244365447
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1244365442}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30ae3737221aad74781a5782c57dcb2a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1316768763
GameObject:
m_ObjectHideFlags: 0
......
Videojuegos_Proyecto/Assets/Scripts/Musica.cs
......@@ -43,13 +43,13 @@ public class Musica : MonoBehaviour
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
//Declaramos como estático para poder llamar desde otros scripts.
......@@ -79,5 +79,21 @@ public class Musica : MonoBehaviour
}
}
public static void Parar()
{
//Cambiamos el audio y ajustamos el volumen.
AudioSource audio = musica.GetComponent<AudioSource>();
audio.Pause();
}
public static void Reproducir()
{
//Cambiamos el audio y ajustamos el volumen.
AudioSource audio = musica.GetComponent<AudioSource>();
audio.UnPause();
}
}
Videojuegos_Proyecto/Assets/Scripts/ReproducirExtra.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class ReproducirExtra : MonoBehaviour
{
private Button reproducir;
private Button volver;
void Start()
{
reproducir = GameObject.Find("Reproducir").GetComponent<Button>();
reproducir.onClick.AddListener(PararMusica);
reproducir = GameObject.Find("ButtonBack").GetComponent<Button>();
reproducir.onClick.AddListener(ContinuarMusica);
}
public void PararMusica()
{
Musica.Parar();
}
public void ContinuarMusica()
{
Musica.Reproducir();
}
}
Videojuegos_Proyecto/Assets/Scripts/ReproducirExtra.cs.meta 0 → 100644
fileFormatVersion: 2
guid: 30ae3737221aad74781a5782c57dcb2a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 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: 544}
m_MinSize: {x: 950, y: 300}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2
MonoBehaviour:
......@@ -44,10 +44,10 @@ MonoBehaviour:
y: 30
width: 1366
height: 635
m_MinSize: {x: 679, y: 494}
m_MaxSize: {x: 14002, y: 14044}
m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044}
vertical: 0
controlID: 91
controlID: 37
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -67,8 +67,8 @@ MonoBehaviour:
y: 0
width: 277
height: 635
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
......@@ -93,8 +93,8 @@ MonoBehaviour:
y: 0
width: 202
height: 363
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 202, y: 222}
m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
......@@ -216,10 +216,10 @@ MonoBehaviour:
y: 0
width: 1089
height: 635
m_MinSize: {x: 404, y: 494}
m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044}
vertical: 1
controlID: 32
controlID: 14
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -241,10 +241,10 @@ MonoBehaviour:
y: 0
width: 1089
height: 363
m_MinSize: {x: 404, y: 222}
m_MaxSize: {x: 8004, y: 4022}
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
vertical: 0
controlID: 33
controlID: 15
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -300,7 +300,7 @@ MonoBehaviour:
m_ViewDataDictionary: {fileID: 0}
m_LockTracker:
m_IsLocked: 0
m_LastSelectedObjectID: -51572
m_LastSelectedObjectID: -8524
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -350,9 +350,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 23}
m_SelectedIDs: 2c2e0000
m_LastClickedID: 11820
m_ExpandedIDs: 000000004c2d0000a836000000ca9a3b
m_SelectedIDs: 682b0000
m_LastClickedID: 11112
m_ExpandedIDs: 00000000842a0000ec33000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -380,7 +380,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000004c2d0000a8360000
m_ExpandedIDs: 00000000842a0000ec330000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -500,9 +500,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 4ed2fcff
m_LastClickedID: -208306
m_ExpandedIDs: 54d2fcff6492fdff8eb2feff5ef8fffff4ffffff
m_SelectedIDs: 922a0000
m_LastClickedID: 0
m_ExpandedIDs: 389cfeff729cfeffaa9cfeffdedcffffb6deffffaaefffffb6f0ffffe4f1ffffdcf2ffffe4faffff8cfbfffff4ffffff003e0000063e0000123e0000623e0000ec450000f2450000fe450000524600007a490000804900008c490000de490000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -562,9 +562,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 3.3280542, y: -0.71493274, z: -0.2722045}
m_Target: {x: -3.4533415, y: 0.89867437, z: -0.96062917}
speed: 2
m_Value: {x: 3.3280542, y: -0.71493274, z: -0.2722045}
m_Value: {x: -3.4533415, y: 0.89867437, z: -0.96062917}
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: 7.2679896
m_Target: 24.953445
speed: 2
m_Value: 7.2679896
m_Value: 24.953445
m_Ortho:
m_Target: 1
speed: 2
......
Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt
sceneSetups:
- path: Assets/Scenes/SeleccionNivel.unity
- path: Assets/Scenes/MenuExtras.unity
isLoaded: 1
isActive: 1
isSubScene: 0
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.328054189682007,"y":-0.7149327397346497,"z":-0.2722044885158539},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.267989635467529,"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":-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
Videojuegos_Proyecto/ProjectSettings/TagManager.asset
......@@ -18,6 +18,7 @@ TagManager:
- HitBoxMelee
- PlataformaMovil
- Musica
- Reproducir
layers:
- Default
- TransparentFX
......
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