内容更新

Assets/Dev/Scenes/DevRoom.unity

@@ -227,6 +227,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 655137958}
+  - component: {fileID: 655137959}
+  - component: {fileID: 655137960}
   m_Layer: 0
   m_Name: Scene Manager
   m_TagString: Untagged
@@ -248,6 +250,30 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &655137959
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 655137957}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ee76e5e97598444c8919d6fed886cf1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &655137960
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 655137957}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 607ea3e61721bd74a8ed2f937552d0bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1456620532
 GameObject:
   m_ObjectHideFlags: 0

Assets/Dev/Scripts/_Template.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using ToneTuneToolkit.Object;
+using ToneTuneToolkit.Other;
 
 namespace Dev
 {
@@ -12,7 +13,7 @@ namespace Dev
   {
     private void Start()
     {
- 
+      QRCodeHelper.Instance.GetQRContent(Application.streamingAssetsPath + "/asd.jpg");
     }
   }
 }

Assets/PDFs/-001.pdf.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ba1fa754aacd15442b94512122276edb
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 85c332c42f63ffb4789e0316874896c0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/zxing.unity.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: d020756f4b1332143889e10fb50e2c07
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ToneTuneToolkit/Scripts/Common/FileNameCapturer.cs

@@ -14,6 +14,8 @@ namespace ToneTuneToolkit.Common
   {
     /// <summary>
     /// 获取路径下全部指定类型的文件名
+    ///
+    /// string[] dd = Directory.GetFiles(url, "*.jpg");
     /// </summary>
     /// <param name="path">路径</param>
     /// <param name="suffix">后缀名</param>

Assets/ToneTuneToolkit/Scripts/Other/QRCodeHelper.cs

@@ -0,0 +1,73 @@
+/// <summary>
+/// Copyright (c) 2021 MirzkisD1Ex0 All rights reserved.
+/// Code Version 1.0
+/// </summary>
+
+using System.Collections;
+using UnityEngine;
+using UnityEngine.Networking;
+
+using ToneTuneToolkit.Common;
+using ZXing;
+
+namespace ToneTuneToolkit.Other
+{
+  public class QRCodeHelper : MonoBehaviour
+  {
+    public static QRCodeHelper Instance;
+
+    private void Awake()
+    {
+      Instance = this;
+    }
+
+    public void GetQRContent(string url)
+    {
+      StartCoroutine(this.GetQRPicture(url));
+      return;
+    }
+
+    /// <summary>
+    /// 获取图片
+    /// </summary>
+    /// <param name="url">地址</param>
+    /// <returns></returns>
+    private IEnumerator GetQRPicture(string url)
+    {
+      //  string[] paths = Directory.GetFiles(Application.streamingAssetsPath + "/", "*.jpg"); // 获取所有贴图
+      UnityWebRequest webRequest = UnityWebRequestTexture.GetTexture(url);
+      yield return webRequest.SendWebRequest();
+
+      if (webRequest.result == UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
+      {
+        TipTools.Error(webRequest.error);
+        yield break;
+      }
+      Texture2D texture = DownloadHandlerTexture.GetContent(webRequest);
+
+      string result = DecodeQRCode(texture);
+      TipTools.Notice($"[QRCodeHelper] Result is [{result}], from [{url}].");
+      yield break;
+    }
+
+
+    /// <summary>
+    /// 二维码解码
+    /// </summary>
+    /// <param name="texture">QR码图片</param>
+    /// <returns>返回结果或空</returns>
+    public static string DecodeQRCode(Texture2D texture)
+    {
+      BarcodeReader barcodeReader = new BarcodeReader();
+      barcodeReader.AutoRotate = true;
+      barcodeReader.TryInverted = true;
+      Result result = barcodeReader.Decode(texture.GetPixels32(), texture.width, texture.height);
+      if (result == null)
+      {
+        TipTools.Error("[QRCodeHelper] Decode failed.");
+        return null;
+      }
+      return result.Text;
+    }
+  }
+}

Assets/ToneTuneToolkit/Scripts/Other/QRCodeHelper.cs.meta

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

Logs/AssetImportWorker0-prev.log

@@ -1,150 +0,0 @@
-Using pre-set license
-Built from '2020.3/china_unity/release' branch; Version is '2020.3.15f1c1 (2f15a4c58450) revision 3085732'; Using compiler version '192528614'; Build Type 'Release'
-OS: 'Windows 10 Pro; OS build 19043.1110; Version 2009; 64bit' Language: 'zh' Physical Memory: 16305 MB
-BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0
-
- COMMAND LINE ARGUMENTS:
-C:\workflow\software\Unity\2020.3.15f1c1\Editor\Unity.exe
--adb2
--batchMode
--noUpm
--name
-AssetImportWorker0
--projectPath
-D:/workflow/project/unity/ToneTuneToolkit
--logFile
-Logs/AssetImportWorker0.log
--srvPort
-65344
-Successfully changed project path to: D:/workflow/project/unity/ToneTuneToolkit
-D:/workflow/project/unity/ToneTuneToolkit
-Using Asset Import Pipeline V2.
-Refreshing native plugins compatible for Editor in 42.98 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Initialize engine version: 2020.3.15f1c1 (2f15a4c58450)
-[Subsystems] Discovering subsystems at path C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/Resources/UnitySubsystems
-[Subsystems] Discovering subsystems at path D:/workflow/project/unity/ToneTuneToolkit/Assets
-GfxDevice: creating device client; threaded=0
-Direct3D:
-    Version:  Direct3D 11.0 [level 11.1]
-    Renderer: NVIDIA GeForce GTX 1070 (ID=0x1b81)
-    Vendor:   
-    VRAM:     8088 MB
-    Driver:   27.21.14.5671
-Initialize mono
-Mono path[0] = 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/Managed'
-Mono path[1] = 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit'
-Mono config path = 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/MonoBleedingEdge/etc'
-Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56152
-Begin MonoManager ReloadAssembly
-Registering precompiled unity dll's ...
-Register platform support module: C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll
-Register platform support module: C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
-Registered in 0.003759 seconds.
-Native extension for WindowsStandalone target not found
-Native extension for WebGL target not found
-Refreshing native plugins compatible for Editor in 49.22 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Mono: successfully reloaded assembly
-- Completed reload, in  2.268 seconds
-Domain Reload Profiling:
-	ReloadAssembly (2269ms)
-		BeginReloadAssembly (61ms)
-			ExecutionOrderSort (0ms)
-			DisableScriptedObjects (0ms)
-			BackupInstance (0ms)
-			ReleaseScriptingObjects (0ms)
-			CreateAndSetChildDomain (1ms)
-		EndReloadAssembly (474ms)
-			LoadAssemblies (59ms)
-			RebuildTransferFunctionScriptingTraits (0ms)
-			SetupTypeCache (150ms)
-			ReleaseScriptCaches (0ms)
-			RebuildScriptCaches (32ms)
-			SetupLoadedEditorAssemblies (223ms)
-				LogAssemblyErrors (0ms)
-				InitializePlatformSupportModulesInManaged (6ms)
-				SetLoadedEditorAssemblies (0ms)
-				RefreshPlugins (49ms)
-				BeforeProcessingInitializeOnLoad (11ms)
-				ProcessInitializeOnLoadAttributes (103ms)
-				ProcessInitializeOnLoadMethodAttributes (54ms)
-				AfterProcessingInitializeOnLoad (0ms)
-				EditorAssembliesLoaded (0ms)
-			ExecutionOrderSort2 (0ms)
-			AwakeInstancesAfterBackupRestoration (0ms)
-Platform modules already initialized, skipping
-Registering precompiled user dll's ...
-Registered in 0.006771 seconds.
-Begin MonoManager ReloadAssembly
-Native extension for WindowsStandalone target not found
-Native extension for WebGL target not found
-Refreshing native plugins compatible for Editor in 42.96 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Mono: successfully reloaded assembly
-- Completed reload, in  1.236 seconds
-Domain Reload Profiling:
-	ReloadAssembly (1237ms)
-		BeginReloadAssembly (165ms)
-			ExecutionOrderSort (0ms)
-			DisableScriptedObjects (5ms)
-			BackupInstance (0ms)
-			ReleaseScriptingObjects (0ms)
-			CreateAndSetChildDomain (18ms)
-		EndReloadAssembly (1003ms)
-			LoadAssemblies (107ms)
-			RebuildTransferFunctionScriptingTraits (0ms)
-			SetupTypeCache (304ms)
-			ReleaseScriptCaches (0ms)
-			RebuildScriptCaches (48ms)
-			SetupLoadedEditorAssemblies (437ms)
-				LogAssemblyErrors (0ms)
-				InitializePlatformSupportModulesInManaged (5ms)
-				SetLoadedEditorAssemblies (0ms)
-				RefreshPlugins (43ms)
-				BeforeProcessingInitializeOnLoad (88ms)
-				ProcessInitializeOnLoadAttributes (277ms)
-				ProcessInitializeOnLoadMethodAttributes (13ms)
-				AfterProcessingInitializeOnLoad (11ms)
-				EditorAssembliesLoaded (0ms)
-			ExecutionOrderSort2 (0ms)
-			AwakeInstancesAfterBackupRestoration (7ms)
-Platform modules already initialized, skipping
-========================================================================
-Worker process is ready to serve import requests
-Launched and connected shader compiler UnityShaderCompiler.exe after 0.04 seconds
-Refreshing native plugins compatible for Editor in 0.48 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Unloading 2142 Unused Serialized files (Serialized files now loaded: 0)
-System memory in use before: 170.7 MB.
-System memory in use after: 170.8 MB.
-
-Unloading 28 unused Assets to reduce memory usage. Loaded Objects now: 2601.
-Total: 2.569300 ms (FindLiveObjects: 0.201200 ms CreateObjectMapping: 0.090000 ms MarkObjects: 2.195200 ms  DeleteObjects: 0.081600 ms)
-
-AssetImportParameters requested are different than current active one (requested -> active):
-  custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> 
-  custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> 
-  custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> 
-  custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> 
-  custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> 
-  custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> 
-  custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> 
-  custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
-  custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
-========================================================================
-Received Import Request.
-  path: Assets/ToneTuneToolkit/Documentation.md
-  artifactKey: Guid(00277320b88355049b5c0adbb1dc7925) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/ToneTuneToolkit/Documentation.md using Guid(00277320b88355049b5c0adbb1dc7925) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '2425e54d4d04a6b43b17e23713136167') in 0.041609 seconds 
-  Import took 0.044699 seconds .
-
-========================================================================
-Received Import Request.
-  Time since last request: 24.732733 seconds.
-  path: Assets/ToneTuneToolkit/Documentation.md
-  artifactKey: Guid(00277320b88355049b5c0adbb1dc7925) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/ToneTuneToolkit/Documentation.md using Guid(00277320b88355049b5c0adbb1dc7925) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: 'dc407e71a6c61de167c73f7c2112360e') in 0.001845 seconds 
-  Import took 0.005413 seconds .
-
-AssetImportWorkerClient::OnTransportError - code=2 error=End of file

