From 2e7aa5faabcbe00757c74379f67b3231b1b3370f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 09 十月 2018 16:01:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Treasure/TreasurePotentialPanel.cs | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/System/Treasure/TreasurePotentialPanel.cs b/System/Treasure/TreasurePotentialPanel.cs
index 5948e7a..25fd539 100644
--- a/System/Treasure/TreasurePotentialPanel.cs
+++ b/System/Treasure/TreasurePotentialPanel.cs
@@ -438,12 +438,16 @@
if (_id == 82)
{
m_ContainerLock.gameObject.SetActive(!FuncOpen.Instance.IsFuncOpen(82));
- if (FuncOpen.Instance.IsFuncOpen(82))
+ if (FuncOpen.Instance.IsFuncOpen(82) && model.serverInited)
{
potentialBriefInfos[0].potentialTween.SetStartState();
potentialBriefInfos[0].potentialTween.enabled = false;
m_TreasureAnimation.UnlockTreasurePotential(0);
model.SetPotentialUnlockShow(model.selectedTreasure);
+ }
+ if (!m_SelectTotalEffect)
+ {
+ DisplayPotentialEffect();
}
}
}
@@ -863,7 +867,7 @@
private void PotentialLevelUpdate(int _potentialId, int arg2)
{
- if (_potentialId == model.selectedPotential)
+ if (_potentialId == model.selectedPotential && !m_SelectTotalEffect)
{
DisplayPotentialEffect();
}
@@ -890,19 +894,20 @@
}
}
- var levelUpConfig = GetPotentialLevelUpConfig();
- if (!ContainsPotentialBook(model.selectedPotentialBook))
+ if(_potentialId == model.selectedPotential && !m_SelectTotalEffect)
{
- AutoSelectPotentialBook();
- //model.selectedPotentialBook = 0;
+ var levelUpConfig = GetPotentialLevelUpConfig();
+ if (!ContainsPotentialBook(model.selectedPotentialBook))
+ {
+ AutoSelectPotentialBook();
+ }
+
+ var curconfig = Config.Instance.Get<SkillConfig>(potential.id);
+
+ var level = potential.level;
+ var isMax = level >= curconfig.SkillMaxLV;
+ m_ContainerUpgrade.gameObject.SetActive(!isMax && FuncOpen.Instance.IsFuncOpen(82));
}
-
- var curconfig = Config.Instance.Get<SkillConfig>(potential.id);
-
- var level = potential.level;
- var isMax = level >= curconfig.SkillMaxLV;
- m_ContainerUpgrade.gameObject.SetActive(!isMax && FuncOpen.Instance.IsFuncOpen(82));
-
}
private void OnPotentialLevelUp(int _treasureId, int _potential, bool _ok)
--
Gitblit v1.8.0