From 2ec252a98419cb8d1ab0a2cf22c94efda3ab6349 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 10 九月 2018 11:56:43 +0800
Subject: [PATCH] 3270 高低模及手臂逻辑接入
---
UI/Common/UI3DShowHero.cs | 10 +++++++---
Core/ResModule/InstanceResourcesLoader.cs | 4 ++++
Fight/GameActor/GActorPlayerBase.cs | 14 ++++++++++++--
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/Core/ResModule/InstanceResourcesLoader.cs b/Core/ResModule/InstanceResourcesLoader.cs
index bb7c623..c406493 100644
--- a/Core/ResModule/InstanceResourcesLoader.cs
+++ b/Core/ResModule/InstanceResourcesLoader.cs
@@ -114,6 +114,10 @@
{
return LoadModelPrefab(secondarySuffix, _name, _ui);
}
+ else if (_m.Type == (int)E_ModelResType.Hand)
+ {
+ return LoadModelPrefab(handSuffix, _name, _ui);
+ }
return null;
}
diff --git a/Fight/GameActor/GActorPlayerBase.cs b/Fight/GameActor/GActorPlayerBase.cs
index d02a752..1306b06 100644
--- a/Fight/GameActor/GActorPlayerBase.cs
+++ b/Fight/GameActor/GActorPlayerBase.cs
@@ -517,6 +517,11 @@
}
int _resID = JobSetup.BaseEquip[2];
+ ItemConfig _clothesItemConfig = Config.Instance.Get<ItemConfig>((int)ClothesItemID);
+ if (_clothesItemConfig != null)
+ {
+ _resID = _clothesItemConfig.ChangeOrd + 2900;
+ }
ItemConfig _itemConfig = null;
@@ -534,14 +539,19 @@
_resID = _itemConfig.ChangeOrd;
}
-
// 鍒ゆ柇鏄惁涔嬪墠宸茬粡绌夸簡
// 绌夸簡灏卞厛鑴辨帀
if (m_SecondaryModel)
{
if (SecondaryID == 0)
{
- if (!TryRelease(JobSetup.BaseEquip[2], m_SecondaryModel))
+ int _baseHandResId = JobSetup.BaseEquip[2];
+ if (_clothesItemConfig != null)
+ {
+ _baseHandResId = _clothesItemConfig.ChangeOrd + 2900;
+ }
+
+ if (!TryRelease(_baseHandResId, m_SecondaryModel))
{
return;
}
diff --git a/UI/Common/UI3DShowHero.cs b/UI/Common/UI3DShowHero.cs
index 33738ec..f3fce19 100644
--- a/UI/Common/UI3DShowHero.cs
+++ b/UI/Common/UI3DShowHero.cs
@@ -145,9 +145,12 @@
weaponModel = null;
}
- if (secondaryModel)
+ if (job == 2)
{
- secondaryModel.SetActive(false);
+ if (secondaryModel)
+ {
+ secondaryModel.SetActive(false);
+ }
}
}
@@ -326,7 +329,8 @@
if (itemID == 0)
{
- newSecondary = config.BaseEquip[2];
+ // 杩欓噷涓嶅啀璇诲彇榛樿鐨勫壇鎵嬭澶�,鑰屾槸鏍规嵁濂楄璇诲彇榛樿鐨勬墜鑷傝澶�
+ newSecondary = clothesId + 2900;
}
else
{
--
Gitblit v1.8.0