Commit 0cc8f8ae authored by Pinguin's avatar Pinguin
Browse files
parents 7e3b8152 6cbdf5f9
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Disolvinglick
m_Shader: {fileID: 4800000, guid: ffd47d42d0525a24da64b36a365b7531, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveTex:
m_Texture: {fileID: 2800000, guid: 38f75f5c96cf4734eaf03828d7d4aa29, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 4e862822f4ef689418b5df23423187cb, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DissolveAmount: 0
- _DissolveScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
fileFormatVersion: 2
guid: 872657ebfcd4f4f498a7ee11bd5519ad
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -11249,13 +11249,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 141199733}
m_LocalRotation: {x: 0.5063368, y: 0.50633687, z: 0.49358192, w: 0.4935819}
m_LocalPosition: {x: 0.5600004, y: 2.3838825, z: 1.9300003}
m_LocalRotation: {x: -0.00069001084, y: -0.71606785, z: -0.69803005, w: -0.00067328627}
m_LocalPosition: {x: 0.5600004, y: 2.4068, z: 1.9300003}
m_LocalScale: {x: 0.46526903, y: 0.4652691, z: 0.4652691}
m_Children: []
m_Father: {fileID: 1831127294}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -91.465996, y: 355.678, z: 184.323}
--- !u!23 &141199735
MeshRenderer:
m_ObjectHideFlags: 0
......@@ -13633,13 +13633,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220773980}
m_LocalRotation: {x: -0.49200445, y: 0.4951546, z: 0.50786966, w: -0.504799}
m_LocalRotation: {x: 0.0034607616, y: 0.6980218, z: 0.7160599, w: 0.0034364408}
m_LocalPosition: {x: 0.5600853, y: 2.364667, z: 1.9330711}
m_LocalScale: {x: 0.4, y: 0.40000004, z: 0.40000004}
m_Children: []
m_Father: {fileID: 310979616}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -91.564995, y: 200.926, z: -380.924}
--- !u!23 &220773982
MeshRenderer:
m_ObjectHideFlags: 0
......@@ -14603,6 +14603,7 @@ MonoBehaviour:
Link: 0
LoadScene: 0
sceneBuildIndex: 0
nonVR: 1
progressBar: {fileID: 0}
--- !u!114 &240082616
MonoBehaviour:
......@@ -44507,6 +44508,7 @@ MonoBehaviour:
Link: 1
LoadScene: 0
sceneBuildIndex: 0
nonVR: 1
progressBar: {fileID: 0}
--- !u!114 &470878014
MonoBehaviour:
......@@ -46985,6 +46987,7 @@ MonoBehaviour:
Link: 0
LoadScene: 0
sceneBuildIndex: 0
nonVR: 1
progressBar: {fileID: 0}
--- !u!114 &524011920
MonoBehaviour:
......@@ -59253,6 +59256,7 @@ MonoBehaviour:
Link: 0
LoadScene: 1
sceneBuildIndex: 3
nonVR: 1
progressBar: {fileID: 894342333}
--- !u!82 &677943430
AudioSource:
......@@ -65163,13 +65167,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 787155639}
m_LocalRotation: {x: -0.49200445, y: 0.4951546, z: 0.50786966, w: -0.504799}
m_LocalRotation: {x: -0.0015375956, y: 0.6980291, z: 0.71606576, w: -0.0016911482}
m_LocalPosition: {x: 0.5600853, y: 2.364667, z: 1.9330711}
m_LocalScale: {x: 0.4, y: 0.40000004, z: 0.40000004}
m_Children: []
m_Father: {fileID: 1831127294}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -88.51501, y: -10.143001, z: -169.845}
--- !u!23 &787155641
MeshRenderer:
m_ObjectHideFlags: 0
......@@ -84076,6 +84080,7 @@ MonoBehaviour:
Link: 0
LoadScene: 1
sceneBuildIndex: 1
nonVR: 1
progressBar: {fileID: 894342333}
--- !u!1001 &986566064
PrefabInstance:
......@@ -106014,9 +106019,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_MethodName: SetActive
m_Mode: 6
- m_Target: {fileID: 2077926518}
m_MethodName: StartVRScene
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
......@@ -111937,6 +111942,7 @@ MonoBehaviour:
Link: 1
LoadScene: 0
sceneBuildIndex: 0
nonVR: 1
progressBar: {fileID: 0}
--- !u!114 &1163591677
MonoBehaviour:
......@@ -115067,13 +115073,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1227562203}
m_LocalRotation: {x: 0.5063368, y: 0.50633687, z: 0.49358192, w: 0.4935819}
m_LocalPosition: {x: 0.5600004, y: 2.3838825, z: 1.9300003}
m_LocalRotation: {x: -0.7018313, y: -0.0012265347, z: 0.0012717099, w: 0.71234107}
m_LocalPosition: {x: 0.5600004, y: 2.415, z: 1.9300003}
m_LocalScale: {x: 0.46526903, y: 0.4652691, z: 0.4652691}
m_Children: []
m_Father: {fileID: 310979616}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 269.125, y: 166.63, z: 193.373}
--- !u!23 &1227562205
MeshRenderer:
m_ObjectHideFlags: 0
......@@ -149305,6 +149311,8 @@ MonoBehaviour:
vertSenseSlider: {fileID: 884153100}
checkMark: {fileID: 667360969}
tutCheckMark: {fileID: 0}
VRTut: 0
VRMode: 0
--- !u!1 &1546063520
GameObject:
m_ObjectHideFlags: 0
......@@ -157922,6 +157930,7 @@ MonoBehaviour:
Link: 1
LoadScene: 0
sceneBuildIndex: 0
nonVR: 1
progressBar: {fileID: 0}
--- !u!114 &1631129260
MonoBehaviour:
......@@ -181672,6 +181681,7 @@ MonoBehaviour:
Link: 0
LoadScene: 0
sceneBuildIndex: 0
nonVR: 1
progressBar: {fileID: 0}
--- !u!114 &1822801958
MonoBehaviour:
......@@ -182044,6 +182054,7 @@ MonoBehaviour:
Link: 0
LoadScene: 1
sceneBuildIndex: 2
nonVR: 1
progressBar: {fileID: 894342333}
--- !u!1001 &1827653085
PrefabInstance:
......@@ -207208,6 +207219,8 @@ MonoBehaviour:
vertSenseSlider: {fileID: 0}
checkMark: {fileID: 0}
tutCheckMark: {fileID: 1284873677}
VRTut: 0
VRMode: 0
--- !u!4 &2077926519
Transform:
m_ObjectHideFlags: 0
......@@ -215045,6 +215058,7 @@ MonoBehaviour:
Link: 0
LoadScene: 0
sceneBuildIndex: 0
nonVR: 1
progressBar: {fileID: 0}
--- !u!114 &2145622348
MonoBehaviour:
......@@ -225817,13 +225831,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5708676338873214153}
m_LocalRotation: {x: -0.49200445, y: 0.4951546, z: 0.50786966, w: -0.504799}
m_LocalRotation: {x: 0.008933568, y: 0.6979733, z: 0.7160109, w: 0.009050379}
m_LocalPosition: {x: 0.5600853, y: 2.364667, z: 1.9330711}
m_LocalScale: {x: 0.4, y: 0.40000004, z: 0.40000004}
m_Children: []
m_Father: {fileID: 1332966807}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -87.936005, y: 44.910004, z: -224.91899}
--- !u!4 &2435836605200371147
Transform:
m_ObjectHideFlags: 0
......@@ -260060,13 +260074,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1852953093649960582}
m_LocalRotation: {x: 0.5063368, y: 0.50633687, z: 0.49358192, w: 0.4935819}
m_LocalPosition: {x: 0.5600004, y: 2.3838825, z: 1.9300003}
m_LocalRotation: {x: 0.004474328, y: -0.7160546, z: -0.69801635, w: 0.004361648}
m_LocalPosition: {x: 0.5600004, y: 2.3929, z: 1.9300003}
m_LocalScale: {x: 0.46526903, y: 0.4652691, z: 0.4652691}
m_Children: []
m_Father: {fileID: 1332966807}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -91.627, y: 386.093, z: 153.898}
--- !u!198 &7210498866858423417
ParticleSystem:
m_ObjectHideFlags: 0
......@@ -64,7 +64,7 @@ public class Mainmenu : MonoBehaviour
public int VRTut;
public int VRMode;
void StartVRScene()
public void StartVRScene()
{
SettingsData.instance.VR = true;
StartCoroutine(LoadYourAsyncScene());
......
......@@ -25,6 +25,14 @@ public class VRGamestate : MonoBehaviour
}
public float fadespeed = 1f;
public GameObject LoseScreen;
public void LoseGame()
{
}
public TextMeshProUGUI winText;
public void WinFade()
{
......
......@@ -7,38 +7,33 @@ using UnityEngine.XR.Interaction.Toolkit;
public class VRPauseMenu : MonoBehaviour
{
//VR HArdware
public InputHelpers.Button menuButton;
public InputDeviceCharacteristics controllerCharacteristics;
XRRig rig;
InputDevice controllerInput;
public XRController controllerInput;
public InputHelpers.Button menuButton;
//Menu
public GameObject pauseMenuCanvas;
bool menuActive;
void Start()
{
rig = FindObjectOfType<XRRig>();
List<InputDevice> devices = new List<InputDevice>();
InputDevices.GetDevicesWithCharacteristics(controllerCharacteristics, devices);
if (devices.Count > 0) controllerInput = devices[0];
else Debug.LogError("Cant find controller for menu interaction.");
}
bool lastFrameState;
private void Update()
{
InputHelpers.IsPressed(controllerInput, menuButton, out bool ispressed);
InputHelpers.IsPressed(controllerInput.inputDevice, menuButton, out bool ispressed);
if (ispressed)
{
if (menuActive)
if (lastFrameState) return;
lastFrameState = true;
if (!menuActive)
{
menuActive = false;
menuActive = true;
SettingsData.instance.paused = true;
transform.position = rig.transform.position;
transform.rotation = rig.transform.rotation;
transform.position = rig.cameraGameObject.transform.position;
transform.eulerAngles = new Vector3(0, rig.cameraGameObject.transform.eulerAngles.y, 0);
pauseMenuCanvas.SetActive(true);
}
else
......@@ -48,5 +43,6 @@ public class VRPauseMenu : MonoBehaviour
pauseMenuCanvas.SetActive(false);
}
}
else lastFrameState = false;
}
}
This diff is collapsed.
fileFormatVersion: 2
guid: 1c12660439cf7a145b3bf777badad63c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 5412f33af1abc154285adf5010f2550c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
Markdown is supported
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