Merge branch 'master' into windowdancefix

This commit is contained in:
Firerise9402 2023-11-18 14:46:16 -05:00
commit 11b34ec5ce
19 changed files with 1399 additions and 37 deletions

View file

@ -2,14 +2,15 @@
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: 3DGameRenderTex m_Name: 3DGameRenderTex
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
@ -75,6 +76,7 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AlphaClip: 0 - _AlphaClip: 0
- _Blend: 0 - _Blend: 0

View file

@ -13,12 +13,12 @@ RenderTexture:
m_ForcedFallbackFormat: 4 m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0 m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0 m_IsAlphaChannelOptional: 0
serializedVersion: 3 serializedVersion: 5
m_Width: 1920 m_Width: 1920
m_Height: 1080 m_Height: 1080
m_AntiAliasing: 1 m_AntiAliasing: 1
m_MipCount: -1 m_MipCount: -1
m_DepthFormat: 2 m_DepthStencilFormat: 92
m_ColorFormat: 8 m_ColorFormat: 8
m_MipMap: 0 m_MipMap: 0
m_GenerateMips: 1 m_GenerateMips: 1
@ -36,3 +36,4 @@ RenderTexture:
m_WrapW: 1 m_WrapW: 1
m_Dimension: 2 m_Dimension: 2
m_VolumeDepth: 1 m_VolumeDepth: 1
m_ShadowSamplingMode: 2

File diff suppressed because one or more lines are too long

View file

@ -410,7 +410,7 @@ RectTransform:
- {fileID: 3114553210599439120} - {fileID: 3114553210599439120}
- {fileID: 3361920161722488605} - {fileID: 3361920161722488605}
m_Father: {fileID: 6414734252487272423} m_Father: {fileID: 6414734252487272423}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@ -2571,8 +2571,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 5724386541704624271} m_TargetGraphic: {fileID: 5724386541704624271}
m_HandleRect: {fileID: 1751651485190533021} m_HandleRect: {fileID: 1751651485190533021}
m_Direction: 2 m_Direction: 2
m_Value: 0 m_Value: 1
m_Size: 1 m_Size: 0.92075473
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
@ -3977,6 +3977,7 @@ RectTransform:
- {fileID: 8800668829680167042} - {fileID: 8800668829680167042}
- {fileID: 7445086984111591383} - {fileID: 7445086984111591383}
- {fileID: 7199445264310719903} - {fileID: 7199445264310719903}
- {fileID: 3335478948268195989}
- {fileID: 352916495994336378} - {fileID: 352916495994336378}
- {fileID: 1074170538819331136} - {fileID: 1074170538819331136}
m_Father: {fileID: 4476710119336366620} m_Father: {fileID: 4476710119336366620}
@ -11214,6 +11215,142 @@ MonoBehaviour:
m_ChildScaleWidth: 1 m_ChildScaleWidth: 1
m_ChildScaleHeight: 0 m_ChildScaleHeight: 0
m_ReverseArrangement: 0 m_ReverseArrangement: 0
--- !u!1 &7121635722953185395
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3335478948268195989}
- component: {fileID: 2324031694345916984}
- component: {fileID: 4182686963326507293}
m_Layer: 5
m_Name: WindowDanceToggle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3335478948268195989
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7121635722953185395}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4384156169143710584}
m_Father: {fileID: 6414734252487272423}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1165, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2324031694345916984
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7121635722953185395}
m_CullTransparentMesh: 1
--- !u!114 &4182686963326507293
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7121635722953185395}
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: Window Dancing
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2}
m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, 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: 32
m_fontSizeBase: 32
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
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_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 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!1 &7123263382392519494 --- !u!1 &7123263382392519494
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -11351,6 +11488,83 @@ MonoBehaviour:
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &7140186355433932929
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 207348126910743797}
- component: {fileID: 205630935931843557}
- component: {fileID: 3232221203156598093}
m_Layer: 5
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &207348126910743797
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7140186355433932929}
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:
- {fileID: 4790349822366902495}
m_Father: {fileID: 4384156169143710584}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &205630935931843557
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7140186355433932929}
m_CullTransparentMesh: 1
--- !u!114 &3232221203156598093
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7140186355433932929}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7150267262384080733 --- !u!1 &7150267262384080733
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -11737,6 +11951,7 @@ MonoBehaviour:
timingDispMinModeToggle: {fileID: 4906402620624022633} timingDispMinModeToggle: {fileID: 4906402620624022633}
letterboxBgEnable: {fileID: 4396709347257482799} letterboxBgEnable: {fileID: 4396709347257482799}
letterboxFxEnable: {fileID: 2017189606605254942} letterboxFxEnable: {fileID: 2017189606605254942}
windowDanceEnable: {fileID: 1850206126763094766}
LytEditBg: {fileID: 2373156634136147033} LytEditBg: {fileID: 2373156634136147033}
LytEditBgAmbi: {fileID: 6790269430476297747} LytEditBgAmbi: {fileID: 6790269430476297747}
LytEditBgAmbiGO: {fileID: 7150267262384080733} LytEditBgAmbiGO: {fileID: 7150267262384080733}
@ -13442,7 +13657,7 @@ RectTransform:
- {fileID: 6333297351521765582} - {fileID: 6333297351521765582}
- {fileID: 5761262922024577280} - {fileID: 5761262922024577280}
m_Father: {fileID: 6414734252487272423} m_Father: {fileID: 6414734252487272423}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@ -13692,6 +13907,104 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 306.69, y: 30} m_SizeDelta: {x: 306.69, y: 30}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!1 &8911481200621928624
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4384156169143710584}
- component: {fileID: 1850206126763094766}
m_Layer: 5
m_Name: Toggle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4384156169143710584
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8911481200621928624}
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:
- {fileID: 207348126910743797}
m_Father: {fileID: 3335478948268195989}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -132, y: -0.0000030994}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1850206126763094766
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8911481200621928624}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3232221203156598093}
toggleTransition: 1
graphic: {fileID: 8789903610445910835}
m_Group: {fileID: 0}
onValueChanged:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 3551660278321604313}
m_TargetAssemblyTypeName: HeavenStudio.Editor.GameSettings, Assembly-CSharp
m_MethodName: OnWindowDanceToggleChanged
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_IsOn: 1
--- !u!1 &8916896168442358637 --- !u!1 &8916896168442358637
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -14422,3 +14735,79 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &9209781191443767413
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4790349822366902495}
- component: {fileID: 8862159153762629161}
- component: {fileID: 8789903610445910835}
m_Layer: 5
m_Name: Checkmark
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4790349822366902495
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9209781191443767413}
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: 207348126910743797}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8862159153762629161
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9209781191443767413}
m_CullTransparentMesh: 1
--- !u!114 &8789903610445910835
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9209781191443767413}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1

