From bc89c175e05b7e468c3c07dab7c9ff79619897b8 Mon Sep 17 00:00:00 2001 From: hevinci Date: Fri, 14 Jul 2023 09:58:27 +0800 Subject: [PATCH] update space shooter --- .../Scripts/Editor/PackageCompareWindow.cs | 2 +- .../Scripts/Editor/PackageImportWindow.cs | 2 +- .../StreamingAssetsHelper/StreamingAssetsDefine.cs | 5 +++++ .../StreamingAssetsDefine.cs.meta | 11 +++++++++++ .../StreamingAssetsHelper/StreamingAssetsHelper.cs | 5 ----- ...AssetsHelperOLD.cs => StreamingAssetsHelper2.cs} | 13 +++++-------- ...erOLD.cs.meta => StreamingAssetsHelper2.cs.meta} | 0 7 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsDefine.cs create mode 100644 Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsDefine.cs.meta rename Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/{StreamingAssetsHelperOLD.cs => StreamingAssetsHelper2.cs} (92%) rename Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/{StreamingAssetsHelperOLD.cs.meta => StreamingAssetsHelper2.cs.meta} (100%) diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs index 2cea177..81bf6f4 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageCompareWindow.cs @@ -10,7 +10,7 @@ namespace YooAsset.Editor { static PackageCompareWindow _thisInstance; - [MenuItem("YooAsset/补丁包比对工具", false, 302)] + [MenuItem("Tools/补丁包比对工具", false, 102)] static void ShowWindow() { if (_thisInstance == null) diff --git a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageImportWindow.cs b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageImportWindow.cs index f58a655..50fd7e5 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageImportWindow.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/PackageImportWindow.cs @@ -8,7 +8,7 @@ namespace YooAsset.Editor { static PackageImportWindow _thisInstance; - [MenuItem("YooAsset/补丁包导入工具", false, 301)] + [MenuItem("Tools/补丁包导入工具", false, 101)] static void ShowWindow() { if (_thisInstance == null) diff --git a/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsDefine.cs b/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsDefine.cs new file mode 100644 index 0000000..739aa3e --- /dev/null +++ b/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsDefine.cs @@ -0,0 +1,5 @@ + +public class StreamingAssetsDefine +{ + public const string RootFolderName = "yoo"; +} \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsDefine.cs.meta b/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsDefine.cs.meta new file mode 100644 index 0000000..ce70537 --- /dev/null +++ b/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsDefine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7e44d691f47abe34e9deb9cb309074f4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper.cs b/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper.cs index e041c72..623cb9f 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper.cs +++ b/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper.cs @@ -3,11 +3,6 @@ using System.Collections.Generic; using UnityEngine; using YooAsset; -public class StreamingAssetsDefine -{ - public const string RootFolderName = "yoo"; -} - /// /// 内置文件查询服务类 /// diff --git a/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelperOLD.cs b/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper2.cs similarity index 92% rename from Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelperOLD.cs rename to Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper2.cs index cf6be3a..16173b3 100644 --- a/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelperOLD.cs +++ b/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper2.cs @@ -6,26 +6,21 @@ using UnityEngine; using YooAsset; /* -public class StreamingAssetsDefine -{ - public const string RootFolderName = "yoo"; -} - /// /// 内置文件查询服务类 /// -public class GameQueryServices : IQueryServices +public class GameQueryServices2 : IQueryServices { public bool QueryStreamingAssets(string packageName, string fileName) { - return StreamingAssetsHelper.FileExists($"{StreamingAssetsDefine.RootFolderName}/{packageName}/{fileName}"); + return StreamingAssetsHelper2.FileExists($"{StreamingAssetsDefine.RootFolderName}/{packageName}/{fileName}"); } } /// /// StreamingAssets目录下资源查询帮助类 /// -public sealed class StreamingAssetsHelper +public sealed class StreamingAssetsHelper2 { private static readonly Dictionary _cacheData = new Dictionary(1000); @@ -131,7 +126,9 @@ internal class AndroidPost : UnityEditor.Android.IPostGenerateGradleAndroidProje */ + /* +// 以下代码为安卓原生代码，不需要解除注释 //auto-gen-function public boolean CheckAssetExist(String filePath) { diff --git a/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelperOLD.cs.meta b/Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper2.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelperOLD.cs.meta rename to Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper2.cs.meta