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/DogzDungeon/DogzBoxBehaviour.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/DogzDungeon/DogzBoxBehaviour.cs b/System/DogzDungeon/DogzBoxBehaviour.cs
index 82cbd47..d0291e1 100644
--- a/System/DogzDungeon/DogzBoxBehaviour.cs
+++ b/System/DogzDungeon/DogzBoxBehaviour.cs
@@ -20,7 +20,7 @@
public void Display()
{
timer = 0f;
- UI3DModelExhibition.Instance.BeginShowNPC(model.bigBoxNpcId, Vector3.zero, m_RawImage);
+ UI3DModelExhibition.Instance.ShowNPC(model.bigBoxNpcId, Vector3.zero, m_RawImage);
DisplayBoxSurplusInfo();
model.boxSurplusChangeEvent += OnBoxInfoUpdate;
}
@@ -28,7 +28,7 @@
public void Dispose()
{
model.boxSurplusChangeEvent -= OnBoxInfoUpdate;
- UI3DModelExhibition.Instance.StopShowNPC();
+ UI3DModelExhibition.Instance.StopShow();
}
private void OnBoxInfoUpdate()
--
Gitblit v1.8.0