Commit 4cd9b775 authored by radow's avatar radow
Browse files

pushpush

parent 5ef40b0f
This diff is collapsed.
......@@ -43737,20 +43737,17 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 670224309865224971, guid: 3093dc41424bb144bb28292f81674dc3,
type: 3}
objectReference: {fileID: 2100000, guid: 6bcdcbce5ef8f5949b8d171aedfbfe30, type: 2}
- target: {fileID: -6033892192861876981, guid: cae8eac66aabe3849beb1a375299a10d,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 670224309865224971, guid: 3093dc41424bb144bb28292f81674dc3,
type: 3}
objectReference: {fileID: 2100000, guid: a57203a251ae82a4e8d58ce3645d0ac2, type: 2}
- target: {fileID: -5977752441902007008, guid: cae8eac66aabe3849beb1a375299a10d,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 670224309865224971, guid: 3093dc41424bb144bb28292f81674dc3,
type: 3}
objectReference: {fileID: 2100000, guid: 45e2388d7371ea44e8d8e82c243186b3, type: 2}
- target: {fileID: -4216859302048453862, guid: cae8eac66aabe3849beb1a375299a10d,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -43830,26 +43827,22 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 670224309865224971, guid: 3093dc41424bb144bb28292f81674dc3,
type: 3}
objectReference: {fileID: 2100000, guid: 6bcdcbce5ef8f5949b8d171aedfbfe30, type: 2}
- target: {fileID: 5700239834516171333, guid: cae8eac66aabe3849beb1a375299a10d,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 670224309865224971, guid: 3093dc41424bb144bb28292f81674dc3,
type: 3}
objectReference: {fileID: 2100000, guid: e1ca31f3ea6122a4d8186978bdb276e9, type: 2}
- target: {fileID: 7532182806661294634, guid: cae8eac66aabe3849beb1a375299a10d,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 670224309865224971, guid: 3093dc41424bb144bb28292f81674dc3,
type: 3}
objectReference: {fileID: 2100000, guid: 641bf7a29b1112442b4bbc0b893ddfb0, type: 2}
- target: {fileID: 7973204641519777568, guid: cae8eac66aabe3849beb1a375299a10d,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 670224309865224971, guid: 3093dc41424bb144bb28292f81674dc3,
type: 3}
objectReference: {fileID: 2100000, guid: 6bcdcbce5ef8f5949b8d171aedfbfe30, type: 2}
- target: {fileID: 8849551083935788077, guid: cae8eac66aabe3849beb1a375299a10d,
type: 3}
propertyPath: m_Materials.Array.data[2]
......@@ -43859,8 +43852,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 670224309865224971, guid: 3093dc41424bb144bb28292f81674dc3,
type: 3}
objectReference: {fileID: 2100000, guid: 8a8ba0ac7361ca44c84ab64c45c01d8f, type: 2}
- target: {fileID: 8849551083935788077, guid: cae8eac66aabe3849beb1a375299a10d,
type: 3}
propertyPath: m_Materials.Array.data[1]
......@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
......@@ -51,7 +51,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 1
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
......
......@@ -10,7 +10,7 @@ public class VRGamestate : MonoBehaviour
void Update()
{
if (Endzone.instance.done) WinFade();
if (Endzone.instance.inside) WinFade();
if (VRPlayer.thePlayer.dead) LoseGame();
}
......@@ -30,6 +30,8 @@ public class VRGamestate : MonoBehaviour
bool end;
public TextMeshProUGUI looseText;
public VRPauseMenu pauseMenu;
public GameObject vrUIRay;
public void LoseGame()
{
......@@ -41,15 +43,36 @@ public class VRGamestate : MonoBehaviour
end = true;
LoseScreen.SetActive(true);
SettingsData.instance.paused = true;
Invoke("ShowLooseMenu", 2);
}
public TextMeshProUGUI winText;
public void WinFade()
{
Color a = winText.color;
a.a += Time.deltaTime * fadespeed;
winText.color = a;
// activate Winmenu
if (end) return;
end = true;
SettingsData.instance.paused = true;
Invoke("ShowWinmenu" , 2);
}
public GameObject winmenu;
void ShowWinmenu()
{
winmenu.SetActive(true);
pauseMenu.SetPostion();
vrUIRay.SetActive(true);
}
public GameObject loosemenu;
void ShowLooseMenu()
{
loosemenu.SetActive(true);
vrUIRay.SetActive(true);
}
}
......@@ -12,6 +12,7 @@ public class VRPauseMenu : MonoBehaviour
public InputHelpers.Button menuButton;
//Menu
public GameObject vrUIRay;
public GameObject pauseMenuCanvas;
bool menuActive;
......@@ -35,12 +36,14 @@ public class VRPauseMenu : MonoBehaviour
transform.position = rig.cameraGameObject.transform.position;
transform.eulerAngles = new Vector3(0, rig.cameraGameObject.transform.eulerAngles.y, 0);
pauseMenuCanvas.SetActive(true);
vrUIRay.SetActive(true);
}
else
{
menuActive = false;
SettingsData.instance.paused = false;
pauseMenuCanvas.SetActive(false);
vrUIRay.SetActive(false);
}
}
else lastFrameState = false;
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3451189634562077218
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3451189634562077223}
- component: {fileID: 3451189634562077216}
- component: {fileID: 3451189634562077222}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3451189634562077223
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3451189634562077218}
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: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3451189634562077216
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3451189634562077218}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!114 &3451189634562077222
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3451189634562077218}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791, type: 3}
m_Name:
m_EditorClassIdentifier:
clickSpeed: 0.3
moveDeadzone: 0.6
repeatDelay: 0.5
repeatRate: 0.1
trackedDeviceDragThresholdMultiplier: 2
m_MaxTrackedDeviceRaycastDistance: 1000
m_EnableXRInput: 1
m_EnableMouseInput: 1
m_EnableTouchInput: 1
fileFormatVersion: 2
guid: 33a34bbb3c8e2274d946bd6e0b026f0f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3227719135886555787
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1971563752730553328}
- component: {fileID: 8020007819454762903}
- component: {fileID: 6437082730185435163}
- component: {fileID: 5522400444626036239}
- component: {fileID: 8004816946049838873}
m_Layer: 30
m_Name: Right UI Ray
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1971563752730553328
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3227719135886555787}
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: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8020007819454762903
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3227719135886555787}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1ae26e19cd956134bbdf3c6f65bf393a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UpdateTrackingType: 0
m_EnableInputActions: 1
m_PoseProvider: {fileID: 0}
m_ControllerNode: 5
m_SelectUsage: 3
m_ActivateUsage: 2
m_UIPressUsage: 2
m_AxisToPressThreshold: 0.1
m_ModelPrefab: {fileID: 0}
m_ModelTransform: {fileID: 0}
m_AnimateModel: 0
m_ModelSelectTransition:
m_ModelDeSelectTransition:
--- !u!114 &6437082730185435163
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3227719135886555787}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6803edce0201f574f923fd9d10e5b30a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 0}
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_AttachTransform: {fileID: 0}
m_StartingSelectedInteractable: {fileID: 0}
m_OnHoverEnter:
m_PersistentCalls:
m_Calls: []
m_OnHoverExit:
m_PersistentCalls:
m_Calls: []
m_OnSelectEnter:
m_PersistentCalls:
m_Calls: []
m_OnSelectExit:
m_PersistentCalls:
m_Calls: []
m_SelectActionTrigger: 1
m_HideControllerOnSelect: 0
m_PlayAudioClipOnSelectEnter: 0
m_AudioClipForOnSelectEnter: {fileID: 0}
m_PlayAudioClipOnSelectExit: 0
m_AudioClipForOnSelectExit: {fileID: 0}
m_PlayAudioClipOnHoverEnter: 0
m_AudioClipForOnHoverEnter: {fileID: 0}
m_PlayAudioClipOnHoverExit: 0
m_AudioClipForOnHoverExit: {fileID: 0}
m_PlayHapticsOnSelectEnter: 1
m_HapticSelectEnterIntensity: 0.3
m_HapticSelectEnterDuration: 0.67
m_PlayHapticsOnSelectExit: 0
m_HapticSelectExitIntensity: 0
m_HapticSelectExitDuration: 0
m_PlayHapticsOnHoverEnter: 0
m_HapticHoverEnterIntensity: 0
m_HapticHoverEnterDuration: 0
m_PlayHapticsOnHoverExit: 0
m_HapticHoverExitIntensity: 0
m_HapticHoverExitDuration: 0
m_LineType: 0
m_MaxRaycastDistance: 30
m_ReferenceFrame: {fileID: 0}
m_Velocity: 16
m_Acceleration: 9.8
m_AdditionalFlightTime: 0.5
m_EndPointDistance: 30
m_EndPointHeight: -10
m_ControlPointDistance: 10
m_ControlPointHeight: 5
m_SampleFrequency: 20
m_HitDetectionType: 0
m_SphereCastRadius: 0
m_RaycastMask:
serializedVersion: 2
m_Bits: 4294967295
m_RaycastTriggerInteraction: 1
m_HoverToSelect: 1
m_HoverTimeToSelect: 0.5
m_EnableUIInteraction: 1
--- !u!120 &5522400444626036239
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3227719135886555787}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_Positions:
- {x: 0, y: -100, z: 0}
- {x: 0, y: -100, z: 0}
m_Parameters:
serializedVersion: 3
widthMultiplier: 0.02
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 0, g: 0, b: 1, a: 1}
key1: {r: 0, g: 0, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 4
numCapVertices: 4
alignment: 0
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_UseWorldSpace: 1
m_Loop: 0
--- !u!114 &8004816946049838873
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3227719135886555787}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LineWidth: 0.02
m_OverrideInteractorLineLength: 1
m_LineLength: 10
m_WidthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_ValidColorGradient:
serializedVersion: 2
key0: {r: 1, g: 0.8627451, b: 0.4039216, a: 1}
key1: {r: 1, g: 0.8627451, b: 0.40392157, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 1349
atime1: 63993
atime2: 65535
atime3: 65535
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 3
m_InvalidColorGradient:
serializedVersion: 2
key0: {r: 0.13333334, g: 0.08235294, b: 0.03137255, a: 1}
key1: {r: 0.13333334, g: 0.08235294, b: 0.03137255, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 964
atime1: 58982
atime2: 65535
atime3: 65535
atime4: 65535
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 3
m_SmoothMovement: 0
m_FollowTightness: 10
m_SnapThresholdDistance: 10
m_Reticle: {fileID: 0}
m_StopLineAtFirstRaycastHit: 1
fileFormatVersion: 2
guid: 656f1bf9bd8b70c45a817297dbd0218c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
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