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

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/Compose/New/ComposeWinModel.cs

@@ -417,6 +417,16 @@
    }

    #endregion



    public PackType GetPackTypeByMakerId(int[] makeIds)

    {

        if (makeIds == null || makeIds.Length < 1) return PackType.rptDeleted;



        int makeId = makeIds[0];

        var itemConfig = Config.Instance.Get<ItemConfig>(makeId);



        return GeneralDefine.GetPackTypeByItemType(itemConfig.Type); 
    }



    public void SetUpdateSendComposeEvent()

    {

        if(UpdateSendComposeEvent != null)

@@ -522,12 +532,12 @@
            MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));

            return;

        }



        var packType = GetPackTypeByMakerId(compoundModel.makeID);

        int[] fixedIds = compoundModel.itemID;

        int[] fixedCounts = compoundModel.itemCount;

        for (i = 0; i < fixedCounts.Length; i++)

        {

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

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

            if (haveCount < fixedCounts[i])

            {

                ItemConfig fixedConfig = Config.Instance.Get<ItemConfig>(fixedIds[i]);

@@ -570,7 +580,7 @@
        {

            for(i= 0; i < fixedIndexArray.Length;i++ )

            {

                ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem,fixedIndexArray[i]);

                ItemModel itemModel = playerPack.GetItemModelByIndex(packType, fixedIndexArray[i]);

                SetMatIsBindDict(itemModel,fixedMatIsBindDict);

            }

        }

@@ -588,7 +598,7 @@
        {

            for (i = 0; i < unfixedIndexArray.Length; i++)

            {

                ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, unfixedIndexArray[i]);

                ItemModel itemModel = playerPack.GetItemModelByIndex(packType, unfixedIndexArray[i]);

                SetMatIsBindDict(itemModel,unfixedMatIsBindDict);

            }

        }