From fe5b1a2c216316911ae92eda2b82ad9b69f9c23d Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 10 十月 2018 16:10:09 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能
---
System/Skill/TalentTreeScriptable.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/System/Skill/TalentTreeScriptable.cs b/System/Skill/TalentTreeScriptable.cs
index d981d0b..c41e745 100644
--- a/System/Skill/TalentTreeScriptable.cs
+++ b/System/Skill/TalentTreeScriptable.cs
@@ -19,6 +19,16 @@
get { return m_ContentSizeDelta; }
}
+ public int arrowCount
+ {
+ get { return arrowElements == null ? 0 : arrowElements.Count; }
+ }
+
+ public int skillCount
+ {
+ get { return skillElements == null ? 0 : skillElements.Count; }
+ }
+
public TalentElement GetTalentElement(int index)
{
if (skillElements != null && index < skillElements.Count)
@@ -78,7 +88,7 @@
}
}
- public void ApplyArrowElement(int index, Vector3 _position, Vector2 _sizeDelta)
+ public void ApplyArrowElement(int index, Vector3 _position, Vector2 _sizeDelta, Vector3 _rotation, string _iconKey)
{
if (arrowElements == null)
{
@@ -88,6 +98,8 @@
{
position = _position,
sizeDelta = _sizeDelta,
+ rotation = _rotation,
+ iconKey = _iconKey,
};
if (index >= arrowElements.Count)
{
@@ -162,7 +174,9 @@
[Serializable]
public struct ArrowElement
{
+ public string iconKey;
public Vector3 position;
+ public Vector3 rotation;
public Vector2 sizeDelta;
}
}
--
Gitblit v1.8.0