3204 【前端】成就前往反馈优化

client_Wu Xijin

2018-09-03 ce5ed509e463a615b882b90935a4f2a1fe2b36d7

3204 【前端】成就前往反馈优化

 System/Achievement/AchievementGotoPart1.cs

@@ -218,7 +218,7 @@


        }



        public static void GotoKylin(int _achievementId)

        public static void GotoKylin_7(int _achievementId)

        {

            dailyQuestModel.currentDailyQuest = (int)DailyQuestType.Kirin;

            var dailyQuestState = dailyQuestModel.GetQuestState((int)DailyQuestType.Kirin);

@@ -236,6 +236,15 @@
            }

        }



        public static void GotoKylin_49(int _achievementId)

        {

            var config = Config.Instance.Get<SuccessConfig>(_achievementId);

            var dungeon = new Dungeon(31190, config.Condition[0] - 1);

            dungeonModel.currentDungeon = dungeon;

            dungeonModel.selectedKylinDungeon = dungeon;

            guideAchievementId = _achievementId;

        }



        //日常界面本身有特效，这个是不要的

        public static void GotoGetDailyActiveValueAward(int _achievementId)

        {


 System/Achievement/AchievementModel.cs

@@ -599,8 +599,10 @@
                    AchievementGoto.GotoFairyLand(_achievementId);

                    break;

                case 7:

                    AchievementGoto.GotoKylin_7(_achievementId);

                    break;

                case 49:

                    AchievementGoto.GotoKylin(_achievementId);

                    AchievementGoto.GotoKylin_49(_achievementId);

                    break;

                case 50:

                    AchievementGoto.Goto50(_achievementId);


 System/WindowJump/WindowJumpMgr.cs

@@ -19,8 +19,10 @@
    private Dictionary<int, List<string>> openWindows = new Dictionary<int, List<string>>();

    private Dictionary<int, string> jumpWinNameDict = new Dictionary<int, string>();

    PlayerPetDatas m_petModel;

    PlayerPetDatas petmodel {

        get {

    PlayerPetDatas petmodel

    {

        get

        {

            return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>());

        }

    }

@@ -44,7 +46,7 @@
    TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }

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



    public bool IsJumpState { get; private set;}

    public bool IsJumpState { get; private set; }

    private int jumpPhase = 0;



    public void GetPreAllOpenWin()

@@ -84,12 +86,12 @@
    public void WindowJumpTo(JumpUIType jumpType)

    {

        _tagWinSearchModel = Config.Instance.Get<WindowSearchConfig>((int)jumpType);

      


        if (_tagWinSearchModel == null)

        {

            return;

        }

        


        if (!FuncOpen.Instance.IsFuncOpen(_tagWinSearchModel.Lv) && _tagWinSearchModel.Lv != 0)

        {

            FuncOpen.Instance.ProcessorFuncErrorTip(_tagWinSearchModel.Lv);

@@ -120,7 +122,7 @@
                }

                break;

            case JumpUIType.UnionStore:

                if(!fairyModel.fairyStoreOpen)

                if (!fairyModel.fairyStoreOpen)

                {

                    fairyModel.ProcessErrorTip();

                    return;

@@ -133,7 +135,7 @@
            case JumpUIType.TreasureFindHostFunc2Type2:

            case JumpUIType.TreasureFindHostFunc3Type2:

                bool isUnlock = hostModel.IsUnlockTreasure(int.Parse(_tagWinSearchModel.SelectActive));

                if(!isUnlock)

                if (!isUnlock)

                {

                    hostModel.jumpTreasureId = 0;

                    return;

@@ -194,6 +196,13 @@
                if (!trialDungeonModel.CompleteTrialFloor(0))

                {

                    trialDungeonModel.ProcessOpenTrialExchangeError();

                    return;

                }

                break;

            case JumpUIType.Kylin:

                if (!FuncOpen.Instance.IsFuncOpen(85))

                {

                    FuncOpen.Instance.ProcessorFuncErrorTip((int)FuncOpenEnum.Kylin);

                    return;

                }

                break;

@@ -260,7 +269,7 @@
        #region 条件判段

        switch (jumpType)

        {

            case JumpUIType.RoleFunc1:         
            case JumpUIType.RoleFunc1:

            case JumpUIType.RoleFunc2:

            case JumpUIType.RoleFunc3:

            case JumpUIType.RoleFunc4:

@@ -290,7 +299,7 @@
            case JumpUIType.ComposeFunc1:

            case JumpUIType.ComposeFunc2:

            case JumpUIType.ComposeFunc3:

            case JumpUIType.ComposeFunc4:         
            case JumpUIType.ComposeFunc4:

            case JumpUIType.ComposeFunc5:

            case JumpUIType.TicketCompose1:

            case JumpUIType.TicketCompose2:

@@ -307,8 +316,8 @@
                break;

            case JumpUIType.UnionFunc1:

            case JumpUIType.UnionFunc2:

            case JumpUIType.UnionFunc3:        
            case JumpUIType.UnionFunc4:           
            case JumpUIType.UnionFunc3:

            case JumpUIType.UnionFunc4:

            case JumpUIType.UnionFunc5:

                SetJumpLogic<UnionPanel>(_tagWinSearchModel.TABID);

                break;

@@ -317,7 +326,7 @@
                SetJumpLogic<PetWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.PetStone:

                if(PackSendQuestMgr.Instance.useItemModel != null)

                if (PackSendQuestMgr.Instance.useItemModel != null)

                {

                    petModel.PetStoneItemId = PackSendQuestMgr.Instance.useItemModel.itemId;

                }

@@ -463,12 +472,12 @@
                SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.LootPreciousFrameSpec:

                DemonJarWin.guideChallenge =true;

                DemonJarWin.guideChallenge = true;

                SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.MarketFunc1:

            case JumpUIType.MarketFunc2:

            case JumpUIType.MarketFunc3:             
            case JumpUIType.MarketFunc3:

                SetJumpLogic<MarketWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.BlastFurnaceFunc1:

@@ -558,7 +567,7 @@
                break;

            case JumpUIType.UnionChat1:

            case JumpUIType.UnionChat2:

                ChatCtrl.Inst.presentChatType =(ChatInfoType)(int.Parse(_tagWinSearchModel.SelectActive) - 1);

                ChatCtrl.Inst.presentChatType = (ChatInfoType)(int.Parse(_tagWinSearchModel.SelectActive) - 1);

                SetJumpLogic<ChatWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.MakeDrug:

@@ -578,7 +587,7 @@
                break;

            case JumpUIType.Alchemyrescripte104:

            case JumpUIType.Alchemyrescripte105:

                ModelCenter.Instance.GetModel<BlastFurnaceModel>().jumpToPrescripe =int.Parse(_tagWinSearchModel.SelectActive);

                ModelCenter.Instance.GetModel<BlastFurnaceModel>().jumpToPrescripe = int.Parse(_tagWinSearchModel.SelectActive);

                SetJumpLogic<BlastFurnaceWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.AttackMagicianType1:

@@ -591,6 +600,9 @@
                break;

            case JumpUIType.TreasureCollectSoul:

                SetJumpLogic<TreasureLevelUpWin>(0);

                break;

            case JumpUIType.Kylin:

                SetJumpLogic<MultipleDifficultyDungeonWin>(0);

                break;

            case JumpUIType.VipRechargeFunc3:

            case JumpUIType.OSTimeLimitGift:

@@ -633,7 +645,7 @@
            case JumpUIType.ComposeTicketIce:

                var composeModel = ModelCenter.Instance.GetModel<ComposeWinModel>();

                int[] composeTypelist = ConfigParse.GetMultipleStr<int>(_tagWinSearchModel.SelectActive);

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

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

                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.TrialDungeonSelect:

@@ -704,7 +716,7 @@
                SetJumpLogic<FirstRechargeWin>(_tagWinSearchModel.TABID, true);

                break;

            default:

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

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

                IsJumpState = false;

                openWindows.Clear();

                jumpWinNameDict.Clear();

@@ -746,7 +758,7 @@
    {



        string curOpenWin = typeof(T).Name;

        jumpWinNameDict.Add(jumpPhase,curOpenWin);

        jumpWinNameDict.Add(jumpPhase, curOpenWin);

        switch (_tagWinSearchModel.Type)

        {

            case 1:

@@ -789,7 +801,7 @@
        }

        DebugEx.Log("关闭界面类型：" + _tagWinSearchModel.Type);

        WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;

      


        int i = 0;

        List<string> openWinlist = null;

        switch (_tagWinSearchModel.Type)

@@ -798,7 +810,7 @@
            case 4:

                openWinlist = openWindows[jumpPhase];

                WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom);

                for (i = 0; i < openWinlist.Count; i++) 
                for (i = 0; i < openWinlist.Count; i++)

                {

                    Window window = WindowCenter.Instance.Get(openWinlist[i]);

                    switch (window.name)

@@ -837,7 +849,7 @@
                            }

                            break;

                    }

                  


                }

                jumpWinNameDict.Remove(jumpPhase);

                jumpPhase -= 1;

@@ -853,20 +865,20 @@
                for (i = 0; i < openWinlist.Count; i++)

                {

                    Window window = WindowCenter.Instance.Get(openWinlist[i]);

                    if(window != null && window.windowInfo.windowType == WindowType.Base)

                    if (window != null && window.windowInfo.windowType == WindowType.Base)

                    {

                        if(!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                        if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                        {

                            WindowCenter.Instance.Get(openWinlist[i]).Open();

                        }

                      


                    }

                    else

                    {

                        switch(window.name)

                        switch (window.name)

                        {

                            case "RebornWin":

                                if(SettingEffectMgr.Instance.isPlayerDie)

                                if (SettingEffectMgr.Instance.isPlayerDie)

                                {

                                    if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                                    {

@@ -910,23 +922,23 @@
                break;

        }



        if(jumpPhase <= 0)

        if (jumpPhase <= 0)

        {

            openWindows.Clear();

            IsJumpState = false;

            jumpWinNameDict.Clear();

            if(DeadModel.playerIsDie)

            if (DeadModel.playerIsDie)

            {

                DeadModel.PlayerDie(PlayerDatas.Instance.baseData.PlayerID);

            }

        }

       


    }

    private void SecondRefresh()

    {

        if (DeadModel.playerIsDie && WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

        {

            if(!WindowCenter.Instance.CheckOpen<RebornWin>()

            if (!WindowCenter.Instance.CheckOpen<RebornWin>()

               && !WindowCenter.Instance.CheckOpen<ReliveWin>()

               && !WindowCenter.Instance.CheckOpen<ElderGodAreaExitWin>()

               && !WindowCenter.Instance.CheckOpen<ElderGodAreaRebornWin>())

@@ -944,7 +956,7 @@
        jumpPhase = 0;

        openWindows.Clear();

        IsJumpState = false;

        foreach(var key in jumpWinNameDict.Keys)

        foreach (var key in jumpWinNameDict.Keys)

        {

            WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;

        }

@@ -999,7 +1011,7 @@
    Treasure = 35,

    WorldChat = 38,

    PrivateChat = 39,

    BountyInterface=40,//赏金界面

    BountyInterface = 40,//赏金界面

    DailyQuestFunc1 = 44,

    DailyQuestFunc2 = 45,

    DailyQuestFunc3 = 46,

@@ -1047,10 +1059,10 @@
    RebornOpenHourse = 115,//死亡复活打开坐骑

    RebornOpenStrength = 116,//死亡复活打开强化

    RebornOpenPet = 117,//死亡复活打开灵宠

    RedPacket=118,//红包

    RedPacket = 118,//红包

    TreasureFunc1 = 119, //入世法宝

    TreasureFunc2 = 120, //本源法宝

    


    Type1TreasureFunc1 = 121, //入世法宝

    Type1TreasureFunc2 = 122, //本源法宝

    UnionWarehouse = 123,  //仙盟宝库界面

@@ -1071,7 +1083,7 @@
    MakeDrug = 138, //丹药使用

    XianBaguaIntr = 139, //仙族法宝八卦炉介绍界面

    UnionTask2 = 140, //仙盟任务界面回到主界面

    OpenServerActivityFunc2_1 =141, //活动发红包（精彩活动）

    OpenServerActivityFunc2_1 = 141, //活动发红包（精彩活动）

    OpenServerActivityFunc2_2 = 142, //活动抢红包（精彩活动）

    FirstRecharge = 143,  // 首充界面

    KnapSackFunc1Type2 = 144, // 背包界面（返回）

@@ -1129,7 +1141,7 @@
    FaBaoSoul_Suit = 196, //法宝魂-套装之魂

    FaBaoSoul_Wash = 197, //法宝魂-洗炼之魂

    ConsumreRebate = 198, //福利—消费返利界面（精彩活动）

    OSTimeLimitGift=199, //开服活动开服特惠（精彩活动）

    OSTimeLimitGift = 199, //开服活动开服特惠（精彩活动）

    WelfareFunc2Type2 = 200,  //祈愿返回主界面

    LimitedTimePackage = 201, //限时礼包（精彩活动）

    BossReborn = 202, //Boss复活（精彩活动）

@@ -1143,7 +1155,7 @@
    XBStoreType2 = 210, //寻宝商店

    XBWarehouseType2 = 211, //寻宝仓库

    TrialExchange = 212, //宗门试练材料兑换

    ComposeTicketFairy =213, //合成-仙界密境通行证

    ComposeTicketFairy = 213, //合成-仙界密境通行证

    ComposeTicketGod = 214, //合成-古神通行证

    ComposeTicketIce = 215, //合成-冰晶矿脉通行证

    TrialDungeonSelect = 216, //宗门试练副本选择界面

@@ -1157,6 +1169,7 @@
    OpenServerGift2 = 224, //超值礼包2

    OpenServerGift3 = 225, //超值礼包3

    TreasureCollectSoul = 226,//法宝集魂

    Kylin = 227,//跳转到麒麟之府， 不配置选中任何层

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

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

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