2848 【1.5】装备合成跳转问题

Client_PangDeRong

2019-01-09 801882a9e5814aa9a6be54a93fbc73cafe3ec513

2848 【1.5】装备合成跳转问题

 System/Compose/New/ComposeEquipWin.cs

@@ -154,35 +154,16 @@


        private void DefaultSelect()

        {

            bool isJumpTo = false;

            if (composeWinModel.secondType != 0)

            {

                isJumpTo = true;

                curSecondType = composeWinModel.secondType;

                curThirdType = composeWinModel.thirdType;

                composeWinModel.ResetJumpToModel();

            }



            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Equip, curSecondType, curThirdType, out thirdTypeData);

            if (thirdTypeData != null)

            if(composeWinModel.CurComposeModel == null)

            {

                RefreshUI(thirdTypeData.itemCompound);

                if (isJumpTo)

                {

                    isJumpTo = false;

                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound) || !composeWinModel.IsEnoughUnfixedMat(thirdTypeData.itemCompound))

                    {

                        MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));

                    }

                    else if (!composeWinModel.IsEnoughMoney(thirdTypeData.itemCompound))

                    {

                        MessageWin.Inst.ShowFixedTip(Language.Get("Z1011"));

                    }

                }

            }

            else

            {

                RefreshUI(null);

                curComposeEquipIndex = -1;

            }

        }




 System/Compose/New/ComposeWin.cs

@@ -69,6 +69,7 @@


        protected override void OnPreOpen()

        {

            DebugEx.Log("是否跳转打开界面：" + WindowJumpMgr.Instance.IsJumpState);

            ComposeModel.ResetModel();



            if (WindowJumpMgr.Instance.IsJumpState && ComposeModel.secondType == 0)

@@ -100,6 +101,11 @@
                    }

                }

            }

            else

            {

                ComposeModel.SetCurComposeModel(null);

            }

           
        }



        protected override void OnActived()