少年修仙传客户端代码仓库
client_linchunjie
2019-07-02 d1be45a4e52e56bd6077a4ec2204c0342157a8f5
7707 【2.0.200】【开发】驭灵卷技能支持预览
6个文件已修改
89 ■■■■■ 已修改文件
System/KnapSack/Logic/ModelShowPerfab.cs 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/FairyTreasureWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/HumanTreasureSkillDetailWin.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/HumanTreasureWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureBaseWin.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/UI3DHeroSkillShow.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ModelShowPerfab.cs
@@ -2,6 +2,7 @@
using UnityEngine.UI;
using System.Collections.Generic;
using System;
namespace Snxxz.UI
{
@@ -11,10 +12,21 @@
        [SerializeField] public RawImage modelImg;
        [SerializeField] public Text fightPowerText;
        [SerializeField] public Image fightImg;
        [SerializeField] Button m_ViewSkill;
        int displayId = 0;
        ModelShowType showType;
        FashionDressModel fashionDressModel { get { return ModelCenter.Instance.GetModel<FashionDressModel>(); } }
        ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
        private void Awake()
        {
            if (m_ViewSkill != null)
            {
                m_ViewSkill.onClick.AddListener(OnViewSkill);
            }
        }
        public void OnDisable()
        {
@@ -34,10 +46,20 @@
        {
            titleText.text = title;
            this.showType = showType;
            if (m_ViewSkill != null)
            {
                m_ViewSkill.gameObject.SetActive(false);
            }
            switch (showType)
            {
                case ModelShowType.Treasure:
                    displayId = id;
                    if (m_ViewSkill != null)
                    {
                        m_ViewSkill.gameObject.SetActive(id == 304);
                    }
                    fightImg.SetSprite("FightingLv_Normal");
                    UI3DTreasureExhibition.Instance.ShowTreasure(id, modelImg);
                    break;
@@ -127,6 +149,17 @@
            return data;
        }
        private void OnViewSkill()
        {
            WindowCenter.Instance.uiRoot.uicamera.gameObject.SetActive(false);
            CameraController.Instance.CameraObject.gameObject.SetActive(false);
            UI3DHeroSkillShow.Instance.ShowTreasureSkill(displayId, () =>
            {
                WindowCenter.Instance.uiRoot.uicamera.gameObject.SetActive(true);
                CameraController.Instance.CameraObject.gameObject.SetActive(true);
            });
        }
    }
    public enum ModelShowType
System/Treasure/FairyTreasureWin.cs
@@ -67,8 +67,6 @@
        private void OnPreviewTreasureSkill(bool isOpen)
        {
            m_TreasureFairyBehaviour.gameObject.SetActive(!isOpen);
            if (isOpen)
            {
                UI3DTreasureSelectStage.Instance.CloseRenderCamera();
System/Treasure/HumanTreasureSkillDetailWin.cs
@@ -42,7 +42,8 @@
            Display();
            var config = TreasureConfig.Get(treasureId);
            m_Preview.gameObject.SetActive(config.Category == (int)TreasureCategory.Human);
            m_Preview.gameObject.SetActive(config.Category == (int)TreasureCategory.Human
                || config.Category == (int)TreasureCategory.Fairy);
            if (WindowCenter.Instance.IsOpen<HumanTreasureWin>())
            {
@@ -93,7 +94,7 @@
                onPreviewTreasureSkill(true);
            }
            WindowCenter.Instance.uiRoot.uicamera.enabled = false;
            WindowCenter.Instance.uiRoot.uicamera.gameObject.SetActive(false);
            CameraController.Instance.CameraObject.gameObject.SetActive(false);
            UI3DHeroSkillShow.Instance.ShowTreasureSkill(treasureId, () =>
@@ -102,7 +103,7 @@
                {
                    onPreviewTreasureSkill(false);
                }
                WindowCenter.Instance.uiRoot.uicamera.enabled = true;
                WindowCenter.Instance.uiRoot.uicamera.gameObject.SetActive(true);
                if (!UI3DTreasureSelectStage.Instance.IsOpen)
                {
                    CameraController.Instance.CameraObject.gameObject.SetActive(true);
System/Treasure/HumanTreasureWin.cs
@@ -276,8 +276,6 @@
        private void OnPreviewTreasureSkill(bool state)
        {
            m_ContainerDisplay.gameObject.SetActive(!state);
            if (state)
            {
                UI3DTreasureSelectStage.Instance.CloseRenderCamera();
System/Treasure/TreasureBaseWin.cs
@@ -66,7 +66,6 @@
                }
            }
            HumanTreasureSkillDetailWin.onPreviewTreasureSkill += OnPreviewTreasureSkill;
        }
        protected override void OnAfterOpen()
@@ -102,7 +101,6 @@
            UI3DTreasureSelectStage.Instance.OnCameraBackComplete -= OnCameraBackComplete;
            m_DragSelect.onDragComplete -= OnDragComplete;
            model.treasureSelectedEvent -= TreasureSelectedEvent;
            HumanTreasureSkillDetailWin.onPreviewTreasureSkill -= OnPreviewTreasureSkill;
            if (!backToSelectWindow)
            {
@@ -114,11 +112,6 @@
        {
        }
        #endregion
        private void OnPreviewTreasureSkill(bool state)
        {
            DisplayContainer(!state);
        }
        private void TreasureSelectedEvent(int treasureId)
        {
@@ -314,11 +307,6 @@
            m_DisplayContainer.gameObject.SetActive(false);
            WindowCenter.Instance.Open<TreasureSelectWin>(true);
            UI3DTreasureSelectStage.Instance.StartBack();
        }
        public void DisplayContainer(bool active)
        {
            m_DisplayContainer.gameObject.SetActive(active);
        }
        private bool AllowSelectTreasure(int treasureId)
UI/Common/UI3DHeroSkillShow.cs
@@ -31,6 +31,7 @@
        [SerializeField] Animator m_CameraAnimator;
        [SerializeField] List<RuntimeAnimatorController> m_HeroShowControllers;
        [SerializeField] List<TreasureSkill> m_TreasureSkills;
        [SerializeField] List<SkillAct> m_SkillActs;
        UI3DShowHero m_HeroShow = new UI3DShowHero();
@@ -177,15 +178,26 @@
        private void StartPlaySkill(int _skillId)
        {
            var _cfg = SkillConfig.Get(_skillId);
            if (_cfg == null)
            var config = SkillConfig.Get(_skillId);
            if (config == null)
            {
                return;
            }
            if (_cfg.Skillactmark > 0
             && _cfg.Skillactmark < 20)
            var skillActMark = config.Skillactmark;
            var index = m_SkillActs.FindIndex((x) =>
            {
                switch (_cfg.Skillactmark)
                return x.skillId == _skillId;
            });
            if (index != -1)
            {
                skillActMark = m_SkillActs[index].mark;
            }
            if (skillActMark > 0 && skillActMark < 20)
            {
                switch (config.Skillactmark)
                {
                    case 10:
                        m_HeroAnimator.Play(GAStaticDefine.State_Attack1Hash, 0);
@@ -203,7 +215,7 @@
            }
            else
            {
                switch (_cfg.Skillactmark)
                switch (skillActMark)
                {
                    case 21:
                        m_HeroAnimator.Play(GAStaticDefine.State_Skill21, 0);
@@ -329,6 +341,13 @@
            public List<Effect> effects;
        }
        [Serializable]
        public struct SkillAct
        {
            public int skillId;
            public int mark;
        }
        public enum PlayerJob
        {
            Qiang = 1,