6903 【2.0】【开发】法宝认主副本界面优化

client_linchunjie

2019-05-22 0241321774766aef9f342d35beb7deae99487b5a

6903 【2.0】【开发】法宝认主副本界面优化

 System/Dungeon/TreasureDungeonMissionHintWin.cs

@@ -24,6 +24,7 @@
        [SerializeField] Transform m_ContainerTreasure;

        [SerializeField] Image m_Icon;

        [SerializeField] ScreenMoveTo m_ScreenMoveTo;

        [SerializeField] Button m_ViewSkill;



        [SerializeField] Transform m_ContainerDemonDungeon;

        [SerializeField] PropertyBehaviour[] m_DemonPropertys;

@@ -41,6 +42,7 @@


        protected override void AddListeners()

        {

            m_ViewSkill.AddListener(ViewSkill);

        }



        protected override void OnPreOpen()

@@ -171,6 +173,12 @@
            m_Icon.SetSprite(config.Icon);

        }



        private void ViewSkill()

        {

            HumanTreasureSkillDetailWin.treasureId = treasureId;

            WindowCenter.Instance.Open<HumanTreasureSkillDetailWin>();

        }



        void DisplayDemonTreasureDungeon()

        {

            TreasureDungeon treasureDungeon;


 System/Treasure/HumanTreasureSkillDetailWin.cs

New file
@@ -0,0 +1,111 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Wednesday, May 22, 2019

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class HumanTreasureSkillDetailWin : Window

    {

        [SerializeField] RectTransform m_Container;

        [SerializeField] Image m_SkillDetailIcon;

        [SerializeField] Text m_SkillDetailName;

        [SerializeField] Text m_SkillCoolDown;

        [SerializeField] Button m_Preview;

        [SerializeField] Text m_SkillDescription;



        public static int treasureId = 0;



        public static event Action<bool> onPreviewTreasureSkill;



        TreasureModel model { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }



        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

            m_Preview.SetListener(Preview);

        }



        protected override void OnPreOpen()

        {

            Display();



            if (WindowCenter.Instance.IsOpen<TreasureBaseWin>())

            {

                m_Container.anchoredPosition = new Vector3(530, -500, 0);

            }

            else

            {

                m_Container.anchoredPosition = new Vector3(536, -300, 0);

            }

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

        }



        protected override void OnAfterClose()

        {

        }

        #endregion



        void Display()

        {

            Treasure treasure;

            if (model.TryGetTreasure(treasureId, out treasure))

            {

                var skillId = treasure.skillId;

                var skillConfig = SkillConfig.Get(skillId);

                m_SkillDetailIcon.SetSprite(skillConfig.IconName);

                m_SkillDetailName.text = skillConfig.SkillName;

                m_SkillDescription.text = skillConfig.Description;

                m_SkillCoolDown.text = skillConfig.CoolDownTime == 0 ? string.Empty :

                    Language.Get("L1065", skillConfig.CoolDownTime / 1000);

            }

        }



        private void Preview()

        {

            if (onPreviewTreasureSkill != null)

            {

                onPreviewTreasureSkill(true);

            }



            WindowCenter.Instance.uiRoot.uicamera.enabled = false;

            CameraController.Instance.CameraObject.gameObject.SetActive(false);



            UI3DHeroSkillShow.Instance.ShowTreasureSkill(treasureId, () =>

            {

                if (onPreviewTreasureSkill != null)

                {

                    onPreviewTreasureSkill(false);

                }

                WindowCenter.Instance.uiRoot.uicamera.enabled = true;

                if (!UI3DTreasureSelectStage.Instance.IsOpen)

                {

                    CameraController.Instance.CameraObject.gameObject.SetActive(true);

                }

            });

        }

    }



}










 System/Treasure/HumanTreasureSkillDetailWin.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 23bd9c8f96920b9448f0993f5603e871
timeCreated: 1558510794
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/Treasure/HumanTreasureWin.cs

@@ -35,14 +35,6 @@
        [SerializeField] UIEffect m_EffectInduction;

        [SerializeField] UIEffect m_EffectInduction1;



        [SerializeField] Transform m_ContainerSkillDetial;

        [SerializeField] Image m_SkillDetailIcon;

        [SerializeField] Text m_SkillDetailName;

        [SerializeField] Text m_SkillCoolDown;

        [SerializeField] Button m_Preview;

        [SerializeField] Text m_SkillDescription;

        


        [SerializeField] ScrollerController m_TaskController;



        bool animationStep = false;

@@ -66,7 +58,6 @@
        protected override void AddListeners()

        {

            m_Challenge.AddListener(Challenge);

            m_Preview.SetListener(Preview);

            m_ViewDetail.AddListener(ViewDetail);



            m_TaskController.OnRefreshCell += OnRefreshCell;

@@ -74,13 +65,12 @@


        protected override void OnPreOpen()

        {

            m_ContainerSkillDetial.gameObject.SetActive(false);



            animationStep = false;



            TreasureBaseWin.allowSelectTreasure += AllowSelectTreasure;

            model.treasureSelectedEvent += TreasureSelectedEvent;

            model.onInductionTaskComplete += OnInductionTaskComplete;

            HumanTreasureSkillDetailWin.onPreviewTreasureSkill += OnPreviewTreasureSkill;

        }



        protected override void OnActived()

@@ -99,6 +89,7 @@
            TreasureBaseWin.allowSelectTreasure -= AllowSelectTreasure;

            model.treasureSelectedEvent -= TreasureSelectedEvent;

            model.onInductionTaskComplete -= OnInductionTaskComplete;

            HumanTreasureSkillDetailWin.onPreviewTreasureSkill -= OnPreviewTreasureSkill;



            StopAllCoroutines();

        }

