Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/WindowJump/WindowJumpMgr.cs

@@ -48,6 +48,8 @@
    ImpactRankModel rankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }

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

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

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



    public bool IsJumpState { get; private set; }

    public int jumpPhase { get; private set;}

    public int jumpType { get; private set; }

@@ -119,8 +121,14 @@
            case JumpUIType.StrengthFunc4:

            case JumpUIType.StrengthFunc5:

            case JumpUIType.EquipWashType2:

            case JumpUIType.StrengthFunc1Type2:

            case JumpUIType.EquipSuitType2:

            case JumpUIType.StrengthFunc1Type2:  
                SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.EquipHighSuit:

            case JumpUIType.EquipLowSuit:

                int suitType = 0;

                int.TryParse(_tagWinSearchModel.SelectActive,out suitType);

                suitModel.SetJumpModel(suitType);

                SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.ComposeFunc1:

@@ -838,7 +846,7 @@
                var giftModel = ModelCenter.Instance.GetModel<OSGiftModel>();

                int giftId = 0;

                int.TryParse(_tagWinSearchModel.SelectActive, out giftId);

                if (!giftModel.CheckActivate())

                if (!giftModel.IsGiftExist(giftId))

                {

                    if (PlayerDatas.Instance.baseData.coinPointTotal <= 0

                        || !ModelCenter.Instance.GetModel<VipModel>().firstChargeRewardGet)

@@ -849,11 +857,15 @@
                    {

                        SysNotifyMgr.Instance.ShowTip("GiftAlreadyBuy");

                    }

                    else if (giftModel.IsGiftOverdue(giftId))

                    else if (!giftModel.IsGiftExist(giftId))

                    {

                        SysNotifyMgr.Instance.ShowTip("MissSell");

                    }

                    return false;

                }

                else

                {

                    giftModel.jumpGiftId = giftId;

                }

                break;

            case JumpUIType.OpenServerGift:

@@ -1185,7 +1197,7 @@
    StrengthFunc2 = 13,

    StrengthFunc3 = 14,

    StrengthFunc4 = 15,

    EquipSuitType2 = 241, //套装界面

    EquipLowSuit = 241, //普通套装界面

    StrengthFunc5 = 16,

    EquipWashType2 = 239, //装备洗练界面

    ComposeFunc1 = 17,

@@ -1392,6 +1404,7 @@
    DogzFunc2Type2 = 251, //神兽强化界面

    BindGoldWheel = 252, //绑玉转盘界面

    FlashRushToBuy = 253, //精彩活动—限时抢购界面

    EquipHighSuit = 254, //强化套装界面

    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

    GyzTs = 1003,//鬼牙刃功法提升界面