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/FairyAu/KingTempleWin.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/System/FairyAu/KingTempleWin.cs b/System/FairyAu/KingTempleWin.cs
index 6a61cc1..85ee998 100644
--- a/System/FairyAu/KingTempleWin.cs
+++ b/System/FairyAu/KingTempleWin.cs
@@ -82,7 +82,7 @@
protected override void OnPreClose()
{
model.UpdateKingFairyEvent -= UpdateKingFairyEvent;
- UI3DModelExhibition.Instance.StopShowPlayer();
+ UI3DModelExhibition.Instance.StopShow();
}
protected override void OnAfterClose()
@@ -181,7 +181,18 @@
itemData = _leaderData.roleEquipDataDic[RoleEquipType.retWeapon2];
weapon2 = itemData.ItemID;
}
- UI3DModelExhibition.Instance.BeginShowOtherPlayer(m_LeaderMob, _leaderData.rolePropData.Job, clothes, _suitEffect, weapon, wing, weapon2);
+
+ var data = new UI3DModelExhibition.UI3DPlayerExhibitionData
+ {
+ job = _leaderData.rolePropData.Job,
+ clothesId = clothes,
+ suitLevel = _suitEffect,
+ weaponId = weapon,
+ wingsId = wing,
+ secondaryId = weapon2,
+ };
+
+ UI3DModelExhibition.Instance.ShowOtherPlayer(m_LeaderMob, data);
m_LeaderNameTxt.text = _leaderData.rolePropData.Name;
m_LeaderRealmImg.gameObject.SetActive(_leaderData.rolePropData.RealmLV > 0);
var _realmCfg = Config.Instance.Get<RealmConfig>(_leaderData.rolePropData.RealmLV);
--
Gitblit v1.8.0