浏览代码

Upgrade: Project is now using Unity 2020.1.0b8

/demo-ssao-2020.1
andytouch 5 年前
当前提交
baa541e9
共有 31 个文件被更改,包括 140 次插入88 次删除
  1. 23
      Assets/Data/UniversalRP/BoatDemoRenderer.asset
  2. 1
      Assets/Data/UniversalRP/PipelineAsset_High.asset
  3. 5
      Assets/Materials/BlackoutBackface.mat
  4. 5
      Assets/Materials/Blocker.mat
  5. 5
      Assets/Materials/BushTest.mat
  6. 5
      Assets/Materials/Seaweed.mat
  7. 3
      Assets/Materials/Splash.mat
  8. 5
      Assets/Materials/StudioLight.mat
  9. 5
      Assets/Materials/StudioLight_Bright.mat
  10. 3
      Assets/Materials/Terrain.mat
  11. 11
      Assets/Objects/Levels/Island/Terrain_0_0.asset
  12. 8
      Assets/Objects/Levels/Island/Terrain_1_0.asset
  13. 5
      Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat
  14. 5
      Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat
  15. 5
      Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat
  16. 5
      Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat
  17. 5
      Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat
  18. 4
      Assets/Objects/misc/checkpoint.prefab
  19. 5
      Assets/Objects/props/props/Materials/Matr_Props.mat
  20. 5
      Assets/Shaders/Imposters/Shader Graphs_ImposterTest.mat
  21. 1
      Packages/com.verasl.water-system/Materials/Caustics.mat
  22. 1
      Packages/com.verasl.water-system/Materials/Sea.mat
  23. 10
      Packages/manifest.json
  24. 4
      ProjectSettings/ProjectVersion.txt
  25. 2
      ProjectSettings/QualitySettings.asset
  26. 15
      ProjectSettings/URPProjectSettings.asset
  27. 8
      ProjectSettings/VersionControlSettings.asset
  28. 25
      UserSettings/EditorUserSettings.asset
  29. 36
      Assets/Data/UniversalRP/BoatXRayRenderer.asset
  30. 8
      Assets/Data/UniversalRP/BoatXRayRenderer.asset.meta

23
Assets/Data/UniversalRP/BoatDemoRenderer.asset


m_Name: BoatDemoRenderer
m_EditorClassIdentifier:
m_RendererFeatures:
- {fileID: 1493603568523985814}
- {fileID: 4860357971611268930, guid: 74177b577927ace4798a79666640ab41, type: 2}
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
shaders:
blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}

failOperation: 0
zFailOperation: 0
m_ShadowTransparentReceive: 1
--- !u!114 &1493603568523985814
--- !u!114 &684880503429451503
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adbe377f4f72c497faee64bc3f0580b9, type: 3}
m_Name: WaterSystem
m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3}
m_Name: NewScreenSpaceAmbientOcclusion
settings:
causticScale: 0.25
debug: 0
causticShader: {fileID: 4800000, guid: 90939d2e4b62841d29c136c866715501, type: 3}
m_Active: 1
settings: {Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3},
Quality: 2, Params:
Downsample: 1
NormalSamples: 1
Intensity: 1
Radius: 0.1
SampleCount: 7
BlurPasses: 3
}
m_Material: {fileID: 0}

1
Assets/Data/UniversalRP/PipelineAsset_High.asset


m_SupportsDynamicBatching: 0
m_MixedLightingSupported: 1
m_DebugLevel: 0
m_PostProcessingFeatureSet: 0
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_ShadowType: 1

5
Assets/Materials/BlackoutBackface.mat


m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2050
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []

- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &4290816286168958820
MonoBehaviour:
m_ObjectHideFlags: 11

m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 2

5
Assets/Materials/Blocker.mat


m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2050
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []

- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.1999999, g: 0.1999999, b: 0.1999999, a: 1}
m_BuildTextureStacks: []
--- !u!114 &2540273213146068490
MonoBehaviour:
m_ObjectHideFlags: 11

