少年修仙传客户端代码仓库
client_Wu Xijin
2019-03-19 e1324a5c21d9f953a16301743eb4bc8c1f921b51
3335 更新物品类型管理.
11个文件已修改
76 ■■■■ 已修改文件
Core/GameEngine/Model/TelPartialConfig/tagChinItemConfig.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/ItemConfigWrap.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FindPrecious/DemonJarVictoryWin.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemLogicUtility.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemModel.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Message/HrefAnalysis.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Message/RichTableEvent.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/WingsBouncedWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/WingsRedDotModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/WingsRefined.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/UIHelper.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/TelPartialConfig/tagChinItemConfig.cs
@@ -29,11 +29,6 @@
        return item;
    }
    public static bool IsWing(int itemId)
    {
        var config = ItemConfig.Get(itemId);
        return config != null && (config.Type == 111 || config.Type == 39 || config.Type == 52);
    }
}
Lua/Gen/ItemConfigWrap.cs
@@ -392,11 +392,6 @@
                {
                    int _itemId = LuaAPI.xlua_tointeger(L, 1);
                    
                        bool gen_ret = ItemConfig.IsWing( _itemId );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    return 1;
                }
                
System/FindPrecious/DemonJarVictoryWin.cs
@@ -18,7 +18,7 @@
        [SerializeField] Transform m_ContainerPoivt;
        [SerializeField] Transform m_KillRewardExplain;
        [SerializeField] Text m_Rank;
        [SerializeField] RectTransform  m_FirstRankRewardTip;
        [SerializeField] RectTransform m_FirstRankRewardTip;
        [SerializeField] Transform m_DoubleReward;
        [SerializeField] Transform m_DoubleChallenge;
        [SerializeField] ScrollRect m_RewardsScroll;
@@ -198,28 +198,13 @@
            }
            else
            {
                if ((config1.Type == 108 || config1.Type == 109) && (config2.Type != 108 && config2.Type != 109))
                if (config1.ItemColor != config2.ItemColor)
                {
                    return -1;
                }
                else if ((config1.Type != 108 && config1.Type == 109) && (config2.Type == 108 || config2.Type == 109))
                {
                    return 1;
                    return config2.ItemColor.CompareTo(config1.ItemColor);
                }
                else
                {
                    if (config1.ItemColor != config2.ItemColor)
                    {
                        return config2.ItemColor.CompareTo(config1.ItemColor);
                    }
                    else if (config1.StarLevel != config2.StarLevel)
                    {
                        return config2.StarLevel.CompareTo(config1.StarLevel);
                    }
                    else
                    {
                        return config2.LV.CompareTo(config1.LV);
                    }
                    return config2.LV.CompareTo(config1.LV);
                }
            }
System/KnapSack/Logic/ItemLogicUtility.cs
@@ -906,7 +906,7 @@
        public int SetSellItemOrder(ItemModel startModel, ItemModel endModel)
        {
            bool startIsEquip = IsEquip(startModel.itemId);
            bool endIsEquip = IsEquip(endModel .itemId);
            bool endIsEquip = IsEquip(endModel.itemId);
            if (startIsEquip.CompareTo(endIsEquip) != 0) return -startIsEquip.CompareTo(endIsEquip);
            int order1 = startModel.config.Type;
            int order2 = endModel.config.Type;
@@ -1427,8 +1427,23 @@
        public bool IsEquip(int itemId)
        {
            if (ItemConfig.Has(itemId))
            {
                return false;
            }
            var config = ItemConfig.Get(itemId);
            return (config.Type >= 101 && config.Type <= 112) || (config.Type >= 128 && config.Type <= 137);
            return config.Type >= 101 && config.Type <= 112;
        }
        public bool IsWing(int itemId)
        {
            if (ItemConfig.Has(itemId))
            {
                return false;
            }
            var config = ItemConfig.Get(itemId);
            return config.Type == 113 || config.Type == 39 || config.Type == 52;
        }
    }
