少年修仙传客户端代码仓库
client_linchunjie
2019-06-13 6df700a2564d7e53e5c90e49e61d3ed747f03b07
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
51 ■■■■■ 已修改文件
System/FairyAu/ExchangeActiveTokenWin.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainInterfaceWin.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainPositionTween.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainWin/HighSettingFadeInFadeOut.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Tip/ExperienceFloat.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/ExchangeActiveTokenWin.cs
@@ -47,8 +47,7 @@
    protected override void OnPreOpen()
    {
        RefreshEquipsScroll();
        RefreshActiveCanGet();
        RefreshActiveCount();
        m_Model.RefreshActiveCanGetEvent += RefreshActiveCanGet;
        m_Model.ExchangetSuccessEvent += ExchangeSuccess;
    }
@@ -96,7 +95,9 @@
            itemModelAryList.Add(itemModelAry);
        }
        m_EquipsScroll.Init(itemModelAryList);
        RefreshActiveCanGet();
        RefreshActiveCount();
    }
}
System/MainInterfacePanel/MainInterfaceWin.cs
@@ -437,10 +437,12 @@
            }
            else
            {
                if (_unflod)
                m_MainPositionTween.SwitchFunctions(new MainPositionTween.SwitchParam()
                {
                    m_MainPositionTween.SwitchFunctions(new MainPositionTween.SwitchParam() { showDefault = true, immediately = false });
                }
                    bottomState = _unflod ? MainPositionTween.RightBottomState.Function : MainPositionTween.RightBottomState.Skill,
                    showDefault = true,
                    immediately = false
                });
            }
        }
System/MainInterfacePanel/MainPositionTween.cs
@@ -135,7 +135,7 @@
        static float resetToDefaultTimer = 0;
        public static void SetRecoverToSkillTimer()
        {
            resetToDefaultTimer = 20f;
            resetToDefaultTimer = 5f;
        }
        public void SwitchFunctions(SwitchParam switchParams)
@@ -151,14 +151,9 @@
        {
            var mapId = PlayerDatas.Instance.baseData.MapID;
            var isDungeon = MapUtility.IsDungeon(mapId);
            var isNeutralMap = false;
            var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(mapId);
            var isBossArea = PlayerDatas.Instance.hero != null && MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);
            var isGuiding = NewBieCenter.Instance.inGuiding;
            if (GeneralDefine.neutralBossMaps.Contains(mapId))
            {
                isNeutralMap = true;
            }
            m_ContainerBossList.gameObject.SetActive(isNeutralMap);
@@ -201,10 +196,19 @@
                    break;
            }
            var rightBottomState = resetToDefaultTimer <= 0f
                && switchParams.showDefault
                && !isGuiding
                && !treasureModel.newGotShowing ? RightBottomState.Skill : RightBottomState.Function;
            var rightBottomState = RightBottomState.Skill;
            switch (switchParams.bottomState)
            {
                case RightBottomState.None:
                    rightBottomState = resetToDefaultTimer <= 0f
                    && switchParams.showDefault
                    && !isGuiding
                    && !treasureModel.newGotShowing ? RightBottomState.Skill : RightBottomState.Function;
                    break;
                default:
                    rightBottomState = switchParams.bottomState;
                    break;
            }
            switch (rightBottomState)
            {
@@ -235,7 +239,7 @@
            }
            isDefaultState = rightBottomState == RightBottomState.Skill;
            resetToDefaultTimer = !isDefaultState ? 20f : 0f;
            resetToDefaultTimer = !isDefaultState ? 5f : 0f;
            m_RayMask.gameObject.SetActive(!isDefaultState);
            if (switchParams.immediately)
@@ -281,6 +285,7 @@
        public enum RightBottomState
        {
            None,
            Function,
            Skill,
        }
@@ -297,6 +302,7 @@
            public bool showDefault;
            public bool immediately;
            public bool manual;
            public RightBottomState bottomState;
        }
    }
System/MainWin/HighSettingFadeInFadeOut.cs
@@ -38,7 +38,7 @@
        public static void SetAutoCloseTimer()
        {
            closeTimer = 20f;
            closeTimer = 5f;
        }
        void Start()
System/Tip/ExperienceFloat.cs
@@ -52,7 +52,7 @@
                        m_ExperienceRate.text = StringUtility.Contact("(", experienceRateBuf / 100 + 100, "%)?");
                        break;
                    case 6:
                        m_ExperienceRate.text = StringUtility.Contact("(", experienceRateBuf / 100 + 100, "%)!");
                        m_ExperienceRate.text = "!";
                        break;
                    default:
                        m_ExperienceRate.text = "";
@@ -111,7 +111,7 @@
                var instance = pool.Request();
                var experienceFloat = instance.GetComponent<ExperienceFloat>();
                experienceFloat.SetEnable(true);
                experienceFloat.pattern= _pattern;
                experienceFloat.pattern = _pattern;
                return experienceFloat;
            }
            else