少年修仙传客户端代码仓库
client_Wu Xijin
2019-05-20 8ff978c9f2dc958b620a3aad28d214f4208aef55
6873 体验翅膀自动穿戴
4个文件已修改
202 ■■■■■ 已修改文件
System/ItemTip/ItemTipUtility.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/ItemTip/TipItemBaseInfoWidget.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemLogicUtility.cs 175 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/SpiritWeapon/SpiritWeaponModel.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/ItemTip/ItemTipUtility.cs
@@ -57,6 +57,7 @@
            public int star;
            public int strengthenLevel;
            public int score;
            public bool isOverdue;
            public int auctionSurplusTime;
            public int overdueSurplusTime;
            public int levelLimit;
@@ -892,6 +893,7 @@
                isEquiped = isEquiped,
                isPreview = false,
                score = item.score,
                isOverdue =ItemLogicUtility.Instance.IsOverdue(guid),
                auctionSurplusTime = item.isAuction ? item.auctionSurplusTime : 0,
                overdueSurplusTime = item.overdueSurplusTime,
                levelLimit = item.isAuction ? 0 : item.config.UseLV,
System/ItemTip/TipItemBaseInfoWidget.cs
@@ -51,7 +51,7 @@
                if (baseInfo.isAuction)
                {
                    m_SurplusTimeContainer.gameObject.SetActive(true);
                    if (baseInfo.auctionSurplusTime > 0)
                    if (!baseInfo.isOverdue)
                    {
                        m_SurplusTime.text = TimeUtility.SecondsToHMSCHSRetain(baseInfo.auctionSurplusTime);
                    }
@@ -62,13 +62,21 @@
                }
                else if (itemConfig.ExpireTime > 0)
                {
                    m_SurplusTimeContainer.gameObject.SetActive(true);
                    if (baseInfo.overdueSurplusTime > 0)
                    if (!baseInfo.isOverdue)
                    {
                        m_SurplusTime.text = TimeUtility.SecondsToConsumeRebate(baseInfo.overdueSurplusTime);
                        if (baseInfo.overdueSurplusTime > 0)
                        {
                            m_SurplusTimeContainer.gameObject.SetActive(true);
                            m_SurplusTime.text = TimeUtility.SecondsToConsumeRebate(baseInfo.overdueSurplusTime);
                        }
                        else
                        {
                            m_SurplusTimeContainer.gameObject.SetActive(false);
                        }
                    }
                    else
                    {
                        m_SurplusTimeContainer.gameObject.SetActive(true);
                        m_SurplusTime.text = "已过期";
                    }
                }
