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

fix deleting volume changes and markers

Browse source 
prep category markers
This commit is contained in:
minenice55 2023-12-11 22:21:30 -05:00
parent 67255bfee1
commit a4db33846d
11 changed files with 1575 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Assets/Resources/Sprites/Editor/UI/button.png.meta
View file

@ -3,7 +3,7 @@ guid: 77703dfffd29ca6439338d6adfc62c9b
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
@ -43,11 +44,11 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 30, y: 30, z: 30, w: 30}
spriteBorder: {x: 16, y: 16, z: 16, w: 16}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -62,6 +63,7 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@ -99,6 +101,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 64
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@ -106,12 +120,13 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

BIN
Assets/Resources/Sprites/Editor/UI/categoryMarker.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

255
Assets/Resources/Sprites/Editor/UI/categoryMarker.png.meta Normal file
View file

@ -0,0 +1,255 @@
fileFormatVersion: 2
guid: e5abe03b692975a4d9e0c457df165e1a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: on
rect:
serializedVersion: 2
x: 0
y: 192
width: 64
height: 64
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 7fa5c5583d1aa9c41928d047306204b8
internalID: 1235749078
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: cat0
rect:
serializedVersion: 2
x: 66
y: 192
width: 64
height: 64
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 0a30446d09603aa438fa427c1a2fd165
internalID: 1850054390
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: cat3
rect:
serializedVersion: 2
x: 132
y: 192
width: 64
height: 64
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: cecc1f5a4da682c43bf2c6d59f8a6658
internalID: -696784122
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: cat2
rect:
serializedVersion: 2
x: 0
y: 126
width: 64
height: 64
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: e9f160e9f73c2ab4a918828c2902d30a
internalID: 1543524385
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: cat1
rect:
serializedVersion: 2
x: 66
y: 126
width: 64
height: 64
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d469cdb86b075d3408d706568b3b4c82
internalID: -1867618289
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: off
rect:
serializedVersion: 2
x: 0
y: 0
width: 64
height: 64
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 9b934317ecd86d14e9baa66e034bf0ca
internalID: -1973897523
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
cat0: 1850054390
cat1: -1867618289
cat2: 1543524385
cat3: -696784122
off: -1973897523
on: 1235749078
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

207
Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/categoryMarker.asset Normal file
View file

