From 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 16:10:43 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/Core/ResModule/ScriptableObjectLoader.cs | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/Main/Core/ResModule/ScriptableObjectLoader.cs b/Main/Core/ResModule/ScriptableObjectLoader.cs
index 72900fa..bf11edc 100644
--- a/Main/Core/ResModule/ScriptableObjectLoader.cs
+++ b/Main/Core/ResModule/ScriptableObjectLoader.cs
@@ -1,5 +1,7 @@
锘縰sing UnityEngine;
using System;
+using Cysharp.Threading.Tasks;
+using ProjSG.Resource;
#if UNITY_EDITOR
using UnityEditor;
@@ -20,10 +22,10 @@
if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
- var resourcePath = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
+ var resourcePath = StringUtility.Concat(ResourcesPath.ResourcesOutAssetPath,
"ScriptableObject/NewBieGuide/",
SoNewBieGuide_Suffix,
- _id,
+ _id.ToString(),
".asset");
config = AssetDatabase.LoadAssetAtPath<NewBieGuideScriptableObject>(resourcePath);
@@ -31,9 +33,9 @@
}
else
{
- var assetName = StringUtility.Contact(SoNewBieGuide_Suffix, _id);
- var assetInfo = new AssetInfo(bundleName, assetName);
- config = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as NewBieGuideScriptableObject;
+ var assetName = StringUtility.Concat(SoNewBieGuide_Suffix, _id.ToString());
+ var assetPath = StringUtility.Concat("Assets/ResourcesOut/ScriptableObject/NewBieGuide/", assetName);
+ config = YooAssetService.Instance.LoadAssetSync<NewBieGuideScriptableObject>(assetPath);
}
if (config == null)
@@ -44,5 +46,35 @@
return config;
}
+ public static async UniTask<NewBieGuideScriptableObject> LoadSoNewBieGuideStepAsync(int _id)
+ {
+ NewBieGuideScriptableObject config = null;
+ if (!AssetSource.isUseAssetBundle)
+ {
+#if UNITY_EDITOR
+ var resourcePath = StringUtility.Concat(ResourcesPath.ResourcesOutAssetPath,
+ "ScriptableObject/NewBieGuide/",
+ SoNewBieGuide_Suffix,
+ _id.ToString(),
+ ".asset");
+
+ config = AssetDatabase.LoadAssetAtPath<NewBieGuideScriptableObject>(resourcePath);
+#endif
+ }
+ else
+ {
+ var assetName = StringUtility.Concat(SoNewBieGuide_Suffix, _id.ToString());
+ var assetPath = StringUtility.Concat("Assets/ResourcesOut/ScriptableObject/NewBieGuide/", assetName);
+ config = await YooAssetService.Instance.LoadAssetAsync<NewBieGuideScriptableObject>(assetPath);
+ }
+
+ if (config == null)
+ {
+ Debug.LogErrorFormat("ScriptableObjectLoader.LoadSoNewBieGuideStepAsync() => 鍔犺浇涓嶅埌璧勬簮: {0}.", _id);
+ }
+
+ return config;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0