m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 2

5
Assets/Materials/BushTest.mat


m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2500
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses: []

- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.11320739, g: 0.11320739, b: 0.11320739, a: 0.5}
m_BuildTextureStacks: []
--- !u!114 &7331025373869863914
MonoBehaviour:
m_ObjectHideFlags: 11

m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 2

5
Assets/Materials/Seaweed.mat


m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2500
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses: []

- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999993, g: 0.19999993, b: 0.19999993, a: 0.5}
m_BuildTextureStacks: []
--- !u!114 &743226389367642094
MonoBehaviour:
m_ObjectHideFlags: 11

m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 2

3
Assets/Materials/Splash.mat


m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 2
--- !u!21 &2100000
Material:
serializedVersion: 6

- _SoftParticleFadeParams: {r: 0, g: 10, b: 0, a: 0}
- _SpecColor: {r: 0.19998494, g: 0.19998494, b: 0.19998494, a: 0.2}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

5
Assets/Materials/StudioLight.mat


m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 2
--- !u!21 &2100000
Material:
serializedVersion: 6

m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2050
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []

- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 1.1791481, g: 1.3087661, b: 1.4618678, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

5
Assets/Materials/StudioLight_Bright.mat


m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 2
--- !u!21 &2100000
Material:
serializedVersion: 6

m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2050
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []

- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

3
Assets/Materials/Terrain.mat


m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 2
--- !u!21 &2100000
Material:
serializedVersion: 6

- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

11
Assets/Objects/Levels/Island/Terrain_0_0.asset
文件差异内容过多而无法显示
查看文件

8
Assets/Objects/Levels/Island/Terrain_1_0.asset
文件差异内容过多而无法显示
查看文件

5
Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat


m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_c7c57f0cd682471d8da8de631f1fc93b_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

m_BuildTextureStacks: []

5
Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat


m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_c7c57f0cd682471d8da8de631f1fc93b_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

m_BuildTextureStacks: []

5
Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat


m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_c7c57f0cd682471d8da8de631f1fc93b_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

m_BuildTextureStacks: []

5
Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat


m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_c7c57f0cd682471d8da8de631f1fc93b_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

m_BuildTextureStacks: []

5
Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat


m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_c7c57f0cd682471d8da8de631f1fc93b_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

m_BuildTextureStacks: []

4
Assets/Objects/misc/checkpoint.prefab


- component: {fileID: 7010558061549940322}
- component: {fileID: 2022547064098935892}
- component: {fileID: 5705232510240925869}
m_Layer: 16
m_Layer: 0
m_Name: checkpoint
m_TagString: Untagged
m_Icon: {fileID: 0}

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

m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}

5
Assets/Objects/props/props/Materials/Matr_Props.mat


m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
version: 2
--- !u!21 &2100000
Material:
serializedVersion: 6

m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2050
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []

