Commit 1faee6c1 authored by radow's avatar radow
Browse files

A bunch of changes!

parent b581e343
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class LoadMainScene : MonoBehaviour
{
public int sceneBuildIndex;
// Start is called before the first frame update
void Start()
{
Debug.Log("Buffer Scene Active");
StartCoroutine(LoadYourAsyncScene());
}
IEnumerator LoadYourAsyncScene()
{
AsyncOperation asyncLoad = SceneManager.LoadSceneAsync(sceneBuildIndex, LoadSceneMode.Single);
while (!asyncLoad.isDone)
{
yield return null;
}
}
}
fileFormatVersion: 2
guid: 08c102377fa0fed42b74f552fadf4d65
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -202,7 +202,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 1.5
scalar: 0
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -4990,7 +4990,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 1.5
scalar: 0
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -9744,7 +9744,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 1.5
scalar: 0
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -14498,7 +14498,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -19252,7 +19252,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -23953,7 +23953,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.0001
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -28760,7 +28760,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 1.5
scalar: 0
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -33494,7 +33494,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 2
scalar: 0.0001
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -38248,7 +38248,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.0001
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -43002,7 +43002,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1.47
scalar: 0.0001
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -47809,7 +47809,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0
minScalar: 5
maxCurve:
serializedVersion: 2
......@@ -52563,7 +52563,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0
minScalar: 5
maxCurve:
serializedVersion: 2
This diff is collapsed.
fileFormatVersion: 2
guid: 7b3a4ab5ffd0be64c99ecbec033a7de3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -3053,6 +3053,12 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 388977046}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &407852954 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3968901275214463324, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
m_PrefabInstance: {fileID: 1523423409}
m_PrefabAsset: {fileID: 0}
--- !u!1 &426391778
GameObject:
m_ObjectHideFlags: 0
......@@ -10068,6 +10074,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: QuitTotitle
objectReference: {fileID: 0}
- target: {fileID: 2118592380816379917, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.535
objectReference: {fileID: 0}
- target: {fileID: 3830970359163761044, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_text
......@@ -10143,6 +10154,31 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3968901276384614327, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.009986023
objectReference: {fileID: 0}
- target: {fileID: 3968901276384614327, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.31018248
objectReference: {fileID: 0}
- target: {fileID: 3968901276384614327, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.0014076717
objectReference: {fileID: 0}
- target: {fileID: 3968901276384614327, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.9506236
objectReference: {fileID: 0}
- target: {fileID: 3968901276384614327, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 36.147003
objectReference: {fileID: 0}
- target: {fileID: 3968901276448051190, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_AnchorMax.x
......@@ -10153,6 +10189,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3968901276467998824, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 8561688982873914251}
- target: {fileID: 3968901276486124508, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_AnchorMin.x
......@@ -10168,11 +10209,36 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3968901276835845977, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: Focusoffset.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3968901276835845977, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: Focusoffset.z
value: -0.2
objectReference: {fileID: 0}
- target: {fileID: 4185823996652914856, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 8561688982873914251}
- target: {fileID: 4185823996652914871, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4185823996733895812, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: Focusoffset.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4185823996733895812, guid: f5df68b6103e3ed4ab4938712077e5fc,
type: 3}
propertyPath: Focusoffset.z
value: -0.2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f5df68b6103e3ed4ab4938712077e5fc, type: 3}
--- !u!114 &1523423410 stripped
......@@ -10220,7 +10286,7 @@ MonoBehaviour:
masterVolumeSlider: {fileID: 1523423412}
horizSensSlider: {fileID: 0}
vertSenseSlider: {fileID: 0}
checkMark: {fileID: 0}
checkMark: {fileID: 407852954}
tutCheckMark: {fileID: 0}
VRTut: 0
VRMode: 0
......@@ -13857,6 +13923,148 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2035238439
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2035238442}
- component: {fileID: 2035238441}
- component: {fileID: 2035238440}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2035238440
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2035238439}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4297cf58fee4d640bf6f37b3e42d11d, type: 3}
m_Name:
m_EditorClassIdentifier:
MusicAuds:
- {fileID: 2035238441}
--- !u!82 &2035238441
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2035238439}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: a4375ed4d7dadc54da40af1fc60fea05, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!4 &2035238442
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2035238439}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -29.091656, y: -0.391248, z: 22.577265}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &2067340644 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 8192f3d41da3f0f4ba856af19d8b3696,
......@@ -15552,6 +15760,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2385126335188232453, guid: c85e920f5299b2b48bec014575a73614,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3158021200038205973, guid: c85e920f5299b2b48bec014575a73614,
type: 3}
propertyPath: gosToDeactivate.Array.size
......@@ -17360,7 +17573,7 @@ MonoBehaviour:
rightTeleportRay: {fileID: 3131279840704234243}
leftTeleportRay: {fileID: 0}
teleportActivationButton: 2
activationthreshold: 0.01
activationthreshold: 0.011
--- !u!81 &8561688982873914228
AudioListener:
m_ObjectHideFlags: 0
......
......@@ -145,7 +145,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 668508}
m_LocalRotation: {x: 0, y: -0.9233141, z: 0, w: 0.38404557}
m_LocalPosition: {x: 0, y: 0, z: -0.456}
m_LocalPosition: {x: 0, y: 0, z: -0.22}
m_LocalScale: {x: 1.2999997, y: 1.3, z: 1.2999997}
m_Children:
- {fileID: 1975496872}
......@@ -154,7 +154,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: -134.831, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.386, y: 0.49899995}
m_AnchoredPosition: {x: 0.26, y: 0.49899995}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &1557308
......@@ -27885,6 +27885,11 @@ PrefabInstance:
propertyPath: m_Name
value: GY_Horse
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 62ae32eaab8ab514aa42355db637d07b,
type: 3}
propertyPath: m_Layer
value: 31
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 62ae32eaab8ab514aa42355db637d07b, type: 3}
--- !u!1 &331176702
......@@ -32956,7 +32961,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: ef46a09fb2e9c0845b5bac0fb9538a68,
type: 3}
propertyPath: m_LocalPosition.x
value: -517.9946
value: -514.64
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: ef46a09fb2e9c0845b5bac0fb9538a68,
type: 3}
......@@ -32966,7 +32971,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: ef46a09fb2e9c0845b5bac0fb9538a68,
type: 3}
propertyPath: m_LocalPosition.z
value: -506.86914
value: -508.54
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: ef46a09fb2e9c0845b5bac0fb9538a68,
type: 3}
......@@ -33008,11 +33013,26 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -2758713382586594122, guid: ef46a09fb2e9c0845b5bac0fb9538a68,
type: 3}
propertyPath: m_Layer
value: 31
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: ef46a09fb2e9c0845b5bac0fb9538a68,
type: 3}
propertyPath: m_Name
value: GY_Statue_Base
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: ef46a09fb2e9c0845b5bac0fb9538a68,
type: 3}
propertyPath: m_Layer
value: 31
objectReference: {fileID: 0}
- target: {fileID: 5876345650827675881, guid: ef46a09fb2e9c0845b5bac0fb9538a68,
type: 3}
propertyPath: m_Layer
value: 31
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ef46a09fb2e9c0845b5bac0fb9538a68, type: 3}
--- !u!1001 &336648063
......@@ -58422,7 +58442,7 @@ MonoBehaviour:
descr: 1
Link: 0
LoadScene: 1
sceneBuildIndex: 3
sceneBuildIndex: 2
nonVR: 1
progressBar: {fileID: 894342333}
--- !u!82 &677943430
......@@ -81817,7 +81837,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1cafcd2e43fb18249a8ff114a7da8d69, type: 3}
m_Name:
m_EditorClassIdentifier:
Focusoffset: {x: 0.5, y: 0, z: 0.7}
Focusoffset: {x: 0.1, y: 0, z: 0.2}
focus: 0
--- !u!114 &945962719
MonoBehaviour:
......@@ -83106,7 +83126,7 @@ MonoBehaviour:
descr: 1
Link: 0
LoadScene: 1
sceneBuildIndex: 1
sceneBuildIndex: 3
nonVR: 1
progressBar: {fileID: 894342333}
--- !u!1001 &986566064
......@@ -83554,6 +83574,8 @@ Transform:
- {fileID: 1934014920}
- {fileID: 731827931}
- {fileID: 1290363209}
- {fileID: 1733054325}
- {fileID: 1942795268}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -157512,7 +157534,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalPosition.x
value: -516.89
value: -508.51
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
......@@ -157522,7 +157544,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalPosition.z
value: -525.81
value: -510.19
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
......@@ -157569,6 +157591,11 @@ PrefabInstance:
propertyPath: m_Name
value: GY_DeadTree_big
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_Layer
value: 30
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0f7609a88433b7540bfcceb4b4c9cffe, type: 3}
--- !u!4 &1648147404 stripped
......@@ -170899,6 +170926,86 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1731023217}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1733054324
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 994123305}
m_Modifications:
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalPosition.x
value: -516.72
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.3
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalPosition.z
value: -527.4
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.15735435
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.6893765
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.68937606
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.15735455
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_RootOrder
value: 52
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90.00001
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 154.28401
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 0f7609a88433b7540bfcceb4b4c9cffe,
type: 3}
propertyPath: m_Name