Commit ca905aa3 authored by 16이진형's avatar 16이진형

Level 1

parent 51b5277d
...@@ -17,10 +17,14 @@ public class AlertManager : MonoBehaviour ...@@ -17,10 +17,14 @@ public class AlertManager : MonoBehaviour
Queue<string> alertTextQueue; Queue<string> alertTextQueue;
private void Awake()
{
Close();
}
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
Close();
//string[] aa = { "a","b" }; //string[] aa = { "a","b" };
//Alert(aa); //Alert(aa);
} }
...@@ -56,13 +60,13 @@ public class AlertManager : MonoBehaviour ...@@ -56,13 +60,13 @@ public class AlertManager : MonoBehaviour
} }
public void AlertQueue() protected void AlertQueue()
{ {
if(alertTextQueue.Count >= 2) if(alertTextQueue.Count >= 2)
{ {
Alert(alertTextQueue.Dequeue(), AlertQueue, DeleteQueue); Alert(alertTextQueue.Dequeue(), AlertQueue, DeleteQueue);
} }
else else if(alertTextQueue.Count == 1)
{ {
Alert(alertTextQueue.Dequeue()); Alert(alertTextQueue.Dequeue());
} }
......
This diff is collapsed.
fileFormatVersion: 2
guid: 09fd81914134c4f4a823ec2102b1bbfb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -395,17 +395,24 @@ MonoBehaviour: ...@@ -395,17 +395,24 @@ MonoBehaviour:
m_GameObject: {fileID: 279236942} m_GameObject: {fileID: 279236942}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14f968d942299c84ca786317f6de8274, type: 3} m_Script: {fileID: 11500000, guid: 85f33cc515852874d98f6c1e43799fe5, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
uiManager: {fileID: 394305455} uiManager: {fileID: 394305455}
gamma: 0 gamma: 0
player: {fileID: 739347346} player: {fileID: 739347346}
ExplanationText:
- "\uBC11\uC5D0 \uC18D\uB825 \uBC14\uAFB8\uACE0 \uB354\uBE14\uD074\uB9AD\uD558\uBA74
\uC774\uB3D9\uB428"
- "\uADF8\uBC29\uD5A5\uC73C\uB85C \uBA40\uB9AC\uBA40\uB9AC"
- "\uD574\uBCF4\uC790"
- "cancel \uB204\uB974\uBA74 \uB354 \uB098\uC62C\uB9D0\uB4E4 \uC0AC\uB77C\uC9D0"
- "\u3147\u3147"
winstate: 0 winstate: 0
DoubleClickMove: 1 DoubleClickMove: 1
PathRanderMove: 1 PathRanderMove: 0
WASDMove: 1 WASDMove: 0
Todo: "1. \uC774\uB3D9\uD558\uAE30" Todo:
--- !u!1 &332710466 --- !u!1 &332710466
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -753,6 +760,7 @@ MonoBehaviour: ...@@ -753,6 +760,7 @@ MonoBehaviour:
scrollSpeed: 5 scrollSpeed: 5
WASDMove: 1 WASDMove: 1
DoubleCLickMove: 1 DoubleCLickMove: 1
alert: {fileID: 1878497986}
--- !u!4 &394305456 --- !u!4 &394305456
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1199,11 +1207,11 @@ MonoBehaviour: ...@@ -1199,11 +1207,11 @@ MonoBehaviour:
m_GameObject: {fileID: 535323107} m_GameObject: {fileID: 535323107}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 11c0c0a758005e0408c9a767ec478e97, type: 3} m_Script: {fileID: 11500000, guid: d21dcedb7a777274ab532991e3f871d8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
objectType: 3 objectType: 4
collisionPreset: 4 collisionPreset: 3
beta: 0 beta: 0
alpha: {x: 0, y: 0, z: 0} alpha: {x: 0, y: 0, z: 0}
v: {x: 0, y: 0, z: 0} v: {x: 0, y: 0, z: 0}
...@@ -1213,8 +1221,6 @@ MonoBehaviour: ...@@ -1213,8 +1221,6 @@ MonoBehaviour:
time: 0 time: 0
theobject: {fileID: 535323107} theobject: {fileID: 535323107}
mass: 10 mass: 10
starttime: 60
otherclock: {fileID: 1094934749}
--- !u!4 &535323109 --- !u!4 &535323109
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1223,7 +1229,7 @@ Transform: ...@@ -1223,7 +1229,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 535323107} m_GameObject: {fileID: 535323107}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.72, y: 0, z: 0.72} m_LocalPosition: {x: 2.73, y: 0, z: 0.72}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 439858922} - {fileID: 439858922}
...@@ -2102,7 +2108,7 @@ MonoBehaviour: ...@@ -2102,7 +2108,7 @@ MonoBehaviour:
PathColliderPrefab: {fileID: 8684657376034186961, guid: bf9de3c1290fd0749b383f44c1e706f8, PathColliderPrefab: {fileID: 8684657376034186961, guid: bf9de3c1290fd0749b383f44c1e706f8,
type: 3} type: 3}
playercamera: {fileID: 1661408489} playercamera: {fileID: 1661408489}
levelManager: {fileID: 279236944} levelManager: {fileID: 0}
background: {fileID: 1713675715} background: {fileID: 1713675715}
velocityslider: {fileID: 260633610} velocityslider: {fileID: 260633610}
ui: {fileID: 394305455} ui: {fileID: 394305455}
...@@ -3034,11 +3040,11 @@ MonoBehaviour: ...@@ -3034,11 +3040,11 @@ MonoBehaviour:
m_GameObject: {fileID: 1094934748} m_GameObject: {fileID: 1094934748}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 11c0c0a758005e0408c9a767ec478e97, type: 3} m_Script: {fileID: 11500000, guid: d21dcedb7a777274ab532991e3f871d8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
objectType: 3 objectType: 4
collisionPreset: 4 collisionPreset: 3
beta: 0 beta: 0
alpha: {x: 0, y: 0, z: 0} alpha: {x: 0, y: 0, z: 0}
v: {x: 0, y: 0, z: 0} v: {x: 0, y: 0, z: 0}
...@@ -3048,8 +3054,6 @@ MonoBehaviour: ...@@ -3048,8 +3054,6 @@ MonoBehaviour:
time: 0 time: 0
theobject: {fileID: 1094934748} theobject: {fileID: 1094934748}
mass: 10 mass: 10
starttime: 0
otherclock: {fileID: 535323108}
--- !u!4 &1094934750 --- !u!4 &1094934750
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4518,7 +4522,7 @@ MonoBehaviour: ...@@ -4518,7 +4522,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a937b7b15233ade4b8c2766ff3695fb7, type: 3} m_Script: {fileID: 11500000, guid: a937b7b15233ade4b8c2766ff3695fb7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
levelManager: {fileID: 279236944} levelManager: {fileID: 0}
starttime: 0 starttime: 0
gamma: 1 gamma: 1
--- !u!1 &1751424968 --- !u!1 &1751424968
......
...@@ -5,14 +5,28 @@ using UnityEngine; ...@@ -5,14 +5,28 @@ using UnityEngine;
public class Level1Manager : LevelManager public class Level1Manager : LevelManager
{ {
// Start is called before the first frame update // Start is called before the first frame update
void Start() Vector3 orig;
protected override void Start()
{
base.Start();
orig = player.transform.position;
}
protected override bool WinCondition()
{ {
if(XZLengthSquare(player.transform.position,orig) > 100)
{
return true;
}
else
{
return false;
}
} }
// Update is called once per frame float XZLengthSquare(Vector3 a, Vector3 b)
void Update()
{ {
return (a.x - b.x) * (a.x - b.x) + (a.z - b.z) * (a.z - b.z);
} }
} }
...@@ -9,6 +9,9 @@ public class LevelManager : MonoBehaviour ...@@ -9,6 +9,9 @@ public class LevelManager : MonoBehaviour
public double gamma; public double gamma;
public PlayerMovement player; public PlayerMovement player;
public string[] ExplanationText = { "aa","bb"};
[SerializeField] [SerializeField]
protected bool winstate = false; protected bool winstate = false;
...@@ -22,6 +25,8 @@ public class LevelManager : MonoBehaviour ...@@ -22,6 +25,8 @@ public class LevelManager : MonoBehaviour
[SerializeField] [SerializeField]
protected string Todo; protected string Todo;
// Start is called before the first frame update // Start is called before the first frame update
protected virtual void Start() protected virtual void Start()
{ {
...@@ -33,6 +38,8 @@ public class LevelManager : MonoBehaviour ...@@ -33,6 +38,8 @@ public class LevelManager : MonoBehaviour
uiManager.DoubleCLickMove = DoubleClickMove; uiManager.DoubleCLickMove = DoubleClickMove;
uiManager.TodoText = Todo; uiManager.TodoText = Todo;
uiManager.alert.Alert(ExplanationText);
} }
// Update is called once per frame // Update is called once per frame
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Assets.Scripts.ObjectMovement
{
class NormalObject : Planemovement
{
}
}
fileFormatVersion: 2
guid: d21dcedb7a777274ab532991e3f871d8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
...@@ -41,6 +41,8 @@ public class UIManager : MonoBehaviour ...@@ -41,6 +41,8 @@ public class UIManager : MonoBehaviour
public bool WASDMove = true; public bool WASDMove = true;
public bool DoubleCLickMove = true; public bool DoubleCLickMove = true;
public AlertManager alert;
private int prevSelectPathNum = -1; private int prevSelectPathNum = -1;
private Text pathName; private Text pathName;
private Text pathVelocity; private Text pathVelocity;
...@@ -51,6 +53,8 @@ public class UIManager : MonoBehaviour ...@@ -51,6 +53,8 @@ public class UIManager : MonoBehaviour
GraphicRaycaster gr; GraphicRaycaster gr;
PointerEventData ped; PointerEventData ped;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
...@@ -62,6 +66,10 @@ public class UIManager : MonoBehaviour ...@@ -62,6 +66,10 @@ public class UIManager : MonoBehaviour
gr = canvas.GetComponent<GraphicRaycaster>(); gr = canvas.GetComponent<GraphicRaycaster>();
ped = new PointerEventData(null); ped = new PointerEventData(null);
//string[] a = { "a", "b" };
//alert.Alert(a);
} }
// Update is called once per frame // Update is called once per frame
......
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 to comment