少年修仙传客户端代码仓库
client_linchunjie
2019-04-02 8a465012a858b67ae40de8f2b0d38717a8a27d3f
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已删除
3个文件已修改
431 ■■■■■ 已修改文件
System/KnapSack/Logic/ItemInfoWin.cs 384 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemInfoWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemLogicUtility.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/New/KnapSackEventMgr.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureBaseWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemInfoWin.cs
File was deleted
System/KnapSack/Logic/ItemInfoWin.cs.meta
File was deleted
System/KnapSack/Logic/ItemLogicUtility.cs
@@ -82,7 +82,7 @@
        {
            Dictionary<int, int> properties = new Dictionary<int, int>();
            public int this[int id] { get { return properties[id]; } }
            public int this[int id] { get { return properties[id]; } set { properties[id] = value; } }
            public List<int> Keys { get { return new List<int>(properties.Keys); } }
@@ -183,6 +183,12 @@
                AddRange(config.LegendAttrID, config.LegendAttrValue);
                AddRange(config.OutOfPrintAttr, config.OutOfPrintAttrValue);
            }
            public bool ContainsKey(int id)
            {
                return properties.ContainsKey(id);
            }
        }
        public int GetEquipScore(PackType type, int itemId, Dictionary<int, List<int>> useDataDic = null, bool isPreview = false)
@@ -298,6 +304,13 @@
                return 0;
            }
            var minAttack = properties.ContainsKey((int)PropertyType.MinAtk) ? properties[(int)PropertyType.MinAtk] : 0;
            var maxAttack = properties.ContainsKey((int)PropertyType.MaxAtk) ? properties[(int)PropertyType.MaxAtk] : 0;
            var attack = properties.ContainsKey((int)PropertyType.ATK) ? properties[(int)PropertyType.ATK] : 0;
            properties[(int)PropertyType.MinAtk] = minAttack + attack;
            properties[(int)PropertyType.MaxAtk] = maxAttack + attack;
            Equation.Instance.Clear();
            curEquipAttrDict.Clear();
@@ -309,9 +322,11 @@
                {
                    case PropertyType.ATKSPEED:
                    case PropertyType.OnlyFinalHurt:
                    case PropertyType.PVPAtkBackHP:
                    case PropertyType.PVPAtkBackHP:
                    case PropertyType.MinAtk:
                    case PropertyType.MaxAtk:
                        curEquipAttrDict.Add(attrType, properties[key]);
                        break;
                        break;
                    default:
                        if (GSProValueDict != null && GSProValueDict.ContainsKey(attrType))
                        {
System/KnapSack/New/KnapSackEventMgr.cs
@@ -4,7 +4,6 @@
[XLua.LuaCallCSharp]
public class KnapSackEventMgr : Singleton<KnapSackEventMgr>
{
    public Action<GameObject> AddEquipWinTempObjEvent;
@@ -58,23 +57,24 @@
        if (HideItemWinEvent != null)
            HideItemWinEvent();
    }
    public void HideItemPopWin()
    {
        if(WindowCenter.Instance.IsOpen<EquipWin>())
        if (WindowCenter.Instance.IsOpen<EquipWin>())
        {
            HideEquipWin();
        }
        else if(WindowCenter.Instance.IsOpen<WingsWin>())
        else if (WindowCenter.Instance.IsOpen<WingsWin>())
        {
            HideWingsWin();
        }
        else if(WindowCenter.Instance.IsOpen<ItemInfoWin>())
        else if (WindowCenter.Instance.IsOpen<ItemTipWin>())
        {
            HideItemWin();
        }
        else if(WindowCenter.Instance.IsOpen<GuardianWin>())
        else if (WindowCenter.Instance.IsOpen<GuardianWin>())
        {
            HideGuardWin();
            HideGuardWin();
        }
        else if (WindowCenter.Instance.IsOpen<KingFairyChestWin>())
        {
System/Treasure/TreasureBaseWin.cs
@@ -201,7 +201,7 @@
                 || WindowCenter.Instance.IsOpen<TreasureSoulActiveWin>()
                 || WindowCenter.Instance.IsOpen<GetItemPathWin>()
                 || WindowCenter.Instance.IsOpen<DemonTreasurePropertyWin>()
                 || WindowCenter.Instance.IsOpen<ItemInfoWin>())
                 || WindowCenter.Instance.IsOpen<ItemTipWin>())
            {
                return;
            }