【1.4】聚魂功能

client_linchunjie

2018-12-20 38b1927a61ed9d887fd539e426896644bd6cb76e

【1.4】聚魂功能

 System/GatheringSoul/GatherSoulEquipCell.cs

@@ -9,7 +9,6 @@
    [XLua.Hotfix]

    public class GatherSoulEquipCell : CellView

    {

        [SerializeField] Image m_ItemBottom;

        [SerializeField] Image m_Icon;

        [SerializeField] Text m_Level;

        [SerializeField] PropertyBehaviour[] m_Propertys;

@@ -27,9 +26,8 @@
        public void Display(GatherSoulItem item)

        {

            var itemConfig = Config.Instance.Get<ItemConfig>(item.id);

            m_ItemBottom.SetItemBackGround(itemConfig.ItemColor);

            m_Icon.SetSprite(itemConfig.IconKey);

            m_Level.text = Language.Get("Z1024", item.level);

            m_Level.text = item.level.ToString();



            var list = model.gatherSoulPropertys[item.id];

            for (int i = 0; i < m_Propertys.Length; i++)


 System/GatheringSoul/GatherSoulItemBehaviour.cs

@@ -11,7 +11,6 @@
    public class GatherSoulItemBehaviour : MonoBehaviour

    {

        [SerializeField] RectTransform m_ContainerItem;

        [SerializeField] Image m_ItemBottom;

        [SerializeField] Image m_Icon;

        [SerializeField] RectTransform m_ContainerLevel;

        [SerializeField] Text m_Level;

@@ -100,13 +99,10 @@
                {

                    m_Level.text = displayItem.level.ToString();

                }

                if (m_ItemBottom != null)

                {

                    m_ItemBottom.SetItemBackGround(config.ItemColor);

                }

                if (m_ItemName != null)

                {

                    m_ItemName.text = config.ItemName;

                    m_ItemName.color = UIHelper.GetUIColor(config.ItemColor);

                }

            }

            DisplayEffect();


 System/GatheringSoul/GatherSoulResolveWin.cs

@@ -20,6 +20,8 @@
        [SerializeField] ScrollerController m_ScrollerControl;

        [SerializeField] Toggle m_AutoResolveToggle;

        [SerializeField] Button m_OpenQualitySort;

        [SerializeField] Image m_Arrow;

        [SerializeField] ClickScreenOtherSpace m_ClickSpace;

        [SerializeField] SortTable m_QualitySort;

        [SerializeField] Text m_Quality;

        [SerializeField] Text m_SoulDust;

@@ -38,6 +40,8 @@


        int selectQuality = 2;



        bool qualitySortOpen = false;



        #region Built-in

        protected override void BindController()

        {

@@ -55,7 +59,9 @@
        protected override void OnPreOpen()

        {

            model.resolveItems.Clear();



            m_QualitySort.gameObject.SetActive(false);

            qualitySortOpen = false;

            m_Arrow.transform.localEulerAngles = new Vector3(0, 0, 180);

            selectQuality = GetDefaultQuality();

            m_Quality.text = Language.Get(StringUtility.Contact("GatherSoulResolve_", selectQuality));

            m_Quality.color = UIHelper.GetUIColor(selectQuality);

@@ -84,6 +90,15 @@


        protected override void OnAfterClose()

        {

        }



        protected override void LateUpdate()

        {

            if (qualitySortOpen != m_QualitySort.gameObject.activeSelf)

            {

                qualitySortOpen = m_QualitySort.gameObject.activeSelf;

                QualitySortRefresh();

            }

        }

        #endregion



@@ -124,6 +139,11 @@
            }

        }



        private void QualitySortRefresh()

        {

            m_Arrow.transform.localEulerAngles = qualitySortOpen ? Vector3.zero : new Vector3(0, 0, 180);

        }



        private void OneKeyResolveRefresh()

        {

            m_ScrollerControl.m_Scorller.RefreshActiveCellViews();


 System/GatheringSoul/GatherSoulTipBase.cs

@@ -12,7 +12,6 @@
        [SerializeField] RectTransform m_ContainerEssence;

        [SerializeField] RectTransform m_ContainerSoul;

        [SerializeField] RectTransform m_ContainerItem;

        [SerializeField] Image m_ItemBottom;

        [SerializeField] Image m_ItemIcon;

        [SerializeField] Text m_ItemLevel;

        [SerializeField] Text m_EquipPlaceName;

@@ -27,7 +26,7 @@
        {

            var itemConfig = Config.Instance.Get<ItemConfig>(id);

            m_ItemName.text = itemConfig.ItemName;

            m_ItemBottom.SetItemBackGround(itemConfig.ItemColor);

            m_ItemName.color = UIHelper.GetUIColor(itemConfig.ItemColor);

            m_ItemIcon.SetSprite(itemConfig.IconKey);



            bool isSoulEssence = itemConfig.Type == GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE;

@@ -36,7 +35,7 @@
            m_ItemLevel.gameObject.SetActive(!isSoulEssence);

            if (!isSoulEssence)

            {

                m_ItemLevel.text = Language.Get("Z1024", level);

                m_ItemLevel.text = level.ToString();

                m_EquipPlaceName.text = GatheringSoulModel.GetEquipHoleName(id);

                m_Level.text = level.ToString();

            }


 System/GatheringSoul/GatherSoulTipWin.cs

@@ -14,8 +14,12 @@
    [XLua.Hotfix]

    public class GatherSoulTipWin : Window

    {

        [SerializeField] CanvasGroup m_CanvaGroup;

        [SerializeField] Image m_EquipedSign;

        [SerializeField] GatherSoulTipBase m_Base;

        [SerializeField] ScrollRect m_Scroller;

        [SerializeField] LayoutElement m_ScrollerLayout;

        [SerializeField] VerticalLayoutGroup m_ContentLayout;

        [SerializeField] GatherSoulTipProperty m_Property;

        [SerializeField] GatherSoulTipResolve m_Resolve;

        [SerializeField] RectTransform m_ContainerGetWay;

@@ -25,6 +29,8 @@
        [SerializeField] Text m_GetWay;



        [SerializeField] Button m_Close;



        [SerializeField] Vector2 m_ScrollerHeight = new Vector2(180, 260);



        ItemTipsModel itemTipsModel

        {

@@ -52,12 +58,16 @@
            Display();

            DisplayGetWay();

            DisplayFuncs();



            m_CanvaGroup.alpha = 0;

            m_Scroller.verticalNormalizedPosition = 1;

        }



        protected override void OnActived()

        {

            base.OnActived();

            transform.SetAsLastSibling();

            StartCoroutine(Co_GetHeight());

        }



        protected override void OnAfterOpen()

@@ -66,12 +76,28 @@


        protected override void OnPreClose()

        {

            StopAllCoroutines();

        }



        protected override void OnAfterClose()

        {

        }

        #endregion



        IEnumerator Co_GetHeight()

        {

            yield return null;

            yield return null;

            var height = m_Property.GetHeight();

            height += m_Resolve.GetHeight();

            height += m_ContentLayout.padding.top;

            height += m_ContentLayout.padding.bottom;

            height += m_ContentLayout.spacing * 1;

            height = Mathf.Clamp(height, m_ScrollerHeight.x, m_ScrollerHeight.y);

            m_ScrollerLayout.preferredHeight = height;

            yield return null;

            m_CanvaGroup.alpha = 1;

        }



        void DisplayEquipedSign()

        {

@@ -89,7 +115,12 @@


        void DisplayGetWay()

        {

            m_GetWay.text = itemTipsModel.curAttrData.itemConfig.Description;

            var config = itemTipsModel.curAttrData.itemConfig;

            m_ContainerGetWay.gameObject.SetActive(config != null && !string.IsNullOrEmpty(config.Description));

            if (config != null && !string.IsNullOrEmpty(config.Description))

            {

                m_GetWay.text = config.Description;

            }

        }



        void DisplayFuncs()


 System/GatheringSoul/GatherSoulWin.cs

@@ -150,7 +150,14 @@


        private void ViewProperty()

        {

            WindowCenter.Instance.Open<GatherSoulTotalPropertyWin>();

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

            {

                WindowCenter.Instance.Close<GatherSoulTotalPropertyWin>();

            }

            else

            {

                WindowCenter.Instance.Open<GatherSoulTotalPropertyWin>();

            }

        }



        private void GetSoul()


 System/GatheringSoul/GatheringSoulModel.cs

@@ -1300,7 +1300,7 @@
            replaceRedpoint.state = RedPointState.None;

            resolveRedpoint.state = RedPointState.None;

            levelUpRedpoint.state = RedPointState.None;

            if (!FuncOpen.Instance.IsFuncOpen(1))

            if (!FuncOpen.Instance.IsFuncOpen(155))

            {

                return;

            }


 System/Role/RolePanel.cs

@@ -280,14 +280,14 @@
        {

            CloseChild();

            WindowCenter.Instance.Open<GatherSoulWin>();

            functionOrder = 1;

            functionOrder = m_GatherSoul.order;

        }



        private void OnFuncMagician()

        {

            CloseChild();

            WindowCenter.Instance.Open<MagicianWin>();

            functionOrder = 3;

            functionOrder = functionButtonMagician.order;

        }



        private void OnFuncRole()