少年修仙传客户端代码仓库
client_Zxw
2019-01-31 ee963ff1b6e2704e16738e167c97bad8e6c73f02
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
39 ■■■■■ 已修改文件
System/Achievement/AchievementModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowJump/WindowJumpMgr.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Achievement/AchievementModel.cs
@@ -265,6 +265,7 @@
                        WindowCenter.Instance.Open<LocalMapWin>();
                        break;
                    case 36:
                    case 136:
                        WindowCenter.Instance.Close<TreasureBaseWin>();
                        WindowCenter.Instance.Open<MainInterfaceWin>();
                        MapTransferUtility.Instance.MoveToNPC(config.Condition[0]);
System/WindowJump/WindowJumpMgr.cs
@@ -128,6 +128,7 @@
        if (!CheckIsJump(jumpType)) return;
        DebugEx.Log("WindowJumpTo" + jumpType);
        #region 条件判段
        int jumpIndex = 0;
        switch (jumpType)
        {
            case JumpUIType.RoleFunc1:
@@ -533,9 +534,18 @@
            case JumpUIType.SevenDaysTour286:
            case JumpUIType.SevenDaysTour287:
                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();
                int jumpIndex = 0;
                int.TryParse(_tagWinSearchModel.SelectActive,out jumpIndex);
                sevenDaysModel.JumpIndex = jumpIndex;
                SetJumpLogic<AchievementActivityWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.NewYearTour299:
            case JumpUIType.NewYearTour300:
            case JumpUIType.NewYearTour301:
            case JumpUIType.NewYearTour302:
                var springFestivalModel = ModelCenter.Instance.GetModel<SpringFestivalModel>();
                jumpIndex = 0;
                int.TryParse(_tagWinSearchModel.SelectActive, out jumpIndex);
                springFestivalModel.JumpIndex = jumpIndex;
                SetJumpLogic<AchievementActivityWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.TreasureFindHostFunc1:
@@ -593,6 +603,7 @@
            case JumpUIType.FlashRushToBuy:
            case JumpUIType.BindGoldWheel:
            case JumpUIType.OpenServer_AccumulateRecharge:
            case JumpUIType.FestivalRedBag303:
                SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
                break;
            case JumpUIType.OpenServerMountRank:
@@ -910,6 +921,15 @@
                    }
                }
                break;
            case JumpUIType.FestivalRedBag303:
                {
                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
                    {
                        OperationTimeHepler.Instance.ProcessConditionError(Operation.FestivalRedpack);
                        return false;
                    }
                }
                break;
            case JumpUIType.FlashRushToBuy:
                {
                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
@@ -1069,6 +1089,16 @@
            case JumpUIType.SevenDaysTour287:
                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();
                if(!sevenDaysModel.IsJumpOpen())
                {
                    return false;
                }
                break;
            case JumpUIType.NewYearTour299:
            case JumpUIType.NewYearTour300:
            case JumpUIType.NewYearTour301:
            case JumpUIType.NewYearTour302:
                var springFestivalModel = ModelCenter.Instance.GetModel<SpringFestivalModel>();
                if (!springFestivalModel.IsJumpOpen())
                {
                    return false;
                }
@@ -1630,7 +1660,11 @@
    EquipCompose296 = 296,//装备合成-诛仙装备-合成戮仙剑
    EquipCompose297 = 297,//装备合成-诛仙装备-合成陷仙剑
    EquipCompose298 = 298,//装备合成-诛仙装备-合成绝仙剑
    NewYearTour299 = 299, //2019春节巡礼
    NewYearTour300 = 300, //2019春节巡礼
    NewYearTour301 = 301, //2019春节巡礼
    NewYearTour302 = 302, //2019春节巡礼
    FestivalRedBag303 = 303, //节日红包界面
    DhszTs = 1001,//定海神针功法提升界面
    HyqTs = 1002,//皓月枪功法提升界面
    GyzTs = 1003,//鬼牙刃功法提升界面