- _Color: {r: 0.9811321, g: 0.9811321, b: 0.9811321, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

5
Assets/Shaders/Imposters/Shader Graphs_ImposterTest.mat


m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _SampleTexture2D_2702d63aa52f45918807b8915a93722a_Texture_1:
m_Texture: {fileID: 2800000, guid: cb246c1b0d2c9447bb704796fb9275b2, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_CE122E4_Texture_1:
m_Texture: {fileID: 2800000, guid: cb246c1b0d2c9447bb704796fb9275b2, type: 3}
m_Scale: {x: 1, y: 1}

m_BuildTextureStacks: []

1
Packages/com.verasl.water-system/Materials/Caustics.mat


- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

1
Packages/com.verasl.water-system/Materials/Sea.mat


- _Color: {r: 0.43867922, g: 0.80530274, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_BuildTextureStacks: []

10
Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.addressables": "1.6.0",
"com.unity.addressables": "1.6.2",
"com.unity.ide.visualstudio": "2.0.0",
"com.unity.ide.vscode": "1.1.4",
"com.unity.ide.visualstudio": "2.0.1",
"com.unity.ide.vscode": "1.2.0",
"com.unity.render-pipelines.universal": "7.2.1",
"com.unity.render-pipelines.universal": "8.0.1",
"com.unity.textmeshpro": "2.1.0-preview.4",
"com.unity.textmeshpro": "3.0.0-preview.1",
"com.unity.timeline": "1.2.11",
"com.unity.ugui": "1.0.0",
"net.peeweek.gameplay-ingredients": "https://github.com/peeweek/net.peeweek.gameplay-ingredients.git#2019.3.0",

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.3.0f6
m_EditorVersionWithRevision: 2019.3.0f6 (27ab2135bccf)
m_EditorVersion: 2020.1.0b8
m_EditorVersionWithRevision: 2020.1.0b8 (726fc0bca2bc)

2
ProjectSettings/QualitySettings.asset


skinWeights: 2
textureQuality: 0
anisotropicTextures: 2
antiAliasing: 2
antiAliasing: 0
softParticles: 1
softVegetation: 1
realtimeReflectionProbes: 1

15
ProjectSettings/URPProjectSettings.asset


%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: 247994e1f5a72c2419c26a37e9334c01, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LastMaterialVersion: 2

8
ProjectSettings/VersionControlSettings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!890905787 &1
VersionControlSettings:
m_ObjectHideFlags: 0
m_Mode: Visible Meta Files
m_CollabEditorSettings:
inProgressEnabled: 1

25
UserSettings/EditorUserSettings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
UnityEditor.ShaderGraph.FloatingWindowsLayout2:
value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649501f031bf84253f22f2514d70ccc19c91333cd1f0fcbd95f8bb39b8698a8d5d4cfd7ccd6bafdfae4eff4daf7a3e8afbcbe9afae1aefdedcff8f7c8d0b28696dd8bdff8888583ec9d829f9bcfc78c8dd48e958990bdc1e092aba590aaa69994b79d879c8793a774f1f57b246a579eb3bbbd89b3be41867464c6d26665937c3bc882b3ad9d7c879d8096bb4d8adbc1409a968864d20f935e796571755c6b546677696a486c781c073d6f23696429450074652134203e56454c514e4352305f78621f00746f0243326d645d4b5f450e471441155071747340736e6130644f777d42667b34007c5f3fe12420e62304f4e023e03efadde518f54165ebb4efba505858565e5d45bf0a809a4048928946d4da
flags: 0
UnityEditor.ShaderGraph.ToggleSettings:
value: 18135d1527590858060c032302276919051e1a26296a7c362c250e36aea23d2bd2f533ffee3f280a3011e63e083b4365f40b0518f34748081e02f21c21ed1f0518c11dd758925d40e51612cb935fcc
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
m_VCAutomaticAdd: 1
m_VCDebugCom: 0
m_VCDebugCmd: 0
m_VCDebugOut: 0
m_SemanticMergeMode: 2
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCOverlayIcons: 1
m_VCAllowAsyncUpdate: 0

36
Assets/Data/UniversalRP/BoatXRayRenderer.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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
m_Name: BoatXRayRenderer
m_EditorClassIdentifier:
m_RendererFeatures: []
postProcessData: {fileID: 0}
shaders:
blitPS: {fileID: 0}
copyDepthPS: {fileID: 0}
screenSpaceShadowPS: {fileID: 0}
samplingPS: {fileID: 0}
fallbackErrorPS: {fileID: 0}
m_OpaqueLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_TransparentLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_DefaultStencilState:
overrideStencilState: 0
stencilReference: 0
stencilCompareFunction: 8
passOperation: 0
failOperation: 0
zFailOperation: 0
m_ShadowTransparentReceive: 1

8
Assets/Data/UniversalRP/BoatXRayRenderer.asset.meta


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