From 90e4a40c8f82063971355652f589617e66bf82e8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 22 一月 2019 19:40:27 +0800
Subject: [PATCH] 6006 【前端】【1.5.100】诛仙神技开发
---
Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs | 7 +++++--
System/JadeDynastySkill/JadeDynastySkillWin.cs | 2 ++
Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs b/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs
index 976ed2a..0fcb490 100644
--- a/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs
+++ b/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs
@@ -13,7 +13,8 @@
public int skillTypeId { get ; private set ; }
public int totalTime { get ; private set ; }
- public string[] spriteKeys;
+ public string[] spriteKeys;
+ public string descriptionIcon { get ; private set; }
public override string getKey()
{
@@ -27,7 +28,9 @@
totalTime=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
- spriteKeys = rawContents[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ spriteKeys = rawContents[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+
+ descriptionIcon = rawContents[3].Trim();
}
catch (Exception ex)
{
diff --git a/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta b/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta
index bfc46f6..8dc1b55 100644
--- a/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d2052f17dcdee634082ca8f214df0ecd
-timeCreated: 1548147951
+timeCreated: 1548156734
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/System/JadeDynastySkill/JadeDynastySkillWin.cs b/System/JadeDynastySkill/JadeDynastySkillWin.cs
index cfa42e0..81fea98 100644
--- a/System/JadeDynastySkill/JadeDynastySkillWin.cs
+++ b/System/JadeDynastySkill/JadeDynastySkillWin.cs
@@ -16,6 +16,7 @@
{
[SerializeField] Text m_SkillDescription;
[SerializeField] Text m_SkillFightPower;
+ [SerializeField] Image m_SkillDescriptionIcon;
[SerializeField] FrameEffect m_SkillFrame;
[SerializeField] ScrollerController m_ScrollerControl;
@@ -107,6 +108,7 @@
{
var config = Config.Instance.Get<SkillFrameAnimationConfig>(model.selectSkill);
m_SkillFrame.SetSprites(sprites, (float)config.totalTime / 1000);
+ m_SkillDescriptionIcon.SetSprite(config.descriptionIcon);
}
}
}
--
Gitblit v1.8.0