Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-12-04 31efa47c430874f95f4ff5503372f0cf6ecb53ae

 System/KnapSack/Logic/PackModelInterface.cs

@@ -839,10 +839,7 @@
                    if (!isbetter)

                    {

                        equipItemModel = singlePack.GetItemModelByIndex(10);

                        if (equipItemModel != null)

                        {

                            putOnScore = equipItemModel.equipScore;

                        }

                        putOnScore = equipItemModel == null ? 0 : equipItemModel.equipScore;

                        isbetter = CheckIsBetterEquip(model.equipScore, putOnScore);

                    }