diff --git a/Assets/Resources/Sprites/Editor/UI/icons/temp.png b/Assets/Resources/Sprites/Editor/UI/icons/temp.png new file mode 100644 index 00000000..faecf99c Binary files /dev/null and b/Assets/Resources/Sprites/Editor/UI/icons/temp.png differ diff --git a/Assets/Resources/Sprites/Editor/UI/icons/temp.png.meta b/Assets/Resources/Sprites/Editor/UI/icons/temp.png.meta new file mode 100644 index 00000000..5fcb73c5 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/UI/icons/temp.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 3778df98d84dafe4dbc912dcab3598c3 +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: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 0 + 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: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas b/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas index 6221b317..1e2b8af4 100644 --- a/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas +++ b/Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas @@ -65,6 +65,7 @@ SpriteAtlas: - {fileID: 21300000, guid: e85d5d286a8191b499c570d33dd0899c, type: 3} - {fileID: 21300000, guid: 39656548c069d5541a9d9d1a808a76e4, type: 3} - {fileID: 21300000, guid: 21da6678ec5624a439f87f3487819ac0, type: 3} + - {fileID: 21300000, guid: 3778df98d84dafe4dbc912dcab3598c3, type: 3} - {fileID: 21300000, guid: b7a1fac8b59b4d14289fa198206ef47e, type: 3} - {fileID: 21300000, guid: 0c4626a9a4642554684b85376bc236eb, type: 3} - {fileID: 21300000, guid: 6e7b88d9d62ed1b429c63b83745e3672, type: 3} @@ -97,6 +98,7 @@ SpriteAtlas: - bookmark - add-file - tempo-finder + - temp - GameEventArrow - exit - selection diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 0baf3875..0fe4a634 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -414,9 +414,9 @@ RectTransform: m_Father: {fileID: 574002313} 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: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &9435782 @@ -3846,9 +3846,9 @@ RectTransform: m_Father: {fileID: 539838476} 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: 32, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &121871281 @@ -4070,9 +4070,9 @@ RectTransform: m_Father: {fileID: 539838476} 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: 72, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &129013734 @@ -4206,9 +4206,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 112, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &151246938 @@ -5718,6 +5718,7 @@ RectTransform: - {fileID: 683785374} - {fileID: 1436105794} - {fileID: 345154593} + - {fileID: 1813998107} m_Father: {fileID: 1791483803} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8194,7 +8195,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 9.6 + m_fontSize: 14 m_fontSizeBase: 14.3 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -13012,7 +13013,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 171581557} m_HandleRect: {fileID: 171581556} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -30368,7 +30369,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: 76.36734} + m_AnchoredPosition: {x: 0, y: 76.00001} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 @@ -31241,6 +31242,82 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1191898845 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1191898846} + - component: {fileID: 1191898848} + - component: {fileID: 1191898847} + m_Layer: 5 + m_Name: Graphic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1191898846 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191898845} + 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: 1813998107} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1191898847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191898845} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3778df98d84dafe4dbc912dcab3598c3, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1191898848 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191898845} + m_CullTransparentMesh: 1 --- !u!1 &1196204502 GameObject: m_ObjectHideFlags: 0 @@ -34622,9 +34699,9 @@ RectTransform: m_Father: {fileID: 574002313} 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: 40, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1345846031 @@ -39829,7 +39906,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1220118244} m_Direction: 2 m_Value: 1.0000002 - m_Size: 0.23447229 + m_Size: 0.23142865 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -42946,9 +43023,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1783491359 @@ -43775,6 +43852,154 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1813998106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1813998107} + - component: {fileID: 1813998111} + - component: {fileID: 1813998110} + - component: {fileID: 1813998109} + - component: {fileID: 1813998108} + m_Layer: 5 + m_Name: Sort Games By Usage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1813998107 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813998106} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.999792, y: 0.999792, z: 0.999792} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1191898846} + m_Father: {fileID: 202724642} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1813998108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813998106} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a525ece7c981f3418a70bbfa58c1146, type: 3} + m_Name: + m_EditorClassIdentifier: + TooltipText: Sort By Usage +--- !u!114 &1813998109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813998106} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.7921569, g: 0.7921569, b: 0.7921569, a: 1} + m_PressedColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.05 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1813998110} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1154875947} + m_TargetAssemblyTypeName: HeavenStudio.Editor.GridGameSelector, Assembly-CSharp + m_MethodName: Sort + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: usage + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1813998110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813998106} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 77703dfffd29ca6439338d6adfc62c9b, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 10 +--- !u!222 &1813998111 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813998106} + m_CullTransparentMesh: 1 --- !u!1 &1832891382 GameObject: m_ObjectHideFlags: 0 @@ -51470,7 +51695,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8995444695224805070, guid: 51bd6620194834c4c9118dd0f64b1b3d, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: -49.999985 objectReference: {fileID: 0} - target: {fileID: 8995444695466730802, guid: 51bd6620194834c4c9118dd0f64b1b3d, type: 3} propertyPath: tabs.Array.size diff --git a/Assets/Scripts/EventCaller.cs b/Assets/Scripts/EventCaller.cs index 65426e95..938e4c6d 100644 --- a/Assets/Scripts/EventCaller.cs +++ b/Assets/Scripts/EventCaller.cs @@ -110,6 +110,11 @@ namespace HeavenStudio } } + public static List GetAllInGameManagerList(string gameName) + { + return instance.gameManager.Beatmap.Entities.FindAll(c => c.datamodel.Split('/')[0] == gameName); + } + public static List GetAllInGameManagerList(string gameName, string[] include) { List temp1 = instance.gameManager.Beatmap.Entities.FindAll(c => c.datamodel.Split('/')[0] == gameName); diff --git a/Assets/Scripts/Games/AirRally/AirRally.cs b/Assets/Scripts/Games/AirRally/AirRally.cs index 75845dee..8c4aa609 100644 --- a/Assets/Scripts/Games/AirRally/AirRally.cs +++ b/Assets/Scripts/Games/AirRally/AirRally.cs @@ -223,7 +223,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "rvl", "keep" }, "rvlbadminton", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 13 ); } } diff --git a/Assets/Scripts/Games/Airboarder/Airboarder.cs b/Assets/Scripts/Games/Airboarder/Airboarder.cs index 2476981f..9a9398a2 100644 --- a/Assets/Scripts/Games/Airboarder/Airboarder.cs +++ b/Assets/Scripts/Games/Airboarder/Airboarder.cs @@ -132,11 +132,12 @@ namespace HeavenStudio.Games.Loaders new Param("additive", true, "Additive Rotation", "Toggle if the above rotation should be added to the current angle instead of setting the target angle to travel to.") } }, - } + }, // , - // new List() {"ntr", "normal"}, + new List() {"ntr", "normal"}, // "ntrAirboarder", "en", // new List() { } + chronologicalSortKey: 99 ); } } diff --git a/Assets/Scripts/Games/BlueBear/BlueBear.cs b/Assets/Scripts/Games/BlueBear/BlueBear.cs index 3e41b208..7a544072 100644 --- a/Assets/Scripts/Games/BlueBear/BlueBear.cs +++ b/Assets/Scripts/Games/BlueBear/BlueBear.cs @@ -90,7 +90,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ctr", "normal" }, "ctrbear", "en", - new List() { } + new List() { }, + chronologicalSortKey: 70 ); } } diff --git a/Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs b/Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs index e7347cde..5de8bb75 100644 --- a/Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs +++ b/Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs @@ -68,7 +68,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "rvl", "normal" }, "rvlrotation", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 8 ); } } diff --git a/Assets/Scripts/Games/BonOdori/BonOdori.cs b/Assets/Scripts/Games/BonOdori/BonOdori.cs index ccb5ddf7..38de92bc 100644 --- a/Assets/Scripts/Games/BonOdori/BonOdori.cs +++ b/Assets/Scripts/Games/BonOdori/BonOdori.cs @@ -155,7 +155,8 @@ namespace HeavenStudio.Games.Loaders } }, }, - new List() { "agb", "normal" }, "agbBonOdori", "en", new List() { } + new List() { "agb", "normal" }, "agbBonOdori", "en", new List() { }, + chronologicalSortKey: 10 ); } }; diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs index 7854ab72..4ce680f6 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs @@ -65,7 +65,8 @@ namespace HeavenStudio.Games.Loaders new Param("auto", true, "Lights (Auto)", "Toggle if the lights should automatically activate until the another Lights event is reached.") } } - }, new List() { "ntr", "normal" }, "ntrassembly", "en", new List() { }); + }, new List() { "ntr", "normal" }, "ntrassembly", "en", new List() { }, + chronologicalSortKey: 1); } } } diff --git a/Assets/Scripts/Games/BuiltToScaleRvl/BuiltToScaleRvl.cs b/Assets/Scripts/Games/BuiltToScaleRvl/BuiltToScaleRvl.cs index 42863cf4..98a70e8f 100644 --- a/Assets/Scripts/Games/BuiltToScaleRvl/BuiltToScaleRvl.cs +++ b/Assets/Scripts/Games/BuiltToScaleRvl/BuiltToScaleRvl.cs @@ -81,7 +81,8 @@ namespace HeavenStudio.Games.Loaders new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action."), } }, - }, new List() { "rvl", "normal" }, "rvlbuilt", "en", new List() { }); + }, new List() { "rvl", "normal" }, "rvlbuilt", "en", new List() { }, + chronologicalSortKey: 12); } } } diff --git a/Assets/Scripts/Games/Cannery/Cannery.cs b/Assets/Scripts/Games/Cannery/Cannery.cs index 3e8de788..35b21075 100644 --- a/Assets/Scripts/Games/Cannery/Cannery.cs +++ b/Assets/Scripts/Games/Cannery/Cannery.cs @@ -85,8 +85,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "pco", "normal" }, "pcocannery", "en", - new List() { } - ); + new List() { }, + chronologicalSortKey: 20160704); } } } diff --git a/Assets/Scripts/Games/CatchyTune/CatchyTune.cs b/Assets/Scripts/Games/CatchyTune/CatchyTune.cs index ef213e61..4672cd9e 100644 --- a/Assets/Scripts/Games/CatchyTune/CatchyTune.cs +++ b/Assets/Scripts/Games/CatchyTune/CatchyTune.cs @@ -59,7 +59,8 @@ namespace HeavenStudio.Games.Loaders new List() { "ctr", "normal" }, "ctrcatchy", "en", - new List() { } + new List() { }, + chronologicalSortKey: 4 ); } } diff --git a/Assets/Scripts/Games/CheerReaders/CheerReaders.cs b/Assets/Scripts/Games/CheerReaders/CheerReaders.cs index 79991e17..e59f72dc 100644 --- a/Assets/Scripts/Games/CheerReaders/CheerReaders.cs +++ b/Assets/Scripts/Games/CheerReaders/CheerReaders.cs @@ -102,7 +102,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "rvl", "normal" }, "rvlbooks", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 33 ); } } diff --git a/Assets/Scripts/Games/ClapTrap/ClapTrap.cs b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs index 53a2bac8..c04405e4 100644 --- a/Assets/Scripts/Games/ClapTrap/ClapTrap.cs +++ b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs @@ -69,7 +69,9 @@ namespace HeavenStudio.Games.Loaders }, }, - }); + }, + new List() {"rvl", "normal"}, + chronologicalSortKey: 301); } } } diff --git a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs index 162ac47e..5e356d09 100644 --- a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs +++ b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs @@ -62,7 +62,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "normal"}, "agbclap", "en", - new List() {} + new List() {}, + chronologicalSortKey: 5 ); } } diff --git a/Assets/Scripts/Games/CoinToss/CoinToss.cs b/Assets/Scripts/Games/CoinToss/CoinToss.cs index 9ac52b76..33744944 100644 --- a/Assets/Scripts/Games/CoinToss/CoinToss.cs +++ b/Assets/Scripts/Games/CoinToss/CoinToss.cs @@ -53,7 +53,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "aim" }, "ntrcoin", "en", - new List() { } + new List() { }, + chronologicalSortKey: 101 ); } } diff --git a/Assets/Scripts/Games/CropStomp/CropStomp.cs b/Assets/Scripts/Games/CropStomp/CropStomp.cs index d17afb83..08bc77ba 100644 --- a/Assets/Scripts/Games/CropStomp/CropStomp.cs +++ b/Assets/Scripts/Games/CropStomp/CropStomp.cs @@ -66,7 +66,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"ntr", "keep"}, "ntrstomp", "en", - new List() {} + new List() {}, + chronologicalSortKey: 12 ); } } diff --git a/Assets/Scripts/Games/DJSchool/DJSchool.cs b/Assets/Scripts/Games/DJSchool/DJSchool.cs index a860f025..2f156490 100644 --- a/Assets/Scripts/Games/DJSchool/DJSchool.cs +++ b/Assets/Scripts/Games/DJSchool/DJSchool.cs @@ -81,7 +81,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"ntr", "normal"}, "ntrdj", "en", - new List(){} + new List(){}, + chronologicalSortKey: 17 ); } } diff --git a/Assets/Scripts/Games/DogNinja/DogNinja.cs b/Assets/Scripts/Games/DogNinja/DogNinja.cs index dc115d9d..db61b8b6 100644 --- a/Assets/Scripts/Games/DogNinja/DogNinja.cs +++ b/Assets/Scripts/Games/DogNinja/DogNinja.cs @@ -116,7 +116,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "normal" }, "ntrninja", "en", - new List() { } + new List() { }, + chronologicalSortKey: 23 ); } } diff --git a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs index d5c41ea6..6390c4b6 100644 --- a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs +++ b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs @@ -85,7 +85,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"rvl", "normal"}, "rvldate", "en", - new List() {} + new List() {}, + chronologicalSortKey: 4 ); } } diff --git a/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs b/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs index 12e3e336..fb8aa0be 100644 --- a/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs +++ b/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs @@ -78,7 +78,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"ctr", "normal"}, "ctrintro", "en", - new List() {} + new List() {}, + chronologicalSortKey: 0 ); } } diff --git a/Assets/Scripts/Games/FanClub/FanClub.cs b/Assets/Scripts/Games/FanClub/FanClub.cs index 474ec746..827cce96 100644 --- a/Assets/Scripts/Games/FanClub/FanClub.cs +++ b/Assets/Scripts/Games/FanClub/FanClub.cs @@ -109,7 +109,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "normal" }, "ntridol", "jp", - new List() { "jp" } + new List() { "jp" }, + chronologicalSortKey: 4 ); } } diff --git a/Assets/Scripts/Games/Fireworks/Fireworks.cs b/Assets/Scripts/Games/Fireworks/Fireworks.cs index 160313ce..862149bd 100644 --- a/Assets/Scripts/Games/Fireworks/Fireworks.cs +++ b/Assets/Scripts/Games/Fireworks/Fireworks.cs @@ -70,7 +70,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "normal"}, "agbexplode", "en", - new List() {} + new List() {}, + chronologicalSortKey: 28 ); } } diff --git a/Assets/Scripts/Games/FirstContact/FirstContact.cs b/Assets/Scripts/Games/FirstContact/FirstContact.cs index 06da55d6..48251ed3 100644 --- a/Assets/Scripts/Games/FirstContact/FirstContact.cs +++ b/Assets/Scripts/Games/FirstContact/FirstContact.cs @@ -82,7 +82,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ctr", "repeat" }, "ctrinterpreter", "en", - new List() { } + new List() { }, + chronologicalSortKey: 13 ); } } diff --git a/Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs b/Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs index de8eac0f..d127a265 100644 --- a/Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs +++ b/Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs @@ -100,7 +100,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "rvl", "keep" }, "rvlseal", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 22 ); } } diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs index ee6446a7..f458868c 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs @@ -76,7 +76,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"rvl", "normal"}, "rvlfork", "en", - new List() {} + new List() {}, + chronologicalSortKey: 6 ); } } diff --git a/Assets/Scripts/Games/FreezeFrame/FreezeFrame.cs b/Assets/Scripts/Games/FreezeFrame/FreezeFrame.cs index ee9b9abc..d9ee4230 100644 --- a/Assets/Scripts/Games/FreezeFrame/FreezeFrame.cs +++ b/Assets/Scripts/Games/FreezeFrame/FreezeFrame.cs @@ -204,7 +204,8 @@ namespace HeavenStudio.Games.Loaders }, }, new List() { "ntr", "normal" }, - "ntrcameraman", "en" + "ntrcameraman", "en", + chronologicalSortKey: 13 ); } } diff --git a/Assets/Scripts/Games/GleeClub/GleeClub.cs b/Assets/Scripts/Games/GleeClub/GleeClub.cs index f9e6334d..9ba74e79 100644 --- a/Assets/Scripts/Games/GleeClub/GleeClub.cs +++ b/Assets/Scripts/Games/GleeClub/GleeClub.cs @@ -99,7 +99,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "repeat" }, "ntrchorus", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 3 ); } } diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 27772eab..78e2171a 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -401,7 +401,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "agb", "ntr", "rvl", "ctr", "pco", "normal" }, "karate", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 1 ); } } diff --git a/Assets/Scripts/Games/Kitties/Kitties.cs b/Assets/Scripts/Games/Kitties/Kitties.cs index 1e815a84..d5769bf3 100644 --- a/Assets/Scripts/Games/Kitties/Kitties.cs +++ b/Assets/Scripts/Games/Kitties/Kitties.cs @@ -80,7 +80,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ctr", "normal" }, "ctrteppan", "en", - new List() { } + new List() { }, + chronologicalSortKey: 74 ); } } diff --git a/Assets/Scripts/Games/LaunchParty/LaunchParty.cs b/Assets/Scripts/Games/LaunchParty/LaunchParty.cs index 23c51b48..59c8e88c 100644 --- a/Assets/Scripts/Games/LaunchParty/LaunchParty.cs +++ b/Assets/Scripts/Games/LaunchParty/LaunchParty.cs @@ -136,7 +136,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"rvl", "normal"}, "rvlrocket", "en", - new List() {} + new List() {}, + chronologicalSortKey: 26 ); } } diff --git a/Assets/Scripts/Games/Lockstep/Lockstep.cs b/Assets/Scripts/Games/Lockstep/Lockstep.cs index 3fed9b82..d6f0fcb4 100644 --- a/Assets/Scripts/Games/Lockstep/Lockstep.cs +++ b/Assets/Scripts/Games/Lockstep/Lockstep.cs @@ -119,7 +119,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"ntr", "keep"}, "ntrbackbeat", "en", - new List() {} + new List() {}, + chronologicalSortKey: 27 ); } diff --git a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs index 6289db88..c82b146c 100644 --- a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs +++ b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs @@ -229,7 +229,9 @@ namespace HeavenStudio.Games.Loaders }, resizable = true }, - } + }, + new List() {"ctr", "normal"}, + chronologicalSortKey: 22 ); } } diff --git a/Assets/Scripts/Games/MannequinFactory/MannequinFactory.cs b/Assets/Scripts/Games/MannequinFactory/MannequinFactory.cs index fa5860fe..9b9c8555 100644 --- a/Assets/Scripts/Games/MannequinFactory/MannequinFactory.cs +++ b/Assets/Scripts/Games/MannequinFactory/MannequinFactory.cs @@ -88,7 +88,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "normal"}, "agbmannequin", "en", - new List() {} + new List() {}, + chronologicalSortKey: 104 ); } } diff --git a/Assets/Scripts/Games/Manzai/Manzai.cs b/Assets/Scripts/Games/Manzai/Manzai.cs index a1144ac2..c78df9a3 100644 --- a/Assets/Scripts/Games/Manzai/Manzai.cs +++ b/Assets/Scripts/Games/Manzai/Manzai.cs @@ -139,7 +139,8 @@ namespace HeavenStudio.Games.Loaders }}, new List() { "rvl", "normal" }, "rvlmanzai", "jp", - new List() { "jp" } + new List() { "jp" }, + chronologicalSortKey: 104 ); } } diff --git a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs index 1785fea2..e3fed6f2 100644 --- a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs +++ b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs @@ -178,7 +178,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "agb", "normal" }, "agbmarcher", "en", - new List() { "en", "jp" } + new List() { "en", "jp" }, + chronologicalSortKey: 3 ); } } diff --git a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs index 6157738f..7cb7e9c3 100644 --- a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs +++ b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs @@ -126,7 +126,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "pco", "normal", "repeat" }, "pcomeat", "en", - new List() { } + new List() { }, + chronologicalSortKey: 20220513 ); } } diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs index eecee36a..5881f6bd 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs @@ -135,7 +135,9 @@ namespace HeavenStudio.Games.Loaders new Param("ease", Util.EasingFunction.Ease.Linear, "Ease") } } - }); + }, + new List() {"rvl", "keep"}, + chronologicalSortKey: 9); } } } diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index 3e592dab..0e18ffac 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -135,7 +135,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "keep"}, "agboffbeat", "en", - new List() {} + new List() {}, + chronologicalSortKey: 101 ); } } diff --git a/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs b/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs index 0bfc9c93..0fe6f475 100644 --- a/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs +++ b/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs @@ -151,7 +151,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"ntr", "normal"}, "ntrshugyo", "en", - new List() {"en"} + new List() {"en"}, + chronologicalSortKey: 16 ); } } diff --git a/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs b/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs index 1e70b540..7a479941 100644 --- a/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs +++ b/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs @@ -53,7 +53,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "pco", "normal" }, "pconail", "en", - new List() { } + new List() { }, + chronologicalSortKey: 20121009 ); } } diff --git a/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs b/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs index b5e70f4d..c12868be 100644 --- a/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs +++ b/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs @@ -112,7 +112,9 @@ namespace HeavenStudio.Games.Loaders new Param("repeat", new EntityTypes.Integer(0, 100, 1), "Repeat Amount", "How many times will this event repeat?"), } }, - }); + }, + new List() {"agb", "keep"}, + chronologicalSortKey: 20); } } } diff --git a/Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs b/Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs index e89a4fc8..74832afc 100644 --- a/Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs +++ b/Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs @@ -172,7 +172,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"ntr", "repeat"}, "ntrcork", "en", - new List() {} + new List() {}, + chronologicalSortKey: 204 ); } } diff --git a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs index 24d40fbd..d9238292 100644 --- a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs +++ b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs @@ -106,7 +106,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ctr", "normal" }, "ctrpillow", "en", - new List() {"en", "jp", "ko"} + new List() {"en", "jp", "ko"}, + chronologicalSortKey: 66 ); } } diff --git a/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs b/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs index f796c268..c4763d2b 100644 --- a/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs +++ b/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs @@ -94,7 +94,8 @@ namespace HeavenStudio.Games.Loaders defaultLength = 0.5f, }, }, - new List() { "agb", "normal" }, "agbCalligraphy", "en", new List() { } + new List() { "agb", "normal" }, "agbCalligraphy", "en", new List() { }, + chronologicalSortKey: 21 ); } } diff --git a/Assets/Scripts/Games/QuizShow/QuizShow.cs b/Assets/Scripts/Games/QuizShow/QuizShow.cs index 939bc201..e56667a6 100644 --- a/Assets/Scripts/Games/QuizShow/QuizShow.cs +++ b/Assets/Scripts/Games/QuizShow/QuizShow.cs @@ -113,7 +113,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "repeat"}, "agbquiz", "en", - new List() {} + new List() {}, + chronologicalSortKey: 19 ); } } diff --git a/Assets/Scripts/Games/RhythmRally/RhythmRally.cs b/Assets/Scripts/Games/RhythmRally/RhythmRally.cs index 1d6a0f7d..921c922b 100644 --- a/Assets/Scripts/Games/RhythmRally/RhythmRally.cs +++ b/Assets/Scripts/Games/RhythmRally/RhythmRally.cs @@ -118,7 +118,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "keep" }, "ntrpingpong", "en", - new List() { } + new List() { }, + chronologicalSortKey: 6 ); } } diff --git a/Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs b/Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs index 174f7c51..39d63436 100644 --- a/Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs +++ b/Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs @@ -48,7 +48,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "pco", "normal" }, "pcosomen", "en", - new List() { } + new List() { }, + chronologicalSortKey: 20130101 ); } } diff --git a/Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs b/Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs index a9d187fc..b7317c53 100644 --- a/Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs +++ b/Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs @@ -92,9 +92,10 @@ namespace HeavenStudio.Games.Loaders }, }, - new List() {"abg", "aim"}, + new List() {"agb", "aim"}, "agbRhythmTestGBA", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 0 ); } } diff --git a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs index f6e87e0c..2a1c2d6f 100644 --- a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs +++ b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs @@ -104,7 +104,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "repeat"}, "agbhair", "en", - new List() {} + new List() {}, + chronologicalSortKey: 2 ); } } diff --git a/Assets/Scripts/Games/Ringside/Ringside.cs b/Assets/Scripts/Games/Ringside/Ringside.cs index 968209b6..303179aa 100644 --- a/Assets/Scripts/Games/Ringside/Ringside.cs +++ b/Assets/Scripts/Games/Ringside/Ringside.cs @@ -81,7 +81,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"rvl", "normal"}, "rvlinterview", "en", - new List() {"en"} + new List() {"en"}, + chronologicalSortKey: 16 ); } } diff --git a/Assets/Scripts/Games/Rockers/Rockers.cs b/Assets/Scripts/Games/Rockers/Rockers.cs index 63b77e79..67a954e2 100644 --- a/Assets/Scripts/Games/Rockers/Rockers.cs +++ b/Assets/Scripts/Games/Rockers/Rockers.cs @@ -288,7 +288,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "repeat" }, "ntrrockers", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 28 ); } } diff --git a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs index 5d9d9c79..d26123db 100644 --- a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs +++ b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs @@ -97,7 +97,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "normal" }, "ntrsamurai", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 104 ); } } diff --git a/Assets/Scripts/Games/SeeSaw/SeeSaw.cs b/Assets/Scripts/Games/SeeSaw/SeeSaw.cs index 2088e67a..4a95dfc7 100644 --- a/Assets/Scripts/Games/SeeSaw/SeeSaw.cs +++ b/Assets/Scripts/Games/SeeSaw/SeeSaw.cs @@ -122,7 +122,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"rvl", "normal", "keep"}, "rvlseesaw", "en", - new List() {"en"} + new List() {"en"}, + chronologicalSortKey: 3 ); } } diff --git a/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs b/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs index 5ab9b75d..749e8166 100644 --- a/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs +++ b/Assets/Scripts/Games/ShootEmUp/ShootEmUp.cs @@ -83,7 +83,8 @@ namespace HeavenStudio.Games.Loaders } }, }, - new List() { "ntr", "normal" }, "ntrShootEmUp", "en", new List() { } + new List() { "ntr", "normal" }, "ntrShootEmUp", "en", new List() { }, + chronologicalSortKey: 7 ); } } diff --git a/Assets/Scripts/Games/SickBeats/SickBeats.cs b/Assets/Scripts/Games/SickBeats/SickBeats.cs index 2df3eb68..11981254 100644 --- a/Assets/Scripts/Games/SickBeats/SickBeats.cs +++ b/Assets/Scripts/Games/SickBeats/SickBeats.cs @@ -88,7 +88,8 @@ namespace HeavenStudio.Games.Loaders } }, }, - new List() { "agb", "normal" }, "agbSickBeats", "en", new List() { } + new List() { "agb", "normal" }, "agbSickBeats", "en", new List() { }, + chronologicalSortKey: 10 ); } } diff --git a/Assets/Scripts/Games/SlotMonster/SlotMonster.cs b/Assets/Scripts/Games/SlotMonster/SlotMonster.cs index a4d028e8..313bbb98 100644 --- a/Assets/Scripts/Games/SlotMonster/SlotMonster.cs +++ b/Assets/Scripts/Games/SlotMonster/SlotMonster.cs @@ -100,7 +100,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "normal" }, "ntrslotmonster", "en", - new List() {} + new List() {}, + chronologicalSortKey: 203 ); } } diff --git a/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs b/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs index bce5e464..dd133871 100644 --- a/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs +++ b/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs @@ -58,7 +58,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "aim"}, "agbghost", "en", - new List() {} + new List() {}, + chronologicalSortKey: 7 ); } } diff --git a/Assets/Scripts/Games/SpaceDance/SpaceDance.cs b/Assets/Scripts/Games/SpaceDance/SpaceDance.cs index 895fb5d3..ff5ff80b 100644 --- a/Assets/Scripts/Games/SpaceDance/SpaceDance.cs +++ b/Assets/Scripts/Games/SpaceDance/SpaceDance.cs @@ -103,7 +103,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "normal"}, "agbspacedance", "jp", - new List() {"jp"} + new List() {"jp"}, + chronologicalSortKey: 17 ); } } diff --git a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs index 83124a57..d4f965b4 100644 --- a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs +++ b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs @@ -151,7 +151,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "keep" }, "ntrsoccer", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 26 ); } } diff --git a/Assets/Scripts/Games/Spaceball/Spaceball.cs b/Assets/Scripts/Games/Spaceball/Spaceball.cs index 027e4181..81f43998 100644 --- a/Assets/Scripts/Games/Spaceball/Spaceball.cs +++ b/Assets/Scripts/Games/Spaceball/Spaceball.cs @@ -68,7 +68,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "normal"}, "agbbatter", "en", - new List() {} + new List() {}, + chronologicalSortKey: 4 ); } } diff --git a/Assets/Scripts/Games/Splashdown/Splashdown.cs b/Assets/Scripts/Games/Splashdown/Splashdown.cs index b0ca1b4d..eb0ebdd8 100644 --- a/Assets/Scripts/Games/Splashdown/Splashdown.cs +++ b/Assets/Scripts/Games/Splashdown/Splashdown.cs @@ -75,7 +75,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "normal" }, "ntrdiving", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 21 ); } } diff --git a/Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs b/Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs index 3a91d2f6..4bdc49ef 100644 --- a/Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs +++ b/Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs @@ -118,10 +118,11 @@ namespace HeavenStudio.Games.Loaders resizable = true }, - } - //new List() { "ctr", "keep" }, + }, + new List() { "ctr", "keep" }, //"ctrsumou", "jp", - //new List() { } + //new List() { }, + chronologicalSortKey: 31 ); } } diff --git a/Assets/Scripts/Games/Tambourine/Tambourine.cs b/Assets/Scripts/Games/Tambourine/Tambourine.cs index ee8c4418..a210d39e 100644 --- a/Assets/Scripts/Games/Tambourine/Tambourine.cs +++ b/Assets/Scripts/Games/Tambourine/Tambourine.cs @@ -73,7 +73,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"rvl", "repeat"}, "rvldrum", "en", - new List() {} + new List() {}, + chronologicalSortKey: 7 ); } } diff --git a/Assets/Scripts/Games/TapTrial/TapTrial.cs b/Assets/Scripts/Games/TapTrial/TapTrial.cs index 0ace8321..569db4ed 100644 --- a/Assets/Scripts/Games/TapTrial/TapTrial.cs +++ b/Assets/Scripts/Games/TapTrial/TapTrial.cs @@ -85,7 +85,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "agb", "normal" }, "agbtap", "en", - new List() { } + new List() { }, + chronologicalSortKey: 29 ); } } diff --git a/Assets/Scripts/Games/TapTroupe/TapTroupe.cs b/Assets/Scripts/Games/TapTroupe/TapTroupe.cs index 2b4efccc..07b9e54f 100644 --- a/Assets/Scripts/Games/TapTroupe/TapTroupe.cs +++ b/Assets/Scripts/Games/TapTroupe/TapTroupe.cs @@ -90,7 +90,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"rvl", "keep"}, "rvllegs", "en", - new List() {"en"} + new List() {"en"}, + chronologicalSortKey: 31 ); } } diff --git a/Assets/Scripts/Games/TheDazzles/TheDazzles.cs b/Assets/Scripts/Games/TheDazzles/TheDazzles.cs index c1f3a7d4..dabb38a9 100644 --- a/Assets/Scripts/Games/TheDazzles/TheDazzles.cs +++ b/Assets/Scripts/Games/TheDazzles/TheDazzles.cs @@ -119,7 +119,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"ntr", "normal"}, "ntrboxshow", "en", - new List() {"en"} + new List() {"en"}, + chronologicalSortKey: 14 ); } } diff --git a/Assets/Scripts/Games/TossBoys/TossBoys.cs b/Assets/Scripts/Games/TossBoys/TossBoys.cs index 4e027517..b33abfc7 100644 --- a/Assets/Scripts/Games/TossBoys/TossBoys.cs +++ b/Assets/Scripts/Games/TossBoys/TossBoys.cs @@ -103,7 +103,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "normal"}, "agbtoss", "jp", - new List() {} + new List() {}, + chronologicalSortKey: 27 ); } } diff --git a/Assets/Scripts/Games/TotemClimb/TotemClimb.cs b/Assets/Scripts/Games/TotemClimb/TotemClimb.cs index 9eee7315..d11ff17b 100644 --- a/Assets/Scripts/Games/TotemClimb/TotemClimb.cs +++ b/Assets/Scripts/Games/TotemClimb/TotemClimb.cs @@ -101,7 +101,8 @@ namespace HeavenStudio.Games.Loaders resizable = true, defaultLength = 4f } - }); + }, + chronologicalSortKey: 20240127); } } } diff --git a/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs b/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs index c483a8c1..6ef54cf3 100644 --- a/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs +++ b/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs @@ -71,7 +71,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "normal"}, "agbtrampoline", "jp", - new List() {} + new List() {}, + chronologicalSortKey: 16 ); } } diff --git a/Assets/Scripts/Games/TrickClass/TrickClass.cs b/Assets/Scripts/Games/TrickClass/TrickClass.cs index ef319e7a..19c642ee 100644 --- a/Assets/Scripts/Games/TrickClass/TrickClass.cs +++ b/Assets/Scripts/Games/TrickClass/TrickClass.cs @@ -101,7 +101,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "mob", "normal" }, "mobtrick", "en", - new List() { } + new List() { }, + chronologicalSortKey: 20170124 // source: this sketchy site https://rhythm-heaven-fever.appstor.io/ it was the only mention of it online that had a date attached ); } } diff --git a/Assets/Scripts/Games/Tunnel/Tunnel.cs b/Assets/Scripts/Games/Tunnel/Tunnel.cs index 8b850014..da652457 100644 --- a/Assets/Scripts/Games/Tunnel/Tunnel.cs +++ b/Assets/Scripts/Games/Tunnel/Tunnel.cs @@ -54,7 +54,8 @@ namespace HeavenStudio.Games.Loaders }, new List() { "ntr", "keep" }, "ntrtunnel", "en", - new List() { "en" } + new List() { "en" }, + chronologicalSortKey: 103 ); } } diff --git a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs index 53d737fe..9cc8e625 100644 --- a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs +++ b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs @@ -39,7 +39,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"agb", "repeat"}, "agbwizard", "en", - new List() {} + new List() {}, + chronologicalSortKey: 13 ); } } diff --git a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs index c187da16..5b5d8a7e 100644 --- a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs +++ b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs @@ -110,7 +110,8 @@ namespace HeavenStudio.Games.Loaders }, new List() {"rvl", "repeat"}, "rvldough", "en", - new List() {} + new List() {}, + chronologicalSortKey: 11 ); } } diff --git a/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs b/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs index 5b3d886b..3ee994b8 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs @@ -11,6 +11,7 @@ using DG.Tweening; using HeavenStudio.Util; using HeavenStudio.Editor.Track; using System.Text; +using System.Configuration; namespace HeavenStudio.Editor { @@ -258,35 +259,48 @@ namespace HeavenStudio.Editor // sorts depending on which sorting button you click public void Sort(string type) { - var mgsSort = mgsActive; + List mgsSort = mgsActive; mgsSort.Sort((x, y) => string.Compare(x.name, y.name)); switch (type) { case "favorites": - SortFavorites(mgsSort); - break; + SortFavorites(mgsSort); + break; case "chronologic": - SortChronologic(mgsSort); - break; + SortChronologic(mgsSort); + break; + case "usage": + SortUsage(mgsSort); + break; default: // "alphabet" - SortAlphabet(mgsSort); - break; + SortAlphabet(mgsSort); + break; } } void SortAlphabet(List mgs) { - for (int i = 0; i < mgsActive.Count; i++) { - mgs[i].SetSiblingIndex(i + fxActive.Count + 1); + List alph = mgs.OrderBy(AlphabetSortKey).ToList(); + + for (int i = 0; i < alph.Count; i++) { + alph[i].SetSiblingIndex(i + fxActive.Count + 1); } } + string AlphabetSortKey(RectTransform minigame) + { + Minigames.Minigame mg = EventCaller.instance.GetMinigame(minigame.name); + if (mg.displayName.StartsWith("the ", System.StringComparison.InvariantCultureIgnoreCase)) + return mg.displayName[4..]; + else + return mg.displayName; + } // if there are no favorites, the games will sort alphabetically void SortFavorites(List allMgs) { - var favs = allMgs.FindAll(mg => mg.GetComponent().StarActive); - var mgs = allMgs.FindAll(mg => !mg.GetComponent().StarActive); + List favs = allMgs.FindAll(mg => mg.GetComponent().StarActive).OrderBy(AlphabetSortKey).ToList(); + List mgs = allMgs.FindAll(mg => !mg.GetComponent().StarActive).OrderBy(AlphabetSortKey).ToList(); if (Input.GetKey(KeyCode.LeftShift)) { foreach (var fav in favs) @@ -304,43 +318,49 @@ namespace HeavenStudio.Editor void SortChronologic(List mgs) { - var systems = new List[] { - new List(), - new List(), - new List(), - new List(), - new List(), - new List(), - }; - for (int i = 0; i < mgs.Count; i++) - { - var mg = EventCaller.instance.GetMinigame(mgs[i].name); - var tags = mg.tags; - if (tags.Count != 0) { - systems[tags[0] switch { - "agb" => 0, - "ntr" => 1, - "rvl" => 2, - "ctr" => 3, - "mob" => 4, - _ => 5, - }].Add(mgs[i]); - } else if (mg.inferred) { - systems[^1].Add(mgs[i]); - } else { - Debug.LogWarning($"Chronological sorting has failed, does \"{mg.displayName}\" ({mg.name}) have an asset bundle assigned to it?"); - } + List chrono = mgs.OrderBy(GameOriginSortKey).ThenBy(ChronologicSortKey).ThenBy(AlphabetSortKey).ToList(); + + for (int i = 0; i < chrono.Count; i++) { + chrono[i].SetSiblingIndex(i + fxActive.Count + 1); } - int j = fxActive.Count + 1; - foreach (var system in systems) + } + int GameOriginSortKey(RectTransform minigame) + { + Minigames.Minigame mg = EventCaller.instance.GetMinigame(minigame.name); + if (mg.tags.Count > 0) { - system.OrderBy(mg => mg.name); - for (int i = 0; i < system.Count; i++) + return mg.tags[0] switch { - system[i].SetSiblingIndex(j); - j++; - } + "agb" => 0, + "ntr" => 1, + "rvl" => 2, + "ctr" => 3, + _ => 10, + }; } + + return 10; + } + uint ChronologicSortKey(RectTransform minigame) + { + Minigames.Minigame mg = EventCaller.instance.GetMinigame(minigame.name); + if (mg.chronologicalSortKey is uint i) + return i; + + return uint.MaxValue; + } + + void SortUsage(List mgs) + { + List usage = mgs.OrderByDescending(UsageSortKey).ThenBy(AlphabetSortKey).ToList(); + + for (int i = 0; i < usage.Count; i++) { + usage[i].SetSiblingIndex(i + fxActive.Count + 1); + } + } + int UsageSortKey(RectTransform minigame) + { + return EventCaller.GetAllInGameManagerList(minigame.name).Count; } public void Search() diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index b0e7d28d..b2b1a54c 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -371,6 +371,15 @@ namespace HeavenStudio public bool hidden; public bool fxOnly; public List actions = new List(); + + + public uint? chronologicalSortKey; + // playinful: basically i figure this should just be whatever index number the minigame is + // in its game of origin. So, basically, like, if we're talking Rhythm Heaven DS, Built to + // Scale would be 1, then Fillbots would be 2, and so on. If it's an endless game, add 100. + // If it's a rhythm toy, add 200. If it's a 2-Player endless game, add 300. If it's a credits + // game... IDK, I guess just set it to 99. It works. If the game isn't a RH original then just + // put the date in YYYYMMDD format. Oh, and if it's a practice game set it to 0. public List tags; public string defaultLocale = "en"; @@ -405,7 +414,7 @@ namespace HeavenStudio set => soundSequences = value; } - public Minigame(string name, string displayName, string color, bool hidden, bool fxOnly, List actions, List tags = null, string wantAssetBundle = null, string defaultLocale = "en", List supportedLocales = null, bool inferred = false) + public Minigame(string name, string displayName, string color, bool hidden, bool fxOnly, List actions, List tags = null, string wantAssetBundle = null, string defaultLocale = "en", List supportedLocales = null, bool inferred = false, uint? chronologicalSortKey = null) { this.name = name; this.displayName = displayName; @@ -422,9 +431,11 @@ namespace HeavenStudio this.splitColorL = null; this.splitColorR = null; + + this.chronologicalSortKey = chronologicalSortKey; } - public Minigame(string name, string displayName, string color, string splitColorL, string splitColorR, bool hidden, bool fxOnly, List actions, List tags = null, string wantAssetBundle = null, string defaultLocale = "en", List supportedLocales = null, bool inferred = false) + public Minigame(string name, string displayName, string color, string splitColorL, string splitColorR, bool hidden, bool fxOnly, List actions, List tags = null, string wantAssetBundle = null, string defaultLocale = "en", List supportedLocales = null, bool inferred = false, uint? chronologicalSortKey = null) { this.name = name; this.displayName = displayName; @@ -441,6 +452,8 @@ namespace HeavenStudio this.splitColorL = splitColorL; this.splitColorR = splitColorR; + + this.chronologicalSortKey = chronologicalSortKey; } public AssetBundle GetLocalizedAssetBundle()