浏览代码

fixed disabling reason states, added occlusion to UX scene, updated packages to latest AR Foundaton preview, updated project 2019.4 LTS

/main
Dan 4 年前
当前提交
66a0f6ef
共有 20 个文件被更改,包括 278 次插入72 次删除
  1. 64
      Assets/Common/Fonts/Roboto-Medium SDF.asset
  2. 28
      Assets/UX/Scenes/UXManagerScene.unity
  3. 28
      Assets/UX/Scripts/ARUXReasonsManager.cs
  4. 68
      Assets/XR/XRGeneralSettings.asset
  5. 25
      Packages/manifest.json
  6. 24
      ProjectSettings/ProjectSettings.asset
  7. 4
      ProjectSettings/ProjectVersion.txt
  8. 8
      Assets/XR/Loaders.meta
  9. 8
      Assets/XR/Settings.meta
  10. 5
      ProjectSettings/XRPackageSettings.asset
  11. 14
      Assets/XR/Loaders/AR Core Loader.asset
  12. 8
      Assets/XR/Loaders/AR Core Loader.asset.meta
  13. 14
      Assets/XR/Loaders/AR Kit Loader.asset
  14. 8
      Assets/XR/Loaders/AR Kit Loader.asset.meta
  15. 14
      Assets/XR/Settings/AR Core Loader Settings.asset
  16. 8
      Assets/XR/Settings/AR Core Loader Settings.asset.meta
  17. 14
      Assets/XR/Settings/AR Kit Loader Settings.asset
  18. 8
      Assets/XR/Settings/AR Kit Loader Settings.asset.meta

64
Assets/Common/Fonts/Roboto-Medium SDF.asset
文件差异内容过多而无法显示
查看文件

28
Assets/UX/Scenes/UXManagerScene.unity


- component: {fileID: 282840815}
- component: {fileID: 282840816}
- component: {fileID: 282840812}
- component: {fileID: 282840817}
m_Layer: 0
m_Name: AR Camera
m_TagString: MainCamera

m_Script: {fileID: 11500000, guid: 4966719baa26e4b0e8231a24d9bd491a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FocusMode: 1
m_LightEstimationMode: 1
m_FocusMode: -1
m_LightEstimationMode: -1
m_AutoFocus: 1
m_LightEstimation: 3
m_FacingDirection: 1
--- !u!114 &282840817
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 282840810}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b15f82cc229284894964d2d30806969d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HumanSegmentationStencilMode: 3
m_HumanSegmentationDepthMode: 2
--- !u!1 &427002218
GameObject:
m_ObjectHideFlags: 0

m_EditorClassIdentifier:
m_AttemptUpdate: 1
m_MatchFrameRate: 1
m_TrackingMode: 2
--- !u!4 &427002220
Transform:
m_ObjectHideFlags: 0

m_Script: {fileID: 11500000, guid: fa17d122634046b4a8e23048891fafc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RaycastPrefab: {fileID: 0}
--- !u!114 &1335839539
MonoBehaviour:
m_ObjectHideFlags: 0

m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1582620437, guid: 29251f2f7c5044cce8e7eb862b4d93ef, type: 3}
propertyPath: m_ShowNotTrackingReasons
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5977163238016480453, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
type: 3}
propertyPath: m_Name

28
Assets/UX/Scripts/ARUXReasonsManager.cs


void OnEnable()
{
ARSession.stateChanged += ARSessionOnstateChanged;
if (!m_ShowNotTrackingReasons)
{
m_ReasonParent.SetActive(false);
}
}
void OnDisable()
{
ARSession.stateChanged -= ARSessionOnstateChanged;
if (!m_SessionTracking)
{
m_CurrentReason = ARSession.notTrackingReason;
ShowReason();
}
else
if (m_ShowNotTrackingReasons)
if (m_ReasonDisplayText.gameObject.activeSelf)
if (!m_SessionTracking)
m_ReasonParent.SetActive(false);
m_CurrentReason = ARSession.notTrackingReason;
ShowReason();
}
else
{
if (m_ReasonDisplayText.gameObject.activeSelf)
{
m_ReasonParent.SetActive(false);
}
}
}
}

68
Assets/XR/XRGeneralSettings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7698313333363481667
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: d236b7d11115f2143951f1e14045df39, type: 3}
m_Name: iPhone Settings
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: -3260359619799541026}
m_InitManagerOnStart: 1
--- !u!114 &-6536817209371556071
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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
m_Name: Android Providers
m_EditorClassIdentifier:
m_RequiresSettingsUpdate: 0
m_AutomaticLoading: 0
m_AutomaticRunning: 0
m_Loaders:
- {fileID: 11400000, guid: 113868feb4c2b49dbb648da5aaa4622b, type: 2}
--- !u!114 &-3260359619799541026
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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
m_Name: iPhone Providers
m_EditorClassIdentifier:
m_RequiresSettingsUpdate: 0
m_AutomaticLoading: 0
m_AutomaticRunning: 0
m_Loaders:
- {fileID: 11400000, guid: b97eebcafbed643e69fb26d60c08c02e, type: 2}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0

m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
m_Name: XRGeneralSettings
m_EditorClassIdentifier:
Keys:
Values: []
Keys: 0400000007000000
Values:
- {fileID: -7698313333363481667}
- {fileID: 2703266020209631490}
--- !u!114 &2703266020209631490
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: d236b7d11115f2143951f1e14045df39, type: 3}
m_Name: Android Settings
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: -6536817209371556071}
m_InitManagerOnStart: 1

