From bc49768eaf9757e20bd264dc6183b2497780ee08 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 18 九月 2018 14:18:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Treasure/TreasureSoulBehaviour.cs | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/System/Treasure/TreasureSoulBehaviour.cs b/System/Treasure/TreasureSoulBehaviour.cs
index a4ac8e6..b1f0726 100644
--- a/System/Treasure/TreasureSoulBehaviour.cs
+++ b/System/Treasure/TreasureSoulBehaviour.cs
@@ -38,27 +38,27 @@
{
model.treasureSelectSoulChangeEvent += TreasureSelectSoulChangeEvent;
model.treasureSoulEvent += TreasureSoulEvent;
- achievementModel.achievementCompletedEvent += AchievementCompletedEvent;
+ //achievementModel.achievementCompletedEvent += AchievementCompletedEvent;
}
private void OnDisable()
{
model.treasureSelectSoulChangeEvent -= TreasureSelectSoulChangeEvent;
model.treasureSoulEvent -= TreasureSoulEvent;
- achievementModel.achievementCompletedEvent -= AchievementCompletedEvent;
+ //achievementModel.achievementCompletedEvent -= AchievementCompletedEvent;
}
- private void AchievementCompletedEvent(int _id)
- {
- int achievementId = 0;
- if (model.TryGetLockAchievement(treasureSoulId, out achievementId))
- {
- if (achievementId == _id)
- {
- DisplayState();
- }
- }
- }
+ //private void AchievementCompletedEvent(int _id)
+ //{
+ // int achievementId = 0;
+ // if (model.TryGetLockAchievement(treasureSoulId, out achievementId))
+ // {
+ // if (achievementId == _id)
+ // {
+ // DisplayState();
+ // }
+ // }
+ //}
public void Display(int _id)
{
@@ -88,25 +88,27 @@
}
else
{
- int achievementId = 0;
- bool unlock = true;
- if (model.TryGetLockAchievement(treasureSoulId, out achievementId))
- {
- Achievement achievement;
- if (achievementModel.TryGetAchievement(achievementId, out achievement))
- {
- unlock = achievement.completed;
- }
- }
- if (unlock)
- {
- m_SoulState.text = Language.Get("TreasureSoul_Awaking");
- }
- else
- {
- var successConfig = Config.Instance.Get<SuccessConfig>(achievementId);
- m_SoulState.text = Language.Get("TreasureSoulRealm", successConfig.NeedCnt);
- }
+ m_SoulState.text = Language.Get("TreasureSoul_Awaking");
+
+ //int achievementId = 0;
+ //bool unlock = true;
+ //if (model.TryGetLockAchievement(treasureSoulId, out achievementId))
+ //{
+ // Achievement achievement;
+ // if (achievementModel.TryGetAchievement(achievementId, out achievement))
+ // {
+ // unlock = achievement.completed;
+ // }
+ //}
+ //if (unlock)
+ //{
+ // m_SoulState.text = Language.Get("TreasureSoul_Awaking");
+ //}
+ //else
+ //{
+ // var successConfig = Config.Instance.Get<SuccessConfig>(achievementId);
+ // m_SoulState.text = Language.Get("TreasureSoulRealm", successConfig.NeedCnt);
+ //}
}
}
}
--
Gitblit v1.8.0