浏览代码

Upgrade to 2020.2.13b (#247)

/devlogs-2-scriptable-objects
GitHub 4 年前
当前提交
19a7c4c5
共有 18 个文件被更改,包括 1578 次插入560 次删除
  1. 3
      UOP1_Project/Assets/Art/Characters/BardHare/BardHare_Expressions.mat
  2. 3
      UOP1_Project/Assets/Art/Characters/PigChef/PigChef_Eyes.mat
  3. 3
      UOP1_Project/Assets/Art/Characters/PigChef/PigChef_Mouth.mat
  4. 3
      UOP1_Project/Assets/Materials/Debug_Semitransparent.mat
  5. 7
      UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset
  6. 4
      UOP1_Project/Assets/Shaders/CustomHLSL/CustomLighting.hlsl
  7. 995
      UOP1_Project/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph
  8. 995
      UOP1_Project/Assets/Shaders/Toon.shadergraph
  9. 11
      UOP1_Project/Packages/manifest.json
  10. 56
      UOP1_Project/Packages/packages-lock.json
  11. 9
      UOP1_Project/ProjectSettings/PackageManagerSettings.asset
  12. 4
      UOP1_Project/ProjectSettings/ProjectVersion.txt
  13. 2
      UOP1_Project/ProjectSettings/URPProjectSettings.asset
  14. 1
      UOP1_Project/ProjectSettings/VersionControlSettings.asset
  15. 42
      UOP1_Project/UserSettings/EditorUserSettings.asset
  16. 0
      /UOP1_Project/Assets/Scenes/Examples/AudioExamples.unity
  17. 0
      /UOP1_Project/Assets/Scenes/Examples/AudioExamples.unity.meta

3
UOP1_Project/Assets/Art/Characters/BardHare/BardHare_Expressions.mat


- _Color: {r: 1, g: 1, b: 1, 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 &597435720688896434
MonoBehaviour:
m_ObjectHideFlags: 11

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

3
UOP1_Project/Assets/Art/Characters/PigChef/PigChef_Eyes.mat


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

- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 0}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: []

3
UOP1_Project/Assets/Art/Characters/PigChef/PigChef_Mouth.mat


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

- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 0}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: []

3
UOP1_Project/Assets/Materials/Debug_Semitransparent.mat


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

- _Color: {r: 1, g: 1, b: 1, 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: []

7
UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset


- {fileID: 6060256440939812884}
m_RendererFeatureMap: f8d024bb3d3093cbec2b2cef2b7c072d3b4d8cc13cf079065e61212817c89a8e1498fdd91f5b1a54
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
shaders:
blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}

tileDepthInfoPS: {fileID: 0}
tileDeferredPS: {fileID: 0}
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
m_OpaqueLayerMask:
serializedVersion: 2
m_Bits: 823

failOperation: 0
zFailOperation: 0
m_ShadowTransparentReceive: 1
m_RenderingMode: 0
m_AccurateGbufferNormals: 0
--- !u!114 &466668180145458491
MonoBehaviour:
m_ObjectHideFlags: 0

4
UOP1_Project/Assets/Shaders/CustomHLSL/CustomLighting.hlsl


void MainLight_float(float3 WorldPos, out float3 Direction, out float3 Color, out float ShadowAtten)
{
#if SHADERGRAPH_PREVIEW
#ifdef SHADERGRAPH_PREVIEW
Direction = float3(0.5, 0.5, 0);
Color = 1;
ShadowAtten = 1;

{
float4 White = 1;
#if SHADERGRAPH_PREVIEW
#ifdef SHADERGRAPH_PREVIEW
Out = 0;
#else
Smoothness = exp2(10 * Smoothness + 1);

995
UOP1_Project/Assets/Shaders/SubGraphs/ToonShading.shadersubgraph
文件差异内容过多而无法显示
查看文件

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

11
UOP1_Project/Packages/manifest.json


{
"dependencies": {
"com.unity.addressables": "1.8.5",
"com.unity.animation.rigging": "0.2.7-preview",
"com.unity.addressables": "1.14.2",
"com.unity.animation.rigging": "1.0.3",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.3",
"com.unity.ide.vscode": "1.2.3",
"com.unity.inputsystem": "1.0.0",
"com.unity.localization": "0.9.0-preview",

"com.unity.recorder": "2.4.0-preview.1",
"com.unity.render-pipelines.universal": "7.5.1",
"com.unity.render-pipelines.universal": "10.2.0",
"com.unity.textmeshpro": "2.1.3",
"com.unity.textmeshpro": "3.0.1",
"com.unity.timeline": "1.2.17",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",

56
UOP1_Project/Packages/packages-lock.json


"url": "https://packages.unity.com"
},
"com.unity.animation.rigging": {
"version": "0.2.7-preview",
"version": "1.0.3",
"com.unity.burst": "1.1.1",
"com.unity.test-framework": "1.0.7"
"com.unity.burst": "1.3.4",
"com.unity.test-framework": "1.1.14"
"version": "1.1.1",
"version": "1.3.4",
"com.unity.mathematics": "1.1.0"
"com.unity.mathematics": "1.2.1"
},
"url": "https://packages.unity.com"
},

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

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

"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.1.0",
"version": "1.2.1",
"depth": 2,
"source": "registry",
"dependencies": {},

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

},
"com.unity.render-pipelines.universal": {
"version": "7.5.1",
"version": "10.2.0",
"com.unity.render-pipelines.core": "7.5.1",
"com.unity.shadergraph": "7.5.1"
"com.unity.mathematics": "1.1.0",
"com.unity.render-pipelines.core": "10.2.0",
"com.unity.shadergraph": "10.2.0"
},
"url": "https://packages.unity.com"
},

