Browse Source

Merge branch 'jeff' into main

# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
main
Jeff 2 years ago
parent
commit
e8239d1edd
10 changed files with 63 additions and 2 deletions
  1. BIN
      Assets/Scenes/Credits.unity
  2. +7
    -0
      Assets/Scenes/Credits.unity.meta
  3. BIN
      Assets/Scenes/Main Menu.unity
  4. +7
    -0
      Assets/Scenes/Main Menu.unity.meta
  5. BIN
      Assets/Scenes/PlatformTest.unity
  6. +7
    -0
      Assets/Scenes/PlatformTest.unity.meta
  7. +8
    -0
      Assets/Scripts/UI.meta
  8. +12
    -0
      Assets/Scripts/UI/MenuController.cs
  9. +11
    -0
      Assets/Scripts/UI/MenuController.cs.meta
  10. BIN
      ProjectSettings/EditorBuildSettings.asset

BIN
Assets/Scenes/Credits.unity (Stored with Git LFS) View File

size 43503

+ 7
- 0
Assets/Scenes/Credits.unity.meta View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3a428a0a932fd344bbd39fadc0044b55
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/Main Menu.unity (Stored with Git LFS) View File

size 43905

+ 7
- 0
Assets/Scenes/Main Menu.unity.meta View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a8031f28a3a4d3f489443a65b88ad5f3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/PlatformTest.unity (Stored with Git LFS) View File

size 441491

+ 7
- 0
Assets/Scenes/PlatformTest.unity.meta View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f399ab73a357cbc4c996a840935ce440
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 8
- 0
Assets/Scripts/UI.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 97e02867f2639f844900dff68e815e49
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 12
- 0
Assets/Scripts/UI/MenuController.cs View File

@ -0,0 +1,12 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class MenuController : MonoBehaviour
{
public void LoadLevel(string value)
{
SceneManager.LoadScene(value);
}
}

+ 11
- 0
Assets/Scripts/UI/MenuController.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 057b5d983b62a5b4a99e8b9db5306cf8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

BIN
ProjectSettings/EditorBuildSettings.asset (Stored with Git LFS) View File

size 516

Loading…
Cancel
Save