4282 【主干】【BUG】古神禁地门票合成按钮无反应

client_Wu Xijin

2019-06-28 05c1a42de14e739355502e0ae218d435fb87c207

4282 【主干】【BUG】古神禁地门票合成按钮无反应

 System/Achievement/AchievementGotoPart3.cs

@@ -43,9 +43,6 @@
                case JumpUIType.ComposeFunc2:
                    funcType = ComposeFuncType.Ticket;
                    break;
                case JumpUIType.ComposeFunc3:
                    funcType = ComposeFuncType.Fairy;
                    break;
                case JumpUIType.ComposeFunc4:
                    funcType = ComposeFuncType.Equip;
                    break;

 System/Compose/New/ComposeWinModel.cs

@@ -1202,7 +1202,6 @@
{

    Wings = 1,

    Ticket = 2,

    Fairy = 3,

    Equip = 4,

    Item = 5,

    MountDogz = 6,


 System/WindowJump/WindowJumpMgr.cs

@@ -194,12 +194,12 @@
                if (types.Length > 2)

                {

                    ComposeEquipWin.selectEquipPlace = types[2];

                    composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1, types[0], types[1]);

                    composeModel.SetJumpToModel(TableIndexToComposeFuncType(_tagWinSearchModel.TABID), types[0], types[1]);

                    SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

                }

                else if (types.Length > 1)

                {

                    composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1, types[0], types[1]);

                    composeModel.SetJumpToModel(TableIndexToComposeFuncType(_tagWinSearchModel.TABID), types[0], types[1]);

                    SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

                }

                break;

@@ -213,7 +213,7 @@
                SetJumpLogic<UnionStoreWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.FairyStore1:

                int.TryParse(_tagWinSearchModel.SelectActive,out storeModel.fairyStoreJumpShopId);

                int.TryParse(_tagWinSearchModel.SelectActive, out storeModel.fairyStoreJumpShopId);

                SetJumpLogic<UnionStoreWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.UnionFunc1:

@@ -623,7 +623,7 @@
            case JumpUIType.ComposeTicketGod:

            case JumpUIType.ComposeTicketIce:

                int[] composeTypelist = GetSearchData(_tagWinSearchModel.ID).conditions;

                composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1, composeTypelist[0], composeTypelist[1]);

                composeModel.SetJumpToModel(TableIndexToComposeFuncType(_tagWinSearchModel.TABID), composeTypelist[0], composeTypelist[1]);

                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.TrialDungeonSelect:

@@ -765,7 +765,7 @@
            case JumpUIType.ExchangeActiveToken:

                SetJumpLogic<ExchangeActiveTokenWin>();

                break;

           default:

            default:

                DebugEx.Log("未添加此跳转界面：" + jumpType);

                IsJumpState = false;

                openWindows.Clear();

@@ -1080,7 +1080,7 @@
                int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;

                if (types.Length > 0)

                {

                    if (!composeModel.CheckIsComposeByType(_tagWinSearchModel.TABID + 1, types[0], types[1]))

                    if (!composeModel.CheckIsComposeByType((int)TableIndexToComposeFuncType(_tagWinSearchModel.TABID), types[0], types[1]))

                    {

                        return false;

                    }

@@ -1411,6 +1411,18 @@


    }



    public ComposeFuncType TableIndexToComposeFuncType(int tableIndex)

    {

        if (tableIndex == 2)

        {

            return ComposeFuncType.Ticket;

        }

        else

        {

            return (ComposeFuncType)(tableIndex + 1);

        }

    }



}



/// <summary>