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

client_linchunjie

2019-03-15 ac7422d9e68a2e4d0f7b4807a3c8a42251a20cc6

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

 System/Dungeon/DungeonRewardItem.cs

@@ -38,19 +38,20 @@
        private void RequestSfx()

        {

            RecycleSfx();

            if (base.itemConfig == null)

            var config = ItemConfig.Get(itemId);

            if (config != null)

            {

                return;

            }

            var _effect = itemConfig.ItemColor == 3 ? 1136 :

                itemConfig.ItemColor == 4 ? 1137 :

                itemConfig.ItemColor == 5 ? 1138 : 0;

            if (_effect != 0)

                var effect = config.ItemColor == 3 ? 1136 :

                                   config.ItemColor == 4 ? 1137 :

                                   config.ItemColor == 5 ? 1138 : 0;

                if (effect != 0)

            {

                itemColorSfx = EffectMgr.Instance.PlayUIEffect(_effect, 2500, transform, true);

                    itemColorSfx = EffectMgr.Instance.PlayUIEffect(effect, 2500, transform, true);

            }

        }



        }



        private void RecycleSfx()

        {

            if (itemColorSfx != null)


 System/Equip/EquipModel.cs

@@ -115,7 +115,7 @@
            {
                foreach (var item in items)
                {
                    if (!item.isAuction)
                    if (ItemLogicUtility.Instance.IsJobCompatibleItem(item.itemId) && !item.isAuction)
                    {
                        candidateEquips.Add(new CandidateEquip(item.guid));
                    }

 System/HappyXB/BestXBWin.cs

@@ -411,10 +411,8 @@
                        WindowCenter.Instance.Open<HappyXBGetItemWin>();

                    }

                });

                if (xbResultItemBasiclist[index].itemConfig != null)

                {

                    XBModel.GetNotifyResult(xbResultItemBasiclist[index].itemConfig.ID, int.Parse(xbResultItemBasiclist[index].countText.text));

                }



                XBModel.GetNotifyResult(xbResultItemBasiclist[index].itemId, int.Parse(xbResultItemBasiclist[index].countText.text));

            }

        }




 System/HappyXB/RuneXBWin.cs

@@ -426,11 +426,9 @@
                        ResetXBItemState();

                        WindowCenter.Instance.Open<HappyXBGetItemWin>();

                    }

                }); ;

                if(xbResultItemBasiclist[index].itemConfig != null)

                {

                    XBModel.GetNotifyResult(xbResultItemBasiclist[index].itemConfig.ID, int.Parse(xbResultItemBasiclist[index].countText.text));

                }

                });



                XBModel.GetNotifyResult(xbResultItemBasiclist[index].itemId, int.Parse(xbResultItemBasiclist[index].countText.text));

            }

        }




 System/HappyXB/XBGetItemCell.cs