Logs/AssetImportWorker0.log

@@ -1,10 +1,10 @@
 Using pre-set license
-Built from '2020.3/china_unity/release' branch; Version is '2020.3.15f1c1 (2f15a4c58450) revision 3085732'; Using compiler version '192528614'; Build Type 'Release'
+Built from '2020.3/release' branch; Version is '2020.3.15f2 (6cf78cb77498) revision 7141260'; Using compiler version '192528614'; Build Type 'Release'
 OS: 'Windows 10 Pro; OS build 19043.1110; Version 2009; 64bit' Language: 'zh' Physical Memory: 16305 MB
 BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0
 
  COMMAND LINE ARGUMENTS:
-C:\workflow\software\Unity\2020.3.15f1c1\Editor\Unity.exe
+C:\workflow\software\Unity\Editor\2020.3.15f2\Editor\Unity.exe
 -adb2
 -batchMode
 -noUpm
@@ -15,14 +15,14 @@ D:/workflow/project/unity/ToneTuneToolkit
 -logFile
 Logs/AssetImportWorker0.log
 -srvPort
-60948
+60260
 Successfully changed project path to: D:/workflow/project/unity/ToneTuneToolkit
 D:/workflow/project/unity/ToneTuneToolkit
 Using Asset Import Pipeline V2.
