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/RoleParticulars/RoleParticularsWin.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/System/RoleParticulars/RoleParticularsWin.cs b/System/RoleParticulars/RoleParticularsWin.cs
index f4eb20e..aaf05ab 100644
--- a/System/RoleParticulars/RoleParticularsWin.cs
+++ b/System/RoleParticulars/RoleParticularsWin.cs
@@ -136,7 +136,7 @@
protected override void OnAfterClose()
{
- UI3DModelExhibition.Instance.StopShowPlayer();
+ UI3DModelExhibition.Instance.StopShow();
}
#endregion
@@ -248,7 +248,16 @@
{
weapon2 = itemData.ItemID;
}
- UI3DModelExhibition.Instance.BeginShowOtherPlayer(roleModel, viewPlayerData.rolePropData.Job, clothes, _suitLevel, weapon, wing, weapon2);
+
+ var data = new UI3DModelExhibition.UI3DPlayerExhibitionData {
+ job = viewPlayerData.rolePropData.Job,
+ clothesId = clothes,
+ suitLevel = _suitLevel,
+ weaponId=weapon,
+ wingsId=wing,
+ secondaryId=weapon2,
+ };
+ UI3DModelExhibition.Instance.ShowOtherPlayer(roleModel, data);
}
}
--
Gitblit v1.8.0