"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.searcher": {
"version": "4.3.1",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": {
"version": "1.0.3",
"depth": 0,

},
"com.unity.shadergraph": {
"version": "7.5.1",
"version": "10.2.0",
"com.unity.render-pipelines.core": "7.5.1"
"com.unity.render-pipelines.core": "10.2.0",
"com.unity.searcher": "4.3.1"
},
"url": "https://packages.unity.com"
},

"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.1.3",
"version": "3.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.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"
}

9
UOP1_Project/ProjectSettings/PackageManagerSettings.asset


m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 0}
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
m_EditorClassIdentifier: UnityEditor:UnityEditor.PackageManager.UI:PackageManagerProjectSettings
m_EditorClassIdentifier:
m_EnablePreviewPackages: 0
m_EnablePackageDependencies: 0
m_AdvancedSettingsExpanded: 1
m_ScopedRegistriesSettingsExpanded: 1
oneTimeWarningShown: 0
m_Registries:

m_Scopes: []
m_IsDefault: 1
m_Capabilities: 7
m_UserSelectedRegistryName:
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:

m_Url:
m_Scopes: []
m_IsDefault: 0
m_Capabilities: 0
m_Modified: 0
m_Name:
m_Url:

4
UOP1_Project/ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.4.14f1
m_EditorVersionWithRevision: 2019.4.14f1 (4037e52648cd)
m_EditorVersion: 2020.2.0b13
m_EditorVersionWithRevision: 2020.2.0b13 (655e1a328b90)

2
UOP1_Project/ProjectSettings/URPProjectSettings.asset


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

1
UOP1_Project/ProjectSettings/VersionControlSettings.asset


� 2020.2.0b13�����$5�����w���6����):\7����������H������1�1�����@���Q�j�3�L�J@VersionControlSettingsm_ModeCollabEditorSettingsm_CollabEditorSettingsinProgressEnabled Visible Meta Files

42
UOP1_Project/UserSettings/EditorUserSettings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c731f151614233629323922275d07e7f32076f7e93ffdfe
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c761e1f03112b20213c313920123dacf53a31f6fe
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c6b15050311242b0f343f3827197df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7a08171a0826293b6911382d143cc7f83535f2eb33a7f234362820
flags: 0
UnityEditor.ShaderGraph.FloatingWindowsLayout2:
value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884ba88bbb4888b8ef7a7a3a8bfaaa0bde7f69580f3d2a3b5f1bfbbc3cbebc7cca4c1d884939ff4829d91b3ece1dac3d3c78cc2c5c09983dcf2d9ecc7fefdcaf9f3c1ccf7c0fdc5c9c9fe22aaed3a37353cf4ebe1efd9e5ee3ada2029d2d025229b643bc88d808891748e9b8f838b6e9b8094538fd8c17adc40a145406368685b6f796f5e7b2e017d7e4b5821637e1a022b792372792f1a2020001e546c5d400d7746050e49422e364d00337d5152425f1316060e170746602c1c262c302a33291b32281b072d2f0e350970ba6f7ab37d76ebda06e021e8acb619b21b7daaa4a7a8445c4444094f53a943928e4405dfda
flags: 0
UnityEditor.ShaderGraph.InspectorWindow:
value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed909c968797a7cf
flags: 0
UnityEditor.ShaderGraph.ToggleSettings:
value: 18135d1527590858060c032302276919051e1a26296a7c243f3c187fa0e92708f0e220e0e22d09352a0bed30017c5b2be01f0c47b40219221f1ded0b12eb1f0127cc0bcc18c41a5e910d0edbc85193e0dadadbf8e8f9e8ced7dba5e0b6aaaca4dbfeabfef4eae1
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: 1

/UOP1_Project/Assets/Scenes/Examples/AudioExample.unity → /UOP1_Project/Assets/Scenes/Examples/AudioExamples.unity

/UOP1_Project/Assets/Scenes/Examples/AudioExample.unity.meta → /UOP1_Project/Assets/Scenes/Examples/AudioExamples.unity.meta

正在加载...
取消
保存