-Refreshing native plugins compatible for Editor in 43.68 ms, found 3 plugins.
+Refreshing native plugins compatible for Editor in 40.95 ms, found 3 plugins.
 Preloading 0 native plugins for Editor in 0.00 ms.
-Initialize engine version: 2020.3.15f1c1 (2f15a4c58450)
-[Subsystems] Discovering subsystems at path C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/Resources/UnitySubsystems
+Initialize engine version: 2020.3.15f2 (6cf78cb77498)
+[Subsystems] Discovering subsystems at path C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data/Resources/UnitySubsystems
 [Subsystems] Discovering subsystems at path D:/workflow/project/unity/ToneTuneToolkit/Assets
 GfxDevice: creating device client; threaded=0
 Direct3D:
@@ -32,79 +32,79 @@ Direct3D:
     VRAM:     8088 MB
     Driver:   27.21.14.5671
 Initialize mono
-Mono path[0] = 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/Managed'
-Mono path[1] = 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit'
-Mono config path = 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/MonoBleedingEdge/etc'
-Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56368
+Mono path[0] = 'C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data/Managed'
+Mono path[1] = 'C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data/MonoBleedingEdge/lib/mono/unityjit'
+Mono config path = 'C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data/MonoBleedingEdge/etc'
+Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56492
 Begin MonoManager ReloadAssembly
 Registering precompiled unity dll's ...
-Register platform support module: C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll
-Register platform support module: C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
-Registered in 0.003630 seconds.
+Register platform support module: C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll
+Register platform support module: C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
+Registered in 0.004007 seconds.
 Native extension for WindowsStandalone target not found
 Native extension for WebGL target not found
-Refreshing native plugins compatible for Editor in 42.50 ms, found 3 plugins.
+Refreshing native plugins compatible for Editor in 41.32 ms, found 3 plugins.
 Preloading 0 native plugins for Editor in 0.00 ms.
 Mono: successfully reloaded assembly
-- Completed reload, in  2.141 seconds
+- Completed reload, in  1.128 seconds
 Domain Reload Profiling:
