From 7bfaf6ee7ead545cfb7c885da84680f405b75109 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 22 八月 2018 13:57:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Treasure/FairyTreasureCollectPanelPattern5.cs | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/System/Treasure/FairyTreasureCollectPanelPattern5.cs b/System/Treasure/FairyTreasureCollectPanelPattern5.cs
index 6da991c..9a5de96 100644
--- a/System/Treasure/FairyTreasureCollectPanelPattern5.cs
+++ b/System/Treasure/FairyTreasureCollectPanelPattern5.cs
@@ -13,6 +13,7 @@
[SerializeField] ScrollRect m_AchievementScroller;
[SerializeField] FurnacesAchievement[] m_FurnacesAchievements;
[SerializeField] Button m_AchievementGetBtn;
+ [SerializeField] Button m_ActiveBtn;
[SerializeField] RectTransform m_ContainerHoles;
[SerializeField] Image[] m_FurnacesIcons;
[SerializeField] RectTransform m_ContainerFunc;
@@ -56,10 +57,12 @@
{
m_AchievementGetBtn.onClick.AddListener(OnAchievementGet);
m_GotoStove.onClick.AddListener(GotoStove);
+ m_ActiveBtn.onClick.AddListener(Active);
}
public override void Display(int _treasureId, bool _tween = false)
{
+ base.Display(_treasureId);
m_GotoGet.onClick.RemoveAllListeners();
m_GotoGet.onClick.AddListener(GotoGet);
@@ -77,7 +80,11 @@
DisplayFurnacesHole();
DisplayFurnace();
DisplayFunc();
+
+ achievementModel.achievementCompletedEvent -= AchievementCompletedEvent;
achievementModel.achievementCompletedEvent += AchievementCompletedEvent;
+ model.treasureStageUpEvent -= TreasureStageUpEvent;
+ model.treasureStageUpEvent += TreasureStageUpEvent;
completedAchivement = 0;
@@ -112,9 +119,18 @@
{
m_GotoGet.onClick.RemoveAllListeners();
achievementModel.achievementCompletedEvent -= AchievementCompletedEvent;
+ model.treasureStageUpEvent -= TreasureStageUpEvent;
for (int i = 0; i < m_FurnacesAchievements.Length; i++)
{
m_FurnacesAchievements[i].Dispose();
+ }
+ }
+
+ private void TreasureStageUpEvent(int _id)
+ {
+ if (_id == treasureId && model.serverInited)
+ {
+ TreasureActiveEffect();
}
}
@@ -190,10 +206,10 @@
{
_effect.OnComplete = null;
m_FurnacesIcons[_index].gameObject.SetActive(true);
- if (_index == m_FurnacesIcons.Length - 1)
- {
- TreasureActiveEffect();
- }
+ //if (_index == m_FurnacesIcons.Length - 1)
+ //{
+ // TreasureActiveEffect();
+ //}
};
}
continue;
@@ -281,6 +297,7 @@
var unlockTreasureConfig = Config.Instance.Get<TreasureConfig>(unlocktreasureId);
m_AchievementGetBtn.gameObject.SetActive(false);
+ m_ActiveBtn.gameObject.SetActive(false);
m_GotoGet.gameObject.SetActive(false);
m_ContainerLocked.gameObject.SetActive(true);
m_LockedDescription.text = Language.Get("BlastFurnaceGet", unlockTreasureConfig == null ? string.Empty : unlockTreasureConfig.Name);
@@ -291,10 +308,12 @@
m_AchievementGetBtn.gameObject.SetActive(false);
m_GotoGet.gameObject.SetActive(false);
m_ContainerLocked.gameObject.SetActive(false);
+ m_ActiveBtn.gameObject.SetActive(currentAchievement == null && treasure.stage == 0);
}
else
{
m_ContainerLocked.gameObject.SetActive(false);
+ m_ActiveBtn.gameObject.SetActive(false);
var _isReach = Achievement.IsReach(currentAchievement.id, currentAchievement.progress);
m_AchievementGetBtn.gameObject.SetActive(_isReach);
var _list = model.GetFurnacesAchievements();
@@ -413,6 +432,13 @@
WindowCenter.Instance.Open<BlastFurnaceWin>();
}
+ private void Active()
+ {
+ CA515_tagCMMagicWeaponUp _pak = new CA515_tagCMMagicWeaponUp();
+ _pak.MWID = (uint)treasureId;
+ GameNetSystem.Instance.SendInfo(_pak);
+ }
+
private void GetCurrentAchievement()
{
--
Gitblit v1.8.0