From 5e2fc31fb56e47d6d08eababe9969343bb4e503b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 09 一月 2019 11:27:44 +0800
Subject: [PATCH] 5729 【前端】【1.5】时装功能开发
---
UI/Common/UI3DModelExhibition.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/UI/Common/UI3DModelExhibition.cs b/UI/Common/UI3DModelExhibition.cs
index b5cd590..93de580 100644
--- a/UI/Common/UI3DModelExhibition.cs
+++ b/UI/Common/UI3DModelExhibition.cs
@@ -242,13 +242,15 @@
if (exceptEquip != RoleEquipType.retClothes)
{
- clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);
+ clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionClothes);
+ clothes = clothes ?? playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);
clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;
}
if (exceptEquip != RoleEquipType.retWeapon)
{
- var weapon = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon);
+ var weapon = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionWeapon);
+ weapon = weapon ?? playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon);
weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;
}
@@ -260,7 +262,8 @@
if (exceptEquip != RoleEquipType.retWeapon2)
{
- var secondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2);
+ var secondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionWeapon2);
+ secondary = secondary ?? playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2);
secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;
}
--
Gitblit v1.8.0