mindfulminun/FebGameJam
1
0
Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-09-11 08:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
MindfulMinun
2022-02-25 21:02:59 -06:00
parent 5938fdbb30 39c2ec94da
commit 7a16dc24d2
18 changed files with 2861 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/BeatCrowds.cs
+2 -2
View File
@@ -25,9 +25,9 @@ public class BeatCrowds : MonoBehaviour
void BeatLevel()
{
if (currentLevel == 1)
if (currentLevel == 2)
{
PlayerPrefs.SetInt("CurrentLevel", 2);
PlayerPrefs.SetInt("CurrentLevel", 3);
SceneManager.LoadScene("Real World");
}else
{
Assets/BeatHeights.cs
+37
View File
@@ -0,0 +1,37 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class BeatHeights : MonoBehaviour
{
public int currentLevel;
// Start is called before the first frame update
void Start()
{
currentLevel = PlayerPrefs.GetInt("CurrentLevel");
}
// Update is called once per frame
/*void Update()
{
if (Input.GetButtonDown("Jump"))
{
BeatLevel();
}
}*/
void BeatLevel()
{
if (currentLevel == 1)
{
PlayerPrefs.SetInt("CurrentLevel", 2);
SceneManager.LoadScene("Real World");
}
else
{
SceneManager.LoadScene("Real World");
}
}
}
Assets/BeatHeights.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 13ce7dadc96f7ff43a1d8b51afb8322e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Clouds/Cloud Ceiling Variant.prefab
+135
View File
@@ -0,0 +1,135 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1863913792
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1863913793}
- component: {fileID: 1863913795}
- component: {fileID: 1863913794}
m_Layer: 8
m_Name: Height Trigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1863913793
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1863913792}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4058488523496122551}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1863913795
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1863913792}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e8c23705bf1fc90429b5d3732a001af7, type: 3}
m_Name:
m_EditorClassIdentifier:
cam: {fileID: 0}
--- !u!61 &1863913794
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1863913792}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
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
serializedVersion: 2
m_Size: {x: 18, y: 1}
m_EdgeRadius: 0
--- !u!1001 &5621520944030056987
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8525598097607813777, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_Name
value: Cloud Ceiling
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalPosition.x
value: 0.08599669
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalPosition.y
value: 4.98
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
--- !u!4 &4058488523496122551 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
m_PrefabInstance: {fileID: 5621520944030056987}
m_PrefabAsset: {fileID: 0}
Assets/Prefabs/Clouds/Cloud Ceiling Variant.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1604be00c1dca7a4d8643cce45a3ef0f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scene 1 Assets/Bird.cs
+1
View File
@@ -40,6 +40,7 @@ public class Bird : MonoBehaviour
Vector3 targetVelocity = new Vector2(horizontalMove, Mathf.Sin(elapsed * frequency) * deltaY);
// And then smoothing it out and applying it to the character
m_Rigidbody2D.velocity = Vector3.SmoothDamp(m_Rigidbody2D.velocity, targetVelocity, ref m_Velocity, m_MovementSmoothing);
}
else {
m_Rigidbody2D.velocity = Vector3.zero;
Assets/Scene 1 Assets/SpawnTrigger.cs
+31
View File
@@ -0,0 +1,31 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class SpawnTrigger : Trigger
{
[SerializeField] float despawnTimer = 10f;
[SerializeField] GameObject entity;
[SerializeField] Vector2 startPos;
private GameObject clone;
private bool spawned;
//And function itself
IEnumerator SpawnDespawn(){
clone = Instantiate(entity, startPos, Quaternion.identity);
clone.gameObject.SetActive(true);
yield return new WaitForSeconds(despawnTimer);
Destroy(clone);
this.gameObject.SetActive(false);
}
public override void Action() {
if(!spawned) {
Debug.Log("spawn");
StartCoroutine(SpawnDespawn());
}
}
// Start is called before the first frame update
}
Assets/Scene 1 Assets/SpawnTrigger.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 55be82907c3918e408296a2532d38fff
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/Acrophobia.unity
+63 -59
View File
@@ -344,63 +344,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9415d90d6c46f0f4ba482e70db108b4c, type: 3}
--- !u!1001 &1107087967
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8525598097607813777, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_Name
value: Cloud Ceiling
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalPosition.x
value: 0.08599669
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalPosition.y
value: 4.98
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8525598097607813804, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
--- !u!1 &1249172108
GameObject:
m_ObjectHideFlags: 0
@@ -854,6 +797,67 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7f2f989c2081d545b71b393bd6a1795, type: 3}
--- !u!1001 &5621520945126068292
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1863913795, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: cam
value:
objectReference: {fileID: 516382873}
- target: {fileID: 4058488523496122506, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_Name
value: Cloud Ceiling
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalPosition.x
value: 0.08599669
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalPosition.y
value: 4.98
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4058488523496122551, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1604be00c1dca7a4d8643cce45a3ef0f, type: 3}
--- !u!1001 &6311002086871137254
PrefabInstance:
m_ObjectHideFlags: 0
@@ -932,7 +936,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8377657887517498965, guid: 7306927cb053fa544a6109071277a072, type: 3}
propertyPath: m_LocalPosition.y
value: -0.09
value: 0.37
objectReference: {fileID: 0}
- target: {fileID: 8377657887517498965, guid: 7306927cb053fa544a6109071277a072, type: 3}
propertyPath: m_LocalPosition.z
@@ -988,7 +992,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8377657887517498987, guid: 7306927cb053fa544a6109071277a072, type: 3}
propertyPath: positionToMoveTo.y
value: -0.09
value: 0.37
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7306927cb053fa544a6109071277a072, type: 3}
Assets/Scenes/Crowds Test.unity
+111 -4
View File
@@ -296,7 +296,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &282791052
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -512,6 +512,104 @@ Transform:
m_Father: {fileID: 1536876606}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &814501014
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 814501017}
- component: {fileID: 814501016}
- component: {fileID: 814501015}
- component: {fileID: 814501018}
m_Layer: 8
m_Name: spawntest
m_TagString: Event
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &814501015
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814501014}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 55be82907c3918e408296a2532d38fff, type: 3}
m_Name:
m_EditorClassIdentifier:
forceInteract: 1
repeatable: 0
value: 0
despawnTimer: 3
entity: {fileID: 1890188395}
startPos: {x: 4, y: 1}
--- !u!61 &814501016
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814501014}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
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
serializedVersion: 2
m_Size: {x: 3, y: 3}
m_EdgeRadius: 2
--- !u!4 &814501017
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814501014}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &814501018
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814501014}
m_BodyType: 2
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!1001 &947900510
PrefabInstance:
m_ObjectHideFlags: 0
@@ -647,7 +745,7 @@ GameObject:
- component: {fileID: 1536876601}
m_Layer: 3
m_Name: Character
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -845,6 +943,11 @@ PrefabInstance:
objectReference: {fileID: 532366119}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6ea336e93a8128346aad568255a7e6af, type: 3}
--- !u!1 &1890188395 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7120480105423891695, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
m_PrefabInstance: {fileID: 7120480105463622328}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1969245556
GameObject:
m_ObjectHideFlags: 0
@@ -960,7 +1063,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 252906743233931201, guid: 616bb628e140f2746aa551bed0c95e8f, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 252906743233931256, guid: 616bb628e140f2746aa551bed0c95e8f, type: 3}
propertyPath: m_Radius
@@ -1087,6 +1190,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7120480105423891680, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
propertyPath: despawnTimer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7120480105423891682, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
propertyPath: m_RootOrder
value: 7
@@ -1137,7 +1244,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7120480105423891695, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f47750517b3662a4ab2cbeeb18eec95f, type: 3}
Assets/Scenes/Game Scenes/Heights Level.unity
+2371
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Game Scenes/Heights Level.unity.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b23f36c2e3b3a284baae9cff59bb54e7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/Game Scenes/Real World.unity
+5 -5
View File
@@ -557,11 +557,11 @@ PrefabInstance:
objectReference: {fileID: 1477723291}
- target: {fileID: 3617937272123271708, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: CancelInvoke
value: Level1
objectReference: {fileID: 0}
- target: {fileID: 3617937272123271708, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: UnityEngine.MonoBehaviour, UnityEngine
value: WorldScreenController, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 4116959943985034055, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_LocalRotation.w
@@ -593,7 +593,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8900608489955080584, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_Name
value: Crowds
value: Heights
objectReference: {fileID: 0}
- target: {fileID: 8900608489955080584, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_IsActive
@@ -1113,7 +1113,7 @@ PrefabInstance:
objectReference: {fileID: 1477723291}
- target: {fileID: 3617937272123271708, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value:
value: Level2
objectReference: {fileID: 0}
- target: {fileID: 3617937272123271708, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
@@ -1149,7 +1149,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8900608489955080584, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_Name
value: Speeds
value: Crowds
objectReference: {fileID: 0}
- target: {fileID: 8900608489955080584, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_IsActive
Assets/WorldScreenController.cs
+1 -1
View File
@@ -30,7 +30,7 @@ public class WorldScreenController : MonoBehaviour
{
if (currentLevel >= 1)
{
SceneManager.LoadScene("Crowds Level");
SceneManager.LoadScene("Heights Level");
}
}
Assets/camMoveUp.cs
+23
View File
@@ -0,0 +1,23 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class camMoveUp : MonoBehaviour
{
public GameObject cam;
[Range(0f, 20f)] public float offset;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
void OnTriggerEnter2D(Collider2D col){
cam.transform.position = new Vector3(0, 10f,-1.3f);
}
}
Assets/camMoveUp.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e8c23705bf1fc90429b5d3732a001af7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
ProjectSettings/EditorBuildSettings.asset
+4 -1
View File
@@ -15,9 +15,12 @@ EditorBuildSettings:
path: Assets/Scenes/Game Scenes/Crowds Level.unity
guid: fdd06664190a83b47a3fcbac3e218da0
- enabled: 1
path: Assets/Scenes/Game Scenes/Heights Level.unity
guid: b23f36c2e3b3a284baae9cff59bb54e7
- enabled: 0
path: Assets/Scenes/Scene1.unity
guid: 2cda990e2423bbf4892e6590ba056729
- enabled: 1
- enabled: 0
path: Assets/Scenes/testScene.unity
guid: fc7cc980862393c49b562753aef7928b
m_configObjects: {}
UserSettings/EditorUserSettings.asset
+30
View File
@@ -5,6 +5,36 @@ EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7e1304180822232a2f31633c133af6f9
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367f6d7717e1351027
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0