4709 【1.3】【前端】魔族法宝界面修改

client_linchunjie

2018-11-24 720b1f25a9ffbda69b091c14fede719e9cff0fda

4709 【1.3】【前端】魔族法宝界面修改

 System/Treasure/DemonTreasureWin.cs

@@ -16,6 +16,7 @@
    public class DemonTreasureWin : Window

    {

        [SerializeField] TreasureDemonBehaviour m_TreasureDemonBehaviour;

        [SerializeField] Image m_TreasureNameIcon;

        [SerializeField] Text m_PropertyTitle;

        [SerializeField] PropertyBehaviour[] m_Propertys;

        [SerializeField] Text m_SkillTitle;

@@ -38,7 +39,6 @@
        [SerializeField] PositionTween m_TreasureGainTween;

        [SerializeField] PositionTween m_DescriptionTween;

        [SerializeField] PositionTween m_SkillTween;

        [SerializeField] PositionTween m_NameTween;

        [SerializeField] UIAlphaTween m_DungeonAlphaTween;



        [SerializeField] float m_SelectHeight = 253f;

@@ -211,6 +211,7 @@
            DisplayDungeons();

            DisplayChallenge();

            DisplayDungeonPosition();

            DisplayTreasureName();

        }



        private void DisplayAnimation()

@@ -219,7 +220,6 @@
            {

                case AnimationStep.None2Lock:

                    m_DescriptionTween.Play();

                    m_NameTween.Play();

                    m_SkillTween.Play();

                    m_TreasureGainTween.SetStartState();

                    UI3DTreasureSelectStage.Instance.SetStartState();

@@ -231,13 +231,9 @@
                    treasureTweening = true;

                    timer = 0f;

                    StopAllLine();

                    UI3DTreasureSelectStage.Instance.Tween(()=> 
                    {

                        treasureTweening = false;

                        DisplayLines();

                    });

                    m_TreasureNameIcon.gameObject.SetActive(false);

                    UI3DTreasureSelectStage.Instance.Tween(OnTreasureTweenComplete);

                    m_DescriptionTween.SetStartState();

                    m_NameTween.SetStartState();

                    m_SkillTween.SetStartState();

                    m_TreasureGainTween.Play();

                    break;

@@ -247,13 +243,8 @@
                    treasureTweening = true;

                    timer = 0f;

                    StopAllLine();

                    UI3DTreasureSelectStage.Instance.Tween(() =>

                    {

                        treasureTweening = false;

                        DisplayLines();

                    });

                    UI3DTreasureSelectStage.Instance.Tween(OnTreasureTweenComplete);

                    m_DescriptionTween.Play(true);

                    m_NameTween.Play(true);

                    m_SkillTween.Play(true);

                    m_TreasureGainTween.Play();

                    break;

@@ -261,13 +252,31 @@
                    m_ContainerDungeons.gameObject.SetActive(false);

                    UI3DTreasureSelectStage.Instance.SetStartState();

                    m_DescriptionTween.Play();

                    m_NameTween.Play();

                    m_SkillTween.Play();

                    m_TreasureGainTween.Play(true);

                    break;

            }

        }



        void OnTreasureTweenComplete()

        {

            treasureTweening = false;

            DisplayLines();

            DisplayTreasureName();

        }



        private void DisplayTreasureName()

        {

            if (treasureTweening)

            {

                m_TreasureNameIcon.gameObject.SetActive(false);

                return;

            }

            m_TreasureNameIcon.gameObject.SetActive(true);

            var config = Config.Instance.Get<TreasureConfig>(model.selectedTreasure);

            m_TreasureNameIcon.SetSprite(config.TreasureNameIcon);

        }



        private void DisplayProperty()

        {

            TreasureDungeon treasureDungeon;


 System/Treasure/TreasureDemonBehaviour.cs

@@ -9,7 +9,6 @@
{

    public class TreasureDemonBehaviour : MonoBehaviour

    {

        [SerializeField] Image m_TreasureNameIcon;

        [SerializeField] Text m_TreasureDescription;

        [SerializeField] RectTransform m_ContainerFightPower;

        [SerializeField] Text m_FightPower;

@@ -63,7 +62,6 @@
            var myPower = PlayerDatas.Instance.baseData.FightPoint;

            m_ContainerLimit.gameObject.SetActive(m_Treasure.state == TreasureState.Locked);

            m_ContainerFightPower.gameObject.SetActive(m_Treasure.state == TreasureState.Collected);

            m_TreasureNameIcon.SetSprite(config.TreasureNameIcon);



            if (m_Treasure.state == TreasureState.Locked)

            {