From 99ec4075b3cf616d4047c830175be62221ef7104 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 22 九月 2018 00:05:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Treasure/TreasurePotentialPanel.cs | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/System/Treasure/TreasurePotentialPanel.cs b/System/Treasure/TreasurePotentialPanel.cs
index 042fc48..9b91016 100644
--- a/System/Treasure/TreasurePotentialPanel.cs
+++ b/System/Treasure/TreasurePotentialPanel.cs
@@ -84,7 +84,8 @@
var level = potential.level;
var isMax = level >= config.SkillMaxLV;
m_PotentialMaxLevelTip.gameObject.SetActive(isMax);
- m_ContainerUpgrade.gameObject.SetActive(!isMax && FuncOpen.Instance.IsFuncOpen(82));
+ m_ContainerUpgrade.gameObject.SetActive(!isMax &&
+ FuncOpen.Instance.IsFuncOpen(82) && model.IsPotentialUnlock(m_Treasure.id, selectedPotential));
m_ContainerRequirement.gameObject.SetActive(!isMax);
if (!isMax)
@@ -93,7 +94,6 @@
DisplayUpgradeCost();
DisplayGetSkill();
DisplaySuccessRatio();
- m_UpgradeImage.gray = !TestPotentialLevelUp();
}
else
{
@@ -526,13 +526,18 @@
{
return;
}
+ if (config.InitialRate >= 100)
+ {
+ model.selectedPotentialBook = 0;
+ return;
+ }
var itemId = config.Meterial2ID.Length > 0 ? config.Meterial2ID[0] : 0;
if (itemId != 0)
{
- var own = playerPack.GetItemCountByID(PackType.rptItem, itemId);
- var need = config.MeterialNum2[0];
+ //var own = playerPack.GetItemCountByID(PackType.rptItem, itemId);
+ //var need = config.MeterialNum2[0];
var rate = config.Rate[0];
- if (rate >= 60 && own >= need)
+ if (rate >= 60)
{
model.selectedPotentialBook = itemId;
}
@@ -550,7 +555,6 @@
m_SPOwn.text = UIHelper.ReplaceLargeNum(spOwn);
m_SPNeed.text = StringUtility.Contact("/", UIHelper.ReplaceLargeNum(spNeed));
m_SPOwn.color = spOwn >= spNeed ? UIHelper.GetUIColor(TextColType.DarkGreen) : UIHelper.GetUIColor(TextColType.Red);
- m_UpgradeImage.gray = spOwn < spNeed;
}
private void DisplayGetSkill(bool _levelUp = false)
@@ -591,9 +595,11 @@
{
var levelUpConfig = GetPotentialLevelUpConfig();
m_SuccessRatio.text = StringUtility.Contact((levelUpConfig.rate * 0.01f).ToString("f0"), "%");
- m_RatioUp.gameObject.SetActive(model.selectedPotentialBook != 0);
- m_SuccessRatio.color = UIHelper.GetUIColor(model.selectedPotentialBook != 0 ? TextColType.DarkGreen : TextColType.LightYellow);
- m_UpgradeImage.gray = !TestPotentialLevelUp();
+ m_RatioUp.gameObject.SetActive(model.selectedPotentialBook != 0 && levelUpConfig.rate > 0);
+ m_SuccessRatio.color = UIHelper.GetUIColor(model.selectedPotentialBook != 0 && levelUpConfig.rate > 0
+ ? TextColType.DarkGreen : TextColType.LightYellow);
+ m_UpgradeImage.gray = levelUpConfig.rate == 0 && model.selectedPotentialBook == 0;
+ m_Upgrade.interactable = levelUpConfig.rate != 0 || model.selectedPotentialBook != 0;
}
private void DisplayAddBookRedpoint()
@@ -644,7 +650,9 @@
m_PotentialBook.SetItem(_potentialBookId, 1);
var levelUpConfig = GetPotentialLevelUpConfig();
- m_PotentialCount.text = StringUtility.Contact(levelUpConfig.own, "/", levelUpConfig.need);
+ bool satisfy = levelUpConfig.own >= levelUpConfig.need;
+ m_PotentialCount.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(satisfy ?
+ TextColType.LightYellow : TextColType.Red, levelUpConfig.own.ToString()), "/", levelUpConfig.need);
}
DisplaySuccessRatio();
@@ -657,10 +665,14 @@
if (packType == PackType.rptItem && config != null && config.Type == 6)
{
var levelUpConfig = GetPotentialLevelUpConfig();
- if (levelUpConfig.own < levelUpConfig.need)
+ if (_id == model.selectedPotentialBook)
{
- model.selectedPotentialBook = 0;
+ DisplayPotentialBook(model.selectedPotentialBook);
}
+ //if (levelUpConfig.own < levelUpConfig.need)
+ //{
+ // model.selectedPotentialBook = 0;
+ //}
}
}
@@ -687,13 +699,21 @@
}
break;
case 3:
- MessageWin.Inst.ShowFixedTip(Language.Get("Hallows_SpUnEnough"));
+ ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(148);
+ //MessageWin.Inst.ShowFixedTip(Language.Get("Hallows_SpUnEnough"));
break;
case 4:
SysNotifyMgr.Instance.ShowTip("TreasureUnsealed");
break;
case 6:
- SysNotifyMgr.Instance.ShowTip("LevelUpZeroRate");
+ if (model.selectedPotentialBook != 0)
+ {
+ ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(model.selectedPotentialBook);
+ }
+ else
+ {
+ SysNotifyMgr.Instance.ShowTip("LevelUpZeroRate");
+ }
break;
}
@@ -840,9 +860,10 @@
}
var levelUpConfig = GetPotentialLevelUpConfig();
- if (levelUpConfig.own < levelUpConfig.need || !ContainsPotentialBook(model.selectedPotentialBook))
+ if (!ContainsPotentialBook(model.selectedPotentialBook))
{
- model.selectedPotentialBook = 0;
+ AutoSelectPotentialBook();
+ //model.selectedPotentialBook = 0;
}
var curconfig = Config.Instance.Get<SkillConfig>(potential.id);
@@ -924,7 +945,6 @@
m_SPOwn.text = UIHelper.ReplaceLargeNum(spOwn);
m_SPNeed.text = StringUtility.Contact("/", UIHelper.ReplaceLargeNum(spNeed));
m_SPOwn.color = spOwn >= spNeed ? UIHelper.GetUIColor(TextColType.DarkGreen) : UIHelper.GetUIColor(TextColType.Red);
- m_UpgradeImage.gray = !TestPotentialLevelUp();
break;
}
}
--
Gitblit v1.8.0