View file

@ -90,9 +90,14 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
canvas: {fileID: 1535126665250126034} canvas: {fileID: 1535126665250126034}
overlayView: {fileID: 2482900817612876218} overlayView: {fileID: 2482900817612876218}
parentView: {fileID: 0}
parent: {fileID: 0}
ambientBg: {fileID: 5129120947114944961} ambientBg: {fileID: 5129120947114944961}
ambientBgGO: {fileID: 269805006432045765} ambientBgGO: {fileID: 269805006432045765}
letterboxBgGO: {fileID: 3741076794236313655} letterboxBgGO: {fileID: 3741076794236313655}
letterboxMask: {fileID: 0}
viewportTexture: {fileID: 0}
gameRenderTexture: {fileID: 0}
camera: {fileID: 378821074852065722} camera: {fileID: 378821074852065722}
--- !u!1 &269805006432045765 --- !u!1 &269805006432045765
GameObject: GameObject:
@ -520,6 +525,51 @@ MonoBehaviour:
y: 0 y: 0
width: 1 width: 1
height: 1 height: 1
--- !u!1 &3223354119073494540
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4818231903868123926}
- component: {fileID: 176381795900272283}
m_Layer: 0
m_Name: WindowController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4818231903868123926
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3223354119073494540}
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: 6052331674888157612}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &176381795900272283
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3223354119073494540}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a063196b0fe162045b5e345c3f220fcf, type: 3}
m_Name:
m_EditorClassIdentifier:
UniController: {fileID: 0}
--- !u!1 &3741076794236313655 --- !u!1 &3741076794236313655
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -804,6 +854,7 @@ Transform:
- {fileID: 2274170308165449537} - {fileID: 2274170308165449537}
- {fileID: 4235880641665482497} - {fileID: 4235880641665482497}
- {fileID: 2077856143944097172} - {fileID: 2077856143944097172}
- {fileID: 4818231903868123926}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View file

@ -227,9 +227,14 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
canvas: {fileID: 1168123228960484818} canvas: {fileID: 1168123228960484818}
overlayView: {fileID: 2814421364062256314} overlayView: {fileID: 2814421364062256314}
parentView: {fileID: 0}
parent: {fileID: 0}
ambientBg: {fileID: 4779885053979786433} ambientBg: {fileID: 4779885053979786433}
ambientBgGO: {fileID: 487891016983371717} ambientBgGO: {fileID: 487891016983371717}
letterboxBgGO: {fileID: 3931965693507761463} letterboxBgGO: {fileID: 3931965693507761463}
letterboxMask: {fileID: 0}
viewportTexture: {fileID: 0}
gameRenderTexture: {fileID: 0}
camera: {fileID: 16338400879174842} camera: {fileID: 16338400879174842}
--- !u!1 &487891016983371717 --- !u!1 &487891016983371717
GameObject: GameObject:

View file

@ -2,14 +2,15 @@
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: OverlayTexMaterial m_Name: OverlayTexMaterial
m_Shader: {fileID: 4800000, guid: 0596a6838d78f624397b642817cf20bc, type: 3} m_Shader: {fileID: 4800000, guid: 0596a6838d78f624397b642817cf20bc, type: 3}
m_ShaderKeywords: m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
@ -55,6 +56,7 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _BumpScale: 1 - _BumpScale: 1
- _ColorMask: 15 - _ColorMask: 15

View file

