fix special timeline

This commit is contained in:
Braedon Lewis 2023-09-26 17:19:55 -04:00
parent e231da62f0
commit 06f5fbefbf
13 changed files with 1110 additions and 1254 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 1051
m_Height: 591
m_Width: 1163
m_Height: 654
m_AntiAliasing: 2
m_MipCount: -1
m_DepthStencilFormat: 92

View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 1576
m_Height: 886
m_Width: 1744
m_Height: 981
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 92

View file

@ -584,8 +584,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 602, y: -65}
m_SizeDelta: {x: 1180, y: 40}
m_AnchoredPosition: {x: 571.5, y: -65}
m_SizeDelta: {x: 1119, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &20366933
MonoBehaviour:
@ -2117,7 +2117,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 0
@ -6797,11 +6797,11 @@ RectTransform:
m_Father: {fileID: 1542666926}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 1.2, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6, y: 0}
m_SizeDelta: {x: 200, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &297792673
MonoBehaviour:
m_ObjectHideFlags: 0
@ -7138,7 +7138,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 10.3
m_fontSize: 14
m_fontSizeBase: 14.3
m_fontWeight: 400
m_enableAutoSizing: 1
@ -8889,7 +8889,6 @@ GameObject:
m_Component:
- component: {fileID: 380411594}
- component: {fileID: 380411595}
- component: {fileID: 380411596}
m_Layer: 5
m_Name: VolumeChange
m_TagString: Untagged
@ -8918,8 +8917,8 @@ RectTransform:
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: 0.70999146}
m_SizeDelta: {x: 0.0876, y: 2.8290014}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &380411595
MonoBehaviour:
@ -8940,18 +8939,6 @@ MonoBehaviour:
first: 0
volumeTXT: {fileID: 746356640}
volumeLine: {fileID: 1126835990}
--- !u!114 &380411596
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 380411593}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ebb4f22da63ed144917cdff47f9c93c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &382658480
GameObject:
m_ObjectHideFlags: 0
@ -8987,10 +8974,10 @@ RectTransform:
m_Father: {fileID: 292323698}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -0.0050354004, y: 0}
m_SizeDelta: {x: 1280, y: 281.88}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 16}
m_SizeDelta: {x: -32, y: 281.88}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &382658482
MonoBehaviour:
@ -9859,7 +9846,7 @@ MonoBehaviour:
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.01
m_ScrollSensitivity: 1
m_ScrollSensitivity: 0
m_Viewport: {fileID: 547319783}
m_HorizontalScrollbar: {fileID: 608588499}
m_VerticalScrollbar: {fileID: 1610635822}
@ -10193,7 +10180,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1250, y: -25}
m_AnchoredPosition: {x: 1101, y: -25}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &456251927
@ -10537,17 +10524,17 @@ RectTransform:
m_GameObject: {fileID: 490421832}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.25, y: 0.4, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1542666926}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -14.5}
m_SizeDelta: {x: 4, y: 11.84}
m_Pivot: {x: 0.5, y: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -0.000061030285, y: 3}
m_SizeDelta: {x: 10, y: 6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &490421834
MonoBehaviour:
m_ObjectHideFlags: 0
@ -10650,17 +10637,17 @@ RectTransform:
m_GameObject: {fileID: 499528697}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.01111111, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 666273484}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 1.137, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6, y: 0}
m_SizeDelta: {x: 200, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &499528699
MonoBehaviour:
m_ObjectHideFlags: 0
@ -10730,7 +10717,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
@ -11196,8 +11183,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 133.91498, y: -20}
m_SizeDelta: {x: 267.83, y: 50}
m_AnchoredPosition: {x: 166.61316, y: -20}
m_SizeDelta: {x: 333.22635, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &509875038
MonoBehaviour:
@ -11268,7 +11255,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
@ -14569,8 +14556,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 602, y: -25}
m_SizeDelta: {x: 1180, y: 40}
m_AnchoredPosition: {x: 571.5, y: -25}
m_SizeDelta: {x: 1119, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &644014464
MonoBehaviour:
@ -14593,7 +14580,7 @@ MonoBehaviour:
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
@ -15231,7 +15218,6 @@ GameObject:
m_Component:
- component: {fileID: 666273484}
- component: {fileID: 666273485}
- component: {fileID: 666273486}
m_Layer: 5
m_Name: TempoChange
m_TagString: Untagged
@ -15261,7 +15247,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.0876, y: 0}
m_SizeDelta: {x: 1, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &666273485
MonoBehaviour:
@ -15282,18 +15268,6 @@ MonoBehaviour:
first: 0
tempoTXT: {fileID: 499528699}
tempoLine: {fileID: 1287203019}
--- !u!114 &666273486
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 666273483}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ebb4f22da63ed144917cdff47f9c93c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &676318033
GameObject:
m_ObjectHideFlags: 0
@ -16523,17 +16497,17 @@ RectTransform:
m_GameObject: {fileID: 703624043}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.25, y: -0.4, z: 1}
m_LocalScale: {x: 1, y: -1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1542666926}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -14.5}
m_SizeDelta: {x: 4, y: 11.84}
m_Pivot: {x: 0.5, y: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: -3}
m_SizeDelta: {x: 10, y: 6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &703624045
MonoBehaviour:
m_ObjectHideFlags: 0
@ -17371,7 +17345,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.36, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &738028141
MonoBehaviour:
@ -17511,17 +17485,17 @@ RectTransform:
m_GameObject: {fileID: 746356638}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.01111111, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 380411594}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 1.137, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6, y: 0}
m_SizeDelta: {x: 200, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &746356640
MonoBehaviour:
m_ObjectHideFlags: 0
@ -17591,7 +17565,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
@ -19802,7 +19776,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.03, y: 0}
m_SizeDelta: {x: 2, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &856705697
MonoBehaviour:
@ -19954,7 +19928,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -193.45}
m_SizeDelta: {x: 0, y: -195.82}
m_Pivot: {x: 0, y: 1}
--- !u!1 &861788454
GameObject:
@ -20510,7 +20484,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 0
m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -21858,7 +21832,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.36, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &983551350
MonoBehaviour:
@ -24249,7 +24223,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.03, y: 0}
m_SizeDelta: {x: 2, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1126835992
MonoBehaviour:
@ -25079,7 +25053,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 100.28569}
m_AnchoredPosition: {x: 0, y: 118.8571}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
@ -25779,7 +25753,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.36, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1186810250
MonoBehaviour:
@ -27652,7 +27626,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000011444092}
m_SizeDelta: {x: 0.03, y: -0.000005722}
m_SizeDelta: {x: 2, y: -0.000005722}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1287203021
MonoBehaviour:
@ -30297,10 +30271,10 @@ RectTransform:
m_Father: {fileID: 380411594}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -28}
m_SizeDelta: {x: 0.15, y: 11.84}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 11.84, y: 11.84}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1436123039
MonoBehaviour:
@ -30438,7 +30412,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0.000015258789}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1443971066
MonoBehaviour:
@ -30499,7 +30473,7 @@ MonoBehaviour:
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
@ -31223,6 +31197,7 @@ GameObject:
- component: {fileID: 1493206653}
- component: {fileID: 1493206652}
- component: {fileID: 1493206651}
- component: {fileID: 1493206654}
m_Layer: 5
m_Name: InputField (TMP)
m_TagString: Untagged
@ -31248,8 +31223,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 279.915, y: -20}
m_SizeDelta: {x: 888, y: 40}
m_AnchoredPosition: {x: 333.22635, y: -20}
m_SizeDelta: {x: 785.7736, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1493206651
MonoBehaviour:
@ -31402,6 +31377,26 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1493206649}
m_CullTransparentMesh: 1
--- !u!114 &1493206654
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1493206649}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: 10
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &1497456599
GameObject:
m_ObjectHideFlags: 0
@ -32636,7 +32631,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
@ -32947,7 +32942,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1542666926
RectTransform:
m_ObjectHideFlags: 0
@ -32970,8 +32965,8 @@ RectTransform:
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: 0.70999146}
m_SizeDelta: {x: 0.0876, y: 2.8290014}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1542666927
MonoBehaviour:
@ -34023,7 +34018,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1220118244}
m_Direction: 2
m_Value: 1
m_Size: 0.4326531
m_Size: 0.5865305
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -37186,9 +37181,9 @@ RectTransform:
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1280, y: 50}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1813644965
MonoBehaviour:
@ -39388,17 +39383,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1958523549}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: -0.24429213, w: 0.9697017}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 129013733}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -28.28}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.0000067353, y: -5.65}
m_AnchoredPosition: {x: -0.0000076293945, y: -4.63}
m_SizeDelta: {x: 16, y: 16}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1958523551
@ -41217,7 +41212,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1122.8251, y: -25}
m_AnchoredPosition: {x: 973.825, y: -25}
m_SizeDelta: {x: 214.35, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2057361811
@ -41289,7 +41284,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
@ -42544,7 +42539,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.15, y: 11.84}
m_SizeDelta: {x: 11.84, y: 11.84}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &2127964036
MonoBehaviour:

