From df501724227ef9ea1105a7310cda5619c99d33a2 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 04 十二月 2018 18:22:45 +0800
Subject: [PATCH] 5098 【开发】【1.3】新版套装特效显示与配置 UI显示修改
---
UI/Common/UI3DShowHero.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/UI/Common/UI3DShowHero.cs b/UI/Common/UI3DShowHero.cs
index 3b44eea..51e53f3 100644
--- a/UI/Common/UI3DShowHero.cs
+++ b/UI/Common/UI3DShowHero.cs
@@ -95,6 +95,7 @@
PutOnWing(wingsResId);
PutOnGodWeaponEffect(godWeapons);
+ LoadClothesEffect();
return clothesModel;
}
@@ -107,7 +108,7 @@
PutOnWeapon(job, weaponResId);
PutOnSecondary(job, secondaryResId);
PutOnWing(wingsResId);
-
+ LoadClothesEffect();
return clothesModel;
}
@@ -163,7 +164,8 @@
if (smRenderer != null)
{
MaterialLoader.Release(smRenderer.material);
- smRenderer.material = null;
+ smRenderer.material = smRenderer.sharedMaterial = null;
+ smRenderer.materials = smRenderer.sharedMaterials = new Material[0];
}
}
@@ -191,7 +193,6 @@
wingsId = 0;
secondaryId = 0;
- SwitchMaterial(false);
TakeOffGodWeaponEffect();
}
@@ -278,8 +279,6 @@
var parent = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.SecondaryBindBoneName[job - 1]);
wingsModel.transform.SetParentEx(parent, Vector3.zero, Quaternion.identity, Vector3.one);
}
-
- LoadClothesEffect(suitLevel);
}
}
@@ -324,7 +323,8 @@
if (smRenderer != null)
{
MaterialLoader.Release(smRenderer.material);
- smRenderer.material = null;
+ smRenderer.material = smRenderer.sharedMaterial = null;
+ smRenderer.materials = smRenderer.sharedMaterials = new Material[0];
}
var prefab = InstanceResourcesLoader.LoadModelRes(clothesId, true);
@@ -552,12 +552,12 @@
private PlayerSuitModel SuitModel { get { return ModelCenter.Instance.GetModel<PlayerSuitModel>(); } }
private PlayerPackModel PlayerBackModel { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
- private void LoadClothesEffect(int suitLevel)
+ private void LoadClothesEffect()
{
var _equipModel = PlayerBackModel.GetSinglePackModel(PackType.rptEquip);
if (_equipModel == null)
{
- SwitchMaterial(DTC0309_tagPlayerLoginInfo.equipSuitID > 0);
+ SwitchMaterial(false);
return;
}
@@ -572,6 +572,7 @@
if (_itemModel == null)
{
+ SwitchMaterial(false);
return;
}
@@ -609,7 +610,7 @@
}
}
- SwitchMaterial(suitLevel > 0 || _suitCount >= 5);
+ SwitchMaterial(_suitCount >= 5);
}
public void SwitchMaterial(bool isSuit)
--
Gitblit v1.8.0