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

client_Hale

2018-08-27 375016271649eb20b29788df140fc164bcafd23b

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

 System/BlastFurnace/DandrugCell.cs

@@ -1,4 +1,5 @@
using Snxxz.UI;

using System;

using System.Collections.Generic;

using System.Linq;

using TableConfig;

@@ -14,6 +15,8 @@
    [SerializeField] public Image danBgIcon;

    [SerializeField] public GameObject unSelectImg;

    [SerializeField] public GameObject selectImg;

    [SerializeField] public GameObject progressObj;

    [SerializeField] public Text progressValue;

    [SerializeField] public RedpointBehaviour Redpoint;

    [SerializeField] GameObject achieveReach;

    [SerializeField] Text achieveReachText;

@@ -43,10 +46,14 @@
        {

           lockText.gameObject.SetActive(true);

           lockText.text = Language.Get("BlastFurnace104", alchemyModel.BlastFurnaceLV);

            progressObj.SetActive(false);

        }

        else

        {

          lockText.gameObject.SetActive(false);

            progressObj.SetActive(true);

           lockText.gameObject.SetActive(false);

            progressValue.text = StringUtility.Contact((float)Math.Round(playerPack.GetAlchemyProgress(alchemyModel),2),"%");



        }

     

        if (index == selectIndex)


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -21,6 +21,7 @@
        public int InitBagGridCnt { get; private set; }

        public int MaxDepotGridCnt { get; private set; }

        public int InitDepotGridCnt { get; private set; }

        BlastFurnaceModel FurnaceModel { get { return ModelCenter.Instance.GetModel<BlastFurnaceModel>(); } }



        public override void Init()

        {

@@ -1648,6 +1649,28 @@
            }

            return false;

        }



        List<AttrFruitConfig> limitlist = new List<AttrFruitConfig>();

        public float GetAlchemyProgress(AlchemyConfig alchemy)

        {

            var previewDanlist = FurnaceModel.GetPreviewMakeDruglist(alchemy).Keys.ToList();

            float progress = 0;

            limitlist.Clear();

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

            {

                AttrFruitConfig fruitConfig = Config.Instance.Get<AttrFruitConfig>(previewDanlist[i]);

                if(fruitConfig != null)

                {

                    limitlist.Add(fruitConfig);

                }

            }



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

            {

                progress += ((float)1 / limitlist.Count) *((float)GetSumUseCntByID(limitlist[i].ID)/limitlist[i].MaxUseCnt);

            }

            return progress*100;

        }

        #endregion

    }

}


 System/Rune/RuneModel.cs

@@ -476,12 +476,12 @@
                    }

                    if (!IsSameInHoleRune(_itemCfg.ID, _hole))

                    {

                        return true;

                    }

                    if (runeComposeModel.m_RuneBothPropertys.Contains(rune.id)

                        if (runeComposeModel.m_RuneBothPropertys.Contains(rune.id)

                        && GetDoublePropLimitCount() <= GetCurrentDoublePropCount())

                    {

                        return false;

                        {

                            return false;

                        }

                        return true;

                    }

                }

            }

@@ -827,7 +827,8 @@
                    || (_itemBetterCfg.ItemColor == _itemCfg.ItemColor && _runeCfg.AttrType.Length == 1 && _runeBetterCfg.AttrType.Length == 2))

                {

                    if (runeComposeModel.m_RuneBothPropertys.Contains(_rune.id)

                        && GetDoublePropLimitCount() <= GetCurrentDoublePropCount())

                        && GetDoublePropLimitCount() <= GetCurrentDoublePropCount()

                        && !runeComposeModel.m_RuneBothPropertys.Contains(_runeHole.id))

                    {

                        return false;

                    }

@@ -874,7 +875,8 @@
                || (_itemBetterCfg.ItemColor == _itemCfg.ItemColor && _runeCfg.AttrType.Length == 1 && _runeBetterCfg.AttrType.Length == 2))

            {

                if (runeComposeModel.m_RuneBothPropertys.Contains(_data.id)

                    && GetDoublePropLimitCount() <= GetCurrentDoublePropCount())

                    && GetDoublePropLimitCount() <= GetCurrentDoublePropCount()

                    && !runeComposeModel.m_RuneBothPropertys.Contains(_runeHole.id))

                {

                    return false;

                }

@@ -939,6 +941,7 @@
                    OnRefreshRuneTowerLv();

                }

            }

            UpdateRedpoint();

        }



        public bool IsSameInHoleRune(int id, int hole)


 System/Rune/RuneMosaicWin.cs

@@ -293,6 +293,7 @@
            m_LevelUpBtnTxt.color = m_RuneLevelUpBtn.interactable ? m_LevelUpCacheColor : Color.grey;

            runeLevelUpItemNum.gameObject.SetActive(!_isRuneMaxLv);

            m_ContainerLvUp1.gameObject.SetActive(!_isRuneMaxLv);

            m_ContainerLvUp2.gameObject.SetActive(!_isRuneMaxLv && _doubleProperty);

            m_ContainerItem.gameObject.SetActive(!_isRuneMaxLv);

            m_RuneLevelUpBtn.gameObject.SetActive(!_isRuneMaxLv);

            //m_ContainerLevelUp.gameObject.SetActive(!_isRuneMaxLv);


 System/Rune/RunePackCell.cs

@@ -84,8 +84,10 @@
                MessageWin.Inst.ShowFixedTip(Language.Get("L1078"));

                return;

            }

            var sltHoleRune = model.GetHoleRune(model.sltRuneHole);

            if (runeComposeModel.m_RuneBothPropertys.Contains(_rune.id)

                && model.GetDoublePropLimitCount() <= model.GetCurrentDoublePropCount())

                && model.GetDoublePropLimitCount() <= model.GetCurrentDoublePropCount()

                && (sltHoleRune == null || !runeComposeModel.m_RuneBothPropertys.Contains(sltHoleRune.id)))

            {

                var _count = model.GetDoublePropLimitCount();

                SysNotifyMgr.Instance.ShowTip("RuneGridUnEnough", _count);