25
Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.vscode": "1.1.4",
"com.unity.test-framework": "1.1.11",
"com.unity.ide.vscode": "1.2.0",
"com.unity.test-framework": "1.1.14",
"com.unity.xr.arcore": "3.1.0-preview.8",
"com.unity.xr.arfoundation": "3.1.0-preview.8",
"com.unity.xr.arkit": "3.1.0-preview.8",
"com.unity.xr.legacyinputhelpers": "1.3.11",
"com.unity.xr.arcore": "4.0.0-preview.3",
"com.unity.xr.arfoundation": "4.0.0-preview.3",
"com.unity.xr.arkit": "4.0.0-preview.3",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.cloth": "1.0.0",
"com.unity.modules.director": "1.0.0",

"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.umbra": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
"com.unity.modules.unitywebrequestaudio": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0",
"com.unity.modules.vehicles": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
}
}

24
ProjectSettings/ProjectSettings.asset


switchNVNShaderPoolsGranularity: 33554432
switchNVNDefaultPoolsGranularity: 16777216
switchNVNOtherPoolsGranularity: 16777216
stadiaPresentMode: 0
stadiaTargetFramerate: 0
vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0
m_SupportedAspectRatios:

16:9: 1
Others: 1
bundleVersion: 0.1
preloadedAssets: []
preloadedAssets:
- {fileID: 4800000, guid: e7c77f6eaab324a819efdc13b8125a39, type: 3}
- {fileID: -7698313333363481667, guid: 5c86decb01f9d6b46a50ce486fba0042, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1

uIStatusBarHidden: 1
uIExitOnSuspend: 0
uIStatusBarStyle: 0
iPhoneSplashScreen: {fileID: 0}
iPhoneHighResSplashScreen: {fileID: 0}
iPhoneTallHighResSplashScreen: {fileID: 0}
iPhone47inSplashScreen: {fileID: 0}
iPhone55inPortraitSplashScreen: {fileID: 0}
iPhone55inLandscapeSplashScreen: {fileID: 0}
iPhone58inPortraitSplashScreen: {fileID: 0}
iPhone58inLandscapeSplashScreen: {fileID: 0}
iPadPortraitSplashScreen: {fileID: 0}
iPadHighResPortraitSplashScreen: {fileID: 0}
iPadLandscapeSplashScreen: {fileID: 0}
iPadHighResLandscapeSplashScreen: {fileID: 0}
iPhone65inPortraitSplashScreen: {fileID: 0}
iPhone65inLandscapeSplashScreen: {fileID: 0}
iPhone61inPortraitSplashScreen: {fileID: 0}
iPhone61inLandscapeSplashScreen: {fileID: 0}
appleTVSplashScreen: {fileID: 0}
appleTVSplashScreen2x: {fileID: 0}
tvOSSmallIconLayers: []

ps4UseResolutionFallback: 0
ps4ReprojectionSupport: 0
ps4UseAudio3dBackend: 0
ps4UseLowGarlicFragmentationMode: 1
ps4SocialScreenEnabled: 0
ps4ScriptOptimizationLevel: 0
ps4Audio3dVirtualSpeakerCount: 14

XboxOnePersistentLocalStorageSize: 0
XboxOneXTitleMemory: 8
XboxOneOverrideIdentityName:
XboxOneOverrideIdentityPublisher:
vrEditorSettings:
daydream:
daydreamIconForeground: {fileID: 0}

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.3.6f1
m_EditorVersionWithRevision: 2019.3.6f1 (5c3fb0a11183)
m_EditorVersion: 2019.4.0f1
m_EditorVersionWithRevision: 2019.4.0f1 (0af376155913)

8
Assets/XR/Loaders.meta


fileFormatVersion: 2
guid: b2e713d6ac65646d68942fb6a6598d13
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/XR/Settings.meta


fileFormatVersion: 2
guid: fdee5a1363d414760ab3bd7311bf6e59
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

5
ProjectSettings/XRPackageSettings.asset


{
"m_Settings": [
"RemoveLegacyInputHelpersForReload"
]
}

14
Assets/XR/Loaders/AR Core Loader.asset


%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: 06042c85f885b4d1886f3ca5a1074eca, type: 3}
m_Name: AR Core Loader
m_EditorClassIdentifier:

8
Assets/XR/Loaders/AR Core Loader.asset.meta


fileFormatVersion: 2
guid: 113868feb4c2b49dbb648da5aaa4622b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

14
Assets/XR/Loaders/AR Kit Loader.asset


%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: a18c4d6661b404073b154020b9e2d993, type: 3}
m_Name: AR Kit Loader
m_EditorClassIdentifier:

8
Assets/XR/Loaders/AR Kit Loader.asset.meta


fileFormatVersion: 2
guid: b97eebcafbed643e69fb26d60c08c02e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

14
Assets/XR/Settings/AR Core Loader Settings.asset


%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: 00cb13c61b2744fd786f9f969ce96149, type: 3}
m_Name: AR Core Loader Settings
m_EditorClassIdentifier:

8
Assets/XR/Settings/AR Core Loader Settings.asset.meta


fileFormatVersion: 2
guid: d5e54d27ce8b34008b640f249d6c2d79
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

14
Assets/XR/Settings/AR Kit Loader Settings.asset


%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: 9cac560dd573c4c5088432b9d202f3e7, type: 3}
m_Name: AR Kit Loader Settings
m_EditorClassIdentifier:

8
Assets/XR/Settings/AR Kit Loader Settings.asset.meta


fileFormatVersion: 2
guid: db055c65538d047d3a5245050a4d9b41
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存