diff --git a/Assets/Scenes/IntroScene.unity b/Assets/Scenes/IntroScene.unity
index 38d77114dd3e0bfc6b0b15822f1edc7b459102ac..50550790d91fa1d6b7e67cd0a902b8ff64150edd 100644
--- a/Assets/Scenes/IntroScene.unity
+++ b/Assets/Scenes/IntroScene.unity
@@ -250,169 +250,6 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
---- !u!43 &63439666
-Mesh:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name:
- serializedVersion: 10
- m_SubMeshes:
- - serializedVersion: 2
- firstByte: 0
- indexCount: 24
- topology: 0
- baseVertex: 0
- firstVertex: 0
- vertexCount: 8
- localAABB:
- m_Center: {x: 0, y: 0.01, z: 0}
- m_Extent: {x: 1.65, y: 0, z: 1.275}
- m_Shapes:
- vertices: []
- shapes: []
- channels: []
- fullWeights: []
- m_BindPose: []
- m_BoneNameHashes:
- m_RootBoneNameHash: 0
- m_BonesAABB: []
- m_VariableBoneCountWeights:
- m_Data:
- m_MeshCompression: 0
- m_IsReadable: 1
- m_KeepVertices: 1
- m_KeepIndices: 1
- m_IndexFormat: 0
- m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400
- m_VertexData:
- serializedVersion: 3
- m_VertexCount: 8
- m_Channels:
- - stream: 0
- offset: 0
- format: 0
- dimension: 3
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 12
- format: 0
- dimension: 4
- - stream: 0
- offset: 28
- format: 0
- dimension: 2
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- m_DataSize: 288
- _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f
- m_CompressedMesh:
- m_Vertices:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_UV:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Normals:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Tangents:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Weights:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_NormalSigns:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_TangentSigns:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_FloatColors:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_BoneIndices:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_Triangles:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_UVInfo: 0
- m_LocalAABB:
- m_Center: {x: 0, y: 0.01, z: 0}
- m_Extent: {x: 1.65, y: 0, z: 1.275}
- m_MeshUsageFlags: 0
- m_BakedConvexCollisionMesh:
- m_BakedTriangleCollisionMesh:
- m_MeshMetrics[0]: 1
- m_MeshMetrics[1]: 1
- m_MeshOptimizationFlags: 1
- m_StreamData:
- offset: 0
- size: 0
- path:
--- !u!1001 &139842959
PrefabInstance:
m_ObjectHideFlags: 0
@@ -764,17 +601,9 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 146900, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
- propertyPath: m_Name
- value: '[CameraRig]'
- objectReference: {fileID: 0}
- - target: {fileID: 146900, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_LocalPosition.x
- value: -1.22
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_LocalPosition.y
@@ -782,7 +611,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_LocalPosition.z
- value: 2.66
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_LocalRotation.x
@@ -816,14 +645,22 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 146900, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
+ propertyPath: m_Name
+ value: '[CameraRig]'
+ objectReference: {fileID: 0}
+ - target: {fileID: 146900, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 2348914, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
- objectReference: {fileID: 1039112270}
+ objectReference: {fileID: 1828487043}
- target: {fileID: 3380982, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_Mesh
value:
- objectReference: {fileID: 63439666}
+ objectReference: {fileID: 1374973175}
- target: {fileID: 124034, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
propertyPath: m_IsActive
value: 1
@@ -1283,40 +1120,6 @@ Transform:
m_Father: {fileID: 1047444053}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &1039112270
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Sprites/Default
- m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords:
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _AlphaTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Floats:
- - PixelSnap: 0
- - _EnableExternalAlpha: 0
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _Flip: {r: 1, g: 1, b: 1, a: 1}
- - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &1047444049
GameObject:
m_ObjectHideFlags: 0
@@ -1611,6 +1414,169 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 70, y: 90, z: 0}
+--- !u!43 &1374973175
+Mesh:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ serializedVersion: 10
+ m_SubMeshes:
+ - serializedVersion: 2
+ firstByte: 0
+ indexCount: 24
+ topology: 0
+ baseVertex: 0
+ firstVertex: 0
+ vertexCount: 8
+ localAABB:
+ m_Center: {x: 0, y: 0.01, z: 0}
+ m_Extent: {x: 1.65, y: 0, z: 1.275}
+ m_Shapes:
+ vertices: []
+ shapes: []
+ channels: []
+ fullWeights: []
+ m_BindPose: []
+ m_BoneNameHashes:
+ m_RootBoneNameHash: 0
+ m_BonesAABB: []
+ m_VariableBoneCountWeights:
+ m_Data:
+ m_MeshCompression: 0
+ m_IsReadable: 1
+ m_KeepVertices: 1
+ m_KeepIndices: 1
+ m_IndexFormat: 0
+ m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400
+ m_VertexData:
+ serializedVersion: 3
+ m_VertexCount: 8
+ m_Channels:
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 3
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 12
+ format: 0
+ dimension: 4
+ - stream: 0
+ offset: 28
+ format: 0
+ dimension: 2
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ m_DataSize: 288
+ _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f
+ m_CompressedMesh:
+ m_Vertices:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_UV:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Normals:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Tangents:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Weights:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_NormalSigns:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_TangentSigns:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_FloatColors:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_BoneIndices:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_Triangles:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_UVInfo: 0
+ m_LocalAABB:
+ m_Center: {x: 0, y: 0.01, z: 0}
+ m_Extent: {x: 1.65, y: 0, z: 1.275}
+ m_MeshUsageFlags: 0
+ m_BakedConvexCollisionMesh:
+ m_BakedTriangleCollisionMesh:
+ m_MeshMetrics[0]: 1
+ m_MeshMetrics[1]: 1
+ m_MeshOptimizationFlags: 1
+ m_StreamData:
+ offset: 0
+ size: 0
+ path:
--- !u!1 &1444539395
GameObject:
m_ObjectHideFlags: 0
@@ -6884,16 +6850,16 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1661077311}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 39.1}
- m_LocalScale: {x: 0.050708, y: 0.050708, z: 0.050708}
+ m_LocalPosition: {x: 0, y: 0, z: 3.22}
+ m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
m_Children: []
m_Father: {fileID: 52197889}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 20.9, y: 12.6}
- m_SizeDelta: {x: 458.3, y: 125.1}
+ m_AnchoredPosition: {x: -1.2700043, y: -0.41000366}
+ m_SizeDelta: {x: 350.7, y: 117.7}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1661077313
MonoBehaviour:
@@ -6908,7 +6874,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.52213013, g: 1, b: 0.5529412, a: 1}
+ m_Color: {r: 0, g: 0.16586089, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -6917,7 +6883,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 100
+ m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@@ -6961,11 +6927,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1047444053}
m_Modifications:
- - target: {fileID: -927199367670048503, guid: 3c6ce42bdec2e4f438963e5160539634,
- type: 3}
- propertyPath: m_Name
- value: untitled10m
- objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 3c6ce42bdec2e4f438963e5160539634,
type: 3}
propertyPath: m_LocalPosition.x
@@ -7031,6 +6992,11 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 20
objectReference: {fileID: 0}
+ - target: {fileID: -927199367670048503, guid: 3c6ce42bdec2e4f438963e5160539634,
+ type: 3}
+ propertyPath: m_Name
+ value: untitled10m
+ objectReference: {fileID: 0}
- target: {fileID: -1504981713932161579, guid: 3c6ce42bdec2e4f438963e5160539634,
type: 3}
propertyPath: m_Materials.Array.data[0]
@@ -7038,6 +7004,40 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 7b50f3a190574004dada19f6e2053f74, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3c6ce42bdec2e4f438963e5160539634, type: 3}
+--- !u!21 &1828487043
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Sprites/Default
+ m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _AlphaTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - PixelSnap: 0
+ - _EnableExternalAlpha: 0
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Flip: {r: 1, g: 1, b: 1, a: 1}
+ - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &1855262968
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Scene2/ActionHandlr2.cs b/Assets/Scripts/Scene2/ActionHandlr2.cs
index 0693831b62d46df06d02b2625b1e29f9c6ac4c46..dd55524d418f3979e357b03e0069e7e23c88e936 100644
--- a/Assets/Scripts/Scene2/ActionHandlr2.cs
+++ b/Assets/Scripts/Scene2/ActionHandlr2.cs
@@ -144,7 +144,7 @@ public class ActionHandlr2 : MonoBehaviour
NewRound();
}
- private void EndWarmup()
+ public void EndWarmup()
{
Timer.instance.EndTimer();
ActGame = false;
diff --git a/Assets/Scripts/Scene2/Timer.cs b/Assets/Scripts/Scene2/Timer.cs
index 66ca4b9d30a162570a6595cba4bdf0209698c76d..994159291c00f99c8423126d26b1610bafa9e207 100644
--- a/Assets/Scripts/Scene2/Timer.cs
+++ b/Assets/Scripts/Scene2/Timer.cs
@@ -10,8 +10,11 @@ public class Timer : MonoBehaviour
public int stageTime = 0;
private int min;
private int sec;
- public bool gameFinished = false;
- public bool gameStarted = false;
+ public bool gameFinished;
+ public bool gameStarted;
+ private bool Timeisup;
+ private const int countdown = 180;
+ private int actTime;
private int startcount = 0;
@@ -29,27 +32,53 @@ public class Timer : MonoBehaviour
void Start()
{
-
- }
+ gameFinished = false;
+ gameStarted = false;
+ Timeisup = false;
+ actTime = 180;
+}
void Update()
{
- while (stageTime <= 180)
- {
+
+
if (gameStarted && startcount == 0)
{
startcount += 1;
//Debug.Log("enter gameStarted");
startTime = Time.time;
}
- else if (gameStarted && startcount != 0 && !gameFinished)
+ else if (gameStarted && startcount != 0 && !gameFinished && actTime > 0)
{
stageTime = (int)(Time.time - startTime);
- //Debug.Log("enter gameStarted + running");
- min = Mathf.FloorToInt(stageTime / 60);
- sec = Mathf.FloorToInt(stageTime % 60);
+
+ actTime = countdown - stageTime;
+
+ //Debug.Log("enter gameStarted + running");
+ min = Mathf.FloorToInt(actTime / 60);
+ sec = Mathf.FloorToInt(actTime % 60);
+
+ }
+ else if (Timeisup == false && actTime == 0)
+ {
+ EndTimer();
+ ActionHandlr2.instance.EndWarmup();
+ Timeisup = true;
+ }
+ else
+ {
+ return;
+ }
+
+ if (actTime == 15)
+ {
+ GetComponent<Text>().color = Color.yellow;
}
+ else if (actTime == 10)
+ {
+ GetComponent<Text>().color = Color.red;
}
+
}
void OnGUI()
@@ -61,6 +90,7 @@ public class Timer : MonoBehaviour
{
gameStarted = true;
gameFinished = false;
+ Timeisup = false;
}
public void EndTimer()