-	ReloadAssembly (2141ms)
-		BeginReloadAssembly (62ms)
+	ReloadAssembly (1128ms)
+		BeginReloadAssembly (64ms)
 			ExecutionOrderSort (0ms)
 			DisableScriptedObjects (0ms)
 			BackupInstance (0ms)
 			ReleaseScriptingObjects (0ms)
 			CreateAndSetChildDomain (1ms)
-		EndReloadAssembly (398ms)
-			LoadAssemblies (59ms)
+		EndReloadAssembly (422ms)
+			LoadAssemblies (60ms)
 			RebuildTransferFunctionScriptingTraits (0ms)
-			SetupTypeCache (144ms)
+			SetupTypeCache (156ms)
 			ReleaseScriptCaches (0ms)
-			RebuildScriptCaches (29ms)
-			SetupLoadedEditorAssemblies (159ms)
+			RebuildScriptCaches (31ms)
+			SetupLoadedEditorAssemblies (164ms)
 				LogAssemblyErrors (0ms)
 				InitializePlatformSupportModulesInManaged (5ms)
 				SetLoadedEditorAssemblies (0ms)
-				RefreshPlugins (43ms)
+				RefreshPlugins (41ms)
 				BeforeProcessingInitializeOnLoad (9ms)
-				ProcessInitializeOnLoadAttributes (77ms)
-				ProcessInitializeOnLoadMethodAttributes (26ms)
+				ProcessInitializeOnLoadAttributes (80ms)
+				ProcessInitializeOnLoadMethodAttributes (28ms)
 				AfterProcessingInitializeOnLoad (0ms)
 				EditorAssembliesLoaded (0ms)
 			ExecutionOrderSort2 (0ms)
 			AwakeInstancesAfterBackupRestoration (0ms)
 Platform modules already initialized, skipping
 Registering precompiled user dll's ...
-Registered in 0.003014 seconds.
+Registered in 0.003443 seconds.
 Begin MonoManager ReloadAssembly
 Native extension for WindowsStandalone target not found
 Native extension for WebGL target not found
-Refreshing native plugins compatible for Editor in 42.31 ms, found 3 plugins.
+Refreshing native plugins compatible for Editor in 40.51 ms, found 3 plugins.
 Preloading 0 native plugins for Editor in 0.00 ms.
 Mono: successfully reloaded assembly
-- Completed reload, in  1.159 seconds
+- Completed reload, in  1.231 seconds
 Domain Reload Profiling:
-	ReloadAssembly (1160ms)
-		BeginReloadAssembly (146ms)
+	ReloadAssembly (1232ms)
+		BeginReloadAssembly (154ms)
 			ExecutionOrderSort (0ms)
 			DisableScriptedObjects (5ms)
 			BackupInstance (0ms)
 			ReleaseScriptingObjects (0ms)
-			CreateAndSetChildDomain (16ms)
-		EndReloadAssembly (950ms)
-			LoadAssemblies (95ms)
+			CreateAndSetChildDomain (17ms)
+		EndReloadAssembly (1011ms)
+			LoadAssemblies (103ms)
 			RebuildTransferFunctionScriptingTraits (0ms)
-			SetupTypeCache (280ms)
+			SetupTypeCache (302ms)
 			ReleaseScriptCaches (0ms)
-			RebuildScriptCaches (47ms)
-			SetupLoadedEditorAssemblies (419ms)
+			RebuildScriptCaches (48ms)
+			SetupLoadedEditorAssemblies (447ms)
 				LogAssemblyErrors (0ms)
 				InitializePlatformSupportModulesInManaged (5ms)
 				SetLoadedEditorAssemblies (0ms)
-				RefreshPlugins (42ms)
-				BeforeProcessingInitializeOnLoad (87ms)
-				ProcessInitializeOnLoadAttributes (262ms)
-				ProcessInitializeOnLoadMethodAttributes (11ms)
+				RefreshPlugins (41ms)
+				BeforeProcessingInitializeOnLoad (96ms)
+				ProcessInitializeOnLoadAttributes (280ms)
+				ProcessInitializeOnLoadMethodAttributes (13ms)
 				AfterProcessingInitializeOnLoad (11ms)
 				EditorAssembliesLoaded (0ms)
 			ExecutionOrderSort2 (0ms)
@@ -113,14 +113,14 @@ Platform modules already initialized, skipping
 ========================================================================
 Worker process is ready to serve import requests
 Launched and connected shader compiler UnityShaderCompiler.exe after 0.04 seconds
-Refreshing native plugins compatible for Editor in 0.44 ms, found 3 plugins.
+Refreshing native plugins compatible for Editor in 0.47 ms, found 3 plugins.
 Preloading 0 native plugins for Editor in 0.00 ms.
-Unloading 2141 Unused Serialized files (Serialized files now loaded: 0)
-System memory in use before: 170.7 MB.
-System memory in use after: 170.8 MB.
+Unloading 2134 Unused Serialized files (Serialized files now loaded: 0)
+System memory in use before: 168.1 MB.
+System memory in use after: 168.2 MB.
 
