少年修仙传客户端代码仓库
client_Wu Xijin
2019-03-14 ac66d6bad43b5be03e0817fe0512e9462f7ffeb4
Merge branch 'ItemTip'
11个文件已修改
90 ■■■■■ 已修改文件
System/Chat/ChatCtrl.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonData.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonNuwaVictoryWin.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonVictoryWin.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/EquipGem/EquipGemItemCell.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/DonateEquipTipsWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FairyAu/WarehouseTipsWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FashionDress/FashionDressWin.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemModel.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ModelShowPerfab.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/UI3DHeroSkillShow.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Chat/ChatCtrl.cs
@@ -1050,7 +1050,6 @@
            var item = new ItemModel(PackType.Item);
            var itemInfo = new ItemInfo();
            itemInfo.itemId = flauntGemId;
            itemInfo.isBind = flauntGemBind ? 1 : 0;
            item.SetItemInfo(itemInfo);
            var tip = string.Format("[{0}]", config.ItemName);
            itemPlaceList.Add(item);
System/Dungeon/DungeonData.cs
@@ -189,8 +189,7 @@
    {
        public int ItemID;
        public int Count;
        public int IsBind;
        public int IsSuite;
        public int IsAuctionItem;
        public string UserData;
    }
System/Dungeon/DungeonNuwaVictoryWin.cs
@@ -194,14 +194,11 @@
                    {
                        itemInfo.count = serverItem.Count;
                    }
                    itemInfo.isBind = serverItem.IsBind;
                    itemInfo.isSuite = serverItem.IsSuite;
                    itemInfo.userData = serverItem.UserData;
                    itemInfo.userData = serverItem.UserData;
                    itemModel.SetItemInfo(itemInfo);
                    items.Add(itemModel);
                }
             //   items.Sort(Compare);
                for (int i = 0; i < passRewardBehaviours.Length; i++)
                {
System/Dungeon/DungeonVictoryWin.cs
@@ -208,10 +208,8 @@
                    {
                        itemInfo.count = serverItem.Count;
                    }
                    itemInfo.isBind = serverItem.IsBind;
                    itemInfo.isSuite = serverItem.IsSuite;
                    itemInfo.userData = serverItem.UserData;
                    itemInfo.userData = serverItem.UserData;
                    itemModel.SetItemInfo(itemInfo);
                    items.Add(itemModel);
                }
