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

client_linchunjie

2019-06-27 d58471c74c51213eada32384da961d31d1fc38f5

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

 System/ItemTip/ItemTipUtility.cs

@@ -1830,7 +1830,6 @@
                case 42:

                    return TipType.PetMount;

                case 113:

                    return TipType.Wing;

                case 114:

                case 116:

                case 117:


 System/KnapSack/New/CommonItemBaisc.cs

@@ -80,10 +80,8 @@
        }



        EquipSuitEffect m_SuitEffect;

        EquipSuitEffect suitEffect

        {

            get

            {

        EquipSuitEffect suitEffect {

            get {

                if (m_SuitEffect == null)

                {

                    LoadPrefab();

@@ -226,22 +224,39 @@
                return 99;

            }



            switch (type)

            if (ItemLogicUtility.Instance.IsDogzEquip(itemId))

            {

                case PackType.DogzItem:

                    var compareSocre = GetDogzEquipSocre(config.EquipPlace);

                    return score.CompareTo(compareSocre);

                default:

                    return equipModel.CompareToCurrent(guid);

                var compareSocre = GetDogzEquipScore(config.EquipPlace);

                return score.CompareTo(compareSocre);

            }

            else if (ItemLogicUtility.Instance.IsSpiritWeapon(itemId))

            {

                return score.CompareTo(GetSpiritWeaponScore(config.EquipPlace));

            }

            else if (ItemLogicUtility.Instance.IsRealmEquip(itemId))

            {

                return equipModel.CompareToCurrent(guid);

            }

            else

            {

                return 0;

            }

        }



        int GetDogzEquipSocre(int equipPlace)

        int GetDogzEquipScore(int equipPlace)

        {

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

            ItemModel putOnModel = null;

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

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

        }



        int GetSpiritWeaponScore(int equipPlace)

        {

            var spiritWeaponModel = ModelCenter.Instance.GetModel<SpiritWeaponModel>();

            var guid = spiritWeaponModel.GetSpiritWeapon((RoleEquipType)equipPlace);

            var item = packModel.GetItemByGuid(guid);

            return item != null ? item.score : 0;

        }



    }

@@ -266,7 +281,7 @@
            this.useDataDic = useDataDic;

            this.packType = type;



            this.score = ItemLogicUtility.Instance.GetEquipScore( itemId, useDataDic, isPreview);

            this.score = ItemLogicUtility.Instance.GetEquipScore(itemId, useDataDic, isPreview);

        }



        public ItemCellModel(int itemId)

@@ -289,7 +304,7 @@
            this.useDataDic = null;

            this.packType = PackType.Deleted;



            this.score = ItemLogicUtility.Instance.GetEquipScore( itemId, null, isPreview);

            this.score = ItemLogicUtility.Instance.GetEquipScore(itemId, null, isPreview);

        }



        int AdjustItemId(int itemId)


 System/SpiritWeapon/SpiritWeaponModel.cs

@@ -17,6 +17,8 @@

        public const int WING_EQUIPINDEX = 0;

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

        public override void Init()
        {

@@ -27,6 +29,14 @@

        }

        public string GetSpiritWeapon(RoleEquipType equipType)
        {
            var index = EquipPlaceMapConfig.GetServerPlace(0, (int)equipType);
            var item = packModel.GetItemByIndex(PackType.Equip, index);

            return item != null ? item.guid : string.Empty;
        }

    }

}