更新2020版本

LuaDemo/Assets/BundleEditing/Plugins/SFramework.meta

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

LuaDemo/Assets/BundleResource/Scenes/Update.unity

@@ -98,7 +98,8 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_LightingSettings: {fileID: 4890085278179872738, guid: ed950d7b7f4c4a84b8071edc37fa8774, type: 2}
+  m_LightingSettings: {fileID: 4890085278179872738, guid: ed950d7b7f4c4a84b8071edc37fa8774,
+    type: 2}
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -255,7 +256,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1727958737}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 475264068, guid: 78949cd819fa1fe4d9dfd4e34b20bbc1, type: 3}
+  m_Script: {fileID: 11500000, guid: 45861e82433559046b3ce402358e5d45, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &1926732199
@@ -307,7 +308,8 @@ MonoBehaviour:
   images:
     clearImage: {fileID: 2800000, guid: 79c2d337343c7b04abca85e5e8dc3408, type: 3}
     collapseImage: {fileID: 2800000, guid: 4e0f88347f5adbd43a1ba324c8dbcb7e, type: 3}
-    clearOnNewSceneImage: {fileID: 2800000, guid: 4a3b84dee49a75444a25d90004782017, type: 3}
+    clearOnNewSceneImage: {fileID: 2800000, guid: 4a3b84dee49a75444a25d90004782017,
+      type: 3}
     showTimeImage: {fileID: 2800000, guid: df893fd102ff24b4b8b323d1e3429288, type: 3}
     showSceneImage: {fileID: 2800000, guid: 84634c196c1762e4e9770a28f84a04b2, type: 3}
     userImage: {fileID: 2800000, guid: 88b9ea8dcae47fc48b11ac11cdd9cd33, type: 3}
@@ -326,11 +328,13 @@ MonoBehaviour:
     warningImage: {fileID: 2800000, guid: 9f2f624f22ec0ba48822543532c89f24, type: 3}
     errorImage: {fileID: 2800000, guid: 07fcdd6497a643c4d9f615472729e846, type: 3}
     barImage: {fileID: 2800000, guid: f5bac8656a6a3c843a07bf0db45343b6, type: 3}
-    button_activeImage: {fileID: 2800000, guid: 2c391e29da335ae4faf0ba6912d37c42, type: 3}
+    button_activeImage: {fileID: 2800000, guid: 2c391e29da335ae4faf0ba6912d37c42,
+      type: 3}
     even_logImage: {fileID: 2800000, guid: 65d1d28ad245ec54f94d3afd26713459, type: 3}
     odd_logImage: {fileID: 2800000, guid: 1c956527cd616fc4b9da0828d8b8dfe6, type: 3}
     selectedImage: {fileID: 2800000, guid: 72d2513a7d348a843a3c2e8670ca07cb, type: 3}
-    reporterScrollerSkin: {fileID: 11400000, guid: e15a46121742f8e4a83ccdc4384d4f4a, type: 2}
+    reporterScrollerSkin: {fileID: 11400000, guid: e15a46121742f8e4a83ccdc4384d4f4a,
+      type: 2}
   size: {x: 32, y: 32}
   maxSize: 20
   numOfCircleToShow: 1

LuaDemo/Assets/SFramework/Editor.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 91740a417a3904841a4972a94da1295a
+guid: 28c75bed8e2e802448b615d46a17eedd
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

LuaDemo/Assets/SFramework/Editor/SAssetsBundleHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0ea420757d4b9034497fc77a7aaae2f6
+guid: ddab7a66863f39949ac7de4a647695d3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Editor/SDataCleanHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 67d59d187d42ecb4b930637bd5bad352
+guid: 7928db1afb366e24791137d4628fbfc5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Editor/SSymbolLinkHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 975db4f5f3fd0364690f135437050f2d
+guid: 0a2950af8078a0347a13635813fe1f62
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Editor/Tools.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 38428914eb13d70428848232512d3e10
+guid: 0c5f227db78fcfb45b7957c273e9e4aa
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

LuaDemo/Assets/SFramework/Editor/Tools/SEditorUtils.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 15fee28a3e95e664b8e33a119021ebb3
+guid: 55b3db96ac194e14d8e62d3ec34f9eed
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Editor/Tools/SSymbolLink.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3cd49e8a33aae0e40bfc122c2b1e5fae
+guid: 0ce36bcd062006240b7133300e726f60
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Editor/Tools/SUnityEditorEventCatcher.cs

@@ -139,13 +139,13 @@ namespace SUnityEditorTools
             EditorApplication.update -= OnEditorUpdate;
             EditorApplication.update += OnEditorUpdate;
 
-            // change by Jiang XuFeng on 20220325 for warnning;
+            // change by sunxun on 20211011 for warnning;
             //SceneView.onSceneGUIDelegate -= OnSceneViewGUI;
             SceneView.duringSceneGui -= OnSceneViewGUI;
             //SceneView.onSceneGUIDelegate += OnSceneViewGUI;
             SceneView.duringSceneGui += OnSceneViewGUI;
 
-            // change by Jiang XuFeng on 20220325 for warnning;
+            // change by sunxun on 20181019 for warnning;
             //EditorApplication.playmodeStateChanged -= OnPlayModeStateChanged;
             EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
             //EditorApplication.playmodeStateChanged += OnPlayModeStateChanged;

LuaDemo/Assets/SFramework/Editor/Tools/SUnityEditorEventCatcher.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 51690eb89a7c2834c98383a7985283df
+guid: cd9aa7dfbc72fd742ae9e3348d8a36c1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Module/SCoroutineRunner.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ccf533a1dcbf41f44bf678af04f62fef
+guid: 94f45a7fd7781cb4fbd64fb3de7ccb05
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Module/SEventManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b526a25a3257a6f4bb13f3cef911cbd7
+guid: aef127a589d03624ea62e4faf7851c96
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Module/SResourceManager.cs

@@ -44,7 +44,7 @@ namespace SFramework
 
                 string abExtName = SFrameworkDef.AssetsBundleExtName;
                 targetObject = LoadOneAssetBundle(resourcePath + abExtName);
-                // Disable it on 20220325 by Jiang XuFeng. Because targeetObject == null. If the assetbundle.isStreamedSceneAssetBundle == true.
+                // Disable it on 20181023 by SunXun. Because targeetObject == null. If the assetbundle.isStreamedSceneAssetBundle == true.
                 // Debug.Assert(targetObject != null);
 
                 return targetObject;
@@ -231,9 +231,8 @@ namespace SFramework
                 {
                     // just wait.
                 }
-                if (versionFileLoader.isNetworkError || versionFileLoader.isHttpError)
-                // for 2020
-                //if (versionFileLoader.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || versionFileLoader.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
+                //if (versionFileLoader.isNetworkError || versionFileLoader.isHttpError)
+                if (versionFileLoader.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || versionFileLoader.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
                 {
                     Debug.LogError("GetLocalVersionInfo -> versionFileLoader error ->" + versionFileLoader.error);
                     return null;

LuaDemo/Assets/SFramework/Module/SResourceManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a0d149b1d11e573418f431b7f762cb50
+guid: bc3e2ebe15eeda149907c7b2654ae644
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Module/SUpdateManager.cs

@@ -118,9 +118,8 @@ namespace SFramework
                 UnityEngine.Networking.UnityWebRequest.Get(hotfixLuaUrl);
             luaRequest.timeout = SFrameworkDef.httpRequestTimeoutTime;
             yield return luaRequest.SendWebRequest();
-            if (luaRequest.isNetworkError || luaRequest.isHttpError)
-            // for 2020
-            //if (luaRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || luaRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
+            //if (luaRequest.isNetworkError || luaRequest.isHttpError)
+            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);
@@ -162,9 +161,7 @@ namespace SFramework
                 UnityEngine.Networking.UnityWebRequest.Get(resVersionUrl);
             resVersionRequest.timeout = SFrameworkDef.httpRequestTimeoutTime;
             yield return resVersionRequest.SendWebRequest();
-            if (resVersionRequest.isNetworkError || resVersionRequest.isHttpError)
-            // for 2020
-            //if (resVersionRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ConnectionError || resVersionRequest.result == UnityEngine.Networking.UnityWebRequest.Result.ProtocolError)
+            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);

LuaDemo/Assets/SFramework/Module/SUpdateManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 84719be4f0c331b459fe49970476b7bf
+guid: 45861e82433559046b3ce402358e5d45
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Module/SVersionInfo.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 21c1921fd2b8805458f32349f06c4caa
+guid: ea215c3da61232b4a9602c242601f984
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/SFrameworkDef.cs

@@ -13,8 +13,8 @@ namespace SFramework
 
         // ResourceManager
         // This is the Update Manager Flag.
-        //public const bool isEnableHotfix = false;
-        public const bool isEnableHotfix = true;
+        public const bool isEnableHotfix = false;
+        //public const bool isEnableHotfix = true;
         public const bool isLoadAssetsBundleOnEditor = false;
         //public const bool isLoadAssetsBundleOnEditor = true;
 
@@ -24,13 +24,11 @@ namespace SFramework
         // So We Should Put The Hotfix Lua On GameServer.
         //public const string hotfixLuaUrl = "http://192.168.2.125:21000/files/hotfix.lua";
         //public const string hotfixLuaUrl = "http://127.0.0.1:21000/files/hotfix.lua";
-        //public const string hotfixLuaUrl = "http://10.10.100.100:21000/hotfix.lua";
-        public const string hotfixLuaUrl = "http://192.168.1.135:80/hotfix.lua";
+        public const string hotfixLuaUrl = "http://10.10.100.100:21000/hotfix.lua";
         // We should put download server on non-game server like CDN in production mode.
         //public const string resourceVersionUrlBase = "http://192.168.2.125:21000/files/Bundles/";
         //public const string resourceVersionUrlBase = "http://127.0.0.1:21000/files/Bundles/";
-        //public const string resourceVersionUrlBase = "http://10.10.100.100:21000/Bundles/";
-        public const string resourceVersionUrlBase = "http://192.168.1.135:80/Bundles/";
+        public const string resourceVersionUrlBase = "http://10.10.100.100:21000/Bundles/";
         public const string resourceVersionName = "version.json";
     }
 } 