@ -0,0 +1,207 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3}
m_Name: categoryMarker
m_EditorClassIdentifier:
m_Version: 1.1.0
m_FaceInfo:
m_FaceIndex: 0
m_FamilyName:
m_StyleName:
m_PointSize: 0
m_Scale: 0
m_UnitsPerEM: 0
m_LineHeight: 0
m_AscentLine: 0
m_CapLine: 0
m_MeanLine: 0
m_Baseline: 0
m_DescentLine: 0
m_SuperscriptOffset: 0
m_SuperscriptSize: 0
m_SubscriptOffset: 0
m_SubscriptSize: 0
m_UnderlineOffset: 0
m_UnderlineThickness: 0
m_StrikethroughOffset: 0
m_StrikethroughThickness: 0
m_TabWidth: 0
m_Material: {fileID: 3793351778648502308}
spriteSheet: {fileID: 2800000, guid: e5abe03b692975a4d9e0c457df165e1a, type: 3}
m_SpriteCharacterTable:
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 0
m_Scale: 1
m_Name: on
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 1
m_Scale: 1
m_Name: cat0
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 2
m_Scale: 1
m_Name: cat3
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 3
m_Scale: 1
m_Name: cat2
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 4
m_Scale: 1
m_Name: cat1
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 5
m_Scale: 1
m_Name: off
m_GlyphTable:
- m_Index: 0
m_Metrics:
m_Width: 64
m_Height: 64
m_HorizontalBearingX: 0
m_HorizontalBearingY: 60
m_HorizontalAdvance: 72
m_GlyphRect:
m_X: 0
m_Y: 192
m_Width: 64
m_Height: 64
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 1235749078, guid: e5abe03b692975a4d9e0c457df165e1a, type: 3}
- m_Index: 1
m_Metrics:
m_Width: 64
m_Height: 64
m_HorizontalBearingX: 0
m_HorizontalBearingY: 60
m_HorizontalAdvance: 72
m_GlyphRect:
m_X: 66
m_Y: 192
m_Width: 64
m_Height: 64
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 1850054390, guid: e5abe03b692975a4d9e0c457df165e1a, type: 3}
- m_Index: 2
m_Metrics:
m_Width: 64
m_Height: 64
m_HorizontalBearingX: 0
m_HorizontalBearingY: 60
m_HorizontalAdvance: 72
m_GlyphRect:
m_X: 132
m_Y: 192
m_Width: 64
m_Height: 64
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -696784122, guid: e5abe03b692975a4d9e0c457df165e1a, type: 3}
- m_Index: 3
m_Metrics:
m_Width: 64
m_Height: 64
m_HorizontalBearingX: 0
m_HorizontalBearingY: 60
m_HorizontalAdvance: 72
m_GlyphRect:
m_X: 0
m_Y: 126
m_Width: 64
m_Height: 64
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 1543524385, guid: e5abe03b692975a4d9e0c457df165e1a, type: 3}
- m_Index: 4
m_Metrics:
m_Width: 64
m_Height: 64
m_HorizontalBearingX: 0
m_HorizontalBearingY: 60
m_HorizontalAdvance: 72
m_GlyphRect:
m_X: 66
m_Y: 126
m_Width: 64
m_Height: 64
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -1867618289, guid: e5abe03b692975a4d9e0c457df165e1a, type: 3}
- m_Index: 5
m_Metrics:
m_Width: 64
m_Height: 64
m_HorizontalBearingX: 0
m_HorizontalBearingY: 60
m_HorizontalAdvance: 72
m_GlyphRect:
m_X: 0
m_Y: 0
m_Width: 64
m_Height: 64
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -1973897523, guid: e5abe03b692975a4d9e0c457df165e1a, type: 3}
spriteInfoList: []
fallbackSpriteAssets: []
--- !u!21 &3793351778648502308
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: categoryMarker Material
m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: e5abe03b692975a4d9e0c457df165e1a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _CullMode: 0
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

8
Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/categoryMarker.asset.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d614b063ccb0fdf498b0c04e1c79f2ce
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

1172
Assets/Scenes/Editor.unity
View file

File diff suppressed because it is too large Load diff

8
Assets/Scripts/LevelEditor/Commands/SpecialMarker.cs
View file

@ -125,10 +125,10 @@ namespace HeavenStudio.Editor.Commands
}
if (deletedEntity != null)
{
var marker = SpecialTimeline.instance.specialTimelineObjs[deletedEntity.guid];
SpecialTimelineObj marker = SpecialTimeline.instance.specialTimelineObjs[deletedEventID];
deletedEntityData = deletedEntity.DeepCopy();
deletedEntityData.guid = deletedEntity.guid;
deletedEntityData.guid = deletedEventID;
switch (type)
{
@ -143,7 +143,7 @@ namespace HeavenStudio.Editor.Commands
break;
}
SpecialTimeline.instance.specialTimelineObjs.Remove(deletedEntity.guid);
SpecialTimeline.instance.specialTimelineObjs.Remove(deletedEventID);
GameObject.Destroy(marker.gameObject);
GameManager.instance.SortEventsList();
@ -171,6 +171,8 @@ namespace HeavenStudio.Editor.Commands
break;
}
deletedEntityData = null;
GameManager.instance.SortEventsList();
}
}
}

27
Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs
View file

