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/FindPrecious/BossIntroduceBehaviour.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/FindPrecious/BossIntroduceBehaviour.cs b/System/FindPrecious/BossIntroduceBehaviour.cs
index 08ac38f..e5c7577 100644
--- a/System/FindPrecious/BossIntroduceBehaviour.cs
+++ b/System/FindPrecious/BossIntroduceBehaviour.cs
@@ -51,7 +51,7 @@
public void Dispose()
{
- UI3DModelExhibition.Instance.StopShowNPC();
+ UI3DModelExhibition.Instance.StopShow();
}
private void LateUpdate()
@@ -89,13 +89,13 @@
var config = Config.Instance.Get<NPCConfig>(bossId);
m_BossName.text = config.charName;
m_BossLevel.text = Language.Get("Z1024", config.NPCLV);
- UI3DModelExhibition.Instance.BeginShowNPC(bossId, config.UIModeLOffset, config.UIModelRotation, m_BossPortrait);
+ UI3DModelExhibition.Instance.ShowNPC(bossId, config.UIModeLOffset, config.UIModelRotation, m_BossPortrait);
m_BossAbility.Display(bossId);
}
protected virtual void DrawReward()
{
- UI3DModelExhibition.Instance.StopShowNPC();
+ UI3DModelExhibition.Instance.StopShow();
m_ViewType = ViewType.Reward;
m_ContainerReward.gameObject.SetActive(true);
m_ContainerBossInfo.gameObject.SetActive(false);
--
Gitblit v1.8.0