Blocks almost fully replaced
This commit is contained in:
Braedon Lewis
parent
341a271ef4
commit
638e6dcd3f
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 00ba8359d55aea94799b54c203adf38f
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -14,8 +14,8 @@ RenderTexture:
|
|||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 5
|
||||
m_Width: 1150
|
||||
m_Height: 646
|
||||
m_Width: 1130
|
||||
m_Height: 635
|
||||
m_AntiAliasing: 2
|
||||
m_MipCount: -1
|
||||
m_DepthStencilFormat: 92
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ RenderTexture:
|
|||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 5
|
||||
m_Width: 1725
|
||||
m_Height: 969
|
||||
m_Width: 1695
|
||||
m_Height: 952
|
||||
m_AntiAliasing: 1
|
||||
m_MipCount: -1
|
||||
m_DepthStencilFormat: 92
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 122 B After Width: | Height: | Size: 225 B |
|
|
@ -3,7 +3,7 @@ guid: f9232c079e126cd48a7344b23eaf42a5
|
|||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
serializedVersion: 12
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
|
|
@ -24,6 +24,7 @@ TextureImporter:
|
|||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
|
|
@ -32,7 +33,7 @@ TextureImporter:
|
|||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 0
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
|
|
@ -47,7 +48,7 @@ TextureImporter:
|
|||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 2, y: 2, z: 2, w: 2}
|
||||
spriteBorder: {x: 6, y: 6, z: 6, w: 6}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
|
|
@ -62,13 +63,14 @@ TextureImporter:
|
|||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
cookieLightType: 1
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
textureCompression: 2
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
|
|
@ -99,6 +101,30 @@ TextureImporter:
|
|||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Server
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
@ -106,12 +132,13 @@ TextureImporter:
|
|||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
internalID: 1537655665
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 667 B |
|
|
@ -306,7 +306,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
|
||||
|
|
@ -490,7 +490,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_RootOrder: 9
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
|
@ -1109,7 +1109,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
|
||||
|
|
@ -4273,7 +4273,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798021449}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
@ -4431,8 +4431,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: 288.675, y: -25}
|
||||
m_SizeDelta: {x: 537.35, y: 30}
|
||||
m_AnchoredPosition: {x: 239.00496, y: -145}
|
||||
m_SizeDelta: {x: 438.00992, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &184838089
|
||||
MonoBehaviour:
|
||||
|
|
@ -5181,7 +5181,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
|
||||
|
|
@ -5591,13 +5591,13 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_Father: {fileID: 547319783}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -0.0000016084}
|
||||
m_SizeDelta: {x: 0, y: 56.395}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0.000007637187, y: 56.395}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &238901183
|
||||
MonoBehaviour:
|
||||
|
|
@ -5619,7 +5619,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -1106677661, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Sprite: {fileID: 1099965293, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -5805,12 +5805,12 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798021449}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 7
|
||||
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: 41.062, y: 0.000024795532}
|
||||
m_SizeDelta: {x: -43.062, y: 44.84}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 41.062, y: 0}
|
||||
m_SizeDelta: {x: -45.062, y: -8.000001}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &258006093
|
||||
MonoBehaviour:
|
||||
|
|
@ -5834,15 +5834,15 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: Event
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 147c28f2f84477044b69d3cbf70ee556, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 00ba8359d55aea94799b54c203adf38f, type: 2}
|
||||
m_sharedMaterial: {fileID: -1034967165085496816, guid: 00ba8359d55aea94799b54c203adf38f, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
|
|
@ -5862,7 +5862,7 @@ MonoBehaviour:
|
|||
m_fontSize: 18.8
|
||||
m_fontSizeBase: 18.8
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 4.9
|
||||
m_fontSizeMax: 18.8
|
||||
m_fontStyle: 0
|
||||
|
|
@ -5875,7 +5875,7 @@ MonoBehaviour:
|
|||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
m_TextWrappingMode: 0
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
|
|
@ -5947,9 +5947,9 @@ RectTransform:
|
|||
m_Father: {fileID: 156962254}
|
||||
m_RootOrder: 0
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 7.799999, y: -21}
|
||||
m_SizeDelta: {x: 32, y: 32}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &270008766
|
||||
|
|
@ -6380,9 +6380,9 @@ RectTransform:
|
|||
m_Father: {fileID: 156962254}
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 198.2, y: -21}
|
||||
m_SizeDelta: {x: 32, y: 32}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &285739500
|
||||
|
|
@ -6637,7 +6637,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 297792671}
|
||||
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: 1542666926}
|
||||
|
|
@ -6717,7 +6717,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
|
||||
|
|
@ -8085,8 +8085,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: 288.675, y: -25}
|
||||
m_SizeDelta: {x: 537.35, y: 30}
|
||||
m_AnchoredPosition: {x: 239.00496, y: -65}
|
||||
m_SizeDelta: {x: 438.00992, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &355353077
|
||||
GameObject:
|
||||
|
|
@ -8841,8 +8841,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: 288.675, y: -25}
|
||||
m_SizeDelta: {x: 537.35, y: 30}
|
||||
m_AnchoredPosition: {x: 239.00496, y: -25}
|
||||
m_SizeDelta: {x: 438.00992, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &396879234
|
||||
MonoBehaviour:
|
||||
|
|
@ -9069,7 +9069,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 411779173}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.8017311, y: 80.17311, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1310571274}
|
||||
|
|
@ -9228,7 +9228,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1203596442}
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -9739,7 +9739,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -1106677661, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Sprite: {fileID: 1401309272, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -9832,7 +9832,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -997670817, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Sprite: {fileID: 1099965293, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -10154,9 +10154,9 @@ RectTransform:
|
|||
m_Father: {fileID: 156962254}
|
||||
m_RootOrder: 1
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 55.399998, y: -21}
|
||||
m_SizeDelta: {x: 32, y: 32}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &456434811
|
||||
|
|
@ -10374,7 +10374,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -14.5}
|
||||
m_SizeDelta: {x: 0.15, y: 11.84}
|
||||
m_SizeDelta: {x: 4, y: 11.84}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &490421834
|
||||
MonoBehaviour:
|
||||
|
|
@ -11417,7 +11417,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
|
||||
|
|
@ -11665,6 +11665,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 238901181}
|
||||
- {fileID: 1852819573}
|
||||
m_Father: {fileID: 441876681}
|
||||
m_RootOrder: 0
|
||||
|
|
@ -12621,7 +12622,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -13403,7 +13404,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -520399450, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Sprite: {fileID: 1782490243, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -14564,6 +14565,7 @@ GameObject:
|
|||
- component: {fileID: 660967737}
|
||||
- component: {fileID: 660967739}
|
||||
- component: {fileID: 660967738}
|
||||
- component: {fileID: 660967740}
|
||||
m_Layer: 7
|
||||
m_Name: Block
|
||||
m_TagString: Untagged
|
||||
|
|
@ -14620,7 +14622,7 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 0.25
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &660967739
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -14629,6 +14631,51 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 660967736}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &660967740
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 660967736}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Delegates:
|
||||
- eventID: 2
|
||||
callback:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 798021450}
|
||||
m_TargetAssemblyTypeName: RhythmHeavenMania.Editor.TimelineEventObj, Assembly-CSharp
|
||||
m_MethodName: OnDown
|
||||
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
|
||||
- eventID: 5
|
||||
callback:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 798021450}
|
||||
m_TargetAssemblyTypeName: HeavenStudio.Editor.Track.TimelineEventObj, Assembly-CSharp
|
||||
m_MethodName: OnDragMain
|
||||
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
|
||||
--- !u!1 &663306161
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -15694,7 +15741,7 @@ RectTransform:
|
|||
- {fileID: 380411594}
|
||||
- {fileID: 1542666926}
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
@ -15791,9 +15838,9 @@ RectTransform:
|
|||
m_Father: {fileID: 156962254}
|
||||
m_RootOrder: 2
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 103, y: -21}
|
||||
m_SizeDelta: {x: 32, y: 32}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &689781278
|
||||
|
|
@ -16157,7 +16204,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -14.5}
|
||||
m_SizeDelta: {x: 0.15, y: 11.84}
|
||||
m_SizeDelta: {x: 4, y: 11.84}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &703624045
|
||||
MonoBehaviour:
|
||||
|
|
@ -16466,7 +16513,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -243.16, y: 6}
|
||||
m_AnchoredPosition: {x: -243.15999, y: 6}
|
||||
m_SizeDelta: {x: 216, y: 216}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &723094754
|
||||
|
|
@ -17449,8 +17496,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: 288.675, y: -25}
|
||||
m_SizeDelta: {x: 537.35, y: 30}
|
||||
m_AnchoredPosition: {x: 239.00496, y: -105}
|
||||
m_SizeDelta: {x: 438.00992, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &755586979
|
||||
MonoBehaviour:
|
||||
|
|
@ -17655,7 +17702,7 @@ RectTransform:
|
|||
- {fileID: 424396917}
|
||||
- {fileID: 117889363}
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -17793,7 +17840,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
|
||||
|
|
@ -18228,7 +18275,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 798021449}
|
||||
- component: {fileID: 798021451}
|
||||
- component: {fileID: 798021452}
|
||||
- component: {fileID: 798021450}
|
||||
- component: {fileID: 798021453}
|
||||
m_Layer: 7
|
||||
|
|
@ -18253,11 +18299,11 @@ RectTransform:
|
|||
- {fileID: 660967737}
|
||||
- {fileID: 163256866}
|
||||
- {fileID: 820032005}
|
||||
- {fileID: 258006092}
|
||||
- {fileID: 2127582757}
|
||||
- {fileID: 1231936949}
|
||||
- {fileID: 2046851080}
|
||||
- {fileID: 184364176}
|
||||
- {fileID: 258006092}
|
||||
m_Father: {fileID: 1838356727}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -18289,7 +18335,6 @@ MonoBehaviour:
|
|||
rightDrag: {fileID: 184364176}
|
||||
outline: {fileID: 1231936952}
|
||||
length: 0
|
||||
eligibleToMove: 0
|
||||
selected: 0
|
||||
mouseHovering: 0
|
||||
resizable: 0
|
||||
|
|
@ -18306,51 +18351,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 798021448}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &798021452
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 798021448}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Delegates:
|
||||
- eventID: 4
|
||||
callback:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 798021450}
|
||||
m_TargetAssemblyTypeName: HeavenStudio.Editor.Track.TimelineEventObj, Assembly-CSharp
|
||||
m_MethodName: OnClick
|
||||
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
|
||||
- eventID: 2
|
||||
callback:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 798021450}
|
||||
m_TargetAssemblyTypeName: RhythmHeavenMania.Editor.TimelineEventObj, Assembly-CSharp
|
||||
m_MethodName: OnDown
|
||||
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
|
||||
--- !u!114 &798021453
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -18775,7 +18775,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 4, y: 0}
|
||||
m_SizeDelta: {x: 35.06207, y: 35.06207}
|
||||
m_SizeDelta: {x: 24, y: 35.06207}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &820032006
|
||||
MonoBehaviour:
|
||||
|
|
@ -18790,7 +18790,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.46666667}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.74509805}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
|
@ -19035,10 +19035,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1969940937}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -7.74, y: 0}
|
||||
m_SizeDelta: {x: 547.82, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -6.9999695, y: 0.000015258789}
|
||||
m_SizeDelta: {x: -14.000085, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &830452353
|
||||
MonoBehaviour:
|
||||
|
|
@ -19061,7 +19061,7 @@ MonoBehaviour:
|
|||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlWidth: 1
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
|
|
@ -19095,13 +19095,13 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 830452351}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &838509659
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -20072,7 +20072,7 @@ MonoBehaviour:
|
|||
m_HandleRect: {fileID: 1589389271}
|
||||
m_Direction: 2
|
||||
m_Value: 1
|
||||
m_Size: 1
|
||||
m_Size: 0.99999315
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -22446,7 +22446,7 @@ MonoBehaviour:
|
|||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: 1
|
||||
m_FlexibleWidth: 1.35
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &1055877577
|
||||
|
|
@ -24665,7 +24665,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: 125.619736}
|
||||
m_AnchoredPosition: {x: 0, y: 136.54295}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &1154875945
|
||||
|
|
@ -25645,7 +25645,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 1207455549}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.0124730095, y: 0.0124730095, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 411779174}
|
||||
|
|
@ -25861,7 +25861,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798021449}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
@ -25889,8 +25889,8 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.2}
|
||||
m_RaycastTarget: 1
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.627451}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
|
|
@ -29671,8 +29671,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: 288.675, y: -25}
|
||||
m_SizeDelta: {x: 537.35, y: 30}
|
||||
m_AnchoredPosition: {x: 239.00496, y: -185}
|
||||
m_SizeDelta: {x: 438.00992, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1443721748
|
||||
MonoBehaviour:
|
||||
|
|
@ -29905,7 +29905,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: 1
|
||||
|
|
@ -30250,7 +30250,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
|
||||
|
|
@ -31554,7 +31554,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -32333,7 +32333,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1542666926}
|
||||
- component: {fileID: 1542666927}
|
||||
- component: {fileID: 1542666928}
|
||||
m_Layer: 5
|
||||
m_Name: ChartSection
|
||||
m_TagString: Untagged
|
||||
|
|
@ -32386,22 +32385,6 @@ MonoBehaviour:
|
|||
sectionLabel: {fileID: 297792673}
|
||||
chartLine: {fileID: 856705695}
|
||||
sectionDialog: {fileID: 292323699}
|
||||
--- !u!114 &1542666928
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1542666925}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ebb4f22da63ed144917cdff47f9c93c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
rectTransform: {fileID: 0}
|
||||
sizeDeltaXInternal: 0
|
||||
sizeDeltaX: 1
|
||||
multiply: 100
|
||||
--- !u!1 &1548381522
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -34170,7 +34153,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 1671827686}
|
||||
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_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1478022677}
|
||||
|
|
@ -34180,8 +34163,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: 288.675, y: -35}
|
||||
m_SizeDelta: {x: 537.35, y: 50}
|
||||
m_AnchoredPosition: {x: 239.00496, y: -235}
|
||||
m_SizeDelta: {x: 438.00992, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1671827688
|
||||
MonoBehaviour:
|
||||
|
|
@ -35230,7 +35213,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2037220114}
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -35562,9 +35545,9 @@ RectTransform:
|
|||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 68.92, y: 0}
|
||||
m_SizeDelta: {x: 468, y: 0}
|
||||
m_SizeDelta: {x: -68.92, y: 0}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1776034728
|
||||
MonoBehaviour:
|
||||
|
|
@ -36305,13 +36288,14 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 441876681}
|
||||
- {fileID: 1814893641}
|
||||
m_Father: {fileID: 311438945}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 112.5, y: 0}
|
||||
m_SizeDelta: {x: -225, y: 0}
|
||||
m_AnchoredPosition: {x: 114, y: 0}
|
||||
m_SizeDelta: {x: -228, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1800461596
|
||||
GameObject:
|
||||
|
|
@ -36488,6 +36472,79 @@ MonoBehaviour:
|
|||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &1814893640
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1814893641}
|
||||
- component: {fileID: 1814893643}
|
||||
- component: {fileID: 1814893642}
|
||||
m_Layer: 5
|
||||
m_Name: RawImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1814893641
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1814893640}
|
||||
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: 1798785971}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 2, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1814893642
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1814893640}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.20392159, g: 0.20784315, b: 0.20784315, 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_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!222 &1814893643
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1814893640}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1832891382
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -36719,7 +36776,7 @@ RectTransform:
|
|||
- {fileID: 2142375787}
|
||||
- {fileID: 798021449}
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -36757,7 +36814,6 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 238901181}
|
||||
- {fileID: 1527251880}
|
||||
- {fileID: 1747224096}
|
||||
- {fileID: 1838356727}
|
||||
|
|
@ -36768,7 +36824,7 @@ RectTransform:
|
|||
- {fileID: 2066632680}
|
||||
- {fileID: 19519745}
|
||||
m_Father: {fileID: 547319783}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -37083,7 +37139,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 1973936073, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Sprite: {fileID: 1782490243, guid: bd48ded17f064414eb670529c2375358, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -37392,7 +37448,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
|
||||
|
|
@ -37529,7 +37585,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: 1
|
||||
|
|
@ -40136,7 +40192,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798021449}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -40662,7 +40718,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 411779174}
|
||||
m_Father: {fileID: 1852819573}
|
||||
m_RootOrder: 8
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -41365,9 +41421,9 @@ RectTransform:
|
|||
m_Father: {fileID: 156962254}
|
||||
m_RootOrder: 3
|
||||
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_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 150.59999, y: -21}
|
||||
m_SizeDelta: {x: 32, y: 32}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &2125404437
|
||||
|
|
@ -41496,7 +41552,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 798021449}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
@ -43187,7 +43243,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
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
using System;
|
||||
|
||||
public static class AppInfo {
|
||||
public const string Version = "0.0.983";
|
||||
public static readonly DateTime Date = new DateTime(2023, 09, 21, 14, 09, 18, 735, DateTimeKind.Utc);
|
||||
public const string Version = "0.0.985";
|
||||
public static readonly DateTime Date = new DateTime(2023, 09, 22, 21, 35, 49, 591, DateTimeKind.Utc);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -51,18 +51,12 @@ namespace HeavenStudio.Editor
|
|||
text = boxVisual.transform.GetChild(1).GetComponent<RectTransform>();
|
||||
}
|
||||
|
||||
private void Update()
|
||||
public void UpdateSelection()
|
||||
{
|
||||
if (Editor.instance == null) return;
|
||||
float deltaTimelineX = timelineContent.transform.localPosition.x - timelineLastX;
|
||||
|
||||
Camera camera = Editor.instance.EditorCamera;
|
||||
Vector3 scale = Editor.instance.MainCanvas.transform.localScale;
|
||||
|
||||
boxVisual.transform.localScale = new Vector2((1f / Timeline.instance.TimelineContent.localScale.x) / scale.x, 1f / scale.y);
|
||||
text.transform.localScale = scale;
|
||||
|
||||
if (Selections.instance.eventsSelected.Count > 0 && Timeline.instance.InteractingWithEvents())
|
||||
if (Selections.instance.eventsSelected.Count > 0 && TimelineBlockManager.Instance.InteractingWithEvents)
|
||||
{
|
||||
startPosition = Vector2.zero;
|
||||
endPosition = Vector2.zero;
|
||||
|
|
@ -98,7 +92,7 @@ namespace HeavenStudio.Editor
|
|||
// dragging
|
||||
if (Input.GetMouseButton(0) && clickedInTimeline)
|
||||
{
|
||||
startPosition.x += deltaTimelineX * scale.x;
|
||||
startPosition.x += deltaTimelineX;
|
||||
endPosition = MousePosition();
|
||||
DrawSelection();
|
||||
SelectEvents(); //kek
|
||||
|
|
@ -165,7 +159,8 @@ namespace HeavenStudio.Editor
|
|||
|
||||
private void SelectEvents()
|
||||
{
|
||||
if (!Input.GetKey(KeyCode.LeftShift) && !Timeline.instance.InteractingWithEvents() && Editor.instance.canSelect) Selections.instance.DeselectAll();
|
||||
if (!Input.GetKey(KeyCode.LeftShift) && !TimelineBlockManager.Instance.InteractingWithEvents && Editor.instance.canSelect)
|
||||
Selections.instance.DeselectAll();
|
||||
|
||||
int selected = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -220,6 +220,7 @@ namespace HeavenStudio.Editor
|
|||
|
||||
if (Timeline.instance.timelineState.selected && Editor.instance.canSelect)
|
||||
{
|
||||
/*
|
||||
if (Input.GetMouseButtonUp(0))
|
||||
{
|
||||
List<TimelineEventObj> selectedEvents = Timeline.instance.eventObjs.FindAll(c => c.selected == true && c.eligibleToMove == true);
|
||||
|
|
@ -240,6 +241,7 @@ namespace HeavenStudio.Editor
|
|||
CommandManager.instance.Execute(new Commands.Move(result));
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ namespace HeavenStudio.Editor
|
|||
eventSelector.SetActive(false);
|
||||
this.entity = entity;
|
||||
|
||||
string col = TrackToThemeColour(entity["track"]);
|
||||
string col = TrackToThemeColour((int)entity["track"]);
|
||||
Editor.instance.SetGameEventTitle($"Properties for <color=#{col}>{action.displayName}</color> on Beat {entity.beat}");
|
||||
|
||||
DestroyParams();
|
||||
|
|
@ -194,7 +194,7 @@ namespace HeavenStudio.Editor
|
|||
GameObject input = Instantiate(prefab);
|
||||
input.transform.SetParent(this.gameObject.transform);
|
||||
input.SetActive(true);
|
||||
input.transform.localScale = Vector2.one;
|
||||
input.transform.localScale = Vector3.one;
|
||||
|
||||
if(tooltip != string.Empty)
|
||||
Tooltip.AddTooltip(input, "", tooltip);
|
||||
|
|
|
|||
|
|
@ -20,12 +20,15 @@ namespace HeavenStudio.Editor
|
|||
|
||||
private void Update()
|
||||
{
|
||||
// Should never happen to begin with.
|
||||
/*
|
||||
var buggedSelections = eventsSelected.FindAll(c => c == null);
|
||||
if (buggedSelections.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < buggedSelections.Count; i++)
|
||||
Deselect(buggedSelections[i]);
|
||||
}
|
||||
*/
|
||||
if (Editor.instance.isShortcutsEnabled)
|
||||
{
|
||||
if (Input.GetKey(KeyCode.LeftControl))
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ namespace HeavenStudio.Editor.Track
|
|||
public float PixelsPerBeat => WidthPerBeat * Zoom;
|
||||
public float Zoom { get; private set; } = 1.0f;
|
||||
public float MousePos2Beat { get; private set; }
|
||||
public float MousePos2Layer { get; private set; }
|
||||
public float MousePos2BeatSnap => Mathp.Round2Nearest(MousePos2Beat + (SnapInterval() * 0.5f), SnapInterval());
|
||||
|
||||
private Vector2 relativeMousePos;
|
||||
|
|
@ -391,6 +392,7 @@ namespace HeavenStudio.Editor.Track
|
|||
RectTransformUtility.ScreenPointToLocalPointInRectangle(TimelineContent, Input.mousePosition, Editor.instance.EditorCamera, out relativeMousePos);
|
||||
|
||||
MousePos2Beat = relativeMousePos.x / PixelsPerBeat;
|
||||
MousePos2Layer = Mathf.Clamp(Mathf.FloorToInt(-(relativeMousePos.y - TimelineEventsHolder.offsetMax.y) / LayerHeight()), 0, LayerCount - 1);
|
||||
|
||||
Conductor cond = Conductor.instance;
|
||||
// waveform.rectTransform.anchoredPosition = new Vector2(
|
||||
|
|
@ -501,6 +503,7 @@ namespace HeavenStudio.Editor.Track
|
|||
LayersRect.GetWorldCorners(LayerCorners);
|
||||
|
||||
TimelineBlockManager.Instance.UpdateMarkers();
|
||||
BoxSelection.instance.UpdateSelection();
|
||||
}
|
||||
|
||||
public static float GetScaleModifier()
|
||||
|
|
@ -987,16 +990,6 @@ namespace HeavenStudio.Editor.Track
|
|||
GameManager.instance.SortEventsList();
|
||||
}
|
||||
|
||||
public bool IsMouseAboveEvents()
|
||||
{
|
||||
return Timeline.instance.eventObjs.FindAll(c => c.mouseHovering == true).Count > 0;
|
||||
}
|
||||
|
||||
public bool InteractingWithEvents()
|
||||
{
|
||||
return eventObjs.FindAll(c => c.moving == true).Count > 0 || eventObjs.FindAll(c => c.resizing == true).Count > 0;
|
||||
}
|
||||
|
||||
public float SnapToLayer(float y)
|
||||
{
|
||||
float size = LayerHeight();
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ namespace HeavenStudio.Editor.Track
|
|||
|
||||
private RiqEntity entityToSet;
|
||||
|
||||
public bool InteractingWithEvents { get; private set; } = false;
|
||||
|
||||
public void SetEntityToSet(RiqEntity entity)
|
||||
{
|
||||
entityToSet = entity;
|
||||
|
|
@ -98,6 +100,13 @@ namespace HeavenStudio.Editor.Track
|
|||
Pool.Release(EntityMarkers[entity.uid]);
|
||||
}
|
||||
}
|
||||
|
||||
InteractingWithEvents = false;
|
||||
foreach (var marker in EntityMarkers.Values)
|
||||
{
|
||||
if (marker.moving || marker.resizing || marker.mouseHovering)
|
||||
InteractingWithEvents = true;
|
||||
}
|
||||
}
|
||||
|
||||
private TimelineEventObj CreateMarker()
|
||||
|
|
|
|||
|
|
@ -4,14 +4,12 @@ using UnityEngine.UI;
|
|||
using Starpelly;
|
||||
using Jukebox;
|
||||
using TMPro;
|
||||
using UnityEngine.Timeline;
|
||||
|
||||
namespace HeavenStudio.Editor.Track
|
||||
{
|
||||
public class TimelineEventObj : MonoBehaviour
|
||||
{
|
||||
private float startPosX;
|
||||
private float startPosY;
|
||||
|
||||
private Vector3 lastPos;
|
||||
public Vector2 moveStartPos;
|
||||
private RectTransform rectTransform;
|
||||
|
|
@ -35,7 +33,6 @@ namespace HeavenStudio.Editor.Track
|
|||
[Header("Properties")]
|
||||
public RiqEntity entity;
|
||||
public float length;
|
||||
public bool eligibleToMove = false;
|
||||
private bool lastVisible;
|
||||
public bool selected;
|
||||
public bool mouseHovering;
|
||||
|
|
@ -48,6 +45,15 @@ namespace HeavenStudio.Editor.Track
|
|||
private bool inResizeRegion;
|
||||
public bool isCreating;
|
||||
|
||||
private bool altWhenClicked = false;
|
||||
|
||||
private float initMoveX = 0.0f;
|
||||
private float initMoveY = 0.0f;
|
||||
|
||||
private bool movedEntity = false;
|
||||
private float lastBeat = 0.0f;
|
||||
private int lastLayer = 0;
|
||||
|
||||
float leftSide, rightSide;
|
||||
|
||||
[Header("Colors")]
|
||||
|
|
@ -104,9 +110,11 @@ namespace HeavenStudio.Editor.Track
|
|||
|
||||
public void UpdateMarker()
|
||||
{
|
||||
mouseHovering = Timeline.instance.timelineState.selected && RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition, Editor.instance.EditorCamera);
|
||||
|
||||
mouseHovering = Timeline.instance.timelineState.selected && Timeline.instance.MousePos2Beat.IsWithin((float)entity.beat, (float)entity.beat + entity.length);
|
||||
|
||||
Icon.rectTransform.sizeDelta = new Vector2(Timeline.instance.LayerHeight() - 8, Timeline.instance.LayerHeight() - 8);
|
||||
eventLabel.rectTransform.offsetMin = new Vector2(Icon.rectTransform.anchoredPosition.x + Icon.rectTransform.sizeDelta.x + 4, eventLabel.rectTransform.offsetMin.y);
|
||||
SetColor((int)entity["track"]);
|
||||
|
||||
if (selected)
|
||||
{
|
||||
|
|
@ -133,8 +141,6 @@ namespace HeavenStudio.Editor.Track
|
|||
|
||||
if (Conductor.instance.NotStopped())
|
||||
{
|
||||
Cancel();
|
||||
|
||||
if (moving)
|
||||
{
|
||||
moving = false;
|
||||
|
|
@ -168,10 +174,30 @@ namespace HeavenStudio.Editor.Track
|
|||
|
||||
rectTransform.sizeDelta = new Vector2(Mathp.Round2Nearest(sizeDelta.x, Timeline.SnapInterval()), sizeDelta.y);
|
||||
SetPivot(new Vector2(0, rectTransform.pivot.y));
|
||||
OnComplete(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Input.GetMouseButtonUp(0))
|
||||
{
|
||||
if (moving)
|
||||
{
|
||||
moving = false;
|
||||
|
||||
GameManager.instance.SortEventsList();
|
||||
}
|
||||
}
|
||||
|
||||
if (moving)
|
||||
{
|
||||
foreach (var marker in Selections.instance.eventsSelected)
|
||||
{
|
||||
marker.entity.beat = Mathf.Max(Timeline.instance.MousePos2BeatSnap - marker.initMoveX, 0);
|
||||
marker.entity["track"] = Mathf.Clamp(Timeline.instance.MousePos2Layer - marker.initMoveY, 0, Timeline.instance.LayerCount - 1);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
int count = 0;
|
||||
foreach (TimelineEventObj e in Timeline.instance.eventObjs)
|
||||
{
|
||||
|
|
@ -215,7 +241,7 @@ namespace HeavenStudio.Editor.Track
|
|||
else
|
||||
{
|
||||
this.transform.position = new Vector3(mousePos.x - startPosX, mousePos.y - startPosY - 0.40f, 0);
|
||||
this.transform.localPosition = new Vector3(Mathf.Max(Mathp.Round2Nearest(this.transform.localPosition.x, Timeline.SnapInterval()), 0), Timeline.instance.SnapToLayer(this.transform.localPosition.y));
|
||||
this.transform.localPosition = new Vector3(Mathf.Max(Mathp.Round2Nearest(this.transform.localPosition.x * Timeline.instance.PixelsPerBeat, Timeline.SnapInterval()), 0), Timeline.instance.SnapToLayer(this.transform.localPosition.y));
|
||||
}
|
||||
|
||||
if (lastPos != transform.localPosition)
|
||||
|
|
@ -225,6 +251,7 @@ namespace HeavenStudio.Editor.Track
|
|||
|
||||
lastPos = transform.localPosition;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
if (Input.GetMouseButtonUp(0))
|
||||
|
|
@ -250,12 +277,51 @@ namespace HeavenStudio.Editor.Track
|
|||
}
|
||||
|
||||
rectTransform.sizeDelta = new Vector2(rectTransform.sizeDelta.x, Timeline.instance.LayerHeight());
|
||||
this.transform.localPosition = new Vector3(this.transform.localPosition.x, -entity["track"] * Timeline.instance.LayerHeight());
|
||||
rectTransform.anchoredPosition = new Vector2((float)entity.beat * Timeline.instance.PixelsPerBeat, -entity["track"] * Timeline.instance.LayerHeight());
|
||||
}
|
||||
|
||||
public void BeginMoving(bool setMovedEntity = true)
|
||||
{
|
||||
moving = true;
|
||||
|
||||
foreach (var marker in Selections.instance.eventsSelected)
|
||||
{
|
||||
if (setMovedEntity) marker.movedEntity = true;
|
||||
marker.lastBeat = (float)marker.entity.beat;
|
||||
marker.lastLayer = (int)marker.entity["track"];
|
||||
|
||||
marker.initMoveX = Timeline.instance.MousePos2BeatSnap - (float)marker.entity.beat;
|
||||
marker.initMoveY = Timeline.instance.MousePos2Layer - (int)marker.entity["track"];
|
||||
}
|
||||
}
|
||||
|
||||
#region ClickEvents
|
||||
|
||||
public void OnClick()
|
||||
public void OnDragMain()
|
||||
{
|
||||
if (Input.GetMouseButton(1) || Input.GetMouseButton(2)) return;
|
||||
if (!moving)
|
||||
altWhenClicked = Input.GetKey(KeyCode.LeftAlt);
|
||||
|
||||
if (!altWhenClicked)
|
||||
{
|
||||
if (!selected)
|
||||
Selections.instance.ClickSelect(this);
|
||||
if (!moving)
|
||||
BeginMoving();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
var entities = Selections.instance.eventsSelected;
|
||||
if (entities.Count == 0)
|
||||
{
|
||||
entities = new() { this };
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void OnDown()
|
||||
{
|
||||
if (Input.GetMouseButton(0) && Timeline.instance.timelineState.selected)
|
||||
{
|
||||
|
|
@ -265,30 +331,7 @@ namespace HeavenStudio.Editor.Track
|
|||
}
|
||||
else
|
||||
{
|
||||
if (!selected)
|
||||
{
|
||||
Selections.instance.ClickSelect(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void OnDown()
|
||||
{
|
||||
if (Input.GetMouseButton(0))
|
||||
{
|
||||
if (selected && Timeline.instance.timelineState.selected)
|
||||
{
|
||||
moveStartPos = transform.localPosition;
|
||||
|
||||
for (int i = 0; i < Timeline.instance.eventObjs.Count; i++)
|
||||
{
|
||||
Vector3 mousePos = Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition);
|
||||
Timeline.instance.eventObjs[i].startPosX = mousePos.x - Timeline.instance.eventObjs[i].transform.position.x;
|
||||
Timeline.instance.eventObjs[i].startPosY = mousePos.y - Timeline.instance.eventObjs[i].transform.position.y;
|
||||
}
|
||||
|
||||
moving = true;
|
||||
Selections.instance.ClickSelect(this);
|
||||
}
|
||||
}
|
||||
else if (Input.GetMouseButton(1))
|
||||
|
|
@ -317,40 +360,6 @@ namespace HeavenStudio.Editor.Track
|
|||
}
|
||||
}
|
||||
|
||||
public void OnUp()
|
||||
{
|
||||
// lastPos_ = this.lastPos_;
|
||||
// previousPos = this.transform.localPosition;
|
||||
|
||||
if (selected && Timeline.instance.timelineState.selected)
|
||||
{
|
||||
if (wasDuplicated)
|
||||
{
|
||||
Timeline.instance.FinalizeDuplicateEventStack();
|
||||
wasDuplicated = false;
|
||||
}
|
||||
if (eligibleToMove)
|
||||
{
|
||||
OnComplete(true);
|
||||
moveStartPos = transform.localPosition;
|
||||
}
|
||||
|
||||
moving = false;
|
||||
|
||||
Cancel();
|
||||
if (isCreating == true)
|
||||
{
|
||||
isCreating = false;
|
||||
CommandManager.instance.Execute(new Commands.Place(this));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void Cancel()
|
||||
{
|
||||
eligibleToMove = false;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region ResizeEvents
|
||||
|
|
@ -421,37 +430,6 @@ namespace HeavenStudio.Editor.Track
|
|||
|
||||
#endregion
|
||||
|
||||
#region OnEvents
|
||||
|
||||
private void OnMove()
|
||||
{
|
||||
if (GameManager.instance.Beatmap.Entities.FindAll(c => c.beat == this.transform.localPosition.x && c["track"] == GetTrack() && c != this.entity).Count > 0)
|
||||
{
|
||||
eligibleToMove = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
eligibleToMove = true;
|
||||
}
|
||||
|
||||
OnComplete(true);
|
||||
}
|
||||
|
||||
private void OnComplete(bool move)
|
||||
{
|
||||
entity.length = rectTransform.sizeDelta.x / Timeline.instance.PixelsPerBeat;
|
||||
entity.beat = this.transform.localPosition.x / Timeline.instance.PixelsPerBeat;
|
||||
entity["track"] = GetTrack();
|
||||
|
||||
GameManager.instance.SortEventsList();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Selection
|
||||
|
||||
#endregion
|
||||
|
||||
#region Extra
|
||||
|
||||
public void SetColor(int type)
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ namespace HeavenStudio.Editor.Track
|
|||
public void ZoomIn(float delta, Vector2 relativeMousePosition)
|
||||
{
|
||||
if (!(_scale.x < _maximumScale)) return;
|
||||
if (Timeline.instance.InteractingWithEvents() || SpecialTimeline.instance.InteractingWithEvents()) return;
|
||||
if (TimelineBlockManager.Instance.InteractingWithEvents || SpecialTimeline.instance.InteractingWithEvents()) return;
|
||||
|
||||
float incre = _scaleIncrement * delta;
|
||||
|
||||
|
|
@ -62,7 +62,7 @@ namespace HeavenStudio.Editor.Track
|
|||
public void ZoomOut(float delta, Vector2 relativeMousePosition)
|
||||
{
|
||||
if (!(_scale.x > _minimumScale)) return;
|
||||
if (Timeline.instance.InteractingWithEvents() || SpecialTimeline.instance.InteractingWithEvents()) return;
|
||||
if (TimelineBlockManager.Instance.InteractingWithEvents || SpecialTimeline.instance.InteractingWithEvents()) return;
|
||||
|
||||
float incre = _scaleIncrement * -delta;
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -134,7 +134,7 @@ PlayerSettings:
|
|||
16:10: 1
|
||||
16:9: 1
|
||||
Others: 1
|
||||
bundleVersion: 0.0.983
|
||||
bundleVersion: 0.0.985
|
||||
preloadedAssets:
|
||||
- {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
|
||||
metroInputSource: 0
|
||||
|
|
@ -158,11 +158,11 @@ PlayerSettings:
|
|||
applicationIdentifier:
|
||||
Standalone: com.RHeavenStudio.Heaven-Studio
|
||||
buildNumber:
|
||||
Standalone: 983
|
||||
Standalone: 985
|
||||
iPhone: 0
|
||||
tvOS: 0
|
||||
overrideDefaultApplicationIdentifier: 0
|
||||
AndroidBundleVersionCode: 983
|
||||
AndroidBundleVersionCode: 985
|
||||
AndroidMinSdkVersion: 22
|
||||
AndroidTargetSdkVersion: 0
|
||||
AndroidPreferredInstallLocation: 1
|
||||
|
|
|
|||
Loading…
Reference in a new issue