System/KnapSack/Logic/ItemLogicUtility.cs
@@ -743,78 +743,92 @@
                return;
            }
            int equipPlace = item.config.EquipPlace;
            switch ((RoleEquipType)equipPlace)
            {
                case RoleEquipType.Weapon:
                case RoleEquipType.Weapon2:
                case RoleEquipType.Hat:
                case RoleEquipType.Clothes:
                case RoleEquipType.Belt:
                case RoleEquipType.Trousers:
                case RoleEquipType.Shoes:
                case RoleEquipType.Neck:
                case RoleEquipType.FairyCan1:
                case RoleEquipType.FairyCan2:
                case RoleEquipType.Glove:
                case RoleEquipType.Jade:
                case RoleEquipType.Wing:
                case RoleEquipType.Guard:
                case RoleEquipType.PeerlessWeapon1:
                case RoleEquipType.PeerlessWeapon2:
                    if (betterEquipExceptDungeonDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
                    {
                        if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(item.itemId))
                        {
                            return;
                        }
                    }
                    SetGetBetterEquipEvent(item);
                    break;
            }
        }
        private void SetGetBetterEquipEvent(ItemModel model)
        {
            if (model.isAuction)
            {
                return;
            }
            var itemEffectTime = model.GetUseData((int)ItemUseDataKey.createTime);
            if (!itemEffectTime.IsNullOrEmpty() && itemEffectTime.Count > 0)
            {
                if (itemEffectTime[0] != 0)
                {
                    var cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.guid);
                    double remainTime = 0;
                    if (cool != null)
                    {
                        remainTime = cool.GetRemainTime();
                    }
                    if (remainTime >= 0 && remainTime < 120 && model.config.ExpireTime > 0)
                    {
                        return;
                    }
                }
            }
            if (!equipModel.IsLevelUnLocked(model.config.LV))
            {
                return;
            }
            int isFightUp = IsFightUp(model.itemId, model.score);
            if (isFightUp != 1)
            {
                return;
            }
            if (GetBetterEquipEvent != null)
            {
                GetBetterEquipEvent(model.guid);
            }
            int equipPlace = item.config.EquipPlace;
            if ((RoleEquipType)equipPlace == RoleEquipType.Wing)
            {
                var wing = packModel.GetItemByIndex(PackType.Equip, SpiritWeaponModel.WING_EQUIPINDEX);
                if (wing == null)
                {
                    if (!SpiritWeaponModel.hasAutoEquipWing)
                    {
                        SpiritWeaponModel.hasAutoEquipWing = true;
                        ItemOperateUtility.Instance.PutOnItem(item.guid);
                        return;
                    }
                }
            }
            switch ((RoleEquipType)equipPlace)
            {
                case RoleEquipType.Weapon:
                case RoleEquipType.Weapon2:
                case RoleEquipType.Hat:
                case RoleEquipType.Clothes:
                case RoleEquipType.Belt:
                case RoleEquipType.Trousers:
                case RoleEquipType.Shoes:
                case RoleEquipType.Neck:
                case RoleEquipType.FairyCan1:
                case RoleEquipType.FairyCan2:
                case RoleEquipType.Glove:
                case RoleEquipType.Jade:
                case RoleEquipType.Wing:
                case RoleEquipType.Guard:
                case RoleEquipType.PeerlessWeapon1:
                case RoleEquipType.PeerlessWeapon2:
                    if (betterEquipExceptDungeonDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
                    {
                        if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(item.itemId))
                        {
                            return;
                        }
                    }
                    SetGetBetterEquipEvent(item);
                    break;
            }
        }
        private void SetGetBetterEquipEvent(ItemModel model)
        {
            if (model.isAuction)
            {
                return;
            }
            var itemEffectTime = model.GetUseData((int)ItemUseDataKey.createTime);
            if (!itemEffectTime.IsNullOrEmpty() && itemEffectTime.Count > 0)
            {
                if (itemEffectTime[0] != 0)
                {
                    var cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.guid);
                    double remainTime = 0;
                    if (cool != null)
                    {
                        remainTime = cool.GetRemainTime();
                    }
                    if (remainTime >= 0 && remainTime < 120 && model.config.ExpireTime > 0)
                    {
                        return;
                    }
                }
            }
            if (!equipModel.IsLevelUnLocked(model.config.LV))
            {
                return;
            }
            int isFightUp = IsFightUp(model.itemId, model.score);
            if (isFightUp != 1)
            {
                return;
            }
            if (GetBetterEquipEvent != null)
            {
                GetBetterEquipEvent(model.guid);
            }
        }
        public event Action<PackType, string> PickItemEvent; //捡起的物品
@@ -927,8 +941,8 @@
        private int playerLv;
        private Dictionary<int, List<ItemModel>> _lifePotionDict = new Dictionary<int, List<ItemModel>>(); //key 药水等级
        private List<int> _sellItemScorelist = new List<int>();
        private Dictionary<int, Dictionary<int, List<ItemModel>>> _sameIndexEquipDict = new Dictionary<int, Dictionary<int, List<ItemModel>>>();  //存储相同装备位的装备
                                                                                                                                                  // private  _sameEquipScoreDict = new Dictionary<int, List<ItemModel>>(); //存储相同ID中相同装备评分的装备
        private Dictionary<int, Dictionary<int, List<ItemModel>>> _sameIndexEquipDict = new Dictionary<int, Dictionary<int, List<ItemModel>>>();  //存储相同装备位的装备
                                                                                                                                                  // private  _sameEquipScoreDict = new Dictionary<int, List<ItemModel>>(); //存储相同ID中相同装备评分的装备
        private Dictionary<int, ItemModel> _packModelDict;
        private List<ItemModel> _sellItemlist = new List<ItemModel>();
@@ -1420,7 +1434,18 @@
            }
            else
            {
                return item.overdueSurplusTime < 0;
                var isoverdue = false;
                switch ((ItemTimeType)item.config.EndureReduceType)
                {
                    case ItemTimeType.EquipedTime:
                        isoverdue = item.GetUseDataFirstValue(44) > 0 && item.overdueSurplusTime < 0;
                        break;
                    case ItemTimeType.RealityTime:
                        isoverdue = item.overdueSurplusTime < 0;
                        break;
                }
                return isoverdue;
            }
        }
System/SpiritWeapon/SpiritWeaponModel.cs
@@ -6,6 +6,15 @@
{
    public class SpiritWeaponModel : Model
    {
        public static bool hasAutoEquipWing {
            get {
                return LocalSave.GetBool(StringUtility.Contact("HasAutoEquipWing_", PlayerDatas.Instance.baseData.PlayerID));
            }
            set {
                LocalSave.SetBool(StringUtility.Contact("HasAutoEquipWing_", PlayerDatas.Instance.baseData.PlayerID), value);
            }
        }
        public const int WING_EQUIPINDEX = 0;
        public override void Init()