From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/MainInterfacePanel/FeatureNoticeWin.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeWin.cs b/System/MainInterfacePanel/FeatureNoticeWin.cs
index a573ec1..c504631 100644
--- a/System/MainInterfacePanel/FeatureNoticeWin.cs
+++ b/System/MainInterfacePanel/FeatureNoticeWin.cs
@@ -19,7 +19,7 @@
Pet = 6,//鐏靛疇
Horse = 8,//鍧愰獞
Wing = 97,//缈呰唨
- GossipFurnace = 87,//鍏崷鐐�
+ GossipFurnace = 143,//鍏崷鐐�
}
public class FeatureNoticeWin : Window
@@ -97,9 +97,9 @@
}
protected override void OnPreClose()
{
- UI3DModelExhibition.Instance.StopShowNPC();
- UI3DModelExhibition.Instance.StopShowHourse();
- UI3DModelExhibition.Instance.StopShowWing();
+ UI3DModelExhibition.Instance.StopShow();
+ UI3DModelExhibition.Instance.StopShow();
+ UI3DModelExhibition.Instance.StopShow();
UI3DTreasureExhibition.Instance.StopShow();
}
protected override void OnAfterClose()
@@ -256,6 +256,7 @@
m_TextShowB.gameObject.SetActive(false);
m_TextShowC.gameObject.SetActive(false);
m_TextShowD.gameObject.SetActive(false);
+ m_TextAdvanceName.text = "?";
}
else
{
@@ -263,8 +264,9 @@
m_TextShowB.gameObject.SetActive(true);
m_TextShowC.gameObject.SetActive(true);
m_TextShowD.gameObject.SetActive(true);
+ m_TextAdvanceName.text = functionForecastConfig.FuncName;
}
- m_TextAdvanceName.text = functionForecastConfig.FuncName;
+
DisplayIcon(ClickFuncID);
string[] StrList = ConfigParse.GetMultipleStr(functionForecastConfig.Content);
if (StrList.Length > 0)
@@ -294,9 +296,9 @@
m_RawImage3.gameObject.SetActive(false);
m_RawImage4.gameObject.SetActive(false);
m_FeaturesImage.gameObject.SetActive(false);
- UI3DModelExhibition.Instance.StopShowNPC();
- UI3DModelExhibition.Instance.StopShowHourse();
- UI3DModelExhibition.Instance.StopShowWing();
+ UI3DModelExhibition.Instance.StopShow();
+ UI3DModelExhibition.Instance.StopShow();
+ UI3DModelExhibition.Instance.StopShow();
UI3DTreasureExhibition.Instance.StopShow();
var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);
bool Type = false;
@@ -319,12 +321,12 @@
case (int)FeatureNoticeEnum.Pet:
m_RawImage1.gameObject.SetActive(true);
var npcConfig = Config.Instance.Get<NPCConfig>(50106001);
- UI3DModelExhibition.Instance.BeginShowNPC(50106001, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImage1);
+ UI3DModelExhibition.Instance.ShowNPC(50106001, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImage1);
break;
case (int)FeatureNoticeEnum.Horse:
m_RawImage2.gameObject.SetActive(true);
HorseConfig _model = Config.Instance.Get<HorseConfig>(100);
- UI3DModelExhibition.Instance.BeginShowHourse(_model.Model, m_RawImage2);
+ UI3DModelExhibition.Instance.ShowHourse(_model.Model, m_RawImage2);
break;
case (int)FeatureNoticeEnum.Wing:
m_RawImage3.gameObject.SetActive(true);
@@ -334,13 +336,13 @@
{
var config = Config.Instance.Get<WingRefineExpConfig>(3711);
int _modelID = config.Model;
- UI3DModelExhibition.Instance.BeginShowWing(_modelID, vec3, m_RawImage3);
+ UI3DModelExhibition.Instance.ShowWing(_modelID, vec3, m_RawImage3);
}
else if (job == 2)
{
var config = Config.Instance.Get<WingRefineExpConfig>(3721);
int _modelID = config.Model;
- UI3DModelExhibition.Instance.BeginShowWing(_modelID, vec3, m_RawImage3);
+ UI3DModelExhibition.Instance.ShowWing(_modelID, vec3, m_RawImage3);
}
break;
case (int)FeatureNoticeEnum.GossipFurnace:
@@ -383,7 +385,7 @@
}
}
m_TextUnopened.gameObject.SetActive(true);
- m_TextUnopened.text = string.Format(Language.Get("NextYGLimit"), NeedLv, functionForecastConfig.FuncName);
+ m_TextUnopened.text = string.Format(Language.Get("NextYGLimit"), NeedLv);
return;
}
if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID != 0)
--
Gitblit v1.8.0