少年修仙传客户端代码仓库
client_Wu Xijin
2018-10-25 e985d7ed9beddb32fa26c02167b7a31e3cb7c999
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
53 ■■■■■ 已修改文件
System/Chat/ChatCtrl.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/New/OfflineHangUpUseWin.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/UI3DHeroSkillShow.cs 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Chat/ChatCtrl.cs
@@ -221,7 +221,8 @@
    {
        try
        {
            if (chatCenter.IsChatBanned)
            if (chatCenter.IsChatBanned || IsInviteChat(content)
                || KillRegex.IsMatch(content))
            {
                return;
            }
System/KnapSack/New/OfflineHangUpUseWin.cs
@@ -128,7 +128,8 @@
            }
            int addHour = (itemModel.chinItemModel.EffectValueA1 / 3600)* (int)Mathf.Ceil(_batchUseSlider.value);
            s = StringUtility.Contact(s,"+", Language.Get("ItemOverdue103",addHour));
            string addHourStr = UIHelper.GetTextColorByItemColor(TextColType.Green,StringUtility.Contact("+", Language.Get("ItemOverdue103", addHour)),true);
            s = StringUtility.Contact(s, addHourStr);
            return s;
        }
UI/Common/UI3DHeroSkillShow.cs
@@ -51,6 +51,8 @@
        Action m_HeroSkillCompletet;
        SFXController m_SkillExtraSfx;
        public int cacheSkillId { get; private set; }
        public Camera showCamera { get { return m_ShowCamera; } }
@@ -163,6 +165,15 @@
                });
                var _clip = _index != -1 ? _treasureSkill.clip[_index] : _treasureSkill.clip[0];
                ShowHeroSkill(_skillId, _clip.clip);
                if (_treasureSkill.effects != null && _treasureSkill.effects.Count > 0)
                {
                    _index = _treasureSkill.effects.FindIndex((x) =>
                    {
                        return (int)x.job == PlayerDatas.Instance.baseData.Job;
                    });
                    var _effect = _index != -1 ? _treasureSkill.effects[_index] : _treasureSkill.effects[0];
                    StartCoroutine(Co_PlayExtraEffect(_effect));
                }
            }
        }
@@ -251,12 +262,37 @@
            StopShow();
        }
        IEnumerator Co_PlayExtraEffect(Effect effect)
        {
            yield return new WaitForSeconds(effect.startTime);
            if (m_SkillExtraSfx != null)
            {
                SFXPlayUtility.Instance.Release(m_SkillExtraSfx);
                m_SkillExtraSfx = null;
            }
            var parent = hero;
            if (!string.IsNullOrEmpty(effect.parentName) && hero != null)
            {
                parent = hero.GetChildTransformDeeply(effect.parentName, true);
            }
            m_SkillExtraSfx = SFXPlayUtility.Instance.Play(effect.id, parent);
            if (m_SkillExtraSfx != null)
            {
                m_SkillExtraSfx.duration = effect.duration;
            }
        }
        public void StopShow()
        {
            UI3DTreasureSelectStage.Instance.showCamera.enabled = true;
            m_ShowCamera.gameObject.SetActive(false);
            m_HeroSkillCompletet = null;
            m_HeroShow.Dispose();
            if (m_SkillExtraSfx != null)
            {
                SFXPlayUtility.Instance.Release(m_SkillExtraSfx);
                m_SkillExtraSfx = null;
            }
        }
        [Serializable]
@@ -267,10 +303,21 @@
        }
        [Serializable]
        public struct Effect
        {
            public PlayerJob job;
            public int id;
            public float startTime;
            public float duration;
            public string parentName;
        }
        [Serializable]
        public struct TreasureSkill
        {
            public int treasureId;
            public List<CameraClip> clip;
            public List<Effect> effects;
        }
        public enum PlayerJob