Merge remote-tracking branch 'origin/master' into SpringFestival

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/KnapSack/New/SplitWin.cs

@@ -101,7 +101,7 @@
        public void InitPanel()
        {
            ItemModel itemModel = playerPack.GetItemModelByGUID(itemTipsModel.curAttrData.guid);
            if (itemModel == null || itemModel.packType != PackType.rptItem)
            if (itemModel == null)
                return;

            _itemCell.Init(itemModel);