Skip to content
Snippets Groups Projects
Commit 92da52d8 authored by Lucas Plabst's avatar Lucas Plabst
Browse files

still crashing, update unity now

parent 61e4a32b
No related branches found
No related tags found
No related merge requests found
......@@ -41,7 +41,7 @@ MonoBehaviour:
Microsoft.MixedReality.Toolkit.Services.SpatialAwarenessSystem
spatialAwarenessSystemProfile: {fileID: 11400000, guid: 290163a5091672044a72ba597faa6019, type: 2}
diagnosticsSystemProfile: {fileID: 11400000, guid: 14ba885e44780d54fb54aa9cc69fe215, type: 2}
enableDiagnosticsSystem: 0
enableDiagnosticsSystem: 1
diagnosticsSystemType:
reference: Microsoft.MixedReality.Toolkit.Diagnostics.MixedRealityDiagnosticsSystem,
Microsoft.MixedReality.Toolkit.Services.DiagnosticsSystem
......@@ -53,4 +53,4 @@ MonoBehaviour:
registeredServiceProvidersProfile: {fileID: 11400000, guid: efbaf6ea540c69f4fb75415a5d145a53, type: 2}
useServiceInspectors: 0
renderDepthBuffer: 0
enableVerboseLogging: 0
enableVerboseLogging: 1
......@@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
isCustomProfile: 1
showDiagnostics: 1
showProfiler: 1
showProfiler: 0
showFrameInfo: 1
showMemoryStats: 1
frameSampleRate: 0.1
......
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.16788375, g: 0.21073635, b: 0.28994125, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -224,6 +224,10 @@ PrefabInstance:
propertyPath: m_Name
value: EyeGazeCursor
objectReference: {fileID: 0}
- target: {fileID: 1000012072213228, guid: 521049f9431e342478200d59fce43f92, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4000011792100794, guid: 521049f9431e342478200d59fce43f92, type: 3}
propertyPath: m_RootOrder
value: 8
......
......@@ -16,7 +16,7 @@ public class Records : MonoBehaviour
[SerializeField] Material[] selectableBurgerIngredientsMaterial;
GameObject[] notificationPrefabs;
public int notificationType;
public GameObject notificationSetManager;
public GameObject notificationSetManager;
public GameObject dockObject;
public GridObjectCollection dockGrid;
public bool handMenuOpen;
......@@ -38,11 +38,11 @@ public class Records : MonoBehaviour
{
persistentGO = GameObject.FindGameObjectsWithTag("PersistentGO")[0];
persistentGO.GetComponent<PersistentGOManager>().SetCurrGlobalRecordsGO(transform.gameObject);
dockGrid = dockObject.GetComponent<GridObjectCollection>();
if (dockObject != null) dockGrid = dockObject.GetComponent<GridObjectCollection>();
}
void Update()
{
dockGrid.UpdateCollection();
if (dockGrid != null) dockGrid.UpdateCollection();
}
public GameObject[] GetPrefabList()
{
......
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"OptimizeFor": 0
}
}
......@@ -32,6 +32,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/VoiceHand.unity
guid: c57e2c043bef3c8409cb5a475bd55acf
- enabled: 1
path: Assets/Scenes/VoiceHand.unity
guid: c57e2c043bef3c8409cb5a475bd55acf
m_configObjects:
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: eb2f83d806c558546af7ded5ab69ef72, type: 2}
com.unity.xr.openxr.settings4: {fileID: 11400000, guid: e665940620a013b4ab8997f461bf4d77, type: 2}
......@@ -52,7 +52,7 @@ PlayerSettings:
m_MTRendering: 1
mipStripping: 0
numberOfMipsStripped: 0
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
m_StackTraceTypes: 020000000200000002000000020000000200000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
iosUseCustomAppBackgroundBehavior: 0
......
......@@ -29,6 +29,24 @@ TagManager:
- Nachricht A
- Nachricht B
- Nachricht C
- IconNumber
- ButtonBackground
- SubtitleGrid
- Nachricht 11
- Nachricht 12
- Nachricht 13
- Nachricht 14
- Nachricht 15
- Nachricht 16
- Nachricht 17
- Nachricht 18
- Nachricht 19
- Nachricht 20
- Nachricht 21
- Nachricht 22
- Nachricht 23
- Nachricht 24
- Nachricht D
layers:
- Default
- TransparentFX
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 61
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
m_Name:
m_EditorClassIdentifier:
assetDefaultFramerate: 60
m_DefaultFrameRate: 60
......@@ -12,28 +12,28 @@ EditorUserSettings:
value: 51060d540056500c5b59547244260944424e487c2d2a7f67752f4f36e7e4666b
flags: 0
RecentlyUsedSceneGuid-2:
value: 56070d50545050585e575923427a59441516192c797b7434782a1e63e7b43069
value: 5155025204010d0d0c585f2146210744134e1b72292c273274781e35b6b93268
flags: 0
RecentlyUsedSceneGuid-3:
value: 5155025204010d0d0c585f2146210744134e1b72292c273274781e35b6b93268
value: 55020404070408095d0f082016220844141641722e7b2263787d4836e7b33539
flags: 0
RecentlyUsedSceneGuid-4:
value: 55020404070408095d0f082016220844141641722e7b2263787d4836e7b33539
value: 000403035756590f5e0c092443200744464e1b2879297267782b1966b7e1373e
flags: 0
RecentlyUsedSceneGuid-5:
value: 000403035756590f5e0c092443200744464e1b2879297267782b1966b7e1373e
value: 0008505f0405595a09085c2144270744454f482e7a7c20352f7a4960b6b13069
flags: 0
RecentlyUsedSceneGuid-6:
value: 0008505f0405595a09085c2144270744454f482e7a7c20352f7a4960b6b13069
value: 530806565553585f5d5e5f7214715944434f497c7b297435752c4f6bbae2636d
flags: 0
RecentlyUsedSceneGuid-7:
value: 005457025300595f0c5d0f73477b5b4447154c287c7c76362e2a4d36b2b56560
value: 56070d50545050585e575923427a59441516192c797b7434782a1e63e7b43069
flags: 0
RecentlyUsedSceneGuid-8:
value: 0050560354540f0d095e0d7241775a44474e1a2f7a7c74622c784532e7b36068
value: 005457025300595f0c5d0f73477b5b4447154c287c7c76362e2a4d36b2b56560
flags: 0
RecentlyUsedSceneGuid-9:
value: 530806565553585f5d5e5f7214715944434f497c7b297435752c4f6bbae2636d
value: 0050560354540f0d095e0d7241775a44474e1a2f7a7c74622c784532e7b36068
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment