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

client_Hale

2018-09-14 079ecd71b24f5bf9aac653f18f76d4670bcd169e

 System/Dungeon/DungeonModel.cs

@@ -73,17 +73,9 @@
            set { m_DungeonResult = value; }

        }



        public int dungeonCoinInspireCount {

            get; private set;

        }



        public int dungeonJadeInspireCount {

            get; private set;

        }



        public int dungeonInspireUper {

            get; private set;

        }

        Dictionary<int, int> dungeonInspireCounts = new Dictionary<int, int>();//5-仙玉或绑玉

        Dictionary<int, int> dungeonInspireUpperDict = new Dictionary<int, int>();

        Dictionary<int, int> dungeonMaxInspireCountDict = new Dictionary<int, int>();



        Dungeon m_SelectedKylinDungeon;

        public Dungeon selectedKylinDungeon {

@@ -140,8 +132,7 @@
        public void OnBeforePlayerDataInitialize()

        {

            dungeonCountRemainTimes.Clear();

            dungeonCoinInspireCount = 0;

            dungeonJadeInspireCount = 0;

            dungeonInspireCounts.Clear();

        }



        public void OnAfterPlayerDataInitialize()

@@ -597,6 +588,7 @@
            specialItemCollectRecord = default(Item);

            dungeonCoolDowns.Clear();

            m_Mission = default(DungeonMissionData);

            dungeonInspireCounts.Clear();

        }



        public void UpdateRecords(HA320_tagMCPlayerFBInfoData.tagMCFBInfo[] _serverInfos)

@@ -690,10 +682,9 @@
            }

        }



        public void UpdateInspireLevel(int coinInspireLv, int jadeInpsireLv)

        public void UpdateInspireLevel(int type, int count)

        {

            dungeonCoinInspireCount = coinInspireLv;

            dungeonJadeInspireCount = jadeInpsireLv;

            dungeonInspireCounts[type] = count;

            if (dungeonInspireLvEvent != null)

            {

                dungeonInspireLvEvent();

@@ -1216,22 +1207,35 @@
            }

        }



        public int GetInspireMaxCount(int _dataMapId)

        public int GetDungeonInspireLevel(int moneyType = 0)//0代表总等级

        {

            List<DungeonInspireConfig> _list = GetDungeonInspire(_dataMapId);

            int _maxCnt = 0;

            if (_list != null)

            var level = 0;

            foreach (var key in dungeonInspireCounts.Keys)

            {

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

                if (moneyType == 0 || moneyType == key)

                {

                    if (_list[i].InspireType == 2)

                    {

                        _maxCnt = _list[i].InspireCount;

                        break;

                    }

                    level += dungeonInspireCounts[key];

                }

            }

            return _maxCnt;

            return level;

        }



        public int GetDungeonInspireCost(DungeonInspireConfig config)

        {

            var level = GetDungeonInspireLevel();

            Equation.Instance.Clear();

            Equation.Instance.AddKeyValue("encourageLV", level);

            return Equation.Instance.Eval<int>(config.MoneyCount);

        }



        public int GetDungeonInspireUpper(int mapId)

        {

            return dungeonInspireUpperDict.ContainsKey(mapId) ? dungeonInspireUpperDict[mapId] : 0;

        }



        public int GetInspireMaxCount(int _dataMapId)

        {

            return dungeonMaxInspireCountDict.ContainsKey(_dataMapId) ? dungeonMaxInspireCountDict[_dataMapId] : 0;

        }



        public Item GetLackItem(DungeonSuppliesLackWin.LackType lackType)

@@ -1363,10 +1367,11 @@
                trialDungeonMapList.AddRange(ConfigParse.GetMultipleStr<int>(funcCfg.Numerical1));

            }



            funcCfg = Config.Instance.Get<FuncConfigConfig>("InspireNum");

            funcCfg = Config.Instance.Get<FuncConfigConfig>("FBEncourageBuff");

            if (funcCfg != null)

            {

                dungeonInspireUper = int.Parse(funcCfg.Numerical1);

                dungeonMaxInspireCountDict = ConfigParse.GetDic<int, int>(funcCfg.Numerical2);

                dungeonInspireUpperDict = ConfigParse.GetDic<int, int>(funcCfg.Numerical3);

            }



            foreach (var _cfg in Config.Instance.GetAllValues<DungeonInspireConfig>())