-Unloading 28 unused Assets to reduce memory usage. Loaded Objects now: 2600.
-Total: 2.364800 ms (FindLiveObjects: 0.174900 ms CreateObjectMapping: 0.071100 ms MarkObjects: 2.050800 ms  DeleteObjects: 0.066900 ms)
+Unloading 29 unused Assets to reduce memory usage. Loaded Objects now: 2592.
+Total: 2.658400 ms (FindLiveObjects: 0.189000 ms CreateObjectMapping: 0.072000 ms MarkObjects: 2.323000 ms  DeleteObjects: 0.073300 ms)
 
 AssetImportParameters requested are different than current active one (requested -> active):
   custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> 
@@ -134,293 +134,9 @@ AssetImportParameters requested are different than current active one (requested
   custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
 ========================================================================
 Received Import Request.
-  path: Assets/LearnStorage/02/Scenes
-  artifactKey: Guid(3dc4b3e6c8d62d947bfc721f5d77441d) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/LearnStorage/02/Scenes using Guid(3dc4b3e6c8d62d947bfc721f5d77441d) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '60bdd8fba0665cc5cbfb8794b03339b7') in 0.003622 seconds 
-  Import took 0.030270 seconds .
+  path: Assets/PDFs/007.pdf
+  artifactKey: Guid(b89977bd40e36e24a9e09afa0047ffef) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
+Start importing Assets/PDFs/007.pdf using Guid(b89977bd40e36e24a9e09afa0047ffef) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '22e98836310fbb3eedf9f5ab9155342a') in 0.035274 seconds 
+  Import took 0.062305 seconds .
 