@ -1876,6 +1876,11 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 225, y: 0} m_SizeDelta: {x: 225, y: 0}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!224 &66970446 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8512930684284350359, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!1 &73172994 --- !u!1 &73172994
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -13129,7 +13134,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -50} m_AnchoredPosition: {x: 0, y: -50.000015}
m_SizeDelta: {x: -48, y: -148} m_SizeDelta: {x: -48, y: -148}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &572765323 --- !u!114 &572765323
@ -14669,14 +14674,62 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 176381795900272283, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: UniController
value:
objectReference: {fileID: 0}
- target: {fileID: 3558106557710386107, guid: 720073bc7682b1441bece7116681f72c, type: 3} - target: {fileID: 3558106557710386107, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_BlockingMask.m_Bits propertyPath: m_BlockingMask.m_Bits
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3741076794236313655, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3788593923839736097, guid: 720073bc7682b1441bece7116681f72c, type: 3} - target: {fileID: 3788593923839736097, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_RaycastTarget propertyPath: m_RaycastTarget
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: parent
value:
objectReference: {fileID: 1568335707}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: maskObj
value:
objectReference: {fileID: 2105509200}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: canvasObj
value:
objectReference: {fileID: 1638236449}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: parentView
value:
objectReference: {fileID: 1112762038}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: letterboxMask
value:
objectReference: {fileID: 2105509201}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: overlayCanvas
value:
objectReference: {fileID: 66970446}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: overlayTexture
value:
objectReference: {fileID: 631525715}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: viewportTexture
value:
objectReference: {fileID: 1638236456}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: gameRenderTexture
value:
objectReference: {fileID: 8400000, guid: da1c23fc8a9167c438d0d771189a6157, type: 2}
- target: {fileID: 4500092555783399993, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_ScreenMatchMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4820152107260776423, guid: 720073bc7682b1441bece7116681f72c, type: 3} - target: {fileID: 4820152107260776423, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_RaycastTarget propertyPath: m_RaycastTarget
value: 0 value: 0
@ -14767,6 +14820,42 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 6052331674369862802, guid: 720073bc7682b1441bece7116681f72c, type: 3} m_CorrespondingSourceObject: {fileID: 6052331674369862802, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709} m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &631525714 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3223354119073494540, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!114 &631525715
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 631525714}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eb951500192d2430eb3e306480cc2f31, type: 3}
m_Name:
m_EditorClassIdentifier:
_isTransparent: 0
_alphaValue: 1
_isTopmost: 0
_isBottommost: 0
_isZoomed: 0
_shouldFitMonitor: 0
_allowDropFiles: 0
isHitTestEnabled: 1
hitTestType: 1
opacityThreshold: 0.1
autoSwitchCameraBackground: 1
forceWindowed: 0
currentCamera: {fileID: 0}
transparentType: 1
keyColor:
serializedVersion: 2
rgba: 65537
onObject: 1
pickedColor: {r: 0, g: 0, b: 0, a: 0}
--- !u!1 &632795495 --- !u!1 &632795495
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -24960,6 +25049,16 @@ MonoBehaviour:
m_FlexibleWidth: 1 m_FlexibleWidth: 1
m_FlexibleHeight: -1 m_FlexibleHeight: -1
m_LayoutPriority: 1 m_LayoutPriority: 1
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -408.97974, y: -17}
m_SizeDelta: {x: -817.96, y: -46.29}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &1112762038 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2077856143944097172, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1121370303 --- !u!1 &1121370303
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -33621,6 +33720,156 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1523610370} m_GameObject: {fileID: 1523610370}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1527251879
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1527251880}
- component: {fileID: 1527251882}
- component: {fileID: 1527251883}
- component: {fileID: 1527251881}
m_Layer: 5
m_Name: BeatGrid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1527251880
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527251879}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.011111111, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1852819573}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -42.49511}
m_SizeDelta: {x: 1440.022, y: -84.99}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1527251881
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527251879}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35ff6e8800018654d9558db07c4cd080, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.45490196, g: 0.45490196, b: 0.45490196, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_improveResolution: 0
m_Resolution: 0
m_useNativeSize: 0
m_points:
- {x: 0, y: 0}
- {x: 1, y: 0}
- {x: 1, y: 1}
- {x: 0, y: 1}
- {x: 0, y: 0}
- {x: 0, y: 1}
- {x: 0.0625, y: 1}
- {x: 0.0625, y: 1}
- {x: 0.0625, y: 0}
- {x: 0.125, y: 0}
- {x: 0.125, y: 0}
- {x: 0.125, y: 1}
- {x: 0.1875, y: 1}
- {x: 0.1875, y: 1}
- {x: 0.1875, y: 0}
- {x: 0.25, y: 0}
- {x: 0.25, y: 0}
- {x: 0.25, y: 1}
- {x: 0.3125, y: 1}
- {x: 0.3125, y: 1}
- {x: 0.3125, y: 0}
- {x: 0.375, y: 0}
- {x: 0.375, y: 0}
- {x: 0.375, y: 1}
- {x: 0.4375, y: 1}
- {x: 0.4375, y: 1}
- {x: 0.4375, y: 0}
- {x: 0.5, y: 0}
- {x: 0.5, y: 0}
- {x: 0.5, y: 1}
- {x: 0.5625, y: 1}
- {x: 0.5625, y: 1}
- {x: 0.5625, y: 0}
- {x: 0.625, y: 0}
- {x: 0.625, y: 0}
- {x: 0.625, y: 1}
- {x: 0.6875, y: 1}
- {x: 0.6875, y: 1}
- {x: 0.6875, y: 0}
- {x: 0.75, y: 0}
- {x: 0.75, y: 0}
- {x: 0.75, y: 1}
- {x: 0.8125, y: 1}
- {x: 0.8125, y: 1}
- {x: 0.8125, y: 0}
- {x: 0.875, y: 0}
- {x: 0.875, y: 0}
- {x: 0.875, y: 1}
- {x: 0.9375, y: 1}
- {x: 0.9375, y: 1}
- {x: 0.9375, y: 0}
- {x: 1, y: 0}
- {x: 1, y: 1}
lineThickness: 2
relativeSize: 1
lineList: 0
lineCaps: 0
bezierSegmentsPerCurve: 10
LineJoins: 0
BezierMode: 0
drivenExternally: 0
m_GridColumns: 16
m_GridRows: 1
--- !u!222 &1527251882
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527251879}
m_CullTransparentMesh: 1
--- !u!114 &1527251883
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527251879}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9c7a9db66b8fb65479a81158697db051, type: 3}
m_Name:
m_EditorClassIdentifier:
snap: 1
count: 0
scrollRect: {fileID: 0}
--- !u!1 &1530329043 --- !u!1 &1530329043
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -35017,6 +35266,17 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1567318395} m_GameObject: {fileID: 1567318395}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1568335707 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4500092555783399993, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1575762741 --- !u!1 &1575762741
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -35145,6 +35405,149 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1585542809} m_GameObject: {fileID: 1585542809}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1588658938
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1588658939}
- component: {fileID: 1588658942}
- component: {fileID: 1588658941}
- component: {fileID: 1588658940}
- component: {fileID: 1588658943}
m_Layer: 8
m_Name: Scrollbar Vertical
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1588658939
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1588658938}
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:
- {fileID: 1304677024}
m_Father: {fileID: 546272877}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -2.0100098, y: 0}
m_SizeDelta: {x: 17.99, y: -0}
m_Pivot: {x: 1, y: 1}
--- !u!114 &1588658940
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1588658938}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1292844878}
m_HandleRect: {fileID: 1292844877}
m_Direction: 2
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1588658941
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1588658938}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1588658942
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1588658938}
m_CullTransparentMesh: 1
--- !u!114 &1588658943
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1588658938}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: db125c7de00668f4e98849d0aaf366d7, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.20392159, g: 0.20392159, b: 0.20392159, a: 1}
m_EffectDistance: {x: 2, y: -2}
m_UseGraphicAlpha: 0
--- !u!1 &1589389270 --- !u!1 &1589389270
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -35826,6 +36229,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1643615740} m_GameObject: {fileID: 1643615740}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1638236449 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2464883521749415129, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1638236456 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 647613278910435637, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1638236449}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1647324172 --- !u!1 &1647324172
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -44255,6 +44674,16 @@ MonoBehaviour:
m_FlexibleWidth: -1 m_FlexibleWidth: -1
m_FlexibleHeight: -1 m_FlexibleHeight: -1
m_LayoutPriority: 1 m_LayoutPriority: 1
--- !u!1 &2105509200 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7051539713125569525, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!224 &2105509201 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8925473620302868482, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2125404435 --- !u!1 &2125404435
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View file

