mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

disable circle cursor when not using touch style

Browse source
This commit is contained in:
minenice55 2023-12-24 23:52:59 -05:00
parent 647b773ad4
commit 442e1addad
4 changed files with 167 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
Assets/Scenes/Title.unity
View file

@ -1591,7 +1591,7 @@ RectTransform:
- {fileID: 1592423196}
- {fileID: 1923523151}
m_Father: {fileID: 1012016923}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -4129,6 +4129,7 @@ RectTransform:
m_Children:
- {fileID: 720687239}
- {fileID: 177207010}
- {fileID: 1959183876}
- {fileID: 429465179}
m_Father: {fileID: 1925566737}
m_RootOrder: 0
@ -7278,6 +7279,7 @@ MonoBehaviour:
chartTitleText: {fileID: 2077947577}
chartMapperText: {fileID: 128923927}
chartDescText: {fileID: 177207008}
chartStyleText: {fileID: 1959183877}
mainSelectables:
- {fileID: 2079077664}
- {fileID: 1336149019}
@ -8313,6 +8315,143 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1959183875
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1959183876}
- component: {fileID: 1959183878}
- component: {fileID: 1959183877}
m_Layer: 0
m_Name: StyleInfo
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1959183876
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1959183875}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1012016923}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 60}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1959183877
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1959183875}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Recommended Control Style: Pad'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: e5f3069ff426f2546b8168857ad6e0d4, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 4638a9d0993647b47b1ee898eec7aea3, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 18
m_fontSizeBase: 18
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1959183878
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1959183875}
m_CullTransparentMesh: 1
--- !u!1 &1978756628
GameObject:
m_ObjectHideFlags: 0

13
Assets/Scripts/CircleCursor.cs
View file

@ -61,7 +61,7 @@ namespace HeavenStudio
private void Close()
{
DSGuyAnimator.Play("Close", -1);
Circle.SetActive(true);
Circle.SetActive(true && PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch);
isOpen = false;
}
@ -70,7 +70,7 @@ namespace HeavenStudio
flickStart = startPos;
vel = newVel;
DSGuyAnimator.Play("Flick", -1);
Circle.SetActive(true);
Circle.SetActive(true && PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch);
isOpen = false;
}
@ -86,6 +86,10 @@ namespace HeavenStudio
}
else
{
DSGuy.SetActive(PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch);
Circle.SetActive(PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch);
if (PlayerInput.CurrentControlStyle != InputSystem.InputController.ControlStyles.Touch) return;
bool lrState = PlayerInput.GetInputController(1).GetPointerLeftRight();
if (splitTouchSnapEffect != null && PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch && (GameManager.instance?.GameHasSplitColours ?? false))
{
@ -111,7 +115,7 @@ namespace HeavenStudio
}
else if (splitTouchSnapEffect != null && splitTouchSnapEffect.emitting)
{
ClearTrail();
ClearTrail(false);
}
gameObject.transform.position = pos;
@ -160,13 +164,14 @@ namespace HeavenStudio
ClearTrail();
}
public void ClearTrail()
public void ClearTrail(bool emm = false)
{
trailEnableTime = 0;
if (splitTouchSnapEffect != null)
{
splitTouchSnapEffect.Clear();
}
splitTouchSnapEffect.emitting = emm;
}
public void SetCursorColors(Color main, Color left, Color right)

1
Assets/Scripts/GameManager.cs
View file

@ -1203,6 +1203,7 @@ namespace HeavenStudio
CircleCursor.SetCursorColors(Color.white, Color.white, Color.white);
HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Color.black, false);
}
CircleCursor.ClearTrail(false);
}
private void SetAmbientGlowToCurrentMinigameColor()

26
Assets/Scripts/TitleManager.cs
View file

@ -45,6 +45,7 @@ namespace HeavenStudio
[SerializeField] private TMP_Text chartTitleText;
[SerializeField] private TMP_Text chartMapperText;
[SerializeField] private TMP_Text chartDescText;
[SerializeField] private TMP_Text chartStyleText;
[SerializeField] private Selectable[] mainSelectables;
[SerializeField] private Selectable defaultSelectable;
@ -202,21 +203,27 @@ namespace HeavenStudio
var controller = PlayerInput.GetInputController(1);
if (playMenuRevealed)
{
switch (controller.GetLastActionDown())
if (PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch)
{
case (int) InputController.ActionsPad.East:
PlayPanelAccept();
break;
case (int) InputController.ActionsPad.South:
PlayPanelBack();
break;
switch (controller.GetLastActionDown())
{
case (int)InputController.ActionsPad.East:
PlayPanelAccept();
break;
case (int)InputController.ActionsPad.South:
PlayPanelBack();
break;
}
}
}
else if (snsRevealed)
{
if (controller.GetLastActionDown() == (int)InputController.ActionsPad.South)
if (PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch)
{
SocialsClose();
if (controller.GetLastActionDown() == (int)InputController.ActionsPad.South)
{
SocialsClose();
}
}
}
else
@ -482,6 +489,7 @@ namespace HeavenStudio
chartTitleText.text = beatmap["remixtitle"];
chartMapperText.text = beatmap["remixauthor"];
chartDescText.text = beatmap["remixdesc"];
chartStyleText.text = $"Recommended Control Style: {beatmap["playstyle"].ToString()}";
playPanel.SetActive(true);
playMenuRevealed = true;