@@ -11,9 +11,10 @@
        {

            if (effect != null)

            {

                if (itemConfig != null)

                var config = ItemConfig.Get(itemId);

                if (config != null)

                {

                    switch ((TextColType)itemConfig.ItemColor)

                    switch ((TextColType)config.ItemColor)

                    {

                        case TextColType.Purple:

                            effect.effect = 1136;


 System/HeavenBattle/XMZZCampVicRewardWin.cs

@@ -74,7 +74,7 @@
                item.transform.localScale = Vector3.one;
                item.name = StringUtility.Contact("RewardCell", id);
                item.gameObject.SetActive(true);
                item.InitModel(heavenModel.campVicRewardDict[id], id);
                item.InitModel(heavenModel.campVicRewardDict[id]);
                GetList.Add(item);
                item.button.RemoveAllListeners();
                item.button.AddListener(() =>
@@ -92,7 +92,7 @@
                item.transform.localScale = Vector3.one;
                item.name = StringUtility.Contact("RewardCell", id);
                item.gameObject.SetActive(true);
                item.InitModel(heavenModel.campFailRewardDict[id], id);
                item.InitModel(heavenModel.campFailRewardDict[id]);
                GetList.Add(item);
                item.button.RemoveAllListeners();
                item.button.AddListener(() =>

 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -1447,7 +1447,7 @@
        public bool IsJobCompatibleItem(int itemId)
        {
            var config = ItemConfig.Get(itemId);
            return config.JobLimit == 0 || config.JobLimit / 100 == PlayerDatas.Instance.baseData.Job;
            return config != null && (config.JobLimit == 0 || config.JobLimit / 100 == PlayerDatas.Instance.baseData.Job);
        }

    }

 System/KnapSack/New/ChooseCell.cs

@@ -8,25 +8,23 @@
    {
        [SerializeField] GameObject chooseImage;
        [SerializeField] Text nameText;
        public int ItemId = 0;
        private void Awake()
        {
            ChooseItemWin.RefreshChooseCellAct += RefreshChooseImage;
            
        }

        public void InitModel(ItemCellModel model,int id)
        public void InitModel(ItemCellModel model)
        {
            base.Init(model);
            this.ItemId = id;
            nameText.text = itemConfig.ItemName;
            var config = ItemConfig.Get( itemId);
            nameText.text = config.ItemName;
            SetIsChoose(false);

        }

        private void RefreshChooseImage(int id)
        {
            if (id == ItemId)
            if (id == this.itemId)
            {
                SetIsChoose(true);
            }

 System/KnapSack/New/CommonItemBaisc.cs

@@ -72,9 +72,9 @@
            }

        }



        public ItemConfig itemConfig;

        public int itemId { get; private set; }



        protected PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

        EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }



        /// <summary>

@@ -82,29 +82,30 @@
        /// </summary>

        /// <param name="model"></param>

        /// <param name="isCompare"></param>

        public virtual void Init(ItemModel model, bool isCompare = false, int compareScore = 0)

        public virtual void Init(ItemModel model, bool isCompare = false)

        {

            itemConfig = model.config;

            InitUI(model.guid, model.itemId, (ulong)model.count, model.equipScore, model.isAuction, model.packType, isCompare, model.useDataDict, compareScore);

            itemId = model.itemId;

            InitUI(model.guid, model.itemId, (ulong)model.count, model.equipScore, model.isAuction, model.packType, isCompare, model.useDataDict);

        }



        /// <summary>

        ///  初始化数据（预览）

        /// </summary>

        /// <param name="model"></param>

        public virtual void Init(ItemCellModel model, int compareScore = 0)

        public virtual void Init(ItemCellModel model)

        {

            itemConfig = model.itemConfig;

            InitUI(model.guid, model.itemId, model.count, model.score, false, model.packType, model.isCompare, model.useDataDic, compareScore);

            itemId = model.itemId;

            InitUI(model.guid, model.itemId, model.count, model.score, false, model.packType, model.isCompare, model.useDataDic);

        }



        private void InitUI(string guid, int itemId, ulong count, int score, bool isAuction, PackType type, bool isCompare, Dictionary<int, List<int>> useDataDic, int compareScore = 0)

        private void InitUI(string guid, int itemId, ulong count, int score, bool isAuction, PackType type, bool isCompare, Dictionary<int, List<int>> useDataDic)

        {

            if (itemConfig == null) return;

            var config = ItemConfig.Get(itemId);

            if (config == null) return;



            itemIcon.gameObject.SetActive(true);

            bgIcon.gameObject.SetActive(true);

            itemIcon.SetSprite(itemConfig.IconKey);

            itemIcon.SetSprite(config.IconKey);

            bgIcon.SetItemBackGround(ItemLogicUtility.Instance.GetItemQuality(itemId, useDataDic));



            auctionIcon.gameObject.SetActive(isAuction);

@@ -115,50 +116,45 @@
                countText.text = UIHelper.ReplaceLargeNum((double)count);

            }



            int compareReslut = Compare(type, itemId, score, isCompare, compareScore, guid);

            var compareReslut = isCompare ? Compare(type, itemId, score, guid) : 0;

            switch (compareReslut)

            {

                case -1:

                    stateIcon.gameObject.SetActive(true);

                    stateIcon.SetSprite("EquipDownIcon");

                    break;

                case 0:

                    stateIcon.gameObject.SetActive(false);

                    break;

                case 1:

                    stateIcon.gameObject.SetActive(true);

                    stateIcon.SetSprite("EquipForbidIcon");

                    break;

                case 2:

                    stateIcon.gameObject.SetActive(true);

                    stateIcon.SetSprite("EquipUpIcon");

                    break;

                case 3:

                case 99:

                    stateIcon.gameObject.SetActive(true);

                    stateIcon.SetSprite("EquipDownIcon");

                    stateIcon.SetSprite("EquipForbidIcon");

                    break;

            }

        }



        /// <summary>

        /// 0 不比较 1 禁止比较 2 高评分 3 低评分

        /// 0 相等 99 禁止比较 1 高评分 -1 低评分

        /// </summary>

        /// <param name="itemId"></param>

        /// <param name="score"></param>

        /// <param name="isCompare"></param>

        /// <param name="compareSocre"></param>

        /// <returns></returns>

        int Compare(PackType type, int itemId, int score, bool isCompare, int compareSocre, string guid)

        int Compare(PackType type, int itemId, int score, string guid)

        {

            if (!isCompare && compareSocre == 0)

            if (type == PackType.Equip || type == PackType.DogzEquip)

            {

                return 0;

            }



            if (score == compareSocre && compareSocre != 0)

            if (!ItemLogicUtility.Instance.IsJobCompatibleItem(itemId))

            {

                return 0;

            }



            if (compareSocre <= 0 && (type == PackType.Equip || type == PackType.DogzEquip))

            {

                return 0;

                return 99;

            }



            var config = ItemConfig.Get(itemId);

@@ -168,65 +164,34 @@
            }



            var item = packModel.GetItemByGuid(guid);

            if (item != null && item.isAuction)

            {

                return 99;

            }



            if (item != null && ItemLogicUtility.Instance.IsOverdue(guid, itemId, item.useDataDict))

            {

                return 1;

                return 99;

            }



            if (!ItemLogicUtility.Instance.IsJobCompatibleItem(itemId))

            {

                return 1;

            }



            if (isCompare)

            {

                switch (type)

                {

                    case PackType.DogzItem:

                        compareSocre = GetCurrentEquipSocre(PackType.DogzEquip, config.EquipPlace);

                        break;

                    var compareSocre = GetDogzEquipSocre(config.EquipPlace);

                    return score.CompareTo(compareSocre);

                    default:

                        var result = equipModel.CompareToCurrent(guid);

                        if (result == 0)

                        {

                            return 0;

                        }

                        else if (result > 0)

                        {

                            return 2;

                        }

                        else

                        {

                            return 3;

                        }

                    return equipModel.CompareToCurrent(guid);

                }

            }



            if (score == compareSocre)

        int GetDogzEquipSocre(int equipPlace)

            {

                return 0;

            }

            else

            {

                return score > compareSocre ? 2 : 3;

            }



        }



        int GetCurrentEquipSocre(PackType type, int equipPlace)

        {

            switch (type)

            {

                case PackType.DogzEquip:

                    var dogzModel = ModelCenter.Instance.GetModel<DogzModel>();

                    ItemModel putOnModel = null;

                    dogzModel.TryGetDogzEquip(dogzModel.presentSelectDogz, equipPlace, out putOnModel);

                    return putOnModel == null ? 0 : putOnModel.equipScore;

                default:

                    ItemModel model = packModel.GetItemByIndex(type, equipPlace);

                    return model == null ? 0 : model.equipScore;

            }

        }



    }



    public class ItemCellModel


 System/KnapSack/New/ItemCell.cs

@@ -1,6 +1,5 @@
using UnityEngine;
using UnityEngine.UI;

using Snxxz.UI;
using System.Collections.Generic;
using System;
@@ -20,15 +19,15 @@
            }
        }

        public override void Init(ItemModel model, bool isCompare = false, int compareScore = 0)
        public override void Init(ItemModel model, bool isCompare = false)
        {
            base.Init(model, isCompare, compareScore);
            base.Init(model, isCompare);
            reducebtn.gameObject.SetActive(false);
        }

        public override void Init(ItemCellModel model, int compareScore = 0)
        public override void Init(ItemCellModel model)
        {
            base.Init(model, compareScore);
            base.Init(model);
            reducebtn.gameObject.SetActive(false);
        }
    }

 System/KnapSack/New/RareItem.cs

@@ -8,7 +8,7 @@
    {

        [SerializeField] UIEffect m_RareSfx;



        public override void Init(ItemCellModel model, int compareScore = 0)

        public override void Init(ItemCellModel model)

        {

            if (m_RareSfx != null)

            {

@@ -17,7 +17,7 @@
            base.Init(model);

        }



        public void SetItemRare(ItemCellModel model, int _itemColor = 0, int compareScore = 0)

        public void SetItemRare(ItemCellModel model, int _itemColor = 0)

        {

            if (model == null)

            {