From f4f07847775c12b338d8bccedbbabc067dc1ae2c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 18 八月 2018 14:34:26 +0800
Subject: [PATCH] Merge branch '法宝、法宝魂修改'
---
System/Treasure/FairyTreasureCollectPanelPattern5.cs | 25 +++++--------------------
1 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/System/Treasure/FairyTreasureCollectPanelPattern5.cs b/System/Treasure/FairyTreasureCollectPanelPattern5.cs
index f018d70..4f05f94 100644
--- a/System/Treasure/FairyTreasureCollectPanelPattern5.cs
+++ b/System/Treasure/FairyTreasureCollectPanelPattern5.cs
@@ -78,8 +78,6 @@
DisplayFurnace();
DisplayFunc();
achievementModel.achievementCompletedEvent += AchievementCompletedEvent;
- model.treasureStateChangeEvent -= OnTreasureStateChange;
- model.treasureStateChangeEvent += OnTreasureStateChange;
completedAchivement = 0;
@@ -110,23 +108,10 @@
achievementModel.GotoCompleteAchievement(currentAchievement.id);
}
- protected override void OnTreasureStateChange(int _id)
- {
- if (_id != treasureId)
- {
- return;
- }
- if (model.newGotTreasureId == treasureId)
- {
- model.newGotTreasureId = 0;
- }
- }
-
public override void Dispose()
{
m_GotoGet.onClick.RemoveAllListeners();
achievementModel.achievementCompletedEvent -= AchievementCompletedEvent;
- model.treasureStateChangeEvent -= OnTreasureStateChange;
for (int i = 0; i < m_FurnacesAchievements.Length; i++)
{
m_FurnacesAchievements[i].Dispose();
@@ -261,10 +246,6 @@
IEnumerator Co_Fly()
{
yield return WaitingForSecondConst.WaitMS300;
- if (model.newGotTreasureId == treasureId)
- {
- model.newGotTreasureId = 0;
- }
model.treasureStepUpShow = false;
BeginFly();
}
@@ -347,7 +328,11 @@
private void DisplayFunc()
{
m_FuncTitle.text = treasure.state == TreasureState.Collected ? Language.Get("FairyTreasureOpenFunc") : Language.Get("FairyTreasureUnOpenFunc");
- var config = ConfigManager.Instance.GetTemplate<FuncOpenLVConfig>(treasure.unLockFunc);
+ var funcStage = treasure.treasureStages.Find((x) =>
+ {
+ return x.unlockType == TreasureStageUnlock.Func;
+ });
+ var config = ConfigManager.Instance.GetTemplate<FuncOpenLVConfig>(funcStage.func);
if (config != null)
{
m_FuncIcon.SetSprite(config.Icon);
--
Gitblit v1.8.0