@@ -262,25 +253,6 @@
            m_Container.gameObject.SetActive(false);

        }



        void DisplaySkillDetail()

        {

            if (!m_ContainerSkillDetial.gameObject.activeSelf)

            {

                m_ContainerSkillDetial.gameObject.SetActive(true);

                Treasure treasure;

                if (model.TryGetTreasure(model.selectedTreasure, out treasure))

                {

                    var skillId = treasure.skillId;

                    var skillConfig = SkillConfig.Get(skillId);

                    m_SkillDetailIcon.SetSprite(skillConfig.IconName);

                    m_SkillDetailName.text = skillConfig.SkillName;

                    m_SkillDescription.text = skillConfig.Description;

                    m_SkillCoolDown.text = skillConfig.CoolDownTime == 0 ? string.Empty :

                        Language.Get("L1065", skillConfig.CoolDownTime / 1000);

                }

            }

        }



        private void OnTweenComplete()

        {

            animationStep = false;

@@ -296,9 +268,22 @@
            m_PositionTween1.SetEndState();

            m_PositionTween2.SetEndState();

            m_Container.gameObject.SetActive(true);

            m_ContainerSkillDetial.gameObject.SetActive(false);

            UI3DTreasureSelectStage.Instance.SetEndState();

            Display();

        }



        private void OnPreviewTreasureSkill(bool state)

        {

            m_ContainerDisplay.gameObject.SetActive(!state);



            if (state)

            {

                UI3DTreasureSelectStage.Instance.CloseRenderCamera();

            }

            else

            {

                UI3DTreasureSelectStage.Instance.OpenRenderCamera();

            }

        }



        private void OnInductionTaskComplete(int id)

@@ -340,7 +325,8 @@


        private void ViewDetail()

        {

            DisplaySkillDetail();

            HumanTreasureSkillDetailWin.treasureId = model.selectedTreasure;

            WindowCenter.Instance.Open<HumanTreasureSkillDetailWin>();

        }



        private bool AllowSelectTreasure(int treasureId)

@@ -366,23 +352,6 @@
                }

                taskCell.Display(cell.index, animation, displayTime);

            }

        }



        private void Preview()

        {

            UI3DTreasureSelectStage.Instance.CloseRenderCamera();

            m_ContainerDisplay.gameObject.SetActive(false);

            var baseWin = WindowCenter.Instance.Get<TreasureBaseWin>();

            if (baseWin != null)

            {

                baseWin.DisplayContainer(false);

            }

            UI3DHeroSkillShow.Instance.ShowTreasureSkill(model.selectedTreasure, () =>

            {

                UI3DTreasureSelectStage.Instance.OpenRenderCamera();

                m_ContainerDisplay.gameObject.SetActive(true);

                baseWin.DisplayContainer(true);

            });

        }

    }

}


 System/Treasure/TreasureBaseWin.cs

@@ -65,6 +65,8 @@
                    model.selectedTreasure = UI3DTreasureSelectStage.Instance.selectTreasure;

                }

            }



            HumanTreasureSkillDetailWin.onPreviewTreasureSkill += OnPreviewTreasureSkill;

        }



        protected override void OnAfterOpen()

@@ -100,6 +102,7 @@
            UI3DTreasureSelectStage.Instance.OnCameraBackComplete -= OnCameraBackComplete;

            m_DragSelect.onDragComplete -= OnDragComplete;

            model.treasureSelectedEvent -= TreasureSelectedEvent;

            HumanTreasureSkillDetailWin.onPreviewTreasureSkill -= OnPreviewTreasureSkill;



            if (!backToSelectWindow)

            {

@@ -111,6 +114,11 @@
        {

        }

        #endregion



        private void OnPreviewTreasureSkill(bool state)

        {

            DisplayContainer(!state);

        }



        private void TreasureSelectedEvent(int treasureId)

        {

@@ -200,7 +208,8 @@
            if (NewBieCenter.Instance.inGuiding

                 || WindowCenter.Instance.IsOpen<TreasureSoulActiveWin>()

                 || WindowCenter.Instance.IsOpen<DemonTreasurePropertyWin>()

                 || WindowCenter.Instance.IsOpen<ItemTipWin>())

                 || WindowCenter.Instance.IsOpen<ItemTipWin>()

                 || WindowCenter.Instance.IsOpen<HumanTreasureSkillDetailWin>())

            {

                return;

            }


 UI/Common/UI3DHeroSkillShow.cs

@@ -84,7 +84,10 @@


        private void ShowHeroSkill(int _skillId, string _clip)

        {

            UI3DTreasureSelectStage.Instance.showCamera.enabled = false;

            if (UI3DTreasureSelectStage.Instance.IsOpen)

            {

                UI3DTreasureSelectStage.Instance.showCamera.enabled = false;

            }



            cacheSkillId = _skillId;



@@ -278,7 +281,10 @@


        public void StopShow()

        {

            UI3DTreasureSelectStage.Instance.showCamera.enabled = true;

            if (UI3DTreasureSelectStage.Instance.IsOpen)

            {

                UI3DTreasureSelectStage.Instance.showCamera.enabled = true;

            }

            m_ShowCamera.gameObject.SetActive(false);

            m_HeroSkillCompletet = null;

            m_HeroShow.Dispose();