diff --git a/GQ_URP/GQ/Assets/Model/古泉站机房模型90个型号/1.fbm/gq_01.jpg b/GQ_URP/GQ/Assets/Model/古泉站机房模型90个型号/1.fbm/gq_01.jpg index 4735d2998..d434cde53 100644 Binary files a/GQ_URP/GQ/Assets/Model/古泉站机房模型90个型号/1.fbm/gq_01.jpg and b/GQ_URP/GQ/Assets/Model/古泉站机房模型90个型号/1.fbm/gq_01.jpg differ diff --git a/GQ_URP/GQ/Assets/Plugins/LitJson.dll b/GQ_URP/GQ/Assets/Plugins/LitJson.dll new file mode 100644 index 000000000..03d340193 Binary files /dev/null and b/GQ_URP/GQ/Assets/Plugins/LitJson.dll differ diff --git a/GQ_URP/GQ/Assets/Plugins/LitJson.dll.meta b/GQ_URP/GQ/Assets/Plugins/LitJson.dll.meta new file mode 100644 index 000000000..b80f58e99 --- /dev/null +++ b/GQ_URP/GQ/Assets/Plugins/LitJson.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: d9fd79e978ab54046877e491ae28ee41 +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: diff --git a/GQ_URP/GQ/Assets/script/接口/修改/AddDevice.cs b/GQ_URP/GQ/Assets/script/接口/修改/AddDevice.cs index 7eb1a758f..7bd71e6b6 100644 --- a/GQ_URP/GQ/Assets/script/接口/修改/AddDevice.cs +++ b/GQ_URP/GQ/Assets/script/接口/修改/AddDevice.cs @@ -3,12 +3,8 @@ using Newtonsoft.Json; using System; using System.Collections; using System.Collections.Generic; -using System.Threading.Tasks; -using Unity.VisualScripting.Antlr3.Runtime; using UnityEngine; -using UnityEngine.Events; using UnityEngine.UI; -using static GameManager; /// /// 设备-新增 /// diff --git a/GQ_URP/GQ/Packages/manifest.json b/GQ_URP/GQ/Packages/manifest.json index a5cd3ef3f..2b927a14b 100644 --- a/GQ_URP/GQ/Packages/manifest.json +++ b/GQ_URP/GQ/Packages/manifest.json @@ -1,16 +1,16 @@ { "dependencies": { - "com.unity.collab-proxy": "2.0.1", - "com.unity.ide.rider": "3.0.18", - "com.unity.ide.visualstudio": "2.0.17", + "com.unity.collab-proxy": "1.15.16", + "com.unity.ide.rider": "3.0.13", + "com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.vscode": "1.2.5", "com.unity.postprocessing": "3.2.2", - "com.unity.render-pipelines.universal": "12.1.10", + "com.unity.render-pipelines.universal": "12.1.6", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.8.0", + "com.unity.visualscripting": "1.7.6", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -43,4 +43,4 @@ "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" } -} +} \ No newline at end of file diff --git a/GQ_URP/GQ/Packages/packages-lock.json b/GQ_URP/GQ/Packages/packages-lock.json index cded8bc47..6e1cfbe15 100644 --- a/GQ_URP/GQ/Packages/packages-lock.json +++ b/GQ_URP/GQ/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.2", + "version": "1.6.5", "depth": 1, "source": "registry", "dependencies": { @@ -10,10 +10,12 @@ "url": "https://packages.unity.cn" }, "com.unity.collab-proxy": { - "version": "2.0.1", + "version": "1.15.16", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.services.core": "1.0.1" + }, "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { @@ -24,7 +26,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { - "version": "3.0.18", + "version": "3.0.13", "depth": 0, "source": "registry", "dependencies": { @@ -33,7 +35,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.14", "depth": 0, "source": "registry", "dependencies": { @@ -55,6 +57,13 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.0.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.cn" + }, "com.unity.postprocessing": { "version": "3.2.2", "depth": 0, @@ -65,7 +74,7 @@ "url": "https://packages.unity.cn" }, "com.unity.render-pipelines.core": { - "version": "12.1.10", + "version": "12.1.6", "depth": 1, "source": "builtin", "dependencies": { @@ -75,14 +84,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "12.1.10", + "version": "12.1.6", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.2", - "com.unity.render-pipelines.core": "12.1.10", - "com.unity.shadergraph": "12.1.10" + "com.unity.burst": "1.5.0", + "com.unity.render-pipelines.core": "12.1.6", + "com.unity.shadergraph": "12.1.6" } }, "com.unity.searcher": { @@ -92,12 +101,23 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, + "com.unity.services.core": { + "version": "1.3.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.cn" + }, "com.unity.shadergraph": { - "version": "12.1.10", + "version": "12.1.6", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.10", + "com.unity.render-pipelines.core": "12.1.6", "com.unity.searcher": "4.9.1" } }, @@ -143,7 +163,7 @@ } }, "com.unity.visualscripting": { - "version": "1.8.0", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/GQ_URP/GQ/ProjectSettings/ProjectVersion.txt b/GQ_URP/GQ/ProjectSettings/ProjectVersion.txt index 53df9d937..f9b5ef894 100644 --- a/GQ_URP/GQ/ProjectSettings/ProjectVersion.txt +++ b/GQ_URP/GQ/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.20f1c1 -m_EditorVersionWithRevision: 2021.3.20f1c1 (7cf0fbd73406) +m_EditorVersion: 2021.3.2f1c1 +m_EditorVersionWithRevision: 2021.3.2f1c1 (7ac240095d88)