yyl
19 小时以前 4934ee3ee5ee0ce717cab2c6c001b580e9693e66
Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
4个文件已修改
28 ■■■■ 已修改文件
Main/Core/GameEngine/Launch/LaunchInHot.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Horse/HorseController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Main/MainWin.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/PhantasmPavilion/PhantasmPavilionManager.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/Core/GameEngine/Launch/LaunchInHot.cs
@@ -22,6 +22,20 @@
    void Start()
    {
#if !UNITY_EDITOR
        if (File.Exists(Directory.GetParent(Application.persistentDataPath) + "/Debug") ||
        LocalSave.GetString("#@#BrancH") != string.Empty)
        {
            Debug.unityLogger.logEnabled = true;
        }
        else
        {
            Debug.unityLogger.logEnabled = false;
        }
#endif
        System.Net.ServicePointManager.DefaultConnectionLimit = 100;//设置http最大连接数
        Application.backgroundLoadingPriority = ThreadPriority.High;
        Screen.sleepTimeout = SleepTimeout.NeverSleep;
Main/System/Horse/HorseController.cs
@@ -54,7 +54,7 @@
        skeletonGraphic = instanceGO.GetComponentInChildren<SkeletonGraphic>(true);
        skeletonGraphic.skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("UIEffect/Spine/Horse/", skinConfig.Spine);
        skeletonGraphic.skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("UIEffect/Spine/Horse", skinConfig.Spine);
        if (skeletonGraphic.skeletonDataAsset == null)
        {
Main/System/Main/MainWin.cs
@@ -164,7 +164,9 @@
            case PlayerDataType.default26:
                hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
                break;
            case PlayerDataType.ExAttr3:
                officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
                break;
        }
    }
Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
@@ -229,8 +229,6 @@
                spine.enabled = false;
                uiFrame.enabled = false;
                if (sprite == null)
                {
                    if (!IconConfig.HasKey(resourceValue))
@@ -246,6 +244,10 @@
                imgFace.enabled = true;
                uiFrame.enabled = false;
                spine.enabled = true;
                imgFace.sprite = null;
                imgFace.overrideSprite = null;
                spine.effectId = int.Parse(resourceValue);
                spine.isPlaySpineLoop = true;
                spine.Play();
@@ -255,7 +257,9 @@
                imgFace.enabled = true;
                spine.enabled = false;
                uiFrame.enabled = true;
                imgFace.sprite = null;
                imgFace.overrideSprite = null;
                if (!UIFrameMgr.Inst.ContainsDynamicImage(resourceValue))
                    break;