Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

8 天以前 bb5909bcd36b48b919366c95b4248a3754452698

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

 Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs

@@ -52,10 +52,6 @@

    public override void End()
    {
        if (AssetSource.isUseAssetBundle)
        {
            AssetBundleUtility.Instance.InitBuiltInAsset();
        }
        // ConfigInitiator.SyncInit();
        UIManager.Instance.CloseWindow<DownLoadWin>();
        UIManager.Instance.CloseWindow<VersionUpdateWin>();

 Main/Core/GameEngine/Launch/LaunchInHot.cs

@@ -26,6 +26,10 @@
        Application.backgroundLoadingPriority = ThreadPriority.High;
        Screen.sleepTimeout = SleepTimeout.NeverSleep;

        if (AssetSource.isUseAssetBundle)
        {
            AssetBundleUtility.Instance.InitBuiltInAsset();
        }

        InitSystemMgr();
        SDKUtils.Instance.Init();  //原sdk接口

 Main/Manager/UIManager.cs

@@ -481,8 +481,17 @@

    private UIBase LoadUIResource(string uiName)
    {
        
        // 从资源管理器加载UI预制体
        GameObject prefab = ResManager.Instance.LoadAsset<GameObject>("UI", uiName);
        GameObject prefab;
        if (uiName == "LaunchWin")
        {
            prefab = BuiltInLoader.LoadPrefab(uiName);
        }
        else
        {
            prefab = ResManager.Instance.LoadAsset<GameObject>("UI", uiName);
        }

        // 检查预制体是否加载成功
        if (prefab == null)

 Main/ResModule/AssetBundle/AssetBundleUtility.cs

@@ -434,6 +434,8 @@

        var isBuiltin = assetBundleName.Contains("builtin");
        string _path = isBuiltin ? AssetVersionUtility.GetBuiltInAssetFilePath(assetBundleName) : AssetVersionUtility.GetAssetFilePath(assetBundleName);
        Debug.LogFormat("Sync_LoadAssetBundle(): {0} => {1}", assetBundleName, _path);

        AssetBundle _assetBundle = AssetBundle.LoadFromFile(_path);

        CacheAssetBundle(assetBundleName, _assetBundle);

 Main/System/HeroUI/GiftBaseCell.cs

@@ -220,23 +220,23 @@
    {
        if (quality == 1)
        {
            //1D0029
            return new Color32(29, 0, 41, 128);
            //692088
            return new Color32(105, 32, 136, 128);
        }
        else if (quality == 2)
        {
            //372300
            return new Color32(55, 35, 0, 128);
            //886220
            return new Color32(136, 98, 32, 128);
        }
        else if (quality == 3)
        {
            //3A1800
            return new Color32(58, 24, 0, 128);
            //884a20
            return new Color32(136, 74, 32, 128);
        }
        else if (quality == 4)
        {
            //3A0000
            return new Color32(58, 0, 0, 128);
            //882020
            return new Color32(136, 32, 32, 128);
        }
        return new Color32(0, 0, 0, 128);
    }

 Main/Utility/DontDestroyOnLoad.cs

File was deleted

 Main/Utility/DontDestroyOnLoad.cs.meta

File was deleted

 Main/Utility/FrameEffect.cs

 Main/Utility/FrameEffect.cs.meta