Skip to content

Commit

Permalink
buncha stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
NoahRobichaux committed Sep 6, 2023
1 parent fa214b1 commit a980c81
Show file tree
Hide file tree
Showing 12 changed files with 243 additions and 272 deletions.
156 changes: 10 additions & 146 deletions Assets/Scenes/LevelOne.unity

Large diffs are not rendered by default.

142 changes: 139 additions & 3 deletions Assets/Scenes/MainMenu.unity
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,6 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 4
m_TargetDisplay: 0
Expand All @@ -668,6 +667,7 @@ RectTransform:
- {fileID: 1904928767}
- {fileID: 1340904841}
- {fileID: 1022226905}
- {fileID: 2058100908}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -706,6 +706,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
Expand Down Expand Up @@ -908,7 +909,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 157804079}
m_RootOrder: -1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &1098774812
AudioSource:
Expand Down Expand Up @@ -1571,7 +1572,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 157804079}
m_RootOrder: -1
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &1765236569
AudioSource:
Expand Down Expand Up @@ -1912,6 +1913,141 @@ MonoBehaviour:
m_Handle: 0
LevelSelect:
m_Handle: 0
--- !u!1 &2058100907
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2058100908}
- component: {fileID: 2058100910}
- component: {fileID: 2058100909}
m_Layer: 5
m_Name: VersionText
m_TagString: HighScoreText
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2058100908
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2058100907}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 761381574}
m_RootOrder: 5
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: 800, y: -450}
m_SizeDelta: {x: 350, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2058100909
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2058100907}
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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Version 0.2.5
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: e433cb4ee06651647b232147f4445073, type: 2}
m_sharedMaterial: {fileID: 6759744680345126366, guid: e433cb4ee06651647b232147f4445073, 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: 0
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: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
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_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &2058100910
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2058100907}
m_CullTransparentMesh: 1
--- !u!1 &2111459642
GameObject:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scripts/GameManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ void Update()
startText.SetActive(true);
isPlayerDead = false;
}
if (isPlayerDead && lives == 2)
else if (isPlayerDead && lives == 2)
{
lives = 1;
livesText.SetText("Lives: 1");
lostLifeObject.SetActive(true);
startText.SetActive(true);
isPlayerDead = false;
}
if (isPlayerDead && lives == 1)
else if (isPlayerDead && lives == 1)
{
livesText.SetText("Lives: 0");
lives = 0;
Expand Down
Binary file not shown.
14 changes: 6 additions & 8 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
{
"dependencies": {
"com.unity.2d.animation": "9.0.1",
"com.unity.2d.pixel-perfect": "5.0.3",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "9.0.1",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.adaptiveperformance.samsung.android": "4.0.1",
"com.unity.adaptiveperformance.samsung.android": "5.0.0",
"com.unity.ai.navigation": "1.1.1",
"com.unity.analytics": "3.8.1",
"com.unity.collab-proxy": "1.17.7",
"com.unity.device-simulator.devices": "1.0.0",
"com.unity.feature.2d": "1.0.0",
"com.unity.feature.mobile": "1.0.0",
"com.unity.ide.rider": "3.0.16",
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.rider": "3.0.24",
"com.unity.ide.visualstudio": "2.0.20",
"com.unity.ide.vscode": "1.2.5",
"com.unity.purchasing": "4.5.1",
"com.unity.purchasing": "4.9.4",
"com.unity.remote-config": "3.2.2",
"com.unity.render-pipelines.universal": "14.0.4",
"com.unity.render-pipelines.universal": "12.1.7",
"com.unity.services.mediation": "1.0.5",
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.2",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.3",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6",
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.7.8",
"com.unity.xr.legacyinputhelpers": "2.1.10",
Expand Down
Loading

0 comments on commit a980c81

Please sign in to comment.