Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-12-22 5d634238845178c8cea928bad6d0d78f3f2029d2

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/GatheringSoul/GatherSoulHoleBehaviour.cs

@@ -99,6 +99,7 @@
                    data.SetGatherSoul(item.level, hole);

                    GatherSoulComposeModel.Compose compose;

                    bool requireCompose = composeModel.ExistInComposeMat(item.id, out compose);

                    data.SetTipsFuncBtn(ItemWinBtnType.putOff, OnTipFunc);

                    if (requireCompose)

                    {

                        data.SetTipsFuncBtn(ItemWinBtnType.compose, OnTipFunc);

@@ -107,7 +108,6 @@
                    {

                        data.SetTipsFuncBtn(ItemWinBtnType.LevelUp, OnTipFunc);

                    }

                    data.SetTipsFuncBtn(ItemWinBtnType.putOff, OnTipFunc);

                    itemTipsModel.SetItemTipsModel(data);

                }

                else


 System/GatheringSoul/GatherSoulItemBehaviour.cs

@@ -148,6 +148,16 @@
                    data.SetGatherSoul(item.level, -1, PackType.rptGatherSoul, displayItem.index);

                    if (item.itemType != GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE)

                    {

                        GatherSoulComposeModel.Compose compose;

                        if (composeModel.TryGetCompose(item.id, out compose)

                            && compose.requireItems.Count > 0)

                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.split, OnTipFunc);

                        }

                        else

                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.Resolve, OnTipFunc);

                        }

                        GatherSoulComposeModel.Compose outCompose;

                        bool requireCompose = composeModel.ExistInComposeMat(item.id, out outCompose);

                        if (requireCompose)

@@ -161,16 +171,6 @@
                        else

                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.Replace, OnTipFunc);

                        }

                        GatherSoulComposeModel.Compose compose;

                        if (composeModel.TryGetCompose(item.id, out compose)

                            && compose.requireItems.Count > 0)

                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.split, OnTipFunc);

                        }

                        else

                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.Resolve, OnTipFunc);

                        }

                    }

                    itemTipsModel.SetItemTipsModel(data);


 System/GatheringSoul/GatherSoulWin.cs

@@ -39,6 +39,11 @@
        {

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

        }



        DailyQuestModel dailyQuestModel

        {

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

        }

        #region Built-in

        protected override void BindController()

        {

@@ -162,7 +167,8 @@


        private void GetSoul()

        {



            dailyQuestModel.currentDailyQuest = (int)DailyQuestType.GatherSoulDungeon;

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1);

        }



        private void GotoCompose()