From 4a5699643165134f7bb856bdeb04435bed8a35c6 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 09 一月 2019 10:29:01 +0800
Subject: [PATCH] 5729 【前端】【1.5】时装功能开发
---
UI/Common/UI3DModelExhibition.cs | 98 ++++++++++++++++++++++++++++++-------------------
1 files changed, 60 insertions(+), 38 deletions(-)
diff --git a/UI/Common/UI3DModelExhibition.cs b/UI/Common/UI3DModelExhibition.cs
index f3d9bcd..b5cd590 100644
--- a/UI/Common/UI3DModelExhibition.cs
+++ b/UI/Common/UI3DModelExhibition.cs
@@ -26,8 +26,7 @@
[SerializeField] UI3DModelInteractProcessor m_InteractProcessor;
[SerializeField] ColorCorrectionCurves m_CameraColor;
- public bool interactable
- {
+ public bool interactable {
get { return m_Interactable; }
set { m_Interactable = value; }
}
@@ -36,8 +35,7 @@
int m_HorseModelId = 0;
GameObject horseModel = null;
- public GameObject NpcModelHorse
- {
+ public GameObject NpcModelHorse {
get { return horseModel; }
set { horseModel = value; }
}
@@ -46,8 +44,7 @@
GameObject npcModel = null;
SFXController m_NpcEffect;
readonly List<SFXController> m_BindEffectList = new List<SFXController>();
- public GameObject NpcModelPet
- {
+ public GameObject NpcModelPet {
get { return npcModel; }
set { npcModel = value; }
}
@@ -73,10 +70,8 @@
public static UI3DModelExhibition Instance { get; private set; }
static UI3DModelExhibition m_InstanceClone1 = null;
- public static UI3DModelExhibition InstanceClone1
- {
- get
- {
+ public static UI3DModelExhibition InstanceClone1 {
+ get {
if (m_InstanceClone1 == null)
{
CreateCloneStage();
@@ -116,6 +111,9 @@
public void ShowLoginPlayer(RawImage _rawImage, int _job)
{
+ var flashClothes = 0;
+ var flashWeapon = 0;
+ var flashSecondary = 0;
var clothesItemId = 0;
var weaponItemId = 0;
var wingsItemId = 0;
@@ -128,6 +126,15 @@
var equipInfo = equipInfos[i];
switch ((RoleEquipType)equipInfo.ItemPlace)
{
+ case RoleEquipType.retFashionClothes:
+ flashClothes = (int)equipInfo.ItemID;
+ break;
+ case RoleEquipType.retFashionWeapon:
+ flashWeapon = (int)equipInfo.ItemID;
+ break;
+ case RoleEquipType.retFashionWeapon2:
+ flashSecondary = (int)equipInfo.ItemID;
+ break;
case RoleEquipType.retWeapon:
weaponItemId = (int)equipInfo.ItemID;
break;
@@ -155,11 +162,11 @@
var data = new UI3DPlayerExhibitionData
{
job = _job,
- clothesId = clothesItemId,
+ clothesId = flashClothes > 0 ? flashClothes : clothesItemId,
suitLevel = suitLevel,
- weaponId = weaponItemId,
+ weaponId = flashWeapon > 0 ? flashWeapon : weaponItemId,
wingsId = wingsItemId,
- secondaryId = secondaryItemId,
+ secondaryId = flashSecondary > 0 ? flashSecondary : secondaryItemId,
isDialogue = false,
godWeapons = new Dictionary<int, int>() {
{ 1, (int)PlayerDatas.Instance.loginInfo.ExAttr15 },
@@ -173,27 +180,29 @@
public void ShowPlayer(RawImage _rawImage, int _job, bool _isDialogue = false)
{
- var clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);
+ var clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionClothes);
+ clothes = clothes ?? playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);
var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;
- 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);
var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;
var wings = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing);
var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;
- 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);
var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;
- int _suitLevel = 0;
-
+ int suitLevel = 0;
if (clothes != null)
{
if (clothes.itemInfo.IsSuite == 1)
{
if (clothes.GetUseDataModel(30) != null && clothes.GetUseDataModel(30)[0] != 0)
{
- _suitLevel = clothes.GetUseDataModel(30)[0];
+ suitLevel = clothes.GetUseDataModel(30)[0];
}
}
}
@@ -207,7 +216,7 @@
{
job = _job,
clothesId = clothesId,
- suitLevel = _suitLevel,
+ suitLevel = suitLevel,
weaponId = weaponId,
wingsId = wingsId,
secondaryId = secondaryId,
@@ -223,33 +232,46 @@
ShowPlayer(_rawImage, data);
}
- public void ShowPlayer(RawImage _rawImage, int _job, RoleEquipType _exceptEquip)
+ public void ShowPlayer(RawImage rawImage, int job, RoleEquipType exceptEquip)
{
- var clothes = _exceptEquip == RoleEquipType.retClothes ?
- null : playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);
- var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;
+ var clothesId = 0;
+ var weaponId = 0;
+ var wingsId = 0;
+ var secondaryId = 0;
+ ItemModel clothes = null;
- var weapon = _exceptEquip == RoleEquipType.retWeapon ?
- null : playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon);
- var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;
+ if (exceptEquip != RoleEquipType.retClothes)
+ {
+ clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);
+ clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;
+ }
- var wings = _exceptEquip == RoleEquipType.retWing ?
- null : playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing);
- var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;
+ if (exceptEquip != RoleEquipType.retWeapon)
+ {
+ var weapon = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon);
+ weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;
+ }
- var secondary = _exceptEquip == RoleEquipType.retWeapon2 ?
- null : playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2);
- var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;
+ if (exceptEquip != RoleEquipType.retWing)
+ {
+ var wings = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing);
+ wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;
+ }
- int _suitLevel = 0;
+ if (exceptEquip != RoleEquipType.retWeapon2)
+ {
+ var secondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2);
+ secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;
+ }
+ var suitLevel = 0;
if (clothes != null)
{
if (clothes.itemInfo.IsSuite == 1)
{
if (clothes.GetUseDataModel(30) != null && clothes.GetUseDataModel(30)[0] != 0)
{
- _suitLevel = clothes.GetUseDataModel(30)[0];
+ suitLevel = clothes.GetUseDataModel(30)[0];
}
}
}
@@ -261,9 +283,9 @@
var godWeapon4 = magicianModel.GetGodWeaponInfo(4);
var data = new UI3DPlayerExhibitionData
{
- job = _job,
+ job = job,
clothesId = clothesId,
- suitLevel = _suitLevel,
+ suitLevel = suitLevel,
weaponId = weaponId,
wingsId = wingsId,
secondaryId = secondaryId,
@@ -276,7 +298,7 @@
}
};
- ShowPlayer(_rawImage, data);
+ ShowPlayer(rawImage, data);
}
void ShowPlayer(RawImage _rawImage, UI3DPlayerExhibitionData data)
--
Gitblit v1.8.0