Skip to content
Snippets Groups Projects
Commit cdfa78d1 authored by Arno Alexander's avatar Arno Alexander :alien:
Browse files

Merge branch 'menu' into 'master'

Menu

See merge request !2
parents 7029332c 7f266b76
1 merge request!2Menu
fileFormatVersion: 2
guid: 06572dce90599984eabd20f6046c2588
folderAsset: yes
timeCreated: 1509100588
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Images/background_earthquake_manager.jpg

73.3 KiB

fileFormatVersion: 2
guid: 7ec5ae3c8b958e549985af02506ae444
timeCreated: 1509100637
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Images/ic_launcher.png

10.8 KiB

fileFormatVersion: 2
guid: 790b8e5ff1dca464c9b2d0d9774e254b
timeCreated: 1509108129
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 8084a59538ebe5c4ea8e2d6b6ab89b08
timeCreated: 1509100561
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -18,7 +18,6 @@ public class FirstPersonCamera : MonoBehaviour {
//MOVE CAMERA
verticalMouse = -Input.GetAxis ("Mouse Y") * mouseSensitivity;
float nextXAngle = transform.eulerAngles [0] + verticalMouse;
print (nextXAngle);
if (nextXAngle >= minAngle || nextXAngle <= maxAngle) {
transform.Rotate (verticalMouse, 0, 0);
}
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class MainMenu : MonoBehaviour {
public GameObject mainMenu;
public GameObject levelMenu;
public GameObject setting;
public InputField nameForm;
public InputField latitudeForm;
public InputField longitudeForm;
public InputField magnitudeForm;
public const string PLAYER_NAME = "PLAYER_NAME";
public const string PLAYER_LATITUDE = "PLAYER_LATITUDE";
public const string PLAYER_LONGITUDE = "PLAYER_LONGITUDE";
public const string PLAYER_MAGNITUDE = "PLAYER_MAGNITUDE";
/*LOAD SCENE*/
public void loadLevel (string levelName) {
SceneManager.LoadScene(levelName);
}
/*SELECT DISPLAYED MENU*/
public void showLevelMenu() {
mainMenu.gameObject.SetActive (false);
levelMenu.gameObject.SetActive (true);
setting.gameObject.SetActive (false);
}
public void showMainMenu() {
mainMenu.gameObject.SetActive (true);
levelMenu.gameObject.SetActive (false);
setting.gameObject.SetActive (false);
}
public void showSetting() {
mainMenu.gameObject.SetActive (false);
levelMenu.gameObject.SetActive (false);
setting.gameObject.SetActive (true);
loadPref ();
}
/*PLAYER PREFS*/
public void savePlayerName (string name) {
PlayerPrefs.SetString (PLAYER_NAME, name);
}
public void savePlayerLatitude (float latitude) {
PlayerPrefs.SetFloat (PLAYER_LATITUDE, latitude);
}
public void savePlayerLongitude (float longitude) {
PlayerPrefs.SetFloat (PLAYER_LONGITUDE, longitude);
}
public void savePlayerMagnitude (float magnitude) {
PlayerPrefs.SetFloat (PLAYER_MAGNITUDE, magnitude);
}
/*PLAYER PREF*/
public void savePref () {
float value;
PlayerPrefs.SetString(PLAYER_NAME, nameForm.text);
float.TryParse(latitudeForm.text, out value);
PlayerPrefs.SetFloat(PLAYER_LATITUDE, value);
float.TryParse(longitudeForm.text, out value);
PlayerPrefs.SetFloat(PLAYER_LONGITUDE, value);
float.TryParse(magnitudeForm.text, out value);
PlayerPrefs.SetFloat(PLAYER_MAGNITUDE, value);
PlayerPrefs.Save();
}
public void loadPref () {
if (PlayerPrefs.HasKey (PLAYER_NAME)) {
nameForm.text = PlayerPrefs.GetString (PLAYER_NAME);
} else {
nameForm.text = "";
}
if (PlayerPrefs.HasKey (PLAYER_LATITUDE)) {
latitudeForm.text = PlayerPrefs.GetFloat (PLAYER_LATITUDE).ToString();
} else {
latitudeForm.text = "";
}
if (PlayerPrefs.HasKey (PLAYER_LONGITUDE)) {
longitudeForm.text = PlayerPrefs.GetFloat (PLAYER_LONGITUDE).ToString();
} else {
longitudeForm.text = "";
}
if (PlayerPrefs.HasKey (PLAYER_MAGNITUDE)) {
magnitudeForm.text = PlayerPrefs.GetFloat (PLAYER_MAGNITUDE).ToString();
} else {
magnitudeForm.text = "";
}
}
/*QUIT*/
public void quitGame() {
Application.Quit ();
}
/*MAIN*/
void Update() {
if (Input.GetKeyDown ("escape")) {
showMainMenu ();
}
}
}
fileFormatVersion: 2
guid: 4b8ad58f9291cc34780982afe2971fa5
timeCreated: 1509106560
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -4,4 +4,10 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
m_Scenes:
- enabled: 1
path: Assets/Scene/main_menu.unity
guid: 8084a59538ebe5c4ea8e2d6b6ab89b08
- enabled: 1
path: Assets/Scene/firstperson.unity
guid: 47f15893f2a21524f9ce10c61a3693bc
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment