diff --git a/FindObjectBundleBuilder/Packages/manifest.json b/FindObjectBundleBuilder/Packages/manifest.json index 1ed4a7c..9316ec4 100644 --- a/FindObjectBundleBuilder/Packages/manifest.json +++ b/FindObjectBundleBuilder/Packages/manifest.json @@ -1,17 +1,17 @@ { "dependencies": { - "com.unity.collab-proxy": "2.2.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.feature.2d": "2.0.0", - "com.unity.ide.rider": "3.0.25", - "com.unity.ide.visualstudio": "2.0.21", + "com.unity.collab-proxy": "2.5.2", + "com.unity.feature.2d": "2.0.1", + "com.unity.ide.rider": "3.0.31", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", + "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.scriptablebuildpipeline": "1.20.2", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.5", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.9.1", + "com.unity.visualscripting": "1.9.4", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/FindObjectBundleBuilder/Packages/packages-lock.json b/FindObjectBundleBuilder/Packages/packages-lock.json index 7ed8eba..1f73f3f 100644 --- a/FindObjectBundleBuilder/Packages/packages-lock.json +++ b/FindObjectBundleBuilder/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "7.0.12", + "version": "7.1.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.6", + "com.unity.2d.common": "6.0.7", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -13,26 +13,26 @@ "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.0.1", + "version": "1.1.6", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.sprite": "1.0.0", "com.unity.2d.common": "6.0.6", + "com.unity.2d.sprite": "1.0.0", "com.unity.mathematics": "1.2.6", "com.unity.modules.animation": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "6.0.6", + "version": "6.0.7", "depth": 2, "source": "registry", "dependencies": { + "com.unity.burst": "1.5.1", "com.unity.2d.sprite": "1.0.0", "com.unity.mathematics": "1.1.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.burst": "1.5.1" + "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -51,13 +51,13 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "6.0.7", + "version": "6.0.9", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.animation": "7.0.9", - "com.unity.2d.common": "6.0.6", - "com.unity.2d.sprite": "1.0.0" + "com.unity.2d.common": "6.0.7", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.animation": "7.1.0" }, "url": "https://packages.unity.com" }, @@ -72,9 +72,9 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "6.0.6", "com.unity.2d.path": "5.0.2", + "com.unity.2d.common": "6.0.6", + "com.unity.mathematics": "1.1.0", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" @@ -90,24 +90,25 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.tilemap": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", "com.unity.ugui": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.6.6", + "version": "1.8.18", "depth": 3, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.2.0", + "version": "2.5.2", "depth": 0, "source": "registry", "dependencies": {}, @@ -121,22 +122,22 @@ "url": "https://packages.unity.com" }, "com.unity.feature.2d": { - "version": "2.0.0", + "version": "2.0.1", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "7.0.12", + "com.unity.2d.animation": "7.1.1", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "6.0.7", + "com.unity.2d.psdimporter": "6.0.9", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.spriteshape": "7.0.7", "com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap.extras": "2.2.7", - "com.unity.2d.aseprite": "1.0.1" + "com.unity.2d.aseprite": "1.1.6" } }, "com.unity.ide.rider": { - "version": "3.0.25", + "version": "3.0.31", "depth": 0, "source": "registry", "dependencies": { @@ -145,7 +146,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.21", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -168,7 +169,7 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", + "version": "3.2.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -206,9 +207,9 @@ "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -223,7 +224,7 @@ } }, "com.unity.visualscripting": { - "version": "1.9.1", + "version": "1.9.4", "depth": 0, "source": "registry", "dependencies": { diff --git a/FindObjectBundleBuilder/ProjectSettings/ProjectVersion.txt b/FindObjectBundleBuilder/ProjectSettings/ProjectVersion.txt index 265377b..8386a05 100644 --- a/FindObjectBundleBuilder/ProjectSettings/ProjectVersion.txt +++ b/FindObjectBundleBuilder/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.32f1 -m_EditorVersionWithRevision: 2021.3.32f1 (3b9dae9532f5) +m_EditorVersion: 2021.3.45f1 +m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79) diff --git a/FindObjectBundleBuilder/Tools/build_package/build_package.py b/FindObjectBundleBuilder/Tools/build_package/build_package.py index 4ee3977..d2d98c3 100644 --- a/FindObjectBundleBuilder/Tools/build_package/build_package.py +++ b/FindObjectBundleBuilder/Tools/build_package/build_package.py @@ -49,7 +49,7 @@ unity_proj_path = config.getUnityProjPath(env) # 主机IP IP = "" # Unity执行文件路径 -UNITY_PATH = "/Applications/Unity/Hub/Editor/2021.3.32f1/Unity.app/Contents/MacOS/Unity" +UNITY_PATH = "/Applications/Unity/Hub/Editor/2021.3.45f1/Unity.app/Contents/MacOS/Unity" # 项目路径 PROJECT_PATH = os.path.abspath(os.path.join(curr_dir, "../..")) # resource目录,最终要提交到CDN地文件 @@ -263,7 +263,7 @@ if __name__ == '__main__': opts.platform = "Android" opts.assets = "/Users/a0729/gogs.git/find-vertical-art" opts.resources = "/Users/a0729/gogs.git/find-vertical-bundle-resource" - opts.unityexe = "/Applications/Unity/Hub/Editor/2021.3.32f1/Unity.app/Contents/MacOS/Unity" + opts.unityexe = "/Applications/Unity/Hub/Editor/2021.3.45f1/Unity.app/Contents/MacOS/Unity" opts.log = "log/build.log" opts.upload = "false" # opts.special = "main_30point_ws20250422_1" diff --git a/FindObjectBundleBuilder/Tools/config.py b/FindObjectBundleBuilder/Tools/config.py index fa7fc4c..7571f8b 100644 --- a/FindObjectBundleBuilder/Tools/config.py +++ b/FindObjectBundleBuilder/Tools/config.py @@ -78,11 +78,11 @@ class machine_env_config(enum.Enum): # differences工程环境路径 "workspace_path": "/Volumes/Predator/find-object", # unity安装路径 - "unity_install_path": "/Applications/Unity/Hub/Editor/2020.3.32f1/Unity.app/Contents/MacOS/Unity", + "unity_install_path": "/Applications/Unity/Hub/Editor/2021.3.45f1/Unity.app/Contents/MacOS/Unity", } Local_Path = { "workspace_path": "/Users/a0729/gogs.git", - "unity_install_path": "/Applications/Unity/Hub/Editor/2021.3.32f1/Unity.app/Contents/MacOS/Unity", + "unity_install_path": "/Applications/Unity/Hub/Editor/2021.3.45f1/Unity.app/Contents/MacOS/Unity", } def getArtProjPath(env: machine_env_config):