From f65841dcefd4fcf3fd4d966bbd0d6b130a789190 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 21 二月 2019 11:15:26 +0800
Subject: [PATCH] 6242 子 【开发】【2.0】法宝界面调整 / 【前端】【2.0】法宝调整
---
System/Skill/SkillPassWin.cs | 161 ++++++++++++++++++++++++++++-------------------------
1 files changed, 84 insertions(+), 77 deletions(-)
diff --git a/System/Skill/SkillPassWin.cs b/System/Skill/SkillPassWin.cs
index 6339712..8243974 100644
--- a/System/Skill/SkillPassWin.cs
+++ b/System/Skill/SkillPassWin.cs
@@ -204,7 +204,7 @@
if (model.UnlockPassHole != 0)
{
var index = 0;
- for (int i = 0; i < equipPassSkills.Count; i++)
+ for (int i = 0; i < model.passEquipCnt; i++)
{
PassSkillLimit limit;
if (model.TryGetPassSkillLimit(i, out limit))
@@ -415,101 +415,108 @@
{
for (int i = 0; i < equipPassSkills.Count; i++)
{
- PassSkillLimit limit;
- equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleUnLimitColor;
- if (model.TryGetPassSkillLimit(i, out limit))
+ equipPassSkills[i].gameObject.SetActive(i < model.passEquipCnt);
+ if (i < model.passEquipCnt)
{
- if (limit.level > 0)
+ PassSkillLimit limit;
+ equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleUnLimitColor;
+ if (model.TryGetPassSkillLimit(i, out limit))
{
- if (PlayerDatas.Instance.baseData.LV < limit.level)
+ if (limit.level > 0)
{
- SetEquipSkillDeActive(i);
- equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleLimitColor;
- equipPassSkills[i].skillData.m_SkillNameTxt.text = Language.Get("PassSkillHoleLimitLv", limit.level);
- continue;
- }
- }
- else if (limit.vipLv > 0)
- {
- if (PlayerDatas.Instance.baseData.VIPLv < limit.vipLv)
- {
- SetEquipSkillDeActive(i);
- equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleLimitColor;
- equipPassSkills[i].skillData.m_SkillNameTxt.text = Language.Get("PassSkillHoleLimitVip", limit.vipLv);
- continue;
- }
- }
- else if (limit.MountLv > 0)
- {
- if (promoteModel.GetMountTotallv() < limit.MountLv)
- {
- SetEquipSkillDeActive(i);
- equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleLimitColor;
- equipPassSkills[i].skillData.m_SkillNameTxt.text = Language.Get("PassSkillHoleLimitMount", limit.MountLv);
- continue;
- }
- }
- else if (limit.OpenSkillSlots > 0)
- {
- if (!model.IsTaskHoleUnlock(limit.OpenSkillSlots) || model.UnlockPassHole == limit.OpenSkillSlots)
- {
- SetEquipSkillDeActive(i);
- equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleLimitColor;
-
- if (model.taskHoleDict.ContainsKey(limit.OpenSkillSlots))
+ if (PlayerDatas.Instance.baseData.LV < limit.level)
{
- var taskId = model.taskHoleDict[limit.OpenSkillSlots];
- var config = PyTaskConfig.Get(taskId);
- if (PlayerDatas.Instance.baseData.LV < config.lv)
+ SetEquipSkillDeActive(i);
+ equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleLimitColor;
+ equipPassSkills[i].skillData.m_SkillNameTxt.text = Language.Get("PassSkillHoleLimitLv", limit.level);
+ continue;
+ }
+ }
+ else if (limit.vipLv > 0)
+ {
+ if (PlayerDatas.Instance.baseData.VIPLv < limit.vipLv)
+ {
+ SetEquipSkillDeActive(i);
+ equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleLimitColor;
+ equipPassSkills[i].skillData.m_SkillNameTxt.text = Language.Get("PassSkillHoleLimitVip", limit.vipLv);
+ continue;
+ }
+ }
+ else if (limit.MountLv > 0)
+ {
+ if (promoteModel.GetMountTotallv() < limit.MountLv)
+ {
+ SetEquipSkillDeActive(i);
+ equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleLimitColor;
+ equipPassSkills[i].skillData.m_SkillNameTxt.text = Language.Get("PassSkillHoleLimitMount", limit.MountLv);
+ continue;
+ }
+ }
+ else if (limit.OpenSkillSlots > 0)
+ {
+ if (!model.IsTaskHoleUnlock(limit.OpenSkillSlots) || model.UnlockPassHole == limit.OpenSkillSlots)
+ {
+ SetEquipSkillDeActive(i);
+ equipPassSkills[i].skillData.m_SkillNameTxt.color = equipHoleLimitColor;
+
+ if (model.taskHoleDict.ContainsKey(limit.OpenSkillSlots))
{
- equipPassSkills[i].skillData.m_SkillNameTxt.text =
- UIHelper.ReplaceNewLine(Language.Get("PassSkillHoleLimitTask_6", config.lv));
- continue;
+ var taskId = model.taskHoleDict[limit.OpenSkillSlots];
+ var config = PyTaskConfig.Get(taskId);
+ if (PlayerDatas.Instance.baseData.LV < config.lv)
+ {
+ equipPassSkills[i].skillData.m_SkillNameTxt.text =
+ UIHelper.ReplaceNewLine(Language.Get("PassSkillHoleLimitTask_6", config.lv));
+ continue;
+ }
+ }
+ equipPassSkills[i].skillData.m_SkillNameTxt.text =
+ UIHelper.ReplaceNewLine(Language.Get(StringUtility.Contact("PassSkillHoleLimitTask_", limit.OpenSkillSlots)));
+ continue;
+ }
+ else if (model.IsImmediatelyUnlock(i)
+ && model.IsTaskHoleUnlock(limit.OpenSkillSlots))
+ {
+ if (m_ImmediatelyUnlock.gameObject.activeSelf)
+ {
+ m_ImmediatelyUnlock.gameObject.SetActive(false);
}
}
- equipPassSkills[i].skillData.m_SkillNameTxt.text =
- UIHelper.ReplaceNewLine(Language.Get(StringUtility.Contact("PassSkillHoleLimitTask_", limit.OpenSkillSlots)));
- continue;
- }
- else if (model.IsImmediatelyUnlock(i)
- && model.IsTaskHoleUnlock(limit.OpenSkillSlots))
- {
- if (m_ImmediatelyUnlock.gameObject.activeSelf)
- {
- m_ImmediatelyUnlock.gameObject.SetActive(false);
- }
}
}
+ int _skillId = 0;
+ equipPassSkills[i].skillData.m_SkillNameTxt.text = string.Empty;
+ equipPassSkills[i].skillData.m_LockImg.gameObject.SetActive(false);
+ model.TryGetEquipPassSkills(model.presentSltPage, i, out _skillId);
+ equipPassSkills[i].skillData.SetSkillData(_skillId);
}
- int _skillId = 0;
- equipPassSkills[i].skillData.m_SkillNameTxt.text = string.Empty;
- equipPassSkills[i].skillData.m_LockImg.gameObject.SetActive(false);
- model.TryGetEquipPassSkills(model.presentSltPage, i, out _skillId);
- equipPassSkills[i].skillData.SetSkillData(_skillId);
}
}
private void CheckReplaceEquipSkill()
{
- for (int i = 0; i < equipPassSkills.Count; i++)
+ for (int i = 0; i < model.passEquipCnt; i++)
{
- var rect = equipPassSkills[i].transform as RectTransform;
- var des = RectTransformUtility.CalculateRelativeRectTransformBounds(this.transform, rect);
- var src = RectTransformUtility.CalculateRelativeRectTransformBounds(this.transform, m_DragImg.rectTransform);
- var dis = Vector3.Distance(des.center, src.center);
- if (dis < rect.rect.width / 2)
+ if (i < equipPassSkills.Count)
{
- if (CheckOpenGetWays(i) != 0)
+ var rect = equipPassSkills[i].transform as RectTransform;
+ var des = RectTransformUtility.CalculateRelativeRectTransformBounds(this.transform, rect);
+ var src = RectTransformUtility.CalculateRelativeRectTransformBounds(this.transform, m_DragImg.rectTransform);
+ var dis = Vector3.Distance(des.center, src.center);
+ if (dis < rect.rect.width / 2)
{
- //SoundPlayer.Instance.PlayUIAudio(2);
- return;
+ if (CheckOpenGetWays(i) != 0)
+ {
+ //SoundPlayer.Instance.PlayUIAudio(2);
+ return;
+ }
+ model.SendEquipPassSkills(model.skillDragId, i);
+ if (model.passSkillHoleRedpoints[i].state == RedPointState.Simple)
+ {
+ model.SetDayRemind();
+ }
+ break;
}
- model.SendEquipPassSkills(model.skillDragId, i);
- if (model.passSkillHoleRedpoints[i].state == RedPointState.Simple)
- {
- model.SetDayRemind();
- }
- break;
}
}
}
--
Gitblit v1.8.0