From 8cb1ef9b86b6bd07b7033a1d3d4e9b0ff619b689 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 24 六月 2019 19:50:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/LongPressShowPanel.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/System/MainInterfacePanel/LongPressShowPanel.cs b/System/MainInterfacePanel/LongPressShowPanel.cs
index 7442419..5ddf39d 100644
--- a/System/MainInterfacePanel/LongPressShowPanel.cs
+++ b/System/MainInterfacePanel/LongPressShowPanel.cs
@@ -26,7 +26,8 @@
Treasure treasure;
if (treasureModel.TryGetTreasure(treasures[i], out treasure))
{
- if (treasure.skillId == skillId)
+ var skillConfig = SkillConfig.Get(skillId);
+ if (skillConfig != null && treasure.skillId == skillConfig.SkillTypeID)
{
treasureId = treasure.id;
break;
@@ -34,13 +35,14 @@
}
}
-
- var skillConfig = SkillConfig.Get(skillId);
- Name.text = skillConfig.SkillName;
- Describe.text = skillConfig.Description;
-
- var treasureConfig = TreasureConfig.Get(treasureId);
- m_Icon.SetSprite(treasureConfig.Icon);
+ {
+ var skillConfig = SkillConfig.Get(skillId);
+ Name.text = skillConfig.SkillName;
+ Describe.text = skillConfig.Description;
+
+ var treasureConfig = TreasureConfig.Get(treasureId);
+ m_Icon.SetSprite(treasureConfig.Icon);
+ }
}
}
--
Gitblit v1.8.0