From 3e06f7892e9fd71eab425c0ac76c1927f89cd924 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 26 九月 2018 21:38:56 +0800
Subject: [PATCH] 2614 【前端】神兽——强化功能
---
System/Strengthening/CrystalSelectionWin.cs | 5 ++++-
System/Strengthening/GodBeastEntry.cs | 2 +-
System/Strengthening/GodBeastSlidingList.cs | 10 +++++-----
System/Strengthening/GodBeastAttributes.cs | 28 ++++++++++++++++++++++++----
4 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/System/Strengthening/CrystalSelectionWin.cs b/System/Strengthening/CrystalSelectionWin.cs
index 1429cb0..a13bac2 100644
--- a/System/Strengthening/CrystalSelectionWin.cs
+++ b/System/Strengthening/CrystalSelectionWin.cs
@@ -42,7 +42,10 @@
protected override void OnPreOpen()
{
- m_TextDisplay.text = "浣犳嫢鏈�" + godBeastModel.Crystal_ItemModel.itemInfo.ItemCount + "涓己鍖栨按鏅�";
+ string str = godBeastModel.Crystal_ItemModel.chinItemModel.ItemName;
+
+ m_TextDisplay.text = string.Format(Language.Get("OwnQuantity_SH"), godBeastModel.Crystal_ItemModel.itemInfo.ItemCount,
+ UIHelper.GetTextColorByItemColor(godBeastModel.Crystal_ItemModel.chinItemModel.ItemColor, str, true));
m_Slider.minValue = 0;
m_Slider.maxValue = godBeastModel.Crystal_ItemModel.itemInfo.ItemCount;
if (godBeastModel.Absorption_Dic.ContainsKey(godBeastModel.ItemInde))
diff --git a/System/Strengthening/GodBeastAttributes.cs b/System/Strengthening/GodBeastAttributes.cs
index 03cf1f7..75414a2 100644
--- a/System/Strengthening/GodBeastAttributes.cs
+++ b/System/Strengthening/GodBeastAttributes.cs
@@ -207,10 +207,7 @@
m_BottomBox.SetActive(false);
m_Text_two.SetActive(false);
m_FrameNull.SetActive(false);
- m_TextAttributes1.gameObject.SetActive(false);
- m_TextAttributes2.gameObject.SetActive(false);
- m_TextAttributesAdd1.gameObject.SetActive(false);
- m_TextAttributesAdd2.gameObject.SetActive(false);
+ FullLevelAttributes();//璁剧疆婊＄骇灞炴��
m_FullLevel.SetActive(true);
GodBeast_Number = GodBeastNumber;
GodBeast_Part = GodBeastPart;
@@ -496,6 +493,29 @@
}
}
+ private void FullLevelAttributes()//璁剧疆婊＄骇灞炴��
+ {
+ var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv);
+ int[] AttType = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attType);
+ int[] AttValue = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attValue);
+ m_TextAttributesAdd1.gameObject.SetActive(false);
+ m_TextAttributesAdd2.gameObject.SetActive(false);
+ if (AttType.Length > 1)
+ {
+ m_TextAttributes1.gameObject.SetActive(true);
+ m_TextAttributes2.gameObject.SetActive(true);
+ string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;
+ string StrName2 = Config.Instance.Get<PlayerPropertyConfig>(AttType[1]).Name;
+ m_TextAttributes1.text = StrName1 + ":" + AttValue[0];
+ m_TextAttributes2.text = StrName2 + ":" + AttValue[1];
+ }
+ else
+ {
+ m_TextAttributes2.gameObject.SetActive(false);
+ string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;
+ m_TextAttributes1.text = StrName1 + ":" + AttValue[0];
+ }
+ }
}
}
diff --git a/System/Strengthening/GodBeastEntry.cs b/System/Strengthening/GodBeastEntry.cs
index 519dc8c..92c6ba7 100644
--- a/System/Strengthening/GodBeastEntry.cs
+++ b/System/Strengthening/GodBeastEntry.cs
@@ -37,7 +37,7 @@
{
if (itemModel[i].EquipPlace == godBeastPart)
{
- ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, itemModel[i].itemInfo.IsBind);
+ ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, 0);//涓嶆樉绀虹粦瀹�
m_itemCell.Init(ItemModel);
var itemConfig = Config.Instance.Get<ItemConfig>(itemModel[i].itemId);
var IudetDogzEquipPlus = itemModel[i].GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);// 绁炲吔瑁呭寮哄寲淇℃伅鍒楄〃 [寮哄寲绛夌骇, 寮哄寲鐔熺粌搴
diff --git a/System/Strengthening/GodBeastSlidingList.cs b/System/Strengthening/GodBeastSlidingList.cs
index 8c66559..c3c7b94 100644
--- a/System/Strengthening/GodBeastSlidingList.cs
+++ b/System/Strengthening/GodBeastSlidingList.cs
@@ -334,19 +334,19 @@
switch (Type)
{
case 0:
- m_Label.text = "寮哄寲姘存櫠";
+ m_Label.text = Language.Get("Crystal_SH");
break;
case 2:
- m_Label.text = "钃濊壊浠ヤ笅";
+ m_Label.text = Language.Get("BelowBlue_SH");
break;
case 3:
- m_Label.text = "绱壊浠ヤ笅";
+ m_Label.text = Language.Get("BelowPurple_SH");
break;
case 4:
- m_Label.text = "姗欒壊浠ヤ笅";
+ m_Label.text = Language.Get("BelowOrange_SH");
break;
case 10:
- m_Label.text = "鍏ㄩ儴";
+ m_Label.text = Language.Get("All_SH");
break;
default:
break;
--
Gitblit v1.8.0