-========================================================================
-Received Import Request.
-  Time since last request: 0.000287 seconds.
-  path: Assets/LearnStorage/02/Scenes/Example.unity
-  artifactKey: Guid(7ed423ddc5698a44da5d10a501286eba) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/LearnStorage/02/Scenes/Example.unity using Guid(7ed423ddc5698a44da5d10a501286eba) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '060123093a9ea303a21bee62d83fdd19') in 0.009801 seconds 
-  Import took 0.023090 seconds .
-
-========================================================================
-Received Prepare
-Registering precompiled user dll's ...
-Registered in 0.003018 seconds.
-Begin MonoManager ReloadAssembly
-Native extension for WindowsStandalone target not found
-Native extension for WebGL target not found
-Refreshing native plugins compatible for Editor in 0.46 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Mono: successfully reloaded assembly
-- Completed reload, in  1.059 seconds
-Domain Reload Profiling:
-	ReloadAssembly (1059ms)
-		BeginReloadAssembly (123ms)
-			ExecutionOrderSort (0ms)
-			DisableScriptedObjects (6ms)
-			BackupInstance (0ms)
-			ReleaseScriptingObjects (0ms)
-			CreateAndSetChildDomain (34ms)
-		EndReloadAssembly (870ms)
-			LoadAssemblies (95ms)
-			RebuildTransferFunctionScriptingTraits (0ms)
-			SetupTypeCache (276ms)
-			ReleaseScriptCaches (1ms)
-			RebuildScriptCaches (41ms)
-			SetupLoadedEditorAssemblies (365ms)
-				LogAssemblyErrors (0ms)
-				InitializePlatformSupportModulesInManaged (6ms)
-				SetLoadedEditorAssemblies (0ms)
-				RefreshPlugins (1ms)
-				BeforeProcessingInitializeOnLoad (94ms)
-				ProcessInitializeOnLoadAttributes (249ms)
-				ProcessInitializeOnLoadMethodAttributes (5ms)
-				AfterProcessingInitializeOnLoad (11ms)
-				EditorAssembliesLoaded (0ms)
-			ExecutionOrderSort2 (0ms)
-			AwakeInstancesAfterBackupRestoration (10ms)
-Platform modules already initialized, skipping
-Refreshing native plugins compatible for Editor in 0.44 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Unloading 2129 Unused Serialized files (Serialized files now loaded: 0)
-System memory in use before: 170.1 MB.
-System memory in use after: 170.3 MB.
-
-Unloading 18 unused Assets to reduce memory usage. Loaded Objects now: 2602.
-Total: 2.808000 ms (FindLiveObjects: 0.211900 ms CreateObjectMapping: 0.100800 ms MarkObjects: 2.473700 ms  DeleteObjects: 0.020500 ms)
-
-AssetImportParameters requested are different than current active one (requested -> active):
-  custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> 
-  custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> 
-  custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> 
-  custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> 
-  custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> 
-  custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> 
-  custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> 
-  custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
-  custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
-========================================================================
-Received Import Request.
-  Time since last request: 47.297669 seconds.
-  path: Assets/LearnStorage/03/Scenes/Example.unity
-  artifactKey: Guid(233d5225687f9f14d9529c7990094537) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/LearnStorage/03/Scenes/Example.unity using Guid(233d5225687f9f14d9529c7990094537) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '49a106f311298a178642ce3650075238') in 0.012386 seconds 
-  Import took 0.029263 seconds .
-
-========================================================================
-Received Import Request.
-  Time since last request: 9.563154 seconds.
-  path: Assets/LearnStorage/03/Scripts/SingletonTEST.cs
-  artifactKey: Guid(845b8e5769497fb46baa13306f5bc170) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/LearnStorage/03/Scripts/SingletonTEST.cs using Guid(845b8e5769497fb46baa13306f5bc170) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '9e78c06e35d415c1d60ed80e480752ff') in 0.025113 seconds 
-  Import took 0.041030 seconds .
-
-========================================================================
-Received Prepare
-Registering precompiled user dll's ...
-Registered in 0.003178 seconds.
-Begin MonoManager ReloadAssembly
-Native extension for WindowsStandalone target not found
-Native extension for WebGL target not found
-Refreshing native plugins compatible for Editor in 0.46 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Mono: successfully reloaded assembly
-- Completed reload, in  1.039 seconds
-Domain Reload Profiling:
-	ReloadAssembly (1039ms)
-		BeginReloadAssembly (117ms)
-			ExecutionOrderSort (0ms)
-			DisableScriptedObjects (6ms)
-			BackupInstance (0ms)
-			ReleaseScriptingObjects (0ms)
-			CreateAndSetChildDomain (33ms)
-		EndReloadAssembly (858ms)
-			LoadAssemblies (96ms)
-			RebuildTransferFunctionScriptingTraits (0ms)
-			SetupTypeCache (272ms)
-			ReleaseScriptCaches (1ms)
-			RebuildScriptCaches (40ms)
-			SetupLoadedEditorAssemblies (361ms)
-				LogAssemblyErrors (0ms)
-				InitializePlatformSupportModulesInManaged (6ms)
-				SetLoadedEditorAssemblies (0ms)
-				RefreshPlugins (1ms)
-				BeforeProcessingInitializeOnLoad (95ms)
-				ProcessInitializeOnLoadAttributes (244ms)
-				ProcessInitializeOnLoadMethodAttributes (5ms)
-				AfterProcessingInitializeOnLoad (11ms)
-				EditorAssembliesLoaded (0ms)
-			ExecutionOrderSort2 (0ms)
-			AwakeInstancesAfterBackupRestoration (10ms)
-Platform modules already initialized, skipping
-Refreshing native plugins compatible for Editor in 0.50 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Unloading 2127 Unused Serialized files (Serialized files now loaded: 0)
-System memory in use before: 170.2 MB.
-System memory in use after: 170.3 MB.
-
-Unloading 18 unused Assets to reduce memory usage. Loaded Objects now: 2604.
-Total: 2.458900 ms (FindLiveObjects: 0.173400 ms CreateObjectMapping: 0.073200 ms MarkObjects: 2.195000 ms  DeleteObjects: 0.016300 ms)
-
-AssetImportParameters requested are different than current active one (requested -> active):
-  custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> 
-  custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> 
-  custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> 
-  custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> 
-  custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> 
-  custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> 
-  custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> 
-  custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
-  custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
-========================================================================
-Received Import Request.
-  Time since last request: 58.784633 seconds.
-  path: Assets/LearnStorage/04/Scenes/Example.unity
-  artifactKey: Guid(b67c21ca1b1cd7e4193f3c2628612991) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/LearnStorage/04/Scenes/Example.unity using Guid(b67c21ca1b1cd7e4193f3c2628612991) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '83eed5e55648880bda70cfd1ba9ffd6e') in 0.023568 seconds 
-  Import took 0.040982 seconds .
-
-========================================================================
-Received Import Request.
-  Time since last request: 4.288640 seconds.
-  path: Assets/LearnStorage/04/Scripts/Counter.cs
-  artifactKey: Guid(0bde3777873391941ac81b7725a34346) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/LearnStorage/04/Scripts/Counter.cs using Guid(0bde3777873391941ac81b7725a34346) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '289408b44db4bc6b29e0f64b90a64ea6') in 0.001398 seconds 
-  Import took 0.004829 seconds .
-
-========================================================================
-Received Import Request.
-  Time since last request: 0.002564 seconds.
-  path: Assets/LearnStorage/04/Scripts/Counter.cs
-  artifactKey: Guid(0bde3777873391941ac81b7725a34346) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/LearnStorage/04/Scripts/Counter.cs using Guid(0bde3777873391941ac81b7725a34346) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '289408b44db4bc6b29e0f64b90a64ea6') in 0.001267 seconds 
-  Import took 0.004565 seconds .
-
-========================================================================
-Received Prepare
-Registering precompiled user dll's ...
-Registered in 0.003312 seconds.
-Begin MonoManager ReloadAssembly
-Native extension for WindowsStandalone target not found
-Native extension for WebGL target not found
-Refreshing native plugins compatible for Editor in 0.46 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Mono: successfully reloaded assembly
-- Completed reload, in  1.041 seconds
-Domain Reload Profiling:
-	ReloadAssembly (1042ms)
-		BeginReloadAssembly (120ms)
-			ExecutionOrderSort (0ms)
-			DisableScriptedObjects (7ms)
-			BackupInstance (0ms)
-			ReleaseScriptingObjects (0ms)
-			CreateAndSetChildDomain (32ms)
-		EndReloadAssembly (857ms)
-			LoadAssemblies (96ms)
-			RebuildTransferFunctionScriptingTraits (0ms)
-			SetupTypeCache (271ms)
-			ReleaseScriptCaches (1ms)
-			RebuildScriptCaches (40ms)
-			SetupLoadedEditorAssemblies (358ms)
-				LogAssemblyErrors (0ms)
-				InitializePlatformSupportModulesInManaged (6ms)
-				SetLoadedEditorAssemblies (0ms)
-				RefreshPlugins (1ms)
-				BeforeProcessingInitializeOnLoad (94ms)
-				ProcessInitializeOnLoadAttributes (242ms)
-				ProcessInitializeOnLoadMethodAttributes (5ms)
-				AfterProcessingInitializeOnLoad (11ms)
-				EditorAssembliesLoaded (0ms)
-			ExecutionOrderSort2 (0ms)
-			AwakeInstancesAfterBackupRestoration (10ms)
-Platform modules already initialized, skipping
-Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Unloading 2126 Unused Serialized files (Serialized files now loaded: 0)
-System memory in use before: 170.2 MB.
-System memory in use after: 170.3 MB.
-
-Unloading 17 unused Assets to reduce memory usage. Loaded Objects now: 2607.
-Total: 2.500900 ms (FindLiveObjects: 0.168200 ms CreateObjectMapping: 0.068000 ms MarkObjects: 2.246900 ms  DeleteObjects: 0.016800 ms)
-
-AssetImportParameters requested are different than current active one (requested -> active):
-  custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> 
-  custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> 
-  custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> 
-  custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> 
-  custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> 
-  custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> 
-  custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> 
-  custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
-  custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
-========================================================================
-Received Import Request.
-  Time since last request: 29.389083 seconds.
-  path: Assets/LearnStorage/_TEST/Scripts/TEST.cs
-  artifactKey: Guid(3dfae3f2d1f9553429a954dd6cd49349) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
-Start importing Assets/LearnStorage/_TEST/Scripts/TEST.cs using Guid(3dfae3f2d1f9553429a954dd6cd49349) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '0fc578abcaacebffb36dba64196287d2') in 0.003854 seconds 
-  Import took 0.013223 seconds .
-
-========================================================================
-Received Prepare
-Registering precompiled user dll's ...
-Registered in 0.003346 seconds.
-Begin MonoManager ReloadAssembly
-Native extension for WindowsStandalone target not found
-Native extension for WebGL target not found
-Refreshing native plugins compatible for Editor in 0.53 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Mono: successfully reloaded assembly
-- Completed reload, in  1.044 seconds
-Domain Reload Profiling:
-	ReloadAssembly (1044ms)
-		BeginReloadAssembly (122ms)
-			ExecutionOrderSort (0ms)
-			DisableScriptedObjects (6ms)
-			BackupInstance (0ms)
-			ReleaseScriptingObjects (0ms)
-			CreateAndSetChildDomain (31ms)
-		EndReloadAssembly (857ms)
-			LoadAssemblies (95ms)
-			RebuildTransferFunctionScriptingTraits (0ms)
-			SetupTypeCache (270ms)
-			ReleaseScriptCaches (1ms)
-			RebuildScriptCaches (42ms)
-			SetupLoadedEditorAssemblies (357ms)
-				LogAssemblyErrors (0ms)
-				InitializePlatformSupportModulesInManaged (6ms)
-				SetLoadedEditorAssemblies (0ms)
-				RefreshPlugins (1ms)
-				BeforeProcessingInitializeOnLoad (95ms)
-				ProcessInitializeOnLoadAttributes (240ms)
-				ProcessInitializeOnLoadMethodAttributes (5ms)
-				AfterProcessingInitializeOnLoad (10ms)
-				EditorAssembliesLoaded (0ms)
-			ExecutionOrderSort2 (0ms)
-			AwakeInstancesAfterBackupRestoration (10ms)
-Platform modules already initialized, skipping
-Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins.
-Preloading 0 native plugins for Editor in 0.00 ms.
-Unloading 2122 Unused Serialized files (Serialized files now loaded: 0)
-System memory in use before: 170.1 MB.
-System memory in use after: 170.2 MB.
-
-Unloading 20 unused Assets to reduce memory usage. Loaded Objects now: 2607.
-Total: 2.758100 ms (FindLiveObjects: 0.180200 ms CreateObjectMapping: 0.072500 ms MarkObjects: 2.482700 ms  DeleteObjects: 0.021700 ms)
-
-AssetImportParameters requested are different than current active one (requested -> active):
-  custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> 
-  custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> 
-  custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> 
-  custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> 
-  custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> 
-  custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> 
-  custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> 
-  custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
-  custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> 
 AssetImportWorkerClient::OnTransportError - code=2 error=End of file

