diff --git a/.idea/.idea.HALLUCINATE/.idea/workspace.xml b/.idea/.idea.HALLUCINATE/.idea/workspace.xml index f16ca1cf..03841595 100644 --- a/.idea/.idea.HALLUCINATE/.idea/workspace.xml +++ b/.idea/.idea.HALLUCINATE/.idea/workspace.xml @@ -6,9 +6,7 @@ - - - + diff --git a/Assets/Settings/Project Setting/AudioDatabase.asset b/Assets/Settings/Project Setting/AudioDatabase.asset index 46cfa756..afd3f52f 100644 --- a/Assets/Settings/Project Setting/AudioDatabase.asset +++ b/Assets/Settings/Project Setting/AudioDatabase.asset @@ -53,3 +53,98 @@ MonoBehaviour: DefaultVolume: 0.3 DefaultPitch: 1.1 MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menuclick + Clip: {fileID: 8300000, guid: 0e77a34a88618c947a6f28d62211e533, type: 3} + DefaultVolume: 0.5 + DefaultPitch: 1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menu-play-hover + Clip: {fileID: 8300000, guid: c209fbd95b1b02a4cb75a027ce0713aa, type: 3} + DefaultVolume: 0.4 + DefaultPitch: 1.1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menu-back-hover + Clip: {fileID: 8300000, guid: 3408227a2bcd6d8468df7a6bdb185972, type: 3} + DefaultVolume: 0.4 + DefaultPitch: 1.05 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menu-options-hover + Clip: {fileID: 8300000, guid: 7e58115b9cec4cf45a79c858b76077b1, type: 3} + DefaultVolume: 0.4 + DefaultPitch: 1.05 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menu-exit-hover + Clip: {fileID: 8300000, guid: 3fed8036f4c5ad943b1d907d5e29d22c, type: 3} + DefaultVolume: 0.4 + DefaultPitch: 0.95 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menu-play-click + Clip: {fileID: 8300000, guid: ebd4de3e32d29714eb4cfd6338ec1d1a, type: 3} + DefaultVolume: 0.8 + DefaultPitch: 1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menu-back-click + Clip: {fileID: 8300000, guid: 5ba84b0e2cf43df408d587976da49d63, type: 3} + DefaultVolume: 0.7 + DefaultPitch: 0.9 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: click-short-confirm + Clip: {fileID: 8300000, guid: 55eef2d804c271946a2c47337fa27ce4, type: 3} + DefaultVolume: 0.9 + DefaultPitch: 1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: click-close + Clip: {fileID: 8300000, guid: 4ca23ada6817c7348a52ecbd49801702, type: 3} + DefaultVolume: 0.6 + DefaultPitch: 0.8 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: pause-retry-click + Clip: {fileID: 8300000, guid: a4ab3d4f1ae6ac940a5d16119a73a4e4, type: 3} + DefaultVolume: 0.8 + DefaultPitch: 1.1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menu-options-click + Clip: {fileID: 8300000, guid: 5f51b36760658354a91d710ecab055a1, type: 3} + DefaultVolume: 0.7 + DefaultPitch: 1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menu-exit-click + Clip: {fileID: 8300000, guid: 872d2756e2154fd44a1b07b67596b94a, type: 3} + DefaultVolume: 0.7 + DefaultPitch: 0.85 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: check-on + Clip: {fileID: 8300000, guid: 0467ea34c3274e449b7dd5b6c820db4e, type: 3} + DefaultVolume: 0.6 + DefaultPitch: 1.2 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: check-off + Clip: {fileID: 8300000, guid: 843d92b9180c16f4fb3a878aa7aacc9b, type: 3} + DefaultVolume: 0.6 + DefaultPitch: 0.8 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: UI_Focus + Clip: {fileID: 8300000, guid: 843d92b9180c16f4fb3a878aa7aacc9b, type: 3} + DefaultVolume: 0.4 + DefaultPitch: 1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: heartbeat + Clip: {fileID: 8300000, guid: 843d92b9180c16f4fb3a878aa7aacc9b, type: 3} + DefaultVolume: 0.8 + DefaultPitch: 1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: menuHit + Clip: {fileID: 8300000, guid: 843d92b9180c16f4fb3a878aa7aacc9b, type: 3} + DefaultVolume: 1 + DefaultPitch: 1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: sectionpass + Clip: {fileID: 8300000, guid: 843d92b9180c16f4fb3a878aa7aacc9b, type: 3} + DefaultVolume: 0.9 + DefaultPitch: 1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} + - Name: sectionfail + Clip: {fileID: 8300000, guid: 843d92b9180c16f4fb3a878aa7aacc9b, type: 3} + DefaultVolume: 0.9 + DefaultPitch: 1 + MixerGroup: {fileID: 24300002, guid: 914a8292e2b2b594e9b7cb3ee0c7e77d, type: 2} diff --git a/Assets/UI/MainPanelSettings.asset b/Assets/UI/MainPanelSettings.asset index dd92aeaa..9f3c49e5 100644 --- a/Assets/UI/MainPanelSettings.asset +++ b/Assets/UI/MainPanelSettings.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_ScaleMode: 1 m_ReferenceSpritePixelsPerUnit: 100 m_PixelsPerUnit: 100 - m_Scale: 1 + m_Scale: 1.6899998 m_ReferenceDpi: 96 m_FallbackDpi: 96 m_ReferenceResolution: {x: 1200, y: 800}