Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/Core/ResModule/ScriptableObjectLoader.cs

@@ -1,5 +1,7 @@
using UnityEngine;
using System;
using Cysharp.Threading.Tasks;
using ProjSG.Resource;

#if UNITY_EDITOR
using UnityEditor;
@@ -13,8 +15,11 @@
    public const string SoNewBieGuide_Suffix = "NewBieGuideStep_";
    

    
    public static NewBieGuideScriptableObject LoadSoNewBieGuideStep(int _id)

        // 已移除同步加载接口，强制业务全部走异步API。
        // public static NewBieGuideScriptableObject LoadSoNewBieGuideStep(int _id) => throw new NotSupportedException("同步加载已禁用，请使用异步接口");

    public static async UniTask<NewBieGuideScriptableObject> LoadSoNewBieGuideStepAsync(int _id)
    {
        NewBieGuideScriptableObject config = null;
        if (!AssetSource.isUseAssetBundle)
@@ -32,13 +37,13 @@
        else
        {
            var assetName = StringUtility.Concat(SoNewBieGuide_Suffix, _id.ToString());
            var assetInfo = new AssetInfo(bundleName, assetName);
            config = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as NewBieGuideScriptableObject;
            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;