View file

@ -1,8 +1,8 @@
using System;
public static class AppInfo {
public const string Version = "0.0.991";
public static readonly DateTime Date = new DateTime(2023, 09, 25, 15, 04, 38, 319, DateTimeKind.Utc);
public const string Version = "0.0.992";
public static readonly DateTime Date = new DateTime(2023, 09, 25, 20, 37, 15, 570, DateTimeKind.Utc);
}

View file

@ -139,9 +139,6 @@ namespace HeavenStudio.Editor.Track
if (create == true)
{
tempoChange.transform.position = new Vector3(Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition).x + 0.08f, tempoChange.transform.position.y);
tempoChange.transform.localPosition = new Vector3(Starpelly.Mathp.Round2Nearest(tempoChange.transform.localPosition.x, Timeline.SnapInterval()), tempoChange.transform.localPosition.y);
float lastTempo = Conductor.instance.GetBpmAtBeat(tempoChange.transform.localPosition.x);
if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift))
{
@ -151,13 +148,12 @@ namespace HeavenStudio.Editor.Track
{
lastTempo = lastTempo / 2f;
}
RiqEntity tempoC = GameManager.instance.Beatmap.AddNewTempoChange(tempoChange.transform.localPosition.x, lastTempo);
RiqEntity tempoC = GameManager.instance.Beatmap.AddNewTempoChange(Timeline.instance.MousePos2BeatSnap, lastTempo);
tempoTimelineObj.tempoChange = tempoC;
}
else
{
tempoTimelineObj.tempoChange = tempoChange_;
tempoChange.transform.localPosition = new Vector3((float) tempoTimelineObj.tempoChange.beat, tempoChange.transform.localPosition.y);
tempoTimelineObj.first = first;
}
tempoTimelineObj.SetVisibility(Timeline.instance.timelineState.currentState);
@ -181,17 +177,13 @@ namespace HeavenStudio.Editor.Track
if (create == true)
{
volumeChange.transform.position = new Vector3(Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition).x + 0.08f, volumeChange.transform.position.y);
volumeChange.transform.localPosition = new Vector3(Starpelly.Mathp.Round2Nearest(volumeChange.transform.localPosition.x, Timeline.SnapInterval()), volumeChange.transform.localPosition.y);
RiqEntity volumeC = GameManager.instance.Beatmap.AddNewVolumeChange(volumeChange.transform.localPosition.x, 100f);
RiqEntity volumeC = GameManager.instance.Beatmap.AddNewVolumeChange(Timeline.instance.MousePos2BeatSnap, 100f);
volumeTimelineObj.volumeChange = volumeC;
GameManager.instance.Beatmap.VolumeChanges.Add(volumeC);
}
else
{
volumeTimelineObj.volumeChange = volumeChange_;
volumeChange.transform.localPosition = new Vector3((float) volumeTimelineObj.volumeChange.beat, volumeChange.transform.localPosition.y);
volumeTimelineObj.first = first;
}
volumeTimelineObj.SetVisibility(Timeline.instance.timelineState.currentState);
@ -214,10 +206,7 @@ namespace HeavenStudio.Editor.Track
if (create == true)
{
chartSection.transform.position = new Vector3(Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition).x + 0.08f, chartSection.transform.position.y);
chartSection.transform.localPosition = new Vector3(Starpelly.Mathp.Round2Nearest(chartSection.transform.localPosition.x, Timeline.SnapInterval()), chartSection.transform.localPosition.y);
RiqEntity sectionC = GameManager.instance.Beatmap.AddNewSectionMarker(chartSection.transform.localPosition.x, "New Section");
RiqEntity sectionC = GameManager.instance.Beatmap.AddNewSectionMarker(Timeline.instance.MousePos2BeatSnap, "New Section");
sectionTimelineObj.chartSection = sectionC;
GameManager.instance.Beatmap.SectionMarkers.Add(sectionC);
@ -225,7 +214,6 @@ namespace HeavenStudio.Editor.Track
else
{
sectionTimelineObj.chartSection = chartSection_;
chartSection.transform.localPosition = new Vector3((float) sectionTimelineObj.chartSection.beat, chartSection.transform.localPosition.y);
}
sectionTimelineObj.SetVisibility(Timeline.instance.timelineState.currentState);

