浏览代码

Update to 2020.2.0f1

/main
Andre McGrail 4 年前
当前提交
02722ac4
共有 27 个文件被更改,包括 3792 次插入1384 次删除
  1. 2
      Assets/Materials/BlackoutBackface.mat
  2. 2
      Assets/Materials/Blocker.mat
  3. 2
      Assets/Materials/BushTest.mat
  4. 2
      Assets/Materials/Seaweed.mat
  5. 2
      Assets/Materials/Splash.mat
  6. 2
      Assets/Materials/StudioLight.mat
  7. 2
      Assets/Materials/StudioLight_Bright.mat
  8. 2
      Assets/Materials/Terrain.mat
  9. 12
      Assets/Objects/Levels/Island/Terrain_1_0.asset
  10. 16
      Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat
  11. 16
      Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat
  12. 16
      Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat
  13. 16
      Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat
  14. 16
      Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat
  15. 2
      Assets/Objects/props/props/Materials/Matr_Props.mat
  16. 995
      Assets/Shaders/CheckpointShader.shadergraph
  17. 995
      Assets/Shaders/Houses_Jetty.shadergraph
  18. 995
      Assets/Shaders/UtilityGraphs/PBR_HUE.ShaderGraph
  19. 1000
      Assets/Shaders/Vegetation/Vegetation.shadergraph
  20. 1000
      Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph
  21. 8
      Packages/manifest.json
  22. 28
      Packages/packages-lock.json
  23. 4
      ProjectSettings/ProjectVersion.txt
  24. 2
      ProjectSettings/URPProjectSettings.asset
  25. 9
      ProjectSettings/VersionControlSettings.asset
  26. 30
      UserSettings/EditorUserSettings.asset

2
Assets/Materials/BlackoutBackface.mat


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

2
Assets/Materials/Blocker.mat


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

2
Assets/Materials/BushTest.mat


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

2
Assets/Materials/Seaweed.mat


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

2
Assets/Materials/Splash.mat


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

2
Assets/Materials/StudioLight.mat


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

2
Assets/Materials/StudioLight_Bright.mat


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

2
Assets/Materials/Terrain.mat


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

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

16
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_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

16
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_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

16
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_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

16
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_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

16
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_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_6E11FCEA: 0.8
- Vector1_8B35DE98: 65

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


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

995
Assets/Shaders/CheckpointShader.shadergraph
文件差异内容过多而无法显示
查看文件

995
Assets/Shaders/Houses_Jetty.shadergraph
文件差异内容过多而无法显示
查看文件

995
Assets/Shaders/UtilityGraphs/PBR_HUE.ShaderGraph
文件差异内容过多而无法显示
查看文件

1000
Assets/Shaders/Vegetation/Vegetation.shadergraph
文件差异内容过多而无法显示
查看文件

1000
Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph
文件差异内容过多而无法显示
查看文件

8
Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.addressables": "1.14.2",
"com.unity.addressables": "1.16.10",
"com.unity.ide.visualstudio": "2.0.3",
"com.unity.ide.vscode": "1.2.2",
"com.unity.ide.visualstudio": "2.0.5",
"com.unity.ide.vscode": "1.2.3",
"com.unity.render-pipelines.universal": "10.1.0",
"com.unity.render-pipelines.universal": "10.2.2",
"com.unity.textmeshpro": "3.0.3",
"com.unity.timeline": "1.4.3",
"com.unity.ugui": "1.0.0",

28
Packages/packages-lock.json


"dependencies": {}
},
"com.unity.addressables": {
"version": "1.14.2",
"version": "1.16.10",
"com.unity.scriptablebuildpipeline": "1.11.1",
"com.unity.scriptablebuildpipeline": "1.14.1",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"

"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.0",
"version": "1.0.5",
"depth": 2,
"source": "registry",
"dependencies": {},

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

"version": "1.2.2",
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},

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

},
"com.unity.render-pipelines.universal": {
"version": "10.1.0",
"version": "10.2.2",
"com.unity.render-pipelines.core": "10.1.0",
"com.unity.shadergraph": "10.1.0"
"com.unity.render-pipelines.core": "10.2.2",
"com.unity.shadergraph": "10.2.2"
"version": "1.11.1",
"version": "1.14.1",
"depth": 1,
"source": "registry",
"dependencies": {},

"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
"version": "10.1.0",
"version": "10.2.2",
"com.unity.render-pipelines.core": "10.1.0",
"com.unity.render-pipelines.core": "10.2.2",
"version": "1.1.16",
"version": "1.1.19",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ext.nunit": "1.0.5",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2020.2.0b8
m_EditorVersionWithRevision: 2020.2.0b8 (dff91d65251a)
m_EditorVersion: 2020.2.0f1
m_EditorVersionWithRevision: 2020.2.0f1 (3721df5a8b28)

2
ProjectSettings/URPProjectSettings.asset


m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LastMaterialVersion: 3
m_LastMaterialVersion: 4

9
ProjectSettings/VersionControlSettings.asset


�� 2020.1.0b1�����$5�����w���6����):\7����������H������1�1�����@���Q�j�3�L�J@VersionControlSettingsm_ModeCollabEditorSettingsm_CollabEditorSettingsinProgressEnabled Visible Meta Files
%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

30
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: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b9859884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0ffb0e1e380cafbf2c3adc18e9cd285a2908b87ee819c8395949c9483d38b8d97ddbd90eed2a5a892a2af949aa48bafb19f85bd75a7ed3a7d25658598b7b58bb4b76aaf777690ca2863946c72c6cd81b6b6708f9f879f88769589d91c8f888e64d20f935e796571755c6b546677696a486c781c073c773d756a66771753783a27353f4c504172674347264e2e7a16016c711e4d7d5f686758400216064d1b4f487873735e6d726f6b3f577c7d47786579002d00
flags: 0
UnityEditor.ShaderGraph.InspectorWindow:
value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a3d10eb548717f73713d91006c1c309d0effad0d2f9ddffa582f0de8ebeb6fdd1cbfceba0b9f0b3bed8e8f5d0b0818e85dd839099c5e2dbd4
flags: 0
UnityEditor.ShaderGraph.ToggleSettings:
value: 18135d1527590858060c032302276919051e1a26296a7c362c250e36aea23d2bd2f533ffee3f280a3011e63e083b4365f40b0518f34748020227f31d01fa13071ed72ecc09c11d10ce5b46c8cc11c2e69994d7e5d4e4f5e8ccd0b6fbf0f5fcbaafb3f9d5a5a6f99ee8b2
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_VCProjectOverlayIcons: 1
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 0
正在加载...
取消
保存