System/EquipGem/EquipGemItemCell.cs
@@ -9,7 +9,6 @@
    {
        [SerializeField] Image m_ItemBackground;
        [SerializeField] Image m_ItemIcon;
        [SerializeField] Image m_Bind;
        [SerializeField] PropertyBehaviour[] m_Propertys;
        [SerializeField] Text m_Count;
        [SerializeField] Image m_Redpoint;
@@ -26,7 +25,6 @@
                {
                    m_ItemBackground.SetItemBackGround(config.ItemColor);
                    m_ItemIcon.SetSprite(config.IconKey);
                    m_Bind.gameObject.SetActive(item.isBind == 1);
                    m_Count.text = item.count.ToString();
                    EquipGemWin.DisplayProperty(item.itemId, m_Propertys);
                    m_Redpoint.gameObject.SetActive(red);
System/FairyAu/DonateEquipTipsWin.cs
@@ -89,9 +89,6 @@
            {
                ItemConfig _ChinItem = ItemConfig.Get((int)backpack_dic[item_id].itemId);
                if (backpack_dic[item_id].isBind == 1)
                    continue;
                foreach (int key in _ProductOrderJudgment.Keys)
                {
                    if (_ChinItem.EquipPlace == key && _ChinItem.LV >= _ProductOrderJudgment[key].Class && _ChinItem.StarLevel >= _ProductOrderJudgment[key].TheStar && _ChinItem.ItemColor >= _ProductOrderJudgment[key].Color)
System/FairyAu/WarehouseTipsWin.cs
@@ -1117,8 +1117,6 @@
            foreach (int item_id in backpack_dic.Keys)
            {
                ItemConfig _ChinItem = ItemConfig.Get((int)backpack_dic[item_id].itemId);
                if (backpack_dic[item_id].isBind == 1)
                    continue;
                foreach (int key in _ProductOrderJudgment.Keys)
                {
                    if (_ChinItem.EquipPlace == key && _ChinItem.LV >= _ProductOrderJudgment[key].Class && _ChinItem.StarLevel >= _ProductOrderJudgment[key].TheStar && _ChinItem.ItemColor >= _ProductOrderJudgment[key].Color)
System/FashionDress/FashionDressWin.cs
@@ -363,18 +363,6 @@
            }
            int _suitLevel = 0;
            if (clothes != null)
            {
                if (clothes.isSuite == 1)
                {
                    if (clothes.GetUseDataModel(30) != null && clothes.GetUseDataModel(30)[0] != 0)
                    {
                        _suitLevel = clothes.GetUseDataModel(30)[0];
                    }
                }
            }
            UI3DPlayerExhibitionData data = new UI3DPlayerExhibitionData()
            {
                job = job,
System/KnapSack/Logic/ItemModel.cs
@@ -32,7 +32,6 @@
        public int count { get { return itemInfo == null ? 0 : itemInfo.count; } }
        public int itemPlace { get { return itemInfo == null ? 0 : itemInfo.index; } }
        public int isBind { get { return itemInfo == null ? 0 : itemInfo.isBind; } }
        public int isSuite { get { return itemInfo == null ? 0 : itemInfo.isSuite; } }
        public int preItemCount { get; private set; }
        public int auctionSurplusTime {
            get {
@@ -75,38 +74,17 @@
            }
            var itemEffectTime = GetUseDataModel((int)ItemUseDataKey.createTime);
            if (itemEffectTime != null && itemEffectTime[0] != 0 && config.ExpireTime > 0)
            if (config.ExpireTime > 0 && !itemEffectTime.IsNullOrEmpty() && itemEffectTime[0] != 0)
            {
                switch ((EquipReduceType)config.EndureReduceType)
                {
                    case EquipReduceType.Def_EquipReduceType_None:
                        break;
                    case EquipReduceType.Def_EquipReduceType_DEF:
                        break;
                    case EquipReduceType.Def_EquipReduceType_ATK:
                        break;
                    case EquipReduceType.Def_EquipReduceType_Time:
                        ItemLogicUtility.Instance.SetItemEffectCDTime(info.guid, info.itemId, itemEffectTime[0], serverSurplusTime);
                        break;
                    case EquipReduceType.Def_EquipReduceType_AttackValue:
                        break;
                    case EquipReduceType.Def_EquipReduceType_HurtValue:
                        break;
                    case EquipReduceType.Def_EquipReduceType_Spcl:
                        break;
                    case EquipReduceType.Def_EquipReduceType_HPMPValue:
                        break;
                    case EquipReduceType.Def_EquipReduceType_Horse:
                        break;
                    case EquipReduceType.Def_EquipReduceType_RTimeItem:
                        ItemLogicUtility.Instance.SetItemEffectCDTime(info.guid, info.itemId, itemEffectTime[0], serverSurplusTime);
                        break;
                    case EquipReduceType.Def_EquipReduceType_Day:
                        break;
                    case EquipReduceType.Def_EquipReduceType_ServerDay:
                    default:
                        break;
                }
            }
        }
@@ -147,8 +125,6 @@
        public int remainHour;  //剩余时间(小时)
        public int isSuite;//是否已经套装化
        public string userData;//size = UserDataLen
        public string guid; //物品的实例ID
@@ -164,11 +140,10 @@
            index = serverItem.ItemPlace;
            count = serverItem.ItemCount;
            remainHour = (int)serverItem.RemainHour;
            isBind = serverItem.IsBind;
            isSuite = serverItem.IsSuite;
            userData = serverItem.UserData;
            isLocked = serverItem.IsLocked;
            guid = serverItem.ItemGUID;
            isBind = serverItem.IsBind;
        }
        public ItemInfo(H0704_tagRolePackRefresh serverItem)
@@ -177,11 +152,10 @@
            index = serverItem.ItemPlace;
            count = serverItem.ItemCount;
            remainHour = (int)serverItem.RemainHour;
            isBind = serverItem.IsBind;
            isSuite = serverItem.IsSuite;
            userData = serverItem.UserData;
            isLocked = serverItem.IsLocked;
            guid = serverItem.ItemGUID;
            isBind = serverItem.IsBind;
        }
    }
System/KnapSack/Logic/ModelShowPerfab.cs
@@ -196,18 +196,6 @@
            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;
            int _suitLevel = 0;
            if (clothes != null)
            {
                if (clothes.isSuite == 1)
                {
                    if (clothes.GetUseDataModel(30) != null && clothes.GetUseDataModel(30)[0] != 0)
                    {
                        _suitLevel = clothes.GetUseDataModel(30)[0];
                    }
                }
            }
            UI3DPlayerExhibitionData data = new UI3DPlayerExhibitionData()
            {
                job = job,
UI/Common/UI3DHeroSkillShow.cs
@@ -113,18 +113,6 @@
            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;
            int _suitLevel = 0;
            if (clothes != null)
            {
                if (clothes.isSuite == 1)
                {
                    if (clothes.GetUseDataModel(30) != null && clothes.GetUseDataModel(30)[0] != 0)
                    {
                        _suitLevel = clothes.GetUseDataModel(30)[0];
                    }
                }
            }
            #endregion
            UI3DPlayerExhibitionData data = new UI3DPlayerExhibitionData()