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

client_Wu Xijin

2019-04-26 c9e0c32d29174ded28b462a3c4d10502731cb364

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

 System/Alchemy/AlchemyBriefBehaviour.cs

@@ -30,7 +30,7 @@
        void DisplayAlchemyCount()

        {

            AlchemyCount alchemyCount;

            if (model.TryGetAlchemyCount(model.selectAlchemy, out alchemyCount))

            if (model.TryGetAlchemyCount(model.selectAlchemy, PlayerDatas.Instance.extersion.luckValue, out alchemyCount))

            {

                if (alchemyCount.min == alchemyCount.max)

                {


 System/Alchemy/AlchemyDrugLimitWin.cs

@@ -81,7 +81,8 @@
            if (model.TryGetAlchemyUseLimit(drugId, out drugUseLimit))

            {

                var itemConfig = ItemConfig.Get(drugUseLimit.addItem.id);

                m_Now.text = Language.Get("AlchemyAddLimit_1", drugUseLimit.GetUseLimit(),

                var drugConfig = ItemConfig.Get(drugId);

                m_Now.text = Language.Get("AlchemyAddLimit_1", drugUseLimit.GetUseLimit(), drugConfig.ItemName,

                    itemConfig.ItemName);

                m_Next.text = Language.Get("AlchemyAddLimit_2", drugUseLimit.addItem.count, itemConfig.ItemName,

                    drugUseLimit.addLimitPerTimes);

@@ -94,7 +95,8 @@
            AlchemyDrugUseLimit drugUseLimit;

            if (model.TryGetAlchemyUseLimit(drugId, out drugUseLimit))

            {

                m_Now.text = Language.Get("AlchemyAddLimit_3", drugUseLimit.GetUseLimit());

                var drugConfig = ItemConfig.Get(drugId);

                m_Now.text = Language.Get("AlchemyAddLimit_3", drugUseLimit.GetUseLimit(), drugConfig.ItemName);

                var realmLevel = drugUseLimit.GetNextUpgradeRealm();

                var realmConfig = RealmConfig.Get(realmLevel);

                var upgrade = drugUseLimit.GetRealmLimit(realmLevel) -


 System/Alchemy/AlchemyModel.cs

@@ -7,7 +7,7 @@
    public class AlchemyModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

    {

        Dictionary<int, uint> m_AlchemyTimes = new Dictionary<int, uint>();

        Dictionary<int, AlchemyCount> m_AlchemyCounts = new Dictionary<int, AlchemyCount>();

        Dictionary<int, Dictionary<int, AlchemyCount>> m_AlchemyCounts = new Dictionary<int, Dictionary<int, AlchemyCount>>();

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

        Dictionary<int, List<Item>> m_AlchemyMaterials = new Dictionary<int, List<Item>>();

        Dictionary<int, AlchemyDrugUseLimit> m_AlchemyDrugUseLimits = new Dictionary<int, AlchemyDrugUseLimit>();

@@ -148,28 +148,15 @@
                    var intArray = LitJson.JsonMapper.ToObject<int[][]>(config.CntRateList);

                    var min = intArray[0][1];

                    var max = intArray[intArray.Length - 1][1];

                    if (m_AlchemyCounts.ContainsKey(config.AlchemyQuality))

                    if (!m_AlchemyCounts.ContainsKey(config.AlchemyQuality))

                    {

                        var alchemyCount = m_AlchemyCounts[config.AlchemyQuality];

                        if (min < alchemyCount.min)

                        {

                            alchemyCount.min = min;

                            m_AlchemyCounts[config.AlchemyQuality] = alchemyCount;

                        }

                        if (max > alchemyCount.max)

                        {

                            alchemyCount.max = max;

                            m_AlchemyCounts[config.AlchemyQuality] = alchemyCount;

                        }

                        m_AlchemyCounts[config.AlchemyQuality] = new Dictionary<int, AlchemyCount>();

                    }

                    else

                    m_AlchemyCounts[config.AlchemyQuality].Add(config.LuckValue, new AlchemyCount()

                    {

                        m_AlchemyCounts[config.AlchemyQuality] = new AlchemyCount()

                        {

                            min = min,

                            max = max,

                        };

                    }

                        min = min,

                        max = max,

                    });

                }

            }



@@ -264,12 +251,12 @@
            return m_AlchemyTimes.TryGetValue(alchemyId, out tick);

        }



        public bool TryGetAlchemyCount(int alchemyId, out AlchemyCount alchemyCount)

        public bool TryGetAlchemyCount(int alchemyId, int luckValue, out AlchemyCount alchemyCount)

        {

            var config = AlchemyConfig.Get(alchemyId);

            alchemyCount = default(AlchemyCount);

            if (config == null)

            {

                alchemyCount = default(AlchemyCount);

                return false;

            }

            if (config.AlchemType == (int)AlchemyType.Fairy)

@@ -277,7 +264,15 @@
                alchemyCount = AlchemyCount.one;

                return true;

            }

            return m_AlchemyCounts.TryGetValue(config.AlchemyQuality, out alchemyCount);

            var dict = m_AlchemyCounts[config.AlchemyQuality];

            foreach (var _luckValue in dict.Keys)

            {

                if (luckValue >= _luckValue)

                {

                    alchemyCount = dict[_luckValue];

                }

            }

            return alchemyCount.Equals(default(AlchemyCount));

        }



        public bool TryGetAlchemyMaterials(int alchemyId, out List<Item> items)