View file

@ -32,6 +32,7 @@ namespace HeavenStudio.Editor.Track
public void UpdateLabel()
{
sectionLabel.text = chartSection["sectionName"];
SetX(chartSection);
}
public override void Init()

View file

@ -5,6 +5,7 @@ using UnityEngine;
using TMPro;
using DG.Tweening;
using Jukebox;
namespace HeavenStudio.Editor.Track
{
@ -49,15 +50,12 @@ namespace HeavenStudio.Editor.Track
if (moving)
{
Vector3 mousePos = Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition);
transform.position = new Vector3(mousePos.x - startPosX, transform.position.y, 0);
transform.localPosition = new Vector3(Mathf.Clamp(Starpelly.Mathp.Round2Nearest(transform.localPosition.x, Timeline.SnapInterval()), 0, Mathf.Infinity), transform.localPosition.y);
OnMove(Timeline.instance.MousePos2BeatSnap);
if (Input.GetMouseButtonUp(0))
{
if (!OnMove(transform.localPosition.x))
transform.localPosition = new Vector3(lastPosX, transform.localPosition.y);
/*if (!OnMove(transform.localPosition.x))
transform.localPosition = new Vector3(lastPosX, transform.localPosition.y);*/
moving = false;
lastPosX = transform.localPosition.x;
@ -66,6 +64,7 @@ namespace HeavenStudio.Editor.Track
}
else
{
/*
if (moving)
{
if (!OnMove(transform.localPosition.x))
@ -73,10 +72,16 @@ namespace HeavenStudio.Editor.Track
moving = false;
lastPosX = transform.localPosition.x;
}
*/
hovering = false;
}
}
public void SetX(RiqEntity entity)
{
rectTransform.anchoredPosition = new Vector2((float)entity.beat * Timeline.instance.PixelsPerBeat, rectTransform.anchoredPosition.y);
}
public void StartMove()
{
if (first) return;

View file

@ -31,7 +31,7 @@ namespace HeavenStudio.Editor.Track
if (Input.GetKey(KeyCode.LeftShift))
newTempo *= 5f;
if (Input.GetKey(KeyCode.LeftControl))
newTempo /= 100f;
newTempo *= 0.01f;
tempoChange["tempo"] += newTempo;
@ -49,8 +49,9 @@ namespace HeavenStudio.Editor.Track
private void UpdateTempo()
{
tempoTXT.text = $"{tempoChange["tempo"]} BPM";
tempoTXT.text = tempoChange["tempo"].ToString("F") + $" BPM";
Timeline.instance.FitToSong();
SetX(tempoChange);
}
public override void Init()

View file

@ -31,7 +31,7 @@ namespace HeavenStudio.Editor.Track
if (Input.GetKey(KeyCode.LeftShift))
newVolume *= 5f;
if (Input.GetKey(KeyCode.LeftControl))
newVolume /= 100f;
newVolume *= 0.01f;
volumeChange["volume"] += newVolume;
@ -47,7 +47,8 @@ namespace HeavenStudio.Editor.Track
private void UpdateVolume()
{
volumeTXT.text = $"{volumeChange["volume"]}%";
volumeTXT.text = $"{volumeChange["volume"].ToString("F")}%";
SetX(volumeChange);
}
public override void Init()

View file

@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.0.991
bundleVersion: 0.0.992
preloadedAssets:
- {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
metroInputSource: 0
@ -158,11 +158,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.RHeavenStudio.Heaven-Studio
buildNumber:
Standalone: 991
Standalone: 992
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 991
AndroidBundleVersionCode: 992
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1