3335 物品相关类型重构

client_Wu Xijin

2019-02-25 e2d975178561a04f0d902e9ce686846bd0ddf2eb

3335 物品相关类型重构

 System/WindowJump/WindowJumpMgr.cs

@@ -15,28 +15,14 @@
        StageLoad.Instance.onStartStageLoadingEvent += ClearCurRecord;

        GlobalTimeEvent.Instance.secondEvent += SecondRefresh;

    }



    private Window preWin = null;

    private WindowSearchConfig _tagWinSearchModel;

    private FuncOpenLVConfig _tagOpenLvModel;

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

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

    PetModel m_petModel;

    PetModel petmodel

    {

        get

        {

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

        }

    }



    PlayerDeadModel _deadModel;

    PlayerDeadModel DeadModel

    {

        get

        {

            return _deadModel ?? (_deadModel = ModelCenter.Instance.GetModel<PlayerDeadModel>());

        }

    }

    PetModel petmodel { get { return ModelCenter.Instance.GetModel<PetModel>(); } }

    PlayerDeadModel DeadModel { get { return ModelCenter.Instance.GetModel<PlayerDeadModel>(); } }



    TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }

    DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

@@ -52,28 +38,29 @@
    PlayerSuitModel suitModel { get { return ModelCenter.Instance.GetModel<PlayerSuitModel>(); } }



    #region 解析本地数据

    public Dictionary<int, WindowSearchData> windowSearchDataDict { get; private set;}

    public Dictionary<int, WindowSearchData> windowSearchDataDict { get; private set; }

    private void ParseWindowSearchConfig()

    {

        windowSearchDataDict = new Dictionary<int, WindowSearchData>();

        List<WindowSearchConfig> searchConfigs = WindowSearchConfig.GetValues();

        for(int i = 0; i < searchConfigs.Count; i++)

        for (int i = 0; i < searchConfigs.Count; i++)

        {

            var searchConfig = searchConfigs[i];

            WindowSearchData searchData = new WindowSearchData();

            searchData.id = searchConfig.ID;

            searchData.searchConfig = searchConfig;

            searchData.conditions = ConfigParse.GetMultipleStr<int>(searchConfig.SelectActive);

            if(!windowSearchDataDict.ContainsKey(searchConfig.ID))

            if (!windowSearchDataDict.ContainsKey(searchConfig.ID))

            {

                windowSearchDataDict.Add(searchConfig.ID,searchData);

                windowSearchDataDict.Add(searchConfig.ID, searchData);

            }

        }

    }

    public WindowSearchData GetSearchData(int id)



    WindowSearchData GetSearchData(int id)

    {

        WindowSearchData searchData = null;

        windowSearchDataDict.TryGetValue(id,out searchData);

        windowSearchDataDict.TryGetValue(id, out searchData);

        return searchData;

    }



@@ -86,9 +73,9 @@
    #endregion



    public bool IsJumpState { get; private set; }

    public int jumpPhase { get; private set;}

    public int jumpPhase { get; private set; }

    public int jumpType { get; private set; }

    public void GetPreAllOpenWin()

    void GetPreAllOpenWin()

    {

        jumpPhase += 1;

        var windowKeys = WindowCenter.Instance.GetAll();

@@ -160,13 +147,13 @@
            case JumpUIType.StrengthFunc4:

            case JumpUIType.StrengthFunc5:

            case JumpUIType.EquipWashType2:

            case JumpUIType.StrengthFunc1Type2:  
            case JumpUIType.StrengthFunc1Type2:

                SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.EquipHighSuit:

            case JumpUIType.EquipLowSuit:

                int suitType = 0;

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

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

                suitModel.SetJumpModel(suitType);

                SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID);

                break;

