From 8052c47e7d676f5044c8f4bd4af70d98ba942acb Mon Sep 17 00:00:00 2001
From: Adam Sattaur <asatt014@gold.ac.uk>
Date: Tue, 1 Nov 2016 12:58:16 +0000
Subject: [PATCH] Finished game
---
Assets/FROGGER.unity | 80 +++++++++++++------------------
Assets/SpawnScript.cs | 25 ++++++++++
Assets/SpawnScript.cs.meta | 12 +++++
Assets/WaitText.prefab | 93 +++++++++++++++++++++++++++++++++++++
Assets/WaitText.prefab.meta | 8 ++++
5 files changed, 169 insertions(+), 49 deletions(-)
create mode 100644 Assets/SpawnScript.cs
create mode 100644 Assets/SpawnScript.cs.meta
create mode 100644 Assets/WaitText.prefab
create mode 100644 Assets/WaitText.prefab.meta
diff --git a/Assets/FROGGER.unity b/Assets/FROGGER.unity
index 5c4a1b2..e5a9133 100644
--- a/Assets/FROGGER.unity
+++ b/Assets/FROGGER.unity
@@ -136,7 +136,12 @@ Prefab:
- target: {fileID: 114000012297445424, guid: e74d429f0269249988a7f4cafbe13a93,
type: 2}
propertyPath: speed
- value: 2
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 114000012297445424, guid: e74d429f0269249988a7f4cafbe13a93,
+ type: 2}
+ propertyPath: interval
+ value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: e74d429f0269249988a7f4cafbe13a93, type: 2}
@@ -227,7 +232,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 3
--- !u!1001 &1076193507
Prefab:
m_ObjectHideFlags: 0
@@ -270,48 +275,6 @@ Prefab:
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 3a9f6216adfc24906af2cca2bfd74257, type: 2}
m_IsPrefabParent: 0
---- !u!1001 &1152422829
-Prefab:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 4000011957999638, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
- propertyPath: m_LocalPosition.x
- value: 0.19275121
- objectReference: {fileID: 0}
- - target: {fileID: 4000011957999638, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
- propertyPath: m_LocalPosition.y
- value: -8.64
- objectReference: {fileID: 0}
- - target: {fileID: 4000011957999638, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
- propertyPath: m_LocalPosition.z
- value: -2
- objectReference: {fileID: 0}
- - target: {fileID: 4000011957999638, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4000011957999638, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4000011957999638, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4000011957999638, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4000011957999638, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
- propertyPath: m_RootOrder
- value: 2
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_ParentPrefab: {fileID: 100100000, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
- m_IsPrefabParent: 0
--- !u!1 &1386371084
GameObject:
m_ObjectHideFlags: 0
@@ -374,7 +337,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 2
--- !u!1001 &1632045109
Prefab:
m_ObjectHideFlags: 0
@@ -412,12 +375,17 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4000012431817894, guid: e74d429f0269249988a7f4cafbe13a93, type: 2}
propertyPath: m_RootOrder
- value: 5
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 114000012297445424, guid: e74d429f0269249988a7f4cafbe13a93,
type: 2}
propertyPath: speed
- value: -2
+ value: -4
+ objectReference: {fileID: 0}
+ - target: {fileID: 114000012297445424, guid: e74d429f0269249988a7f4cafbe13a93,
+ type: 2}
+ propertyPath: interval
+ value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: e74d429f0269249988a7f4cafbe13a93, type: 2}
@@ -502,7 +470,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 6
--- !u!61 &1971609642
BoxCollider2D:
m_ObjectHideFlags: 0
@@ -542,6 +510,7 @@ GameObject:
serializedVersion: 4
m_Component:
- 4: {fileID: 1977217413}
+ - 114: {fileID: 1977217414}
m_Layer: 0
m_Name: FrogSpawn
m_TagString: Untagged
@@ -561,4 +530,17 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 5
+--- !u!114 &1977217414
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1977217412}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 33486c91ce9584ad0ad43f2ef1a4d764, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ start_delay: 7
+ frog: {fileID: 1000010763568984, guid: 415ef9f847bf240898a5e66f8ac19f8f, type: 2}
diff --git a/Assets/SpawnScript.cs b/Assets/SpawnScript.cs
new file mode 100644
index 0000000..1e96907
--- /dev/null
+++ b/Assets/SpawnScript.cs
@@ -0,0 +1,25 @@
+using UnityEngine;
+using System.Collections;
+
+public class SpawnScript : MonoBehaviour {
+
+ public float start_delay = 10f;
+ private float start_time;
+ private bool spawned = false;
+
+ public GameObject frog;
+
+ // Use this for initialization
+ void Start () {
+ start_time = Time.time;
+ }
+
+ // Update is called once per frame
+ void Update () {
+ if (Time.time > start_time + start_delay && !spawned) {
+ Instantiate (frog, transform);
+ spawned = true;
+ Destroy (GameObject.Find ("WaitText"));
+ }
+ }
+}
diff --git a/Assets/SpawnScript.cs.meta b/Assets/SpawnScript.cs.meta
new file mode 100644
index 0000000..79cdca6
--- /dev/null
+++ b/Assets/SpawnScript.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 33486c91ce9584ad0ad43f2ef1a4d764
+timeCreated: 1478004750
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/WaitText.prefab b/Assets/WaitText.prefab
new file mode 100644
index 0000000..70cddbf
--- /dev/null
+++ b/Assets/WaitText.prefab
@@ -0,0 +1,93 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+ m_ObjectHideFlags: 1
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications: []
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 0}
+ m_RootGameObject: {fileID: 1000012400904942}
+ m_IsPrefabParent: 1
+--- !u!1 &1000012400904942
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 4
+ m_Component:
+ - 4: {fileID: 4000013367221164}
+ - 23: {fileID: 23000011536152524}
+ - 102: {fileID: 102000011260396406}
+ m_Layer: 0
+ m_Name: WaitText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4000013367221164
+Transform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012400904942}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -4.07, y: 0.96, z: -2}
+ m_LocalScale: {x: 2.05, y: 1.88, z: 1}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+--- !u!23 &23000011536152524
+MeshRenderer:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012400904942}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_Materials:
+ - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+ m_SubsetIndices:
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_SelectedWireframeHidden: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+--- !u!102 &102000011260396406
+TextMesh:
+ serializedVersion: 3
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1000012400904942}
+ m_Text: please wait for frog
+ m_OffsetZ: 0
+ m_CharacterSize: 1
+ m_LineSpacing: 1
+ m_Anchor: 0
+ m_Alignment: 0
+ m_TabSize: 4
+ m_FontSize: 0
+ m_FontStyle: 0
+ m_RichText: 1
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_Color:
+ serializedVersion: 2
+ rgba: 4278255601
diff --git a/Assets/WaitText.prefab.meta b/Assets/WaitText.prefab.meta
new file mode 100644
index 0000000..c755cd1
--- /dev/null
+++ b/Assets/WaitText.prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: db70a1b61057443c18e79bfb5615f889
+timeCreated: 1478004998
+licenseType: Free
+NativeFormatImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
GitLab