eckertnoah/Unity3DRoom_MasterProject
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: eckertnoah:d88fa6d9c04882bfa474f96067cc045562bc339b
Branches Tags
eckertnoah:master
..
compare: eckertnoah:1a065bfedbf1f86d8970af0fb4222fbe6fe9c4d3
Branches Tags
eckertnoah:master

No commits in common. "d88fa6d9c04882bfa474f96067cc045562bc339b" and "1a065bfedbf1f86d8970af0fb4222fbe6fe9c4d3" have entirely different histories.
d88fa6d9c0 ... 1a065bfedb

11 changed files with 183 additions and 138 deletions
Show Stats Expand all files Collapse all files

182
Assets/Scenes/Room Noah.unity
View File

@ -123,6 +123,86 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &686006188
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 686006189}
m_Layer: 0
m_Name: Camera Offset
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &686006189
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 686006188}
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:
- {fileID: 1223379203}
m_Father: {fileID: 693965536}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &693965534
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 693965536}
- component: {fileID: 693965535}
m_Layer: 0
m_Name: XRRig
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &693965535
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 693965534}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a2483b9bd782f9449a5972b61b7d51a9, type: 3}
m_Name:
m_EditorClassIdentifier:
m_CameraFloorOffsetObject: {fileID: 686006188}
m_RequestedTrackingMode: 2
m_TrackingOriginMode: 1
m_TrackingSpace: 1
m_CameraYOffset: 1.36144
--- !u!4 &693965536
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 693965534}
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:
- {fileID: 686006189}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1188061477
PrefabInstance:
m_ObjectHideFlags: 0
@ -180,6 +260,108 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 64d10a353b83142ee8e885dda0859db7, type: 3}
--- !u!1 &1223379200
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1223379203}
- component: {fileID: 1223379202}
- component: {fileID: 1223379201}
- component: {fileID: 1223379204}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &1223379201
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1223379200}
m_Enabled: 1
--- !u!20 &1223379202
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1223379200}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.01
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1223379203
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1223379200}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 1.619}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 686006189}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1223379204
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1223379200}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Device: 0
m_PoseSource: 2
m_PoseProviderComponent: {fileID: 0}
m_TrackingType: 0
m_UpdateType: 0
m_UseRelativeTransform: 0
--- !u!1 &1769897100
GameObject:
m_ObjectHideFlags: 0

8
Assets/XRI.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 9b76628e2b5cb43a892d61607140f630
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/XRI/Settings.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: d8e107696c8ee4ba28cde68c73bc3841
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/XRI/Settings/Resources.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 6f74f0ad76dcd4c48aed57cc450468ef
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

47
Assets/XRI/Settings/Resources/InteractionLayerSettings.asset
View File

@ -1,47 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 191492db6e452eb468b95433ec162164, type: 3}
m_Name: InteractionLayerSettings
m_EditorClassIdentifier:
m_LayerNames:
- Default
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

8
Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 50ff985e9654347248bda5e488304e9b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

16
Assets/XRI/Settings/XRInteractionEditorSettings.asset
View File

@ -1,16 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 2d38fb1463c5c804b8847c20e8873623, type: 3}
m_Name: XRInteractionEditorSettings
m_EditorClassIdentifier:
m_InteractionLayerUpdaterShown: 1
m_ShowOldInteractionLayerMaskInInspector: 0

8
Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4af9197898d694d5d8582cb3fb53fab9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

1
Packages/manifest.json
View File

@ -8,7 +8,6 @@
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0",
"com.unity.xr.interaction.toolkit": "2.0.1",
"com.unity.xr.management": "4.2.1",
"com.unity.xr.oculus": "1.11.2",
"com.unity.modules.ai": "1.0.0",

33
Packages/packages-lock.json
View File

@ -41,15 +41,6 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.2.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.0.1",
"depth": 1,
@ -107,30 +98,6 @@
"com.unity.modules.imgui": "1.0.0"
}
},
"com.unity.xr.core-utils": {
"version": "2.0.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.interaction.toolkit": {
"version": "2.0.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.inputsystem": "1.2.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.core-utils": "2.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.8",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.physics": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.8",
"depth": 1,

2
ProjectSettings/ProjectSettings.asset
View File

@ -773,7 +773,7 @@ PlayerSettings:
m_VersionCode: 1
m_VersionName:
apiCompatibilityLevel: 6
activeInputHandler: 1
activeInputHandler: 0
cloudProjectId:
framebufferDepthMemorylessMode: 0
qualitySettingsNames: []