From eed44c4e855611e2ca9bcb94c040b4eaa6266939 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 04 九月 2018 17:32:46 +0800
Subject: [PATCH] 3240 前端 主界面任务显示和自动选中逻辑修改
---
System/MainInterfacePanel/MainInterfaceWin.cs | 221 ++++++++++++++++++++++++++----------------------------
1 files changed, 107 insertions(+), 114 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 8bcf8b8..58a0678 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -97,14 +97,14 @@
[SerializeField] ClickScreenOtherSpace _MarkRay;//渚挎嵎鍒囨崲鎸夐挳
[SerializeField] TeamInvitationEntrance m_TeamInvitationEntrance;
+
+ [SerializeField] FairyCallMemberBehaviour m_FairyCallBehaviour;
#region
- private float switcherTime = 0;//涓荤晫闈㈣嚜鍔ㄥ垏鎹㈡椂闂�
private int mapId = 0;
public delegate void OnChatCallback();//鑱婂ぉ鍥炶皟
public static event OnChatCallback Event_ChatCallback;
public delegate void OnDuplicates(bool _bool, float _speed);
public static event OnDuplicates Event_Duplicates;
- public static event Action<bool> SitEvent;//鍏充簬鎵撳潗鐨勫洖璋�
#endregion
private List<int> ListBossMapId = new List<int>();//鐢ㄤ簬boss鍖哄煙鍦板浘id
@@ -135,14 +135,13 @@
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
#region Built-in
protected override void BindController()
{
- switcherTime = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("AutomaticSwitch").Numerical1);
recordPositionBool = true;
m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;
- // m_LowSettingTipGroup.localPosition = m_position2_L.localPosition;
m_CastSkillTip.localPosition = m_position1_S.localPosition;
m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);
m_MailObj.SetActive(true);
@@ -152,7 +151,7 @@
LeftImage.SetActive(true);
RightImg.SetActive(false);
ListBossMapId.Clear();
- string strBoss = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TaskRetract").Numerical1;
+ string strBoss = Config.Instance.Get<FuncConfigConfig>("TaskRetract").Numerical1;
string[] bossList = ConfigParse.GetMultipleStr(strBoss);//瑙ｆ瀽鍑烘暟缁剕
for (int i = 0; i < bossList.Length; i++)
{
@@ -196,6 +195,7 @@
m_SkillButtonEffects.Init();
m_AnimationFadeOut.Init();
m_TeamInvitationEntrance.Init();
+ m_FairyCallBehaviour.Init();
m_BossBriefInfos.gameObject.SetActive(false);
ArticleExperience();//鍏充簬缁忛獙鏉�
@@ -206,7 +206,6 @@
CheckChatTipOpen();
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;
FunctionUnlockFlyObject.functionUnLockShowBeginEvent += UnFlodFunctionArea;
- CoroutineMgr.Instance.MaininterCDTimeEvent += OnMaininterCDTime;
fairyModel.UpdateFairyRequestEvent += UpdateFairyRequest;
GA_Hero.OnEnterOrExitArea += OnEnterOrExitArea;
NewBieCenter.Instance.guideBeginEvent += OnGuideBegin;
@@ -222,7 +221,7 @@
PlayerTaskDatas.CompletionOfTaskEvent += CompletionOfTaskEvent;
RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;
NewBieCenter.Instance.guideBeginEvent += GuideBeginEvent;
-
+ fairyGrabBossModel.bossGrabHintEvent += bossGrabHintEvent;
}
private void CompletionOfTaskEvent(int obj)
@@ -234,6 +233,7 @@
protected override void OnActived()
{
m_HighSettingTip.OnActived();
+ IsShowTaskPanel();//鏄惁鏄剧ず浠诲姟闈㈡澘
}
IEnumerator Co_Load()
@@ -244,7 +244,6 @@
protected override void OnAfterOpen()
{
- bool IsSitBool = PlayerDatas.Instance.hero != null && MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Dazuo);//鏄惁鍦ㄦ墦鍧愬尯鍩�
bool IsBossBool = PlayerDatas.Instance.hero != null && MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
if (onMainModel.IsDead || (onMainModel.IsBossAreaTask && !IsBossBool))
{
@@ -263,13 +262,11 @@
var inDungeon = IsDungeon();
if (inDungeon)
{
- m_TaskAndTeamTip.SetActive(!inDungeon);
m_FunctionForecastTip.gameObject.SetActive(false);
if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())
{
WindowCenter.Instance.Close<FunctionForecastWin>();
}
- m_TaskSwithButton.gameObject.SetActive(false);
if (mapId != PlayerDatas.Instance.baseData.MapID)
{
CopyOfThePanel.localPosition = CopyOfThePosition2.localPosition;
@@ -292,13 +289,22 @@
}
}
else
- {
+ {
var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
if (isNeutralMap)
{
m_BossBriefInfos.gameObject.SetActive(true);
- m_BossBriefInfos.Display(ModelCenter.Instance.GetModel<WorldBossModel>().GetWorldBosses(PlayerDatas.Instance.baseData.MapID));
+ if (PlayerDatas.Instance.baseData.MapID==DogzDungeonModel.DATA_MAPID)
+ {
+ var bosses = ModelCenter.Instance.GetModel<DogzDungeonModel>().GetBosses();
+ m_BossBriefInfos.Display(bosses);
+ }
+ else
+ {
+ var bosses = ModelCenter.Instance.GetModel<WorldBossModel>().GetWorldBosses(PlayerDatas.Instance.baseData.MapID);
+ m_BossBriefInfos.Display(bosses);
+ }
}
else
{
@@ -317,7 +323,7 @@
}
else
{
- if (!IsSitBool && !IsBossBool)
+ if (!IsBossBool)
{
CopyOfThePanel.localPosition = CopyOfThePosition1.localPosition;
CopyOfThePositionBool = true;
@@ -330,15 +336,13 @@
{
Event_Duplicates(true, CopyOfThePanelSpeed);
}
-
- m_TaskAndTeamTip.SetActive(true);
m_FunctionForecastTip.gameObject.SetActive(true);
- m_TaskSwithButton.gameObject.SetActive(true);
}
mapId = PlayerDatas.Instance.baseData.MapID;
m_HighSettingTip.AfterOpen();
m_ChatTip.OnAfterOpen();
HandleAchievement();
+
}
protected override void OnPreClose()
@@ -356,10 +360,10 @@
m_FunctionForecastTip.Unit();
m_AnimationFadeOut.Unit();
m_TeamInvitationEntrance.UnInit();
+ m_FairyCallBehaviour.UnInit();
horseRidBool = false;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;
FunctionUnlockFlyObject.functionUnLockShowBeginEvent -= UnFlodFunctionArea;
- CoroutineMgr.Instance.MaininterCDTimeEvent -= OnMaininterCDTime;
fairyModel.UpdateFairyRequestEvent -= UpdateFairyRequest;
GA_Hero.OnEnterOrExitArea -= OnEnterOrExitArea;
NewBieCenter.Instance.guideBeginEvent -= OnGuideBegin;
@@ -379,12 +383,15 @@
m_CollectBtn.RemoveAllListeners();
GA_NpcCollect.OnArrive -= OnArriveCollectNPC;
GA_NpcCollect.OnLeave -= OnLeaveCollectNpc;
+ fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent;
m_CollectBtn.gameObject.SetActive(false);
}
private void GuideBeginEvent()
{
- if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 89)
+ if (NewBieCenter.Instance.inGuiding
+ && (NewBieCenter.Instance.currentGuide == 89
+ || NewBieCenter.Instance.currentGuide == TrialDungeonModel.TRIALEXCHANGE_GUIDE))
{
UnFlodFunctionArea(true, 0);
}
@@ -453,7 +460,7 @@
private void OnEnterOrExitArea(MapArea.E_Type _areaType, bool _enter)
{
- // DesignDebug.LogError(_areaType + ".." + _enter);
+ // DesignDebug.LogError(_areaType + ".." + _enter);
if (PlayerDatas.Instance.baseData.MapID == 10040 && _areaType != MapArea.E_Type.Boss && _enter)
{
if (Buffmodel.PkType != onMainModel.AreaState)
@@ -462,12 +469,16 @@
}
}
- if (_areaType == MapArea.E_Type.Neutral && _enter)
+ if ((_areaType == MapArea.E_Type.Neutral || _areaType == MapArea.E_Type.Boss) && _enter)
{
WindowCenter.Instance.Open<NeutralMarkWin>();
int mapID = PlayerDatas.Instance.baseData.MapID;
- var config = ConfigManager.Instance.GetTemplate<MapConfig>(mapID);
+ var config = Config.Instance.Get<MapConfig>(mapID);
int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();
+ if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID) || fairyGrabBossModel.grabBossHintOpen)
+ {
+ return;
+ }
if (atkInt.Length > 1 && Buffmodel.PkType != 5)
{
onMainModel.AreaState = Buffmodel.PkType;
@@ -484,16 +495,12 @@
}
}
- if ((_areaType == MapArea.E_Type.Boss && _enter) || (_areaType == MapArea.E_Type.Dazuo && _enter))
+ if (_areaType == MapArea.E_Type.Boss && _enter)
{
if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) < 2 && ListBossMapId.Contains(PlayerDatas.Instance.baseData.MapID))
{
TaskSwithButton();
onMainModel.IsBossAreaTask = true;
- }
- if (_areaType == MapArea.E_Type.Dazuo && _enter && SitEvent != null)
- {
- SitEvent(true);
}
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) < 5)
{
@@ -516,7 +523,7 @@
var inDungeon = IsDungeon();
var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
- if ((_areaType == MapArea.E_Type.Boss && !_enter) || (_areaType == MapArea.E_Type.Dazuo && !_enter))
+ if (_areaType == MapArea.E_Type.Boss && !_enter)
{
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon && !isNeutralMap)
{
@@ -527,11 +534,6 @@
}
m_ContainerBossList.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
m_BossBriefInfos.Unfold(false);
-
- if (SitEvent != null)
- {
- SitEvent(false);
- }
}
}
}
@@ -614,7 +616,7 @@
RedEnvelopeModel.RedEnvelope _envelope;
if (envelopeModel.TryGetLatestEnvelope(out _envelope))
{
- if (OSEnvelopeModel.m_OpenServerGetRedpin.state == RedPointState.Simple)
+ if (OSEnvelopeModel.m_OpenServerGetRedpin.state == RedPointState.GetReward)
{
WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = 2;
@@ -662,47 +664,35 @@
var inDungeon = IsDungeon();
bool IsBossBool = PlayerDatas.Instance.hero == null ? false : MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
- bool IsSitBool = PlayerDatas.Instance.hero == null ? false : MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Dazuo);//鏄惁鍦ㄦ墦鍧愬尯鍩�
var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
if (!recordPositionBool)
{
- if (inDungeon || IsBossBool || IsSitBool || isNeutralMap)
+ if (inDungeon || IsBossBool || isNeutralMap)
{
- if (IsSitBool && SitEvent != null)
- {
- SitEvent(true);
- }
- CopyOfThePanel.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
if (IsCopyOfThePanel != null)
{
IsCopyOfThePanel(false);
}
- m_ContainerBossList.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
- m_BossBriefInfos.Unfold(false);
-
if (Event_Duplicates != null && inDungeon)
{
Event_Duplicates(false, CopyOfThePanelSpeed);
}
-
+ CopyOfThePanel.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
+ m_ContainerBossList.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
+ m_BossBriefInfos.Unfold(false);
}
- if (!IsBossBool && !IsSitBool)
+ if (!IsBossBool)
{
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon)
{
- CopyOfThePanel.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
if (IsCopyOfThePanel != null)
{
IsCopyOfThePanel(true);
}
+ CopyOfThePanel.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
m_ContainerBossList.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
m_BossBriefInfos.Unfold(false);
-
- if (SitEvent != null)
- {
- SitEvent(false);
- }
}
}
m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
@@ -761,17 +751,12 @@
{
var inDungeon = IsDungeon();
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);
- bool IsSitBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Dazuo);
var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
if (recordPositionBool)//鏄剧ず鍔熻兘鍏ュ彛
{
- if (inDungeon || IsBossBool || IsSitBool || isNeutralMap)
+ if (inDungeon || IsBossBool || isNeutralMap)
{
- if (IsSitBool && SitEvent != null)
- {
- SitEvent(false);
- }
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
if (IsCopyOfThePanel != null)
{
@@ -785,7 +770,7 @@
Event_Duplicates(true, CopyOfThePanelSpeed);
}
}
- if (!IsBossBool && !IsSitBool)
+ if (!IsBossBool)
{
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon)
{
@@ -796,11 +781,6 @@
}
m_ContainerBossList.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
m_BossBriefInfos.Unfold(false);
-
- if (SitEvent != null)
- {
- SitEvent(false);
- }
}
}
m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);
@@ -812,12 +792,8 @@
}
else//鏄剧ず榛樿
{
- if (inDungeon || IsBossBool || IsSitBool || isNeutralMap)
+ if (inDungeon || IsBossBool || isNeutralMap)
{
- if (IsSitBool && SitEvent != null)
- {
- SitEvent(true);
- }
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
if (IsCopyOfThePanel != null)
{
@@ -831,7 +807,7 @@
Event_Duplicates(false, CopyOfThePanelSpeed);
}
}
- if (!IsBossBool && !IsSitBool)
+ if (!IsBossBool)
{
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon)
{
@@ -842,11 +818,6 @@
}
m_ContainerBossList.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
m_BossBriefInfos.Unfold(false);
-
- if (SitEvent != null)
- {
- SitEvent(false);
- }
}
}
m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
@@ -859,10 +830,21 @@
recordPositionBool = !recordPositionBool;
}
+ // 鍓嶆湡鎴樻枟鐢ㄥ己鍒惰缃换鍔′綅缃�昏緫
+ public void ForceShowTaskPanel()
+ {
+ if (onMainModel.IsBossAreaTask)
+ {
+ onMainModel.IsBossAreaTask = false;
+ }
+ m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;
+ TaskSwithBool = !TaskSwithBool;
+ }
+
void ArticleExperience()//鍏充簬缁忛獙鏉�
{
int NowLv = (int)PlayerDatas.Instance.baseData.LV;
- if (ConfigManager.Instance.GetTemplate<PlayerLVConfig>(NowLv) != null)
+ if (Config.Instance.Get<PlayerLVConfig>(NowLv) != null)
{
ulong maxValue = (ulong)PlayerLVConfig.GetExpByPlayerLv(NowLv);
ulong nowVlaue = (ulong)PlayerDatas.Instance.baseData.TotalExp + (ulong)PlayerDatas.Instance.baseData.ExpPoint * 100000000;
@@ -943,7 +925,7 @@
private bool IsDungeon()
{
var mapId = PlayerDatas.Instance.baseData.MapID;
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);
+ var mapConfig = Config.Instance.Get<MapConfig>(mapId);
return mapConfig != null && mapConfig.MapFBType != 0;
}
@@ -951,22 +933,16 @@
{
if (_unflod)
{
- if (Vector3.Distance(m_CastSkillTip.localPosition, m_position1_S.localPosition) <= 1)
+ if (Vector3.Distance(m_CastSkillTip.localPosition, m_position1_S.localPosition) <= 1)//鎶�鑳介潰鏉垮睍寮�鐘舵��
{
- m_AnimationFadeOut.ImmediatelyAppear();
- m_CastSkillTip.localPosition = m_position2_S.localPosition;
- m_MailObj.SetActive(false);
- m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);
- recordPositionBool = false;
- _MarkRay.gameObject.SetActive(true);
+ ShowBtnGroup();//鏄剧ず鎸夐挳缁勯殣钘忔妧鑳界粍(寮哄埗鍒囨崲)
}
-
- if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) > 5)
+ if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) > 5)//浠诲姟闈㈡澘
{
TaskSwithButton();
onMainModel.IsBossAreaTask = false;
}
- if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2)
+ if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2)//涓婂眰闈㈡澘
{
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
m_ContainerBossList.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
@@ -980,19 +956,11 @@
}
else
{
- if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)
+ if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//鎶�鑳介潰鏉挎敹璧风姸鎬�
{
- m_AnimationFadeOut.FadeAtOnce();
- m_CastSkillTip.localPosition = m_position1_S.localPosition;
- m_MailObj.SetActive(true);
- m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);
- m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
- recordPositionBool = true;
- _MarkRay.gameObject.SetActive(false);
+ ShowCastSkill();//鏄剧ず鎶�鑳界粍,闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
}
m_HighSettingTip.ShowButtonNow();
- // m_HighSettingTip.ColseButtonNow();
-
if (_skillGroup != 0)
{
m_SkillContainer.skillTurnplate.SwitchGroup(_skillGroup);
@@ -1004,17 +972,11 @@
{
if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
{
- if (m_AnimationFadeOut.GetIsFadeIn())
+ if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//鎶�鑳介潰鏉挎敹璧风姸鎬�
{
- m_AnimationFadeOut.FadeAtOnce();
- m_CastSkillTip.localPosition = m_position1_S.localPosition;
- m_MailObj.SetActive(true);
- m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);
- m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
- recordPositionBool = true;
- _MarkRay.gameObject.SetActive(false);
+ ShowCastSkill();//鏄剧ず鎶�鑳界粍闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
}
- var _cfg = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);
+ var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
var _skillId = ModelCenter.Instance.GetModel<AchievementModel>().FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);
if (_skillId != 0)
{
@@ -1060,19 +1022,50 @@
public void IsShowButtonGroup()
{
- if (Vector3.Distance(m_CastSkillTip.localPosition, m_position1_S.localPosition) <= 1)
+ if (Vector3.Distance(m_CastSkillTip.localPosition, m_position1_S.localPosition) <= 1)//鎶�鑳介潰鏉垮睍绀�
{
- m_AnimationFadeOut.ImmediatelyAppear();
- m_CastSkillTip.localPosition = m_position2_S.localPosition;
- m_MailObj.SetActive(false);
- m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);
- recordPositionBool = false;
- _MarkRay.gameObject.SetActive(true);
+ ShowBtnGroup();//鏄剧ず鎸夐挳缁勯殣钘忔妧鑳界粍(寮哄埗鍒囨崲)
}
-
-
}
+ private void ShowBtnGroup()//鏄剧ず鎸夐挳缁�,闅愯棌鎶�鑳界粍(寮哄埗鍒囨崲)
+ {
+ m_AnimationFadeOut.ImmediatelyAppear();//鎸夐挳缁勭珛鍗冲嚭鐜�
+ m_CastSkillTip.localPosition = m_position2_S.localPosition;//鎶�鑳介潰鏉垮垏鍑�
+ m_MailObj.SetActive(false);
+ m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);
+ recordPositionBool = false;
+ _MarkRay.gameObject.SetActive(true);
+ }
+ private void ShowCastSkill()//鏄剧ず鎶�鑳界粍,闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
+ {
+ m_AnimationFadeOut.FadeAtOnce();//鍔熻兘闈㈡澘绔嬪埢闅愯棌
+ m_CastSkillTip.localPosition = m_position1_S.localPosition;//鎶�鑳介潰鏉跨珛鍗冲嚭鐜�
+ m_MailObj.SetActive(true);
+ m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);
+ m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
+ recordPositionBool = true;
+ _MarkRay.gameObject.SetActive(false);
+ }
+
+ private void IsShowTaskPanel()//鏄惁鏄剧ず浠诲姟闈㈡澘
+ {
+ var inDungeon = IsDungeon();
+ if (inDungeon || fairyGrabBossModel.grabBossHintOpen)
+ {
+ m_TaskAndTeamTip.SetActive(false);
+ m_TaskSwithButton.gameObject.SetActive(false);
+ }
+ else
+ {
+ m_TaskAndTeamTip.SetActive(true);
+ m_TaskSwithButton.gameObject.SetActive(true);
+ }
+ }
+ private void bossGrabHintEvent()
+ {
+ IsShowTaskPanel();
+ }
}
}
--
Gitblit v1.8.0