From c9add585a6990f1beecb94a946eaa3f5d27dcbd1 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 14 三月 2019 14:02:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/ItemTip/EquipTipWin.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/System/ItemTip/EquipTipWin.cs b/System/ItemTip/EquipTipWin.cs
index 84823a5..d37175e 100644
--- a/System/ItemTip/EquipTipWin.cs
+++ b/System/ItemTip/EquipTipWin.cs
@@ -55,21 +55,21 @@
private void DisplayTipInfo()
{
- if (ItemTipUtility.tipType == ItemTipType.EquipCompare)
+ if (EquipTipUtility.tipType == EquipTipType.EquipCompare)
{
m_MainWidgetGroup.SetActive(true);
m_MainWidgetGroup.SetPosition(m_RightPoint.position);
- m_MainWidgetGroup.Display(ItemTipUtility.mainTipData);
+ m_MainWidgetGroup.Display(EquipTipUtility.mainTipData);
m_SecondaryWidgetGroup.SetActive(true);
m_SecondaryWidgetGroup.SetPosition(m_LeftPoint.position);
- m_SecondaryWidgetGroup.Display(ItemTipUtility.secondaryData);
+ m_SecondaryWidgetGroup.Display(EquipTipUtility.secondaryData);
}
else
{
m_MainWidgetGroup.SetActive(true);
m_MainWidgetGroup.SetPosition(m_MiddlePoint.position);
- m_MainWidgetGroup.Display(ItemTipUtility.mainTipData);
+ m_MainWidgetGroup.Display(EquipTipUtility.mainTipData);
m_SecondaryWidgetGroup.SetActive(false);
}
@@ -77,7 +77,7 @@
private void InitOperateButton()
{
- if (string.IsNullOrEmpty(ItemTipUtility.mainTipData.guid))
+ if (string.IsNullOrEmpty(EquipTipUtility.mainTipData.guid))
{
foreach (var button in m_OpreateButtons)
{
@@ -87,7 +87,7 @@
else
{
var actions = new Dictionary<ItemOperateType, UnityAction>();
- if (ItemTipUtility.mainTipData.baseInfo.isAuction)
+ if (EquipTipUtility.mainTipData.baseInfo.isAuction)
{
actions[ItemOperateType.putAway] = () => { };
}
@@ -137,7 +137,7 @@
this.container.position = position;
}
- public void Display(ItemTipUtility.TipData data)
+ public void Display(EquipTipUtility.TipData data)
{
baseInfoWidget.gameObject.SetActive(true);
baseInfoWidget.Display(data.baseInfo);
--
Gitblit v1.8.0