From 807bdcbed7f5b1dd5473357fc8ce737eb90895c3 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 13 六月 2019 15:37:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index c8d5ddf..25a84d9 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -23,7 +23,6 @@
[SerializeField] TaskListTip m_TaskListTip;//浠诲姟
[SerializeField] TopRightTip m_TopRightTip;
[SerializeField] FunctionForecastTip m_FunctionForecastTip;//鍔熻兘棰勫憡
- [SerializeField] IsShowXpButton m_IsShowXp;//XP 鎶�鑳藉父鏄�
[SerializeField] FairyLeagueRemindBehaviour m_FairyLeagueRemind;
[SerializeField] TeamInvitationEntrance m_TeamInvitationEntrance;
[SerializeField] MapSwitchingBehaviour m_MapSwitchingBehaviour;
@@ -98,7 +97,6 @@
m_HighSettingFadeInFadeOut.Init();
m_MainPositionTween.Init();
m_TaskListTip.Init();
- m_IsShowXp.Init();
m_TopRightTip.Init();
m_TeamInvitationEntrance.Init();
m_MapSwitchingBehaviour.Init();
@@ -181,7 +179,6 @@
protected override void OnPreClose()
{
- m_IsShowXp.Unit();
m_InGamePusher.UnInit();
m_SkillContainer.UnInit();
m_HeadPortraitTip.UnInit();
@@ -486,7 +483,7 @@
else
{
var _effect = AchievementGuideEffectPool.Require(3);
- _effect.transform.SetParentEx(m_IsShowXp.transform, Vector3.zero, Vector3.zero, Vector3.one);
+ _effect.transform.SetParentEx(m_SkillContainer.skillXP.transform, Vector3.zero, Vector3.zero, Vector3.one);
}
AchievementGoto.achievementType = 0;
}
--
Gitblit v1.8.0