diff --git a/Assets/Resources/Music/Quick/JUSTOK_JINGLE_Master.wav b/Assets/Resources/Music/Quick/JUSTOK_JINGLE_Master.wav deleted file mode 100644 index ce4eeff09..000000000 Binary files a/Assets/Resources/Music/Quick/JUSTOK_JINGLE_Master.wav and /dev/null differ diff --git a/Assets/Resources/Music/Quick/SUPERB_JINGLE_SHORTEST_WALKUP_II_Master.wav b/Assets/Resources/Music/Quick/SUPERB_JINGLE_SHORTEST_WALKUP_II_Master.wav deleted file mode 100644 index 88aa0bc24..000000000 Binary files a/Assets/Resources/Music/Quick/SUPERB_JINGLE_SHORTEST_WALKUP_II_Master.wav and /dev/null differ diff --git a/Assets/Resources/Music/Quick/TRYAGAIN_JINGLE_Master.wav b/Assets/Resources/Music/Quick/TRYAGAIN_JINGLE_Master.wav deleted file mode 100644 index fcde972f5..000000000 Binary files a/Assets/Resources/Music/Quick/TRYAGAIN_JINGLE_Master.wav and /dev/null differ diff --git a/Assets/Resources/Music/Quick/jgl_ok.wav b/Assets/Resources/Music/Quick/jgl_ok.wav new file mode 100644 index 000000000..8cb371c35 Binary files /dev/null and b/Assets/Resources/Music/Quick/jgl_ok.wav differ diff --git a/Assets/Resources/Music/Quick/SUPERB_JINGLE_SHORTEST_WALKUP_II_Master.wav.meta b/Assets/Resources/Music/Quick/jgl_ok.wav.meta similarity index 91% rename from Assets/Resources/Music/Quick/SUPERB_JINGLE_SHORTEST_WALKUP_II_Master.wav.meta rename to Assets/Resources/Music/Quick/jgl_ok.wav.meta index b904008a0..5cd8409ea 100644 --- a/Assets/Resources/Music/Quick/SUPERB_JINGLE_SHORTEST_WALKUP_II_Master.wav.meta +++ b/Assets/Resources/Music/Quick/jgl_ok.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 588d666adbe56714b9e6db6e1ac51d2a +guid: fe838e0d46133154eb569eea405b4384 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Music/Quick/jgl_superb.wav b/Assets/Resources/Music/Quick/jgl_superb.wav new file mode 100644 index 000000000..038fad829 Binary files /dev/null and b/Assets/Resources/Music/Quick/jgl_superb.wav differ diff --git a/Assets/Resources/Music/Quick/TRYAGAIN_JINGLE_Master.wav.meta b/Assets/Resources/Music/Quick/jgl_superb.wav.meta similarity index 91% rename from Assets/Resources/Music/Quick/TRYAGAIN_JINGLE_Master.wav.meta rename to Assets/Resources/Music/Quick/jgl_superb.wav.meta index 406e3d63c..847c30956 100644 --- a/Assets/Resources/Music/Quick/TRYAGAIN_JINGLE_Master.wav.meta +++ b/Assets/Resources/Music/Quick/jgl_superb.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b97abe537803cf745a8e1b266e34f6e1 +guid: fe1f6ef0afa48654b8f7327f8c524a95 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Music/Quick/jgl_tryagain.wav b/Assets/Resources/Music/Quick/jgl_tryagain.wav new file mode 100644 index 000000000..b864f05ef Binary files /dev/null and b/Assets/Resources/Music/Quick/jgl_tryagain.wav differ diff --git a/Assets/Resources/Music/Quick/JUSTOK_JINGLE_Master.wav.meta b/Assets/Resources/Music/Quick/jgl_tryagain.wav.meta similarity index 91% rename from Assets/Resources/Music/Quick/JUSTOK_JINGLE_Master.wav.meta rename to Assets/Resources/Music/Quick/jgl_tryagain.wav.meta index 412313389..58b599f54 100644 --- a/Assets/Resources/Music/Quick/JUSTOK_JINGLE_Master.wav.meta +++ b/Assets/Resources/Music/Quick/jgl_tryagain.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5bd7048cc57d7f49abdc3238a661efd +guid: fafe3a8c7c727724ba5435964ea65c6b AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Music/Superb_Theme_Heaven_Studio.wav b/Assets/Resources/Music/Superb_Theme_Heaven_Studio.wav deleted file mode 100644 index 6bb1f384e..000000000 Binary files a/Assets/Resources/Music/Superb_Theme_Heaven_Studio.wav and /dev/null differ diff --git a/Assets/Resources/Music/Superb_Theme_Heaven_Studio.wav.meta b/Assets/Resources/Music/Superb_Theme_Heaven_Studio.wav.meta deleted file mode 100644 index f54dac130..000000000 --- a/Assets/Resources/Music/Superb_Theme_Heaven_Studio.wav.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 13e101f21d913cd4bb83706535d11ffa -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 2 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Music/Heaven_Studio_-_Just_OK.wav b/Assets/Resources/Music/mus_ok.wav similarity index 65% rename from Assets/Resources/Music/Heaven_Studio_-_Just_OK.wav rename to Assets/Resources/Music/mus_ok.wav index e2cf0fe9f..1d0fb1f6d 100644 Binary files a/Assets/Resources/Music/Heaven_Studio_-_Just_OK.wav and b/Assets/Resources/Music/mus_ok.wav differ diff --git a/Assets/Resources/Music/Heaven_Studio_-_Just_OK.wav.meta b/Assets/Resources/Music/mus_ok.wav.meta similarity index 87% rename from Assets/Resources/Music/Heaven_Studio_-_Just_OK.wav.meta rename to Assets/Resources/Music/mus_ok.wav.meta index f9a253e02..822355b9e 100644 --- a/Assets/Resources/Music/Heaven_Studio_-_Just_OK.wav.meta +++ b/Assets/Resources/Music/mus_ok.wav.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: cee5e986cdf404a4ca2cb5b3286a09e8 +guid: a18ff86cd91f74d4181edf421100ee30 AudioImporter: externalObjects: {} serializedVersion: 6 defaultSettings: - loadType: 2 + loadType: 0 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 diff --git a/Assets/Resources/Music/mus_ok00.ogg b/Assets/Resources/Music/mus_ok00.ogg new file mode 100644 index 000000000..ff632dbd9 Binary files /dev/null and b/Assets/Resources/Music/mus_ok00.ogg differ diff --git a/Assets/Resources/Music/mus_ok00.ogg.meta b/Assets/Resources/Music/mus_ok00.ogg.meta new file mode 100644 index 000000000..360637436 --- /dev/null +++ b/Assets/Resources/Music/mus_ok00.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8a156afa82eaafe4ba9ec880135824a9 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Music/mus_ok01.ogg b/Assets/Resources/Music/mus_ok01.ogg new file mode 100644 index 000000000..e0bbe7b48 Binary files /dev/null and b/Assets/Resources/Music/mus_ok01.ogg differ diff --git a/Assets/Resources/Music/mus_ok01.ogg.meta b/Assets/Resources/Music/mus_ok01.ogg.meta new file mode 100644 index 000000000..830258087 --- /dev/null +++ b/Assets/Resources/Music/mus_ok01.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4f2d2a5e5d575f54e96c0d5c0b490d1a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Music/mus_superb00.ogg b/Assets/Resources/Music/mus_superb00.ogg new file mode 100644 index 000000000..01650c435 Binary files /dev/null and b/Assets/Resources/Music/mus_superb00.ogg differ diff --git a/Assets/Resources/Music/mus_superb00.ogg.meta b/Assets/Resources/Music/mus_superb00.ogg.meta new file mode 100644 index 000000000..1b2f8515b --- /dev/null +++ b/Assets/Resources/Music/mus_superb00.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5ac640a8e787ded4f9c0edd71b0b1355 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Music/mus_superb01.ogg b/Assets/Resources/Music/mus_superb01.ogg new file mode 100644 index 000000000..e7c2ed5cb Binary files /dev/null and b/Assets/Resources/Music/mus_superb01.ogg differ diff --git a/Assets/Resources/Music/mus_superb01.ogg.meta b/Assets/Resources/Music/mus_superb01.ogg.meta new file mode 100644 index 000000000..6c7db17fb --- /dev/null +++ b/Assets/Resources/Music/mus_superb01.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: bb96be36a3375024f8986d8820129039 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Music/mus_tryagain00.ogg b/Assets/Resources/Music/mus_tryagain00.ogg new file mode 100644 index 000000000..26c95ace9 Binary files /dev/null and b/Assets/Resources/Music/mus_tryagain00.ogg differ diff --git a/Assets/Resources/Music/mus_tryagain00.ogg.meta b/Assets/Resources/Music/mus_tryagain00.ogg.meta new file mode 100644 index 000000000..dc12e0efd --- /dev/null +++ b/Assets/Resources/Music/mus_tryagain00.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e2d0f21965505d34ab91f07878b11d48 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Music/mus_tryagain01.ogg b/Assets/Resources/Music/mus_tryagain01.ogg new file mode 100644 index 000000000..a9bb2b3f9 Binary files /dev/null and b/Assets/Resources/Music/mus_tryagain01.ogg differ diff --git a/Assets/Resources/Music/mus_tryagain01.ogg.meta b/Assets/Resources/Music/mus_tryagain01.ogg.meta new file mode 100644 index 000000000..fc836e818 --- /dev/null +++ b/Assets/Resources/Music/mus_tryagain01.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a3804382c0f51b742af5e9a6a0fb47ef +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Music/try_again_hs.flac b/Assets/Resources/Music/try_again_hs.flac deleted file mode 100644 index 1e34f31c3..000000000 Binary files a/Assets/Resources/Music/try_again_hs.flac and /dev/null differ diff --git a/Assets/Resources/Music/try_again_hs.flac.meta b/Assets/Resources/Music/try_again_hs.flac.meta deleted file mode 100644 index d48144c9a..000000000 --- a/Assets/Resources/Music/try_again_hs.flac.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 0b0bbf45aa130e24d8f5a8836befc88d -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 2 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Common/Textbox/JudgementHeaderSDFMaterial.mat b/Assets/Resources/Sprites/UI/Common/Textbox/JudgementHeaderSDFMaterial.mat index 3921ab248..7dfbb07b3 100644 --- a/Assets/Resources/Sprites/UI/Common/Textbox/JudgementHeaderSDFMaterial.mat +++ b/Assets/Resources/Sprites/UI/Common/Textbox/JudgementHeaderSDFMaterial.mat @@ -70,7 +70,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _OutSmoothness: 0.025 - - _OutThickness: 0.9 + - _OutThickness: 0 - _Parallax: 0.02 - _SDFThreshold: 0.5 - _Smoothness: 0.025 @@ -82,12 +82,12 @@ Material: - _StencilOp: 0 - _StencilReadMask: 255 - _StencilWriteMask: 255 - - _Thickness: 0.8 + - _Thickness: 0.1 - _UVSec: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _OutColor: {r: 1, g: 0, b: 1, a: 1} + - _OutColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/UI/Common/Textbox/JudgementSDFMaterial.mat b/Assets/Resources/Sprites/UI/Common/Textbox/JudgementSDFMaterial.mat index 7a1116503..2860414ad 100644 --- a/Assets/Resources/Sprites/UI/Common/Textbox/JudgementSDFMaterial.mat +++ b/Assets/Resources/Sprites/UI/Common/Textbox/JudgementSDFMaterial.mat @@ -89,5 +89,5 @@ Material: m_Colors: - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _OutColor: {r: 1, g: 0, b: 1, a: 1} + - _OutColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/UI/Timeline.meta b/Assets/Resources/Sprites/UI/Timeline.meta new file mode 100644 index 000000000..f93872ea9 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7de8da1a8b236240968c4669a5ea289 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Timeline/Judgement.meta b/Assets/Resources/Sprites/UI/Timeline/Judgement.meta new file mode 100644 index 000000000..e6a07b1c6 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/Judgement.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57c738cc09b40274490edcdddd49a54d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Timeline/Judgement/Message0.signal b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message0.signal new file mode 100644 index 000000000..e6e2ff9de --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message0.signal @@ -0,0 +1,14 @@ +%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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3} + m_Name: Message0 + m_EditorClassIdentifier: diff --git a/Assets/Resources/Sprites/UI/Timeline/Judgement/Message0.signal.meta b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message0.signal.meta new file mode 100644 index 000000000..f53e8bc29 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message0.signal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 91b18d308429fbd43b8ccc497a10451f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Timeline/Judgement/Message1.signal b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message1.signal new file mode 100644 index 000000000..0c36c4588 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message1.signal @@ -0,0 +1,14 @@ +%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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3} + m_Name: Message1 + m_EditorClassIdentifier: diff --git a/Assets/Resources/Sprites/UI/Timeline/Judgement/Message1.signal.meta b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message1.signal.meta new file mode 100644 index 000000000..7cb71d03b --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message1.signal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5bc62bc9f451ed4a9ed997842113201 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Timeline/Judgement/Message2.signal b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message2.signal new file mode 100644 index 000000000..01f8d4186 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message2.signal @@ -0,0 +1,14 @@ +%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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3} + m_Name: Message2 + m_EditorClassIdentifier: diff --git a/Assets/Resources/Sprites/UI/Timeline/Judgement/Message2.signal.meta b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message2.signal.meta new file mode 100644 index 000000000..91ce71889 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/Judgement/Message2.signal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57ca9bfe84a3d8e459c3acb8ae9d822a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Timeline/Judgement/PrepareJudgement.signal b/Assets/Resources/Sprites/UI/Timeline/Judgement/PrepareJudgement.signal new file mode 100644 index 000000000..4cb1f6d10 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/Judgement/PrepareJudgement.signal @@ -0,0 +1,14 @@ +%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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3} + m_Name: PrepareJudgement + m_EditorClassIdentifier: diff --git a/Assets/Resources/Sprites/UI/Timeline/Judgement/PrepareJudgement.signal.meta b/Assets/Resources/Sprites/UI/Timeline/Judgement/PrepareJudgement.signal.meta new file mode 100644 index 000000000..a69b178d1 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/Judgement/PrepareJudgement.signal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b84f5e43721bc2e408bc902a4e02988d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable b/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable new file mode 100644 index 000000000..1c576c8d0 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable @@ -0,0 +1,440 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9101412954921392876 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (1) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 3 + m_ClipIn: 0 + m_Asset: {fileID: 2796815243102601463} + m_Duration: 6.7666666666666675 + m_TimeScale: 1 + m_ParentTrack: {fileID: -9101412954921392876} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 +--- !u!114 &-5767254530813639598 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: b46e36075dd1c124a8422c228e75e1fb, type: 3} + m_Name: Signal Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: + - {fileID: 4005577975902647507} + - {fileID: 2251119349716289747} + - {fileID: 3019407148365585604} + - {fileID: 8445470951399354961} +--- !u!114 &-3297741380686258233 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 4f10dd60657c6004587f237a7e90f8e4, type: 3} + m_Name: AudioPlayableAsset + m_EditorClassIdentifier: + m_Clip: {fileID: 8300000, guid: ad084587e62305b47a46f1fa415afda5, type: 3} + m_Loop: 0 + m_bufferingTime: 0.1 + m_ClipProperties: + volume: 1 +--- !u!114 &-1993872382755634392 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0.016666666666666666 + m_ClipIn: 0 + m_Asset: {fileID: 3869086833221261789} + m_Duration: 9.75 + m_TimeScale: 1 + m_ParentTrack: {fileID: -1993872382755634392} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 +--- !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: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: JudgementOpen + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: + - {fileID: -1993872382755634392} + - {fileID: -9101412954921392876} + - {fileID: 646370206897025620} + - {fileID: -5767254530813639598} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} +--- !u!114 &646370206897025620 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 8b22792c3b570444eb18cb78c2af3a74, type: 3} + m_Name: Audio Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0.016666666666666666 + m_ClipIn: 0 + m_Asset: {fileID: -3297741380686258233} + m_Duration: 0.47421168418479587 + m_TimeScale: 1 + m_ParentTrack: {fileID: 646370206897025620} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: resultMessage1 + m_Markers: + m_Objects: [] + m_TrackProperties: + volume: 1 + stereoPan: 0 + spatialBlend: 0 +--- !u!114 &2251119349716289747 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} + m_Name: Signal Emitter + m_EditorClassIdentifier: + m_Time: 1.5 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 11400000, guid: 91b18d308429fbd43b8ccc497a10451f, type: 2} +--- !u!114 &2796815243102601463 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: +--- !u!114 &3019407148365585604 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} + m_Name: Signal Emitter + m_EditorClassIdentifier: + m_Time: 2 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 11400000, guid: 57ca9bfe84a3d8e459c3acb8ae9d822a, type: 2} +--- !u!114 &3869086833221261789 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: +--- !u!114 &4005577975902647507 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} + m_Name: Signal Emitter + m_EditorClassIdentifier: + m_Time: 1 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 11400000, guid: f5bc62bc9f451ed4a9ed997842113201, type: 2} +--- !u!114 &8445470951399354961 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} + m_Name: Signal Emitter + m_EditorClassIdentifier: + m_Time: 0 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 11400000, guid: b84f5e43721bc2e408bc902a4e02988d, type: 2} diff --git a/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable.meta b/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable.meta new file mode 100644 index 000000000..4edd3cb91 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cface0e48180cc43954bd1d6d1c6168 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Judgement.unity b/Assets/Scenes/Judgement.unity index 40baf053b..eddc0684f 100644 --- a/Assets/Scenes/Judgement.unity +++ b/Assets/Scenes/Judgement.unity @@ -154,6 +154,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2086822066} + - {fileID: 1475451633} - {fileID: 2144389834} - {fileID: 906704161} - {fileID: 1569344341} @@ -162,7 +163,7 @@ 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: 23.999985} + m_AnchoredPosition: {x: 0, y: 24} m_SizeDelta: {x: -256, y: -207.99997} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &17428506 @@ -282,6 +283,8 @@ GameObject: - component: {fileID: 560605778} - component: {fileID: 560605779} - component: {fileID: 560605780} + - component: {fileID: 560605781} + - component: {fileID: 560605782} m_Layer: 0 m_Name: JudgementMgr m_TagString: Untagged @@ -316,6 +319,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a7b4832b6819554c998fb089d731df5, type: 3} m_Name: m_EditorClassIdentifier: + message0: {fileID: 1702256962} + message1: {fileID: 1589589769} + message2: {fileID: 1162629855} + barText: {fileID: 1606897455} + barSlider: {fileID: 906704162} + messageMid: {fileID: 8300000, guid: c8214d9f68da85749bb54818c69e6909, type: 3} + messageLast: {fileID: 8300000, guid: 50705073a61e8df44943462793889ad1, type: 3} + rankLogo: {fileID: 1569344340} + rankAnim: {fileID: 0} + scaler: {fileID: 1200697281} --- !u!320 &560605780 PlayableDirector: m_ObjectHideFlags: 0 @@ -325,14 +338,193 @@ PlayableDirector: m_GameObject: {fileID: 560605777} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 0} + m_PlayableAsset: {fileID: 11400000, guid: 1cface0e48180cc43954bd1d6d1c6168, type: 2} m_InitialState: 1 - m_WrapMode: 2 + m_WrapMode: 0 m_DirectorUpdateMode: 1 m_InitialTime: 0 - m_SceneBindings: [] + m_SceneBindings: + - key: {fileID: -1993872382755634392, guid: 1cface0e48180cc43954bd1d6d1c6168, type: 2} + value: {fileID: 17428504} + - key: {fileID: 646370206897025620, guid: 1cface0e48180cc43954bd1d6d1c6168, type: 2} + value: {fileID: 560605782} + - key: {fileID: -9101412954921392876, guid: 1cface0e48180cc43954bd1d6d1c6168, type: 2} + value: {fileID: 906704160} + - key: {fileID: -5767254530813639598, guid: 1cface0e48180cc43954bd1d6d1c6168, type: 2} + value: {fileID: 560605781} m_ExposedReferences: m_References: [] +--- !u!114 &560605781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 560605777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: f5bc62bc9f451ed4a9ed997842113201, type: 2} + - {fileID: 11400000, guid: 91b18d308429fbd43b8ccc497a10451f, type: 2} + - {fileID: 11400000, guid: 57ca9bfe84a3d8e459c3acb8ae9d822a, type: 2} + - {fileID: 11400000, guid: b84f5e43721bc2e408bc902a4e02988d, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 560605779} + m_TargetAssemblyTypeName: HeavenStudio.JudgementManager, Assembly-CSharp + m_MethodName: ShowMessage1 + 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 + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 560605779} + m_TargetAssemblyTypeName: HeavenStudio.JudgementManager, Assembly-CSharp + m_MethodName: ShowMessage0 + 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 + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 560605779} + m_TargetAssemblyTypeName: HeavenStudio.JudgementManager, Assembly-CSharp + m_MethodName: ShowMessage2 + 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 + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 560605779} + m_TargetAssemblyTypeName: HeavenStudio.JudgementManager, Assembly-CSharp + m_MethodName: PrepareJudgement + 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!82 &560605782 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 560605777} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &902003159 GameObject: m_ObjectHideFlags: 0 @@ -503,7 +695,7 @@ RectTransform: - {fileID: 2003623135} - {fileID: 1606897454} m_Father: {fileID: 17428505} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -695,7 +887,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -713,6 +905,143 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1021706198} m_CullTransparentMesh: 1 +--- !u!1 &1162629853 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1162629854} + - component: {fileID: 1162629856} + - component: {fileID: 1162629855} + m_Layer: 5 + m_Name: Message2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1162629854 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162629853} + 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: 1475451633} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -7} + m_SizeDelta: {x: 0, y: -14.000012} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1162629855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162629853} + 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: b + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, 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: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -92 + m_lineSpacingMax: 0 + m_paragraphSpacing: 52 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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 &1162629856 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162629853} + m_CullTransparentMesh: 1 --- !u!1 &1200697279 GameObject: m_ObjectHideFlags: 0 @@ -764,7 +1093,7 @@ MonoBehaviour: m_UiScaleMode: 0 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1280, y: 720} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -814,6 +1143,54 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1475451632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1475451633} + - component: {fileID: 1475451635} + m_Layer: 5 + m_Name: MessageContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1475451633 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475451632} + 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: 1702256961} + - {fileID: 1589589768} + - {fileID: 1162629854} + m_Father: {fileID: 17428505} + m_RootOrder: 1 + 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: 6.5} + m_SizeDelta: {x: -100, y: -283} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1475451635 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475451632} + m_CullTransparentMesh: 1 --- !u!1 &1569344340 GameObject: m_ObjectHideFlags: 0 @@ -831,7 +1208,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1569344341 RectTransform: m_ObjectHideFlags: 0 @@ -845,7 +1222,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 17428505} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -890,6 +1267,143 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1569344340} m_CullTransparentMesh: 1 +--- !u!1 &1589589767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1589589768} + - component: {fileID: 1589589770} + - component: {fileID: 1589589769} + m_Layer: 5 + m_Name: Message1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1589589768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1589589767} + 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: 1475451633} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 7} + m_SizeDelta: {x: 0, y: -14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1589589769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1589589767} + 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: a + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, 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: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -92 + m_lineSpacingMax: 0 + m_paragraphSpacing: 52 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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 &1589589770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1589589767} + m_CullTransparentMesh: 1 --- !u!1 &1606897453 GameObject: m_ObjectHideFlags: 0 @@ -1111,6 +1625,143 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1702256960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1702256961} + - component: {fileID: 1702256963} + - component: {fileID: 1702256962} + m_Layer: 5 + m_Name: Message0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1702256961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702256960} + 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: 1475451633} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 611, y: -58.60666} + m_SizeDelta: {x: 1222, y: 117.21333} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1702256962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702256960} + 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: single line message + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, 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: -92 + m_lineSpacingMax: 0 + m_paragraphSpacing: 52 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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 &1702256963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702256960} + m_CullTransparentMesh: 1 --- !u!1 &2003623134 GameObject: m_ObjectHideFlags: 0 @@ -1175,7 +1826,7 @@ RectTransform: m_GameObject: {fileID: 2086822065} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 902003160} @@ -1242,7 +1893,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2144389834 RectTransform: m_ObjectHideFlags: 0 @@ -1256,7 +1907,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 17428505} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/GameInitializer.cs b/Assets/Scripts/GameInitializer.cs index 25630436c..eba226c0c 100644 --- a/Assets/Scripts/GameInitializer.cs +++ b/Assets/Scripts/GameInitializer.cs @@ -68,7 +68,7 @@ namespace HeavenStudio GameObject Games = new GameObject(); Games.name = "Games"; - gameManager.playOnStart = playOnStart; + gameManager.playMode = playOnStart; gameManager.GamesHolder = Games; gameManager.CircleCursor = Cursor.transform.GetChild(0).GetComponent(); diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index aaf494fd5..8e6291ebe 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -44,14 +44,14 @@ namespace HeavenStudio currentPreEvent, currentPreSwitch, currentPreSequence; [NonSerialized] public double endBeat; [NonSerialized] public float startOffset; - [NonSerialized] public bool playOnStart; + [NonSerialized] public bool playMode; [NonSerialized] public double startBeat; [NonSerialized] public GameObject currentGameO; private Minigame _currentMinigame; [NonSerialized] public bool autoplay; [NonSerialized] public bool canInput = true; [NonSerialized] public RiqEntity currentSection, nextSection; - public double sectionProgress { get; private set; } + public double SectionProgress { get; private set; } public bool GameHasSplitColours { @@ -186,7 +186,7 @@ namespace HeavenStudio SetGame("noGame"); } - if (playOnStart) + if (playMode) { StartCoroutine(WaitReadyAndPlayCo(startBeat)); } @@ -297,7 +297,7 @@ namespace HeavenStudio Conductor.instance.SetBpm(Beatmap.TempoChanges[0]["tempo"]); Conductor.instance.SetVolume(Beatmap.VolumeChanges[0]["volume"]); Conductor.instance.firstBeatOffset = Beatmap.data.offset; - if (!playOnStart) + if (!playMode) { Stop(0); } @@ -326,7 +326,7 @@ namespace HeavenStudio } } - public void ScoreInputAccuracy(double accuracy, bool late, double time, double weight = 1, bool doDisplay = true) + public void ScoreInputAccuracy(double beat, double accuracy, bool late, double time, double weight = 1, bool doDisplay = true, int category = 0) { totalInputs += weight; totalPlayerAccuracy += accuracy * weight; @@ -563,16 +563,16 @@ namespace HeavenStudio if (currentSection == null) { - sectionProgress = 0; + SectionProgress = 0; } else { double currectSectionStart = cond.GetSongPosFromBeat(currentSection.beat); if (nextSection == null) - sectionProgress = (cond.songPosition - currectSectionStart) / (cond.GetSongPosFromBeat(endBeat) - currectSectionStart); + SectionProgress = (cond.songPosition - currectSectionStart) / (cond.GetSongPosFromBeat(endBeat) - currectSectionStart); else - sectionProgress = (cond.songPosition - currectSectionStart) / (cond.GetSongPosFromBeat(nextSection.beat) - currectSectionStart); + SectionProgress = (cond.songPosition - currectSectionStart) / (cond.GetSongPosFromBeat(nextSection.beat) - currectSectionStart); } } @@ -642,7 +642,7 @@ namespace HeavenStudio miniGame.OnPlay(beat); } - if (playOnStart) + if (playMode) { CircleCursor.LockCursor(true); } @@ -674,7 +674,7 @@ namespace HeavenStudio SectionMedalsManager.instance.OnRemixEnd(); // pass this data to rating screen + stats - Debug.Log($"== Playthrough statistics of {Beatmap["remixtitle"]} (played at {System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}) =="); + Debug.Log($"== Playthrough statistics of {Beatmap["remixtitle"]} (played at {System.DateTime.Now:yyyy-MM-dd HH:mm:ss}) =="); Debug.Log($"Average input offset for playthrough: {averageInputOffset}ms"); Debug.Log($"Accuracy for playthrough: {(PlayerAccuracy * 100): 0.00}"); Debug.Log($"Cleared {clearedSections.FindAll(c => c).Count} sections out of {Beatmap.SectionMarkers.Count}"); @@ -690,7 +690,7 @@ namespace HeavenStudio { Play(0, restartDelay); } - else if (playOnStart) + else if (playMode) { // when rating screen gets added playOnStart will instead move to that scene GlobalGameManager.LoadScene("Title", 0.35f, 0.5f); diff --git a/Assets/Scripts/Games/Minigame.cs b/Assets/Scripts/Games/Minigame.cs index 632bb8810..ea466003f 100644 --- a/Assets/Scripts/Games/Minigame.cs +++ b/Assets/Scripts/Games/Minigame.cs @@ -435,7 +435,8 @@ namespace HeavenStudio.Games public void ScoreMiss(double weight = 1f) { - GameManager.instance.ScoreInputAccuracy(0, true, NgLateTime(), weight, false); + double beat = Conductor.instance?.songPositionInBeatsAsDouble ?? -1; + GameManager.instance.ScoreInputAccuracy(beat, 0, true, NgLateTime(), weight, false); if (weight > 0) { GoForAPerfect.instance.Miss(); diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs b/Assets/Scripts/Games/PlayerActionEvent.cs index 58474860e..7dae9c96f 100644 --- a/Assets/Scripts/Games/PlayerActionEvent.cs +++ b/Assets/Scripts/Games/PlayerActionEvent.cs @@ -269,7 +269,7 @@ namespace HeavenStudio.Games if (countsForAccuracy && !(noAutoplay || autoplayOnly) && isEligible) { - GameManager.instance.ScoreInputAccuracy(TimeToAccuracy(time), time > 1.0, time); + GameManager.instance.ScoreInputAccuracy(startBeat + timer, TimeToAccuracy(time), time > 1.0, time); if (state >= 1f || state <= -1f) { GoForAPerfect.instance.Miss(); @@ -343,7 +343,7 @@ namespace HeavenStudio.Games if (countsForAccuracy && !(noAutoplay || autoplayOnly)) { - GameManager.instance.ScoreInputAccuracy(0, true, 2.0, 1.0, false); + GameManager.instance.ScoreInputAccuracy(startBeat + timer, 0, true, 2.0, 1.0, false); GoForAPerfect.instance.Miss(); SectionMedalsManager.instance.MakeIneligible(); } diff --git a/Assets/Scripts/JudgementManager.cs b/Assets/Scripts/JudgementManager.cs index 7c038ecfb..d58d352de 100644 --- a/Assets/Scripts/JudgementManager.cs +++ b/Assets/Scripts/JudgementManager.cs @@ -1,18 +1,136 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Timeline; +using UnityEngine.UI; +using TMPro; +using Jukebox; +using UnityEngine.Playables; -public class JudgementManager : MonoBehaviour +namespace HeavenStudio { - // Start is called before the first frame update - void Start() + [RequireComponent(typeof(PlayableDirector), typeof(AudioSource))] + public class JudgementManager : MonoBehaviour { - - } + public enum InputCategory : int + { + Normal = 0, + Keep = 1, + Aim = 2, + Repeat = 3 + // higher values are (will be) custom categories + } - // Update is called once per frame - void Update() - { - + [Serializable] + public struct MedalInfo + { + public double beat; + public string name; + public double score; + public bool cleared; + } + + [Serializable] + public struct InputInfo + { + public double beat; + public double accuracyState; + public double timeOffset; + public float weight; + public int category; + } + + [Serializable] + public struct JudgementInfo + { + public List inputs; + public List medals; + + public double finalScore; + public bool star, perfect; + public DateTime time; + } + + const string MessageAdd = "Also... "; + + static JudgementInfo judgementInfo; + static RiqBeatmap playedBeatmap; + + public static void SetPlayInfo(JudgementInfo info, RiqBeatmap beatmap) + { + judgementInfo = info; + playedBeatmap = beatmap; + } + + [SerializeField] TMP_Text message0; + [SerializeField] TMP_Text message1; + [SerializeField] TMP_Text message2; + [SerializeField] TMP_Text barText; + [SerializeField] Slider barSlider; + + [SerializeField] AudioClip messageMid, messageLast; + + [SerializeField] GameObject rankLogo; + [SerializeField] Animator rankAnim; + [SerializeField] CanvasScaler scaler; + + AudioSource audioSource; + bool twoMessage = false, barStarted = false; + + public void PrepareJudgement() + { + barText.text = "0"; + barSlider.value = 0; + twoMessage = true; + if (twoMessage) + { + message0.gameObject.SetActive(false); + message1.gameObject.SetActive(true); + message2.gameObject.SetActive(true); + message1.text = " "; + message2.text = " "; + } + else + { + message0.gameObject.SetActive(true); + message1.gameObject.SetActive(false); + message2.gameObject.SetActive(false); + message0.text = " "; + } + } + + public void ShowMessage0() + { + if (twoMessage) return; + audioSource.PlayOneShot(messageLast); + message0.text = "single line message"; + } + + public void ShowMessage1() + { + if (!twoMessage) return; + audioSource.PlayOneShot(messageMid); + message1.text = "message line 1"; + } + + public void ShowMessage2() + { + if (!twoMessage) return; + audioSource.PlayOneShot(messageLast); + message2.text = "message line 2"; + } + + private void Start() + { + audioSource = GetComponent(); + } + + private void Update() + { + float w = Screen.width / 1920f; + float h = Screen.height / 1080f; + scaler.scaleFactor = Mathf.Min(w, h); + } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Overlays/ChartSectionDisplay.cs b/Assets/Scripts/UI/Overlays/ChartSectionDisplay.cs index 674f549c8..f65919445 100644 --- a/Assets/Scripts/UI/Overlays/ChartSectionDisplay.cs +++ b/Assets/Scripts/UI/Overlays/ChartSectionDisplay.cs @@ -27,13 +27,13 @@ namespace HeavenStudio.Common // Update is called once per frame void Update() { - SectionProgress.value = (float) GameManager.instance.sectionProgress; + SectionProgress.value = (float) GameManager.instance.SectionProgress; } public void OnBeatChanged(double beat) { gameObject.SetActive(GameManager.instance.currentSection != null); - SectionProgress.value = (float) GameManager.instance.sectionProgress; + SectionProgress.value = (float) GameManager.instance.SectionProgress; } public void OnSectionChange(RiqEntity section) @@ -42,7 +42,7 @@ namespace HeavenStudio.Common { gameObject.SetActive(true); SectionText.text = section["sectionName"]; - SectionProgress.value = (float) GameManager.instance.sectionProgress; + SectionProgress.value = (float) GameManager.instance.SectionProgress; if (PersistentDataManager.gameSettings.perfectChallengeType == PersistentDataManager.PerfectChallengeType.Off) return; if (!OverlaysManager.OverlaysEnabled) return; diff --git a/Assets/Scripts/UI/SettingsDialog/SettingsDialog.cs b/Assets/Scripts/UI/SettingsDialog/SettingsDialog.cs index 0ce864bd0..ac7ee1370 100644 --- a/Assets/Scripts/UI/SettingsDialog/SettingsDialog.cs +++ b/Assets/Scripts/UI/SettingsDialog/SettingsDialog.cs @@ -23,7 +23,7 @@ namespace HeavenStudio.Common PersistentDataManager.SaveSettings(); tabsManager.CleanTabs(); - if (GameManager.instance != null && GameManager.instance.CircleCursor != null && GameManager.instance.playOnStart) + if (GameManager.instance != null && GameManager.instance.CircleCursor != null && GameManager.instance.playMode) { GameManager.instance.CircleCursor.LockCursor(true); } @@ -40,7 +40,7 @@ namespace HeavenStudio.Common BuildDateDisplay.text = GlobalGameManager.buildTime; - if (GameManager.instance != null && GameManager.instance.CircleCursor != null && GameManager.instance.playOnStart) + if (GameManager.instance != null && GameManager.instance.CircleCursor != null && GameManager.instance.playMode) { GameManager.instance.CircleCursor.LockCursor(false); }