125 【战斗】战斗系统 战斗封包处理 支持B426拆分FightAction 支持多重嵌套

yyl

7 天以前 8d42bc7ab52a3980df2778d2ee7757e60914e6e0

 Main/ResModule/ResManager.cs

@@ -5,6 +5,9 @@
using System.IO;
using UnityEngine.Video;
using Spine.Unity;
using UnityEngine.UI;





@@ -123,7 +126,7 @@
    }
#endif

    public T LoadAsset<T> (string directory, string name) where T : UnityEngine.Object
    public T LoadAsset<T> (string directory, string name, bool needExt = true) where T : UnityEngine.Object
    {
        T asset = null;
        //  特殊处理 因为有一层图集的关系 directory要传入的应该是atlas的名字
@@ -131,15 +134,26 @@
        {
            return LoadSprite(directory, name) as T;
        }
        else if (typeof(T) == typeof(SkeletonDataAsset))
        {
            //文件目录调整，name中包含了路径
            if (name.Contains("/"))
            {
                directory += name.Substring(0, name.LastIndexOf("/"));
                name = name.Substring(name.LastIndexOf("/") + 1);
            }

        return LoadAssetInternal<T>(directory, name);
            directory = directory.Replace("\\", "/");
        }

        return LoadAssetInternal<T>(directory, name, needExt);
    }

    private T LoadAssetInternal<T>(string directory, string name) where T : UnityEngine.Object
    private T LoadAssetInternal<T>(string directory, string name, bool needExt = true) where T : UnityEngine.Object
    {
        T asset = null;
        var path = ($"Assets/ResourcesOut/{directory}/{name}" + (needExt ? GetExtension(typeof(T)) : "")).Replace("//", "/").Trim().Replace("\\", "/");

        var path = ($"Assets/ResourcesOut/{directory}/{name}" + GetExtension(typeof(T))).Replace("//", "/").Trim().Replace("\\", "/");
        if (!AssetSource.isUseAssetBundle)
        {
#if UNITY_EDITOR
@@ -148,10 +162,28 @@
        }
        else
        {
            if (directory == "UI" || directory == "UIComp" || directory.StartsWith("Sprite") || directory == "Battle/Prefabs")
            { 
            if (!needExt)
            {
                //外部用到的自己加后缀，内部统一去除后缀名
                name = name.Substring(0, name.LastIndexOf("."));
            }

            if (directory == "UI" || directory == "UIComp" || directory.StartsWith("Sprite")
            || directory == "Battle/Prefabs" || directory == "Materials")
            {
                directory = "UI/" + directory;
            }
            else if (name == "Hero_001")
            {
                directory = "UI/Hero/SpineRes";
            }

            else if (directory.Contains("Texture"))
            {
                directory = "maps/" + name;
            }


            var assetInfo = new AssetInfo(directory.ToLower(), name.ToLower());
            asset = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo, typeof(T)) as T;
        }
@@ -183,15 +215,16 @@

    private Sprite LoadSprite(string atlasName, string spriteName)
    {
#if !UNITY_EDITOR
        SpriteAtlas atlas = LoadAsset<SpriteAtlas>("Sprite", atlasName.Replace("Sprite/", ""));
        return atlas.GetSprite(spriteName);
#else
        return ResManager.Instance.LoadAssetInternal<Sprite>(atlasName, spriteName);
#endif
        if (!AssetSource.isUseAssetBundle)
        { 
            SpriteAtlas atlas = LoadAsset<SpriteAtlas>("Sprite", atlasName.Replace("Sprite/", ""));
            return atlas.GetSprite(spriteName);
        }
        else
            return LoadAssetInternal<Sprite>(atlasName, spriteName);
    }

    public void LoadAssetAsync<T>(string directory, string name, Action<bool, UnityEngine.Object> callBack) where T : UnityEngine.Object
    public void LoadAssetAsync<T>(string directory, string name, Action<bool, UnityEngine.Object> callBack, bool needExt = true) where T : UnityEngine.Object
    {
        //  特殊处理 因为有一层图集的关系 directory要传入的应该是atlas的名字
        if (typeof(T) == typeof(Sprite))
@@ -200,7 +233,7 @@
            return;
        }

        LoadAssetAsyncInternal<T>(directory, name, callBack);
        LoadAssetAsyncInternal<T>(directory, name, callBack, needExt);
    }

    private void LoadSpriteAsync<T>(string atlasName, string spriteName, Action<bool, UnityEngine.Object> callBack) where T : UnityEngine.Object
@@ -223,9 +256,9 @@
#endif
    }

    private void LoadAssetAsyncInternal<T>(string directory, string name, Action<bool, UnityEngine.Object> callBack) where T : UnityEngine.Object
    private void LoadAssetAsyncInternal<T>(string directory, string name, Action<bool, UnityEngine.Object> callBack, bool needExt = true) where T : UnityEngine.Object
    {
        var path = string.Concat($"Assets/ResourcesOut/{directory}/{name}", GetExtension(typeof(T))).Replace("//", "/");
        var path = string.Concat($"Assets/ResourcesOut/{directory}/{name}", (needExt ? GetExtension(typeof(T)) : "")).Replace("//", "/");

        if (!AssetSource.isUseAssetBundle)
        {