From 706cd8a5ba596d2f7f4edfb00ac99fc08aa481f8 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期四, 31 一月 2019 16:28:58 +0800
Subject: [PATCH] 6104 【前端】【1.5.200】去除诛仙装备宝石共鸣激活特效
---
System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs | 41 ++------------------
System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs | 40 ++++++++++++++++++++
2 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs b/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
index 0b92de5..4290e9a 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
@@ -840,5 +840,45 @@
return activeSuit != null || nextSuit != null;
}
+
+ public bool IsPlayStoneSuitEffect()
+ {
+ List<int> suitTypes = null;
+ List<int> suitLvs = null;
+ bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);
+ if (isActiveSuit)
+ {
+ for (int i = 0; i < suitTypes.Count; i++)
+ {
+ int suitType = suitTypes[i];
+ int suitLv = suitLvs[i];
+ bool isLocalSaveActiveSuit = IsLocalSaveActiveStoneSuit(suitType, suitLv);
+ if (!isLocalSaveActiveSuit)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public void StopPlayStoneSuitEffect(UIEffect effect,bool isSave = false)
+ {
+ if(!isSave)
+ {
+ if (effect.IsPlaying)
+ {
+ effect.Stop();
+ }
+ }
+ else
+ {
+ List<int> suitTypes = null;
+ List<int> suitLvs = null;
+ bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);
+ SetLockLocalSaveActiveStoneSuit(suitTypes, suitLvs);
+ }
+ }
+
}
}
diff --git a/System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs b/System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs
index ff1d611..845c924 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs
@@ -86,7 +86,6 @@
UpdatePlayerUI3DModel();
UpdateFightPower();
UpdateSuitBtnPlayerEffect();
- UpdateStoneSuitBtnPlayerEffect();
TimeDownMgr.CoolTimeData data;
if (TimeDownMgr.Instance.Get(TimeDownMgr.CoolTimeType.BagSort, out data))
{
@@ -163,7 +162,6 @@
UpdatePlayerUI3DModel();
UpdateFightPower();
UpdateSuitBtnPlayerEffect();
- UpdateStoneSuitBtnPlayerEffect();
if (config != null)
{
UpdateSuitPlayerEffect(equipModel.GetJadeDynastyEquipPlace(index));
@@ -218,45 +216,17 @@
private void UpdateStoneSuitBtnPlayerEffect(bool isSave = false)
{
- List<int> suitTypes = null;
- List<int> suitLvs = null;
- bool isActiveSuit = equipModel.TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);
- if (isActiveSuit)
+ bool isPlay = equipModel.IsPlayStoneSuitEffect();
+ if(isPlay && !isSave)
{
- for (int i = 0; i < suitTypes.Count; i++)
+ if (!stoneBtnEffect.IsPlaying)
{
- int suitType = suitTypes[i];
- int suitLv = suitLvs[i];
- bool isLocalSaveActiveSuit = equipModel.IsLocalSaveActiveStoneSuit(suitType, suitLv);
- if (!isLocalSaveActiveSuit)
- {
- if (!stoneBtnEffect.IsPlaying)
- {
- stoneBtnEffect.Play();
- }
- break;
- }
- else
- {
- if (stoneBtnEffect.IsPlaying)
- {
- stoneBtnEffect.Stop();
- }
- }
+ stoneBtnEffect.Play();
}
}
else
{
- if (stoneBtnEffect.IsPlaying)
- {
- stoneBtnEffect.Stop();
- }
- }
-
- if (isSave && stoneBtnEffect.IsPlaying)
- {
- stoneBtnEffect.Stop();
- equipModel.SetLockLocalSaveActiveStoneSuit(suitTypes, suitLvs);
+ equipModel.StopPlayStoneSuitEffect(stoneBtnEffect, isSave);
}
}
@@ -363,7 +333,6 @@
private void ClickStoneAttr()
{
- UpdateStoneSuitBtnPlayerEffect(true);
WindowCenter.Instance.Open<JadeDynastyStoneSuitAttrWin>();
}
--
Gitblit v1.8.0