浏览代码

Merge pull request #35 from unity/Dees_Scene_Changes

Updated missing prefabs in 3 scenes, connected several buttons
/3.1
GitHub Enterprise 4 年前
当前提交
6a363320
共有 7 个文件被更改,包括 26 次插入16 次删除
  1. 9
      Assets/Scenes/ARCollaborationData/ARCollaborationDataExample.unity
  2. 6
      Assets/Scenes/Anchors.unity
  3. 11
      Assets/Scenes/Scale.unity
  4. 10
      Packages/manifest.json
  5. 1
      ProjectSettings/GraphicsSettings.asset
  6. 1
      ProjectSettings/ProjectSettings.asset
  7. 4
      ProjectSettings/ProjectVersion.txt

9
Assets/Scenes/ARCollaborationData/ARCollaborationDataExample.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_Script: {fileID: 11500000, guid: 728ad7fae8e460a4ba41265c7308d757, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AnchorPrefab: {fileID: 0}
m_AnchorPrefab: {fileID: 8182956443887353202, guid: 7ab75e6d1363a42c883343aef7bc3596,
type: 3}
--- !u!114 &411184571
MonoBehaviour:
m_ObjectHideFlags: 0

m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 411184569}
m_MethodName: RemoveAllReferencePoints
m_MethodName: RemoveAllAnchors
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1790662393}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

6
Assets/Scenes/Anchors.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1335839538}
m_MethodName: RemoveAllReferencePoints
m_MethodName: RemoveAllAnchors
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

11
Assets/Scenes/Scale.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1309532706}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:

m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:

m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
- {fileID: 2100000, guid: 4260d5b4b48824e04b5464194b713343, type: 2}
- {fileID: 2100000, guid: 1bf33998c68d4e94fa9d3bcdcb78c58d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:

m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:

10
Packages/manifest.json


"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "2.0.8",
"com.unity.analytics": "3.3.2",
"com.unity.analytics": "3.3.4",
"com.unity.ide.rider": "1.1.0",
"com.unity.ide.rider": "1.1.4",
"com.unity.multiplayer-hlapi": "1.0.4",
"com.unity.package-manager-ui": "2.2.0",
"com.unity.test-framework": "1.0.18",
"com.unity.test-framework": "1.1.3",
"com.unity.timeline": "1.1.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.arcore": "3.1.0-preview.2",
"com.unity.xr.arfoundation": "3.1.0-preview.3",

1
ProjectSettings/GraphicsSettings.asset


- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}

1
ProjectSettings/ProjectSettings.asset


switchRatingsInt_9: 0
switchRatingsInt_10: 0
switchRatingsInt_11: 0
switchRatingsInt_12: 0
switchLocalCommunicationIds_0:
switchLocalCommunicationIds_1:
switchLocalCommunicationIds_2:

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.2.12f1
m_EditorVersionWithRevision: 2019.2.12f1 (b1a7e1fb4fa5)
m_EditorVersion: 2019.2.17f1
m_EditorVersionWithRevision: 2019.2.17f1 (8e603399ca02)
正在加载...
取消
保存