From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/Core/ResModule/ScriptableObjectLoader.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Main/Core/ResModule/ScriptableObjectLoader.cs b/Main/Core/ResModule/ScriptableObjectLoader.cs
index 72900fa..70a6916 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;
@@ -13,17 +15,20 @@
public const string SoNewBieGuide_Suffix = "NewBieGuideStep_";
-
- public static NewBieGuideScriptableObject LoadSoNewBieGuideStep(int _id)
+
+ // 宸茬Щ闄ゅ悓姝ュ姞杞芥帴鍙ｏ紝寮哄埗涓氬姟鍏ㄩ儴璧板紓姝PI銆�
+ // public static NewBieGuideScriptableObject LoadSoNewBieGuideStep(int _id) => throw new NotSupportedException("鍚屾鍔犺浇宸茬鐢紝璇蜂娇鐢ㄥ紓姝ユ帴鍙�");
+
+ public static async UniTask<NewBieGuideScriptableObject> LoadSoNewBieGuideStepAsync(int _id)
{
NewBieGuideScriptableObject config = null;
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,14 +36,14 @@
}
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 = await YooAssetService.Instance.LoadAssetAsync<NewBieGuideScriptableObject>(assetPath);
}
if (config == null)
{
- Debug.LogErrorFormat("ScriptableObjectLoader.LoadSoNewBieGuideStep() => 鍔犺浇涓嶅埌璧勬簮: {0}.", _id);
+ Debug.LogErrorFormat("ScriptableObjectLoader.LoadSoNewBieGuideStepAsync() => 鍔犺浇涓嶅埌璧勬簮: {0}.", _id);
}
return config;
--
Gitblit v1.8.0