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

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/Compose/New/ComposeTicketWin.cs

@@ -468,12 +468,13 @@
            }



            List<int> composeCountlist = new List<int>();

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);

            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);

            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);

            int[] fixedIds = compoundModel.itemID;

            int[] fixedCounts = compoundModel.itemCount;

            for (int i = 0; i < fixedIds.Length; i++)

            {

                int haveCount = playerPack.GetItemCountByID(PackType.rptItem, fixedIds[i]);

                int haveCount = playerPack.GetItemCountByID(packType, fixedIds[i]);

                int canComposeCount = haveCount / fixedCounts[i];

                composeCountlist.Add(canComposeCount);

                List<int> itemIndexlist = null;

@@ -515,8 +516,10 @@
        private void SetFixedItemIndexDic()

        {

            fixedItemIndexDict.Clear();

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);

            if (singlePack == null || compoundModel == null) return;

            if (compoundModel == null) return;

            var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);

            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);

            if (singlePack == null) return;



            int minBindCnt = 0;

            int minNoBindCnt = 0;