snxxz_scripts.git

parent: b6329ea0 | 补丁 | 提交 | ignore whitespace

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

client_Hale

2019-07-04 0d86cb96d37ebc52d1c65e7f4b46b6a10ba2d947

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

7个文件已修改

	Core/GameEngine/Model/Config/TaskFeedbackConfig.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeFirstTypeCell.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeSecondTypeCell.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeToolsWin.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeWinModel.cs	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/TaskFeedbackModel.cs	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/Model/Config/TaskFeedbackConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Tuesday, June 11, 2019
//    [  Date ]:           Thursday, July 04, 2019
//--------------------------------------------------------

using System.Collections.Generic;
@@ -24,6 +24,7 @@
    public readonly int jump;

    public readonly string[] funcTitles;

    public readonly string failFuncs;

    public readonly int onlyOneFunc;

    public readonly string[] remind;

    public TaskFeedbackConfig()
@@ -58,7 +59,9 @@


            failFuncs = tables[10];



            remind = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            int.TryParse(tables[11],out onlyOneFunc); 


            remind = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
        }
        catch (Exception ex)
        {

 Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b80a883f246077d46ab59d6938182ec9
timeCreated: 1560244941
timeCreated: 1562229408
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 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);

                    }

                }

@@ -1220,7 +1224,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)


 System/MainInterfacePanel/TaskFeedbackModel.cs

@@ -180,7 +180,14 @@
                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        taskFeedbackFuncs.AddRange(succFuncs);

                                        if (config.onlyOneFunc == 1)

                                        {

                                            taskFeedbackFuncs.Add(succFuncs[0]);

                                        }

                                        else

                                        {

                                            taskFeedbackFuncs.AddRange(succFuncs);

                                        }

                                        TaskFeedbackFuncWin.funcTitle = funcTitle;

                                        WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                    }

@@ -212,7 +219,14 @@
                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        taskFeedbackFuncs.AddRange(succFuncs);

                                        if (config.onlyOneFunc == 1)

                                        {

                                            taskFeedbackFuncs.Add(succFuncs[0]);

                                        }

                                        else

                                        {

                                            taskFeedbackFuncs.AddRange(succFuncs);

                                        }

                                        TaskFeedbackFuncWin.funcTitle = funcTitle;

                                        WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                    }

@@ -245,7 +259,14 @@
                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        taskFeedbackFuncs.AddRange(succFuncs);

                                        if (config.onlyOneFunc == 1)

                                        {

                                            taskFeedbackFuncs.Add(succFuncs[0]);

                                        }

                                        else

                                        {

                                            taskFeedbackFuncs.AddRange(succFuncs);

                                        }

                                        TaskFeedbackFuncWin.funcTitle = funcTitle;

                                        WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                    }

			@@ -1,6 +1,6 @@
			//--------------------------------------------------------
			// [Author]: Fish
			// [ Date ]: Tuesday, June 11, 2019
			// [ Date ]: Thursday, July 04, 2019
			//--------------------------------------------------------

			using System.Collections.Generic;
			@@ -24,6 +24,7 @@
			public readonly int jump;
			public readonly string[] funcTitles;
			public readonly string failFuncs;
			public readonly int onlyOneFunc;
			public readonly string[] remind;

			public TaskFeedbackConfig()
			@@ -58,7 +59,9 @@

			failFuncs = tables[10];

			remind = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
			int.TryParse(tables[11],out onlyOneFunc);

			remind = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
			}
			catch (Exception ex)
			{

			@@ -1,6 +1,6 @@
			fileFormatVersion: 2
			guid: b80a883f246077d46ab59d6938182ec9
			timeCreated: 1560244941
			timeCreated: 1562229408
			licenseType: Pro
			MonoImporter:
			serializedVersion: 2

			@@ -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
			{

			@@ -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))
			{

			@@ -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();
			}

			@@ -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);
			}
			}
			@@ -1220,7 +1224,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)

			@@ -180,7 +180,14 @@
			if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
			{
			taskFeedbackFuncs.Clear();
			taskFeedbackFuncs.AddRange(succFuncs);
			if (config.onlyOneFunc == 1)
			{
			taskFeedbackFuncs.Add(succFuncs[0]);
			}
			else
			{
			taskFeedbackFuncs.AddRange(succFuncs);
			}
			TaskFeedbackFuncWin.funcTitle = funcTitle;
			WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
			}
			@@ -212,7 +219,14 @@
			if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
			{
			taskFeedbackFuncs.Clear();
			taskFeedbackFuncs.AddRange(succFuncs);
			if (config.onlyOneFunc == 1)
			{
			taskFeedbackFuncs.Add(succFuncs[0]);
			}
			else
			{
			taskFeedbackFuncs.AddRange(succFuncs);
			}
			TaskFeedbackFuncWin.funcTitle = funcTitle;
			WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
			}
			@@ -245,7 +259,14 @@
			if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
			{
			taskFeedbackFuncs.Clear();
			taskFeedbackFuncs.AddRange(succFuncs);
			if (config.onlyOneFunc == 1)
			{
			taskFeedbackFuncs.Add(succFuncs[0]);
			}
			else
			{
			taskFeedbackFuncs.AddRange(succFuncs);
			}
			TaskFeedbackFuncWin.funcTitle = funcTitle;
			WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
			}