1885 神兽功能修改

Client_PangDeRong

2018-09-28 faf918ea467df1bebd70de3e149f2eeac67ad12c

1885 神兽功能修改

 System/Dogz/DogzModel.cs

@@ -575,6 +575,11 @@


        private void SendPutOffEquip(int equipPlace)

        {

            if(playerPack.GetReaminGridCount(PackType.rptDogzItem) < 1)

            {

                SysNotifyMgr.Instance.ShowTip("DogzBagFull");

                return;

            }

            GetDogzEquipPlaceStates(presentSelectDogz);

            CA5C1_tagCMDogzUnEquipItem dogzPutOff = new CA5C1_tagCMDogzUnEquipItem();

            dogzPutOff.DogzID = (byte)presentSelectDogz;

@@ -639,6 +644,23 @@
            }

            dogzItemList.Sort(CompareByDogzItemPack);

            return dogzItemList;

        }



        public int GetDogzPackMatNum()

        {

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptDogzItem);

            if (singlePack == null) return 0;



            int num = 0;

            Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict();

            foreach (var value in pairs.Values)

            {

               if(value.chinItemModel.EquipPlace == 0)

                {

                    num += 1;

                }

            }

            return num;

        }



        public bool IsReachSelectCondi(int itemId)

@@ -708,6 +730,12 @@
            y = end.equipScore;

            if (x.CompareTo(y) != 0) return -x.CompareTo(y);



            List<int> strenglist = start.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);

            x = strenglist != null ? strenglist[0] : 0;

            strenglist = end.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);

            y = strenglist != null ? strenglist[0] : 0;

            if (x.CompareTo(y) != 0) return -x.CompareTo(y);



            return 0;

        }

        #endregion


 System/Dogz/DogzPackCell.cs

@@ -1,30 +1,41 @@
using Snxxz.UI;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace EnhancedUI.EnhancedScroller
{
    public class DogzPackCell : ScrollerUI
    {
        [SerializeField] List<DogzItemCell> dogzItemlist;
        DogzPackModel m_Model;
        DogzPackModel model
        {
            get
            {
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DogzPackModel>());
            }
        }
        public override void Refresh(CellView cell)
        {
            var _line = cell.index;
            for (int i = 0; i < 4; i++)
            {
                var _index = _line * 4 + i;
                dogzItemlist[i].Display(_index);
            }
        }
    }
}

using Snxxz.UI;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;

namespace EnhancedUI.EnhancedScroller

{

    public class DogzPackCell : ScrollerUI

    {

        [SerializeField] List<DogzItemCell> dogzItemlist;

        DogzModel m_Model;

        DogzModel model

        {

            get

            {

                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DogzModel>());

            }

        }

        public override void Refresh(CellView cell)

        {

            var _line = cell.index;

            for (int i = 0; i < 4; i++)

            {

                var _index = _line * 4 + i;

                dogzItemlist[i].gameObject.SetActive(true);

                if (model.SelectDogzItemQuality == 0

                    && model.SelectDogzItemStart == 0)

                {

                    int hideIndex = model.DogzPackGridCnt - model.GetDogzPackMatNum();

                    if (_index >= hideIndex)

                    {

                        dogzItemlist[i].gameObject.SetActive(false);

                    }

                }

              
                dogzItemlist[i].Display(_index);

            }

        }

    }

}




 System/Dogz/DogzPackWin.cs

@@ -274,12 +274,28 @@
                    }

                    else

                    {

                        int putStrenLv = 0;

                        if (itemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)

                        {

                            putStrenLv = itemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];

                        }



                        int selectStrenLv = 0;

                        if (selectModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)

                        {

                            selectStrenLv = selectModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];

                        }



                        if (itemModel.chinItemModel.ItemColor < selectModel.chinItemModel.ItemColor

                           || (itemModel.chinItemModel.StarLevel < selectModel.chinItemModel.StarLevel

                           && itemModel.chinItemModel.ItemColor == selectModel.chinItemModel.ItemColor)

                            || (itemModel.equipScore < selectModel.equipScore 

                            && itemModel.chinItemModel.ItemColor == selectModel.chinItemModel.ItemColor

                            && itemModel.chinItemModel.StarLevel == selectModel.chinItemModel.StarLevel))

                            && itemModel.chinItemModel.StarLevel == selectModel.chinItemModel.StarLevel)

                            ||(itemModel.equipScore == selectModel.equipScore

                            && itemModel.chinItemModel.ItemColor == selectModel.chinItemModel.ItemColor

                            && itemModel.chinItemModel.StarLevel == selectModel.chinItemModel.StarLevel

                            && putStrenLv < selectStrenLv))

                        {

                            indexlist.Add(dogzModel.selectEquipPlacelist[0].itemInfo.ItemPlace);

                        }