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

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/Compose/New/ComposeWingsWin.cs

@@ -478,8 +478,10 @@


        private bool ChangeFixedMatUI()

        {

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

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

            if (compoundModel == null) return false;

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

            SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);

            if (singlePack == null) return false;



            bool isBind = false;

            Dictionary<int,ItemModel> unfixedMatDict = selectModel.GetHaveUnfixedSelectItem();

@@ -605,8 +607,10 @@
        private void SetFixedMatIndex()

        {

            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 isBind = 0;



            if(IsComposeBind)