@ -25,7 +25,7 @@ namespace HeavenStudio
[NonSerialized] public ObjectPool<Sound> SoundObjects; [NonSerialized] public ObjectPool<Sound> SoundObjects;
[Header("Components")] [Header("Components")]
[NonSerialized] public Camera GameCamera, CursorCam, OverlayCamera, StaticCamera; [NonSerialized] public Camera GameCamera, CursorCam, OverlayCamera, StaticCamera, WindowController;
[NonSerialized] public CircleCursor CircleCursor; [NonSerialized] public CircleCursor CircleCursor;
[NonSerialized] public GameObject GamesHolder; [NonSerialized] public GameObject GamesHolder;
[NonSerialized] public Games.Global.Flash fade; [NonSerialized] public Games.Global.Flash fade;

View file

@ -833,7 +833,6 @@ namespace HeavenStudio
new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to scale the viewport in" ) new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to scale the viewport in" )
} }
), ),
new GameAction("screen shake", "Screen Shake", 1f, true, new GameAction("screen shake", "Screen Shake", 1f, true,
new List<Param>() new List<Param>()
{ {
@ -841,6 +840,64 @@ namespace HeavenStudio
new Param("valB", new EntityTypes.Float(0, 10, 1), "Vertical Intensity") new Param("valB", new EntityTypes.Float(0, 10, 1), "Vertical Intensity")
} }
), ),
/* kinda broken idk if its useful but its here
new GameAction("scale letterbox", "Scale Letterbox", 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Integer(0, 200, 100), "Scale Letterbox X"),
new Param("valB", new EntityTypes.Integer(0, 200, 100), "Scale Letterbox Y"),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"),
new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to scale the letterbox in")
}
),*/
new GameAction("fit to screen", "Fit Game To Screen", 0.5f, false, new List<Param>()
{
new Param("toggle", false, "Toggle", "Toggle the game fitting to the screen.")
},
delegate
{
StaticCamera.instance.UpdateFitToScreen(eventCaller.currentEntity["toggle"]);
}
),
new GameAction("tile screen", "Tile Screen", 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Float(1, 50, 1), "Tile Screen X"),
new Param("valB", new EntityTypes.Float(1, 50, 1), "Tile Screen Y"),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"),
new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to tile the screen in")
}
),
new GameAction("pan tiles", "Pan Tiles", 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Float(-50, 50, 0), "Pan Tiles X"),
new Param("valB", new EntityTypes.Float(-50, 50, 0), "Pan Tiles Y"),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"),
new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to pan the tiles in")
}
),
new GameAction("pan window", "Move Window", 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Float(-100, 200, 0), "Window X", "The Window's destination X coordinate. Can go off screen. Measured in percent from bottom left of screen."),
new Param("valB", new EntityTypes.Float(-100, 200, 0), "Window Y", "The Window's destination Y coordinate. Can go off screen. Measured in percent from bottom left of screen."),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"),
new Param("axis", WindowController.ViewAxis.All, "Axis")
}
),
new GameAction("scale window", "Scale Window", 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Float(0, 200, 100), "Scale X", "How much the window is scaled on the X axis, measured in percent."),
new Param("valB", new EntityTypes.Float(0, 200, 100), "Scale Y", "How much the window is scaled on the Y axis, measured in percent."),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"),
new Param("axis", WindowController.ViewAxis.All, "Axis", "AAAAAAA")
}
),
//Non functional until further notice
/*new GameAction("shake window", "Shake Window", 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Float(0, 10, 0), "Horizontal Intensity"),
new Param("valB", new EntityTypes.Float(0, 10, 1), "Vertical Intensity")
}
),*/
new GameAction("display textbox", "Display Textbox", 1f, true, new List<Param>() new GameAction("display textbox", "Display Textbox", 1f, true, new List<Param>()
{ {

View file

@ -37,6 +37,7 @@ namespace HeavenStudio.Common
true, true,
false, false,
true, true,
true,
true true
); );
@ -115,7 +116,8 @@ namespace HeavenStudio.Common
bool letterboxBgEnable = true, bool letterboxBgEnable = true,
bool letterboxFxEnable = true, bool letterboxFxEnable = true,
int editorScale = 0, int editorScale = 0,
bool scaleWScreenSize = false bool scaleWScreenSize = false,
bool windowDanceEnable = true
) )
{ {
this.showSplash = showSplash; this.showSplash = showSplash;
@ -143,6 +145,7 @@ namespace HeavenStudio.Common
this.overlaysInEditor = overlaysInEditor; this.overlaysInEditor = overlaysInEditor;
this.letterboxBgEnable = true; this.letterboxBgEnable = true;
this.letterboxFxEnable = true; this.letterboxFxEnable = true;
this.windowDanceEnable = true;
this.timingDisplayComponents = new List<OverlaysManager.TimingDisplayComponent>() this.timingDisplayComponents = new List<OverlaysManager.TimingDisplayComponent>()
{ {
@ -183,6 +186,7 @@ namespace HeavenStudio.Common
public bool overlaysInEditor; public bool overlaysInEditor;
public bool letterboxBgEnable; public bool letterboxBgEnable;
public bool letterboxFxEnable; public bool letterboxFxEnable;
public bool windowDanceEnable;
public List<OverlaysManager.TimingDisplayComponent> timingDisplayComponents; public List<OverlaysManager.TimingDisplayComponent> timingDisplayComponents;
public List<OverlaysManager.SkillStarComponent> skillStarComponents; public List<OverlaysManager.SkillStarComponent> skillStarComponents;
public List<OverlaysManager.SectionComponent> sectionComponents; public List<OverlaysManager.SectionComponent> sectionComponents;

View file

@ -16,10 +16,14 @@ namespace HeavenStudio
{ {
[SerializeField] RectTransform canvas; [SerializeField] RectTransform canvas;
[SerializeField] GameObject overlayView; [SerializeField] GameObject overlayView;
[SerializeField] RectTransform overlayCanvas;
[SerializeField] RectTransform parentView;
[SerializeField] Image ambientBg; [SerializeField] Image ambientBg;
[SerializeField] GameObject ambientBgGO; [SerializeField] GameObject ambientBgGO;
[SerializeField] GameObject letterboxBgGO; [SerializeField] GameObject letterboxBgGO;
[SerializeField] RectTransform letterboxMask;
[SerializeField] RawImage viewportTexture;
public static StaticCamera instance { get; private set; } public static StaticCamera instance { get; private set; }
public new Camera camera; public new Camera camera;
@ -37,18 +41,35 @@ namespace HeavenStudio
private List<RiqEntity> panEvents = new(); private List<RiqEntity> panEvents = new();
private List<RiqEntity> scaleEvents = new(); private List<RiqEntity> scaleEvents = new();
private List<RiqEntity> rotationEvents = new(); private List<RiqEntity> rotationEvents = new();
private List<RiqEntity> letterboxEvents = new();
private List<RiqEntity> panTileEvents = new();
private List<RiqEntity> tileScreenEvents = new();
private List<RiqEntity> fitToScreenEvents = new();
static Vector3 defaultPan = new Vector3(0, 0, 0); static Vector3 defaultPan = new Vector3(0, 0, 0);
static Vector3 defaultScale = new Vector3(1, 1, 1); static Vector3 defaultScale = new Vector3(1, 1, 1);
static float defaultRotation = 0; static float defaultRotation = 0;
static Vector3 defaultLetterbox = new Vector3(1, 1, 1);
static Vector3 defaultTilePan = new Vector3(0, 0, 0);
static Vector3 defaultScreenTile = new Vector3(1, 1, 1);
static bool defaultFitToScreen = false;
private static Vector3 pan; private static Vector3 pan;
private static Vector3 scale; private static Vector3 scale;
private static float rotation; private static float rotation;
private static Vector3 letterbox;
private static Vector3 panInv;
private static Vector3 scaleInv;
private static Vector3 tilePan;
private static Vector3 screenTile;
private static bool fitToScreen;
private static Vector3 panLast; private static Vector3 panLast;
private static Vector3 scaleLast; private static Vector3 scaleLast;
private static float rotationLast; private static float rotationLast;
private static Vector3 letterboxLast;
private static Vector3 tilePanLast;
private static Vector3 screenTileLast;
private void Awake() private void Awake()
{ {
@ -64,8 +85,12 @@ namespace HeavenStudio
Reset(); Reset();
panLast = defaultPan; panLast = defaultPan;
letterboxLast = defaultLetterbox;
scaleLast = defaultScale; scaleLast = defaultScale;
rotationLast = defaultRotation; rotationLast = defaultRotation;
tilePanLast = defaultTilePan;
screenTileLast = defaultScreenTile;
fitToScreen = defaultFitToScreen;
ToggleLetterboxBg(PersistentDataManager.gameSettings.letterboxBgEnable); ToggleLetterboxBg(PersistentDataManager.gameSettings.letterboxBgEnable);
ToggleLetterboxGlow(PersistentDataManager.gameSettings.letterboxFxEnable); ToggleLetterboxGlow(PersistentDataManager.gameSettings.letterboxFxEnable);
@ -78,26 +103,51 @@ namespace HeavenStudio
panEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "pan view" }); panEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "pan view" });
scaleEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "scale view" }); scaleEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "scale view" });
rotationEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "rotate view" }); rotationEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "rotate view" });
letterboxEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "scale letterbox" });
fitToScreenEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "fit to screen" });
panTileEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "pan tiles"});
tileScreenEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "tile screen" });
panLast = defaultPan; panLast = defaultPan;
letterboxLast = defaultLetterbox;
scaleLast = defaultScale; scaleLast = defaultScale;
rotationLast = defaultRotation; rotationLast = defaultRotation;
tilePanLast = defaultTilePan;
screenTileLast = defaultScreenTile;
fitToScreen = defaultFitToScreen;
UpdatePan(); UpdatePan();
UpdateRotation(); UpdateRotation();
UpdateScale(); UpdateScale();
UpdateLetterbox();
UpdateTilePan();
UpdateScreenTile();
} }
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
UpdateLetterbox();
UpdatePan(); UpdatePan();
UpdateRotation(); UpdateRotation();
UpdateScale(); UpdateScale();
UpdateTilePan();
UpdateScreenTile();
canvas.localPosition = pan; canvas.localPosition = pan;
canvas.eulerAngles = new Vector3(0, 0, rotation); canvas.eulerAngles = new Vector3(0, 0, rotation);
if(fitToScreen)
{
letterboxMask.localScale = new Vector3(parentView.sizeDelta.x/16, parentView.sizeDelta.y/9, 1);
overlayCanvas.localScale = new Vector3(parentView.sizeDelta.x/16, parentView.sizeDelta.y/9, 1);
}
else
{
letterboxMask.localScale = new Vector3(1, 1, 1);
overlayCanvas.localScale = new Vector3(1, 1, 1);
}
canvas.localScale = scale; canvas.localScale = scale;
viewportTexture.uvRect = new Rect(tilePan.x, tilePan.y, screenTile.x, screenTile.y);
} }
private void UpdatePan() private void UpdatePan()
@ -199,11 +249,143 @@ namespace HeavenStudio
} }
} }
private void UpdateLetterbox()
{
foreach (var e in letterboxEvents)
{
float prog = Conductor.instance.GetPositionFromBeat(e.beat, e.length);
if (prog >= 0f)
{
Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction((Util.EasingFunction.Ease) e["ease"]);
switch (e["axis"])
{
case (int) ViewAxis.X:
letterbox.x = func(letterboxLast.x, e["valA"] * .01f * parentView.localScale.x, Mathf.Min(prog, 1f)) * AspectRatioWidth;
break;
case (int) ViewAxis.Y:
letterbox.y = func(letterboxLast.y, e["valB"] * .01f * parentView.localScale.y, Mathf.Min(prog, 1f)) * AspectRatioHeight;
break;
default:
float dx = func(letterboxLast.x, e["valA"] * .01f * parentView.localScale.x, Mathf.Min(prog, 1f)) * AspectRatioWidth;
float dy = func(letterboxLast.y, e["valB"] * .01f * parentView.localScale.y, Mathf.Min(prog, 1f)) * AspectRatioHeight;
letterbox = new Vector3(dx, dy, 1);
break;
}
}
if (prog > 1f)
{
switch (e["axis"])
{
case (int) ViewAxis.X:
letterboxLast.x = e["valA"] * .01f * parentView.localScale.x * AspectRatioWidth;
break;
case (int) ViewAxis.Y:
letterboxLast.y = e["valB"] * .01f * parentView.localScale.y * AspectRatioHeight;
break;
default:
letterboxLast = new Vector3(e["valA"] * .01f * parentView.localScale.x * AspectRatioWidth, e["valB"] * .01f * canvas.localScale.y * AspectRatioHeight, 1);
break;
}
}
}
}
private void UpdateTilePan()
{
foreach (var e in panTileEvents)
{
float prog = Conductor.instance.GetPositionFromBeat(e.beat, e.length);
if (prog >= 0f)
{
Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction((Util.EasingFunction.Ease) e["ease"]);
switch (e["axis"])
{
case (int) ViewAxis.X:
tilePan.x = func(tilePanLast.x, e["valA"], Mathf.Min(prog, 1f));
break;
case (int) ViewAxis.Y:
tilePan.y = func(tilePan.y, e["valB"], Mathf.Min(prog, 1f));
break;
default:
float dx = func(tilePanLast.x, e["valA"], Mathf.Min(prog, 1f));
float dy = func(tilePanLast.y, e["valB"], Mathf.Min(prog, 1f));
tilePan = new Vector3(dx, dy, 0);
break;
}
}
if (prog > 1f)
{
switch (e["axis"])
{
case (int) ViewAxis.X:
tilePanLast.x = e["valA"];
break;
case (int) ViewAxis.Y:
tilePanLast.y = e["valB"];
break;
default:
tilePanLast = new Vector3(e["valA"], e["valB"], 0);
break;
}
}
}
}
private void UpdateScreenTile()
{
foreach (var e in tileScreenEvents)
{
float prog = Conductor.instance.GetPositionFromBeat(e.beat, e.length);
if (prog >= 0f)
{
Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction((Util.EasingFunction.Ease) e["ease"]);
switch (e["axis"])
{
case (int) ViewAxis.X:
screenTile.x = func(screenTileLast.x, e["valA"] * canvas.localScale.x, Mathf.Min(prog, 1f)) * AspectRatioWidth;
break;
case (int) ViewAxis.Y:
screenTile.y = func(screenTileLast.y, e["valB"] * canvas.localScale.y, Mathf.Min(prog, 1f)) * AspectRatioHeight;
break;
default:
float dx = func(screenTileLast.x, e["valA"] * canvas.localScale.x, Mathf.Min(prog, 1f)) * AspectRatioWidth;
float dy = func(screenTileLast.y, e["valB"] * canvas.localScale.y, Mathf.Min(prog, 1f)) * AspectRatioHeight;
screenTile = new Vector3(dx, dy, 1);
break;
}
}
if (prog > 1f)
{
switch (e["axis"])
{
case (int) ViewAxis.X:
screenTileLast.x = e["valA"] * canvas.localScale.x * AspectRatioWidth;
break;
case (int) ViewAxis.Y:
screenTileLast.y = e["valB"] * canvas.localScale.y * AspectRatioHeight;
break;
default:
screenTileLast = new Vector3(e["valA"] * canvas.localScale.x * AspectRatioWidth, e["valB"] * canvas.localScale.y * AspectRatioHeight, 1);
break;
}
}
}
}
public void UpdateFitToScreen(bool toggle)
{
fitToScreen = toggle;
}
public static void Reset() public static void Reset()
{ {
pan = defaultPan; pan = defaultPan;
scale = defaultScale; scale = defaultScale;
rotation = defaultRotation; rotation = defaultRotation;
letterbox = defaultLetterbox;
tilePan = defaultTilePan;
screenTile = defaultScreenTile;
fitToScreen = defaultFitToScreen;
} }
public void ToggleOverlayView(bool toggle) public void ToggleOverlayView(bool toggle)

