Commit 91eb2f28 authored by radow's avatar radow
Browse files

bunch of minor fixes

parent 6cbdf5f9
......@@ -42729,6 +42729,7 @@ GameObject:
- component: {fileID: 700449422}
- component: {fileID: 700449421}
- component: {fileID: 700449420}
- component: {fileID: 700449423}
m_Layer: 14
m_Name: Terrain
m_TagString: Untagged
......@@ -42794,6 +42795,51 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 91.53, y: -0.000015258789, z: -0.000015258789}
--- !u!114 &700449423
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 700449419}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38f6bf3d943ac7945842268c9ef1dca6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 1465766059}
m_Colliders: []
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_OnFirstHoverEnter:
m_PersistentCalls:
m_Calls: []
m_OnHoverEnter:
m_PersistentCalls:
m_Calls: []
m_OnHoverExit:
m_PersistentCalls:
m_Calls: []
m_OnLastHoverExit:
m_PersistentCalls:
m_Calls: []
m_OnSelectEnter:
m_PersistentCalls:
m_Calls: []
m_OnSelectExit:
m_PersistentCalls:
m_Calls: []
m_OnActivate:
m_PersistentCalls:
m_Calls: []
m_OnDeactivate:
m_PersistentCalls:
m_Calls: []
m_CustomReticle: {fileID: 0}
m_TeleportationProvider: {fileID: 0}
m_MatchOrientation: 0
m_TeleportTrigger: 0
--- !u!4 &701269808 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1877266324184490390, guid: 103afb94002bfa8429540d4bf3f96220,
......@@ -90120,6 +90166,49 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1999912850}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1465766058
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1465766060}
- component: {fileID: 1465766059}
m_Layer: 0
m_Name: Interaction Manager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1465766059
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1465766058}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1465766060
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1465766058}
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: 0}
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1467401794
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -102169,6 +102258,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
fadespeed: 1
LoseScreen: {fileID: 2897245952971849211}
looseText: {fileID: 2812579716357311461}
pauseMenu: {fileID: 616773112}
winText: {fileID: 1607806223}
--- !u!1001 &1655332559
PrefabInstance:
......@@ -1423,6 +1423,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7e78641cbf48a2a4cb26e919cb995a87, type: 3}
m_Name:
m_EditorClassIdentifier:
paused: 0
horizontalSensivity: 0
verticalSensivity: 0
masterVolume: 1
......@@ -1642,8 +1643,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 250762353}
m_LocalRotation: {x: -0, y: -0.70160604, z: -0, w: 0.71256506}
m_LocalPosition: {x: 1.65, y: 1.6299999, z: -11.09}
m_LocalScale: {x: 14.0734825, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: 2.711, y: 1.63, z: -11.106}
m_LocalScale: {x: 14.073489, y: 11.488495, z: 3.2250767}
m_Children: []
m_Father: {fileID: 1800726057}
m_RootOrder: 8
......@@ -2344,8 +2345,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318655842}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.6299999, z: -4.76}
m_LocalScale: {x: 4.7343354, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: -0.008, y: 1.63, z: -7.351}
m_LocalScale: {x: 12.120574, y: 11.488492, z: 6.284795}
m_Children: []
m_Father: {fileID: 1672865603}
m_RootOrder: 0
......@@ -2437,8 +2438,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 324656023}
m_LocalRotation: {x: -0, y: -0.70160604, z: -0, w: 0.71256506}
m_LocalPosition: {x: -4.6594462, y: 1.6299999, z: -0.027779765}
m_LocalScale: {x: 4.734337, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: -8.136, y: 1.63, z: -3.554}
m_LocalScale: {x: 23.00423, y: 11.488494, z: 7.9440536}
m_Children: []
m_Father: {fileID: 681999899}
m_RootOrder: 6
......@@ -2530,8 +2531,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 334413131}
m_LocalRotation: {x: -0, y: -0.92972755, z: -0, w: -0.3682482}
m_LocalPosition: {x: 3.1908863, y: 1.6299999, z: -3.4961464}
m_LocalScale: {x: 4.734336, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: 3.687, y: 1.6299999, z: -4.024}
m_LocalScale: {x: 4.7343383, y: 11.488496, z: 2.5508666}
m_Children: []
m_Father: {fileID: 1672865603}
m_RootOrder: 3
......@@ -3103,8 +3104,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 531230685}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.6299999, z: 4.15}
m_LocalScale: {x: 5.445906, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: -0.702, y: 1.63, z: 7.23}
m_LocalScale: {x: 12.265869, y: 11.48849, z: 7.2623086}
m_Children: []
m_Father: {fileID: 681999899}
m_RootOrder: 5
......@@ -3313,8 +3314,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 656874989}
m_LocalRotation: {x: -0, y: -0.9363187, z: -0, w: 0.3511514}
m_LocalPosition: {x: -3.064323, y: 1.6299999, z: -3.6107755}
m_LocalScale: {x: 4.734336, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: -4.705, y: 1.63, z: -5.491}
m_LocalScale: {x: 4.7343383, y: 11.488492, z: 6.094249}
m_Children: []
m_Father: {fileID: 1800726057}
m_RootOrder: 1
......@@ -4227,8 +4228,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 689187251}
m_LocalRotation: {x: -0, y: -0.9363187, z: -0, w: 0.3511514}
m_LocalPosition: {x: 3.6604, y: 1.6299999, z: 2.8901}
m_LocalScale: {x: 3.1513715, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: 4.421, y: 1.63, z: 3.762}
m_LocalScale: {x: 3.151373, y: 11.488495, z: 3.4167283}
m_Children: []
m_Father: {fileID: 1800726057}
m_RootOrder: 2
......@@ -5189,8 +5190,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759583939}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.6299999, z: 8.96}
m_LocalScale: {x: 4.7343354, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: 0, y: 1.63, z: 11.403}
m_LocalScale: {x: 4.734338, y: 11.488492, z: 5.9896545}
m_Children: []
m_Father: {fileID: 780370075}
m_RootOrder: 0
......@@ -5282,8 +5283,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 774272398}
m_LocalRotation: {x: -0, y: -0.92972755, z: -0, w: -0.3682482}
m_LocalPosition: {x: -3.708, y: 1.6299999, z: 2.811}
m_LocalScale: {x: 3.3162477, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: -7.505, y: 1.63, z: 6.852}
m_LocalScale: {x: 3.3162494, y: 11.488484, z: 12.192945}
m_Children: []
m_Father: {fileID: 1672865603}
m_RootOrder: 4
......@@ -5480,8 +5481,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 800333036}
m_LocalRotation: {x: -0, y: -0.9363187, z: -0, w: 0.3511514}
m_LocalPosition: {x: 3.6604, y: 1.6299999, z: 2.8901}
m_LocalScale: {x: 3.1513715, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: 4.3, y: 1.6299999, z: 3.623}
m_LocalScale: {x: 3.151373, y: 11.488495, z: 3.0485585}
m_Children: []
m_Father: {fileID: 681999899}
m_RootOrder: 2
......@@ -5729,8 +5730,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 863204675}
m_LocalRotation: {x: -0, y: -0.9363187, z: -0, w: 0.3511514}
m_LocalPosition: {x: -3.064323, y: 1.6299999, z: -3.6107755}
m_LocalScale: {x: 4.734336, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: -5.133, y: 1.6299999, z: -5.981}
m_LocalScale: {x: 4.7343383, y: 11.48849, z: 7.394003}
m_Children: []
m_Father: {fileID: 1672865603}
m_RootOrder: 1
......@@ -6014,8 +6015,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 903307291}
m_LocalRotation: {x: -0, y: -0.92972755, z: -0, w: -0.3682482}
m_LocalPosition: {x: 3.1908863, y: 1.6299999, z: -3.4961464}
m_LocalScale: {x: 4.734336, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: 4.612, y: 1.6299999, z: -4.575}
m_LocalScale: {x: 4.1417985, y: 11.488494, z: 4.62156}
m_Children: []
m_Father: {fileID: 681999899}
m_RootOrder: 3
......@@ -6125,8 +6126,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024915593}
m_LocalRotation: {x: -0, y: -0.92972755, z: -0, w: -0.3682482}
m_LocalPosition: {x: 3.1908863, y: 1.6299999, z: -3.4961464}
m_LocalScale: {x: 4.734336, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: 4.294, y: 1.6299999, z: -4.67}
m_LocalScale: {x: 4.7343383, y: 11.488494, z: 4.3235826}
m_Children: []
m_Father: {fileID: 780370075}
m_RootOrder: 5
......@@ -6361,7 +6362,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1059616724
Transform:
m_ObjectHideFlags: 0
......@@ -6497,8 +6498,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1094629594}
m_LocalRotation: {x: -0, y: -0.9363187, z: -0, w: 0.3511514}
m_LocalPosition: {x: -3.064323, y: 1.6299999, z: -3.6107755}
m_LocalScale: {x: 4.734336, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: -3.7, y: 1.6299999, z: -3.68}
m_LocalScale: {x: 3.867884, y: 11.488497, z: 2.0419898}
m_Children: []
m_Father: {fileID: 681999899}
m_RootOrder: 1
......@@ -6872,8 +6873,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1149692763}
m_LocalRotation: {x: -0, y: -0.9363187, z: -0, w: 0.3511514}
m_LocalPosition: {x: 3.6604, y: 1.6299999, z: 2.8901}
m_LocalScale: {x: 3.1513715, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: 4.294, y: 1.6299999, z: 3.616}
m_LocalScale: {x: 3.151373, y: 11.488496, z: 3.0290835}
m_Children: []
m_Father: {fileID: 780370075}
m_RootOrder: 4
......@@ -7086,8 +7087,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1171475400}
m_LocalRotation: {x: -0, y: 0.7109244, z: -0, w: 0.7032685}
m_LocalPosition: {x: -2.642, y: 1.63, z: 6.539}
m_LocalScale: {x: 5.940268, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: -3.586, y: 1.63, z: 8.537}
m_LocalScale: {x: 9.916812, y: 11.488495, z: 3.0345998}
m_Children: []
m_Father: {fileID: 780370075}
m_RootOrder: 7
......@@ -8294,8 +8295,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1259037221}
m_LocalRotation: {x: -0, y: -0.92972755, z: -0, w: -0.3682482}
m_LocalPosition: {x: -3.708, y: 1.6299999, z: 2.811}
m_LocalScale: {x: 3.3162477, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: -4.976, y: 1.6299999, z: 4.16}
m_LocalScale: {x: 3.3162494, y: 11.488493, z: 4.8055725}
m_Children: []
m_Father: {fileID: 681999899}
m_RootOrder: 4
......@@ -9438,8 +9439,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1514416580}
m_LocalRotation: {x: -0, y: -0.9363187, z: -0, w: 0.3511514}
m_LocalPosition: {x: 3.6604, y: 1.6299999, z: 2.8901}
m_LocalScale: {x: 3.1513715, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: 5.459, y: 1.6299999, z: 4.95}
m_LocalScale: {x: 3.151373, y: 11.488491, z: 6.572301}
m_Children: []
m_Father: {fileID: 1672865603}
m_RootOrder: 2
......@@ -9624,8 +9625,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1548516146}
m_LocalRotation: {x: -0, y: -0.70160604, z: -0, w: 0.71256506}
m_LocalPosition: {x: 4.659433, y: 1.6299999, z: -0.17221832}
m_LocalScale: {x: 4.734336, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: 8.631, y: 1.63, z: 0.462}
m_LocalScale: {x: 9.127017, y: 11.488488, z: 9.026691}
m_Children: []
m_Father: {fileID: 780370075}
m_RootOrder: 2
......@@ -9717,8 +9718,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1557447483}
m_LocalRotation: {x: -0, y: -0.70160604, z: -0, w: 0.71256506}
m_LocalPosition: {x: -4.6594462, y: 1.6299999, z: -0.027779765}
m_LocalScale: {x: 4.734337, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: -7.502, y: 1.63, z: -1.949}
m_LocalScale: {x: 8.663924, y: 11.488491, z: 6.7296324}
m_Children: []
m_Father: {fileID: 1800726057}
m_RootOrder: 6
......@@ -11613,8 +11614,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1780992095}
m_LocalRotation: {x: -0, y: -0.70160604, z: -0, w: 0.71256506}
m_LocalPosition: {x: -2.45, y: 1.6299999, z: -11.02}
m_LocalScale: {x: 14.0734825, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: -6.324, y: 1.63, z: -10.96}
m_LocalScale: {x: 14.073489, y: 11.488488, z: 8.85172}
m_Children: []
m_Father: {fileID: 1800726057}
m_RootOrder: 7
......@@ -11706,8 +11707,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1786946272}
m_LocalRotation: {x: -0, y: 0.7109244, z: -0, w: 0.7032685}
m_LocalPosition: {x: 2.6884, y: 1.63, z: 6.4744}
m_LocalScale: {x: 5.954507, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: 5.37, y: 1.63, z: 9.157}
m_LocalScale: {x: 11.378109, y: 11.488491, z: 6.4071035}
m_Children: []
m_Father: {fileID: 780370075}
m_RootOrder: 8
......@@ -11902,8 +11903,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1842642720}
m_LocalRotation: {x: -0, y: -0.92972755, z: -0, w: -0.3682482}
m_LocalPosition: {x: 3.1908863, y: 1.6299999, z: -3.4961464}
m_LocalScale: {x: 4.734336, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: 3.211, y: 1.6299999, z: -3.517}
m_LocalScale: {x: 4.7343383, y: 11.488498, z: 1.1605812}
m_Children: []
m_Father: {fileID: 1800726057}
m_RootOrder: 3
......@@ -12124,8 +12125,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1890997797}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.6299999, z: 4.15}
m_LocalScale: {x: 5.445906, y: 11.488498, z: 1.1030368}
m_LocalPosition: {x: -1.851, y: 1.63, z: 7.251}
m_LocalScale: {x: 17.054867, y: 11.48849, z: 7.305203}
m_Children: []
m_Father: {fileID: 1672865603}
m_RootOrder: 5
......@@ -12898,8 +12899,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2017146802}
m_LocalRotation: {x: -0, y: -0.92972755, z: -0, w: -0.3682482}
m_LocalPosition: {x: -3.708, y: 1.6299999, z: 2.811}
m_LocalScale: {x: 3.3162477, y: 11.488498, z: 1.1030369}
m_LocalPosition: {x: -6.982, y: 1.63, z: 2.156}
m_LocalScale: {x: 8.985423, y: 11.488494, z: 4.631234}
m_Children: []
m_Father: {fileID: 1800726057}
m_RootOrder: 4
......
......@@ -207219,8 +207219,8 @@ MonoBehaviour:
vertSenseSlider: {fileID: 0}
checkMark: {fileID: 0}
tutCheckMark: {fileID: 1284873677}
VRTut: 0
VRMode: 0
VRTut: 5
VRMode: 4
--- !u!4 &2077926519
Transform:
m_ObjectHideFlags: 0
......@@ -11,7 +11,7 @@ public class VRGamestate : MonoBehaviour
void Update()
{
if (Endzone.instance.done) WinFade();
if (VRPlayer.thePlayer.dead) LoseGame();
}
public void Gameoverfade()
......@@ -27,9 +27,20 @@ public class VRGamestate : MonoBehaviour
public float fadespeed = 1f;
public GameObject LoseScreen;
bool end;
public TextMeshProUGUI looseText;
public VRPauseMenu pauseMenu;
public void LoseGame()
{
Color a = looseText.color;
a.a += Time.deltaTime * fadespeed;
looseText.color = a;
if (end) return;
pauseMenu.SetPostion();
end = true;
LoseScreen.SetActive(true);
SettingsData.instance.paused = true;
}
......
......@@ -45,4 +45,10 @@ public class VRPauseMenu : MonoBehaviour
}
else lastFrameState = false;
}
public void SetPostion()
{
transform.position = rig.cameraGameObject.transform.position;
transform.eulerAngles = new Vector3(0, rig.cameraGameObject.transform.eulerAngles.y, 0);
}
}
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