少年修仙传客户端代码仓库
client_linchunjie
2018-11-24 24c1a05ada6869612a48f806bb758b8bda907beb
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
37 ■■■■ 已修改文件
System/Compose/New/ComposeEquipWin.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Welcome/WelcomeWin.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeEquipWin.cs
@@ -53,7 +53,8 @@
        [SerializeField]
        GameObject chooseComposeEquip;
        [SerializeField] GameObject container_ComposeEquip;
        [SerializeField] UIEffect composeEffect;
        [SerializeField] UIEffect composeEffect_Three;
        [SerializeField] UIEffect composeEffect_Five;
        [SerializeField] UIEffect successEffect;
        [SerializeField] UIEffect failEffect;
@@ -657,7 +658,18 @@
                    return;
                }
            }
            composeWinModel.SendComposeRequest(compoundModel,fixedItemIndexDict,composeEffect,1,10000,isIncreaseRate);
            composeWinModel.SendComposeRequest(compoundModel,fixedItemIndexDict, GetPlayUIEffct(), 1,10000,isIncreaseRate);
        }
        private UIEffect GetPlayUIEffct()
        {
            if (compoundModel == null) return null;
             if(compoundModel.unfixedItemCount <= 3)
            {
                return composeEffect_Three;
            }
            return composeEffect_Five;
        }
        private void OnComposeAnswer(HA814_tagMCMakeItemAnswer answer)
System/Welcome/WelcomeWin.cs
@@ -14,8 +14,8 @@
    public class WelcomeWin : Window
    {
        [SerializeField] UIAlphaTween m_AlphaTween;
        [SerializeField] UIAlphaTween m_FadeInTween;
        [SerializeField] UIAlphaTween m_FadeOutTween;
        [SerializeField] Button m_Close;
        [SerializeField] float m_ForbidTime = 5f;
        [SerializeField] float m_OutTime = 10f;
@@ -36,8 +36,10 @@
        protected override void OnPreOpen()
        {
            m_Close.gameObject.SetActive(false);
            superOutTime = m_OutTime + 5f;
            ensured = false;
            m_AlphaTween.SetStartState();
            m_FadeOutTween.SetStartState();
        }
        protected override void OnAfterOpen()
@@ -52,11 +54,22 @@
        {
        }
        protected override void OnActived()
        {
            base.OnActived();
            m_FadeInTween.Play();
        }
        protected override void LateUpdate()
        {
            base.LateUpdate();
            timer += Time.deltaTime;
            if (timer > m_ForbidTime && !m_Close.gameObject.activeInHierarchy)
            {
                m_Close.gameObject.SetActive(true);
            }
            if (timer > m_OutTime)
            {
                if (!ensured)
@@ -90,7 +103,7 @@
        private void FadeOut()
        {
            m_AlphaTween.Play(OnFadeOutComplete);
            m_FadeOutTween.Play(OnFadeOutComplete);
        }
        private void OnFadeOutComplete()