Browse Source

解决2020.3.20 -> 2019.4.16降版本出现的问题

gongyan 3 years ago
parent
commit
0a202e90a9

File diff suppressed because it is too large
+ 1 - 2
LuaDemo/Assembly-CSharp-Editor.csproj


File diff suppressed because it is too large
+ 1 - 2
LuaDemo/Assembly-CSharp.csproj


+ 3 - 2
LuaDemo/Assets/SFramework/Module/SResourceManager.cs

@@ -231,8 +231,9 @@ namespace SFramework
                 {
                     // just wait.
                 }
-                //if (versionFileLoader.isNetworkError || versionFileLoader.isHttpError)
-                if (versionFileLoader.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || versionFileLoader.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
+                if (versionFileLoader.isNetworkError || versionFileLoader.isHttpError)
+                // for 2020
+                //if (versionFileLoader.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || versionFileLoader.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
                 {
                     Debug.LogError("GetLocalVersionInfo -> versionFileLoader error ->" + versionFileLoader.error);
                     return null;

+ 6 - 3
LuaDemo/Assets/SFramework/Module/SUpdateManager.cs

@@ -118,8 +118,9 @@ namespace SFramework
                 UnityEngine.Networking.UnityWebRequest.Get(hotfixLuaUrl);
             luaRequest.timeout = SFrameworkDef.httpRequestTimeoutTime;
             yield return luaRequest.SendWebRequest();
-            //if (luaRequest.isNetworkError || luaRequest.isHttpError)
-            if (luaRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || luaRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
+            if (luaRequest.isNetworkError || luaRequest.isHttpError)
+            // for 2020
+            //if (luaRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || luaRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
             {
                 Debug.LogError("SUpdateManager -> UpdateLogic luaRequest Error -> " + luaRequest.error);
                 UpdateStateInfo("Communication With Server ... Error: " + luaRequest.error);
@@ -161,7 +162,9 @@ namespace SFramework
                 UnityEngine.Networking.UnityWebRequest.Get(resVersionUrl);
             resVersionRequest.timeout = SFrameworkDef.httpRequestTimeoutTime;
             yield return resVersionRequest.SendWebRequest();
-            if (resVersionRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || resVersionRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
+            if (resVersionRequest.isNetworkError || resVersionRequest.isHttpError)
+            // for 2020
+            //if (resVersionRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || resVersionRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
             {
                 Debug.LogError("SUpdateManager -> UpdateLogic resVersionRequest Error -> " + resVersionRequest.error);
                 UpdateStateInfo("Communication With Resource Server ... Error: " + resVersionRequest.error);

+ 2 - 2
LuaDemo/Packages/manifest.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.11.2",
+    "com.unity.collab-proxy": "1.2.16",
     "com.unity.ide.rider": "2.0.7",
     "com.unity.ide.visualstudio": "2.0.14",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.29",
-    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.textmeshpro": "2.1.6",
     "com.unity.timeline": "1.4.8",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",

+ 2 - 14
LuaDemo/Packages/packages-lock.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": {
-      "version": "1.11.2",
+      "version": "1.2.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -51,7 +51,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "3.0.6",
+      "version": "2.1.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -213,18 +213,6 @@
       "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"
       }

+ 7 - 2
LuaDemo/ProjectSettings/EditorSettings.asset

@@ -3,7 +3,7 @@
 --- !u!159 &1
 EditorSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 9
   m_ExternalVersionControlSupport: Visible Meta Files
   m_SerializationMode: 2
   m_LineEndingsForNewScripts: 0
@@ -27,4 +27,9 @@ EditorSettings:
   m_EnterPlayModeOptions: 3
   m_ShowLightmapResolutionOverlay: 1
   m_UseLegacyProbeSampleCount: 0
-  m_SerializeInlineMappingsOnOneLine: 1
+  m_AssetPipelineMode: 1
+  m_CacheServerMode: 0
+  m_CacheServerEndpoint: 
+  m_CacheServerNamespacePrefix: default
+  m_CacheServerEnableDownload: 1
+  m_CacheServerEnableUpload: 1

+ 1 - 6
LuaDemo/ProjectSettings/PackageManagerSettings.asset

@@ -9,12 +9,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EnablePreviewPackages: 0
-  m_EnablePackageDependencies: 0
-  m_AdvancedSettingsExpanded: 1
   m_ScopedRegistriesSettingsExpanded: 1
   oneTimeWarningShown: 0
   m_Registries:
@@ -23,7 +20,6 @@ MonoBehaviour:
     m_Url: https://packages.unity.com
     m_Scopes: []
     m_IsDefault: 1
-    m_Capabilities: 7
   m_UserSelectedRegistryName: 
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
@@ -34,7 +30,6 @@ MonoBehaviour:
       m_Url: 
       m_Scopes: []
       m_IsDefault: 0
-      m_Capabilities: 0
     m_Modified: 0
     m_Name: 
     m_Url: 

+ 2 - 2
LuaDemo/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.20f1
-m_EditorVersionWithRevision: 2020.3.20f1 (41c4e627c95f)
+m_EditorVersion: 2019.4.16f1
+m_EditorVersionWithRevision: 2019.4.16f1 (e05b6e02d63e)

Some files were not shown because too many files changed in this diff