浏览代码

reverted packages and project settings back for built-in render and proper scene setup

/main
Dan 4 年前
当前提交
0a5ebfd8
共有 7 个文件被更改,包括 99 次插入54 次删除
  1. 69
      Assets/Shaders/Testing/Shaders Test Bed.unity
  2. 9
      Assets/UX/Scenes/UXManagerScene.unity
  3. 8
      Packages/manifest.json
  4. 53
      Packages/packages-lock.json
  5. 5
      ProjectSettings/EditorBuildSettings.asset
  6. 5
      ProjectSettings/GraphicsSettings.asset
  7. 4
      ProjectSettings/ProjectVersion.txt

69
Assets/Shaders/Testing/Shaders Test Bed.unity


m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1991472879
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4661001487440367306, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_Name
value: CoffeeMaker
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalPosition.x
value: 1.957
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.85
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8571596870699564249, guid: 83a543751b0dd4e5b9690a841c132b70,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 83a543751b0dd4e5b9690a841c132b70, type: 3}

9
Assets/UX/Scenes/UXManagerScene.unity


m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.17280719, g: 0.21594538, b: 0.29788864, a: 1}
m_IndirectSpecularColor: {r: 0.17280708, g: 0.21594499, b: 0.29788813, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

m_GameObject: {fileID: 1335839533}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 4, y: 4, z: 4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 282840814}
m_Father: {fileID: 0}

m_Script: {fileID: 11500000, guid: e1760703bbd54c04488a8d10600262ab, type: 3}
m_Name:
m_EditorClassIdentifier:
m_PlanePrefab: {fileID: 4776765576899091622, guid: 4837ecafbf8234005ba53c5ecf1b86e8,
m_PlanePrefab: {fileID: 4776765576899091622, guid: 635f0c5c56e955042b05a01c20415c3b,
type: 3}
m_DetectionMode: 1
--- !u!114 &1335839538

m_Script: {fileID: 11500000, guid: 446fc7fee4cf2ad4daa02222a84869c4, type: 3}
m_Name:
m_EditorClassIdentifier:
m_PlacedPrefab: {fileID: 7679285653639408882, guid: 6c3d430202eb3498aa04adcecf50f311,
m_PlacedPrefab: {fileID: 6562802905340916462, guid: f87dd2359ba946141af737fcd7366b3a,
m_CanReposition: 1
--- !u!114 &1335839540
MonoBehaviour:
m_ObjectHideFlags: 0

8
Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.ide.rider": "2.0.5",
"com.unity.ide.visualstudio": "2.0.2",
"com.unity.device-simulator": "2.0.0-preview",
"com.unity.ide.rider": "1.1.4",
"com.unity.render-pipelines.universal": "8.1.0",
"com.unity.render-pipelines.universal": "7.3.1",
"com.unity.textmeshpro": "3.0.0-preview.1",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.2.10",
"com.unity.ugui": "1.0.0",
"com.unity.xr.arcore": "4.1.0-preview.5",

53
Packages/packages-lock.json


},
"url": "https://packages.unity.com"
},
"com.unity.device-simulator": {
"version": "2.0.0-preview",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.editorcoroutines": {
"version": "1.0.0",
"depth": 1,

"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "2.0.5",
"version": "1.1.4",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.ide.visualstudio": {
"version": "2.0.2",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.1",
"depth": 0,

"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "8.1.0",
"version": "7.3.1",
"depth": 1,
"source": "registry",
"dependencies": {

},
"com.unity.render-pipelines.universal": {
"version": "8.1.0",
"version": "7.3.1",
"com.unity.render-pipelines.core": "8.1.0",
"com.unity.shadergraph": "8.1.0"
"com.unity.render-pipelines.core": "7.3.1",
"com.unity.shadergraph": "7.3.1"
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.searcher": {
"version": "4.0.9",
"depth": 2,
"source": "registry",
"dependencies": {},

"version": "8.1.0",
"version": "7.3.1",
"com.unity.render-pipelines.core": "8.1.0",
"com.unity.searcher": "4.0.9"
"com.unity.render-pipelines.core": "7.3.1"
},
"url": "https://packages.unity.com"
},

"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "3.0.0-preview.1",
"version": "2.0.1",
"depth": 0,
"source": "registry",
"dependencies": {

"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0"
"com.unity.modules.ui": "1.0.0"
}
},
"com.unity.xr.arcore": {

"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.uielementsnative": "1.0.0"
}
},
"com.unity.modules.uielementsnative": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
}

5
ProjectSettings/EditorBuildSettings.asset


EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Shaders/CameraGrain/Scenes/CameraGrain.unity
guid: 5c16888cbaac545b8b4292d2211a39d3
m_Scenes: []
m_configObjects:
UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 0f640456e31a1497aa336938d310040e,
type: 2}

5
ProjectSettings/GraphicsSettings.asset


m_LensFlare:
m_Mode: 1
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
m_VideoShadersIncludeMode: 2
m_AlwaysIncludedShaders:
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}

m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
m_CustomRenderPipeline: {fileID: 11400000, guid: efc9f20e6a4b0423ebd19efb551d21a0,
type: 2}
m_CustomRenderPipeline: {fileID: 0}
m_TransparencySortMode: 0
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
m_DefaultRenderingPath: 1

m_LightsUseLinearIntensity: 1
m_LightsUseColorTemperature: 0
m_LogWhenShaderIsCompiled: 1
m_AllowEnlightenSupportForUpgradedProject: 0

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2020.2.0a18
m_EditorVersionWithRevision: 2020.2.0a18 (4f8709444da6)
m_EditorVersion: 2019.4.4f1
m_EditorVersionWithRevision: 2019.4.4f1 (1f1dac67805b)
正在加载...
取消
保存