snxxz_scripts.git

			@@ -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;
			}

			}