Added a few missing UI to help game modes feel more complete and fixed a few game mode bugs
This commit is contained in:
Gregory Campbell
@@ -1175,6 +1175,10 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
pauseMenuUI: {fileID: 525105854}
|
pauseMenuUI: {fileID: 525105854}
|
||||||
|
gameOverUI: {fileID: 0}
|
||||||
|
ScoreText: {fileID: 1455233009}
|
||||||
|
TimeText: {fileID: 0}
|
||||||
|
LivesText: {fileID: 1368792133}
|
||||||
--- !u!114 &989087329
|
--- !u!114 &989087329
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1247,6 +1251,8 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 525105858}
|
- {fileID: 525105858}
|
||||||
|
- {fileID: 1455233011}
|
||||||
|
- {fileID: 1368792132}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@@ -1597,6 +1603,318 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1358753754}
|
m_GameObject: {fileID: 1358753754}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!1 &1368792131
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1368792132}
|
||||||
|
- component: {fileID: 1368792134}
|
||||||
|
- component: {fileID: 1368792133}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: LivesText
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1368792132
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1368792131}
|
||||||
|
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: 989087332}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 372, y: 241}
|
||||||
|
m_SizeDelta: {x: 200, y: 50}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1368792133
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1368792131}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_text:
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 2164040, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_enableVertexGradient: 1
|
||||||
|
m_colorMode: 3
|
||||||
|
m_fontColorGradient:
|
||||||
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_fontColorGradientPreset: {fileID: 11400000, guid: de18700ae6836544d88ed0e4f3576ea0,
|
||||||
|
type: 2}
|
||||||
|
m_spriteAsset: {fileID: 0}
|
||||||
|
m_tintAllSprites: 0
|
||||||
|
m_overrideHtmlColors: 0
|
||||||
|
m_faceColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_outlineColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4278190080
|
||||||
|
m_fontSize: 36
|
||||||
|
m_fontSizeBase: 36
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
m_fontSizeMin: 18
|
||||||
|
m_fontSizeMax: 72
|
||||||
|
m_fontStyle: 1
|
||||||
|
m_textAlignment: 514
|
||||||
|
m_characterSpacing: 0
|
||||||
|
m_wordSpacing: 0
|
||||||
|
m_lineSpacing: 0
|
||||||
|
m_lineSpacingMax: 0
|
||||||
|
m_paragraphSpacing: 0
|
||||||
|
m_charWidthMaxAdj: 0
|
||||||
|
m_enableWordWrapping: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_firstOverflowCharacterIndex: -1
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
m_isLinkedTextComponent: 0
|
||||||
|
m_isTextTruncated: 0
|
||||||
|
m_enableKerning: 1
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_parseCtrlCharacters: 1
|
||||||
|
m_isOrthographic: 1
|
||||||
|
m_isCullingEnabled: 0
|
||||||
|
m_ignoreRectMaskCulling: 0
|
||||||
|
m_ignoreCulling: 1
|
||||||
|
m_horizontalMapping: 0
|
||||||
|
m_verticalMapping: 0
|
||||||
|
m_uvLineOffset: 0
|
||||||
|
m_geometrySortingOrder: 0
|
||||||
|
m_VertexBufferAutoSizeReduction: 1
|
||||||
|
m_firstVisibleCharacter: 0
|
||||||
|
m_useMaxVisibleDescender: 1
|
||||||
|
m_pageToDisplay: 1
|
||||||
|
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_textInfo:
|
||||||
|
textComponent: {fileID: 1368792133}
|
||||||
|
characterCount: 0
|
||||||
|
spriteCount: 0
|
||||||
|
spaceCount: 0
|
||||||
|
wordCount: 0
|
||||||
|
linkCount: 0
|
||||||
|
lineCount: 0
|
||||||
|
pageCount: 0
|
||||||
|
materialCount: 1
|
||||||
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
|
m_isVolumetricText: 0
|
||||||
|
m_spriteAnimator: {fileID: 0}
|
||||||
|
m_hasFontAssetChanged: 0
|
||||||
|
m_subTextObjects:
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
m_baseMaterial: {fileID: 0}
|
||||||
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
--- !u!222 &1368792134
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1368792131}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!1 &1455233008
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1455233011}
|
||||||
|
- component: {fileID: 1455233010}
|
||||||
|
- component: {fileID: 1455233009}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: LevelText
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &1455233009
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1455233008}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_text:
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 2164040, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_enableVertexGradient: 1
|
||||||
|
m_colorMode: 3
|
||||||
|
m_fontColorGradient:
|
||||||
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_fontColorGradientPreset: {fileID: 11400000, guid: de18700ae6836544d88ed0e4f3576ea0,
|
||||||
|
type: 2}
|
||||||
|
m_spriteAsset: {fileID: 0}
|
||||||
|
m_tintAllSprites: 0
|
||||||
|
m_overrideHtmlColors: 0
|
||||||
|
m_faceColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_outlineColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4278190080
|
||||||
|
m_fontSize: 36
|
||||||
|
m_fontSizeBase: 36
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
m_fontSizeMin: 18
|
||||||
|
m_fontSizeMax: 72
|
||||||
|
m_fontStyle: 1
|
||||||
|
m_textAlignment: 514
|
||||||
|
m_characterSpacing: 0
|
||||||
|
m_wordSpacing: 0
|
||||||
|
m_lineSpacing: 0
|
||||||
|
m_lineSpacingMax: 0
|
||||||
|
m_paragraphSpacing: 0
|
||||||
|
m_charWidthMaxAdj: 0
|
||||||
|
m_enableWordWrapping: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_firstOverflowCharacterIndex: -1
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
m_isLinkedTextComponent: 0
|
||||||
|
m_isTextTruncated: 0
|
||||||
|
m_enableKerning: 1
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_parseCtrlCharacters: 1
|
||||||
|
m_isOrthographic: 1
|
||||||
|
m_isCullingEnabled: 0
|
||||||
|
m_ignoreRectMaskCulling: 0
|
||||||
|
m_ignoreCulling: 1
|
||||||
|
m_horizontalMapping: 0
|
||||||
|
m_verticalMapping: 0
|
||||||
|
m_uvLineOffset: 0
|
||||||
|
m_geometrySortingOrder: 0
|
||||||
|
m_VertexBufferAutoSizeReduction: 1
|
||||||
|
m_firstVisibleCharacter: 0
|
||||||
|
m_useMaxVisibleDescender: 1
|
||||||
|
m_pageToDisplay: 1
|
||||||
|
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_textInfo:
|
||||||
|
textComponent: {fileID: 1455233009}
|
||||||
|
characterCount: 0
|
||||||
|
spriteCount: 0
|
||||||
|
spaceCount: 0
|
||||||
|
wordCount: 0
|
||||||
|
linkCount: 0
|
||||||
|
lineCount: 0
|
||||||
|
pageCount: 0
|
||||||
|
materialCount: 1
|
||||||
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
|
m_isVolumetricText: 0
|
||||||
|
m_spriteAnimator: {fileID: 0}
|
||||||
|
m_hasFontAssetChanged: 0
|
||||||
|
m_subTextObjects:
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
m_baseMaterial: {fileID: 0}
|
||||||
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
--- !u!222 &1455233010
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1455233008}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!224 &1455233011
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1455233008}
|
||||||
|
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: 989087332}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: -372, y: 241}
|
||||||
|
m_SizeDelta: {x: 200, y: 50}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &1573414419
|
--- !u!1 &1573414419
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2116,8 +2434,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 7e52a505534642144b4f939196badbab, type: 3}
|
m_Script: {fileID: 11500000, guid: 7e52a505534642144b4f939196badbab, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
escalation: 0
|
|
||||||
level: 1
|
|
||||||
player: {fileID: 1644583839}
|
player: {fileID: 1644583839}
|
||||||
script: {fileID: 1644583840}
|
script: {fileID: 1644583840}
|
||||||
obstacleList:
|
obstacleList:
|
||||||
|
|||||||
@@ -578,6 +578,162 @@ Transform:
|
|||||||
m_Father: {fileID: 1759649041}
|
m_Father: {fileID: 1759649041}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &428865309
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 428865312}
|
||||||
|
- component: {fileID: 428865311}
|
||||||
|
- component: {fileID: 428865310}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: LevelText
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &428865310
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 428865309}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_text:
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 2164040, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_enableVertexGradient: 1
|
||||||
|
m_colorMode: 3
|
||||||
|
m_fontColorGradient:
|
||||||
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_fontColorGradientPreset: {fileID: 11400000, guid: de18700ae6836544d88ed0e4f3576ea0,
|
||||||
|
type: 2}
|
||||||
|
m_spriteAsset: {fileID: 0}
|
||||||
|
m_tintAllSprites: 0
|
||||||
|
m_overrideHtmlColors: 0
|
||||||
|
m_faceColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_outlineColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4278190080
|
||||||
|
m_fontSize: 36
|
||||||
|
m_fontSizeBase: 36
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
m_fontSizeMin: 18
|
||||||
|
m_fontSizeMax: 72
|
||||||
|
m_fontStyle: 1
|
||||||
|
m_textAlignment: 514
|
||||||
|
m_characterSpacing: 0
|
||||||
|
m_wordSpacing: 0
|
||||||
|
m_lineSpacing: 0
|
||||||
|
m_lineSpacingMax: 0
|
||||||
|
m_paragraphSpacing: 0
|
||||||
|
m_charWidthMaxAdj: 0
|
||||||
|
m_enableWordWrapping: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_firstOverflowCharacterIndex: -1
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
m_isLinkedTextComponent: 0
|
||||||
|
m_isTextTruncated: 0
|
||||||
|
m_enableKerning: 1
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_parseCtrlCharacters: 1
|
||||||
|
m_isOrthographic: 1
|
||||||
|
m_isCullingEnabled: 0
|
||||||
|
m_ignoreRectMaskCulling: 0
|
||||||
|
m_ignoreCulling: 1
|
||||||
|
m_horizontalMapping: 0
|
||||||
|
m_verticalMapping: 0
|
||||||
|
m_uvLineOffset: 0
|
||||||
|
m_geometrySortingOrder: 0
|
||||||
|
m_VertexBufferAutoSizeReduction: 1
|
||||||
|
m_firstVisibleCharacter: 0
|
||||||
|
m_useMaxVisibleDescender: 1
|
||||||
|
m_pageToDisplay: 1
|
||||||
|
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_textInfo:
|
||||||
|
textComponent: {fileID: 428865310}
|
||||||
|
characterCount: 0
|
||||||
|
spriteCount: 0
|
||||||
|
spaceCount: 0
|
||||||
|
wordCount: 0
|
||||||
|
linkCount: 0
|
||||||
|
lineCount: 0
|
||||||
|
pageCount: 0
|
||||||
|
materialCount: 1
|
||||||
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
|
m_isVolumetricText: 0
|
||||||
|
m_spriteAnimator: {fileID: 0}
|
||||||
|
m_hasFontAssetChanged: 0
|
||||||
|
m_subTextObjects:
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
m_baseMaterial: {fileID: 0}
|
||||||
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
--- !u!222 &428865311
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 428865309}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!224 &428865312
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 428865309}
|
||||||
|
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: 963355974}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: -372, y: 241}
|
||||||
|
m_SizeDelta: {x: 200, y: 50}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &488143136
|
--- !u!1 &488143136
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -863,6 +1019,10 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
pauseMenuUI: {fileID: 1579256708}
|
pauseMenuUI: {fileID: 1579256708}
|
||||||
|
gameOverUI: {fileID: 0}
|
||||||
|
ScoreText: {fileID: 428865310}
|
||||||
|
TimeText: {fileID: 1037071376}
|
||||||
|
LivesText: {fileID: 0}
|
||||||
--- !u!114 &963355971
|
--- !u!114 &963355971
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -935,6 +1095,8 @@ RectTransform:
|
|||||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1579256712}
|
- {fileID: 1579256712}
|
||||||
|
- {fileID: 428865312}
|
||||||
|
- {fileID: 1037071378}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
@@ -943,6 +1105,162 @@ 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: 0, y: 0}
|
m_Pivot: {x: 0, y: 0}
|
||||||
|
--- !u!1 &1037071375
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1037071378}
|
||||||
|
- component: {fileID: 1037071377}
|
||||||
|
- component: {fileID: 1037071376}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: TimeText
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &1037071376
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1037071375}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_text:
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 2164040, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_enableVertexGradient: 1
|
||||||
|
m_colorMode: 3
|
||||||
|
m_fontColorGradient:
|
||||||
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_fontColorGradientPreset: {fileID: 11400000, guid: de18700ae6836544d88ed0e4f3576ea0,
|
||||||
|
type: 2}
|
||||||
|
m_spriteAsset: {fileID: 0}
|
||||||
|
m_tintAllSprites: 0
|
||||||
|
m_overrideHtmlColors: 0
|
||||||
|
m_faceColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_outlineColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4278190080
|
||||||
|
m_fontSize: 36
|
||||||
|
m_fontSizeBase: 36
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
m_fontSizeMin: 18
|
||||||
|
m_fontSizeMax: 72
|
||||||
|
m_fontStyle: 1
|
||||||
|
m_textAlignment: 514
|
||||||
|
m_characterSpacing: 0
|
||||||
|
m_wordSpacing: 0
|
||||||
|
m_lineSpacing: 0
|
||||||
|
m_lineSpacingMax: 0
|
||||||
|
m_paragraphSpacing: 0
|
||||||
|
m_charWidthMaxAdj: 0
|
||||||
|
m_enableWordWrapping: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_firstOverflowCharacterIndex: -1
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
m_isLinkedTextComponent: 0
|
||||||
|
m_isTextTruncated: 0
|
||||||
|
m_enableKerning: 1
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_parseCtrlCharacters: 1
|
||||||
|
m_isOrthographic: 1
|
||||||
|
m_isCullingEnabled: 0
|
||||||
|
m_ignoreRectMaskCulling: 0
|
||||||
|
m_ignoreCulling: 1
|
||||||
|
m_horizontalMapping: 0
|
||||||
|
m_verticalMapping: 0
|
||||||
|
m_uvLineOffset: 0
|
||||||
|
m_geometrySortingOrder: 0
|
||||||
|
m_VertexBufferAutoSizeReduction: 1
|
||||||
|
m_firstVisibleCharacter: 0
|
||||||
|
m_useMaxVisibleDescender: 1
|
||||||
|
m_pageToDisplay: 1
|
||||||
|
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_textInfo:
|
||||||
|
textComponent: {fileID: 1037071376}
|
||||||
|
characterCount: 0
|
||||||
|
spriteCount: 0
|
||||||
|
spaceCount: 0
|
||||||
|
wordCount: 0
|
||||||
|
linkCount: 0
|
||||||
|
lineCount: 0
|
||||||
|
pageCount: 0
|
||||||
|
materialCount: 1
|
||||||
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
|
m_isVolumetricText: 0
|
||||||
|
m_spriteAnimator: {fileID: 0}
|
||||||
|
m_hasFontAssetChanged: 0
|
||||||
|
m_subTextObjects:
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
m_baseMaterial: {fileID: 0}
|
||||||
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
--- !u!222 &1037071377
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1037071375}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!224 &1037071378
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1037071375}
|
||||||
|
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: 963355974}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 170}
|
||||||
|
m_SizeDelta: {x: 278.8, y: 85.8}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &1040909057
|
--- !u!1 &1040909057
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1349,10 +1667,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 4737a90d1ccf9b44382a5f049c1c9f9a, type: 3}
|
m_Script: {fileID: 11500000, guid: 4737a90d1ccf9b44382a5f049c1c9f9a, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
size: 1
|
|
||||||
level: 1
|
|
||||||
completionTime: 120
|
|
||||||
countdown: 0
|
|
||||||
player: {fileID: 1759649035}
|
player: {fileID: 1759649035}
|
||||||
script: {fileID: 1759649036}
|
script: {fileID: 1759649036}
|
||||||
waypoint: {fileID: 4750942322508566266, guid: 9479e2f19497b4941bf652b3f538db27,
|
waypoint: {fileID: 4750942322508566266, guid: 9479e2f19497b4941bf652b3f538db27,
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ public class FloorLevel : MonoBehaviour
|
|||||||
fullTime = Time.time;
|
fullTime = Time.time;
|
||||||
gameOver = false;
|
gameOver = false;
|
||||||
script = player.GetComponent<PlayerController>();
|
script = player.GetComponent<PlayerController>();
|
||||||
|
level = 1;
|
||||||
escalation = 1;
|
escalation = 1;
|
||||||
script.lives = 3;
|
script.lives = 3;
|
||||||
script.finished = false;
|
script.finished = false;
|
||||||
@@ -47,7 +48,11 @@ public class FloorLevel : MonoBehaviour
|
|||||||
{
|
{
|
||||||
|
|
||||||
level++;
|
level++;
|
||||||
if(level > 3) escalation++;
|
if(level > 3)
|
||||||
|
{
|
||||||
|
escalation++;
|
||||||
|
level = 1;
|
||||||
|
}
|
||||||
respawn();
|
respawn();
|
||||||
levelBuild();
|
levelBuild();
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ public class PauseMenu : MonoBehaviour
|
|||||||
|
|
||||||
public TextMeshProUGUI ScoreText;
|
public TextMeshProUGUI ScoreText;
|
||||||
public TextMeshProUGUI TimeText;
|
public TextMeshProUGUI TimeText;
|
||||||
|
public TextMeshProUGUI LivesText;
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
@@ -26,6 +27,20 @@ public class PauseMenu : MonoBehaviour
|
|||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
if(SceneManager.GetActiveScene().name == "Floor Level")
|
||||||
|
{
|
||||||
|
ScoreText.text = "LEVEL: " + FloorLevel.escalation + "-" + FloorLevel.level;
|
||||||
|
LivesText.text = "LIVES: " + PlayerController.shownLives;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(SceneManager.GetActiveScene().name == "Waypoint Race")
|
||||||
|
{
|
||||||
|
|
||||||
|
ScoreText.text = "LEVEL: " + (WaypointRace.size - 1) + "-" + WaypointRace.level;
|
||||||
|
TimeText.text = "TIME: " + Mathf.Round((WaypointRace.countdown + WaypointRace.completionTime) - Time.time);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if(Input.GetButtonDown("Pause"))
|
if(Input.GetButtonDown("Pause"))
|
||||||
{
|
{
|
||||||
if(GameIsPaused)
|
if(GameIsPaused)
|
||||||
@@ -73,13 +88,13 @@ public class PauseMenu : MonoBehaviour
|
|||||||
if(FloorLevel.gameOver == true)
|
if(FloorLevel.gameOver == true)
|
||||||
{
|
{
|
||||||
ScoreText.text = "LEVEL: " + FloorLevel.escalation + "-" + FloorLevel.level;
|
ScoreText.text = "LEVEL: " + FloorLevel.escalation + "-" + FloorLevel.level;
|
||||||
TimeText.text = "TIME: " + FloorLevel.fullTime;
|
TimeText.text = "TIME: " + Mathf.Round(FloorLevel.fullTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(WaypointRace.gameOver == true)
|
if(WaypointRace.gameOver == true)
|
||||||
{
|
{
|
||||||
ScoreText.text = "LEVEL: " + WaypointRace.size + "-" + WaypointRace.level;
|
ScoreText.text = "LEVEL: " + (WaypointRace.size - 1) + "-" + WaypointRace.level;
|
||||||
TimeText.text = "TIME: " + WaypointRace.fullTime;
|
TimeText.text = "TIME: " + Mathf.Round(WaypointRace.fullTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
gameOverUI.SetActive(true);
|
gameOverUI.SetActive(true);
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ public class PlayerController : MonoBehaviour
|
|||||||
public bool finished = false;
|
public bool finished = false;
|
||||||
public bool respawn = false;
|
public bool respawn = false;
|
||||||
public int lives = 3;
|
public int lives = 3;
|
||||||
|
public static int shownLives = 3;
|
||||||
public float maxSpeed;
|
public float maxSpeed;
|
||||||
public float acceleration;
|
public float acceleration;
|
||||||
public float friction;
|
public float friction;
|
||||||
@@ -61,6 +62,8 @@ public class PlayerController : MonoBehaviour
|
|||||||
maxSpeedStore = maxSpeed;
|
maxSpeedStore = maxSpeed;
|
||||||
accelerationStore = acceleration;
|
accelerationStore = acceleration;
|
||||||
|
|
||||||
|
shownLives = 3;
|
||||||
|
|
||||||
Cursor.visible = !Cursor.visible;
|
Cursor.visible = !Cursor.visible;
|
||||||
Cursor.lockState = CursorLockMode.Locked;
|
Cursor.lockState = CursorLockMode.Locked;
|
||||||
}
|
}
|
||||||
@@ -121,6 +124,7 @@ public class PlayerController : MonoBehaviour
|
|||||||
|
|
||||||
respawn = true;
|
respawn = true;
|
||||||
respawnTime = Time.time;
|
respawnTime = Time.time;
|
||||||
|
shownLives--;
|
||||||
|
|
||||||
if (SceneManager.GetActiveScene().name == "Hub World")
|
if (SceneManager.GetActiveScene().name == "Hub World")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ public class WaypointRace : MonoBehaviour
|
|||||||
public static int size = 1;
|
public static int size = 1;
|
||||||
public static int level = 1;
|
public static int level = 1;
|
||||||
public static float fullTime;
|
public static float fullTime;
|
||||||
public int completionTime = 120;
|
public static int completionTime = 120;
|
||||||
public float countdown = 0;
|
public static float countdown = 0;
|
||||||
public GameObject player;
|
public GameObject player;
|
||||||
public PlayerController script;
|
public PlayerController script;
|
||||||
public GameObject waypoint;
|
public GameObject waypoint;
|
||||||
@@ -37,12 +37,14 @@ public class WaypointRace : MonoBehaviour
|
|||||||
gameOver = false;
|
gameOver = false;
|
||||||
script = player.GetComponent<PlayerController>();
|
script = player.GetComponent<PlayerController>();
|
||||||
size = 2;
|
size = 2;
|
||||||
|
level = 1;
|
||||||
script.finished = false;
|
script.finished = false;
|
||||||
respawn();
|
respawn();
|
||||||
script.pivot.transform.Rotate(0.0f, 225.0f, 0.0f, Space.Self);
|
script.pivot.transform.Rotate(0.0f, 225.0f, 0.0f, Space.Self);
|
||||||
levelBuild();
|
levelBuild();
|
||||||
waypointPlacement();
|
waypointPlacement();
|
||||||
countdown = Time.time;
|
countdown = Time.time;
|
||||||
|
completionTime = 60;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,12 +59,12 @@ public class WaypointRace : MonoBehaviour
|
|||||||
if(level > 3)
|
if(level > 3)
|
||||||
{
|
{
|
||||||
size++;
|
size++;
|
||||||
|
level = 1;
|
||||||
script.respawn = true;
|
script.respawn = true;
|
||||||
script.respawnTime = Time.time + 0.25f;
|
script.respawnTime = Time.time + 0.25f;
|
||||||
countdown = Time.time;
|
countdown = Time.time;
|
||||||
completionTime = 120 * size;
|
completionTime = 60 * (size - 1);
|
||||||
levelBuild();
|
levelBuild();
|
||||||
level = 1;
|
|
||||||
}
|
}
|
||||||
script.finished = false;
|
script.finished = false;
|
||||||
|
|
||||||
@@ -152,6 +154,12 @@ public class WaypointRace : MonoBehaviour
|
|||||||
|
|
||||||
groundedScript.transform.position = new Vector3(
|
groundedScript.transform.position = new Vector3(
|
||||||
Random.Range(-100*size, 100*size), Random.Range(2, 10), Random.Range(-100*size, 100*size));
|
Random.Range(-100*size, 100*size), Random.Range(2, 10), Random.Range(-100*size, 100*size));
|
||||||
|
|
||||||
|
if((groundedScript.transform.position.x < 100 && groundedScript.transform.position.x > -100)
|
||||||
|
|| (groundedScript.transform.position.z < 100 && groundedScript.transform.position.z > -100))
|
||||||
|
{
|
||||||
|
waypointPlacement();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+261
-53
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user