LuaDemo/Assets/SFramework/SFrameworkDef.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3e4e169f064e82b49a13565ac93d3f94
+guid: 31ac087448355594fbfa41dda9f4485d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Tools.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bd28e0aec1b622142be4176a187070e3
+guid: df39a1bfe919c49468c2894593225b64
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

LuaDemo/Assets/SFramework/Tools/SPlatformInfo.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 287ef7d3604fa8344ac3b94fa8f21d90
+guid: f2f15bab28b271748868970dbe3cff32
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/Tools/SToolFunction.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 774678b906ea2fe4ea9a39d79dec2e9c
+guid: 21e060f77cadd97428988fb2f9de4404
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/UI.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9775dd657dde8af4395d5f5e075b5a49
+guid: 95d634dbb2e2f2446abf0f2731a12a95
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

LuaDemo/Assets/SFramework/UI/SUIObjectBase.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c14a939fc02b8864a90b800d010a5bea
+guid: 89ac3669a885008439ba37c88447d7f1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/UI/SUIPanelTips.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a0b1e9f6665f57e4f965bb648f5bd598
+guid: ed497ac4cd4913e4e830fb506b070408
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/SFramework/UI/SUIPanelUpdate.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 10587076c3b495444b727ffa6bb150af
+guid: ec136a3e18e170246a496c66fae7fc52
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

LuaDemo/Assets/StreamingAssets/build_info.txt

@@ -1 +1 @@
-Build from DESKTOP-D8U0P0R at 2022/3/31 10:12:43
+Build from DESKTOP-D8U0P0R at 2022/4/7 21:10:41

LuaDemo/Packages/manifest.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.2.16",
+    "com.unity.collab-proxy": "1.11.2",
     "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": "2.1.6",
+    "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.4.8",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",

LuaDemo/Packages/packages-lock.json

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

LuaDemo/ProjectSettings/PackageManagerSettings.asset

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

LuaDemo/ProjectSettings/ProjectVersion.txt

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