Logs/shadercompiler-AssetImportWorker0.log

@@ -1,4 +1,4 @@
-Base path: 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data', plugins path 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/PlaybackEngines'
+Base path: 'C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data', plugins path 'C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler
 
 Unhandled exception: Protocol error - failed to read magic number (error -2147483644, transferred 0/4)

Logs/shadercompiler-UnityShaderCompiler.exe0.log

@@ -1,4 +1,6 @@
-Base path: 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data', plugins path 'C:/workflow/software/Unity/2020.3.15f1c1/Editor/Data/PlaybackEngines'
+Base path: 'C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data', plugins path 'C:/workflow/software/Unity/Editor/2020.3.15f2/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler
 
 Cmd: shutdown
+
+Quitting shader compiler process

Packages/packages-lock.json

@@ -11,7 +11,7 @@
         "com.unity.modules.animation": "1.0.0",
         "com.unity.modules.uielements": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.common": {
       "version": "4.0.3",
@@ -21,21 +21,21 @@
         "com.unity.2d.sprite": "1.0.0",
         "com.unity.modules.uielements": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.path": {
       "version": "4.0.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.pixel-perfect": {
       "version": "4.0.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.psdimporter": {
       "version": "4.1.0",
@@ -46,7 +46,7 @@
         "com.unity.2d.animation": "5.0.6",
         "com.unity.2d.sprite": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.sprite": {
       "version": "1.0.0",
@@ -64,7 +64,7 @@
         "com.unity.2d.path": "4.0.1",
         "com.unity.modules.physics2d": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.2d.tilemap": {
       "version": "1.0.0",
@@ -79,14 +79,14 @@
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "2.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
       "version": "2.0.7",
@@ -95,7 +95,7 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.1"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
       "version": "2.0.9",
@@ -104,28 +104,28 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
       "version": "1.2.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.mathematics": {
       "version": "1.1.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
       "version": "2.0.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
       "version": "1.1.27",
@@ -136,7 +136,7 @@
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
       "version": "3.0.6",
@@ -145,7 +145,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
       "version": "1.4.8",
@@ -157,7 +157,7 @@
         "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
       "version": "1.0.0",

ProjectSettings/PackageManagerSettings.asset

@@ -20,7 +20,7 @@ MonoBehaviour:
   m_Registries:
   - m_Id: main
     m_Name: 
-    m_Url: https://packages.unity.cn
+    m_Url: https://packages.unity.com
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.15f1c1
-m_EditorVersionWithRevision: 2020.3.15f1c1 (2f15a4c58450)
+m_EditorVersion: 2020.3.15f2
+m_EditorVersionWithRevision: 2020.3.15f2 (6cf78cb77498)

UserSettings/EditorUserSettings.asset

@@ -18,22 +18,22 @@ EditorUserSettings:
       value: 224247031146467f081843111326511505583d322d25363c2867083debf42d
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 224247031146467f081843111326511505583c2f3a1a293f2067083debf42d
+      value: 2242470311464677080f1e2c2337500217101d657c7969032e2c1336f1af1120e3ea26e5e2742a323016f6
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 2242470311464677080f1e2c2337500217101d657c7969032e2c1336f1af1120e3ea26e5e2742a323016f6
+      value: 2242470311464677080f1e2c2337500217101d657c7a69032e2c1336f1af1120e3ea26e5e2742a323016f6
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 2242470311464677080f1e2c2337500217101d657c7a69032e2c1336f1af1120e3ea26e5e2742a323016f6
+      value: 2242470311464677080f1e2c2337500217101d657c7b69032e2c1336f1af1120e3ea26e5e2742a323016f6
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 2242470311464677080f1e2c2337500217101d657c7b69032e2c1336f1af1120e3ea26e5e2742a323016f6
+      value: 2242470311464677080f1e2c2337500217101d657c7c69032e2c1336f1af1120e3ea26e5e2742a323016f6
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 2242470311464677080f1e2c2337500217101d657c7c69032e2c1336f1af1120e3ea26e5e2742a323016f6
+      value: 224247031146466f02000916052d5a2419181421253c691428241220adc53928f6fe76dae43f31397936ea311432002bf7441c05ff1f13
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 224247031146466f02000916052d5a2419181421253c691428241220adc53928f6fe76dae43f31397936ea311432002bf7441c05ff1f13
+      value: 224247031146467f081843111326511505583c2f3a1a293f2067083debf42d
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650