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

Client_PangDeRong

2019-01-31 b311bf43edfad6caca39cbc2410d25b59bec5802

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

 System/JadeDynastyKnapSack/JadeDynastyGemModel.cs

@@ -173,13 +173,11 @@
        public bool IsHightestLevelGem(int _id)

        {

            var _itemCfg = Config.Instance.Get<ItemConfig>(_id);

            var _nextCfg = Config.Instance.Get<ItemConfig>(_id + 1);

            if (_itemCfg != null && _nextCfg != null && _itemCfg.Type == _nextCfg.Type

                && _itemCfg.EffectValueA1 == _nextCfg.EffectValueA1)

            if (_itemCfg.EffectValueB1 >= gemModel.gemHighestLevelDict[_itemCfg.EffectValueA1])

            {

                return false;

                return true;

            }

            return true;

            return false;

        }



        public void OnReceivePackage(HA3BC_tagMCStoneInfo package)

@@ -405,7 +403,7 @@
                return false;

            }

            m_GemLevelCountDict.Clear();

            for (int i = _itemCfg.EffectValueB1; i <= 9; i++)

            for (int i = _itemCfg.EffectValueB1; i <= gemModel.gemHighestLevelDict[_type]; i++)

            {

                m_GemLevelCountDict.Add(i, GemCountByLevel(_type, i));

            }


 System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs

@@ -183,9 +183,7 @@
                return;

            }

            int id = (int)equipData.items[equipHole];

            ItemConfig _itemCfg = Config.Instance.Get<ItemConfig>(id);

            ItemConfig _nextCfg = ItemConfig.GetGemDataByLevelAndType(_itemCfg.EffectValueB1 + 1, _itemCfg.EffectValueA1);

            if (_nextCfg == null)

            if (model.IsHightestLevelGem(id))

            {

                SysNotifyMgr.Instance.ShowTip("GemFullLevelError");

                return;

@@ -268,7 +266,7 @@
                        }

                        _levelUpCell.nameText.text = string.Empty;

                        PlayerPropertyConfig _propertyCfg = null;

                        for (int i = _itemCfg.EffectValueB1 + 1; i <= 9; i++)

                        for (int i = _itemCfg.EffectValueB1 + 1; i <= gemModel.gemHighestLevelDict[_itemCfg.EffectValueA1]; i++)

                        {

                            _nextCfg = ItemConfig.GetGemDataByLevelAndType(i, _itemCfg.EffectValueA1);

                            if (_nextCfg == null)


 System/Strengthening/GemLevelUpWin.cs

@@ -231,9 +231,7 @@
            if(jadeDynastyGemModel.TryGetEquipGems(equipPlace,out equipData))

            {

                int id = (int)equipData.items[equipHole];

                ItemConfig cfg = Config.Instance.Get<ItemConfig>((int)id);

                ItemConfig next = ItemConfig.GetGemDataByLevelAndType(cfg.EffectValueB1 + 1, cfg.EffectValueA1);

                if (next == null)

                if (jadeDynastyGemModel.IsHightestLevelGem(id))

                {

                    CloseClick();

                }


 System/Strengthening/GemModel.cs

@@ -14,6 +14,7 @@
    {

        public Dictionary<int, List<int>> equipGemTypeDict = new Dictionary<int, List<int>>();

        public Dictionary<int, List<int>> gemGetWays = new Dictionary<int, List<int>>();

        public Dictionary<int, int> gemHighestLevelDict = new Dictionary<int, int>();

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

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

        public string[] equipPartNames { get; private set; }

@@ -81,6 +82,15 @@
                {

                    gemGetWays.Add(i, new List<int>(ConfigParse.GetMultipleStr<int>(config.Numerical3)));

                }



                var level = 1;

                var gemConfig = ItemConfig.GetGemDataByLevelAndType(level, i);

                while (gemConfig != null && gemConfig.EffectValueA1 == i)

                {

                    gemHighestLevelDict[i] = level;

                    level++;

                    gemConfig = Config.Instance.Get<ItemConfig>(gemConfig.EffectValueC1);

                }

            }



            config = Config.Instance.Get<FuncConfigConfig>("GemOpenVip");