hch
2025-09-11 b9086106957030c9a5cabc02923d052e805c5a8b
0312 打包导致报错的editor问题,删除了7z
5个文件已删除
5个文件已修改
1080 ■■■■■ 已修改文件
Main/Common/SevenZip.meta 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/Common/SevenZip/lzma.cs 873 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/Common/SevenZip/lzma.cs.meta 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/Core/GameEngine/Launch/AssetDeCompressTask.cs 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/ResModule/ResManager.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/SDK/SDKUtils.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Battle/BattleDebug.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/SystemSetting/SystemSetting.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/Utility/SevenZipUtility.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/Utility/SevenZipUtility.cs.meta 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/Common/SevenZip.meta
File was deleted
Main/Common/SevenZip/lzma.cs
File was deleted
Main/Common/SevenZip/lzma.cs.meta
File was deleted
Main/Core/GameEngine/Launch/AssetDeCompressTask.cs
@@ -35,77 +35,52 @@
        }
    }
    public static void Decompress(string path)
    {
        var files = new List<FileInfo>();
        FileExtersion.GetAllDirectoryFileInfos(path, files);
        foreach (var item in files)
        {
            var fullName = item.FullName;
            if (fullName.EndsWith(".7z"))
            {
                SevenZipUtility.DeCompress(fullName, Path.GetDirectoryName(fullName));
            }
        }
    }
    public static DecompressProgress DecompressAync(string path)
    {
        var progress = new DecompressProgress();
        var files = new List<FileInfo>();
        FileExtersion.GetAllDirectoryFileInfos(path, files);
        // var files = new List<FileInfo>();
        // FileExtersion.GetAllDirectoryFileInfos(path, files);
        for (var i = files.Count - 1; i >= 0; i--)
        {
            var fullName = files[i].FullName;
            if (!fullName.EndsWith(".7z"))
            {
                files.RemoveAt(i);
            }
        }
        // for (var i = files.Count - 1; i >= 0; i--)
        // {
        //     var fullName = files[i].FullName;
        //     if (!fullName.EndsWith(".7z"))
        //     {
        //         files.RemoveAt(i);
        //     }
        // }
        var total = files.Count;
        if (total == 0)
        {
            progress.progress = 1f;
        // var total = files.Count;
        // if (total == 0)
        // {
        //     progress.progress = 1f;
        //     progress.done = true;
        //     return progress;
        // }
        // ThreadPool.QueueUserWorkItem((object a) =>
        // {
        //     var index = 0;
        //     foreach (var item in files)
        //     {
        //         var fullName = item.FullName;
        //         if (fullName.EndsWith(".7z"))
        //         {
        //             SevenZipUtility.DeCompress(fullName, Path.GetDirectoryName(fullName));
        //             index++;
        //             progress.progress = index / (float)total;
        //         }
        //     }
        //     progress.done = true;
        // });
            progress.done = true;
            return progress;
        }
        ThreadPool.QueueUserWorkItem((object a) =>
        {
            var index = 0;
            foreach (var item in files)
            {
                var fullName = item.FullName;
                if (fullName.EndsWith(".7z"))
                {
                    SevenZipUtility.DeCompress(fullName, Path.GetDirectoryName(fullName));
                    index++;
                    progress.progress = index / (float)total;
                }
            }
            progress.done = true;
        });
        return progress;
    }
    public static void Delete7zFiles(string path)
    {
        var files = new List<FileInfo>();
        FileExtersion.GetAllDirectoryFileInfos(path, files);
        for (var i = files.Count - 1; i >= 0; i--)
        {
            var fullName = files[i].FullName;
            if (fullName.EndsWith(".7z"))
            {
                files[i].Delete();
            }
        }
    }
    public class DecompressProgress
    {
@@ -179,7 +154,6 @@
    public override void End()
    {
        AssetDeCompressTask.assetDeCompressVersion = VersionConfig.Get().version;
        AssetDeCompressTask.Delete7zFiles(ResourcesPath.Instance.ExternalStorePath);
    }
    public override void Update()
Main/ResModule/ResManager.cs
@@ -205,7 +205,8 @@
        LoadAssetAsync<SpriteAtlas>(atlasName, spriteName, (isLoaded, atlas) => {
            if (isLoaded)
            {
                callBack?.Invoke(isLoaded, atlas.GetSprite(spriteName));
                SpriteAtlas _atlas = atlas as SpriteAtlas;
                callBack?.Invoke(isLoaded, _atlas.GetSprite(spriteName));
            }
            else
            {
Main/SDK/SDKUtils.cs
@@ -910,10 +910,7 @@
        m_Json.Clear();
        m_Json["code"] = CodeU2A.FreePlatformLogout;
        SendMessageToSDK(m_Json);
        if (ChannelPlatform == E_ChannelPlatform.Yl)
        {
            FreePlatformLogin();
        }
        // FreePlatformLogin();
#endif
    }
    public void ShowAccountView()
@@ -922,10 +919,9 @@
        m_Json.Clear();
        m_Json["code"] = CodeU2A.ShowAccountView;
        SendMessageToSDK(m_Json);
        if (ChannelPlatform == E_ChannelPlatform.Yl)
        {
            FreePlatformLogin();
        }
        // FreePlatformLogin();
#endif
    }
    public void FreePlatformSwitchAccount()
Main/System/Battle/BattleDebug.cs
@@ -5,9 +5,11 @@
{
    public static void LogError(string _logMessage)
    {
#if UNITY_EDITOR
        if (Launch.Instance.isOpenBattleDebug)
        {
            Debug.LogError(_logMessage);
        }
#endif
    }
}
Main/System/SystemSetting/SystemSetting.cs
@@ -162,18 +162,18 @@
                break;
        }
#if UNITY_ANDROID && !UNITY_EDITOR
        if (_disabeCamera)
        {
            CameraManager.uiCamera.enabled = false;
        }
// #if !UNITY_EDITOR
//         if (_disabeCamera)
//         {
//             CameraManager.uiCamera.enabled = false;
//         }
        ResolutionUtility.AdjustResolution(_quality);
        if (_disabeCamera)
        {
            Co_WaitFewMinute();
        }
#endif
//         ResolutionUtility.AdjustResolution(_quality);
//         if (_disabeCamera)
//         {
//             Co_WaitFewMinute();
//         }
// #endif
        if (qualityLevelChangeEvent != null)
        {
Main/Utility/SevenZipUtility.cs
File was deleted
Main/Utility/SevenZipUtility.cs.meta
File was deleted