diff --git a/Assets/ResWork/Sound/b001_BGM.mp3 b/Assets/ResWork/Sound/b001_BGM.mp3 deleted file mode 100644 index b656f72..0000000 Binary files a/Assets/ResWork/Sound/b001_BGM.mp3 and /dev/null differ diff --git a/Assets/ResWork/Sound/게임 로비.wav b/Assets/ResWork/Sound/b001_BGM.wav similarity index 100% rename from Assets/ResWork/Sound/게임 로비.wav rename to Assets/ResWork/Sound/b001_BGM.wav diff --git a/Assets/ResWork/Sound/b001_BGM.mp3.meta b/Assets/ResWork/Sound/b001_BGM.wav.meta similarity index 92% rename from Assets/ResWork/Sound/b001_BGM.mp3.meta rename to Assets/ResWork/Sound/b001_BGM.wav.meta index 9f8f499..5f241d9 100644 --- a/Assets/ResWork/Sound/b001_BGM.mp3.meta +++ b/Assets/ResWork/Sound/b001_BGM.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f6114cbd9684c734a86622e924246b10 +guid: f84b956bd038a0a469e34451d8edf1d4 AudioImporter: externalObjects: {} serializedVersion: 8 diff --git a/Assets/ResWork/Sound/Title.wav b/Assets/ResWork/Sound/b008_Title.wav similarity index 100% rename from Assets/ResWork/Sound/Title.wav rename to Assets/ResWork/Sound/b008_Title.wav diff --git a/Assets/ResWork/Sound/Title.wav.meta b/Assets/ResWork/Sound/b008_Title.wav.meta similarity index 88% rename from Assets/ResWork/Sound/Title.wav.meta rename to Assets/ResWork/Sound/b008_Title.wav.meta index b5bf019..32b649b 100644 --- a/Assets/ResWork/Sound/Title.wav.meta +++ b/Assets/ResWork/Sound/b008_Title.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d13d736f18e25de49ba7b6a288990b32 +guid: 8ec33f981f6e4b14384e10d848ce9f32 AudioImporter: externalObjects: {} serializedVersion: 8 @@ -9,7 +9,7 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.01 conversionMode: 0 preloadAudioData: 0 platformSettingOverrides: {} diff --git a/Assets/ResWork/Sound/게임 로비.wav.meta b/Assets/ResWork/Sound/게임 로비.wav.meta deleted file mode 100644 index 3527549..0000000 --- a/Assets/ResWork/Sound/게임 로비.wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: d0750d7f9099d7743a6fd2f40f35354e -AudioImporter: - externalObjects: {} - serializedVersion: 8 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/Table/~$SheGotWet.xlsm.meta b/Assets/ResWork/Table/~$SheGotWet.xlsm.meta deleted file mode 100644 index ed034ee..0000000 --- a/Assets/ResWork/Table/~$SheGotWet.xlsm.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e9e18e8717343a74dbdee03aa7d7cc16 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Res_Addr/Girl/1/Gem/07.png.meta b/Assets/Res_Addr/Girl/1/Gem/07.png.meta index 1404deb..8e4d458 100644 --- a/Assets/Res_Addr/Girl/1/Gem/07.png.meta +++ b/Assets/Res_Addr/Girl/1/Gem/07.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 07_0: 7336298474659753992 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Gem/08.png.meta b/Assets/Res_Addr/Girl/1/Gem/08.png.meta index 2644ea0..7e5ea2e 100644 --- a/Assets/Res_Addr/Girl/1/Gem/08.png.meta +++ b/Assets/Res_Addr/Girl/1/Gem/08.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 08_0: -247037112251525876 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Gem/09.png.meta b/Assets/Res_Addr/Girl/1/Gem/09.png.meta index 13d74a2..adfea9f 100644 --- a/Assets/Res_Addr/Girl/1/Gem/09.png.meta +++ b/Assets/Res_Addr/Girl/1/Gem/09.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 09_0: -3356593810811537127 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Gem/10.png.meta b/Assets/Res_Addr/Girl/1/Gem/10.png.meta index 2a2f10e..d2bc907 100644 --- a/Assets/Res_Addr/Girl/1/Gem/10.png.meta +++ b/Assets/Res_Addr/Girl/1/Gem/10.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 10_0: -5099292496197868168 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Gem/11.png.meta b/Assets/Res_Addr/Girl/1/Gem/11.png.meta index 29b0297..4998e12 100644 --- a/Assets/Res_Addr/Girl/1/Gem/11.png.meta +++ b/Assets/Res_Addr/Girl/1/Gem/11.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 11_0: -2966200626249415253 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Gem/12.png.meta b/Assets/Res_Addr/Girl/1/Gem/12.png.meta index 6d1564f..4e16920 100644 --- a/Assets/Res_Addr/Girl/1/Gem/12.png.meta +++ b/Assets/Res_Addr/Girl/1/Gem/12.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 12_0: -1540426309290004842 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Gem/13.png.meta b/Assets/Res_Addr/Girl/1/Gem/13.png.meta index c3f3a46..9602b3c 100644 --- a/Assets/Res_Addr/Girl/1/Gem/13.png.meta +++ b/Assets/Res_Addr/Girl/1/Gem/13.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 13_0: 8389134475083476877 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Gem/14.png.meta b/Assets/Res_Addr/Girl/1/Gem/14.png.meta index fceeac4..a360393 100644 --- a/Assets/Res_Addr/Girl/1/Gem/14.png.meta +++ b/Assets/Res_Addr/Girl/1/Gem/14.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 14_0: -6270953770400647376 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/15.png.meta b/Assets/Res_Addr/Girl/1/Heart/15.png.meta index 68fafaa..9a6af18 100644 --- a/Assets/Res_Addr/Girl/1/Heart/15.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/15.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 15_0: 4349915267927364619 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/16.png.meta b/Assets/Res_Addr/Girl/1/Heart/16.png.meta index d17f69c..a8c6b90 100644 --- a/Assets/Res_Addr/Girl/1/Heart/16.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/16.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 16_0: 7680820834086852892 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/17.png.meta b/Assets/Res_Addr/Girl/1/Heart/17.png.meta index ab6855c..57c8602 100644 --- a/Assets/Res_Addr/Girl/1/Heart/17.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/17.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 17_0: 6660783624410144326 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/18.png.meta b/Assets/Res_Addr/Girl/1/Heart/18.png.meta index 2937358..49b02eb 100644 --- a/Assets/Res_Addr/Girl/1/Heart/18.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/18.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 18_0: 2960402581040015946 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/19.png.meta b/Assets/Res_Addr/Girl/1/Heart/19.png.meta index bff6b8e..296171b 100644 --- a/Assets/Res_Addr/Girl/1/Heart/19.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/19.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 19_0: 7157561037332017152 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/20.png.meta b/Assets/Res_Addr/Girl/1/Heart/20.png.meta index 5f0820e..938bd7f 100644 --- a/Assets/Res_Addr/Girl/1/Heart/20.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/20.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 20_0: 4164744761163438241 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/21.png.meta b/Assets/Res_Addr/Girl/1/Heart/21.png.meta index 6c82098..daa6f73 100644 --- a/Assets/Res_Addr/Girl/1/Heart/21.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/21.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 21_0: -5750353039905602045 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/22.png.meta b/Assets/Res_Addr/Girl/1/Heart/22.png.meta index ee4010f..3ec0428 100644 --- a/Assets/Res_Addr/Girl/1/Heart/22.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/22.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 22_0: -7371509505491802261 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/23.png.meta b/Assets/Res_Addr/Girl/1/Heart/23.png.meta index 2eb52a8..411bdf6 100644 --- a/Assets/Res_Addr/Girl/1/Heart/23.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/23.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 23_0: 2720535173406242035 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/1/Heart/24.png.meta b/Assets/Res_Addr/Girl/1/Heart/24.png.meta index 048b841..45a2a1e 100644 --- a/Assets/Res_Addr/Girl/1/Heart/24.png.meta +++ b/Assets/Res_Addr/Girl/1/Heart/24.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 24_0: 8102358098348255977 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/4/Coin/03.png.meta b/Assets/Res_Addr/Girl/4/Coin/03.png.meta index 3655ab2..17bfde8 100644 --- a/Assets/Res_Addr/Girl/4/Coin/03.png.meta +++ b/Assets/Res_Addr/Girl/4/Coin/03.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 03_0: 8793915729297761979 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/4/Gem/04.png.meta b/Assets/Res_Addr/Girl/4/Gem/04.png.meta index 7748f44..5a552d4 100644 --- a/Assets/Res_Addr/Girl/4/Gem/04.png.meta +++ b/Assets/Res_Addr/Girl/4/Gem/04.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 04_0: 2750298860172458669 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/4/Gem/05.png.meta b/Assets/Res_Addr/Girl/4/Gem/05.png.meta index 3f7ac27..7071ef7 100644 --- a/Assets/Res_Addr/Girl/4/Gem/05.png.meta +++ b/Assets/Res_Addr/Girl/4/Gem/05.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 05_0: -2276259661975475453 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/4/Gem/06.png.meta b/Assets/Res_Addr/Girl/4/Gem/06.png.meta index 8a63d95..9e4eaed 100644 --- a/Assets/Res_Addr/Girl/4/Gem/06.png.meta +++ b/Assets/Res_Addr/Girl/4/Gem/06.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 06_0: 141893073332109768 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/4/Gem/07.png.meta b/Assets/Res_Addr/Girl/4/Gem/07.png.meta index 30665e1..cac7324 100644 --- a/Assets/Res_Addr/Girl/4/Gem/07.png.meta +++ b/Assets/Res_Addr/Girl/4/Gem/07.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 07_0: 7336298474659753992 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/4/Gem/08.png.meta b/Assets/Res_Addr/Girl/4/Gem/08.png.meta index 56726a1..bbb5be8 100644 --- a/Assets/Res_Addr/Girl/4/Gem/08.png.meta +++ b/Assets/Res_Addr/Girl/4/Gem/08.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 08_0: -247037112251525876 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Res_Addr/Girl/4/Gem/09.png.meta b/Assets/Res_Addr/Girl/4/Gem/09.png.meta index f2f2820..5a2742d 100644 --- a/Assets/Res_Addr/Girl/4/Gem/09.png.meta +++ b/Assets/Res_Addr/Girl/4/Gem/09.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + 09_0: -3356593810811537127 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index c768125..b40643f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -13744,13 +13744,14 @@ MonoBehaviour: - {fileID: 8300000, guid: 68c6fa9e461ecb443b256560ce0500a8, type: 3} - {fileID: 8300000, guid: e5d3771565247fb488eee9fc417aadc3, type: 3} arr_bgm: - - {fileID: 8300000, guid: f6114cbd9684c734a86622e924246b10, type: 3} + - {fileID: 8300000, guid: f84b956bd038a0a469e34451d8edf1d4, type: 3} - {fileID: 8300000, guid: 91f78e0e508d80b4bbc02cf71c03b081, type: 3} - {fileID: 8300000, guid: e682e098a0a157d4ebcb22c3866ba6f7, type: 3} - {fileID: 8300000, guid: d0aa6e330da77f2448cefe11552d975d, type: 3} - {fileID: 8300000, guid: 57be5e76d2009144ebbab33847528018, type: 3} - {fileID: 8300000, guid: ecf1162c59cfdf4458815bce9ea7e364, type: 3} - {fileID: 8300000, guid: cd75e3c503563014988e7bac86abdd11, type: 3} + - {fileID: 8300000, guid: 8ec33f981f6e4b14384e10d848ce9f32, type: 3} --- !u!114 &500962030 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index a159e0e..c304b46 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -27,7 +27,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate { Load(); yield return null; - SoundInfo.Ins.Play_BGM(eBGM.b001_BGM); + SoundInfo.Ins.Play_BGM(eBGM.b008_Title); SoundInfo.Ins.Play_OneShot(eSound.s012_Title); while (!LobbyUI.Ins) yield return null; LobbyUI.Ins.Set_Money(); diff --git a/Assets/Scripts/AttachToGameObject/SoundInfo.cs b/Assets/Scripts/AttachToGameObject/SoundInfo.cs index c1ca0c7..fdd898b 100644 --- a/Assets/Scripts/AttachToGameObject/SoundInfo.cs +++ b/Assets/Scripts/AttachToGameObject/SoundInfo.cs @@ -10,7 +10,7 @@ public enum eSound { s026_Impact_Hit, s027_Impact_Hit, s028_Impact_Hit, s029_Impact_Hit, Max } -public enum eBGM { b001_BGM, b002_MiniGame, b003_MiniGame, b004_MiniGame, b005_Gacha, b006_Album, b007_LuckyGame, Max } +public enum eBGM { b001_BGM, b002_MiniGame, b003_MiniGame, b004_MiniGame, b005_Gacha, b006_Album, b007_LuckyGame, b008_Title, Max } public class SoundInfo : MonoBehaviourSingletonTemplate { diff --git a/Assets/Scripts/Title/TitleInfo.cs b/Assets/Scripts/Title/TitleInfo.cs index b5d8fae..a3d3991 100644 --- a/Assets/Scripts/Title/TitleInfo.cs +++ b/Assets/Scripts/Title/TitleInfo.cs @@ -28,8 +28,9 @@ public class TitleInfo : MonoBehaviour label_msg.text = "로비로 진입 중입니다."; yield return null; - yield return new WaitForSeconds(0.1f); + yield return new WaitForSeconds(3f); gameObject.SetActive(false); go_LobbyUI.SetActive(true); + SoundInfo.Ins.Play_BGM(eBGM.b001_BGM); } } \ No newline at end of file