Browse Source

Updated project to Unity 2020.3.14 and fixed some minor issues after upgrade

console
Nico de Poel 5 years ago
parent
commit
0899855b51
  1. 11
      Assets/Scripts/Layers.cs.meta
  2. 1
      Assets/Scripts/Support/AliasModelAnimator.cs
  3. 12
      Packages/manifest.json
  4. 37
      Packages/packages-lock.json
  5. 2
      ProjectSettings/ProjectSettings.asset
  6. 4
      ProjectSettings/ProjectVersion.txt
  7. 2
      ProjectSettings/QualitySettings.asset
  8. 1
      ProjectSettings/UnityConnectSettings.asset

11
Assets/Scripts/Layers.cs.meta

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e256e725f909b194b8c7075b7bb03076
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/Scripts/Support/AliasModelAnimator.cs

@ -31,6 +31,7 @@ public class AliasModelAnimator : MonoBehaviour
{ {
aliasModel.Animate(frameNumber, out Mesh mesh, out float blendWeight); aliasModel.Animate(frameNumber, out Mesh mesh, out float blendWeight);
meshRenderer.sharedMesh = mesh; meshRenderer.sharedMesh = mesh;
if (mesh != null && mesh.blendShapeCount > 0)
meshRenderer.SetBlendShapeWeight(0, blendWeight); meshRenderer.SetBlendShapeWeight(0, blendWeight);
if (lerpMove) if (lerpMove)

12
Packages/manifest.json

@ -1,14 +1,14 @@
{ {
"dependencies": { "dependencies": {
"com.unity.collab-proxy": "1.3.9",
"com.unity.collab-proxy": "1.5.7",
"com.unity.ide.rider": "2.0.7", "com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.7",
"com.unity.ide.visualstudio": "2.0.9",
"com.unity.ide.vscode": "1.2.3", "com.unity.ide.vscode": "1.2.3",
"com.unity.inputsystem": "1.0.2", "com.unity.inputsystem": "1.0.2",
"com.unity.render-pipelines.universal": "10.4.0",
"com.unity.test-framework": "1.1.24",
"com.unity.textmeshpro": "3.0.4",
"com.unity.timeline": "1.4.7",
"com.unity.render-pipelines.universal": "10.5.0",
"com.unity.test-framework": "1.1.27",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.19-preview", "com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.19-preview",
"com.unity.ugui": "1.0.0", "com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",

37
Packages/packages-lock.json

@ -1,10 +1,12 @@
{ {
"dependencies": { "dependencies": {
"com.unity.collab-proxy": { "com.unity.collab-proxy": {
"version": "1.3.9",
"version": "1.5.7",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {},
"dependencies": {
"com.unity.nuget.newtonsoft-json": "2.0.0"
},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.ext.nunit": { "com.unity.ext.nunit": {
@ -24,7 +26,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.ide.visualstudio": { "com.unity.ide.visualstudio": {
"version": "2.0.7",
"version": "2.0.9",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -53,8 +55,15 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.nuget.newtonsoft-json": {
"version": "2.0.0",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": { "com.unity.render-pipelines.core": {
"version": "10.4.0",
"version": "10.5.0",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -63,30 +72,30 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.render-pipelines.universal": { "com.unity.render-pipelines.universal": {
"version": "10.4.0",
"version": "10.5.0",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.mathematics": "1.1.0", "com.unity.mathematics": "1.1.0",
"com.unity.render-pipelines.core": "10.4.0",
"com.unity.shadergraph": "10.4.0"
"com.unity.render-pipelines.core": "10.5.0",
"com.unity.shadergraph": "10.5.0"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.searcher": { "com.unity.searcher": {
"version": "4.3.1",
"version": "4.3.2",
"depth": 2, "depth": 2,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.shadergraph": { "com.unity.shadergraph": {
"version": "10.4.0",
"version": "10.5.0",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.render-pipelines.core": "10.4.0",
"com.unity.searcher": "4.3.1"
"com.unity.render-pipelines.core": "10.5.0",
"com.unity.searcher": "4.3.2"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
@ -107,7 +116,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.test-framework": { "com.unity.test-framework": {
"version": "1.1.24",
"version": "1.1.27",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -118,7 +127,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.textmeshpro": { "com.unity.textmeshpro": {
"version": "3.0.4",
"version": "3.0.6",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -127,7 +136,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.timeline": { "com.unity.timeline": {
"version": "1.4.7",
"version": "1.4.8",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {

2
ProjectSettings/ProjectSettings.asset

@ -131,6 +131,7 @@ PlayerSettings:
preloadedAssets: preloadedAssets:
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1
@ -563,6 +564,7 @@ PlayerSettings:
ps4videoRecordingFeaturesUsed: 0 ps4videoRecordingFeaturesUsed: 0
ps4contentSearchFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0
ps4CompatibilityPS5: 0 ps4CompatibilityPS5: 0
ps4AllowPS5Detection: 0
ps4GPU800MHz: 1 ps4GPU800MHz: 1
ps4attribEyeToEyeDistanceSettingVR: 0 ps4attribEyeToEyeDistanceSettingVR: 0
ps4IncludedModules: ps4IncludedModules:

4
ProjectSettings/ProjectVersion.txt

@ -1,2 +1,2 @@
m_EditorVersion: 2020.3.7f1
m_EditorVersionWithRevision: 2020.3.7f1 (dd97f2c94397)
m_EditorVersion: 2020.3.14f1
m_EditorVersionWithRevision: 2020.3.14f1 (d0d1bb862f9d)

2
ProjectSettings/QualitySettings.asset

@ -224,6 +224,8 @@ QualitySettings:
excludedTargetPlatforms: [] excludedTargetPlatforms: []
m_PerPlatformDefaultQuality: m_PerPlatformDefaultQuality:
Android: 2 Android: 2
GameCoreScarlett: 0
GameCoreXboxOne: 0
Lumin: 5 Lumin: 5
Nintendo 3DS: 5 Nintendo 3DS: 5
Nintendo Switch: 5 Nintendo Switch: 5

1
ProjectSettings/UnityConnectSettings.asset

@ -9,6 +9,7 @@ UnityConnectSettings:
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
m_ConfigUrl: https://config.uca.cloud.unity3d.com m_ConfigUrl: https://config.uca.cloud.unity3d.com
m_DashboardUrl: https://dashboard.unity3d.com
m_TestInitMode: 0 m_TestInitMode: 0
CrashReportingSettings: CrashReportingSettings:
m_EventUrl: https://perf-events.cloud.unity3d.com m_EventUrl: https://perf-events.cloud.unity3d.com

Loading…
Cancel
Save