Fixed the latest build, final version for GameDev.Net competition

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
This commit is contained in:
RosimInc 2015-08-17 19:19:12 -04:00
parent 04c9c9911e
commit bdd6d968ef
4 changed files with 362 additions and 227 deletions

View File

@ -318,11 +318,11 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 22484724, guid: 5c94559626c169f47a446ce0517b8aec, type: 2} - target: {fileID: 22484724, guid: 5c94559626c169f47a446ce0517b8aec, type: 2}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 22484724, guid: 5c94559626c169f47a446ce0517b8aec, type: 2} - target: {fileID: 22484724, guid: 5c94559626c169f47a446ce0517b8aec, type: 2}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 5c94559626c169f47a446ce0517b8aec, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 5c94559626c169f47a446ce0517b8aec, type: 2}

View File

@ -196,10 +196,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 836354994} - {fileID: 1459567390}
- {fileID: 663155753} - {fileID: 1005505259}
- {fileID: 696279977}
- {fileID: 403748470} - {fileID: 403748470}
- {fileID: 350457696}
- {fileID: 906703074} - {fileID: 906703074}
- {fileID: 1360955016} - {fileID: 1360955016}
m_Father: {fileID: 750965895} m_Father: {fileID: 750965895}
@ -209,68 +209,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: .5, y: .5} m_Pivot: {x: .5, y: .5}
--- !u!1 &350457695
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 350457696}
- 222: {fileID: 350457698}
- 114: {fileID: 350457697}
m_Layer: 5
m_Name: Trending
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &350457696
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 350457695}
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:
- {fileID: 1366676553}
m_Father: {fileID: 122634401}
m_RootOrder: 3
m_AnchorMin: {x: 0, y: .550000012}
m_AnchorMax: {x: 1, y: .699999988}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: .5, y: .5}
--- !u!114 &350457697
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 350457695}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: .847058833, g: .874509811, b: .917647064, a: 1}
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &350457698
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 350457695}
--- !u!1 &403748469 --- !u!1 &403748469
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -300,7 +238,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 724929356} - {fileID: 724929356}
m_Father: {fileID: 122634401} m_Father: {fileID: 122634401}
m_RootOrder: 2 m_RootOrder: 3
m_AnchorMin: {x: 0, y: .699999988} m_AnchorMin: {x: 0, y: .699999988}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
@ -401,67 +339,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 540952208} m_GameObject: {fileID: 540952208}
--- !u!1 &663155750
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 663155753}
- 222: {fileID: 663155752}
- 114: {fileID: 663155751}
m_Layer: 5
m_Name: MaskBot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &663155751
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 663155750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: c22c190fd4877414fa5e862acdae3e64, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &663155752
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 663155750}
--- !u!224 &663155753
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 663155750}
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: 122634401}
m_RootOrder: 1
m_AnchorMin: {x: .566316545, y: 0}
m_AnchorMax: {x: 1, y: .224000007}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: .5, y: .5}
--- !u!1 &664856230 --- !u!1 &664856230
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -638,6 +515,86 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 667257315} m_GameObject: {fileID: 667257315}
--- !u!1 &696279976
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 193382, guid: 5c94559626c169f47a446ce0517b8aec, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 696279977}
- 222: {fileID: 696279980}
- 114: {fileID: 696279979}
- 114: {fileID: 696279978}
m_Layer: 5
m_Name: Trending
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &696279977
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22487128, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 696279976}
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:
- {fileID: 1524397944}
- {fileID: 1673234286}
m_Father: {fileID: 122634401}
m_RootOrder: 2
m_AnchorMin: {x: 0, y: .200000003}
m_AnchorMax: {x: 1, y: .349999994}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: .5, y: .5}
--- !u!114 &696279978
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11471198, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 696279976}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: be7de77740d97f047b5dfd8057fb8219, type: 3}
m_Name:
m_EditorClassIdentifier:
CollectedSouls: {fileID: 1673234287}
--- !u!114 &696279979
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11457732, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 696279976}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: .847058833, g: .874509811, b: .917647064, a: 1}
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &696279980
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22264272, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 696279976}
--- !u!1 &724929355 --- !u!1 &724929355
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -931,67 +888,6 @@ MonoBehaviour:
panel: {fileID: 1810646880} panel: {fileID: 1810646880}
tutorialText: {fileID: 540952210} tutorialText: {fileID: 540952210}
btnNext: {fileID: 667257317} btnNext: {fileID: 667257317}
--- !u!1 &836354993
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 836354994}
- 222: {fileID: 836354996}
- 114: {fileID: 836354995}
m_Layer: 5
m_Name: MaskTop
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &836354994
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 836354993}
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: 122634401}
m_RootOrder: 0
m_AnchorMin: {x: 0, y: .367000014}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -1.90734863e-06}
m_SizeDelta: {x: 0, y: -3.81469727e-06}
m_Pivot: {x: .5, y: .5}
--- !u!114 &836354995
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 836354993}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: c22c190fd4877414fa5e862acdae3e64, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &836354996
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 836354993}
--- !u!1 &906703073 --- !u!1 &906703073
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1023,8 +919,8 @@ RectTransform:
- {fileID: 1197925314} - {fileID: 1197925314}
m_Father: {fileID: 122634401} m_Father: {fileID: 122634401}
m_RootOrder: 4 m_RootOrder: 4
m_AnchorMin: {x: 0, y: .200000003} m_AnchorMin: {x: 0, y: .349999994}
m_AnchorMax: {x: 1, y: .550000012} m_AnchorMax: {x: 1, y: .699999988}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: .5, y: .5} m_Pivot: {x: .5, y: .5}
@ -1055,6 +951,70 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 906703073} m_GameObject: {fileID: 906703073}
--- !u!1 &1005505258
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 166550, guid: 5c94559626c169f47a446ce0517b8aec, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 1005505259}
- 222: {fileID: 1005505261}
- 114: {fileID: 1005505260}
m_Layer: 5
m_Name: MaskBot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1005505259
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22419770, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1005505258}
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: 122634401}
m_RootOrder: 1
m_AnchorMin: {x: .570802867, y: 0}
m_AnchorMax: {x: 1, y: .367000014}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: .5, y: .5}
--- !u!114 &1005505260
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11467088, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1005505258}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: c22c190fd4877414fa5e862acdae3e64, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &1005505261
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22260938, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1005505258}
--- !u!1 &1051568342 --- !u!1 &1051568342
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1385,6 +1345,38 @@ Prefab:
propertyPath: m_Size propertyPath: m_Size
value: .999999881 value: .999999881
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_AnchorMax.x
value: .400000006
objectReference: {fileID: 0}
- target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_AnchorMin.x
value: .462000012
objectReference: {fileID: 0}
- target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_SizeDelta.x
value: -7.62939453e-06
objectReference: {fileID: 0}
- target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2} m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
@ -1477,16 +1469,85 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1360955015} m_GameObject: {fileID: 1360955015}
--- !u!1 &1366676552 --- !u!224 &1447041875 stripped
RectTransform:
m_PrefabParentObject: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558,
type: 2}
m_PrefabInternal: {fileID: 1787461927}
--- !u!1 &1459567389
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 169758, guid: 5c94559626c169f47a446ce0517b8aec, type: 2}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
serializedVersion: 4 serializedVersion: 4
m_Component: m_Component:
- 224: {fileID: 1366676553} - 224: {fileID: 1459567390}
- 222: {fileID: 1366676555} - 222: {fileID: 1459567392}
- 114: {fileID: 1366676554} - 114: {fileID: 1459567391}
m_Layer: 5
m_Name: MaskTop
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1459567390
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22409870, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1459567389}
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: 122634401}
m_RootOrder: 0
m_AnchorMin: {x: 0, y: .521000028}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: .5, y: .5}
--- !u!114 &1459567391
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11484824, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1459567389}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: c22c190fd4877414fa5e862acdae3e64, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &1459567392
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22210494, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1459567389}
--- !u!1 &1524397943
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 139340, guid: 5c94559626c169f47a446ce0517b8aec, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 1524397944}
- 222: {fileID: 1524397946}
- 114: {fileID: 1524397945}
m_Layer: 5 m_Layer: 5
m_Name: Title m_Name: Title
m_TagString: Untagged m_TagString: Untagged
@ -1494,29 +1555,31 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &1366676553 --- !u!224 &1524397944
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 22443456, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1366676552} m_GameObject: {fileID: 1524397943}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 350457696} m_Father: {fileID: 696279977}
m_RootOrder: 0 m_RootOrder: 0
m_AnchorMin: {x: 0, y: .600000024} m_AnchorMin: {x: 0, y: .600000024}
m_AnchorMax: {x: 1, y: .899999976} m_AnchorMax: {x: 1, y: .899999976}
m_AnchoredPosition: {x: -1.21593475e-05, y: 0} m_AnchoredPosition: {x: -1.21593475e-05, y: 0}
m_SizeDelta: {x: -3.05180001e-05, y: 0} m_SizeDelta: {x: -3.05180001e-05, y: 0}
m_Pivot: {x: .5, y: .5} m_Pivot: {x: .5, y: .5}
--- !u!114 &1366676554 --- !u!114 &1524397945
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 11412478, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1366676552} m_GameObject: {fileID: 1524397943}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
@ -1536,18 +1599,14 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Trending m_Text: Collected Souls
--- !u!222 &1366676555 --- !u!222 &1524397946
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 22225516, guid: 5c94559626c169f47a446ce0517b8aec,
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1366676552}
--- !u!224 &1447041875 stripped
RectTransform:
m_PrefabParentObject: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558,
type: 2} type: 2}
m_PrefabInternal: {fileID: 1787461927} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1524397943}
--- !u!1 &1590742288 --- !u!1 &1590742288
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1614,6 +1673,75 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1590742288} m_GameObject: {fileID: 1590742288}
--- !u!1 &1673234285
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 160936, guid: 5c94559626c169f47a446ce0517b8aec, type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 224: {fileID: 1673234286}
- 222: {fileID: 1673234288}
- 114: {fileID: 1673234287}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1673234286
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22469192, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1673234285}
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: 696279977}
m_RootOrder: 1
m_AnchorMin: {x: .280000001, y: .110115722}
m_AnchorMax: {x: .720000029, y: .5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: .5, y: .5}
--- !u!114 &1673234287
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11423224, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1673234285}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!222 &1673234288
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 22218044, guid: 5c94559626c169f47a446ce0517b8aec,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1673234285}
--- !u!1001 &1787461927 --- !u!1001 &1787461927
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -46,8 +46,8 @@ namespace DeathBook.Model
} }
} }
private static Level level; private Level level;
private static Level GameLevel private Level GameLevel
{ {
get get
{ {

View File

@ -15,6 +15,7 @@ public class TutorialScript : MonoBehaviour {
{ {
lvl = LevelManager.Instance.GameLevel; lvl = LevelManager.Instance.GameLevel;
lvl.tutorialInt = 0; lvl.tutorialInt = 0;
Time.timeScale = 0;
} }
void Update() void Update()
@ -23,7 +24,6 @@ public class TutorialScript : MonoBehaviour {
if (lvl.tutorialInt == 0) if (lvl.tutorialInt == 0)
{ {
Time.timeScale = 0;
lvl.allowNext = true; lvl.allowNext = true;
tutorialText.text = "The Slaugthr servers are full!\nMark Zuckerberg hired you, Death, to kill off a few of his annoying users.\n\nCareful, or you might scare the rest away from Mark's website..."; tutorialText.text = "The Slaugthr servers are full!\nMark Zuckerberg hired you, Death, to kill off a few of his annoying users.\n\nCareful, or you might scare the rest away from Mark's website...";
} }
@ -53,7 +53,6 @@ public class TutorialScript : MonoBehaviour {
tutorialText.text = "Finally, notice the big \"Global Awareness\" bar at the bottom right corner of the screen. When it reaches 100%, it means you have been noticed and you lose!"; tutorialText.text = "Finally, notice the big \"Global Awareness\" bar at the bottom right corner of the screen. When it reaches 100%, it means you have been noticed and you lose!";
tutorialText.text += "\n\nHit next to start playing."; tutorialText.text += "\n\nHit next to start playing.";
lvl.allowNext = true; lvl.allowNext = true;
Time.timeScale = 0f;
} }
else else
{ {
@ -65,18 +64,26 @@ public class TutorialScript : MonoBehaviour {
public void btnClick() public void btnClick()
{ {
if (lvl.tutorialInt == 0) if (lvl.tutorialInt == 5)
{ {
Time.timeScale = 1; Time.timeScale = 0f;
} }
if (lvl.tutorialInt == 6) if (lvl.tutorialInt == 6)
{ {
Application.LoadLevel("Gameplay");
Time.timeScale = 1; Time.timeScale = 1;
lvl.tutorialInt = -1;
Application.LoadLevel("Gameplay");
return;
} }
lvl.tutorialInt++; lvl.tutorialInt++;
if (lvl.tutorialInt == 1)
{
Time.timeScale = 1;
}
lvl.allowNext = false; lvl.allowNext = false;
} }