From 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 04 七月 2019 13:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan
---
System/Skill/SkillCell.cs | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/System/Skill/SkillCell.cs b/System/Skill/SkillCell.cs
index 35ace54..de26cc7 100644
--- a/System/Skill/SkillCell.cs
+++ b/System/Skill/SkillCell.cs
@@ -13,15 +13,19 @@
[SerializeField] SkillData skill;
[SerializeField] RedpointBehaviour m_Redpoint;
- public SkillData skillData {
- get {
+ public SkillData skillData
+ {
+ get
+ {
return skill;
}
}
SkillModel m_Model;
- SkillModel model {
- get {
+ SkillModel model
+ {
+ get
+ {
return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<SkillModel>());
}
}
@@ -37,13 +41,16 @@
public void OnPointerDown(PointerEventData eventData)
{
skill.m_SkillBtn.OnPointerClick(eventData);
- if (model.skillDraging) {
+ if (model.skillDraging)
+ {
return;
}
- if (PlayerDatas.Instance.skill.GetSKillById(skill.skillId) == null) {
+ if (PlayerDatas.Instance.skill.GetSKillById(skill.skillId) == null)
+ {
return;
}
- if (model.GetXpSkillID() == skill.skillId) {
+ if (model.IsXpSkill(skill.skillId))
+ {
return;
}
onPress = true;
@@ -66,10 +73,12 @@
public void Refresh(int skillId)
{
skill.SetSkillData(skillId);
- if (model.presentSltSkillID == skillId) {
+ if (model.presentSltSkillID == skillId)
+ {
skill.m_SelectImg.gameObject.SetActive(true);
}
- else {
+ else
+ {
skill.m_SelectImg.gameObject.SetActive(false);
}
@@ -96,9 +105,11 @@
private void LateUpdate()
{
- if (onPress && !model.skillDraging) {
+ if (onPress && !model.skillDraging)
+ {
m_Time += Time.deltaTime;
- if (m_Time > model.onDragDelay) {
+ if (m_Time > model.onDragDelay)
+ {
model.skillDragId = skill.skillId;
model.skillDraging = true;
m_Time = 0;
--
Gitblit v1.8.0