mevulfmp3
/
MuseumGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
main
Matthew Kalahiki 4 years ago
parent 375cecb736 ae62f3a75b
commit c147fbd4aa
8 changed files with 44837 additions and 1476 deletions
Show Stats Download Patch File Download Diff File

9246
MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity
View File

File diff suppressed because it is too large Load Diff

6370
MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity
View File

File diff suppressed because it is too large Load Diff

30570
MuseumGame/Assets/Scenes/DemoLevels/Tower.unity
View File

File diff suppressed because it is too large Load Diff

78
MuseumGame/Assets/Scenes/Museum/Museum.unity
Unescape View File

@ -123,6 +123,52 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &2613657
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2613659}
- component: {fileID: 2613658}
m_Layer: 0
m_Name: Artwork
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2613658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2613657}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ca8106578153b4c4cb86229f1b0c975f, type: 3}
m_Name:
m_EditorClassIdentifier:
artId: 0
artworkToEnable: {fileID: 1783916102}
--- !u!4 &2613659
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2613657}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 83.236404, y: 2.2672524, z: -32.17468}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1783916103}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &73552633
GameObject:
m_ObjectHideFlags: 0
@ -13532,7 +13578,7 @@ Transform:
- {fileID: 993848333}
- {fileID: 1620187171}
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &993848332
GameObject:
@ -17767,11 +17813,11 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_TransformParent: {fileID: 2613659}
m_Modifications:
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_RootOrder
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_LocalScale.x
@ -17783,15 +17829,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_LocalPosition.x
value: 5.75
value: -77.486404
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_LocalPosition.y
value: -1.75
value: -4.0172524
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_LocalPosition.z
value: 1
value: 33.17468
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_LocalRotation.w
@ -17799,15 +17845,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -17825,8 +17871,22 @@ PrefabInstance:
propertyPath: m_Name
value: Blackburn-Abstract#2 Pixelart
objectReference: {fileID: 0}
- target: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
--- !u!1 &1783916102 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
m_PrefabInstance: {fileID: 1783916101}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1783916103 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
m_PrefabInstance: {fileID: 1783916101}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1935037035
GameObject:
m_ObjectHideFlags: 0

7
MuseumGame/Assets/Scripts/GameManager.cs
Unescape View File

@ -37,6 +37,7 @@ public class GameManager : MonoBehaviour
public GameObject scrollSpace;
public GameObject hideGalleryButton;
private GameObject[] galleryArt;
public bool[] enabledArt;
private GameObject[] galleryDialog;
public Sprite[] powerupSprites;
@ -99,6 +100,7 @@ public class GameManager : MonoBehaviour
}*/
sound = GetComponent<AudioSource>();
enabledArt = new bool[art.Length];
//GameManager.Instance.enablePowerup(3);
//GameManager.Instance.enablePowerup(3);
artActivated = new bool[art.Length];
@ -199,10 +201,7 @@ public class GameManager : MonoBehaviour
disableAllPowerups();
player.SetActive(true);
LoadLevel(sceneToLoad, positionToLoad);
disableAllPowerups();
LoadLevel(sceneToLoad, new Vector3(0, 0, 0));
player.SetActive(true);
title.GetComponent<TextMeshProUGUI>().text = "Menu";
title.GetComponent<TextMeshProUGUI>().text = "Paused";
startButton.transform.Find("Text").GetComponent<TextMeshProUGUI>().text = "Restart";

20
MuseumGame/Assets/Scripts/MuseumArt.cs
Unescape View File

@ -0,0 +1,20 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class MuseumArt : MonoBehaviour
{
public int artId = 0;
public GameObject artworkToEnable;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
artworkToEnable.SetActive(GameManager.Instance.enabledArt[artId]);
}
}

11
MuseumGame/Assets/Scripts/MuseumArt.cs.meta
Unescape View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ca8106578153b4c4cb86229f1b0c975f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

11
MuseumGame/UserSettings/EditorUserSettings.asset
Unescape View File

@ -7,29 +7,40 @@ EditorUserSettings:
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
flags: 0
vcSharedLogLevel:

Write Preview
Loading…
Cancel
Save