View file

@ -22,6 +22,7 @@ namespace HeavenStudio.Editor
[SerializeField] Toggle timingDispMinModeToggle; [SerializeField] Toggle timingDispMinModeToggle;
[SerializeField] Toggle letterboxBgEnable; [SerializeField] Toggle letterboxBgEnable;
[SerializeField] Toggle letterboxFxEnable; [SerializeField] Toggle letterboxFxEnable;
[SerializeField] Toggle windowDanceEnable;
[SerializeField] Image LytEditBg; [SerializeField] Image LytEditBg;
[SerializeField] Image LytEditBgAmbi; [SerializeField] Image LytEditBgAmbi;
@ -128,6 +129,11 @@ namespace HeavenStudio.Editor
LytEditBgAmbiGO.SetActive(PersistentDataManager.gameSettings.letterboxFxEnable); LytEditBgAmbiGO.SetActive(PersistentDataManager.gameSettings.letterboxFxEnable);
} }
public void OnWindowDanceToggleChanged()
{
PersistentDataManager.gameSettings.windowDanceEnable = windowDanceEnable.isOn;
}
public override void OnOpenTab() public override void OnOpenTab()
{ {
TimingDispTypeDropdown.ClearOptions(); TimingDispTypeDropdown.ClearOptions();
@ -139,6 +145,7 @@ namespace HeavenStudio.Editor
timingDispMinModeToggle.isOn = PersistentDataManager.gameSettings.timingDisplayMinMode; timingDispMinModeToggle.isOn = PersistentDataManager.gameSettings.timingDisplayMinMode;
letterboxBgEnable.isOn = PersistentDataManager.gameSettings.letterboxBgEnable; letterboxBgEnable.isOn = PersistentDataManager.gameSettings.letterboxBgEnable;
letterboxFxEnable.isOn = PersistentDataManager.gameSettings.letterboxFxEnable; letterboxFxEnable.isOn = PersistentDataManager.gameSettings.letterboxFxEnable;
windowDanceEnable.isOn = PersistentDataManager.gameSettings.windowDanceEnable;
if (PersistentDataManager.gameSettings.timingDisplayComponents.Count == 0 && if (PersistentDataManager.gameSettings.timingDisplayComponents.Count == 0 &&
PersistentDataManager.gameSettings.skillStarComponents.Count == 0 && PersistentDataManager.gameSettings.skillStarComponents.Count == 0 &&

View file

@ -0,0 +1,222 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using HeavenStudio.Util;
using HeavenStudio.Common;
using HeavenStudio.Editor;
using Jukebox;
using Jukebox.Legacy;
using System;
using Kirurobo;
namespace HeavenStudio
{
public class WindowController : MonoBehaviour
{
public static WindowController instance { get; private set; }
private UniWindowController controls;
public enum ViewAxis
{
All,
X,
Y,
}
float AspectRatioWidth;
float AspectRatioHeight;
private List<RiqEntity> panEvents = new();
private List<RiqEntity> scaleEvents = new();
private List<RiqEntity> shakeEvents = new();
public static Vector3 defaultPan;
public static Vector3 defaultScale;
public static Vector3 defaultShake = new Vector3(0, 0, 0);
private static Vector3 pan;
private static Vector3 scale;
private static Vector3 shakeResult;
private static Vector3 panLast;
private static Vector3 scaleLast;
public void SetPosition(short x, short y, short resX, short resY)
{
#if UNITY_EDITOR
return;
#else
if(Application.isEditor || !Editor.Editor.instance.fullscreen || !Conductor.instance.isPlaying) return;
if(PersistentDataManager.gameSettings.windowDanceEnable)
{
controls.windowSize = (new Vector2(resX, resY));
controls.windowPosition = (new Vector2(x, y));
}
#endif
}
private void Awake()
{
AspectRatioWidth = Screen.mainWindowDisplayInfo.width;
AspectRatioHeight = Screen.mainWindowDisplayInfo.height;
defaultScale = new Vector3(Screen.width, Screen.height, 0);
defaultPan = new Vector3(Screen.mainWindowPosition.x, Screen.mainWindowPosition.y, 0);
instance = this;
}
// Start is called before the first frame update
void Start()
{
controls = GetComponent<UniWindowController>();
GameManager.instance.onBeatChanged += OnBeatChanged;
Reset();
panLast = defaultPan;
scaleLast = defaultScale;
}
public void OnBeatChanged(double beat)
{
Reset();
panEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "pan window" });
scaleEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "scale window" });
shakeEvents = EventCaller.GetAllInGameManagerList("vfx", new string[] { "shake window" });
panLast = defaultPan;
scaleLast = defaultScale;
UpdateScale();
UpdatePan();
//SetShakeIntensity();
}
// Update is called once per frame
void Update()
{
//DO NOT PUT SCALE AFTER PAN
//BAD IDEA
//VERY BAD
//idk if its a bad idea anymore
//prob isnt
UpdateScale();
UpdatePan();
//SetShakeIntensity();
SetPosition(Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y));
}
private void UpdatePan()
{
foreach (var e in panEvents)
{
float prog = Conductor.instance.GetPositionFromBeat(e.beat, e.length);
if (prog >= 0f)
{
Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction((Util.EasingFunction.Ease) e["ease"]);
switch (e["axis"])
{
case (int) ViewAxis.X:
pan.x = func(panLast.x, e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, Mathf.Min(prog, 1f));
break;
case (int) ViewAxis.Y:
pan.y = func(panLast.y, e["valB"]* .01f * Screen.mainWindowDisplayInfo.height, Mathf.Min(prog, 1f));
break;
default:
float dx = func(panLast.x, e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, Mathf.Min(prog, 1f));
float dy = func(panLast.y, e["valB"] * .01f * Screen.mainWindowDisplayInfo.height, Mathf.Min(prog, 1f));
pan = new Vector3(dx, dy, 0);
break;
}
}
if (prog > 1f)
{
switch (e["axis"])
{
case (int) ViewAxis.X:
panLast.x = e["valA"] * .01f * Screen.mainWindowDisplayInfo.width;
break;
case (int) ViewAxis.Y:
panLast.y = e["valB"] * .01f * Screen.mainWindowDisplayInfo.height;
break;
default:
panLast = new Vector3(e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, e["valB"] * .01f * Screen.mainWindowDisplayInfo.height, 0);
break;
}
}
}
}
private void UpdateScale()
{
foreach (var e in scaleEvents)
{
float prog = Conductor.instance.GetPositionFromBeat(e.beat, e.length);
if (prog >= 0f)
{
Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction((Util.EasingFunction.Ease) e["ease"]);
switch (e["axis"])
{
case (int) ViewAxis.X:
scale.x = func(scaleLast.x, e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, Mathf.Min(prog, 1f));
break;
case (int) ViewAxis.Y:
scale.y = func(scaleLast.y, e["valB"] * .01f * Screen.mainWindowDisplayInfo.height, Mathf.Min(prog, 1f));
break;
default:
float dx = func(scaleLast.x, e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, Mathf.Min(prog, 1f));
float dy = func(scaleLast.y, e["valB"] * .01f * Screen.mainWindowDisplayInfo.height, Mathf.Min(prog, 1f)); scale = new Vector3(dx, dy, 1);
break;
}
}
if (prog > 1f)
{
switch (e["axis"])
{
case (int) ViewAxis.X:
scaleLast.x = e["valA"] * .01f * Screen.mainWindowDisplayInfo.width;
break;
case (int) ViewAxis.Y:
scaleLast.y = e["valB"] * .01f * Screen.mainWindowDisplayInfo.height;
break;
default:
scaleLast = new Vector3(e["valA"] * .01f * Screen.mainWindowDisplayInfo.width, e["valB"] * .01f * Screen.mainWindowDisplayInfo.height, 1);
break;
}
}
}
}
/*
private void SetShakeIntensity()
{
foreach (var e in shakeEvents)
{
float prog = Conductor.instance.GetPositionFromBeat(e.beat, e.length);
if (prog >= 0f)
{
float fac = Mathf.Cos(Time.time * 80f) * 0.5f;
shakeResult = new Vector3(fac * e["valA"], fac * e["valB"]);
Debug.Log(shakeResult);
}
if (prog > 1f)
{
shakeResult = new Vector3(0, 0, 0);
Debug.Log(shakeResult);
}
}
}*/
public void Reset()
{
pan = defaultPan;
scale = defaultScale;
shakeResult = defaultShake;
SetPosition(Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y));
}
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a063196b0fe162045b5e345c3f220fcf
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View file

