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

client_Wu Xijin

2018-09-26 32c24780842a4bff7f611837c01d9d76b05641e3

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

 System/Dogz/DogzCell.cs

@@ -34,7 +34,7 @@
            var _dogzEquips = model.GetDogzEquips(_dogzCfg.ID);

            bool isActive = (_dogzEquips == null || _dogzEquips.Count < 5) ? false : true;

            m_DogzName.text = _dogzCfg.Name;

            m_DogzGrade.text = StringUtility.Contact("评分：", 100);

            m_DogzGrade.text = Language.Get("DogzFunc106", model.GetDogzScoreById(cell.index));

            redpointBehav.redpointId = model.GetSingleDogzRedpointById(_dogzCfg.ID).id;

            if (isActive)

            {


 System/Dogz/DogzModel.cs

@@ -26,6 +26,7 @@
            selectEquipPlacelist = new List<ItemModel>();

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

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

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

        }



        public void OnAfterPlayerDataInitialize()

@@ -56,7 +57,7 @@
        public int DogzPackGridCnt { get; private set; } //神兽物品背包格子数

        public int[] AddAssistItemCnt { get; private set; } //增加助战神兽总数的物品数量

        public Dictionary<int, int> m_DogzEquipStrenLimit { get; private set;} //神兽装备强化上限 品质 强化等级



        public string dogzScoreFormula { get; private set; } //神兽评分公式

        void ParseConfig()

        {

            var _dogzCfgs = Config.Instance.GetAllValues<DogzConfig>();

@@ -78,6 +79,8 @@
            m_DogzEquipStrenLimit = ConfigParse.GetDic<int, int>(_funcCfg.Numerical4);

            _funcCfg = Config.Instance.Get<FuncConfigConfig>("DogzPack");

            DogzPackGridCnt = int.Parse(_funcCfg.Numerical1);

            _funcCfg = Config.Instance.Get<FuncConfigConfig>("DogzGrade");

            dogzScoreFormula = _funcCfg.Numerical1;

        }

        /// <summary>

        /// 获得格子可以穿戴的装备限制  神兽Id  格子索引 

@@ -103,7 +106,7 @@
        /// </summary>

        /// <param name="_index"></param>

        /// <returns></returns>

        public static string GetDogzPartNameByIndex(int _index)

        public string GetDogzPartNameByIndex(int _index)

        {

            switch (_index)

            {

@@ -122,7 +125,7 @@
            }

        }



        public static string GetItemColorName(int _itemColor)

        public string GetItemColorName(int _itemColor)

        {

            switch (_itemColor)

            {

@@ -143,6 +146,73 @@
                    return string.Empty;

            }

        }



        public int GetDogzScoreById(int dogzId)

        {

            DogzConfig dogzConfig = Config.Instance.Get<DogzConfig>(dogzId);

            if (dogzConfig == null) return 0;

            Equation.Instance.Clear();

            Equation.Instance.AddKeyValue("FightPowerEx",dogzConfig.FightPowerEx);

            Equation.Instance.AddKeyValue("EquipGSFormula", GetDogzEquipScore(dogzId));

            GetDogzAttrDictById(dogzId);

            foreach(var key in m_DogzAttrDict.Keys)

            {

                PlayerPropertyConfig propertyConfig = Config.Instance.Get<PlayerPropertyConfig>(key);

                if (propertyConfig != null)

                {

                    Equation.Instance.AddKeyValue(propertyConfig.Parameter, m_DogzAttrDict[key]);

                }

            }

            return Equation.Instance.Eval<int>(dogzScoreFormula);

        }

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

        public Dictionary<int, int> GetDogzAttrDictById(int dogzId)

        {

            m_DogzAttrDict.Clear();

            DogzConfig dogzConfig = Config.Instance.Get<DogzConfig>(dogzId);

            int[] baseAttrIds = dogzConfig.BaseAttrTypes;

            int[] baseAttrValues = dogzConfig.BaseAttrValues;

            for (int i = 0; i < baseAttrIds.Length; i++)

            {

                if (!m_DogzAttrDict.ContainsKey(baseAttrIds[i]))

                {

                    m_DogzAttrDict.Add(baseAttrIds[i], baseAttrValues[i]);

                }

                else

                {

                    m_DogzAttrDict[baseAttrIds[i]] += baseAttrValues[i];

                }

            }



            Dictionary<int, int> dogzStrenDict = beastModel.AllEnhancedProperties(dogzId);

            foreach (var key in dogzStrenDict.Keys)

            {

                if (!m_DogzAttrDict.ContainsKey(key))

                {

                    m_DogzAttrDict.Add(key, dogzStrenDict[key]);

                }

                else

                {

                    m_DogzAttrDict[key] += dogzStrenDict[key];

                }

            }

            return m_DogzAttrDict;

        }



        public int GetDogzEquipScore(int dogzId)

        {

            int score = 0;

            List<ItemModel> itemModels = GetDogzEquips(dogzId);

            if(itemModels != null)

            {

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

                {

                    score += itemModels[i].equipScore;

                }

            }

            return score;

        }



        #endregion



        public int GetAssistItemCnt()


 System/Dogz/DogzPackWin.cs

