From 6df700a2564d7e53e5c90e49e61d3ed747f03b07 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 13 六月 2019 15:15:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainPositionTween.cs | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/System/MainInterfacePanel/MainPositionTween.cs b/System/MainInterfacePanel/MainPositionTween.cs
index 42fb285..a1e706b 100644
--- a/System/MainInterfacePanel/MainPositionTween.cs
+++ b/System/MainInterfacePanel/MainPositionTween.cs
@@ -135,7 +135,7 @@
static float resetToDefaultTimer = 0;
public static void SetRecoverToSkillTimer()
{
- resetToDefaultTimer = 20f;
+ resetToDefaultTimer = 5f;
}
public void SwitchFunctions(SwitchParam switchParams)
@@ -151,14 +151,9 @@
{
var mapId = PlayerDatas.Instance.baseData.MapID;
var isDungeon = MapUtility.IsDungeon(mapId);
- var isNeutralMap = false;
+ var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(mapId);
var isBossArea = PlayerDatas.Instance.hero != null && MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);
var isGuiding = NewBieCenter.Instance.inGuiding;
-
- if (GeneralDefine.neutralBossMaps.Contains(mapId))
- {
- isNeutralMap = true;
- }
m_ContainerBossList.gameObject.SetActive(isNeutralMap);
@@ -201,10 +196,19 @@
break;
}
- var rightBottomState = resetToDefaultTimer <= 0f
- && switchParams.showDefault
- && !isGuiding
- && !treasureModel.newGotShowing ? RightBottomState.Skill : RightBottomState.Function;
+ var rightBottomState = RightBottomState.Skill;
+ switch (switchParams.bottomState)
+ {
+ case RightBottomState.None:
+ rightBottomState = resetToDefaultTimer <= 0f
+ && switchParams.showDefault
+ && !isGuiding
+ && !treasureModel.newGotShowing ? RightBottomState.Skill : RightBottomState.Function;
+ break;
+ default:
+ rightBottomState = switchParams.bottomState;
+ break;
+ }
switch (rightBottomState)
{
@@ -235,7 +239,7 @@
}
isDefaultState = rightBottomState == RightBottomState.Skill;
- resetToDefaultTimer = !isDefaultState ? 20f : 0f;
+ resetToDefaultTimer = !isDefaultState ? 5f : 0f;
m_RayMask.gameObject.SetActive(!isDefaultState);
if (switchParams.immediately)
@@ -281,6 +285,7 @@
public enum RightBottomState
{
+ None,
Function,
Skill,
}
@@ -297,6 +302,7 @@
public bool showDefault;
public bool immediately;
public bool manual;
+ public RightBottomState bottomState;
}
}
--
Gitblit v1.8.0