diff --git a/Assets/Fonts/ja/SarasaGothicSC-Regular SDF ja Kanji-1.asset b/Assets/Fonts/ja/SarasaGothicSC-Regular SDF ja Kanji-1.asset index 1eece715..57054cdd 100644 --- a/Assets/Fonts/ja/SarasaGothicSC-Regular SDF ja Kanji-1.asset +++ b/Assets/Fonts/ja/SarasaGothicSC-Regular SDF ja Kanji-1.asset @@ -73,9 +73,9 @@ Material: - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.9 + - _ScaleRatioB: 0.73125 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -168,9 +168,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} m_Name: SarasaGothicSC-Regular SDF ja Kanji-1 m_EditorClassIdentifier: - hashCode: 0 + hashCode: 1381821259 material: {fileID: -9109684437157846903} - materialHashCode: 0 + materialHashCode: -1017365621 m_Version: 1.1.0 m_SourceFontFileGUID: 2f42c1d891af66e4ba426c82a0075872 m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 2f42c1d891af66e4ba426c82a0075872, diff --git a/Assets/Fonts/ja/SarasaGothicSC-Regular SDF ja Kanji-2.asset b/Assets/Fonts/ja/SarasaGothicSC-Regular SDF ja Kanji-2.asset index 9cbf5920..60b63281 100644 --- a/Assets/Fonts/ja/SarasaGothicSC-Regular SDF ja Kanji-2.asset +++ b/Assets/Fonts/ja/SarasaGothicSC-Regular SDF ja Kanji-2.asset @@ -60,9 +60,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} m_Name: SarasaGothicSC-Regular SDF ja Kanji-2 m_EditorClassIdentifier: - hashCode: 0 + hashCode: 1381821256 material: {fileID: 532232478057347017} - materialHashCode: 0 + materialHashCode: -527065496 m_Version: 1.1.0 m_SourceFontFileGUID: 2f42c1d891af66e4ba426c82a0075872 m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 2f42c1d891af66e4ba426c82a0075872, @@ -272081,9 +272081,9 @@ Material: - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.9 + - _ScaleRatioB: 0.73125 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset new file mode 100644 index 00000000..01436777 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1726182683, guid: a4865f1ab4504ed8a368670db22f409c, type: 3} + m_Name: AOTGenerationConfig + m_EditorClassIdentifier: + automateBeforeBuilds: 0 + deleteDllAfterBuilds: 1 + AutomateForAllAOTPlatforms: 1 + automateForPlatforms: 0900000014000000 + supportSerializedTypes: [] diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset.meta new file mode 100644 index 00000000..38d57ff0 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ab65f5db0f188a4d85864c603336f50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset new file mode 100644 index 00000000..4393db14 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 772478971, guid: a4865f1ab4504ed8a368670db22f409c, type: 3} + m_Name: ColorPaletteManager + m_EditorClassIdentifier: + colorPalettes: + - name: Country + showAlpha: 0 + colors: + - {r: 0.776, g: 0.651, b: 0.349, a: 1} + - {r: 0.863, g: 0.761, b: 0.631, a: 1} + - {r: 0.91, g: 0.831, b: 0.686, a: 1} + - {r: 0.961, g: 0.902, b: 0.788, a: 1} + - {r: 0.753, g: 0.714, b: 0.667, a: 1} + - {r: 0.478, g: 0.573, b: 0.431, a: 1} + - {r: 0.314, g: 0.427, b: 0.31, a: 1} + - {r: 0.596, g: 0.345, b: 0.235, a: 1} + - {r: 0.545, g: 0.329, b: 0.318, a: 1} + - {r: 0.647, g: 0.204, b: 0.227, a: 1} + - {r: 0.435, g: 0.161, b: 0.063, a: 1} + - {r: 0.357, g: 0.333, b: 0.278, a: 1} + - {r: 0.976, g: 0.98, b: 0.961, a: 1} + - {r: 0.165, g: 0.271, b: 0.11, a: 1} + - name: Beach + showAlpha: 0 + colors: + - {r: 0.996, g: 0.906, b: 0.459, a: 1} + - {r: 0.314, g: 0.592, b: 0.035, a: 1} + - {r: 0.486, g: 0.953, b: 0.875, a: 1} + - {r: 0.996, g: 0.82, b: 0.212, a: 1} + - {r: 1, g: 0.769, b: 0.165, a: 1} + - {r: 0.804, g: 0.835, b: 0.753, a: 1} + - {r: 1, g: 0.769, b: 0.165, a: 1} + - {r: 1, g: 0.702, b: 0.063, a: 1} + - {r: 1, g: 0.898, b: 0.569, a: 1} + - name: Fall + showAlpha: 0 + colors: + - {r: 0.82, g: 0.722, b: 0.318, a: 1} + - {r: 0.537, g: 0.192, b: 0.153, a: 1} + - {r: 0.996, g: 0.812, b: 0.012, a: 1} + - {r: 1, g: 0.431, b: 0.02, a: 1} + - {r: 0.937, g: 0.267, b: 0.094, a: 1} + - {r: 0.42, g: 0.212, b: 0.18, a: 1} + - {r: 0.992, g: 0.651, b: 0.004, a: 1} + - {r: 0.89, g: 0.353, b: 0.086, a: 1} + - {r: 1, g: 0.443, b: 0.004, a: 1} + - {r: 0.682, g: 0.275, b: 0.137, a: 1} + - {r: 0.306, g: 0.231, b: 0.114, a: 1} + - {r: 0.384, g: 0.416, b: 0.082, a: 1} + - {r: 0.165, g: 0.157, b: 0.008, a: 1} + - {r: 0.906, g: 0.635, b: 0.227, a: 1} + - {r: 0.82, g: 0.722, b: 0.318, a: 1} + - {r: 0.745, g: 0.435, b: 0.031, a: 1} + - {r: 0.765, g: 0.682, b: 0.569, a: 1} + - {r: 0.18, g: 0.149, b: 0.075, a: 1} + - {r: 0.702, g: 0.451, b: 0.059, a: 1} + - name: Passion + showAlpha: 0 + colors: + - {r: 0.925, g: 0.682, b: 0.624, a: 1} + - {r: 0.188, g: 0.114, b: 0.224, a: 1} + - {r: 0.349, g: 0.11, b: 0.231, a: 1} + - {r: 0.435, g: 0.267, b: 0.357, a: 1} + - name: Sepia + showAlpha: 0 + colors: + - {r: 0.353, g: 0.098, b: 0.02, a: 1} + - {r: 0.663, g: 0.188, b: 0.114, a: 1} + - {r: 0.906, g: 0.643, b: 0.082, a: 1} + - {r: 0.996, g: 0.839, b: 0.322, a: 1} + - {r: 0.486, g: 0.392, b: 0.02, a: 1} + - {r: 0.294, g: 0.235, b: 0.012, a: 1} + - name: Floral + showAlpha: 0 + colors: + - {r: 0.855, g: 0.518, b: 0.412, a: 1} + - {r: 0.827, g: 0.294, b: 0.333, a: 1} + - {r: 0.737, g: 0.118, b: 0.208, a: 1} + - {r: 0.549, g: 0.149, b: 0.235, a: 1} + - {r: 0.949, g: 0.925, b: 0.784, a: 1} + - {r: 0.945, g: 0.882, b: 0.69, a: 1} + - {r: 0.871, g: 0.812, b: 0.698, a: 1} + - {r: 0.4, g: 0.196, b: 0.243, a: 1} + - {r: 0.271, g: 0.157, b: 0.227, a: 1} + - name: Underwater + showAlpha: 0 + colors: + - {r: 0.663, g: 0.416, b: 0.733, a: 1} + - {r: 0.2, g: 0.6, b: 0.698, a: 1} + - {r: 0.11, g: 0.49, b: 0.698, a: 1} + - {r: 0.439, g: 0.627, b: 0.227, a: 1} + - {r: 0, g: 0.357, b: 0.604, a: 1} + - {r: 0.067, g: 0.271, b: 0.353, a: 1} + - name: Breeze + showAlpha: 0 + colors: + - {r: 0.706, g: 1, b: 0, a: 1} + - {r: 0.651, g: 1, b: 0.404, a: 1} + - {r: 0.122, g: 1, b: 0.514, a: 1} + - {r: 0.216, g: 0.894, b: 0.961, a: 1} + - {r: 0.4, g: 1, b: 0.882, a: 1} + - {r: 0.027, g: 0.792, b: 0.8, a: 1} + - name: Clovers + showAlpha: 0 + colors: + - {r: 0.431, g: 0.549, b: 0.102, a: 1} + - {r: 0.671, g: 0.714, b: 0.071, a: 1} + - {r: 0.969, g: 0.949, b: 0.831, a: 1} + - {r: 0.886, g: 0.902, b: 0.702, a: 1} + - {r: 0.753, g: 0.824, b: 0.627, a: 1} + - {r: 0.404, g: 0.6, b: 0.4, a: 1} + - name: Tropical + showAlpha: 0 + colors: + - {r: 0.953, g: 0.647, b: 0.804, a: 1} + - {r: 0.965, g: 0.741, b: 0.871, a: 1} + - {r: 0.949, g: 0.549, b: 0.643, a: 1} + - {r: 0.992, g: 0.659, b: 0.498, a: 1} + - {r: 0.976, g: 0.792, b: 0.729, a: 1} + - {r: 0.984, g: 0.855, b: 0.725, a: 1} + - {r: 0.259, g: 0.882, b: 0.663, a: 1} + - {r: 0.349, g: 0.753, b: 0.78, a: 1} + - {r: 0.725, g: 0.976, b: 0.91, a: 1} + - {r: 0.647, g: 0.745, b: 0.957, a: 1} + - {r: 0.725, g: 0.863, b: 0.973, a: 1} + - {r: 0.89, g: 0.945, b: 0.996, a: 1} diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset.meta new file mode 100644 index 00000000..a8f2c0f1 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8c108c70496d3941b217d0196f12edf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset new file mode 100644 index 00000000..338ffe3d --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 188390376, guid: a4865f1ab4504ed8a368670db22f409c, type: 3} + m_Name: ImportSettingsConfig + m_EditorClassIdentifier: + automateBeforeBuild: 1 diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset.meta new file mode 100644 index 00000000..51c63678 --- /dev/null +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2b839425e3449a4c94900ec879ce821 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Menu/Chapter/Chapter1.asset b/Assets/Prefabs/Menu/Chapter/Chapter0.asset similarity index 90% rename from Assets/Prefabs/Menu/Chapter/Chapter1.asset rename to Assets/Prefabs/Menu/Chapter/Chapter0.asset index 945bb349..cf5a7597 100644 --- a/Assets/Prefabs/Menu/Chapter/Chapter1.asset +++ b/Assets/Prefabs/Menu/Chapter/Chapter0.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bf4450f8404fb5d4991d2b5a7973ba31, type: 3} - m_Name: Chapter1 + m_Name: Chapter0 m_EditorClassIdentifier: serializationData: SerializedFormat: 2 @@ -21,9 +21,9 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - chapterIndex: C1 + chapterIndex: Chapter0 chapterName: Departure To Multiverse - chapterSubtitle: Chapter 1 + chapterSubtitle: Chapter 0 themeColor: {r: 0.7987421, g: 0.7987421, b: 0.7987421, a: 1} avatar: {fileID: 21300000, guid: c95e8a2cec6d6fb469f3a2e524fbe890, type: 3} chapterSwitch: @@ -58,3 +58,7 @@ MonoBehaviour: displayDifficultyName: designerName: color: {r: 1, g: 0.2, b: 0.2, a: 1} + - difficultyName: Chaos + displayDifficultyName: + designerName: + color: {r: 1, g: 0, b: 1, a: 1} diff --git a/Assets/Prefabs/Menu/Chapter/Chapter1.asset.meta b/Assets/Prefabs/Menu/Chapter/Chapter0.asset.meta similarity index 100% rename from Assets/Prefabs/Menu/Chapter/Chapter1.asset.meta rename to Assets/Prefabs/Menu/Chapter/Chapter0.asset.meta diff --git a/Assets/Prefabs/Menu/Chapter/ChapterSelection.prefab b/Assets/Prefabs/Menu/Chapter/ChapterSelection.prefab index d7f64d04..fb262b80 100644 --- a/Assets/Prefabs/Menu/Chapter/ChapterSelection.prefab +++ b/Assets/Prefabs/Menu/Chapter/ChapterSelection.prefab @@ -2312,7 +2312,7 @@ MonoBehaviour: 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} + bottomRight: {r: 1, g: 1, b: 1, a: 0} m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 diff --git a/Assets/Prefabs/Story/BeatmapStatusMark.prefab b/Assets/Prefabs/Story/BeatmapStatusMark.prefab new file mode 100644 index 00000000..2cff1217 --- /dev/null +++ b/Assets/Prefabs/Story/BeatmapStatusMark.prefab @@ -0,0 +1,212 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1597223253758175175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4784016156976986300} + - component: {fileID: 7864473739413828157} + - component: {fileID: 6919760681373524986} + 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 &4784016156976986300 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1597223253758175175} + 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: 8130309985027027954} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7864473739413828157 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1597223253758175175} + m_CullTransparentMesh: 1 +--- !u!114 &6919760681373524986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1597223253758175175} + 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: FC + 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: 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: 16 + m_fontSizeBase: 16 + 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 &7574088478242334147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8130309985027027954} + - component: {fileID: 6489654351169417587} + - component: {fileID: 5009749467225280522} + m_Layer: 5 + m_Name: BeatmapStatusMark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8130309985027027954 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7574088478242334147} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.75416523} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4784016156976986300} + 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: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6489654351169417587 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7574088478242334147} + m_CullTransparentMesh: 1 +--- !u!114 &5009749467225280522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7574088478242334147} + 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: 9043ea87d87b2534eac0a4aaa784039f, 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: 1 diff --git a/Assets/Scripts/Story/StorylineTest.csv.meta b/Assets/Prefabs/Story/BeatmapStatusMark.prefab.meta similarity index 62% rename from Assets/Scripts/Story/StorylineTest.csv.meta rename to Assets/Prefabs/Story/BeatmapStatusMark.prefab.meta index a5653adc..40389397 100644 --- a/Assets/Scripts/Story/StorylineTest.csv.meta +++ b/Assets/Prefabs/Story/BeatmapStatusMark.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7ae5431e0e2c6fe48ba5237e56a42769 -TextScriptImporter: +guid: 1fc633b6a9d4908488b25fdb228da86b +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Prefabs/Story/BlockConnectorUI.prefab b/Assets/Prefabs/Story/BlockConnectorUI.prefab index 841cac67..fb83bdde 100644 --- a/Assets/Prefabs/Story/BlockConnectorUI.prefab +++ b/Assets/Prefabs/Story/BlockConnectorUI.prefab @@ -66,22 +66,21 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300002, guid: 66995b6b61aed864daa956ae255d7fee, type: 3} + m_Sprite: {fileID: 0} m_improveResolution: 0 m_Resolution: 0 m_useNativeSize: 0 m_points: - {x: 0.50006104, y: -119.49999} - - {x: 140.50006, y: 251.5} - - {x: 560.50006, y: -99.49999} - - {x: 645.50006, y: 260.5} - lineThickness: 20 + - {x: 140.50006, y: 52.7} + - {x: 560.50006, y: -6.32} + lineThickness: 5 relativeSize: 0 lineList: 0 lineCaps: 0 bezierSegmentsPerCurve: 24 LineJoins: 1 - BezierMode: 2 + BezierMode: 0 drivenExternally: 1 --- !u!114 &-805279860356291106 MonoBehaviour: diff --git a/Assets/Prefabs/Story/CurrentTextBlockUI.prefab b/Assets/Prefabs/Story/CurrentTextBlockUI.prefab new file mode 100644 index 00000000..aed92e21 --- /dev/null +++ b/Assets/Prefabs/Story/CurrentTextBlockUI.prefab @@ -0,0 +1,487 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &147050084074733619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5120337310990590007} + - component: {fileID: 501271540936040954} + - component: {fileID: 4219007272173467644} + m_Layer: 5 + m_Name: OutPort + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5120337310990590007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147050084074733619} + 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: 5350638854831129010} + 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: 0, y: -30} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &501271540936040954 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147050084074733619} + m_CullTransparentMesh: 1 +--- !u!114 &4219007272173467644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147050084074733619} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, 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: 0} + 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!1 &1093014837187042595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8088187650405042001} + - component: {fileID: 8483913691444022236} + - component: {fileID: 8300599191905768772} + m_Layer: 5 + m_Name: InPort + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8088187650405042001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093014837187042595} + 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: 5350638854831129010} + 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: 0, y: -30} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8483913691444022236 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093014837187042595} + m_CullTransparentMesh: 1 +--- !u!114 &8300599191905768772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093014837187042595} + m_Enabled: 0 + 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: 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: 0} + 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!1 &2947357181438598616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 808855937929311006} + - component: {fileID: 3938143345111524688} + - component: {fileID: 1269722336407503250} + - component: {fileID: 3931523710101296998} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &808855937929311006 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947357181438598616} + 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: 5350638854831129010} + 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 &3938143345111524688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947357181438598616} + m_CullTransparentMesh: 1 +--- !u!114 &1269722336407503250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947357181438598616} + 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: a53caee9af6d16b44a78a926722a32f5, 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!114 &3931523710101296998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947357181438598616} + 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: 1269722336407503250} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &7991069327751894070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9095470796084918386} + - component: {fileID: 606259940963463531} + - component: {fileID: 8391808794720387191} + - component: {fileID: 6909263626923910701} + 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 &9095470796084918386 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7991069327751894070} + 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: 5350638854831129010} + 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: -20.000002} + m_SizeDelta: {x: 0, y: -39.999996} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &606259940963463531 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7991069327751894070} + m_CullTransparentMesh: 1 +--- !u!114 &8391808794720387191 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7991069327751894070} + 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: Title + 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: 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: 48 + m_fontSizeBase: 48 + 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!225 &6909263626923910701 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7991069327751894070} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!1 &8279096577214194803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5350638854831129010} + - component: {fileID: 6895756204793606274} + - component: {fileID: 7871082850049165166} + m_Layer: 5 + m_Name: CurrentTextBlockUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5350638854831129010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279096577214194803} + 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: 808855937929311006} + - {fileID: 9095470796084918386} + - {fileID: 8088187650405042001} + - {fileID: 5120337310990590007} + m_Father: {fileID: 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: 0} + m_SizeDelta: {x: 400, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6895756204793606274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279096577214194803} + m_CullTransparentMesh: 1 +--- !u!114 &7871082850049165166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279096577214194803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b976128eb3ec59e4e866dbb610441706, type: 3} + m_Name: + m_EditorClassIdentifier: + blockRect: {fileID: 5350638854831129010} + inPort: {fileID: 8088187650405042001} + outPort: {fileID: 5120337310990590007} + blockName: + blockTitle: + button: {fileID: 3931523710101296998} + titleText: {fileID: 8391808794720387191} diff --git a/Assets/Prefabs/Story/TextBlockUI.prefab.meta b/Assets/Prefabs/Story/CurrentTextBlockUI.prefab.meta similarity index 100% rename from Assets/Prefabs/Story/TextBlockUI.prefab.meta rename to Assets/Prefabs/Story/CurrentTextBlockUI.prefab.meta diff --git a/Assets/Prefabs/Story/Dialog.meta b/Assets/Prefabs/Story/Dialog.meta new file mode 100644 index 00000000..d9fb527d --- /dev/null +++ b/Assets/Prefabs/Story/Dialog.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3724feddb1408843a7995372fbfbe1b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Story/ChoiceButton.prefab b/Assets/Prefabs/Story/Dialog/ChoiceButton.prefab similarity index 79% rename from Assets/Prefabs/Story/ChoiceButton.prefab rename to Assets/Prefabs/Story/Dialog/ChoiceButton.prefab index e081c6f5..2074e011 100644 --- a/Assets/Prefabs/Story/ChoiceButton.prefab +++ b/Assets/Prefabs/Story/Dialog/ChoiceButton.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1314285067314511188 +--- !u!1 &1176251198231594119 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,84 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2016797284792224598} - - component: {fileID: 611474904894693993} - - component: {fileID: 6633181440282358348} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2016797284792224598 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314285067314511188} - 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: 7636465290159887349} - 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 &611474904894693993 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314285067314511188} - m_CullTransparentMesh: 1 ---- !u!114 &6633181440282358348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314285067314511188} - 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.3764706} - 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: e04579cd65e80e848be7d130ab60012a, 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!1 &8033017966764082997 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7636465290159887349} - - component: {fileID: 595282724017128489} - - component: {fileID: 8389971437431979706} + - component: {fileID: 7033351746859775176} + - component: {fileID: 4985437946617883479} + - component: {fileID: 4229387824617991636} + - component: {fileID: 1788110989413035462} m_Layer: 5 m_Name: ChoiceButton m_TagString: Untagged @@ -93,42 +19,42 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7636465290159887349 +--- !u!224 &7033351746859775176 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8033017966764082997} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1176251198231594119} + 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: 2016797284792224598} - - {fileID: 1478741180673821888} + - {fileID: 2707619886607754100} + - {fileID: 618321639625094505} 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: 560, y: 50} + m_SizeDelta: {x: 180, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &595282724017128489 +--- !u!222 &4985437946617883479 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8033017966764082997} + m_GameObject: {fileID: 1176251198231594119} m_CullTransparentMesh: 1 ---- !u!114 &8389971437431979706 +--- !u!114 &4229387824617991636 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8033017966764082997} + m_GameObject: {fileID: 1176251198231594119} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -162,11 +88,23 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 6633181440282358348} + m_TargetGraphic: {fileID: 995447401348897857} m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &8617754669712873818 +--- !u!114 &1788110989413035462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176251198231594119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90f34f59ff260c44796d71c51b7c0ee6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5589057778839743913 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -174,10 +112,85 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1478741180673821888} - - component: {fileID: 5778966826281838880} - - component: {fileID: 7578652067859820047} - - component: {fileID: 9171400094775339908} + - component: {fileID: 2707619886607754100} + - component: {fileID: 3917495085193381294} + - component: {fileID: 995447401348897857} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2707619886607754100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5589057778839743913} + 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: 7033351746859775176} + 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 &3917495085193381294 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5589057778839743913} + m_CullTransparentMesh: 1 +--- !u!114 &995447401348897857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5589057778839743913} + 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.3764706} + 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: e04579cd65e80e848be7d130ab60012a, 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!1 &8577723022881073969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 618321639625094505} + - component: {fileID: 8175011701247594375} + - component: {fileID: 7738645786476951168} + - component: {fileID: 1353276082974954538} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -185,40 +198,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1478741180673821888 +--- !u!224 &618321639625094505 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8617754669712873818} + m_GameObject: {fileID: 8577723022881073969} 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: 7636465290159887349} + m_Father: {fileID: 7033351746859775176} 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 &5778966826281838880 +--- !u!222 &8175011701247594375 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8617754669712873818} + m_GameObject: {fileID: 8577723022881073969} m_CullTransparentMesh: 1 ---- !u!114 &7578652067859820047 +--- !u!114 &7738645786476951168 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8617754669712873818} + m_GameObject: {fileID: 8577723022881073969} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -260,12 +273,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 32 + m_fontSize: 48 m_fontSizeBase: 32 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_enableAutoSizing: 1 + m_fontSizeMin: 16 + m_fontSizeMax: 48 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -276,7 +289,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -302,13 +315,13 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &9171400094775339908 +--- !u!114 &1353276082974954538 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8617754669712873818} + m_GameObject: {fileID: 8577723022881073969} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} diff --git a/Assets/Prefabs/Story/Dialog/ChoiceButton.prefab.meta b/Assets/Prefabs/Story/Dialog/ChoiceButton.prefab.meta new file mode 100644 index 00000000..6e805d1c --- /dev/null +++ b/Assets/Prefabs/Story/Dialog/ChoiceButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 59466bf171ad3d74aa604302094e1a8f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Story/Dialog/ChoiceGroup.prefab b/Assets/Prefabs/Story/Dialog/ChoiceGroup.prefab new file mode 100644 index 00000000..187445ad --- /dev/null +++ b/Assets/Prefabs/Story/Dialog/ChoiceGroup.prefab @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8033017966764082997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7636465290159887349} + - component: {fileID: 595282724017128489} + - component: {fileID: 4618900808982286017} + - component: {fileID: 6630610190885680455} + m_Layer: 5 + m_Name: ChoiceGroup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7636465290159887349 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8033017966764082997} + 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: 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: 800, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &595282724017128489 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8033017966764082997} + m_CullTransparentMesh: 1 +--- !u!114 &4618900808982286017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8033017966764082997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 25 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &6630610190885680455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8033017966764082997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a653477cd0de8794b810214793b04cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + choiceButtonPrefab: {fileID: 1176251198231594119, guid: 59466bf171ad3d74aa604302094e1a8f, + type: 3} + container: {fileID: 7636465290159887349} + choiceButtonList: [] diff --git a/Assets/Prefabs/Story/ChoiceButton.prefab.meta b/Assets/Prefabs/Story/Dialog/ChoiceGroup.prefab.meta similarity index 100% rename from Assets/Prefabs/Story/ChoiceButton.prefab.meta rename to Assets/Prefabs/Story/Dialog/ChoiceGroup.prefab.meta diff --git a/Assets/Prefabs/Story/DialogText.prefab b/Assets/Prefabs/Story/Dialog/DialogText.prefab similarity index 95% rename from Assets/Prefabs/Story/DialogText.prefab rename to Assets/Prefabs/Story/Dialog/DialogText.prefab index 208b8024..f3aa612a 100644 --- a/Assets/Prefabs/Story/DialogText.prefab +++ b/Assets/Prefabs/Story/Dialog/DialogText.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 611474904894693993} - component: {fileID: 6633181440282358348} m_Layer: 5 - m_Name: Image + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -141,7 +141,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Content + m_text: StoryChapter0/C0_Departure_P1_A_D1_S1 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 73f9a9bb620a2b040ab7347b390452fe, type: 2} m_sharedMaterial: {fileID: 1291443754377433884, guid: 73f9a9bb620a2b040ab7347b390452fe, @@ -260,6 +260,7 @@ GameObject: m_Component: - component: {fileID: 7636465290159887349} - component: {fileID: 595282724017128489} + - component: {fileID: 4391875194078862085} m_Layer: 5 m_Name: DialogText m_TagString: Untagged @@ -297,6 +298,21 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8033017966764082997} m_CullTransparentMesh: 1 +--- !u!114 &4391875194078862085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8033017966764082997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 831ccff3dc06bfc4884663d623af866d, type: 3} + m_Name: + m_EditorClassIdentifier: + background: {fileID: 6633181440282358348} + speakerNameText: {fileID: 9171400094775339908} + contentText: {fileID: 7479393659305463332} --- !u!1 &8617754669712873818 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Story/DialogText.prefab.meta b/Assets/Prefabs/Story/Dialog/DialogText.prefab.meta similarity index 100% rename from Assets/Prefabs/Story/DialogText.prefab.meta rename to Assets/Prefabs/Story/Dialog/DialogText.prefab.meta diff --git a/Assets/Prefabs/Story/FinishedTextBlockUI.prefab b/Assets/Prefabs/Story/FinishedTextBlockUI.prefab new file mode 100644 index 00000000..14e3932f --- /dev/null +++ b/Assets/Prefabs/Story/FinishedTextBlockUI.prefab @@ -0,0 +1,611 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &147050084074733619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5120337310990590007} + - component: {fileID: 501271540936040954} + - component: {fileID: 4219007272173467644} + m_Layer: 5 + m_Name: OutPort + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5120337310990590007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147050084074733619} + 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: 5350638854831129010} + 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: 0, y: -30} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &501271540936040954 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147050084074733619} + m_CullTransparentMesh: 1 +--- !u!114 &4219007272173467644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147050084074733619} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, 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: 0} + 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!1 &1093014837187042595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8088187650405042001} + - component: {fileID: 8483913691444022236} + - component: {fileID: 8300599191905768772} + m_Layer: 5 + m_Name: InPort + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8088187650405042001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093014837187042595} + 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: 5350638854831129010} + 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: 0, y: -30} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8483913691444022236 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093014837187042595} + m_CullTransparentMesh: 1 +--- !u!114 &8300599191905768772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093014837187042595} + m_Enabled: 0 + 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: 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: 0} + 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!1 &2947357181438598616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 808855937929311006} + - component: {fileID: 3938143345111524688} + - component: {fileID: 1269722336407503250} + - component: {fileID: 3931523710101296998} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &808855937929311006 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947357181438598616} + 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: 5350638854831129010} + 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 &3938143345111524688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947357181438598616} + m_CullTransparentMesh: 1 +--- !u!114 &1269722336407503250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947357181438598616} + 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: a53caee9af6d16b44a78a926722a32f5, 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!114 &3931523710101296998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947357181438598616} + 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: 1269722336407503250} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &5487477990142788049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1412140060069810010} + - component: {fileID: 7700833151999098032} + - component: {fileID: 2834471624508731075} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1412140060069810010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487477990142788049} + 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: 5350638854831129010} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -3, y: 80} + m_SizeDelta: {x: -6, y: -160} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7700833151999098032 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487477990142788049} + m_CullTransparentMesh: 1 +--- !u!114 &2834471624508731075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487477990142788049} + 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: FINISHED + 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: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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 &7991069327751894070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9095470796084918386} + - component: {fileID: 606259940963463531} + - component: {fileID: 8391808794720387191} + 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 &9095470796084918386 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7991069327751894070} + 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: 5350638854831129010} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -72, y: -20} + m_SizeDelta: {x: 135, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &606259940963463531 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7991069327751894070} + m_CullTransparentMesh: 1 +--- !u!114 &8391808794720387191 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7991069327751894070} + 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: Title + 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: 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: 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 &8279096577214194803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5350638854831129010} + - component: {fileID: 6895756204793606274} + - component: {fileID: 7871082850049165166} + m_Layer: 5 + m_Name: FinishedTextBlockUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5350638854831129010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279096577214194803} + 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: 808855937929311006} + - {fileID: 9095470796084918386} + - {fileID: 1412140060069810010} + - {fileID: 8088187650405042001} + - {fileID: 5120337310990590007} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_SizeDelta: {x: 400, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6895756204793606274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279096577214194803} + m_CullTransparentMesh: 1 +--- !u!114 &7871082850049165166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279096577214194803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b976128eb3ec59e4e866dbb610441706, type: 3} + m_Name: + m_EditorClassIdentifier: + blockName: + position: {x: 0, y: 0} + blockRect: {fileID: 5350638854831129010} + inPort: {fileID: 8088187650405042001} + outPort: {fileID: 5120337310990590007} + blockTitle: + button: {fileID: 3931523710101296998} + titleText: {fileID: 8391808794720387191} + state: 0 diff --git a/Assets/Prefabs/Story/FinishedTextBlockUI.prefab.meta b/Assets/Prefabs/Story/FinishedTextBlockUI.prefab.meta new file mode 100644 index 00000000..0092322e --- /dev/null +++ b/Assets/Prefabs/Story/FinishedTextBlockUI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 44de36b0d423e9c418251e354d843dc4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Story/TextBlockUI.prefab b/Assets/Prefabs/Story/LockedTextBlockUI.prefab similarity index 96% rename from Assets/Prefabs/Story/TextBlockUI.prefab rename to Assets/Prefabs/Story/LockedTextBlockUI.prefab index dec9e8e6..66da9442 100644 --- a/Assets/Prefabs/Story/TextBlockUI.prefab +++ b/Assets/Prefabs/Story/LockedTextBlockUI.prefab @@ -34,7 +34,7 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -30} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &501271540936040954 @@ -52,7 +52,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 147050084074733619} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -109,7 +109,7 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -30} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8483913691444022236 @@ -127,7 +127,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1093014837187042595} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -216,7 +216,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 7ddd15eec542d5f43a4e8a2e01322627, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -302,10 +302,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5350638854831129010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -50, y: 75} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -72, y: -20} + m_SizeDelta: {x: 135, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &606259940963463531 CanvasRenderer: @@ -344,8 +344,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -369,7 +369,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -416,7 +416,7 @@ GameObject: - component: {fileID: 6895756204793606274} - component: {fileID: 7871082850049165166} m_Layer: 5 - m_Name: TextBlockUI + m_Name: LockedTextBlockUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -443,7 +443,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 200} + m_SizeDelta: {x: 400, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6895756204793606274 CanvasRenderer: diff --git a/Assets/Prefabs/Story/LockedTextBlockUI.prefab.meta b/Assets/Prefabs/Story/LockedTextBlockUI.prefab.meta new file mode 100644 index 00000000..e938cc38 --- /dev/null +++ b/Assets/Prefabs/Story/LockedTextBlockUI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f6a037648752e004ba8846f352a8f421 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Story/SongBlockUI.prefab b/Assets/Prefabs/Story/SongBlockUI.prefab index 2c6bf693..2bb6c0a5 100644 --- a/Assets/Prefabs/Story/SongBlockUI.prefab +++ b/Assets/Prefabs/Story/SongBlockUI.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 5732796955640118753} - component: {fileID: 1686831770413399787} - - component: {fileID: 7998495330303362196} m_Layer: 5 m_Name: InPort m_TagString: Untagged @@ -34,7 +33,7 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 71, y: -82.5} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1686831770413399787 @@ -45,36 +44,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1139654734443167197} m_CullTransparentMesh: 1 ---- !u!114 &7998495330303362196 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1139654734443167197} - 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: 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: 0} - 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!1 &2947357181438598616 GameObject: m_ObjectHideFlags: 0 @@ -141,7 +110,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 4e9019f9aabcb3c409ea419fdba522f5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -205,7 +174,6 @@ GameObject: m_Component: - component: {fileID: 4908100188787544557} - component: {fileID: 9115198829922096935} - - component: {fileID: 3907262488122341211} m_Layer: 5 m_Name: OutPort m_TagString: Untagged @@ -229,7 +197,7 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -82.5} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9115198829922096935 @@ -240,36 +208,68 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6180957620423729728} m_CullTransparentMesh: 1 ---- !u!114 &3907262488122341211 +--- !u!1 &7352787072520773963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 572536196246750759} + - component: {fileID: 8357542584952053847} + m_Layer: 0 + m_Name: StatusMarkContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &572536196246750759 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7352787072520773963} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.75416523} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5350638854831129010} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 72.5, y: 115} + m_SizeDelta: {x: 300, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8357542584952053847 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6180957620423729728} + m_GameObject: {fileID: 7352787072520773963} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, 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: 0} - 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 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 3 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &7991069327751894070 GameObject: m_ObjectHideFlags: 0 @@ -281,8 +281,9 @@ GameObject: - component: {fileID: 9095470796084918386} - component: {fileID: 606259940963463531} - component: {fileID: 8391808794720387191} + - component: {fileID: 4504653164803251096} m_Layer: 5 - m_Name: Text (TMP) + m_Name: MusicNameText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -304,8 +305,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: 72.5, y: -15} + m_SizeDelta: {x: 300, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &606259940963463531 CanvasRenderer: @@ -344,8 +345,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -404,6 +405,18 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!225 &4504653164803251096 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7991069327751894070} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 --- !u!1 &8279096577214194803 GameObject: m_ObjectHideFlags: 0 @@ -438,12 +451,13 @@ RectTransform: - {fileID: 9095470796084918386} - {fileID: 5732796955640118753} - {fileID: 4908100188787544557} + - {fileID: 572536196246750759} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 100} + m_SizeDelta: {x: 470, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6895756204793606274 CanvasRenderer: @@ -465,10 +479,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5efe0a39fe908354e9ab6d1edfdb8843, type: 3} m_Name: m_EditorClassIdentifier: + blockName: + blockPosition: {x: 0, y: 0} + state: 0 blockRect: {fileID: 5350638854831129010} inPort: {fileID: 5732796955640118753} outPort: {fileID: 4908100188787544557} - blockName: songName: button: {fileID: 3931523710101296998} - musicText: {fileID: 8391808794720387191} + songNameText: {fileID: 8391808794720387191} + beatmapStatusMarkContainer: {fileID: 572536196246750759} + beatmapStatusMarkPrefab: {fileID: 7574088478242334147, guid: 1fc633b6a9d4908488b25fdb228da86b, + type: 3} diff --git a/Assets/Prefabs/Story/TutorialBlockUI.prefab b/Assets/Prefabs/Story/TutorialBlockUI.prefab index 51c5f887..9be2c031 100644 --- a/Assets/Prefabs/Story/TutorialBlockUI.prefab +++ b/Assets/Prefabs/Story/TutorialBlockUI.prefab @@ -34,7 +34,7 @@ RectTransform: 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: 2, y: 0} + m_AnchoredPosition: {x: -15, y: -5} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &459525017163665976 @@ -52,7 +52,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2549272938280010857} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -141,7 +141,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: ba2e784cfa5cc0549bf66051f872367c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -229,7 +229,7 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 35, y: -6} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3000483006876940928 @@ -247,7 +247,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5694744930588099522} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -335,17 +335,18 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Title + m_text: Tutorial m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 73f9a9bb620a2b040ab7347b390452fe, type: 2} + m_sharedMaterial: {fileID: 1291443754377433884, guid: 73f9a9bb620a2b040ab7347b390452fe, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -440,10 +441,10 @@ RectTransform: - {fileID: 4937946904652960982} m_Father: {fileID: 0} 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: 0, y: 0} - m_SizeDelta: {x: 300, y: 200} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -540} + m_SizeDelta: {x: 600, y: 375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6895756204793606274 CanvasRenderer: @@ -465,9 +466,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 821e50e1519236a46b03eb1f005acebe, type: 3} m_Name: m_EditorClassIdentifier: + blockName: + blockPosition: {x: 0, y: 0} + state: 0 blockRect: {fileID: 5350638854831129010} inPort: {fileID: 5784757909052703056} outPort: {fileID: 4937946904652960982} - blockName: button: {fileID: 3931523710101296998} - tutorialText: {fileID: 8391808794720387191} + tutorialName: + tutorialNameText: {fileID: 8391808794720387191} diff --git a/Assets/Resources/I2Languages.asset b/Assets/Resources/I2Languages.asset index f68c5867..7276359a 100644 --- a/Assets/Resources/I2Languages.asset +++ b/Assets/Resources/I2Languages.asset @@ -29,7 +29,7 @@ MonoBehaviour: - Flags: 000000000000 Languages_Touch: [] - - Term: Editor UI/settings + - Term: Menu UI/settings TermType: 0 Description: Languages: @@ -41,7 +41,7 @@ MonoBehaviour: - "C\xE0i \u0111\u1EB7t" Flags: 000000000000 Languages_Touch: [] - - Term: Editor UI/touch_to_start + - Term: Menu UI/touch_to_start TermType: 0 Description: Languages: @@ -54,16 +54,112 @@ MonoBehaviour: - "- Ch\u1EA1m \u0111\u1EC3 b\u1EAFt \u0111\u1EA7u tr\xF2 ch\u01A1i -" Flags: 000000000000 Languages_Touch: [] - - Term: RegularFont - TermType: 9 + - Term: Characters/Soullies + TermType: 0 Description: Languages: - - SarasaGothicSC-Regular SDF en - - SarasaGothicSC-Regular SDF zh-CN - - SarasaGothicSC-Regular SDF zh-TW - - SarasaGothicSC-Regular SDF ja - - SarasaGothicSC-Regular SDF ko - - SarasaGothicSC-Regular SDF vi + - Soullies + - "\u53D7\u4E3D\u4E1D" + - + - + - + - + Flags: 000000000000 + Languages_Touch: [] + - Term: Chapter0/C0_Departure_P1_A_D1_S1 + TermType: 0 + Description: + Languages: + - Welcome to story test! + - "\u6B22\u8FCE\u6765\u5230\u5267\u60C5\u6D4B\u8BD5\uFF01" + - + - + - + - + Flags: 000000000000 + Languages_Touch: [] + - Term: Chapter0/C0_Departure_P1_A_D1_S2 + TermType: 0 + Description: + Languages: + - Please select a story branch. + - "\u8BF7\u9009\u4E00\u4E2A\u5267\u60C5\u5206\u652F\u5427\u3002" + - + - + - + - + Flags: 000000000000 + Languages_Touch: [] + - Term: Chapter0/C0_Departure_P1_A_C1_S1 + TermType: 0 + Description: + Languages: + - I choose storyline A. + - "\u6211\u9009\u62E9\u5206\u652FA\u3002" + - + - + - + - + Flags: 000000000000 + Languages_Touch: [] + - Term: Chapter0/C0_Departure_P1_A_C1_S2 + TermType: 0 + Description: + Languages: + - I choose storyline B. + - "\u6211\u9009\u62E9\u5206\u652FB\u3002" + - + - + - + - + Flags: 000000000000 + Languages_Touch: [] + - Term: Chapter0/C0_Departure_P1_A_D2_S1 + TermType: 0 + Description: + Languages: + - We will go to A now! + - "\u6211\u4EEC\u8FD9\u5C31\u524D\u5F80A\u5206\u652F\uFF01" + - + - + - + - + Flags: 000000000000 + Languages_Touch: [] + - Term: Chapter0/C0_Departure_P1_A_D3_S1 + TermType: 0 + Description: + Languages: + - We will go to B now! + - "\u6211\u4EEC\u9A6C\u4E0A\u8FDB\u5165B\u5206\u652F\uFF01" + - + - + - + - + Flags: 000000000000 + Languages_Touch: [] + - Term: Chapter0/C0_Departure_P2_A_D1_S1 + TermType: 0 + Description: + Languages: + - Let's start from the... + - "\u8BA9\u6211\u4EEC\u5F00\u59CB\u2026\u2026" + - + - + - + - + Flags: 000000000000 + Languages_Touch: [] + - Term: Chapter0/C0_Departure_P2_A_D1_S2 + TermType: 0 + Description: + Languages: + - Chaos Zone! + - "\u8FDB\u5165\u6DF7\u6C8C\u7A7A\u95F4\uFF01" + - + - + - + - Flags: 000000000000 Languages_Touch: [] CaseInsensitiveTerms: 0 @@ -93,7 +189,7 @@ MonoBehaviour: Google_WebServiceURL: https://script.google.com/macros/s/AKfycbyPUuh1rjZLbicNBkY3LFhOHSEBWGRLK13WrmmuwVbrjSobiUGlMpkUT3iMvmv0yiEe/exec Google_SpreadsheetKey: 1Q03aJoMd4NawhUg2VQiSsaCHiKqXKcL--4-ZtGq8-_E Google_SpreadsheetName: I2Loc ichni Official Localization - Google_LastUpdatedVersion: 1748878309400 + Google_LastUpdatedVersion: 1749822296184 Google_Password: change_this GoogleUpdateFrequency: 3 GoogleInEditorCheckFrequency: 2 diff --git a/Assets/Resources/Story.meta b/Assets/Resources/Story.meta new file mode 100644 index 00000000..973c1405 --- /dev/null +++ b/Assets/Resources/Story.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e17b95f6df6430643b7511e916eb25c4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Story/Chapter0.meta b/Assets/Resources/Story/Chapter0.meta new file mode 100644 index 00000000..9cf1b4fc --- /dev/null +++ b/Assets/Resources/Story/Chapter0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a86cfdfeb26292546876402f87f761c5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Dialogs.meta b/Assets/Resources/Story/Chapter0/Dialogs.meta similarity index 100% rename from Assets/Resources/Dialogs.meta rename to Assets/Resources/Story/Chapter0/Dialogs.meta diff --git a/Assets/Resources/Story/Chapter0/Dialogs/Departure_P1_A.txt b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P1_A.txt new file mode 100644 index 00000000..d0854431 --- /dev/null +++ b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P1_A.txt @@ -0,0 +1,19 @@ +$[Start] +$Soullies: C0_Departure_P1_A_D1_S1 +$Soullies: C0_Departure_P1_A_D1_S2 +$Choice(Departure_Path_Choose_1){ + C0_Departure_P1_A_C1_S1 -> [ChooseP2_A]; + C0_Departure_P1_A_C1_S2 -> [ChooseP2_B]; +} + +$[ChooseP2_A]{ + SetVariable("ChooseResult", 1); + GenerateDialogBlock("Departure_P2_A"); +} +$Soullies: C0_Departure_P1_A_D2_S1 + +$[ChooseP2_B]{ + SetVariable("ChooseResult", 2); + GenerateDialogBlock("Departure_P2_B"); +} +$Soullies: C0_Departure_P1_A_D3_S1 \ No newline at end of file diff --git a/Assets/Resources/Story/Chapter0/Dialogs/Departure_P1_A.txt.meta b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P1_A.txt.meta new file mode 100644 index 00000000..b9aaa9d8 --- /dev/null +++ b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P1_A.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: afd46b56ef0cc5c4699710c478ff7c55 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_A.txt b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_A.txt new file mode 100644 index 00000000..dfe290a0 --- /dev/null +++ b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_A.txt @@ -0,0 +1,5 @@ +$[Entry]{ + GenerateSongBlock("Chaos_Zone"); +} +$Soullies: C0_Departure_P2_A_D1_S1 +$Soullies: C0_Departure_P2_A_D1_S2 \ No newline at end of file diff --git a/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_A.txt.meta b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_A.txt.meta new file mode 100644 index 00000000..4056eac9 --- /dev/null +++ b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_A.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4d0a8b411a62bd9449344eb530b3234f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Dialogs/ZakoCurse 0.txt b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_B.txt similarity index 100% rename from Assets/Resources/Dialogs/ZakoCurse 0.txt rename to Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_B.txt diff --git a/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_B.txt.meta b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_B.txt.meta new file mode 100644 index 00000000..918f6cc9 --- /dev/null +++ b/Assets/Resources/Story/Chapter0/Dialogs/Departure_P2_B.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ce2f5ed054e5d4d4082038afac4c472c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Story/Chapter0/Dialogs/Example.txt b/Assets/Resources/Story/Chapter0/Dialogs/Example.txt new file mode 100644 index 00000000..c805e25b --- /dev/null +++ b/Assets/Resources/Story/Chapter0/Dialogs/Example.txt @@ -0,0 +1,49 @@ +$[开始] +$Condition{ + GetVariable("Branch") == 1 -> [标题1]; + GetVariable("Branch") == 2 -> [标题2]; +} + +#上面是条件判断，获取变量Branch的值，决定进入哪个标题。 +#这是一个注释。 +#----------- + + +$[标题1] +$角色名字1: 说话内容1 + +#Dialog结束了 +#----------- + + +$[标题2] +$角色名字2: 说话内容2 +$Choice(选项名字){ + 选项内容A -> [选择A]; + 选项内容B -> [选择B]; +} +#上面是选项 +#----------- + + +$[选择A]{ + SetVariable("ChooseResult", 1); + GenerateDialogBlock("Departure_P2_A"); +} +$角色名字2: 说话内容3-1 +$角色名字2: 说话内容3-2 + +#标题后面的{}内为自定义函数。 +#SetVariable("ChooseResult", 1) 设置变量ChooseResult的值为1。 +#GenerateTextBlock("Departure_P2_A") 生成名字为Departure_P2_A的文本块。 +#----------- + + +$[选择B]{ + SetVariable("ChooseResult", 2); + GenerateDialogBlock("Departure_P2_B"); +} +$角色名字2: 说话内容4-1 +$角色名字2: 说话内容4-2 +$角色名字2: 说话内容4-3 +#----------- \ No newline at end of file diff --git a/Assets/Resources/Story/Chapter0/Dialogs/Example.txt.meta b/Assets/Resources/Story/Chapter0/Dialogs/Example.txt.meta new file mode 100644 index 00000000..8cfded7e --- /dev/null +++ b/Assets/Resources/Story/Chapter0/Dialogs/Example.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8b05c7949169cc048afaeb7635fd7638 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Story/Chapter0/Dialogs/ZakoCurse 0.txt b/Assets/Resources/Story/Chapter0/Dialogs/ZakoCurse 0.txt new file mode 100644 index 00000000..9f6d37d9 --- /dev/null +++ b/Assets/Resources/Story/Chapter0/Dialogs/ZakoCurse 0.txt @@ -0,0 +1,19 @@ +$[Entry] +$Condition{ + GetGlobalVariable("IsCursed") == 1 -> [Cursed-Start]; + GetGlobalVariable("IsCursed") == 0 -> [NotCursed-Start]; +} + +#这是一个注释。 + +$[Cursed-Start] +$Zako-1(Calm): You are cursed! You are cursed! +$Zako-1(Calm): Go find Zako 0 to get rid of the curse! +$Zako-1(Calm): I won't lie to you! + +#这是另一个注释。 +-这个注释有两行。 + +$[NotCursed-Start] +$Zako-1(Happy): You are not cursed! +$Zako-1(Happy): Enjoy your adventure! \ No newline at end of file diff --git a/Assets/Resources/Dialogs/ZakoCurse 0.txt.meta b/Assets/Resources/Story/Chapter0/Dialogs/ZakoCurse 0.txt.meta similarity index 100% rename from Assets/Resources/Dialogs/ZakoCurse 0.txt.meta rename to Assets/Resources/Story/Chapter0/Dialogs/ZakoCurse 0.txt.meta diff --git a/Assets/Resources/Story/Chapter0/StoryData_Chapter0.asset b/Assets/Resources/Story/Chapter0/StoryData_Chapter0.asset new file mode 100644 index 00000000..9bb646f3 --- /dev/null +++ b/Assets/Resources/Story/Chapter0/StoryData_Chapter0.asset @@ -0,0 +1,56 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7ab917c50249812429ebd44d6574497c, type: 3} + m_Name: StoryData_Chapter0 + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + dialogBlockDatas: + - blockName: Departure_P1_A + blockID: C0_D_Departure_P1_A + blockSize: {x: 400, y: 200} + dialogTitle: P1-A + - blockName: Departure_P2_A + blockID: C0_D_Departure_P2_A + blockSize: {x: 400, y: 200} + dialogTitle: P2-A + - blockName: Departure_P2_B + blockID: C0_D_Departure_P2_B + blockSize: {x: 400, y: 200} + dialogTitle: P2-B + songBlockDatas: + - blockName: Chaos_Zone + blockID: C0_S_Departure_Chaos_Zone + blockSize: {x: 470, y: 350} + songName: Chaos Zone + tutorialBlockDatas: + - blockName: Departure_Tutorial_A + blockID: C0_T_Departure_Tutorial_A + blockSize: {x: 600, y: 375} + tutorialName: Departure Tutorial + initialBlocks: + - blockName: Departure_Tutorial_A + initialState: 2 + blockPosition: {x: 200, y: -720} + nextBlocks: + - Departure_P1_A + - blockName: Departure_P1_A + initialState: 1 + blockPosition: {x: 1000, y: -720} + nextBlocks: [] diff --git a/Assets/Scripts/Story/StoryData_Chapter1.asset.meta b/Assets/Resources/Story/Chapter0/StoryData_Chapter0.asset.meta similarity index 100% rename from Assets/Scripts/Story/StoryData_Chapter1.asset.meta rename to Assets/Resources/Story/Chapter0/StoryData_Chapter0.asset.meta diff --git a/Assets/Scenes/MenuScene.meta b/Assets/Scenes/MenuScene.meta new file mode 100644 index 00000000..e1670094 --- /dev/null +++ b/Assets/Scenes/MenuScene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c263413406835674eb266e9f04d562a3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 3c62a174..fdd2f7f3 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -134,7 +134,7 @@ GameObject: - component: {fileID: 8360189} - component: {fileID: 8360188} m_Layer: 5 - m_Name: GameObject + m_Name: BlockContainer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -154,11 +154,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1091682062} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920, y: 1080} - m_Pivot: {x: 0, y: 0.5} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!114 &8360188 MonoBehaviour: m_ObjectHideFlags: 0 @@ -166,7 +166,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8360185} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -197,6 +197,217 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8360185} m_CullTransparentMesh: 1 +--- !u!1 &34921393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 34921394} + - component: {fileID: 34921396} + - component: {fileID: 34921395} + m_Layer: 5 + m_Name: ChapterName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &34921394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34921393} + 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: 1371572583} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000038146973, y: -30.000004} + m_SizeDelta: {x: 400, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &34921395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34921393} + 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: CHAPTER 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: 1 + m_colorMode: 0 + 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: 48 + m_fontSizeBase: 48 + 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!222 &34921396 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34921393} + m_CullTransparentMesh: 1 +--- !u!1 &39339085 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 39339086} + - component: {fileID: 39339088} + - component: {fileID: 39339087} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &39339086 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39339085} + 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: 179146693} + m_Father: {fileID: 1119493264} + 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 &39339087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39339085} + 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: 41b74e1b6f336454599ff14343cbdbb2, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &39339088 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39339085} + m_CullTransparentMesh: 1 --- !u!1 &61907790 GameObject: m_ObjectHideFlags: 0 @@ -539,6 +750,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114792649} m_CullTransparentMesh: 1 +--- !u!1 &179146692 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 179146693} + - component: {fileID: 179146695} + - component: {fileID: 179146694} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &179146693 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 179146692} + 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: 1047641975} + m_Father: {fileID: 39339086} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 800, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &179146694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 179146692} + 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.35686275} + 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: 0} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &179146695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 179146692} + m_CullTransparentMesh: 1 --- !u!1001 &179503906 PrefabInstance: m_ObjectHideFlags: 0 @@ -575,7 +862,7 @@ PrefabInstance: - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, type: 3} @@ -585,7 +872,7 @@ PrefabInstance: - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, type: 3} @@ -635,12 +922,12 @@ PrefabInstance: - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -390 objectReference: {fileID: 0} - target: {fileID: 7049295459616353746, guid: f536078f3fe8e764aba92be12b81c2c4, type: 3} @@ -753,6 +1040,141 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &272824270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 272824271} + - component: {fileID: 272824273} + - component: {fileID: 272824272} + 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 &272824271 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272824270} + 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: 1519945292} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 50, y: 0} + m_SizeDelta: {x: -200, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &272824272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272824270} + 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: Back + 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: 48 + m_fontSizeBase: 48 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + 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!222 &272824273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272824270} + m_CullTransparentMesh: 1 --- !u!1 &290007303 GameObject: m_ObjectHideFlags: 0 @@ -1239,7 +1661,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &512486723 Transform: m_ObjectHideFlags: 0 @@ -1338,6 +1760,141 @@ MonoBehaviour: SerializationNodes: [] mainCanvasGroup: {fileID: 1480276027} enterGameButton: {fileID: 2147175104} +--- !u!1 &582350574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 582350575} + - component: {fileID: 582350577} + - component: {fileID: 582350576} + 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 &582350575 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 582350574} + 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: 1129805216} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 200, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &582350576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 582350574} + 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: -Settings- + 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: 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: 10 + 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!222 &582350577 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 582350574} + m_CullTransparentMesh: 1 --- !u!1 &600935696 GameObject: m_ObjectHideFlags: 0 @@ -1549,6 +2106,81 @@ MonoBehaviour: m_ColorSpace: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 3 +--- !u!1 &621188556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 621188557} + - component: {fileID: 621188559} + - component: {fileID: 621188558} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &621188557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621188556} + 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: 869340149} + 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 &621188558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621188556} + 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.105882354} + 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: a5742c5f03bacf94c8a95659f8f36466, 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 &621188559 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621188556} + m_CullTransparentMesh: 1 --- !u!1 &631888791 GameObject: m_ObjectHideFlags: 0 @@ -1673,8 +2305,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -27.500002} - m_SizeDelta: {x: 200, y: 40} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 200, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &642366236 MonoBehaviour: @@ -2040,6 +2672,127 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &728129698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 728129699} + - component: {fileID: 728129702} + - component: {fileID: 728129701} + - component: {fileID: 728129700} + m_Layer: 5 + m_Name: DifficultyButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &728129699 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 728129698} + 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: 1367591478} + m_Father: {fileID: 1480276023} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -468, y: 298} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &728129700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 728129698} + 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: 728129701} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &728129701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 728129698} + 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!222 &728129702 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 728129698} + m_CullTransparentMesh: 1 --- !u!1 &751614406 GameObject: m_ObjectHideFlags: 0 @@ -2185,7 +2938,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 @@ -2391,7 +3144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &859038602 RectTransform: m_ObjectHideFlags: 0 @@ -2404,7 +3157,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1091682062} + - {fileID: 869340149} m_Father: {fileID: 78737088} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2441,12 +3194,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 2560, y: 1440} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -2483,10 +3236,51 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 859038601} m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &869340148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 869340149} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &869340149 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869340148} + 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: 1091682062} + - {fileID: 1129805216} + - {fileID: 621188557} + - {fileID: 1519945292} + - {fileID: 1371572583} + - {fileID: 1119493264} + m_Father: {fileID: 859038602} + 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 &871906515 GameObject: m_ObjectHideFlags: 0 @@ -2498,7 +3292,7 @@ GameObject: - component: {fileID: 871906516} - component: {fileID: 871906517} m_Layer: 5 - m_Name: TextFrame + m_Name: DialogContentFrame m_TagString: Untagged m_Icon: {fileID: 2800000, guid: 93f09189124b21e479fc891dbc1b93bf, type: 3} m_NavMeshLayer: 0 @@ -2521,10 +3315,10 @@ RectTransform: - {fileID: 1791209518} m_Father: {fileID: 6347218673911890593} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &871906517 MonoBehaviour: @@ -2540,8 +3334,86 @@ MonoBehaviour: m_EditorClassIdentifier: textPrefab: {fileID: 8033017966764082997, guid: 628c2093a25cf564cb34323b3de35b5e, type: 3} - textContainer: {fileID: 1467177623} - isPlayingSentence: 0 + choiceGroupPrefab: {fileID: 8033017966764082997, guid: 66fde4a2944f4334e86cbd6220ad1880, + type: 3} + dialogContentContainer: {fileID: 1467177623} + dialogTexts: [] + choiceGroups: [] +--- !u!1 &909563966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 909563967} + - component: {fileID: 909563969} + - component: {fileID: 909563968} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &909563967 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909563966} + 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: 1091682062} + 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 &909563968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909563966} + 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 &909563969 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909563966} + m_CullTransparentMesh: 1 --- !u!1 &932247136 GameObject: m_ObjectHideFlags: 0 @@ -2626,6 +3498,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 951833081} + - component: {fileID: 951833082} m_Layer: 0 m_Name: SongSelectionManager m_TagString: Untagged @@ -2648,6 +3521,27 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &951833082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 951833080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 726b9313110aee54fbba1c1891bdaa1a, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] --- !u!1 &1010633828 GameObject: m_ObjectHideFlags: 0 @@ -2834,6 +3728,285 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1032070286} m_CullTransparentMesh: 1 +--- !u!1 &1047641974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1047641975} + - component: {fileID: 1047641977} + - component: {fileID: 1047641976} + 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 &1047641975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047641974} + 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: 179146693} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1047641976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047641974} + 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: "\u8FD9\u662F\u201C\u5C0F\u52A9\u624B\u201D\u7ACB\u7ED8\n\n\u6709\u94B1\u4E86\u505ALive2D" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 73f9a9bb620a2b040ab7347b390452fe, type: 2} + m_sharedMaterial: {fileID: 1291443754377433884, guid: 73f9a9bb620a2b040ab7347b390452fe, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + 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: 64 + m_fontSizeBase: 64 + 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!222 &1047641977 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047641974} + m_CullTransparentMesh: 1 +--- !u!1 &1055026777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1055026778} + - component: {fileID: 1055026781} + - component: {fileID: 1055026780} + - component: {fileID: 1055026779} + m_Layer: 5 + m_Name: OutsideClose + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1055026778 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055026777} + 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: 6347218673911890593} + 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 &1055026779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055026777} + 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: 0 + 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: 1055026780} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2860688340790966187} + m_TargetAssemblyTypeName: Ichni.UI.UIPageBase, Assembly-CSharp + m_MethodName: FadeOut + m_Mode: 4 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0.5 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 871906517} + m_TargetAssemblyTypeName: Ichni.Story.DialogContentFrame, Assembly-CSharp + m_MethodName: ClearAllSentences + 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 &1055026780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055026777} + 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} + 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!222 &1055026781 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055026777} + m_CullTransparentMesh: 1 --- !u!1 &1091682061 GameObject: m_ObjectHideFlags: 0 @@ -2846,7 +4019,7 @@ GameObject: - component: {fileID: 1091682063} - component: {fileID: 1091682064} m_Layer: 5 - m_Name: StorylineDisplay + m_Name: Storyline m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2859,19 +4032,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1091682061} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 8360186} + - {fileID: 909563967} - {fileID: 1132659036} - m_Father: {fileID: 859038602} + - {fileID: 8360186} + m_Father: {fileID: 869340149} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.000061035, y: 0} - m_SizeDelta: {x: 1920, y: 1080} + m_SizeDelta: {x: 2560, y: 1440} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1091682063 MonoBehaviour: @@ -2887,8 +4061,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Content: {fileID: 8360186} m_Horizontal: 1 - m_Vertical: 0 - m_MovementType: 1 + m_Vertical: 1 + m_MovementType: 2 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 @@ -2924,10 +4098,174 @@ MonoBehaviour: type: 3} connectionCurvePrefab: {fileID: 2558107630079687234, guid: 1767c8901d2d45a49817babbcbf3cdf1, type: 3} - marginLeft: 50 - marginRight: 50 + marginLeft: 100 + marginRight: 100 + marginTop: 100 + marginBottom: 100 connectionContainer: {fileID: 1132659036} - generatedBlocks: [] + currentBlock: {fileID: 0} + storyBlocks: [] + dialogBlocks: [] + songBlocks: [] + tutorialBlocks: [] + connectors: [] +--- !u!1 &1119493263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1119493264} + m_Layer: 5 + m_Name: Avatar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1119493264 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1119493263} + 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: 39339086} + m_Father: {fileID: 869340149} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 400, y: 150} + m_SizeDelta: {x: 800, y: 1200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1129805215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1129805216} + - component: {fileID: 1129805219} + - component: {fileID: 1129805218} + - component: {fileID: 1129805217} + m_Layer: 5 + m_Name: Settings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1129805216 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129805215} + 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: 582350575} + m_Father: {fileID: 869340149} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 40} + m_SizeDelta: {x: 310, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1129805217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129805215} + 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: 2 + 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: 21300000, guid: a9b93dba6435cd54b963b1b5ef4e2c50, type: 3} + 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: 1129805218} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1129805218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129805215} + 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: 97384a959c9b0e546bdfc9cc9931a7d9, 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 &1129805219 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129805215} + m_CullTransparentMesh: 1 --- !u!1 &1132246363 GameObject: m_ObjectHideFlags: 0 @@ -3062,7 +4400,7 @@ GameObject: - component: {fileID: 1132659036} - component: {fileID: 1132659037} m_Layer: 5 - m_Name: Connectors + m_Name: ConnectorContainer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3085,7 +4423,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920, y: 1080} + m_SizeDelta: {x: 2560, y: 1440} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1132659037 CanvasRenderer: @@ -3128,7 +4466,7 @@ RectTransform: m_Father: {fileID: 1010633829} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -3237,6 +4575,141 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1225558873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1225558874} + - component: {fileID: 1225558876} + - component: {fileID: 1225558875} + m_Layer: 5 + m_Name: ChapterIndex + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1225558874 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1225558873} + 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: 1371572583} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 109.99996, y: 20} + m_SizeDelta: {x: 180, y: 160} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1225558875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1225558873} + 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: 00 + 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: 1 + m_colorMode: 2 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 0, g: 0, b: 0, a: 0.2509804} + bottomRight: {r: 0, g: 0, b: 0, a: 0.2509804} + 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: 128 + m_fontSizeBase: 128 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + 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!222 &1225558876 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1225558873} + m_CullTransparentMesh: 1 --- !u!1 &1293033759 GameObject: m_ObjectHideFlags: 0 @@ -3522,6 +4995,178 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1367591477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1367591478} + - component: {fileID: 1367591480} + - component: {fileID: 1367591479} + 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 &1367591478 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1367591477} + 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: 728129699} + 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 &1367591479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1367591477} + 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: Easy Lv.2 + 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: 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: 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!222 &1367591480 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1367591477} + m_CullTransparentMesh: 1 +--- !u!1 &1371572582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1371572583} + m_Layer: 5 + m_Name: ChapterInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1371572583 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371572582} + 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: 34921394} + - {fileID: 1225558874} + m_Father: {fileID: 869340149} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -325, y: -200} + m_SizeDelta: {x: 400, y: 200} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1385276030 GameObject: m_ObjectHideFlags: 0 @@ -3837,8 +5482,8 @@ RectTransform: 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: -1050} + m_AnchoredPosition: {x: 0, y: -0.00061035156} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1467177624 MonoBehaviour: @@ -3888,6 +5533,65 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1467177622} m_CullTransparentMesh: 0 +--- !u!1 &1477759535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1477759537} + - component: {fileID: 1477759536} + m_Layer: 0 + m_Name: GameSaveManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1477759536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477759535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cffb558157bfb9a49a2a624f025f8958, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: SongSaveModule + Entry: 6 + Data: + - Name: StorySaveModule + Entry: 6 + Data: +--- !u!4 &1477759537 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477759535} + 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: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1480276022 GameObject: m_ObjectHideFlags: 0 @@ -3922,6 +5626,7 @@ RectTransform: m_Children: - {fileID: 1669942147} - {fileID: 2147175103} + - {fileID: 728129699} m_Father: {fileID: 525576374} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4000,10 +5705,131 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1480276022} m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &1519945291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1519945292} + - component: {fileID: 1519945295} + - component: {fileID: 1519945294} + - component: {fileID: 1519945293} + m_Layer: 5 + m_Name: BackButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1519945292 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519945291} + 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: 272824271} + m_Father: {fileID: 869340149} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 207.5, y: -160} + m_SizeDelta: {x: 415, y: 116} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1519945293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519945291} + 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: 1519945294} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1519945294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519945291} + 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: 2a32050711a02bf46bedf89431a07737, 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 &1519945295 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519945291} + m_CullTransparentMesh: 1 --- !u!1 &1521593244 GameObject: m_ObjectHideFlags: 0 @@ -4358,7 +6184,7 @@ GameObject: - component: {fileID: 1669942149} - component: {fileID: 1669942148} m_Layer: 5 - m_Name: Image + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4396,7 +6222,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0, b: 0, a: 1} + m_Color: {r: 0.1254902, g: 0, b: 0, a: 0.5019608} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4460,6 +6286,55 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1680965683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1680965685} + - component: {fileID: 1680965684} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1680965684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680965683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 586224155c7ef7a4d82dd5e831185e96, type: 2} +--- !u!4 &1680965685 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680965683} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.99915147, y: 4.771829, z: 21.813503} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1685360674 GameObject: m_ObjectHideFlags: 0 @@ -4921,7 +6796,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1141383797} m_HandleRect: {fileID: 1141383796} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -5059,7 +6934,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Button + m_text: START m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5172,8 +7047,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 47.5} - m_SizeDelta: {x: 369, y: 95} + m_AnchoredPosition: {x: 0, y: 40} + m_SizeDelta: {x: 310, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1937063705 MonoBehaviour: @@ -10730,7 +12605,7 @@ GameObject: - component: {fileID: 2147175105} - component: {fileID: 2147175104} m_Layer: 5 - m_Name: Button + m_Name: StartGameButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10850,253 +12725,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2147175102} m_CullTransparentMesh: 1 ---- !u!224 &85816673928899133 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051021897189913100} - 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: 1187793528219915377} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 852, y: -85} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &935469768518480591 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7981247551570842920} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &1162227277856790398 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7140214378305103335} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 7 - m_Spacing: 20 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!224 &1187793528219915377 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4911488770745799988} - 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: 7369857810559777258} - - {fileID: 85816673928899133} - m_Father: {fileID: 6347218673911890593} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 300} - m_SizeDelta: {x: 1920, y: 600} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1259651013379437986 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6290981369488132062} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!114 &1357059423052137034 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5750685907422264183} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!222 &1389657235254744052 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5750685907422264183} - m_CullTransparentMesh: 0 ---- !u!114 &1410148178113644486 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6711851210132893554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &1559093176430902076 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6290981369488132062} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 100 - m_Top: 0 - m_Bottom: 50 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!222 &1649755695970164236 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6711851210132893554} - m_CullTransparentMesh: 0 ---- !u!1 &2051021897189913100 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 85816673928899133} - - component: {fileID: 2737602476106353246} - - component: {fileID: 8308184329627531642} - - component: {fileID: 2626177164078466448} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2238435699825645920 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7008407758715306779} - 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: 7172247818387027604} - - {fileID: 7777822263036018529} - - {fileID: 8128254335803346129} - m_Father: {fileID: 3912788228008914051} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 186.08, y: -43.455} - m_SizeDelta: {x: 372.16, y: 86.91} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2403716074040239800 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7981247551570842920} - 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: 10 --- !u!114 &2610266801322206895 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11114,59 +12742,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 55 ---- !u!114 &2626177164078466448 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051021897189913100} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a81a9e081a4afa64dae6b9d42bc38c9f, type: 3} - m_Name: - m_EditorClassIdentifier: - description: Hint here - delay: 0 - tooltipRect: {fileID: 6290981369488132062} - descriptionText: {fileID: 8152878228870039217} - forceToUpdate: 0 - useIn3D: 0 - tooltipAnimator: {fileID: 0} ---- !u!222 &2737602476106353246 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051021897189913100} - m_CullTransparentMesh: 1 ---- !u!114 &2778496578329979341 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7008407758715306779} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 20 - m_Right: 20 - m_Top: 12 - m_Bottom: 15 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!114 &2860688340790966187 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11189,8 +12764,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] mainCanvasGroup: {fileID: 6759614698927231795} - textFrame: {fileID: 871906517} - choiceFrame: {fileID: 6429768965580669925} + dialogContentFrame: {fileID: 871906517} --- !u!1 &3003397923318546413 GameObject: m_ObjectHideFlags: 0 @@ -11208,24 +12782,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &3127332850813175254 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7724313919147483929} - - component: {fileID: 7656137791195831527} - - component: {fileID: 5416854884603034955} - m_Layer: 0 - m_Name: Tooltip - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: 146ad7c4429fc764088d2a5139a2537d, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!224 &3166036863501693288 RectTransform: m_ObjectHideFlags: 0 @@ -11289,7 +12845,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -300} + m_SizeDelta: {x: 522, y: -300} m_Pivot: {x: 0, y: 0.5} --- !u!1 &3166036863631877737 GameObject: @@ -11465,34 +13021,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3166036863773879188} m_CullTransparentMesh: 0 ---- !u!222 &3250976328882232684 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7981247551570842920} - m_CullTransparentMesh: 0 ---- !u!224 &3912788228008914051 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6290981369488132062} - 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: 2238435699825645920} - m_Father: {fileID: 7724313919147483929} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 824.42, y: 106.54} - m_SizeDelta: {x: 472.16, y: 136.91} - m_Pivot: {x: 0.5, y: 0.5} --- !u!4 &4003430166136740793 Transform: m_ObjectHideFlags: 0 @@ -11508,27 +13036,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &4174416008128122219 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6290981369488132062} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 06d31d7b522632e49af62700d10bcc6b, type: 2} - m_CullingMode: 0 - m_UpdateMode: 2 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &4397390401624236569 GameObject: m_ObjectHideFlags: 0 @@ -11546,50 +13053,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!225 &4478969525077577330 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6290981369488132062} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &4911488770745799988 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1187793528219915377} - - component: {fileID: 6429768965580669925} - m_Layer: 5 - m_Name: ChoiceFrame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &5416854884603034955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127332850813175254} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38efc2a00eadebc409b20491d68ef527, type: 3} - m_Name: - m_EditorClassIdentifier: - UIManagerAsset: {fileID: 11400000, guid: 2a619a9609984be49b53b928dd94e61b, type: 2} - background: {fileID: 2403716074040239800} - text: {fileID: 8152878228870039217} --- !u!1 &5686664992784830960 GameObject: m_ObjectHideFlags: 0 @@ -11622,16 +13085,17 @@ MonoBehaviour: serializationData: SerializedFormat: 2 SerializedBytes: - ReferencedUnityObjects: [] + ReferencedUnityObjects: + - {fileID: 11400000, guid: 6e95609f9d235c042a48dbabae121053, type: 2} SerializedBytesString: Prefab: {fileID: 0} PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: - - Name: globalVariables + - Name: storyDatas Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Int32, - mscorlib]], mscorlib + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Ichni.Story.StoryData, + Assembly-CSharp]], mscorlib - Name: comparer Entry: 7 Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, @@ -11647,9 +13111,9 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IsCursed + Data: Chapter0 - Name: $v - Entry: 3 + Entry: 10 Data: 0 - Name: Entry: 8 @@ -11660,27 +13124,15 @@ MonoBehaviour: - Name: Entry: 8 Data: - storylineDisplay: {fileID: 1091682064} + - Name: storyVariables + Entry: 6 + Data: + - Name: selectedChoices + Entry: 6 + Data: + storyline: {fileID: 1091682064} storyUIPage: {fileID: 78737089} ---- !u!1 &5750685907422264183 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8128254335803346129} - - component: {fileID: 1389657235254744052} - - component: {fileID: 8152878228870039217} - - component: {fileID: 1357059423052137034} - m_Layer: 5 - m_Name: Description - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 + currentChapter: Chapter0 --- !u!4 &5788293620442285278 Transform: m_ObjectHideFlags: 0 @@ -11716,45 +13168,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!222 &5947317085524111037 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7008407758715306779} - m_CullTransparentMesh: 0 ---- !u!114 &6135583357420104805 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6711851210132893554} - 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.5882353} - 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: 0755a77d5bd80d94eaba57a2d5d0f55e, 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: 5 + m_IsActive: 1 --- !u!223 &6169289651699952963 Canvas: m_ObjectHideFlags: 0 @@ -11837,11 +13251,15 @@ MonoBehaviour: Data: - Name: choiceDictionary Entry: 7 - Data: 3|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.List`1[[Ichni.Story.Choice, - Assembly-CSharp]], mscorlib]], mscorlib + Data: 3|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Ichni.Story.ChoiceGroup, + Assembly-CSharp]], mscorlib - Name: comparer - Entry: 9 - Data: 1 + Entry: 7 + Data: 4|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: - Name: Entry: 12 Data: 0 @@ -11853,7 +13271,7 @@ MonoBehaviour: Data: - Name: conditionDictionary Entry: 7 - Data: 4|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.List`1[[Ichni.Story.Condition, + Data: 5|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.List`1[[Ichni.Story.Condition, Assembly-CSharp]], mscorlib]], mscorlib - Name: comparer Entry: 9 @@ -11876,27 +13294,6 @@ MonoBehaviour: testTextAssets: - {fileID: 4900000, guid: abedef5a950c819489df91598deb196f, type: 3} dialogUIPage: {fileID: 2860688340790966187} ---- !u!1 &6290981369488132062 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3912788228008914051} - - component: {fileID: 6714128434611812732} - - component: {fileID: 4478969525077577330} - - component: {fileID: 4174416008128122219} - - component: {fileID: 1259651013379437986} - - component: {fileID: 1559093176430902076} - m_Layer: 5 - m_Name: Tooltip Rect - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!224 &6347218673911890593 RectTransform: m_ObjectHideFlags: 0 @@ -11909,8 +13306,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7724313919147483929} - - {fileID: 1187793528219915377} + - {fileID: 1055026778} - {fileID: 871906516} m_Father: {fileID: 5788293620442285278} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11919,23 +13315,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &6429768965580669925 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4911488770745799988} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62ce59e989ba99d4ca0407641e0ae2f2, type: 3} - m_Name: - m_EditorClassIdentifier: - choiceButtonPrefab: {fileID: 8033017966764082997, guid: 66fde4a2944f4334e86cbd6220ad1880, - type: 3} - choiceButtonContainer: {fileID: 7369857810559777258} - choiceButtonList: [] - hint: {fileID: 2626177164078466448} --- !u!4 &6447520319398441545 Transform: m_ObjectHideFlags: 0 @@ -11951,33 +13330,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6711851210132893554 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7172247818387027604} - - component: {fileID: 1649755695970164236} - - component: {fileID: 6135583357420104805} - - component: {fileID: 1410148178113644486} - m_Layer: 5 - m_Name: Shadow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &6714128434611812732 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6290981369488132062} - m_CullTransparentMesh: 0 --- !u!225 &6759614698927231795 CanvasGroup: m_ObjectHideFlags: 0 @@ -11990,80 +13342,6 @@ CanvasGroup: m_Interactable: 0 m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 ---- !u!1 &7008407758715306779 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2238435699825645920} - - component: {fileID: 5947317085524111037} - - component: {fileID: 8331367943762868487} - - component: {fileID: 2778496578329979341} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &7140214378305103335 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7369857810559777258} - - component: {fileID: 1162227277856790398} - m_Layer: 5 - m_Name: Choice - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7172247818387027604 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6711851210132893554} - 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: 2238435699825645920} - 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: 24, y: 24} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &7369857810559777258 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7140214378305103335} - 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: 1187793528219915377} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 590, y: 150} - m_SizeDelta: {x: 560, y: 300} - m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7585203795666590119 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12079,7 +13357,7 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} + m_ReferenceResolution: {x: 2560, y: 1440} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -12087,252 +13365,6 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 0 ---- !u!114 &7656137791195831527 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127332850813175254} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f74f8e3213a5a144d801c9a0e3a84d80, type: 3} - m_Name: - m_EditorClassIdentifier: - mainCanvas: {fileID: 6169289651699952963} - tooltipObject: {fileID: 6290981369488132062} - tooltipContent: {fileID: 7008407758715306779} - targetCamera: {fileID: 0} - tooltipSmoothness: 0.05 - dampSpeed: 10 - preferredWidth: 375 - allowUpdate: 1 - checkDispose: 1 - cameraSource: 0 - transitionMode: 0 - vBorderTop: -15 - vBorderBottom: 10 - hBorderLeft: 20 - hBorderRight: -15 - xLeft: -400 - xRight: 400 - yTop: -325 - yBottom: 325 - contentLE: {fileID: 0} - currentTooltip: {fileID: 0} ---- !u!224 &7724313919147483929 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127332850813175254} - 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: 3912788228008914051} - m_Father: {fileID: 6347218673911890593} - 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!224 &7777822263036018529 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7981247551570842920} - 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: 2238435699825645920} - 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 &7981247551570842920 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7777822263036018529} - - component: {fileID: 3250976328882232684} - - component: {fileID: 2403716074040239800} - - component: {fileID: 935469768518480591} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8128254335803346129 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5750685907422264183} - 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: 2238435699825645920} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -41.955} - m_SizeDelta: {x: 332.16, y: 59.91} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &8152878228870039217 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5750685907422264183} - 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: 'Description here. - - You can type anything you want.' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f, type: 2} - m_sharedMaterial: {fileID: 21539420542967178, guid: 4bd810f1cbcb0f446a8f5a31453e243f, - 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: 22 - m_fontSizeBase: 22 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - 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: 1 - 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!114 &8308184329627531642 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051021897189913100} - 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: 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: b15b60a5a9d3f854ca24a4a9cdbd4f76, 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!114 &8331367943762868487 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7008407758715306779} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -12355,3 +13387,5 @@ SceneRoots: - {fileID: 512486723} - {fileID: 1998834542} - {fileID: 1385276031} + - {fileID: 1680965685} + - {fileID: 1477759537} diff --git a/Assets/Scenes/MenuScene/MenuVolume.asset b/Assets/Scenes/MenuScene/MenuVolume.asset new file mode 100644 index 00000000..5d17590e --- /dev/null +++ b/Assets/Scenes/MenuScene/MenuVolume.asset @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6091830294524258670 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29fa0085f50d5e54f8144f766051a691, type: 3} + m_Name: FilmGrain + m_EditorClassIdentifier: + active: 1 + type: + m_OverrideState: 1 + m_Value: 9 + intensity: + m_OverrideState: 1 + m_Value: 0 + response: + m_OverrideState: 1 + m_Value: 0 + texture: + m_OverrideState: 0 + m_Value: {fileID: 0} +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: MenuVolume + m_EditorClassIdentifier: + components: + - {fileID: -6091830294524258670} + - {fileID: 8215794205551719707} + - {fileID: 4375261676646749473} +--- !u!114 &4375261676646749473 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb60a22f311433c4c962b888d1393f88, type: 3} + m_Name: PaniniProjection + m_EditorClassIdentifier: + active: 0 + distance: + m_OverrideState: 1 + m_Value: 0 + cropToFit: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &8215794205551719707 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81180773991d8724ab7f2d216912b564, type: 3} + m_Name: ChromaticAberration + m_EditorClassIdentifier: + active: 0 + intensity: + m_OverrideState: 1 + m_Value: 1 diff --git a/Assets/Scenes/MenuScene/MenuVolume.asset.meta b/Assets/Scenes/MenuScene/MenuVolume.asset.meta new file mode 100644 index 00000000..f509a758 --- /dev/null +++ b/Assets/Scenes/MenuScene/MenuVolume.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 586224155c7ef7a4d82dd5e831185e96 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game/GameSaveManager.cs b/Assets/Scripts/Game/GameSaveManager.cs new file mode 100644 index 00000000..f9f3ad6d --- /dev/null +++ b/Assets/Scripts/Game/GameSaveManager.cs @@ -0,0 +1,192 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Ichni.RhythmGame; +using Ichni.Story; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace Ichni +{ + public class GameSaveManager : SerializedMonoBehaviour + { + public static GameSaveManager instance; + + public SongSaveModule SongSaveModule; + public StorySaveModule StorySaveModule; + + private void Awake() + { + if (instance == null) + { + instance = this; + + SongSaveModule = new SongSaveModule(); + SongSaveModule.LoadSongStatuses(); + + StorySaveModule = new StorySaveModule(); + StorySaveModule.LoadStoryVariables(); + StorySaveModule.LoadChoices(); + + DontDestroyOnLoad(gameObject); + } + else + { + Destroy(gameObject); + } + } + } + + public partial class SongSaveModule + { + public Dictionary songStatusSaves; + private string SongSavePath => Application.streamingAssetsPath + "/GameSaves/SongSaves.json"; + + public SongSaveModule() + { + songStatusSaves = new Dictionary(); + Debug.Log("Song save path: " + SongSavePath); + } + } + + public partial class SongSaveModule + { + [Button] + public void SaveSongStatuses() + { + ES3.Save("SongSaves", songStatusSaves, SongSavePath); + } + + public void LoadSongStatuses() + { + if (ES3.FileExists(SongSavePath)) + { + songStatusSaves = ES3.Load>("SongSaves", SongSavePath); + } + else + { + songStatusSaves = new Dictionary(); + + //TODO: delete + songStatusSaves.Add("Chaos Zone", new SongStatusSave + { + isCompleted = false, + additionalInfo = "", + beatmapSaves = new Dictionary() + { + { "Easy", new BeatmapSave { accuracy = 0.0f, isFullCombo = false, isAllPerfect = false } }, + { "Hard", new BeatmapSave { accuracy = 0.0f, isFullCombo = false, isAllPerfect = false } }, + { "Chaos", new BeatmapSave { accuracy = 0.0f, isFullCombo = false, isAllPerfect = false } } + } + }); + } + } + + [Button] + public void ClearBeatmapRecords() + { + foreach (var songStatus in songStatusSaves.Values) + { + foreach (var beatmapSave in songStatus.beatmapSaves.Values) + { + beatmapSave.accuracy = 0.0f; + beatmapSave.isFullCombo = false; + beatmapSave.isAllPerfect = false; + } + } + + SaveSongStatuses(); + } + } + + public partial class StorySaveModule + { + public Dictionary> tutorialBlockSaves; + public Dictionary> songBlockSaves; + public Dictionary> dialogBlockSaves; + public Dictionary> connectorSaves; + + public Dictionary storyVariables; + public Dictionary selectedChoices; + + private string GetStorySavePath(string chapterName) => Application.streamingAssetsPath + "/StorySaves/" + chapterName + ".json"; + private string StoryVariablesPath => Application.streamingAssetsPath + "/StorySaves/StoryVariables.json"; + private string ChoicesPath => Application.streamingAssetsPath + "/StorySaves/Choices.json"; + + public StorySaveModule() + { + tutorialBlockSaves = new Dictionary>(); + songBlockSaves = new Dictionary>(); + dialogBlockSaves = new Dictionary>(); + connectorSaves = new Dictionary>(); + storyVariables = new Dictionary(); + selectedChoices = new Dictionary(); + Debug.Log("Story Variables path: " + StoryVariablesPath); + } + } + + public partial class StorySaveModule + { + public void LoadStoryline(string chapterName) + { + tutorialBlockSaves[chapterName] = ES3.Load>("TutorialBlockSaves", GetStorySavePath(chapterName)); + songBlockSaves[chapterName] = ES3.Load>("SongBlockSaves", GetStorySavePath(chapterName)); + dialogBlockSaves[chapterName] = ES3.Load>("TextBlockSaves", GetStorySavePath(chapterName)); + connectorSaves[chapterName] = ES3.Load>("BlockConnectorSaves", GetStorySavePath(chapterName)); + } + + public void SaveStoryline(string chapterName, List tutorialBlocks, + List songBlocks, List dialogBlocks, + List connectors) + { + ES3.Save("TutorialBlockSaves", tutorialBlocks, GetStorySavePath(chapterName)); + ES3.Save("SongBlockSaves", songBlocks, GetStorySavePath(chapterName)); + ES3.Save("TextBlockSaves", dialogBlocks, GetStorySavePath(chapterName)); + ES3.Save("BlockConnectorSaves", connectors, GetStorySavePath(chapterName)); + + SaveStoryVariables(); + SaveChoices(); + } + } + + public partial class StorySaveModule + { + public void SaveStoryVariables() + { + string path = Application.streamingAssetsPath + "/StorySaves/" + "StoryVariables.json"; + ES3.Save("StoryVariables", storyVariables, path); + } + + public void LoadStoryVariables() + { + string path = Application.streamingAssetsPath + "/StorySaves/" + "StoryVariables.json"; + if (ES3.FileExists(path)) + { + storyVariables = ES3.Load>("StoryVariables", path); + } + else + { + storyVariables = new Dictionary(); + } + } + + public void SaveChoices() + { + string path = Application.streamingAssetsPath + "/StorySaves/" + "Choices.json"; + ES3.Save("Choices", selectedChoices, path); + } + + public void LoadChoices() + { + string path = Application.streamingAssetsPath + "/StorySaves/" + "Choices.json"; + if (ES3.FileExists(path)) + { + selectedChoices = ES3.Load>("Choices", path); + } + else + { + selectedChoices = new Dictionary(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Story/StoryChapter.cs.meta b/Assets/Scripts/Game/GameSaveManager.cs.meta similarity index 83% rename from Assets/Scripts/Story/StoryChapter.cs.meta rename to Assets/Scripts/Game/GameSaveManager.cs.meta index 541e66f5..34928ad1 100644 --- a/Assets/Scripts/Story/StoryChapter.cs.meta +++ b/Assets/Scripts/Game/GameSaveManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6de7129c47df0eb47858a380f344dfe2 +guid: cffb558157bfb9a49a2a624f025f8958 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Menu/SongSelection/BeatmapSave.cs b/Assets/Scripts/Menu/SongSelection/BeatmapSave.cs new file mode 100644 index 00000000..fe0a09ad --- /dev/null +++ b/Assets/Scripts/Menu/SongSelection/BeatmapSave.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Ichni.RhythmGame +{ + public class BeatmapSave + { + public float accuracy; + public bool isFullCombo; + public bool isAllPerfect; + } +} diff --git a/Assets/Scripts/Story/Storyline.cs.meta b/Assets/Scripts/Menu/SongSelection/BeatmapSave.cs.meta similarity index 83% rename from Assets/Scripts/Story/Storyline.cs.meta rename to Assets/Scripts/Menu/SongSelection/BeatmapSave.cs.meta index bb6810cc..f126b7a3 100644 --- a/Assets/Scripts/Story/Storyline.cs.meta +++ b/Assets/Scripts/Menu/SongSelection/BeatmapSave.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c427891d163b0a5468cedefc05f055dc +guid: 6b751bb37660d844780656591830afff MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Menu/SongSelection/SongSelectionManager.cs b/Assets/Scripts/Menu/SongSelection/SongSelectionManager.cs index 91f4a5db..14f9ab7c 100644 --- a/Assets/Scripts/Menu/SongSelection/SongSelectionManager.cs +++ b/Assets/Scripts/Menu/SongSelection/SongSelectionManager.cs @@ -1,18 +1,26 @@ +using System; using System.Collections; using System.Collections.Generic; +using Ichni.RhythmGame; +using Sirenix.OdinInspector; using UnityEngine; -public class SongSelectionManager : MonoBehaviour +namespace Ichni.Menu { - // Start is called before the first frame update - void Start() + public partial class SongSelectionManager : SerializedMonoBehaviour { - - } + public static SongSelectionManager instance; - // Update is called once per frame - void Update() - { + + private void Awake() + { + instance = this; + } } -} + + public partial class SongSelectionManager + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Menu/SongSelection/SongStatusSave.cs b/Assets/Scripts/Menu/SongSelection/SongStatusSave.cs new file mode 100644 index 00000000..038b31a1 --- /dev/null +++ b/Assets/Scripts/Menu/SongSelection/SongStatusSave.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Ichni.RhythmGame +{ + public class SongStatusSave + { + public bool isCompleted; + public string additionalInfo; + public Dictionary beatmapSaves; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Story/StorylineSheetReader.cs.meta b/Assets/Scripts/Menu/SongSelection/SongStatusSave.cs.meta similarity index 83% rename from Assets/Scripts/Story/StorylineSheetReader.cs.meta rename to Assets/Scripts/Menu/SongSelection/SongStatusSave.cs.meta index a37f7350..356a63a1 100644 --- a/Assets/Scripts/Story/StorylineSheetReader.cs.meta +++ b/Assets/Scripts/Menu/SongSelection/SongStatusSave.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6be21a0f3163e154ca67d55f70a2617b +guid: 0e15d295a0ae77041ad0269ab3801bc3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/SpaceConverter.cs b/Assets/Scripts/SpaceConverter.cs index 9c1c0613..aa7f5931 100644 --- a/Assets/Scripts/SpaceConverter.cs +++ b/Assets/Scripts/SpaceConverter.cs @@ -89,5 +89,15 @@ namespace Ichni // 最后赋值 target.anchoredPosition = localPos; return localPos; } + + /// + /// 获取目标 RectTransform 在目标空间 RectTransform 中的本地位置 + /// + public static Vector2 GetLocalUIPosition(RectTransform targetRect, RectTransform targetSpace) + { + Vector2 screenPos = RectTransformUtility.WorldToScreenPoint(null, targetRect.position); + RectTransformUtility.ScreenPointToLocalPointInRectangle(targetSpace, screenPos, null, out Vector2 localPos); + return localPos; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Story/Dialog/DialogManager.cs b/Assets/Scripts/Story/Dialog/DialogManager.cs index 6e19ccca..7bea2160 100644 --- a/Assets/Scripts/Story/Dialog/DialogManager.cs +++ b/Assets/Scripts/Story/Dialog/DialogManager.cs @@ -24,7 +24,7 @@ namespace Ichni.Story public Dictionary> functionDictionary; public Dictionary> dialogDictionary; - public Dictionary> choiceDictionary; + public Dictionary choiceDictionary; public Dictionary> conditionDictionary; private string currentLoadingDialog; @@ -41,32 +41,32 @@ namespace Ichni.Story public void SetDialog(string dialogName) { - TextAsset dialog = Resources.Load("Dialogs/" + dialogName); - SetDialog(new List { dialog }, "Entry"); + string chapter = StoryManager.instance.currentChapter; + TextAsset dialog = Resources.Load("Story/" + chapter + "/Dialogs/" + dialogName); + SetDialog(new List { dialog }); } - public void SetDialog(List dialogFiles, string dialogParagraphName) + public void SetDialog(List dialogFiles, string dialogParagraphName = "") { dialogUIPage.FadeIn(); - currentDialog = "NULL"; isPlayingDialog = true; - LoadDialog(dialogFiles); - - if (!string.IsNullOrEmpty(dialogParagraphName)) - { - currentDialog = dialogParagraphName; - } - PlayNextDialogParagraph(currentDialog); + currentDialog = "NULL"; + LoadDialog(dialogFiles, out string firstHeader); + + Debug.Log($"Loaded dialog, first header: {firstHeader}"); + currentDialog = dialogParagraphName == "" ? firstHeader : dialogParagraphName; + + Debug.Log($"Setting dialog to: {currentDialog}"); } - public void PlayNextDialogParagraph(string nextDialog) + public void PlayNextDialogParagraph(string nextDialog, bool invokeFunctions = true) { currentDialog = nextDialog; currentDialogSentenceIndex = 0; - if (functionDictionary.TryGetValue(currentDialog, out List functionList)) + if (invokeFunctions && functionDictionary.TryGetValue(currentDialog, out List functionList)) { functionList.ForEach(x => StoryInterpreters.FunctionInterpreter.Eval(x)); } @@ -83,11 +83,8 @@ namespace Ichni.Story { currentFinalType = "None"; } - - PlayDialog(); } - [Button("Test Play")] public void PlayDialog() { if(currentDialog == "NULL") @@ -95,11 +92,10 @@ namespace Ichni.Story throw new Exception("Current dialog is NULL"); } - /*if (dialogInterface.dialogTextFrame.isPlayingSentence) + if (isPlayingChoice) { - dialogInterface.dialogTextFrame.FinishSentence(); return; - }*/ + } if (dialogDictionary[currentDialog].Count > 0 && currentDialogSentenceIndex < dialogDictionary[currentDialog].Count) { @@ -107,7 +103,7 @@ namespace Ichni.Story string interpretedContent = currentSentence.GetInterpretedContent(); - dialogUIPage.textFrame.PlaySentence(currentSentence.characterName, interpretedContent); + dialogUIPage.dialogContentFrame.PlaySentence(currentSentence.characterName, interpretedContent); currentDialogSentenceIndex++; if (currentDialogSentenceIndex <= dialogDictionary[currentDialog].Count) @@ -121,7 +117,7 @@ namespace Ichni.Story if (currentFinalType == "Choice") { isPlayingChoice = true; - dialogUIPage.choiceFrame.PlayChoice(choiceDictionary[currentDialog]); + dialogUIPage.dialogContentFrame.PlayChoice(choiceDictionary[currentDialog]); return; } @@ -140,21 +136,65 @@ namespace Ichni.Story if (currentFinalType == "None" && currentDialogSentenceIndex >= dialogDictionary[currentDialog].Count) { - dialogUIPage.FadeOut(); - dialogUIPage.choiceFrame.gameObject.SetActive(false); - //currentDialogNPC.priorStoryTexts.Remove(dialogTextAsset); - //currentDialogNPC = null; + StoryManager.instance.storyline.currentBlock.state = StoryBlockState.Completed; isPlayingDialog = false; } } + + public void RevealDialog() + { + string finalType; + int max = 0; + + do + { + finalType = currentFinalType; + currentDialogSentenceIndex = 0; + + foreach (DialogSentence sentence in dialogDictionary[currentDialog]) + { + string interpretedContent = sentence.GetInterpretedContent(); + dialogUIPage.dialogContentFrame.PlaySentence(sentence.characterName, interpretedContent); + currentDialogSentenceIndex++; + } + + if (finalType == "Choice") + { + ChoiceGroup choiceGroup = choiceDictionary[currentDialog]; + int choiceIndex = GameSaveManager.instance.StorySaveModule.selectedChoices[choiceGroup.choiceName]; + dialogUIPage.dialogContentFrame.SelectChoice(choiceGroup, choiceIndex); + } + + if (finalType == "Condition") + { + foreach (var condition in conditionDictionary[currentDialog]) + { + if (condition.GetConditionResult()) + { + PlayNextDialogParagraph(condition.nextDialogName, false); + } + } + } + + max++; + + if (max > 1024) + { + throw new Exception("An infinite loop may detected in dialog parsing. Please check the dialog structure."); + } + + } while (finalType != "None"); + } } public partial class DialogManager { - public void LoadDialog(List dialogFiles) + public void LoadDialog(List dialogFiles, out string firstHeader) { ClearDictionaries(); + firstHeader = string.Empty; + dialogTextAssets = dialogFiles; List dialogLines = new List(); @@ -165,20 +205,34 @@ namespace Ichni.Story dialogLines.RemoveAll(line => line.Trim() == ""); - dialogLines.ForEach(Debug.Log); + //dialogLines.ForEach(Debug.Log); - foreach (var line in from line in dialogLines - where !ParseHeader(line) - where !ParseChoiceModule(line) - where !ParseConditionModule(line) - where !ParseDialogSentence(line) - select line) + foreach (string line in dialogLines) { - throw new Exception($"Invalid dialog line: {line}"); // 抛出异常，提示不合法的对话行 + if (!ParseHeader(line)) + { + if (!ParseChoiceModule(line)) + { + if (!ParseConditionModule(line)) + { + if (!ParseDialogSentence(line)) + { + throw new Exception($"Invalid dialog line: {line}"); // 抛出异常，提示不合法的对话行 + } + } + } + } + else + { + if (firstHeader == string.Empty) + { + firstHeader = currentDialog; + } + } } - + //dialogDictionary.RemoveWhere((header, sentences) => sentences == null || sentences.Count == 0); - choiceDictionary.RemoveWhere((header, choices) => choices == null || choices.Count == 0); + choiceDictionary.RemoveWhere((header, choices) => choices == null || choices.choices.Count == 0); conditionDictionary.RemoveWhere((header, conditions) => conditions == null || conditions.Count == 0); } @@ -244,7 +298,7 @@ namespace Ichni.Story currentLoadingDialog = dialogTitle.Replace("[", "").Replace("]", ""); dialogDictionary.Add(currentLoadingDialog, new List()); - choiceDictionary.Add(currentLoadingDialog, new List()); + //choiceDictionary.Add(currentLoadingDialog, new ChoiceGroup("Error")); conditionDictionary.Add(currentLoadingDialog, new List()); if (currentDialog == "NULL") @@ -278,7 +332,7 @@ namespace Ichni.Story public bool ParseDialogSentence(string line) { - //speakerName(emotion):sentence + //speakerName:sentence string[] sentenceData; if (line.Contains(":")) @@ -291,30 +345,14 @@ namespace Ichni.Story } string character = sentenceData[0]; - string speakerName = character; - string emotion = "Default"; - - - if (character.Contains("(")) - { - emotion = character.Split("(")[1].Replace(")", ""); - speakerName = character.Split("(")[0]; - } - else if (character.Contains("（")) - { - emotion = character.Split("（")[1].Replace("）", ""); - speakerName = character.Split("（")[0]; - } DialogSentence dialogSentence = new DialogSentence { - characterName = speakerName, - characterEmotion = emotion, - content = sentenceData[1] + characterName = speakerName.Trim(), + content = sentenceData[1].Trim() }; - dialogDictionary[currentLoadingDialog].Add(dialogSentence); return true; @@ -322,9 +360,9 @@ namespace Ichni.Story public bool ParseChoiceModule(string line) { - //$Choice{ - //choiceText0(Hint0)->[nextDialogName0]; - //choiceText1(Hint1)->[nextDialogName1]; + //$Choice(ChoiceName){ + //choiceText0->[nextDialogName0]; + //choiceText1->[nextDialogName1]; //} line = line.Trim(); @@ -333,23 +371,21 @@ namespace Ichni.Story { string[] choiceModuleData = line.Split('{'); - List choices = new List(); + string choiceName = choiceModuleData[0].Split('(')[1].Replace(")", "").Trim(); + ChoiceGroup choiceGroup = new ChoiceGroup(choiceName); string[] choiceData = choiceModuleData[1].Split(';'); - for (var index = 0; index < choiceData.Length - 1; index++) { - Choice choice = new Choice - { - choiceText = choiceData[index].Split("->")[0].Split("(")[0].Trim(), - hint = choiceData[index].Split("->")[0].Split("(")[1].Replace(")", "").Trim(), - nextDialogName = choiceData[index].Split("->[")[1].Replace("]", "").Trim(), - }; + choiceData[index] = choiceData[index].Replace(" ", "").Replace("\n", "").Replace("\r", "").Trim(); + + string choiceText = choiceData[index].Split("->[")[0].Trim(); + string nextDialogName = choiceData[index].Split("->[")[1].Replace("]", "").Trim(); - choices.Add(choice); + choiceGroup.choices.Add(new Choice(choiceText, nextDialogName)); } - choiceDictionary[currentLoadingDialog] = choices; + choiceDictionary[currentLoadingDialog] = choiceGroup; return true; } diff --git a/Assets/Scripts/Story/Dialog/DialogModule.cs b/Assets/Scripts/Story/Dialog/DialogModule.cs index 02581d84..11eebc85 100644 --- a/Assets/Scripts/Story/Dialog/DialogModule.cs +++ b/Assets/Scripts/Story/Dialog/DialogModule.cs @@ -10,19 +10,17 @@ namespace Ichni.Story public string audioEventName; public string characterName; - public string characterEmotion; public DialogSentence() { } - public DialogSentence(string content, string audioEventName, string characterName, string characterEmotion) + public DialogSentence(string content, string audioEventName, string characterName) { this.content = content; this.audioEventName = audioEventName; this.characterName = characterName; - this.characterEmotion = characterEmotion; } /// @@ -62,12 +60,29 @@ namespace Ichni.Story return string.Join("", parts); } } + + public class ChoiceGroup + { + public string choiceName; + public List choices; + + public ChoiceGroup(string choiceName) + { + this.choiceName = choiceName; + this.choices = new List(); + } + } public class Choice { public string choiceText; - public string hint; public string nextDialogName; + + public Choice(string choiceText, string nextDialogName) + { + this.choiceText = choiceText; + this.nextDialogName = nextDialogName; + } } public class Condition diff --git a/Assets/Scripts/Story/Dialog/StoryInterpreters.cs b/Assets/Scripts/Story/Dialog/StoryInterpreters.cs index a3daf88c..ee6c94b8 100644 --- a/Assets/Scripts/Story/Dialog/StoryInterpreters.cs +++ b/Assets/Scripts/Story/Dialog/StoryInterpreters.cs @@ -1,6 +1,7 @@ using System; using DynamicExpresso; using Ichni.Story; +using Ichni.Story.UI; using UnityEngine; namespace Ichni.Story @@ -21,23 +22,34 @@ namespace Ichni.Story static void SetFunctionInterpreter() { - FunctionInterpreter.SetFunction("GetGlobalVariable", new Func(GetGlobalVariable)); + FunctionInterpreter.SetFunction("SetVariable", new Action(SetStoryVariable)); + FunctionInterpreter.SetFunction("GetVariable", new Func(GetStoryVariable)); + FunctionInterpreter.SetFunction("GenerateDialogBlock", new Action(GenerateDialogBlock)); + FunctionInterpreter.SetFunction("GenerateSongBlock", new Action(GenerateSongBlock)); } static void SetConditionInterpreter() { - ConditionInterpreter.SetFunction("GetGlobalVariable", new Func(GetGlobalVariable)); + ConditionInterpreter.SetFunction("GetVariable", new Func(GetStoryVariable)); } } public static partial class StoryInterpreters { + /// + /// 设置全局变量的值 + /// + static void SetStoryVariable(string variableName, int value) + { + GameSaveManager.instance.StorySaveModule.storyVariables[variableName] = value; + } + /// /// 获取全局变量的值 /// - static int GetGlobalVariable(string variableName) + static int GetStoryVariable(string variableName) { - if (StoryManager.instance.globalVariables.TryGetValue(variableName, out int value)) + if (GameSaveManager.instance.StorySaveModule.storyVariables.TryGetValue(variableName, out int value)) { return value; } @@ -45,4 +57,23 @@ namespace Ichni.Story throw new ArgumentException($"Global variable '{variableName}' not found."); } } + + public static partial class StoryInterpreters + { + static void GenerateDialogBlock(string blockName) + { + StoryBlockUIBase currentBlock = StoryManager.instance.storyline.currentBlock; + Vector2 positionOffset = new Vector2(500, 0); + DialogBlockUI newBlock = StoryManager.instance.storyline.GenerateDialogBlock(blockName, currentBlock.blockPosition + positionOffset, StoryBlockState.Current); + StoryManager.instance.storyline.GenerateConnector(currentBlock, newBlock); + } + + static void GenerateSongBlock(string blockName) + { + StoryBlockUIBase currentBlock = StoryManager.instance.storyline.currentBlock; + Vector2 positionOffset = new Vector2(500, 0); + SongBlockUI newBlock = StoryManager.instance.storyline.GenerateSongBlock(blockName, currentBlock.blockPosition + positionOffset, StoryBlockState.Current); + StoryManager.instance.storyline.GenerateConnector(currentBlock, newBlock); + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Story/Dialog/StoryManager.cs b/Assets/Scripts/Story/Dialog/StoryManager.cs index 5386e9f0..2d2632fe 100644 --- a/Assets/Scripts/Story/Dialog/StoryManager.cs +++ b/Assets/Scripts/Story/Dialog/StoryManager.cs @@ -8,18 +8,32 @@ using UnityEngine.Serialization; namespace Ichni.Story { - public class StoryManager : SerializedMonoBehaviour + public partial class StoryManager : SerializedMonoBehaviour { public static StoryManager instance; + + [FormerlySerializedAs("storylineDisplay")] public Storyline storyline; + public StoryUIPage storyUIPage; + + public string currentChapter; + public Dictionary storyDatas; - public StorylineDisplay storylineDisplay; - [FormerlySerializedAs("StoryPage")] public StoryUIPage storyUIPage; - - public Dictionary globalVariables; void Awake() { instance = this; } } + + public partial class StoryManager + { + + } + + public enum StoryBlockState + { + Locked, + Current, + Completed + } } \ No newline at end of file diff --git a/Assets/Scripts/Story/StoryBlock.cs b/Assets/Scripts/Story/StoryBlock.cs deleted file mode 100644 index d8565861..00000000 --- a/Assets/Scripts/Story/StoryBlock.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace Ichni.Story -{ - public class StoryBlock - { - public string blockName; // 单元格标识名 - public int rowIndex; // 剧情线编号 - public int timeColumn; // 时间列索引 - public bool isCompleted = false; // 完成状态 - public int requiredCount; // 前序节点未完成计数 - public StoryBlock nextBlock; // 下一个单元格 - } -} \ No newline at end of file diff --git a/Assets/Scripts/Story/StoryChapter.cs b/Assets/Scripts/Story/StoryChapter.cs deleted file mode 100644 index efa11b7d..00000000 --- a/Assets/Scripts/Story/StoryChapter.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace Ichni.Story -{ - public class StoryChapter : MonoBehaviour - { - public List storylines; - } -} \ No newline at end of file diff --git a/Assets/Scripts/Story/StoryData.cs b/Assets/Scripts/Story/StoryData.cs deleted file mode 100644 index 064e08f2..00000000 --- a/Assets/Scripts/Story/StoryData.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using Sirenix.OdinInspector; -using UnityEngine; - -namespace Ichni.Story -{ - [CreateAssetMenu(fileName = "StoryData", menuName = "Ichni/Story/StoryData")] - public class StoryData : SerializedScriptableObject - { - public List StoryBlockDatas; // 剧情单元格名称列表 - public Dictionary storyVariables; // 剧情变量字典，键为变量名，值为默认值，如果Save中没有该变量，则生成，并使用默认值 - } - - [Serializable] - public class StoryBlockData - { - public string blockName; - public string blockID; - - public StoryBlockData(string blockName, string blockID) - { - this.blockName = blockName; - this.blockID = blockID; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Story/StoryData.meta b/Assets/Scripts/Story/StoryData.meta new file mode 100644 index 00000000..d4c0850c --- /dev/null +++ b/Assets/Scripts/Story/StoryData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31a6a9bf0919951489cacfb86fb715c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Story/StoryData/StoryData.cs b/Assets/Scripts/Story/StoryData/StoryData.cs new file mode 100644 index 00000000..f946d651 --- /dev/null +++ b/Assets/Scripts/Story/StoryData/StoryData.cs @@ -0,0 +1,106 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using Sirenix.OdinInspector; +using UnityEngine; +using UnityEngine.Serialization; + +namespace Ichni.Story +{ + [CreateAssetMenu(fileName = "StoryData", menuName = "Ichni/Story/StoryData")] + public class StoryData : SerializedScriptableObject + { + public List dialogBlockDatas; // 剧情单元格名称列表 + public List songBlockDatas; // 音乐单元格名称列表 + public List tutorialBlockDatas; // 教程单元格名称列表 + public List initialBlocks; // 初始剧情单元格列表，包含所有初始剧情单元格的名称 + + public StoryBlockData GetDataByName(string blockName, out Type dataType) + { + foreach (var block in tutorialBlockDatas.Where(block => block.blockName == blockName)) + { + dataType = typeof(TutorialBlockData); + return block; + } + + foreach (var block in songBlockDatas.Where(block => block.blockName == blockName)) + { + dataType = typeof(SongBlockData); + return block; + } + + foreach (var block in dialogBlockDatas.Where(block => block.blockName == blockName)) + { + dataType = typeof(DialogBlockData); + return block; + } + + throw new ArgumentException($"No block found with name: {blockName}"); + } + } + + [InlineProperty] + [Serializable] + public class InitialBlockData + { + public string blockName; + public StoryBlockState initialState; // 初始状态 + public Vector2 blockPosition; // 初始位置 + public List nextBlocks; // 下一步可选的剧情单元格名称列表 + } + + [InlineProperty] + [Serializable] + public class StoryBlockData + { + [FoldoutGroup("$blockName", true)] + public string blockName; + [FoldoutGroup("$blockName")] + public string blockID; + [FoldoutGroup("$blockName")] + public Vector2 blockSize; + } + + [InlineProperty] + [Serializable] + public class TutorialBlockData : StoryBlockData + { + [FoldoutGroup("$blockName")] + public string tutorialName; + + + public TutorialBlockData() + { + this.blockSize = new Vector2(400, 200); + } + } + + [InlineProperty] + [Serializable] + public class DialogBlockData : StoryBlockData + { + [FoldoutGroup("$blockName")] + public string dialogTitle; + + + public DialogBlockData() + { + this.blockSize = new Vector2(400, 200); + } + } + + [InlineProperty] + [Serializable] + public class SongBlockData : StoryBlockData + { + [FoldoutGroup("$blockName")] + public string songName; + + + public SongBlockData() + { + this.blockSize = new Vector2(400, 200); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Story/StoryData.cs.meta b/Assets/Scripts/Story/StoryData/StoryData.cs.meta similarity index 100% rename from Assets/Scripts/Story/StoryData.cs.meta rename to Assets/Scripts/Story/StoryData/StoryData.cs.meta diff --git a/Assets/Scripts/Story/StoryData_Chapter1.asset b/Assets/Scripts/Story/StoryData_Chapter1.asset deleted file mode 100644 index 2086b771..00000000 --- a/Assets/Scripts/Story/StoryData_Chapter1.asset +++ /dev/null @@ -1,61 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7ab917c50249812429ebd44d6574497c, type: 3} - m_Name: StoryData_Chapter1 - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: - - Name: storyVariables - Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Int32, - mscorlib]], mscorlib - - Name: comparer - Entry: 7 - Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, - mscorlib]], mscorlib - - Name: - Entry: 8 - Data: - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: TestVariable - - Name: $v - Entry: 3 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - StoryBlockDatas: - - blockName: - blockID: - blockPosition: {x: 0, y: 0} - previousBlockIDs: [] - nextBlockIDs: [] diff --git a/Assets/Scripts/Story/StorySave.cs b/Assets/Scripts/Story/StorySave.cs index a0879498..a2150fea 100644 --- a/Assets/Scripts/Story/StorySave.cs +++ b/Assets/Scripts/Story/StorySave.cs @@ -4,26 +4,50 @@ using UnityEngine; namespace Ichni.Story { - public class StorySave : MonoBehaviour - { - public StoryBlockSave blockSave; - public StoryVariableSave variableSave; - } - public class StoryBlockSave { - public enum StoryBlockState + public string blockName; + public Vector2 position; + public StoryBlockState state; + + public StoryBlockSave(string blockName, Vector2 position, StoryBlockState state) { - Locked, - Current, - Completed + this.blockName = blockName; + this.state = state; + this.position = position; } - - public Dictionary storyBlockStates = new Dictionary(); } - public class StoryVariableSave + public class TutorialBlockSave : StoryBlockSave { - public Dictionary variables = new Dictionary(); + public TutorialBlockSave(string blockName, Vector2 position, StoryBlockState state) : base(blockName, position, state) + { + } + } + + public class DialogBlockSave : StoryBlockSave + { + public DialogBlockSave(string blockName, Vector2 position, StoryBlockState state) : base(blockName, position, state) + { + } + } + + public class SongBlockSave : StoryBlockSave + { + public SongBlockSave(string blockName, Vector2 position, StoryBlockState state) : base(blockName, position, state) + { + } + } + + public class BlockConnectorSave + { + public string startBlockName; + public string endBlockName; + + public BlockConnectorSave(string startBlockName, string endBlockName) + { + this.startBlockName = startBlockName; + this.endBlockName = endBlockName; + } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/StoryUI.meta b/Assets/Scripts/Story/StoryUI.meta similarity index 100% rename from Assets/Scripts/UI/StoryUI.meta rename to Assets/Scripts/Story/StoryUI.meta diff --git a/Assets/Scripts/Story/StoryUI/Blocks.meta b/Assets/Scripts/Story/StoryUI/Blocks.meta new file mode 100644 index 00000000..d9234b71 --- /dev/null +++ b/Assets/Scripts/Story/StoryUI/Blocks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2c23056fb0ab4b45a8db11866018794 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Story/StoryUI/Blocks/BeatmapStatusMark.cs b/Assets/Scripts/Story/StoryUI/Blocks/BeatmapStatusMark.cs new file mode 100644 index 00000000..349b514e --- /dev/null +++ b/Assets/Scripts/Story/StoryUI/Blocks/BeatmapStatusMark.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BeatmapStatusMark : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Story/StoryBlock.cs.meta b/Assets/Scripts/Story/StoryUI/Blocks/BeatmapStatusMark.cs.meta similarity index 83% rename from Assets/Scripts/Story/StoryBlock.cs.meta rename to Assets/Scripts/Story/StoryUI/Blocks/BeatmapStatusMark.cs.meta index d0021804..5a3c0900 100644 --- a/Assets/Scripts/Story/StoryBlock.cs.meta +++ b/Assets/Scripts/Story/StoryUI/Blocks/BeatmapStatusMark.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4634e1beb428cb341974c13687d09bfa +guid: b547d2cc398393a46a2a4c503f128cac MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/UI/StoryUI/BlockConnectorUI.cs b/Assets/Scripts/Story/StoryUI/Blocks/BlockConnectorUI.cs similarity index 84% rename from Assets/Scripts/UI/StoryUI/BlockConnectorUI.cs rename to Assets/Scripts/Story/StoryUI/Blocks/BlockConnectorUI.cs index 1df0a17b..4dce1990 100644 --- a/Assets/Scripts/UI/StoryUI/BlockConnectorUI.cs +++ b/Assets/Scripts/Story/StoryUI/Blocks/BlockConnectorUI.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using Ichni.Story.UI; using UnityEngine; using UnityEngine.UI.Extensions; @@ -8,6 +9,8 @@ namespace Ichni.Story public class BlockConnectorUI : MonoBehaviour { public UILineRenderer curve; + public StoryBlockUIBase startBlock; + public StoryBlockUIBase endBlock; public void SetCurve(Vector2 startPosition, Vector2 endPosition) { @@ -20,7 +23,7 @@ namespace Ichni.Story curve.Points = new Vector2[] { startPosition, - mid1, + //mid1, mid2, endPosition }; diff --git a/Assets/Scripts/UI/StoryUI/BlockConnectorUI.cs.meta b/Assets/Scripts/Story/StoryUI/Blocks/BlockConnectorUI.cs.meta similarity index 100% rename from Assets/Scripts/UI/StoryUI/BlockConnectorUI.cs.meta rename to Assets/Scripts/Story/StoryUI/Blocks/BlockConnectorUI.cs.meta diff --git a/Assets/Scripts/Story/StoryUI/Blocks/DialogBlockUI.cs b/Assets/Scripts/Story/StoryUI/Blocks/DialogBlockUI.cs new file mode 100644 index 00000000..1cf5d0c3 --- /dev/null +++ b/Assets/Scripts/Story/StoryUI/Blocks/DialogBlockUI.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace Ichni.Story.UI +{ + public class DialogBlockUI : StoryBlockUIBase + { + public string blockTitle; + public TMP_Text titleText; + + public Button button; + public List choiceGroups; + + public void Initialize(string blockName, Vector2 position, Vector2 positionOffset, + Vector2 size, StoryBlockState state, string blockTitle) + { + base.Initialize(blockName, position, positionOffset, size, state); + + this.blockTitle = blockTitle; + titleText.text = blockTitle; + + button.onClick.AddListener(() => + { + if(state == StoryBlockState.Locked) return; + + StoryManager.instance.storyline.currentBlock = this; + + if (state == StoryBlockState.Current) + { + DialogManager.instance.SetDialog(blockName); + DialogManager.instance.PlayNextDialogParagraph(DialogManager.instance.currentDialog); + } + else if (state == StoryBlockState.Completed) + { + DialogManager.instance.SetDialog(blockName); + DialogManager.instance.PlayNextDialogParagraph(DialogManager.instance.currentDialog, false); + DialogManager.instance.RevealDialog(); + } + }); + } + + public override StoryBlockSave GetBlockSave() + { + return new DialogBlockSave(blockName, blockPosition, state); + } + } +} diff --git a/Assets/Scripts/UI/StoryUI/TextBlockUI.cs.meta b/Assets/Scripts/Story/StoryUI/Blocks/DialogBlockUI.cs.meta similarity index 100% rename from Assets/Scripts/UI/StoryUI/TextBlockUI.cs.meta rename to Assets/Scripts/Story/StoryUI/Blocks/DialogBlockUI.cs.meta diff --git a/Assets/Scripts/Story/StoryUI/Blocks/SongBlockUI.cs b/Assets/Scripts/Story/StoryUI/Blocks/SongBlockUI.cs new file mode 100644 index 00000000..d6c3e09e --- /dev/null +++ b/Assets/Scripts/Story/StoryUI/Blocks/SongBlockUI.cs @@ -0,0 +1,78 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using Ichni.Menu; +using Ichni.RhythmGame; +using TMPro; +using UnityEngine; +using UnityEngine.Serialization; +using UnityEngine.UI; + +namespace Ichni.Story.UI +{ + public class SongBlockUI : StoryBlockUIBase + { + public string songName; + public Button button; + public TMP_Text songNameText; + public RectTransform beatmapStatusMarkContainer; + + public GameObject beatmapStatusMarkPrefab; + + public void Initialize(string blockName, Vector2 position, Vector2 positionOffset, + Vector2 size, StoryBlockState state, string songName) + { + base.Initialize(blockName, position, positionOffset, size, state); + + this.songName = songName; + songNameText.text = songName; + + button.onClick.AddListener(() => + { + MenuManager.instance.prepareUIPage.FadeIn(); + }); + + SetUpBeatmapStatusMarks(); + } + + public override StoryBlockSave GetBlockSave() + { + return new SongBlockSave(blockName, blockPosition, state); + } + + public void SetUpBeatmapStatusMarks() + { + SongStatusSave songStatusSave = GameSaveManager.instance.SongSaveModule.songStatusSaves[songName]; + + string chapter = StoryManager.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) + { + foreach (KeyValuePair beatmapSave in songStatusSave.beatmapSaves) + { + if (beatmapSave.Key == difficulty.difficultyName) + { + if (beatmapSave.Value.isAllPerfect) + { + GameObject mark = Instantiate(beatmapStatusMarkPrefab, beatmapStatusMarkContainer); + mark.GetComponent().color = difficulty.color; + mark.transform.GetChild(0).GetComponent().color = difficulty.color; + mark.transform.GetChild(0).GetComponent().text = "AP"; + break; + } + + if (beatmapSave.Value.isFullCombo) + { + GameObject mark = Instantiate(beatmapStatusMarkPrefab, beatmapStatusMarkContainer); + mark.GetComponent().color = difficulty.color; + mark.transform.GetChild(0).GetComponent().color = difficulty.color; + mark.transform.GetChild(0).GetComponent().text = "FC"; + break; + } + } + } + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/StoryUI/SongBlockUI.cs.meta b/Assets/Scripts/Story/StoryUI/Blocks/SongBlockUI.cs.meta similarity index 100% rename from Assets/Scripts/UI/StoryUI/SongBlockUI.cs.meta rename to Assets/Scripts/Story/StoryUI/Blocks/SongBlockUI.cs.meta diff --git a/Assets/Scripts/Story/StoryUI/Blocks/StoryBlockUIBase.cs b/Assets/Scripts/Story/StoryUI/Blocks/StoryBlockUIBase.cs new file mode 100644 index 00000000..36d36506 --- /dev/null +++ b/Assets/Scripts/Story/StoryUI/Blocks/StoryBlockUIBase.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Serialization; + +namespace Ichni.Story.UI +{ + public abstract class StoryBlockUIBase : MonoBehaviour + { + public string blockName; + public Vector2 blockPosition; + public StoryBlockState state; + + public RectTransform blockRect; + public RectTransform inPort; + public RectTransform outPort; + + protected void Initialize(string blockName, Vector2 position, Vector2 positionOffset, Vector2 size, StoryBlockState state) + { + this.blockName = blockName; + this.blockPosition = position; + this.state = state; + + blockRect.anchoredPosition = position + positionOffset; + blockRect.sizeDelta = size; + } + + public abstract StoryBlockSave GetBlockSave(); + } +} diff --git a/Assets/Scripts/UI/StoryUI/StoryBlockUIBase.cs.meta b/Assets/Scripts/Story/StoryUI/Blocks/StoryBlockUIBase.cs.meta similarity index 100% rename from Assets/Scripts/UI/StoryUI/StoryBlockUIBase.cs.meta rename to Assets/Scripts/Story/StoryUI/Blocks/StoryBlockUIBase.cs.meta diff --git a/Assets/Scripts/Story/StoryUI/Blocks/TutorialBlockUI.cs b/Assets/Scripts/Story/StoryUI/Blocks/TutorialBlockUI.cs new file mode 100644 index 00000000..2153da1f --- /dev/null +++ b/Assets/Scripts/Story/StoryUI/Blocks/TutorialBlockUI.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.Serialization; +using UnityEngine.UI; + +namespace Ichni.Story.UI +{ + public class TutorialBlockUI : StoryBlockUIBase + { + public Button button; + public string tutorialName; + public TMP_Text tutorialNameText; + + public void Initialize(string blockName, Vector2 position, Vector2 positionOffset, Vector2 size, StoryBlockState state, string tutorialName) + { + base.Initialize(blockName, position, positionOffset, size, state); + + this.tutorialName = tutorialName; + tutorialNameText.text = tutorialName; + + button.onClick.AddListener(() => + { + //DialogManager.instance.SetDialog(blockName); + }); + } + + public override StoryBlockSave GetBlockSave() + { + return new TutorialBlockSave(blockName, blockPosition, state); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/StoryUI/TutorialBlockUI.cs.meta b/Assets/Scripts/Story/StoryUI/Blocks/TutorialBlockUI.cs.meta similarity index 100% rename from Assets/Scripts/UI/StoryUI/TutorialBlockUI.cs.meta rename to Assets/Scripts/Story/StoryUI/Blocks/TutorialBlockUI.cs.meta diff --git a/Assets/Scripts/UI/DialogUI.meta b/Assets/Scripts/Story/StoryUI/DialogUI.meta similarity index 100% rename from Assets/Scripts/UI/DialogUI.meta rename to Assets/Scripts/Story/StoryUI/DialogUI.meta diff --git a/Assets/Scripts/Story/Storyline.cs b/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceButtonUI.cs similarity index 58% rename from Assets/Scripts/Story/Storyline.cs rename to Assets/Scripts/Story/StoryUI/DialogUI/ChoiceButtonUI.cs index c9a3cfd1..aa54080e 100644 --- a/Assets/Scripts/Story/Storyline.cs +++ b/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceButtonUI.cs @@ -2,9 +2,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace Ichni.Story +namespace Ichni.Story.UI { - public class Storyline : MonoBehaviour + public class ChoiceButtonUI : MonoBehaviour { } diff --git a/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceButtonUI.cs.meta b/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceButtonUI.cs.meta new file mode 100644 index 00000000..1fcc6e12 --- /dev/null +++ b/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceButtonUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90f34f59ff260c44796d71c51b7c0ee6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceGroupUI.cs b/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceGroupUI.cs new file mode 100644 index 00000000..dfa9b8bb --- /dev/null +++ b/Assets/Scripts/Story/StoryUI/DialogUI/ChoiceGroupUI.cs @@ -0,0 +1,45 @@ +using System.Collections; +using System.Collections.Generic; +using I2.Loc; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace Ichni.Story.UI +{ + public class ChoiceGroupUI : MonoBehaviour + { + public GameObject choiceButtonPrefab; + public RectTransform container; + + public List