System/KnapSack/Logic/ItemModel.cs
@@ -16,10 +16,14 @@
        public int equipPlace {
            get {
                if ((config.Type >= 101 && config.Type <= 112) || (config.Type >= 128 && config.Type <= 137))
                if (ItemLogicUtility.Instance.IsEquip(itemId))
                {
                    return EquipSet.ClientPlaceToServerPlace(new Int2(config.LV, config.EquipPlace));
                }
                else if (config.Type >= 113 && config.Type <= 117)
                {
                    return EquipSet.ClientPlaceToServerPlace(new Int2(0, config.EquipPlace));
                }
                else
                {
                    return 0;
System/Message/HrefAnalysis.cs
@@ -154,7 +154,7 @@
                            if (int.TryParse(presentHrefInfo.mSplits["showitem"], out _id))
                            {
                                ItemConfig cfg = ItemConfig.Get(_id);
                                if (cfg != null && cfg.Type == 111)
                                if (cfg != null && cfg.Type == 113)
                                {
                                    Dictionary<int, List<int>> userdatadic = null;
                                    string userdata = array[1];
System/Message/RichTableEvent.cs
@@ -67,7 +67,7 @@
                                        if (cfg != null)
                                        {
                                            var _itemColor = cfg.ItemColor;
                                            if (cfg.Type == 111)//翅膀
                                            if (cfg.Type == 113)//翅膀
                                            {
                                                Dictionary<int, List<int>> userdatadic = null;
                                                if (_dict.ContainsKey("userdata"))
System/Strengthening/WingsBouncedWin.cs
@@ -146,13 +146,13 @@
            foreach (int index in backpack_dic.Keys)
            {
                int itemId = (int)backpack_dic[index].itemId;
                if (!WingRefineExpConfig.Has(itemId) || !ItemConfig.IsWing(itemId))
                if (!WingRefineExpConfig.Has(itemId) || !ItemLogicUtility.Instance.IsWing(itemId))
                {
                    continue;
                }
                var wingConfig = ItemConfig.Get(itemId);
                if (wingConfig.Type == 111 && ItemLogicUtility.Instance.IsJobCompatibleItem(itemId))
                if (wingConfig.Type == 113 && ItemLogicUtility.Instance.IsJobCompatibleItem(itemId))
                {
                    WingDic.Add(index, backpack_dic[index]);
                }
System/Strengthening/WingsRedDotModel.cs
@@ -127,7 +127,7 @@
            {
                var item = backpack_dic[index];
                var itemId = item.itemId;
                if (WingRefineExpConfig.Has(itemId) && ItemConfig.IsWing(itemId))
                if (WingRefineExpConfig.Has(itemId) && ItemLogicUtility.Instance.IsWing(itemId))
                {
                    var _WingsInformation = new WingsInformation();
                    _WingsInformation.WingsID = itemId;
System/Strengthening/WingsRefined.cs
@@ -487,13 +487,13 @@
        foreach (int index in backpack_dic.Keys)
        {
            int _id = (int)backpack_dic[index].itemId;
            if (!ItemConfig.IsWing(_id))
            if (!ItemLogicUtility.Instance.IsWing(_id))
            {
                continue;
            }
            var wingConfig = ItemConfig.Get(_id);
            if (wingConfig.Type == 111 && ItemLogicUtility.Instance.IsJobCompatibleItem(_id))
            if (wingConfig.Type == 113 && ItemLogicUtility.Instance.IsJobCompatibleItem(_id))
            {
                markingbbol = true;
            }
@@ -535,7 +535,7 @@
            var item = items[itemIndex];
            if (WingRefineExpConfig.Has(item.itemId))
            {
                if (ItemConfig.IsWing(item.itemId))
                if (ItemLogicUtility.Instance.IsWing(item.itemId))
                {
                    _wingItemDic.Add(itemIndex, item.itemId);
                    WingDic.Add(itemIndex, item);
Utility/UIHelper.cs
@@ -667,7 +667,7 @@
        if (_itemCfg != null)
        {
            _itemColor = _itemCfg.ItemColor;
            if (_itemCfg.Type == 111 && _dict != null)
            if (_itemCfg.Type == 113 && _dict != null)
            {
                _itemColor = ItemLogicUtility.Instance.GetItemQuality(_itemCfg.ID, _dict);
            }