@ -2,6 +2,7 @@
"dependencies": { "dependencies": {
"com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
"com.nobi.roundedcorners": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git", "com.nobi.roundedcorners": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git",
"com.kirurobo.uniwinc": "https://github.com/kirurobo/UniWindowController.git#upm",
"com.rheavenstudio.jukebox": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox", "com.rheavenstudio.jukebox": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox",
"com.tayx.graphy": "https://github.com/Tayx94/graphy.git", "com.tayx.graphy": "https://github.com/Tayx94/graphy.git",
"com.unity.2d.sprite": "1.0.0", "com.unity.2d.sprite": "1.0.0",

View file

@ -14,6 +14,13 @@
"dependencies": {}, "dependencies": {},
"hash": "88623988179d35ce2da93b7740d6e7be59fcc971" "hash": "88623988179d35ce2da93b7740d6e7be59fcc971"
}, },
"com.kirurobo.uniwinc": {
"version": "https://github.com/kirurobo/UniWindowController.git#upm",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "05c2177703266162eb91efa7e359d4b8207ff4ed"
},
"com.rheavenstudio.jukebox": { "com.rheavenstudio.jukebox": {
"version": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox", "version": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox",
"depth": 0, "depth": 0,

View file

@ -98,7 +98,7 @@ PlayerSettings:
xboxEnableKinectAutoTracking: 0 xboxEnableKinectAutoTracking: 0
xboxEnableFitness: 0 xboxEnableFitness: 0
visibleInBackground: 1 visibleInBackground: 1
allowFullscreenSwitch: 1 allowFullscreenSwitch: 0
fullscreenMode: 3 fullscreenMode: 3
xboxSpeechDB: 0 xboxSpeechDB: 0
xboxEnableHeadOrientation: 0 xboxEnableHeadOrientation: 0