@@ -201,8 +188,8 @@
            case JumpUIType.EquipCompose297:

            case JumpUIType.EquipCompose298:

            case JumpUIType.ToolCompose305:

                int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;     
                if(types.Length > 2)

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

                if (types.Length > 2)

                {

                    ComposeEquipWin.selectEquipPlace = types[2];

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

@@ -325,7 +312,7 @@
            case JumpUIType.CrossServerOneVsOne278:

            case JumpUIType.CrossServerOneVsOne279:

                int oneVsOneFuncId = 0;

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

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

                CrossServerOneVsOneWin.funcId = oneVsOneFuncId;

                SetJumpLogic<CrossServerWin>(_tagWinSearchModel.TABID);

                break;

@@ -419,7 +406,7 @@
            case JumpUIType.Team_EmperorRelic:

            case JumpUIType.Team_TrialDungeon:

                var model = ModelCenter.Instance.GetModel<TeamModel>();

                model.missionBuf = new TeamMission(int.Parse(_tagWinSearchModel.SelectActive),0);

                model.missionBuf = new TeamMission(int.Parse(_tagWinSearchModel.SelectActive), 0);

                SetJumpLogic<TeamFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.VipExperience:

@@ -536,7 +523,7 @@
            case JumpUIType.SevenDaysTour286:

            case JumpUIType.SevenDaysTour287:

                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();

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

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

                sevenDaysModel.JumpIndex = jumpIndex;

                SetJumpLogic<AchievementActivityWin>(_tagWinSearchModel.TABID);

                break;

@@ -587,7 +574,7 @@
            case JumpUIType.Kylin5:

            case JumpUIType.Kylin6:

                int tier = 0;

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

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

                GotoKylinDungeon(tier);

                break;

            case JumpUIType.VipRechargeFunc3:

@@ -1098,7 +1085,7 @@
            case JumpUIType.CrossServerOneVsOne277:

            case JumpUIType.CrossServerOneVsOne278:

            case JumpUIType.CrossServerOneVsOne279:

                if(!CrossServerOneVsOnePKSeason.Instance.IsEnterCrossServer(true))

                if (!CrossServerOneVsOnePKSeason.Instance.IsEnterCrossServer(true))

                {

                    return false;

                }

@@ -1111,7 +1098,7 @@
            case JumpUIType.SevenDaysTour286:

            case JumpUIType.SevenDaysTour287:

                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();

                if(!sevenDaysModel.IsJumpOpen())

                if (!sevenDaysModel.IsJumpOpen())

                {

                    return false;

                }

@@ -1133,7 +1120,7 @@
    private void CheckJumpWin<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window

    {

        string curOpenWin = typeof(T).Name;

      


    }



    private void GotoNormalDungeon(int _dailyQuestId, int _lineId = 0)

@@ -1164,13 +1151,11 @@
    }

    public void GotoKylinDungeon(int tier)

    {

        var dungeon = new Dungeon(31190,tier-1);

        var dungeon = new Dungeon(31190, tier - 1);

        dungeonModel.currentDungeon = dungeon;

        dungeonModel.selectedKylinDungeon = dungeon;

        SetJumpLogic<MultipleDifficultyDungeonWin>(0);

    }



   


    private void SetJumpLogic<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window

    {

@@ -1235,7 +1220,7 @@
            case 1:

            case 4:

                openWinlist = openWindows[jumpPhase];

                if(openWinlist.Contains(obj.name))

                if (openWinlist.Contains(obj.name))

                {

                    openWinlist.Remove(obj.name);

                }

@@ -1366,11 +1351,11 @@
                DeadModel.PlayerDie(PlayerDatas.Instance.baseData.PlayerID);

            }

        }



    }



    private void SecondRefresh()

    {

        if (DeadModel.playerIsDie 
        if (DeadModel.playerIsDie

            && WindowCenter.Instance.IsOpen<MainInterfaceWin>()

            && dungeonModel.dungeonFightStage != DungeonFightStage.ExitPrepare)

        {

@@ -1403,7 +1388,6 @@
    }



}





/// <summary>

/// 规则是每个系统对应标签页顺序

@@ -1621,7 +1605,7 @@
    Kylin2 = 229,//麒麟之府的2层

    Kylin3 = 230,//麒麟之府的3层

    Kylin4 = 231,//麒麟之府的4层

    Kylin5= 232,//麒麟之府的5层

    Kylin5 = 232,//麒麟之府的5层

    Kylin6 = 233,//麒麟之府的6层

    PrayforDrug = 234, //炼丹祈福（太上老君的馈赠）

    EquipCompose1 = 235, //装备合成-龙魂红二

@@ -1676,7 +1660,7 @@
    JadeDynastyTowerRank289 = 289,//排行榜-诛仙塔

    JadeDynastyBoss290 = 290,//诛仙Boss

    EquipCompose291 = 291,//装备合成-诛仙装备

    JadeDynastyEquip292=292,//诛仙装备

    JadeDynastyEquip292 = 292,//诛仙装备

    EquipCompose293 = 293,//装备合成-诛仙装备-合成披风

    EquipCompose294 = 294,//装备合成-诛仙装备-合成如意

    EquipCompose295 = 295,//装备合成-诛仙装备-合成诛仙剑