@@ -125,8 +125,8 @@
                else

                {

                    var _itemColor = dogzModel.GetDogzEquipLimitByIndex(dogzModel.presentSelectDogz, i);

                    m_DogzUnEquipContents[i].text = StringUtility.Contact(DogzModel.GetItemColorName(_itemColor),

                        DogzModel.GetDogzPartNameByIndex(i));

                    m_DogzUnEquipContents[i].text = StringUtility.Contact(dogzModel.GetItemColorName(_itemColor),

                        dogzModel.GetDogzPartNameByIndex(i));

                    m_DogzUnEquipContents[i].color = UIHelper.GetUIColor(_itemColor);

                    m_DogzUnEquipBtns[i].DogzUnEquipBtn.RemoveAllListeners();

                    m_DogzUnEquipBtns[i].DogzUnEquipBtn.AddListener(() => { ClickEquipIndex(index); });


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -1732,58 +1732,34 @@
            {

                if (isPreview)

                {

                    List<int> legendIdlist = new List<int>();

                    List<int> legendValuelist = new List<int>();

                    if (itemConfig.EquipPlace != (int)RoleEquipType.retWing)

                    List<int> legendIdlist = null;

                    List<int> legendValuelist = null;

                    switch(itemConfig.EquipPlace)

                    {

                        if (itemTipsModel.legendAttrIDPreviewDict.ContainsKey(itemConfig.EquipPlace))

                        {

                            foreach (var attrType in itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace].Keys)

                            {

                                switch (attrType)

                                {

                                    case LegendAttrType.Pursuit:

                                        legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                        case 11:

                            SetWingsLegendAttrPreview(out legendIdlist,out legendValuelist);

                                        break;

                                    case LegendAttrType.Fixed:

                                        legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                        case 1:

                        case 2:

                        case 3:

                        case 4:

                        case 5:

                        case 6:

                        case 7:

                        case 8:

                        case 9:

                        case 10:

                        case 12:

                            SetEquipLegendAttrPreview(out legendIdlist,out legendValuelist);

                            break;

                        case 101:

                        case 102:

                        case 103:

                        case 104:

                        case 105:

                            SetDogzEquipLegendAttrPreview(out legendIdlist, out legendValuelist);

                                        break;

                                }

                            }

                        }

                        int i = 0;

                        for (i = 0; i < legendIdlist.Count; i++)

                        {

                            if (itemTipsModel.legendAttrColorValuePreviewDict.ContainsKey(legendIdlist[i]))

                            {

                                if (itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.ItemColor))

                                {

                                    legendValuelist.Add(itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]][itemConfig.ItemColor]);

                                }

                            }

                            else if (itemTipsModel.legendAttrLvValuePreviewDict.ContainsKey(legendIdlist[i]))

                            {

                                if (itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.LV))

                                {

                                    legendValuelist.Add(itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]][itemConfig.LV]);

                                }

                            }

                        }

                    }

                    else

                    {

                        if (itemTipsModel.wingsLegendAttrValuePreviewDict.ContainsKey(itemConfig.LV))

                        {

                            Dictionary<int, List<int>> attrIdDict = itemTipsModel.wingsLegendAttrValuePreviewDict[itemConfig.LV];

                            foreach (var attrId in attrIdDict.Keys)

                            {

                                legendIdlist.Add(attrId);

                                legendValuelist.Add(attrIdDict[attrId][0]);

                            }



                        }

                    }



                    if (legendIdlist.Count == legendValuelist.Count)

                    {

                        SetLegendData(legendIdlist, legendValuelist);

@@ -1864,6 +1840,101 @@
            this.extraInfos = extraInfos;

        }



        private void SetWingsLegendAttrPreview(out List<int> legendIdlist, out List<int> legendValuelist)

        {

            legendIdlist = new List<int>();

            legendValuelist = new List<int>();

            if (itemTipsModel.wingsLegendAttrValuePreviewDict.ContainsKey(itemConfig.LV))

            {

                Dictionary<int, List<int>> attrIdDict = itemTipsModel.wingsLegendAttrValuePreviewDict[itemConfig.LV];

                foreach (var attrId in attrIdDict.Keys)

                {

                    legendIdlist.Add(attrId);

                    legendValuelist.Add(attrIdDict[attrId][0]);

                }



            }

        }



        private void SetEquipLegendAttrPreview(out List<int> legendIdlist, out List<int> legendValuelist)

        {

            legendIdlist = new List<int>();

            legendValuelist = new List<int>();

            if (itemTipsModel.legendAttrIDPreviewDict.ContainsKey(itemConfig.EquipPlace))

            {

                foreach (var attrType in itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace].Keys)

                {

                    switch (attrType)

                    {

                        case LegendAttrType.Pursuit:

                            legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                            break;

                        case LegendAttrType.Fixed:

                            legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                            break;

                    }

                }

            }

            int i = 0;

            for (i = 0; i < legendIdlist.Count; i++)

            {

                if (itemTipsModel.legendAttrColorValuePreviewDict.ContainsKey(legendIdlist[i]))

                {

                    if (itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.ItemColor))

                    {

                        legendValuelist.Add(itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]][itemConfig.ItemColor]);

                    }

                }

                else if (itemTipsModel.legendAttrLvValuePreviewDict.ContainsKey(legendIdlist[i]))

                {

                    if (itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.LV))

                    {

                        legendValuelist.Add(itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]][itemConfig.LV]);

                    }

                }

            }

        }



        private void SetDogzEquipLegendAttrPreview(out List<int> legendIdlist, out List<int> legendValuelist)

        {

            legendIdlist = new List<int>();

            legendValuelist = new List<int>();

            if (itemTipsModel.legendAttrIDPreviewDict.ContainsKey(itemConfig.EquipPlace))

            {

                foreach (var attrType in itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace].Keys)

                {

                    switch (attrType)

                    {

                        case LegendAttrType.Pursuit:

                            legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                            break;

                        case LegendAttrType.Fixed:

                            legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                            break;

                    }

                }

            }

            int i = 0;

            for (i = 0; i < legendIdlist.Count; i++)

            {

                if (itemTipsModel.legendAttrColorValuePreviewDict.ContainsKey(legendIdlist[i]))

                {

                    if (itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.ItemColor))

                    {

                        legendValuelist.Add(itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]][itemConfig.ItemColor]);

                    }

                }

                else if (itemTipsModel.legendAttrLvValuePreviewDict.ContainsKey(legendIdlist[i]))

                {

                    if (itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.LV))

                    {

                        legendValuelist.Add(itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]][itemConfig.LV]);

                    }

                }

            }

        }





        private StringBuilder _extraInfoBuider = new StringBuilder();

        private StringBuilder _allInfoDesBuider = new StringBuilder();

        public string GetExtraInfos()