0312 debug文件优先级＞设置分支

hch

2024-07-29 23e7b2827ec8ad8a7e3faa3d3c9e0785f471f3c9

 Assets/Launch/ResourcesModel.cs

@@ -5,6 +5,8 @@
using LitJsonForAot;

using System.Collections;

using UnityEngine.Networking;

using StartAotSDK;

using UnityEngine.U2D;





namespace StartAot

@@ -25,8 +27,9 @@
        public bool isPCTestDownLoad = false;



        public static readonly string[] VERSION_URL = new string[] {

        "http://gamecenter.secondworld.net.cn:11000/center/appversion_new.php/?"};

        "http://vncenter.daojmengxvn.com:11000/center/appversion_new.php/?"};



        readonly static List<string> excludePngs = new List<string>() { "Launch_1.png", "Launch_2.png", "Launch_3.png", "LoginBackGround.png", "TB_DL_Logo.png" };



        public int debugBranch { get; private set; }



@@ -105,6 +108,14 @@
        {

            if (Application.isMobilePlatform)

            {

                if (LocalSave.GetString("#@#BrancH") != string.Empty)

                {

                    int tmpbranch;

                    int.TryParse(LocalSave.GetString("#@#BrancH").Substring(1), out tmpbranch);

                    if (tmpbranch != 0)

                        debugBranch = tmpbranch;

                }



                var parentDirectory = Directory.GetParent(Application.persistentDataPath);

                if (File.Exists(parentDirectory + "/Debug"))

                {

@@ -157,8 +168,8 @@
        {

            spriteBundle?.Unload(true);  //true完全卸载，更新后重新加载

            prefabBundle?.Unload(true);

            assetVersions.Clear();

            localAssetVersions.Clear();

            assetVersions = null;

            localAssetVersions = null;

            Debug.Log("提前ResourcesModel.Destroy资源");

        }



@@ -166,12 +177,6 @@
        public void RequestVersionCheck()

        {

            var versionConfig = VersionConfigEx.Get();



            if (versionConfig.assetAccess == VersionConfigEx.InstalledAsset.IngoreDownLoad)

            {

                step = LoadDllStep.ReadBytes;

                return;

            }

            var tables = new Dictionary<string, string>();

            tables["channel"] = versionConfig.appId;

            tables["versioncode"] = versionConfig.version;

@@ -182,7 +187,8 @@


            tables["game"] = versionConfig.gameId;



            var url = string.Concat(VERSION_URL[urlIndex % 2], HttpRequest.HashtablaToString(tables));

            //var url = string.Concat(VERSION_URL[urlIndex % 2], HttpRequest.HashtablaToString(tables));

            var url = string.Concat(VERSION_URL[0], HttpRequest.HashtablaToString(tables));

            urlIndex++;

            versionUrl = url;

            Debug.Log("http地址:versionUrl  " + url);

@@ -195,6 +201,13 @@
            {

                versionUrlResult = _result.Replace("{}", "null");

                versionInfo = JsonMapper.ToObject<VersionInfo>(versionUrlResult);



                if (VersionConfigEx.Get().assetAccess == VersionConfigEx.InstalledAsset.IngoreDownLoad)

                {

                    assetVersions = localAssetVersions;

                    step = LoadDllStep.ReadBytes;

                    return;

                }

                step = LoadDllStep.PrepareDownLoad;

            }

            else

@@ -244,8 +257,16 @@
        {

            Sprite sprite = null;

#if UNITY_EDITOR

            var path = StringUtility.Contact("Assets/ResourcesOut/BuiltIn/Sprites/", name, ".png");

            sprite = UnityEditor.AssetDatabase.LoadAssetAtPath<Sprite>(path);

            if (excludePngs.Contains(StringUtility.Contact(name, ".png")))

            {

                var path = StringUtility.Contact("Assets/ResourcesOut/BuiltIn/Sprites/", name, ".png");

                sprite = UnityEditor.AssetDatabase.LoadAssetAtPath<Sprite>(path);

            }

            else

            {

                var spriteAtlas = UnityEditor.AssetDatabase.LoadAssetAtPath<SpriteAtlas>("Assets/ResourcesOut/BuiltIn/Sprites/sprites.spriteatlasv2");

                sprite = spriteAtlas.GetSprite(name);

            }



#else

        if (spriteBundle == null)

@@ -437,7 +458,7 @@
                    if (isOK)

                        InitLocalLogicbytes(value);

                    else

                        Debug.LogError("InitTable logicbytes error");

                        Debug.LogWarning("InitTable logicbytes error");

                }, StreamingAssetPath));

            }

        }

@@ -456,6 +477,7 @@
                    try

                    {

                        var assetVersion = new AssetVersion(line);

                        assetVersion.localValid = true;

                        localAssetVersions[assetVersion.relativePath] = assetVersion;

                    }

                    catch (System.Exception ex)