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
Ivy 4 years ago
parent 22cc21db6c 1e655ae15e
commit 97e71b7985
12 changed files with 185 additions and 3 deletions
Show Stats Download Patch File Download Diff File

17
MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity
Unescape View File

@ -1448,6 +1448,7 @@ GameObject:
- component: {fileID: 563510753} - component: {fileID: 563510753}
- component: {fileID: 563510752} - component: {fileID: 563510752}
- component: {fileID: 563510751} - component: {fileID: 563510751}
- component: {fileID: 563510754}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@ -1490,7 +1491,7 @@ Camera:
far clip plane: 1000 far clip plane: 1000
field of view: 60 field of view: 60
orthographic: 1 orthographic: 1
orthographic size: 4.25 orthographic size: 21.196718
m_Depth: -1 m_Depth: -1
m_CullingMask: m_CullingMask:
serializedVersion: 2 serializedVersion: 2
@ -1520,6 +1521,20 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &563510754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 563510750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2bd046d4caeda4b4b8fcb2e33e4d83c8, type: 3}
m_Name:
m_EditorClassIdentifier:
boundaryPercent: 0.35
easing: 0.01
--- !u!1 &601273749 --- !u!1 &601273749
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

15
MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity
Unescape View File

@ -2638,6 +2638,7 @@ GameObject:
- component: {fileID: 563510753} - component: {fileID: 563510753}
- component: {fileID: 563510752} - component: {fileID: 563510752}
- component: {fileID: 563510751} - component: {fileID: 563510751}
- component: {fileID: 563510754}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@ -2710,6 +2711,20 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &563510754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 563510750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2bd046d4caeda4b4b8fcb2e33e4d83c8, type: 3}
m_Name:
m_EditorClassIdentifier:
boundaryPercent: 0.35
easing: 0.01
--- !u!1 &568026480 --- !u!1 &568026480
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

15
MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity
Unescape View File

@ -8464,6 +8464,7 @@ GameObject:
- component: {fileID: 563510753} - component: {fileID: 563510753}
- component: {fileID: 563510752} - component: {fileID: 563510752}
- component: {fileID: 563510751} - component: {fileID: 563510751}
- component: {fileID: 563510754}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@ -8536,6 +8537,20 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &563510754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 563510750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2bd046d4caeda4b4b8fcb2e33e4d83c8, type: 3}
m_Name:
m_EditorClassIdentifier:
boundaryPercent: 0.35
easing: 0.01
--- !u!1 &680522170 --- !u!1 &680522170
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

15
MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity
Unescape View File

@ -2346,6 +2346,7 @@ GameObject:
- component: {fileID: 563510753} - component: {fileID: 563510753}
- component: {fileID: 563510752} - component: {fileID: 563510752}
- component: {fileID: 563510751} - component: {fileID: 563510751}
- component: {fileID: 563510754}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@ -2418,6 +2419,20 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &563510754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 563510750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2bd046d4caeda4b4b8fcb2e33e4d83c8, type: 3}
m_Name:
m_EditorClassIdentifier:
boundaryPercent: 0.35
easing: 0.01
--- !u!1 &680522170 --- !u!1 &680522170
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

17
MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity
Unescape View File

@ -1816,6 +1816,7 @@ GameObject:
- component: {fileID: 516074243} - component: {fileID: 516074243}
- component: {fileID: 516074242} - component: {fileID: 516074242}
- component: {fileID: 516074241} - component: {fileID: 516074241}
- component: {fileID: 516074244}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@ -1888,6 +1889,20 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &516074244
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 516074240}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2bd046d4caeda4b4b8fcb2e33e4d83c8, type: 3}
m_Name:
m_EditorClassIdentifier:
boundaryPercent: 0.35
easing: 0.01
--- !u!1001 &590469919 --- !u!1001 &590469919
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1981,7 +1996,7 @@ MonoBehaviour:
player: {fileID: 1370635947} player: {fileID: 1370635947}
obtainedPowerups: obtainedPowerups:
powerupStatus: powerupStatus:
sceneToLoad: BossRoom sceneToLoad:
music: music:
- {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3} - {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3}
--- !u!4 &637676178 --- !u!4 &637676178

15
MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity
Unescape View File

@ -2498,6 +2498,7 @@ GameObject:
- component: {fileID: 563510753} - component: {fileID: 563510753}
- component: {fileID: 563510752} - component: {fileID: 563510752}
- component: {fileID: 563510751} - component: {fileID: 563510751}
- component: {fileID: 563510754}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@ -2570,6 +2571,20 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &563510754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 563510750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2bd046d4caeda4b4b8fcb2e33e4d83c8, type: 3}
m_Name:
m_EditorClassIdentifier:
boundaryPercent: 0.35
easing: 0.01
--- !u!1 &680522170 --- !u!1 &680522170
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

15
MuseumGame/Assets/Scenes/DemoLevels/Tower.unity
Unescape View File

@ -134,6 +134,7 @@ GameObject:
- component: {fileID: 429622410} - component: {fileID: 429622410}
- component: {fileID: 429622409} - component: {fileID: 429622409}
- component: {fileID: 429622408} - component: {fileID: 429622408}
- component: {fileID: 429622411}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@ -206,6 +207,20 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &429622411
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 429622407}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2bd046d4caeda4b4b8fcb2e33e4d83c8, type: 3}
m_Name:
m_EditorClassIdentifier:
boundaryPercent: 0.35
easing: 0.01
--- !u!1 &908243558 --- !u!1 &908243558
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

61
MuseumGame/Assets/Scripts/FollowCam.cs
Unescape View File

@ -0,0 +1,61 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class FollowCam : MonoBehaviour
{
private GameObject player;
public float boundaryPercent;
private float lBound;
private float rBound;
private float uBound;
private float dBound;
public float easing;
// Start is called before the first frame update
void Start()
{
lBound = boundaryPercent * Camera.main.pixelWidth;
rBound = Camera.main.pixelWidth - lBound;
dBound = boundaryPercent * Camera.main.pixelHeight;
uBound = Camera.main.pixelHeight - dBound;
player = GameManager.Instance.GetPlayer();
}
// Update is called once per frame
void Update()
{
if (player)
{
Vector3 spriteLoc = Camera.main.WorldToScreenPoint(player.transform.position);
Vector3 pos = transform.position;
if (spriteLoc.x < lBound)
{
pos.x -= lBound - spriteLoc.x;
}
else if (spriteLoc.x > rBound)
{
pos.x += spriteLoc.x - rBound;
}
if (spriteLoc.y < dBound)
{
pos.y -= dBound - spriteLoc.y;
}
else if (spriteLoc.y > uBound)
{
pos.y += spriteLoc.y - uBound;
}
pos = Vector3.Lerp(transform.position, pos, easing);
transform.position = pos;
}
}
}

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

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

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

@ -124,6 +124,10 @@ public class GameManager : MonoBehaviour
} }
} }
} }
public GameObject GetPlayer()
{
return player;
}
} }
// } // }
//} //}

1
MuseumGame/ProjectSettings/TagManager.asset
Unescape View File

@ -6,6 +6,7 @@ TagManager:
tags: tags:
- EnemyProjectile - EnemyProjectile
- Platform - Platform
- Enemy
layers: layers:
- Default - Default
- TransparentFX - TransparentFX

2
MuseumGame/UserSettings/EditorUserSettings.asset
Unescape View File

@ -21,7 +21,7 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
flags: 0 flags: 0
RecentlyUsedScenePath-5: RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
flags: 0 flags: 0
RecentlyUsedScenePath-6: RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820

Write Preview
Loading…
Cancel
Save