snxxz_scripts.git

parent: 70839324 | 补丁 | 提交 | show whitespace

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

client_Wu Xijin

2018-09-26 023314a76d76fb64e325d55375db4806451b33ce

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

5个文件已修改

	System/BlastFurnace/GetEquipPathTips.cs	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/GetEquipPathWin.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/EquipTip.cs	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/ItemTipsModel.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyEquipTip.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/BlastFurnace/GetEquipPathTips.cs

@@ -454,7 +454,29 @@
            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                        legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else

            {


 System/BlastFurnace/GetEquipPathWin.cs

@@ -439,13 +439,28 @@
            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                if (itemAttrData.packType != PackType.rptDogzItem)

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                    legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                }

                else

                {

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                    legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else


 System/KnapSack/Logic/EquipTip.cs

@@ -536,19 +536,32 @@
            legendAttr.SetActive(true);

            legendTitleText.text = Language.Get("EquipWin_LegendPropObj_Text_1");

            legendAttrDes.text = itemTipsModel.GetLegendAttr(itemAttrData);



            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                if(itemAttrData.packType != PackType.rptDogzItem)

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                    legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                }

                else

                {

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                    legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

              
            }

            else

            {


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -1948,11 +1948,14 @@
                            SetDogzEquipLegendAttrPreview(out legendIdlist, out legendValuelist);

                            break;

                    }

                    if(legendIdlist != null && legendValuelist != null)

                    {

                    if (legendIdlist.Count == legendValuelist.Count)

                    {

                        SetLegendData(legendIdlist, legendValuelist);

                    }

                }

                }

                else

                {

                    if (GetUseDataModel(20) != null)


 System/Store/Logic/BuyEquipTip.cs

@@ -503,13 +503,28 @@
            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                if (itemAttrData.packType != PackType.rptDogzItem)

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                    legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                }

                else

                {

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                    legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else

			@@ -454,7 +454,29 @@
			if (itemAttrData.isPreview)
			{
			legendCntPreview.gameObject.SetActive(true);
			switch (itemAttrData.itemConfig.EquipPlace)
			{
			case 1:
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			case 7:
			case 8:
			case 9:
			case 10:
			case 12:
			legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);
			break;
			case 101:
			case 102:
			case 103:
			case 104:
			case 105:
			legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);
			break;
			}
			}
			else
			{

			@@ -439,13 +439,28 @@
			if (itemAttrData.isPreview)
			{
			legendCntPreview.gameObject.SetActive(true);
			if (itemAttrData.packType != PackType.rptDogzItem)
			switch (itemAttrData.itemConfig.EquipPlace)
			{
			case 1:
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			case 7:
			case 8:
			case 9:
			case 10:
			case 12:
			legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);
			}
			else
			{
			break;
			case 101:
			case 102:
			case 103:
			case 104:
			case 105:
			legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);
			break;
			}
			}
			else

			@@ -536,19 +536,32 @@
			legendAttr.SetActive(true);
			legendTitleText.text = Language.Get("EquipWin_LegendPropObj_Text_1");
			legendAttrDes.text = itemTipsModel.GetLegendAttr(itemAttrData);

			if (itemAttrData.isPreview)
			{
			legendCntPreview.gameObject.SetActive(true);
			if(itemAttrData.packType != PackType.rptDogzItem)
			switch (itemAttrData.itemConfig.EquipPlace)
			{
			case 1:
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			case 7:
			case 8:
			case 9:
			case 10:
			case 12:
			legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);
			}
			else
			{
			break;
			case 101:
			case 102:
			case 103:
			case 104:
			case 105:
			legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);
			break;
			}

			}
			else
			{

			@@ -1948,11 +1948,14 @@
			SetDogzEquipLegendAttrPreview(out legendIdlist, out legendValuelist);
			break;
			}
			if(legendIdlist != null && legendValuelist != null)
			{
			if (legendIdlist.Count == legendValuelist.Count)
			{
			SetLegendData(legendIdlist, legendValuelist);
			}
			}
			}
			else
			{
			if (GetUseDataModel(20) != null)

			@@ -503,13 +503,28 @@
			if (itemAttrData.isPreview)
			{
			legendCntPreview.gameObject.SetActive(true);
			if (itemAttrData.packType != PackType.rptDogzItem)
			switch (itemAttrData.itemConfig.EquipPlace)
			{
			case 1:
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			case 7:
			case 8:
			case 9:
			case 10:
			case 12:
			legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);
			}
			else
			{
			break;
			case 101:
			case 102:
			case 103:
			case 104:
			case 105:
			legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);
			break;
			}
			}
			else