From af7cbbd003f89da1f8a2edaa967d9d73c2b9f8ee Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 24 十二月 2018 13:45:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/GatheringSoul/GatherSoulComposeModel.cs | 4 ----
System/GatheringSoul/GatherSoulComposeCategoryCell.cs | 2 +-
System/GatheringSoul/GatherSoulTipBase.cs | 2 ++
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/System/GatheringSoul/GatherSoulComposeCategoryCell.cs b/System/GatheringSoul/GatherSoulComposeCategoryCell.cs
index 1ed4967..e01fcff 100644
--- a/System/GatheringSoul/GatherSoulComposeCategoryCell.cs
+++ b/System/GatheringSoul/GatherSoulComposeCategoryCell.cs
@@ -53,7 +53,7 @@
Language.Get(propertyCountNameKey), Language.Get("SoulCategoryProperty"));
break;
case 2:
- m_CategoryName.text = StringUtility.Contact(Language.Get(qualityNameKey),
+ m_CategoryName.text = StringUtility.Contact(Language.Get(qualityNameKey), Language.Get(propertyCountNameKey),
Language.Get("ComposeSoulCore"));
break;
case 3:
diff --git a/System/GatheringSoul/GatherSoulComposeModel.cs b/System/GatheringSoul/GatherSoulComposeModel.cs
index 2f67c34..b68a5c2 100644
--- a/System/GatheringSoul/GatherSoulComposeModel.cs
+++ b/System/GatheringSoul/GatherSoulComposeModel.cs
@@ -90,10 +90,6 @@
continue;
}
var propertyCount = gatherSoulConfig.AttrType.Length;
- if (itemConfig.Type == GatheringSoulModel.GATHERSOUL_CORE_TYPE)
- {
- propertyCount = 0;
- }
var quality = itemConfig.ItemColor;
var category = new ComposeCategory()
{
diff --git a/System/GatheringSoul/GatherSoulTipBase.cs b/System/GatheringSoul/GatherSoulTipBase.cs
index eb3ff0b..fea12e1 100644
--- a/System/GatheringSoul/GatherSoulTipBase.cs
+++ b/System/GatheringSoul/GatherSoulTipBase.cs
@@ -11,6 +11,7 @@
[SerializeField] Text m_ItemName;
[SerializeField] RectTransform m_ContainerEssence;
[SerializeField] RectTransform m_ContainerSoul;
+ [SerializeField] RectTransform m_ContainerLevel;
[SerializeField] RectTransform m_ContainerItem;
[SerializeField] Image m_ItemIcon;
[SerializeField] Text m_ItemLevel;
@@ -33,6 +34,7 @@
m_ContainerSoul.gameObject.SetActive(!isSoulEssence);
m_ContainerEssence.gameObject.SetActive(isSoulEssence);
m_ItemLevel.gameObject.SetActive(!isSoulEssence);
+ m_ContainerLevel.gameObject.SetActive(!isSoulEssence);
if (!isSoulEssence)
{
m_ItemLevel.text = level.ToString();
--
Gitblit v1.8.0