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

client_Wu Xijin

2018-11-24 fa9f8ce96af772bb012efc9d3cbe6b056fa1165f

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

 System/Compose/New/ComposeEquipWin.cs

@@ -18,9 +18,14 @@


        [SerializeField] GameObject increaseRateItem;

        [SerializeField] GameObject increaseGridCell;

       
        [Header("固定物品和非固定物品")]

        [SerializeField] List<ComposeMatCell> fixedAndUnfixeds = new List<ComposeMatCell>();



        [SerializeField] GameObject three_ComposeEquip;

        [SerializeField] GameObject five_ComposeEquip;

        [Header("固定物品和三个非固定物品")]

        [SerializeField] List<ComposeMatCell> three_FixedAndUnfixeds = new List<ComposeMatCell>();

        [Header("固定物品和五个非固定物品")]

        [SerializeField] List<ComposeMatCell> five_FixedAndUnfixeds = new List<ComposeMatCell>();



        [Header("合成物品")]

        [SerializeField] List<ComposeMatCell> makeItems = new List<ComposeMatCell>();

        [Header("提高成功率")]

@@ -47,9 +52,7 @@


        [SerializeField]

        GameObject chooseComposeEquip;



        [SerializeField]

        GameObject composeEquip;

        [SerializeField] GameObject container_ComposeEquip;

        [SerializeField] UIEffect composeEffect;

        [SerializeField] UIEffect successEffect;

        [SerializeField] UIEffect failEffect;

@@ -396,7 +399,7 @@
        {

            notChooseBG.SetActive(isShows[0]);

            chooseComposeEquip.SetActive(isShows[1]);

            composeEquip.SetActive(isShows[2]);

            container_ComposeEquip.SetActive(isShows[2]);

        }



        private void UpdateComposeMat()

@@ -417,21 +420,31 @@


            int[] fixedIds = compoundModel.itemID;

            int[] fixedDisplays = compoundModel.itemDisplay;

            int[] unfixedIds = compoundModel.unfixedItemID;

            int[] unfixedDisplays = compoundModel.unfixedItemDisplay;

            if(compoundModel.unfixedItemCount <= 3)

            {

                three_ComposeEquip.SetActive(true);

                five_ComposeEquip.SetActive(false);

            }

            else

            {

                three_ComposeEquip.SetActive(false);

                five_ComposeEquip.SetActive(true);

            }



            for(int i = 0; i < fixedAndUnfixeds.Count; i++)

            var fixedAndUnfixeds = compoundModel.unfixedItemCount > 3 ? five_FixedAndUnfixeds : three_FixedAndUnfixeds;

            for (int i = 0; i < fixedAndUnfixeds.Count; i++)

            {

                var matCell = fixedAndUnfixeds[i];

                matCell.SetDisplay(compoundModel, NeedMatType.Nothing, true);

            }



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

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

            {

                var fixedDisplay = fixedDisplays[i];

                if(fixedDisplay != 0)

                if (fixedDisplay != 0)

                {

                    var matCell = fixedAndUnfixeds[fixedDisplay -1];

                    var matCell = fixedAndUnfixeds[fixedDisplay - 1];

                    int fixedId = 0;

                    composeWinModel.TryGetIdByDisplay(NeedMatType.fixedItem, compoundModel, fixedDisplay, out fixedId);

                    matCell.SetDisplay(compoundModel, NeedMatType.fixedItem, false, "", fixedId);

@@ -447,6 +460,7 @@
                    matCell.SetDisplay(compoundModel, NeedMatType.unfixedItem, false, UIHelper.ReplaceNewLine(Language.Get("ComposeWin_PutInText_2")));

                }

            }





            int[] increases = compoundModel.successRateIncrease;

            if (increases == null || increases.Length < 2)

@@ -608,6 +622,8 @@
            var unfixedSelectItemDict = selectModel.GetUnfixedItemModel();

            var unfixeAddDict = selectModel.GetHaveUnfixedSelectItem();

            int[] unfixedDisplays = compoundModel.unfixedItemDisplay;

            var fixedAndUnfixeds = compoundModel.unfixedItemCount > 3 ? five_FixedAndUnfixeds : three_FixedAndUnfixeds;



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

            {

                var unfixedDisplay = unfixedDisplays[i];