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

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/Compose/New/SelectEquipModel.cs

@@ -56,9 +56,11 @@


    public Dictionary<int, ItemModel> GetUnfixedItemModel()

    {

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

        if (singlePack == null || composeWinModel.CurComposeModel == null)

            return null;

        if (composeWinModel.CurComposeModel == null) return null;



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

        SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);

        if (singlePack == null) return null;



        int[] unfixedIds = composeWinModel.CurComposeModel.unfixedItemID;

        allBagItemInfo = singlePack.GetPackModelIndexDict();

@@ -96,9 +98,10 @@


    public Dictionary<int, ItemModel> GetAddItemModel()

    {

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

        if (singlePack == null)

            return null;

        if (composeWinModel.CurComposeModel == null) return null;

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

        SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);

        if (singlePack == null) return null;



        allBagItemInfo = singlePack.GetPackModelIndexDict();

        List<ItemModel> modellist = allBagItemInfo.Values.ToList();

@@ -215,7 +218,10 @@


    public void AddHaveUnfixedSelectItem(int itemPlace)

    {

        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, itemPlace);

        if (composeWinModel.CurComposeModel == null) return;

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



        ItemModel itemModel = playerPack.GetItemModelByIndex(packType, itemPlace);

        if (!haveUnfixedSelectItemDic.ContainsKey(itemPlace))

        {

            haveUnfixedSelectItemDic.Add(itemPlace, itemModel);

@@ -232,7 +238,9 @@


    public void AddHaveAddSelectItem(int itemPlace)

    {

        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, itemPlace);

        if (composeWinModel.CurComposeModel == null) return;

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

        ItemModel itemModel = playerPack.GetItemModelByIndex(packType, itemPlace);

        if (!haveAddSelectItemDic.ContainsKey(itemPlace))

        {

            haveAddSelectItemDic.Add(itemPlace, itemModel);