@ -17,6 +17,10 @@ public class SectionDialog : Dialog
[SerializeField] Slider markerWeight;
[SerializeField] TMP_InputField markerWeightManual;
[SerializeField] Sprite catOff;
[SerializeField] Button[] catButtons;
[SerializeField] Sprite[] catSprites;
public void SwitchSectionDialog()
{
if (dialog.activeSelf)
@ -47,17 +51,20 @@ public class SectionDialog : Dialog
markerWeight.maxValue = 8;
markerWeight.minValue = 0;
markerWeight.wholeNumbers = true;
UpdateCatButtonState();
}
public void DeleteSection()
{
if (sectionObj != null)
{
sectionObj.Remove();
}
if (dialog.activeSelf)
{
dialog.SetActive(false);
Editor.instance.inAuthorativeMenu = false;
SwitchSectionDialog();
}
if (sectionObj == null) return;
sectionObj.DeleteObj();
}
public void ChangeSectionName(string name)
@ -87,4 +94,16 @@ public class SectionDialog : Dialog
sectionObj.chartEntity["weight"] = (float) Math.Round(Convert.ToSingle(markerWeightManual.text), 2);
markerWeight.value = sectionObj.chartEntity["weight"];
}
void UpdateCatButtonState()
{
if (sectionObj == null) return;
for (int i = 0; i < catButtons.Length; i++)
{
if (i == (int) sectionObj.chartEntity["category"])
catButtons[i].GetComponent<Image>().sprite = catSprites[i];
else
catButtons[i].GetComponent<Image>().sprite = catOff;
}
}
}

2
Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs
View file

@ -200,7 +200,6 @@ namespace HeavenStudio.Editor.Track
{
RiqEntity volumeC = GameManager.instance.Beatmap.AddNewVolumeChange(Timeline.instance.MousePos2BeatSnap, 100f);
volumeTimelineObj.chartEntity = volumeC;
GameManager.instance.Beatmap.VolumeChanges.Add(volumeC);
CommandManager.Instance.AddCommand(new Commands.AddMarker(volumeC, volumeC.guid, HoveringTypes.VolumeChange));
}
else
@ -245,7 +244,6 @@ namespace HeavenStudio.Editor.Track
sectionC.CreateProperty("category", 0);
sectionTimelineObj.chartEntity = sectionC;
GameManager.instance.Beatmap.SectionMarkers.Add(sectionC);
CommandManager.Instance.AddCommand(new Commands.AddMarker(sectionC, sectionC.guid, HoveringTypes.SectionChange));
}
else

13
Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs
View file

@ -29,10 +29,11 @@ namespace HeavenStudio.Editor.Track
public void UpdateLabel()
{
//<sprite="categoryMarker" name="cat0">
if (string.IsNullOrEmpty(chartEntity["sectionName"]))
sectionLabel.text = $"x{chartEntity["weight"]:0}";
sectionLabel.text = $"<sprite=\"categoryMarker\" name=\"cat{chartEntity["category"]}\"> x{chartEntity["weight"]:0}";
else
sectionLabel.text = $"x{chartEntity["weight"]:0} | {chartEntity["sectionName"]}";
sectionLabel.text = $"<sprite=\"categoryMarker\" name=\"cat{chartEntity["category"]}\"> x{chartEntity["weight"]:0} | {chartEntity["sectionName"]}";
if (!moving)
SetX(chartEntity);
}
@ -95,5 +96,13 @@ namespace HeavenStudio.Editor.Track
}
}
public void Remove()
{
if (Timeline.instance.timelineState.currentState == Timeline.CurrentTimelineState.State.ChartSection)
{
DeleteObj();
}
}
}
}

2
Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SpecialTimelineObj.cs
View file

@ -104,8 +104,6 @@ namespace HeavenStudio.Editor.Track
{
if (first) return;
CommandManager.Instance.AddCommand(new Commands.DeleteMarker(chartEntity.guid, type));
// transform.parent.GetComponent<SpecialTimeline>().specialTimelineObjs.Remove(this);
// Destroy(this.gameObject);
}
//events