【1.4】聚魂功能

client_linchunjie

2018-12-20 8f8ccc589e7cb93581a0830b708f2ee8e3ef4131

【1.4】聚魂功能

 System/Compose/New/ComposeWin.cs

@@ -270,7 +270,17 @@


        private void GatherSoulCompose()

        {

            CloseSubWindows();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<GatherSoulComposeWin>();

            }

            else

            {

                WindowCenter.Instance.Open<GatherSoulComposeWin>();

            }



            functionOrder = m_GatherSoulCompose.order;

        }






 System/GatheringSoul/GatherSoulComposeCategoryCell.cs

@@ -28,7 +28,14 @@


        private void OnFunc()

        {

            model.selectCategory = category;

            if (model.selectCategory.Equals(category))

            {

                model.selectCategory = default(GatherSoulComposeModel.ComposeCategory);

            }

            else

            {

                model.selectCategory = category;

            }

        }



        public void Display(GatherSoulComposeModel.ComposeCategory category)


 System/GatheringSoul/GatherSoulComposeWin.cs

@@ -43,14 +43,18 @@
        protected override void AddListeners()

        {

            m_Compose.onClick.AddListener(Compose);

            m_ScrollerControl.OnRefreshCell += OnRefreshCell;

        }



        protected override void OnPreOpen()

        {

            model.selectCategory = default(GatherSoulComposeModel.ComposeCategory);

            model.selectItemId = 0;

            Display();

            model.onSelectComposeItemChange += OnSelectComposeItemChange;

            model.onSelectCategoryChange += OnSelectCategoryChange;

            soulModel.gatherSoulPackRefresh += GatherSoulPackRefresh;

            DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent;

        }



        protected override void OnAfterOpen()

@@ -62,6 +66,7 @@
            model.onSelectComposeItemChange -= OnSelectComposeItemChange;

            model.onSelectCategoryChange -= OnSelectCategoryChange;

            soulModel.gatherSoulPackRefresh -= GatherSoulPackRefresh;

            DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent;

        }



        protected override void OnAfterClose()

@@ -87,8 +92,52 @@
            {

                model.selectItemId = 0;

            }

            else

            {

                var list = model.categoryDict[model.selectCategory];

                if (list == null || !list.Contains(model.selectItemId))

                {

                    model.selectItemId = 0;

                }

            }

            DisplayCompose();

            DisplayRequireLevel();

        }



        private void MakeItemAnswerEvent(H0721_tagMakeItemAnswer package)

        {

            if (package.MakeType == (byte)MakeType.Def_mitGatherSoulCompound)

            {

                if (model.selectItemId != 0)

                {

                    GatherSoulComposeModel.Compose compose;

                    if (model.TryGetCompose(model.selectItemId, out compose))

                    {

                        if (compose.requireSoulCore > 0 && compose.requireSoulSplinters > 0)

                        {

                            m_TwoMatEffect.Play();

                        }

                        else

                        {

                            m_OneMatEffect.Play();

                        }

                    }

                }

            }

        }



        private void OnRefreshCell(ScrollerDataType type, CellView cell)

        {

            if (type == ScrollerDataType.Header)

            {

                var categoryCell = cell as GatherSoulComposeCategoryCell;

                categoryCell.Display(model.composeCategories[cell.index]);

            }

            else if (type == ScrollerDataType.Normal)

            {

                var selectCell = cell as GatherSoulComposeSelectCell;

                selectCell.Display(cell.index);

            }

        }



        void Display()

@@ -100,18 +149,24 @@


        void DisplaySelect()

        {

            var jumpIndex = 0;

            m_ScrollerControl.Refresh();

            for (int i = 0; i < model.composeCategories.Count; i++)

            {

                var category = model.composeCategories[i];

                var list = model.categoryDict[category];

                m_ScrollerControl.AddCell(ScrollerDataType.Header, i);

                for (int k = 0; k < list.Count; k++)

                if (model.selectCategory.Equals(category))

                {

                    m_ScrollerControl.AddCell(ScrollerDataType.Normal, k);

                    jumpIndex = i;

                    for (int k = 0; k < list.Count; k++)

                    {

                        m_ScrollerControl.AddCell(ScrollerDataType.Normal, list[k]);

                    }

                }

            }

            m_ScrollerControl.Restart();

            m_ScrollerControl.JumpIndex(jumpIndex);

        }



        void DisplayCompose()


 Utility/EnumHelper.cs

@@ -815,6 +815,7 @@
    Def_DanRecycle = 20, //丹药回收

    Def_mitDogzEquipPlus = 21,// 神兽装备强化 

    Def_mitRuneCompound = 22,//符印合成

    Def_mitGatherSoulCompound = 23,//聚魂合成

}

/// <summary>

/// 金钱类型(虚拟物品)