Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-09 3bbd30d731b4974dc6461bf491116571ad35ca63

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/Dungeon/MultipleDifficultyDungeonWin.cs

@@ -106,7 +106,7 @@
            var error = 0;

            if (TestSweepDungeon(out error))

            {

                WindowCenter.Instance.Open<DungeonSweepWin>();

                model.RequestSweep(model.selectedKylinDungeon);

            }

            else

            {

@@ -126,6 +126,9 @@
                        break;

                    case 4:

                        SysNotifyMgr.Instance.ShowTip("Multiple_Finish");

                        break;

                    case 5:

                        SysNotifyMgr.Instance.ShowTip("SweepFB_1");

                        break;

                }

            }

@@ -206,6 +209,13 @@
            var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);

            var playerLevel = PlayerDatas.Instance.baseData.LV;



            var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            if (dataMapId == model.selectedKylinDungeon.mapId)

            {

                _error = 5;

                return false;

            }



            if (playerLevel < dungeonConfig.SweepLVLimit)

            {

                _error = 1;


 System/Dungeon/NormalDungeonEntranceWin.cs

@@ -220,7 +220,7 @@
            var sweepError = 0;

            if (TestSweepDungeon(out sweepError))

            {

                WindowCenter.Instance.Open<DungeonSweepWin>();

                model.RequestSweep(model.currentDungeon);

            }

            else

            {

@@ -362,6 +362,13 @@
            var playerLevel = PlayerDatas.Instance.baseData.LV;

            var dungeonGrade = model.GetGrade(model.currentDungeon);



            var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            if (dataMapId == model.currentDungeon.mapId)

            {

                _error = 5;

                return false;

            }



            if (dungeonGrade <= 0 && playerLevel < dungeonConfig.SweepLVLimit)

            {

                _error = 1;

@@ -409,6 +416,9 @@
                case 4:

                    SysNotifyMgr.Instance.ShowTip("DungeoninCoolTime");

                    break;

                case 5:

                    SysNotifyMgr.Instance.ShowTip("SweepFB_1");

                    break;

            }

        }




 System/KnapSack/Logic/PackModelInterface.cs

@@ -45,8 +45,7 @@
        private int[] pushItemIds;

        public int[] pushBuffTypeIds;

        private List<int> equipBaseAttrlist = new List<int>();

        public int promptUseLvLimit { get; private set;}

        public int[] promptUseIdsLimit { get; private set; }

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



        public override void Init()

        {

@@ -63,9 +62,9 @@
         

            _itemPush = Config.Instance.Get<FuncConfigConfig>("ItemPush");

            preciousItemType = ConfigParse.GetMultipleStr<int>(_itemPush.Numerical1);



            FuncConfigConfig noPromptUsetItem = Config.Instance.Get<FuncConfigConfig>("NoPromptUsetItem");

            promptUseLvLimit = int.Parse(noPromptUsetItem.Numerical2);

            promptUseIdsLimit = ConfigParse.GetMultipleStr<int>(noPromptUsetItem.Numerical1);

            promptUseLimitDict = ConfigParse.GetDic<int, int>(noPromptUsetItem.Numerical1);



            _drugIDFunc = Config.Instance.Get<FuncConfigConfig>("LifePotionlist");

            drugIDs = ConfigParse.GetMultipleStr<int>(_drugIDFunc.Numerical1);

@@ -518,10 +517,10 @@


            }



            if(promptUseIdsLimit.Contains(itemModel.itemId))

            if(promptUseLimitDict.ContainsKey(itemModel.itemId))

            {

                int playerLv = PlayerDatas.Instance.baseData.LV;

                if(playerLv < promptUseLvLimit)

                if(playerLv < promptUseLimitDict[itemModel.itemId])

                {

                    isReach = false;

                    return isReach;