From 5b4f4fdfb98bbae6116b5879a63f6ca6bba07326 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 07 一月 2019 17:20:54 +0800
Subject: [PATCH] Merge branch 'master' into FashionDress
---
System/Skill/SkillBehaviour.cs | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/System/Skill/SkillBehaviour.cs b/System/Skill/SkillBehaviour.cs
index 12bdcb5..9cc0daa 100644
--- a/System/Skill/SkillBehaviour.cs
+++ b/System/Skill/SkillBehaviour.cs
@@ -15,6 +15,8 @@
[SerializeField] Text m_SkillDescription;
private int skillId = 0;
+ GodWeaponEffectConfig godWeaponEffectConfig = null;
+
public event Action<int> onClick;
private void Awake()
@@ -25,6 +27,7 @@
public void Display(int _skillId)
{
var config = Config.Instance.Get<SkillConfig>(_skillId);
+ godWeaponEffectConfig = null;
skillId = 0;
if (config != null)
{
@@ -33,9 +36,24 @@
}
}
+ public void DisplayGodWeaponEffect(GodWeaponEffectConfig config)
+ {
+ godWeaponEffectConfig = config;
+ m_SkillIcon.SetSprite(config.icon);
+ if (m_SkillName != null)
+ {
+ m_SkillName.text = config.skillName;
+ }
+ if (m_SkillDescription != null)
+ {
+ m_SkillDescription.text = string.Empty;
+ }
+ }
+
public void DisplayNewGot(int _skillId)
{
var config = Config.Instance.Get<SkillConfig>(_skillId);
+ godWeaponEffectConfig = null;
skillId = 0;
if (config != null)
{
@@ -67,7 +85,7 @@
}
}
var config = GodWeaponConfig.GetConfig(ActivateShow.godWeaponType, _lv);
- SkillDetails.ShowSkillDetails(config.SkillID, SkillDetails.SkillSourceType.MagicianSkill, 0, config.Name, string.Empty);
+ SkillDetails.ShowSkillDetails(config.SkillID, SkillDetails.SkillSourceType.GodWeaponSkill, 0, config.Name, string.Empty);
break;
}
@@ -76,6 +94,24 @@
onClick(skillId);
}
}
+
+ if (godWeaponEffectConfig != null)
+ {
+ switch (ActivateShow.activateType)
+ {
+ case ActivateShow.ActivateFunc.GodWeapon:
+ var _model = ModelCenter.Instance.GetModel<MagicianModel>();
+ if (godWeaponEffectConfig != null)
+ {
+ var stage = 0;
+ if (_model.TryGetGodWeaponStage(ActivateShow.godWeaponType, godWeaponEffectConfig.level, out stage))
+ {
+ SkillDetails.ShowGodWeaponEffectSkill(ActivateShow.godWeaponType, stage);
+ }
+ }
+ break;
+ }
+ }
}
}
}
--
Gitblit v1.8.0