Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

2 天以前 973edc44a04dceb8b48a32ca912e6167f86189d4

 Main/System/KnapSack/Logic/SinglePack.cs

@@ -182,9 +182,9 @@
        return list;
    }

    public ulong GetCountById(int itemId, bool includeAuction = true)
    public long GetCountById(int itemId, bool includeAuction = true)
    {
        ulong count = 0;
        long count = 0;

        //部分货币和物品绑定
        if (GeneralDefine.itemMoneyCountDict.ContainsKey(itemId))
@@ -202,7 +202,7 @@
                {
                    continue;
                }
                count += (ulong)item.count;
                count += item.count;
            }
        }
        return count;