3335 恢复原先合成的红点

client_linchunjie

2019-07-04 a9a141c9f5fc61635d2e7973528289b47d041717

3335 恢复原先合成的红点

 System/Compose/New/ComposeFirstTypeCell.cs

@@ -36,7 +36,7 @@
            if (index != -1)

            {

                redpoint.gameObject.SetActive(true);

                redpoint.redpointId = composeModel.secondTypeRedDict[secondType].id;

                redpoint.redpointId = composeModel.secondTypeRedDict[firstType * 100 + secondType].id;

            }

            else

            {


 System/Compose/New/ComposeSecondTypeCell.cs

@@ -33,7 +33,7 @@
            unlockTypeName.text = itemCompound.thirdTypeName;

            lockTypeName.text = itemCompound.thirdTypeName;

            lockLevel.text =  StringUtility.Contact(itemCompound.levelNeed,Language.Get("Z1041"));

            string key = StringUtility.Contact(secondType, 10,thirdType);

            string key = ((firstType * 100 + secondType) * 100 + thirdType).ToString();

            if (firstType == (int)ComposeFuncType.Item

                && composeModel.thirdTypeRedDict.ContainsKey(key))

            {


 System/Compose/New/ComposeToolsWin.cs

@@ -137,15 +137,13 @@
                        {

                            if (composeWinModel.secondTypeRedDict[second].state == RedPointState.Simple)

                            {

                                string key = StringUtility.Contact(second, 10);

                                foreach (var third in composeWinModel.thirdTypeRedDict.Keys)

                                {

                                    if (composeWinModel.thirdTypeRedDict[third].state == RedPointState.Simple)

                                    {

                                        string thirdType = third.Substring(key.Length, third.Length - key.Length);

                                        isJumpTo = true;

                                        curSecondType = second;

                                        curThirdType = int.Parse(thirdType);

                                        curSecondType = second / 100 % 100;

                                        curThirdType = int.Parse(third) % 100;

                                        composeWinModel.ResetJumpToModel();

                                        break;

                                    }

@@ -415,7 +413,7 @@


            successRateText.text = Language.Get("HallowsWin_Success", StringUtility.Contact(compoundModel.successRate / 100, "%"));

            composeWinModel.SetCurComposeModel(compoundModel);

            composeWinModel.composeBtnRed.state = composeWinModel.secondTypeRedDict[compoundModel.secondType].state;

            composeWinModel.composeBtnRed.state = composeWinModel.secondTypeRedDict[compoundModel.firstType * 100 + compoundModel.secondType].state;

            UpdateComposeMat();

        }




 System/Compose/New/ComposeWinModel.cs

@@ -1138,25 +1138,28 @@


        secondTypeRedDict.Clear();

        thirdTypeRedDict.Clear();

        //if (composeDataDict.ContainsKey((int)ComposeFuncType.Item))

        //{

        //    var firstTypeData = composeDataDict[(int)ComposeFuncType.Item];

        //    var secondTypeDict = firstTypeData.secondTypeDict;

        //    foreach (var second in secondTypeDict.Keys)

        //    {

        //        var thirdTypeDict = secondTypeDict[second].thirdTypeDict;

        //        int secondRedKey = COMPOSETOOL_REDKEY * 100 + second;

        //        Redpoint secondRed = new Redpoint(COMPOSETOOL_REDKEY, secondRedKey);

        //        secondTypeRedDict.Add(second, secondRed);

        //        foreach (var third in thirdTypeDict.Keys)

        //        {

        //            int thirdRedKey = secondRedKey * 100 + third;

        //            Redpoint thirdRed = new Redpoint(secondRedKey, thirdRedKey);

        //            string key = StringUtility.Contact(second, 10, third);

        //            thirdTypeRedDict.Add(key, thirdRed);

        //        }

        //    }

        //}



        var firstType= (int)ComposeFuncType.Item;

        if (composeDataDict.ContainsKey(firstType))

        {

            var firstTypeData = composeDataDict[firstType];

            var secondTypeDict = firstTypeData.secondTypeDict;

            foreach (var second in secondTypeDict.Keys)

            {

                var thirdTypeDict = secondTypeDict[second].thirdTypeDict;

                int secondRedKey = COMPOSETOOL_REDKEY * 100 + second;

                Redpoint secondRed = new Redpoint(COMPOSETOOL_REDKEY, secondRedKey);

                var secondKey = firstType * 100 + second;

                secondTypeRedDict.Add(secondKey, secondRed);

                foreach (var third in thirdTypeDict.Keys)

                {

                    int thirdRedKey = secondRedKey * 100 + third;

                    Redpoint thirdRed = new Redpoint(secondRedKey, thirdRedKey);

                    string key = (secondKey * 100 + third).ToString();

                    thirdTypeRedDict.Add(key, thirdRed);

                }

            }

        }



        foreach (var category in composeRedpointCategories)

        {

@@ -1169,12 +1172,13 @@
                    var thirdTypeDict = secondTypeDict[second].thirdTypeDict;

                    int secondRedKey = COMPOSETICKET_REDKEY * 100 + second;

                    Redpoint secondRed = new Redpoint(COMPOSETICKET_REDKEY, secondRedKey);

                    secondTypeRedDict.Add(second, secondRed);

                    var secondKey = category.x * 100 + second;

                    secondTypeRedDict.Add(secondKey, secondRed);

                    foreach (var third in thirdTypeDict.Keys)

                    {

                        int thirdRedKey = secondRedKey * 100 + third;

                        Redpoint thirdRed = new Redpoint(secondRedKey, thirdRedKey);

                        string key = StringUtility.Contact(second, 10, third);

                        string key = (secondKey * 100 + third).ToString();

                        thirdTypeRedDict.Add(key, thirdRed);

                    }

                }

@@ -1206,6 +1210,42 @@
            return;

        }



        {

            var firstType = (int)ComposeFuncType.Item;

            ComposeSecondTypeData secondTypeData = null;

            TryGetSecondTypeData(firstType, 3, out secondTypeData);

            if (secondTypeData != null)

            {

                var thirdTypeDict = secondTypeData.thirdTypeDict;

                foreach (var third in thirdTypeDict.Keys)

                {

                    List<ComposeThirdTypeData> thirdTypeDatas = thirdTypeDict[third];

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

                    {

                        var itemCompound = thirdTypeDatas[i].itemCompound;

                        int makeID = itemCompound.makeID[0];

                        var secondKey = firstType * 100 + 3;

                        string key = (secondKey * 100 + third).ToString();

                        if (IsEnoughFixedMat(itemCompound))

                        {

                            if (thirdTypeRedDict[key].state != RedPointState.Simple)

                            {

                                thirdTypeRedDict[key].state = RedPointState.Simple;

                            }

                        }

                        else

                        {

                            if (thirdTypeRedDict[key].state != RedPointState.None)

                            {

                                thirdTypeRedDict[key].state = RedPointState.None;

                            }

                        }

                    }

                }

            }

        }





        foreach (var category in composeRedpointCategories)

        {

            ComposeSecondTypeData secondTypeData = null;

@@ -1220,7 +1260,8 @@
                    {

                        var itemCompound = thirdTypeDatas[i].itemCompound;

                        int makeID = itemCompound.makeID[0];

                        string key = StringUtility.Contact(category.y, 10, third);

                        var secondKey = category.x * 100 + category.y;

                        string key = (secondKey * 100 + third).ToString();

                        if (IsEnoughFixedMat(itemCompound))

                        {

                            if (thirdTypeRedDict[key].state != RedPointState.Simple)