From 81acf0e7c867174e680a9596497c2884a429ebe0 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 24 八月 2018 10:53:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/PreFightMission.cs | 9 +++++++++
System/Skill/SkillPassWin.cs | 2 +-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/Fight/PreFightMission.cs b/Fight/PreFightMission.cs
index 1db61e7..b81a26a 100644
--- a/Fight/PreFightMission.cs
+++ b/Fight/PreFightMission.cs
@@ -197,6 +197,9 @@
_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/CopyOfThePanel/HighSettingTip/Container_Treasure");
_temp.gameObject.SetActive(false);
+ _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/InGameDownLoadProgress");
+ _temp.localScale = Vector3.zero;
+
_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/SwitchPan_a");
_temp.localScale = Vector3.zero;
_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/Btn_SkillXp");
@@ -1435,6 +1438,9 @@
_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/CopyOfThePanel/HighSettingTip/Container_Treasure");
_temp.gameObject.SetActive(true);
+
+ _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/InGameDownLoadProgress");
+ _temp.localScale = Vector3.one;
_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/SwitchPan_a");
_temp.localScale = Vector3.one;
@@ -1595,6 +1601,9 @@
_temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("CopyOfThePanel/HighSettingTip/Container_Treasure");
_temp.gameObject.SetActive(true);
+ _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/InGameDownLoadProgress");
+ _temp.localScale = Vector3.one;
+
_temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("SkillButtonTip/Pivot/CastSkillTip/SwitchPan_a");
_temp.localScale = Vector3.one;
_temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("SkillButtonTip/Pivot/CastSkillTip/Btn_SkillXp");
diff --git a/System/Skill/SkillPassWin.cs b/System/Skill/SkillPassWin.cs
index f7b3037..b107f90 100644
--- a/System/Skill/SkillPassWin.cs
+++ b/System/Skill/SkillPassWin.cs
@@ -124,7 +124,6 @@
UpdateEquipPassSkill();
SetEquipHoleSelect(GetEquipHoleIndex(model.presentSltSkillID));
DayRemind.Instance.SetDayRemind(DayRemind.PASS_SKILL_REDPOINT, true);
- model.taskUnlockUpdate += TaskUnlockUpdate;
if (cacheCoroutine != null)
{
@@ -142,6 +141,7 @@
protected override void OnAfterOpen()
{
DisplayEffect();
+ model.taskUnlockUpdate += TaskUnlockUpdate;
}
protected override void OnPreClose()
--
Gitblit v1.8.0