diff --git a/Assets/Prefabs/Menu/Chapter.meta b/Assets/Prefabs/Menu/ChapterSelection.meta similarity index 100% rename from Assets/Prefabs/Menu/Chapter.meta rename to Assets/Prefabs/Menu/ChapterSelection.meta diff --git a/Assets/Prefabs/Menu/Chapter/Chapter0.asset b/Assets/Prefabs/Menu/ChapterSelection/Chapter0.asset similarity index 100% rename from Assets/Prefabs/Menu/Chapter/Chapter0.asset rename to Assets/Prefabs/Menu/ChapterSelection/Chapter0.asset diff --git a/Assets/Prefabs/Menu/Chapter/Chapter0.asset.meta b/Assets/Prefabs/Menu/ChapterSelection/Chapter0.asset.meta similarity index 100% rename from Assets/Prefabs/Menu/Chapter/Chapter0.asset.meta rename to Assets/Prefabs/Menu/ChapterSelection/Chapter0.asset.meta diff --git a/Assets/Prefabs/Menu/Chapter/ChapterSelection.prefab b/Assets/Prefabs/Menu/ChapterSelection/ChapterSelection.prefab similarity index 99% rename from Assets/Prefabs/Menu/Chapter/ChapterSelection.prefab rename to Assets/Prefabs/Menu/ChapterSelection/ChapterSelection.prefab index fb262b80..0312c9ed 100644 --- a/Assets/Prefabs/Menu/Chapter/ChapterSelection.prefab +++ b/Assets/Prefabs/Menu/ChapterSelection/ChapterSelection.prefab @@ -3464,7 +3464,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_Color: {r: 0.75, g: 0.75, b: 0.75, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3732,7 +3732,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6098402083919947941 RectTransform: m_ObjectHideFlags: 0 @@ -4032,17 +4032,17 @@ RectTransform: m_Children: - {fileID: 4551339722402108901} - {fileID: 3053449365611135054} - - {fileID: 4491000668490005289} - {fileID: 1164717157833169956} - {fileID: 8264390159060979104} + - {fileID: 4491000668490005289} - {fileID: 8539601127519975421} - - {fileID: 5482144863011502994} - {fileID: 6536910438325192580} - {fileID: 7089605701005238764} - {fileID: 1391245266664431848} - {fileID: 4219303162948560369} - {fileID: 7412017548843780828} - {fileID: 4383495645718972772} + - {fileID: 5482144863011502994} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -4064,7 +4064,10 @@ MonoBehaviour: m_EditorClassIdentifier: content: {fileID: 7049295459616353746} layoutElement: {fileID: 2225817646999968926} - button: {fileID: 1243830395405912301} + expandButton: {fileID: 1243830395405912301} + enterStorylineButton: {fileID: 902400648064669948} + enterSongSelectionButton: {fileID: 5935354699868473682} + chapterName: isExpanded: 0 isDuringAnimation: 0 bottomTip: {fileID: 3369054462927452463} @@ -4727,7 +4730,7 @@ GameObject: - component: {fileID: 888334063374963160} - component: {fileID: 1243830395405912301} m_Layer: 5 - m_Name: Button + m_Name: ExpandButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/Menu/Chapter/ChapterSelection.prefab.meta b/Assets/Prefabs/Menu/ChapterSelection/ChapterSelection.prefab.meta similarity index 100% rename from Assets/Prefabs/Menu/Chapter/ChapterSelection.prefab.meta rename to Assets/Prefabs/Menu/ChapterSelection/ChapterSelection.prefab.meta diff --git a/Assets/Prefabs/Menu/SongSelection.meta b/Assets/Prefabs/Menu/SongSelection.meta new file mode 100644 index 00000000..529d9988 --- /dev/null +++ b/Assets/Prefabs/Menu/SongSelection.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2db6e8ec612d964d98b85207c85e895 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Menu/SongSelection/SongSelectionTab.prefab b/Assets/Prefabs/Menu/SongSelection/SongSelectionTab.prefab new file mode 100644 index 00000000..ea760e63 --- /dev/null +++ b/Assets/Prefabs/Menu/SongSelection/SongSelectionTab.prefab @@ -0,0 +1,501 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1436000617920105069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8536548118669694916} + - component: {fileID: 8345872182840364925} + - component: {fileID: 7419423604420564312} + - component: {fileID: 6093386095854275100} + m_Layer: 5 + m_Name: SongSelectionTab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8536548118669694916 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1436000617920105069} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6247940886474273465} + - {fileID: 2186738650345674754} + m_Father: {fileID: 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_SizeDelta: {x: 980, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8345872182840364925 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1436000617920105069} + m_CullTransparentMesh: 0 +--- !u!114 &7419423604420564312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1436000617920105069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.39215687} + 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: 5e16c7aea118d68498053518146c9cf9, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 10 +--- !u!114 &6093386095854275100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1436000617920105069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e65fe538f854fc041a6bc0065c5959b9, type: 3} + m_Name: + m_EditorClassIdentifier: + connectedSong: + songName: + displaySongName: + composer: + isNewSong: 0 + songSwitch: + idInternal: 0 + valueGuidInternal: + groupIdInternal: 0 + groupGuidInternal: + WwiseObjectReference: {fileID: 0} + albumIconCover: {fileID: 0} + albumIllustrationCover: {fileID: 0} + illustratorName: + additionalInformation: + difficultyDataList: [] + songNameText: {fileID: 1112448872792176886} + switchDifficultyButton: {fileID: 4539070712526871303} + currentDifficultyName: +--- !u!1 &2995843195340799518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4258703617781175079} + - component: {fileID: 5069000752092650568} + - component: {fileID: 4496223596282735305} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4258703617781175079 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2995843195340799518} + 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: 2186738650345674754} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5069000752092650568 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2995843195340799518} + m_CullTransparentMesh: 1 +--- !u!114 &4496223596282735305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2995843195340799518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Difficulty Lv.X + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4315792707800784636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6247940886474273465} + - component: {fileID: 449787441181856078} + - component: {fileID: 1112448872792176886} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6247940886474273465 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4315792707800784636} + 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: 8536548118669694916} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 245, y: 0} + m_SizeDelta: {x: 490, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &449787441181856078 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4315792707800784636} + m_CullTransparentMesh: 1 +--- !u!114 &1112448872792176886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4315792707800784636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Song Name + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 19a92ec938f7b364dad1975875f9fe3a, type: 2} + m_sharedMaterial: {fileID: -5812992765432063453, guid: 19a92ec938f7b364dad1975875f9fe3a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8998634759518483856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2186738650345674754} + - component: {fileID: 503392587650119134} + - component: {fileID: 7578099826838010891} + - component: {fileID: 4539070712526871303} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2186738650345674754 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8998634759518483856} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4258703617781175079} + m_Father: {fileID: 8536548118669694916} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -150, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &503392587650119134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8998634759518483856} + m_CullTransparentMesh: 1 +--- !u!114 &7578099826838010891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8998634759518483856} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4539070712526871303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8998634759518483856} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7578099826838010891} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Prefabs/Menu/SongSelection/SongSelectionTab.prefab.meta b/Assets/Prefabs/Menu/SongSelection/SongSelectionTab.prefab.meta new file mode 100644 index 00000000..0d195bdb --- /dev/null +++ b/Assets/Prefabs/Menu/SongSelection/SongSelectionTab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed294c3952286f543be7a8908b1735e0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Beatmaps/Chapter1.meta b/Assets/Resources/Beatmaps/Chapter0.meta similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1.meta rename to Assets/Resources/Beatmaps/Chapter0.meta diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone.meta b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone.meta similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone.meta rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone.meta diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard.meta b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard.meta similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard.meta rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard.meta diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/Beatmap.bytes similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/Beatmap.bytes rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/Beatmap.bytes diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/Beatmap.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/Beatmap.bytes.meta similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/Beatmap.bytes.meta rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/Beatmap.bytes.meta diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/Beatmap.json b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/Beatmap.json similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/Beatmap.json rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/Beatmap.json diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/Beatmap.json.meta b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/Beatmap.json.meta similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/Beatmap.json.meta rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/Beatmap.json.meta diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/CommandScripts.bytes similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/CommandScripts.bytes rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/CommandScripts.bytes diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/CommandScripts.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/CommandScripts.bytes.meta similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/CommandScripts.bytes.meta rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/CommandScripts.bytes.meta diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/ProjectInfo.bytes similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/ProjectInfo.bytes rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/ProjectInfo.bytes diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/ProjectInfo.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/ProjectInfo.bytes.meta similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/ProjectInfo.bytes.meta rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/ProjectInfo.bytes.meta diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/SongInfo.bytes similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/SongInfo.bytes rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/SongInfo.bytes diff --git a/Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/SongInfo.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/SongInfo.bytes.meta similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Chaos Zone/Hard/SongInfo.bytes.meta rename to Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Hard/SongInfo.bytes.meta diff --git a/Assets/Resources/Beatmaps/Chapter1/Ice Flower.meta b/Assets/Resources/Beatmaps/Chapter0/Ice Flower.meta similarity index 100% rename from Assets/Resources/Beatmaps/Chapter1/Ice Flower.meta rename to Assets/Resources/Beatmaps/Chapter0/Ice Flower.meta diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index fdd2f7f3..f0aad2ca 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -826,140 +826,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 179146692} m_CullTransparentMesh: 1 ---- !u!1001 &179503906 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3166036863631877736} - m_Modifications: - - target: {fileID: 7049295459616353709, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_Name - value: ChapterSelection - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353709, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_SizeDelta.y - value: 826 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -390 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f536078f3fe8e764aba92be12b81c2c4, type: 3} ---- !u!224 &179503907 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, - type: 3} - m_PrefabInstance: {fileID: 179503906} - m_PrefabAsset: {fileID: 0} --- !u!1 &217492843 GameObject: m_ObjectHideFlags: 0 @@ -1531,7 +1397,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &491543718 RectTransform: m_ObjectHideFlags: 0 @@ -1661,7 +1527,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &512486723 Transform: m_ObjectHideFlags: 0 @@ -1760,6 +1626,10 @@ MonoBehaviour: SerializationNodes: [] mainCanvasGroup: {fileID: 1480276027} enterGameButton: {fileID: 2147175104} + switchDifficultyButton: {fileID: 728129700} + songName: + difficulties: [] + difficultyName: --- !u!1 &582350574 GameObject: m_ObjectHideFlags: 0 @@ -2652,7 +2522,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1365808733} - - {fileID: 1997349837} m_Father: {fileID: 1998834542} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2672,6 +2541,92 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &722557507 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 722557508} + - component: {fileID: 722557511} + - component: {fileID: 722557510} + - component: {fileID: 722557509} + m_Layer: 5 + m_Name: List + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &722557508 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722557507} + 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: 1142037536} + 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: -1420} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &722557509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722557507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &722557510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722557507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 1 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!222 &722557511 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722557507} + m_CullTransparentMesh: 0 --- !u!1 &728129698 GameObject: m_ObjectHideFlags: 0 @@ -2754,7 +2709,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 728129701} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 525576375} + m_TargetAssemblyTypeName: Ichni.UI.PrepareUIPage, Assembly-CSharp + m_MethodName: SwitchDifficulty + 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 &728129701 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3077,22 +3044,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f493d04990806d4ea9ca1e0f7733048, type: 3} m_Name: m_EditorClassIdentifier: + startUIPage: {fileID: 0} + chapterSelectionUIPage: {fileID: 0} + storyUIPage: {fileID: 0} + dialogUIPage: {fileID: 0} + songSelectionUIPage: {fileID: 0} prepareUIPage: {fileID: 525576375} - testSprite: {fileID: 0} - testChapterSwitch: - idInternal: 0 - valueGuidInternal: - groupIdInternal: 0 - groupGuidInternal: - WwiseObjectReference: {fileID: 11400000, guid: 2ff408e18dac94f4085dcf4eb39c3be7, - type: 2} - testMusicSwitch: - idInternal: 0 - valueGuidInternal: - groupIdInternal: 0 - groupGuidInternal: - WwiseObjectReference: {fileID: 11400000, guid: 5f8118f2efa6a7441a047bc29e699ec4, - type: 2} --- !u!114 &811649974 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3144,7 +3101,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &859038602 RectTransform: m_ObjectHideFlags: 0 @@ -3236,9 +3193,9 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 859038601} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 --- !u!1 &869340148 GameObject: @@ -3542,6 +3499,7 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] + songSelectionUIPage: {fileID: 0} --- !u!1 &1010633828 GameObject: m_ObjectHideFlags: 0 @@ -4090,7 +4048,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: content: {fileID: 8360186} - textBlockPrefab: {fileID: 8279096577214194803, guid: e145c2ee4ead96e49ae0c8774d6128df, + dialogBlockPrefab: {fileID: 8279096577214194803, guid: e145c2ee4ead96e49ae0c8774d6128df, type: 3} musicBlockPrefab: {fileID: 8279096577214194803, guid: f0a5abea137f9b446b0408c9dc2d66a8, type: 3} @@ -4508,6 +4466,164 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1141383795} m_CullTransparentMesh: 0 +--- !u!1 &1142037535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1142037536} + - component: {fileID: 1142037540} + - component: {fileID: 1142037539} + - component: {fileID: 1142037538} + - component: {fileID: 1142037537} + m_Layer: 5 + m_Name: Scroll Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1142037536 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142037535} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 722557508} + m_Father: {fileID: 1842726725} + 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 &1142037537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142037535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &1142037538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142037535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 722557508} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1142037539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142037535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.1764706, g: 0.25490198, b: 0.33333334, 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: 5e16c7aea118d68498053518146c9cf9, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 6 +--- !u!222 &1142037540 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1142037535} + m_CullTransparentMesh: 0 +--- !u!1 &1149259736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1149259737} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1149259737 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149259736} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1892873559} + - {fileID: 1842726725} + m_Father: {fileID: 1647879295} + 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!1 &1186915510 GameObject: m_ObjectHideFlags: 0 @@ -4852,7 +4968,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1296688833 RectTransform: m_ObjectHideFlags: 0 @@ -4945,9 +5061,9 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1296688832} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 --- !u!1 &1365808732 GameObject: @@ -4985,9 +5101,9 @@ RectTransform: - {fileID: 217492844} - {fileID: 61907791} - {fileID: 290007304} - - {fileID: 491543718} - {fileID: 1672615611} - {fileID: 2009017381} + - {fileID: 491543718} m_Father: {fileID: 708872017} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -5705,10 +5821,69 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1480276022} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 +--- !u!1 &1506872040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1506872042} + - component: {fileID: 1506872041} + m_Layer: 5 + m_Name: SongSelectionPage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1506872041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506872040} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bc849ebcc9595745a8a2584eb86eeee, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + mainCanvasGroup: {fileID: 1647879291} + songSelectionTabPrefab: {fileID: 1436000617920105069, guid: ed294c3952286f543be7a8908b1735e0, + type: 3} + songSelectionTabContainer: {fileID: 722557508} + songSelectionTabs: [] +--- !u!4 &1506872042 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506872040} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1647879295} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1519945291 GameObject: m_ObjectHideFlags: 0 @@ -5974,6 +6149,7 @@ MonoBehaviour: chapterSelectionUIPage: {fileID: 512486724} chapters: - {fileID: 11400000, guid: f36a8d771b3945a4c9968628b65ac876, type: 2} + currentChapter: Chapter0 --- !u!1 &1526614486 GameObject: m_ObjectHideFlags: 0 @@ -6049,6 +6225,121 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1526614486} m_CullTransparentMesh: 0 +--- !u!1 &1647879290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1647879295} + - component: {fileID: 1647879294} + - component: {fileID: 1647879293} + - component: {fileID: 1647879292} + - component: {fileID: 1647879291} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!225 &1647879291 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647879290} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!114 &1647879292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647879290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 631 +--- !u!114 &1647879293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647879290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 2560, y: 1440} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1647879294 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647879290} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 751614408} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 1 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1647879295 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647879290} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1149259737} + m_Father: {fileID: 1506872042} + 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1657412685 GameObject: m_ObjectHideFlags: 0 @@ -6802,6 +7093,42 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &1842726724 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1842726725} + m_Layer: 5 + m_Name: SongList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1842726725 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842726724} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1142037536} + m_Father: {fileID: 1149259737} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -500, y: 0} + m_SizeDelta: {x: 1000, y: 1440} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1876757692 GameObject: m_ObjectHideFlags: 0 @@ -6877,6 +7204,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1876757692} m_CullTransparentMesh: 1 +--- !u!1 &1892873558 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1892873559} + - component: {fileID: 1892873561} + - component: {fileID: 1892873560} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1892873559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892873558} + 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: 1149259737} + 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 &1892873560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892873558} + 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: 68263c4f27cacdd4a9f1a1cd0b45f89a, 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 &1892873561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892873558} + m_CullTransparentMesh: 1 --- !u!1 &1926757888 GameObject: m_ObjectHideFlags: 0 @@ -7317,81 +7719,6 @@ MonoBehaviour: mAlignment_LTR: 514 mAlignmentWasRTL: 0 mInitializeAlignment: 0 ---- !u!1 &1997349836 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1997349837} - - component: {fileID: 1997349839} - - component: {fileID: 1997349838} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1997349837 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1997349836} - 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: 708872017} - 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 &1997349838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1997349836} - 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: 0.20784314} - 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: 554ed049e7048d549b51ec2bd5e87bdf, 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 &1997349839 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1997349836} - m_CullTransparentMesh: 1 --- !u!1 &1998834541 GameObject: m_ObjectHideFlags: 0 @@ -7409,7 +7736,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1998834542 Transform: m_ObjectHideFlags: 0 @@ -7648,7 +7975,7 @@ ParticleSystem: ringBufferLoopRange: {x: 0, y: 1} emitterVelocityMode: 1 looping: 1 - prewarm: 0 + prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 @@ -8350,7 +8677,7 @@ ParticleSystem: sphericalDirectionAmount: 0 randomPositionAmount: 0 radius: - value: 50 + value: 75 mode: 0 spread: 0 speed: @@ -12374,7 +12701,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2091561606 RectTransform: m_ObjectHideFlags: 0 @@ -12402,9 +12729,9 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2091561605} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 --- !u!114 &2091561608 MonoBehaviour: @@ -12675,9 +13002,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 811649973} - m_TargetAssemblyTypeName: Ichni.Menu.MenuManager, Assembly-CSharp - m_MethodName: TestEnterGame + - m_Target: {fileID: 525576375} + m_TargetAssemblyTypeName: Ichni.UI.PrepareUIPage, Assembly-CSharp + m_MethodName: EnterGame m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -12838,8 +13165,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 179503907} + m_Children: [] m_Father: {fileID: 3166036863773879195} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -13124,15 +13450,8 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: storyVariables - Entry: 6 - Data: - - Name: selectedChoices - Entry: 6 - Data: storyline: {fileID: 1091682064} storyUIPage: {fileID: 78737089} - currentChapter: Chapter0 --- !u!4 &5788293620442285278 Transform: m_ObjectHideFlags: 0 @@ -13377,15 +13696,16 @@ SceneRoots: - {fileID: 811649975} - {fileID: 1525336453} - {fileID: 951833081} - - {fileID: 1186915512} - {fileID: 6447520319398441545} - {fileID: 4003430166136740793} - {fileID: 389596702} + - {fileID: 1998834542} - {fileID: 5788293620442285278} - {fileID: 525576374} - {fileID: 78737088} + - {fileID: 1506872042} - {fileID: 512486723} - - {fileID: 1998834542} - {fileID: 1385276031} - {fileID: 1680965685} - {fileID: 1477759537} + - {fileID: 1186915512} diff --git a/Assets/Scripts/Manager/ProjectLoader.cs b/Assets/Scripts/Manager/ProjectLoader.cs index a9c70655..54d253fc 100644 --- a/Assets/Scripts/Manager/ProjectLoader.cs +++ b/Assets/Scripts/Manager/ProjectLoader.cs @@ -32,7 +32,9 @@ namespace Ichni ThemeBundleManager.instance.LoadThemeBundles(new List(){"departure_to_multiverse"}); Observable.EveryUpdate().Where(_ => ThemeBundleManager.instance.waitingBundleAmount.Value == 0).First().Subscribe(_ => { - Load("Chapter1", "Chaos Zone", "Hard"); + Load(InformationTransistor.instance.chapterName, + InformationTransistor.instance.songName, + InformationTransistor.instance.difficultyName); }); Observable.EveryUpdate() diff --git a/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionManager.cs b/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionManager.cs index 97f35e8f..f82a23a8 100644 --- a/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionManager.cs +++ b/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionManager.cs @@ -14,7 +14,7 @@ namespace Ichni public ChapterSelectionUIPage chapterSelectionUIPage; public List chapters; - + public string currentChapter; } public partial class ChapterSelectionManager diff --git a/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionUnit.cs b/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionUnit.cs index 1941f54a..6b92f853 100644 --- a/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionUnit.cs +++ b/Assets/Scripts/Menu/ChapterSelection/ChapterSelectionUnit.cs @@ -5,6 +5,7 @@ using System.Linq; using AK.Wwise; using Sirenix.OdinInspector; using UnityEngine; +using UnityEngine.Serialization; namespace Ichni.Menu { @@ -28,13 +29,13 @@ namespace Ichni.Menu { if(song.difficultyDataList.All(d => d.difficultyName != "Easy")) { - song.difficultyDataList.Add(new DifficultyData("Easy","", "", + song.difficultyDataList.Add(new DifficultyData("Easy","", 0, "", new Color(0f, 0.7f, 0.2f, 1f))); } if (song.difficultyDataList.All(d => d.difficultyName != "Hard")) { - song.difficultyDataList.Add(new DifficultyData("Hard", "", "", + song.difficultyDataList.Add(new DifficultyData("Hard", "", 0, "", new Color(1f, 0.2f, 0.2f, 1f))); } } @@ -52,8 +53,8 @@ namespace Ichni.Menu [FoldoutGroup("$songName")] public string displaySongName; - [FoldoutGroup("$songName")] - public string author; + [FormerlySerializedAs("author")] [FoldoutGroup("$songName")] + public string composer; [FoldoutGroup("$songName")] public bool isNewSong; @@ -82,15 +83,16 @@ namespace Ichni.Menu { public string difficultyName; public string displayDifficultyName; - + public int difficultyValue; public string designerName; public Color color; - public DifficultyData(string difficultyName, string displayDifficultyName, string designerName, Color color) + public DifficultyData(string difficultyName, string displayDifficultyName, int difficultyValue, string designerName, Color color) { this.difficultyName = difficultyName; this.displayDifficultyName = displayDifficultyName; this.designerName = designerName; + this.difficultyValue = difficultyValue; this.color = color; } } diff --git a/Assets/Scripts/Menu/InformationTransistor.cs b/Assets/Scripts/Menu/InformationTransistor.cs index dee99386..c5240605 100644 --- a/Assets/Scripts/Menu/InformationTransistor.cs +++ b/Assets/Scripts/Menu/InformationTransistor.cs @@ -25,18 +25,18 @@ namespace Ichni public Switch chapterSwitch; public Switch musicSwitch; - private void Start() + private void Awake() { - if (instance!=null && instance != this) - { - Destroy(gameObject); - } - else + if (instance == null) { instance = this; DontDestroyOnLoad(gameObject); isReturnedFromGame = false; } + else + { + Destroy(gameObject); + } } public void SetInformation(string chapterName, string songName, string composerName, diff --git a/Assets/Scripts/Menu/MenuManager.cs b/Assets/Scripts/Menu/MenuManager.cs index 9650b982..1e67a0c9 100644 --- a/Assets/Scripts/Menu/MenuManager.cs +++ b/Assets/Scripts/Menu/MenuManager.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using AK.Wwise; +using Ichni.Story.UI; using Ichni.UI; using Sirenix.OdinInspector; using UnityEngine; @@ -14,7 +15,12 @@ namespace Ichni { public static MenuManager instance; - [FormerlySerializedAs("preparePage")] public PrepareUIPage prepareUIPage; + public StartUIPage startUIPage; + public ChapterSelectionUIPage chapterSelectionUIPage; + public StoryUIPage storyUIPage; + public DialogUIPage dialogUIPage; + public SongSelectionUIPage songSelectionUIPage; + public PrepareUIPage prepareUIPage; } public partial class MenuManager @@ -36,21 +42,8 @@ namespace Ichni public partial class MenuManager { - public Sprite testSprite; - public Switch testChapterSwitch; - public Switch testMusicSwitch; - public void TestEnterGame() { - InformationTransistor.instance.SetInformation( - "Chapter 1", - "Chaos Zone", - "s/a_荒しそら & LaRin", - "Hard", - "None", - "Trader", - Color.red, testSprite,testChapterSwitch, testMusicSwitch); - asyncOperation.allowSceneActivation = true; } diff --git a/Assets/Scripts/Menu/SongSelection/SongSelectionManager.cs b/Assets/Scripts/Menu/SongSelection/SongSelectionManager.cs index 14f9ab7c..032ecc5f 100644 --- a/Assets/Scripts/Menu/SongSelection/SongSelectionManager.cs +++ b/Assets/Scripts/Menu/SongSelection/SongSelectionManager.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using Ichni.RhythmGame; +using Ichni.UI; using Sirenix.OdinInspector; using UnityEngine; @@ -10,6 +11,8 @@ namespace Ichni.Menu public partial class SongSelectionManager : SerializedMonoBehaviour { public static SongSelectionManager instance; + + public SongSelectionUIPage songSelectionUIPage; private void Awake() diff --git a/Assets/Scripts/Saving.meta b/Assets/Scripts/Saving.meta new file mode 100644 index 00000000..419a2657 --- /dev/null +++ b/Assets/Scripts/Saving.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 81811d9d9c15b884592f7264eb06fad2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Menu/SongSelection/BeatmapSave.cs b/Assets/Scripts/Saving/BeatmapSave.cs similarity index 100% rename from Assets/Scripts/Menu/SongSelection/BeatmapSave.cs rename to Assets/Scripts/Saving/BeatmapSave.cs diff --git a/Assets/Scripts/Menu/SongSelection/BeatmapSave.cs.meta b/Assets/Scripts/Saving/BeatmapSave.cs.meta similarity index 100% rename from Assets/Scripts/Menu/SongSelection/BeatmapSave.cs.meta rename to Assets/Scripts/Saving/BeatmapSave.cs.meta diff --git a/Assets/Scripts/Game/GameSaveManager.cs b/Assets/Scripts/Saving/GameSaveManager.cs similarity index 100% rename from Assets/Scripts/Game/GameSaveManager.cs rename to Assets/Scripts/Saving/GameSaveManager.cs diff --git a/Assets/Scripts/Game/GameSaveManager.cs.meta b/Assets/Scripts/Saving/GameSaveManager.cs.meta similarity index 100% rename from Assets/Scripts/Game/GameSaveManager.cs.meta rename to Assets/Scripts/Saving/GameSaveManager.cs.meta diff --git a/Assets/Scripts/Menu/SongSelection/SongStatusSave.cs b/Assets/Scripts/Saving/SongStatusSave.cs similarity index 100% rename from Assets/Scripts/Menu/SongSelection/SongStatusSave.cs rename to Assets/Scripts/Saving/SongStatusSave.cs diff --git a/Assets/Scripts/Menu/SongSelection/SongStatusSave.cs.meta b/Assets/Scripts/Saving/SongStatusSave.cs.meta similarity index 100% rename from Assets/Scripts/Menu/SongSelection/SongStatusSave.cs.meta rename to Assets/Scripts/Saving/SongStatusSave.cs.meta diff --git a/Assets/Scripts/Story/StorySave.cs b/Assets/Scripts/Saving/StorySave.cs similarity index 100% rename from Assets/Scripts/Story/StorySave.cs rename to Assets/Scripts/Saving/StorySave.cs diff --git a/Assets/Scripts/Story/StorySave.cs.meta b/Assets/Scripts/Saving/StorySave.cs.meta similarity index 100% rename from Assets/Scripts/Story/StorySave.cs.meta rename to Assets/Scripts/Saving/StorySave.cs.meta diff --git a/Assets/Scripts/Story/Dialog/DialogManager.cs b/Assets/Scripts/Story/Dialog/DialogManager.cs index 7bea2160..50372576 100644 --- a/Assets/Scripts/Story/Dialog/DialogManager.cs +++ b/Assets/Scripts/Story/Dialog/DialogManager.cs @@ -41,7 +41,7 @@ namespace Ichni.Story public void SetDialog(string dialogName) { - string chapter = StoryManager.instance.currentChapter; + string chapter = ChapterSelectionManager.instance.currentChapter; TextAsset dialog = Resources.Load("Story/" + chapter + "/Dialogs/" + dialogName); SetDialog(new List { dialog }); } diff --git a/Assets/Scripts/Story/Dialog/StoryManager.cs b/Assets/Scripts/Story/Dialog/StoryManager.cs index 2d2632fe..2268aec9 100644 --- a/Assets/Scripts/Story/Dialog/StoryManager.cs +++ b/Assets/Scripts/Story/Dialog/StoryManager.cs @@ -14,8 +14,7 @@ namespace Ichni.Story [FormerlySerializedAs("storylineDisplay")] public Storyline storyline; public StoryUIPage storyUIPage; - - public string currentChapter; + public Dictionary storyDatas; diff --git a/Assets/Scripts/Story/StoryUI/Blocks/SongBlockUI.cs b/Assets/Scripts/Story/StoryUI/Blocks/SongBlockUI.cs index d6c3e09e..f535cd8e 100644 --- a/Assets/Scripts/Story/StoryUI/Blocks/SongBlockUI.cs +++ b/Assets/Scripts/Story/StoryUI/Blocks/SongBlockUI.cs @@ -29,6 +29,7 @@ namespace Ichni.Story.UI button.onClick.AddListener(() => { + MenuManager.instance.prepareUIPage.SetUpPrepareUIPage(songName); MenuManager.instance.prepareUIPage.FadeIn(); }); @@ -44,7 +45,7 @@ namespace Ichni.Story.UI { SongStatusSave songStatusSave = GameSaveManager.instance.SongSaveModule.songStatusSaves[songName]; - string chapter = StoryManager.instance.currentChapter; + string chapter = ChapterSelectionManager.instance.currentChapter; ChapterSelectionUnit cpt = ChapterSelectionManager.instance.chapters.First(c => c.chapterIndex == chapter); SongItemData song = cpt.songs.First(s => s.songName == this.songName); foreach (DifficultyData difficulty in song.difficultyDataList) diff --git a/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceGroupUI.cs b/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceGroupUI.cs index dfa9b8bb..1a1e0101 100644 --- a/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceGroupUI.cs +++ b/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceGroupUI.cs @@ -28,7 +28,7 @@ namespace Ichni.Story.UI int cIndex = index; // Capture the current index for the listener GameObject choiceButton = Instantiate(choiceButtonPrefab, container); - choiceButton.GetComponentInChildren().SetTerm(StoryManager.instance.currentChapter + "/" + choice.choiceText); + choiceButton.GetComponentInChildren().SetTerm(ChapterSelectionManager.instance.currentChapter + "/" + choice.choiceText); choiceButton.GetComponent