diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/FlakeImage.prefab b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/FlakeImage.prefab index ad17f31..fdc31db 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/FlakeImage.prefab +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/FlakeImage.prefab @@ -95,6 +95,10 @@ MonoBehaviour: snow_02: {fileID: 11400000, guid: f3829d3dc90b3db46a706d2efb7cd1dd, type: 2} snow_03: {fileID: 11400000, guid: f39b8c9e311ce0a429923c3eef0402b7, type: 2} snow_04: {fileID: 11400000, guid: 39bb304109cba704492efa5099cc1856, type: 2} + step1: {fileID: 8300000, guid: 1320bfe591757af4ca58ba59f1dda347, type: 3} + step2: {fileID: 8300000, guid: fb835f87975f8d046af1beb152cec822, type: 3} + step3: {fileID: 8300000, guid: 7cd4c76324296c845947bcfa3579ce00, type: 3} + step4: {fileID: 8300000, guid: b82c9d8dcede95548a14f7967d483514, type: 3} --- !u!114 &1996081109 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/StatManager.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/StatManager.cs index 257bbe9..e88e885 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/StatManager.cs +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/StatManager.cs @@ -39,7 +39,7 @@ public class StatManager : MonoBehaviour if (idle_player.Frame == idle_player.TotalNumFrames) { loop_count += 1; - Debug.Log(loop_count); + //Debug.Log(loop_count); } if (loop_count >= loop_to_trigger) { diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs index 7719131..7624514 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs @@ -8,21 +8,31 @@ using UltraCombos; public class movieController : MonoBehaviour { DShowMoviePlayer player; + AudioSource aud; public int id; public int stat; public float fade_speed; public bool force_destroy; public float destroy_timer; public float wait_sec = 2f; + public float volume = 1f; public DShowClip snow_01; public DShowClip snow_02; public DShowClip snow_03; public DShowClip snow_04; + + public AudioClip step1; + public AudioClip step2; + public AudioClip step3; + public AudioClip step4; + + bool playAud; float alpha; void Awake() { player = GetComponent(); + //aud = GetComponent(); stat = 0; force_destroy = false; } @@ -35,7 +45,13 @@ public class movieController : MonoBehaviour void Update() { - + aud.volume = volume; + if (playAud && aud.clip != null) + { + Debug.Log(aud.clip.name); + aud.Play(); + playAud = false; + } if(stat == 0){ alpha = 0; if (player.IsPlaying) @@ -73,21 +89,28 @@ public class movieController : MonoBehaviour void OnEnable() { + aud = gameObject.AddComponent(); int seed = Random.Range(0, 4); switch (seed){ case 0: player.VideoAsset = snow_01; + aud.clip = step1; break; case 1: player.VideoAsset = snow_02; + aud.clip = step2; break; case 2: player.VideoAsset = snow_03; + aud.clip = step3; break; case 3: player.VideoAsset = snow_04; + aud.clip = step4; break; } + //aud.Play(); + playAud = true; if (name != "RawImage") { diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs index 66c44f6..de0b7c1 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs @@ -30,6 +30,10 @@ public class tuio_event : MonoBehaviour [Range(0.01f, 5f)] public float img_wait_sec = 2f; + //[Config] + [Range(0f, 1f)] + public float audio_volume = 1f; + void Update() { GetComponent().enabled = VisualizeTouches; @@ -47,6 +51,7 @@ public class tuio_event : MonoBehaviour movie = g.AddComponent(); movie.fade_speed = img_fade_speed; movie.wait_sec = img_wait_sec; + movie.volume = audio_volume; movie.id = id; movies.Add(id, movie); var rt = movie.transform as RectTransform; diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds.meta similarity index 52% rename from 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset.meta rename to 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds.meta index ed3b342..285999f 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset.meta +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 232980c200b699741a54e99e165d86a2 -NativeFormatImporter: +guid: 6063adb2a6fc24b4da15a1c60ae2d0fc +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_1.mp3 b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_1.mp3 new file mode 100644 index 0000000..ba00a6b Binary files /dev/null and b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_1.mp3 differ diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_1.mp3.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_1.mp3.meta new file mode 100644 index 0000000..a66ca86 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_1.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1320bfe591757af4ca58ba59f1dda347 +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/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_2.mp3 b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_2.mp3 new file mode 100644 index 0000000..df4dcaf Binary files /dev/null and b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_2.mp3 differ diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_2.mp3.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_2.mp3.meta new file mode 100644 index 0000000..53d77c1 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_2.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fb835f87975f8d046af1beb152cec822 +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/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_3.mp3 b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_3.mp3 new file mode 100644 index 0000000..36b4ba3 Binary files /dev/null and b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_3.mp3 differ diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_3.mp3.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_3.mp3.meta new file mode 100644 index 0000000..a7bc5d3 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_3.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7cd4c76324296c845947bcfa3579ce00 +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/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_4.mp3 b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_4.mp3 new file mode 100644 index 0000000..f9bdca6 Binary files /dev/null and b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_4.mp3 differ diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_4.mp3.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_4.mp3.meta new file mode 100644 index 0000000..6c9c588 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Sounds/20191216_F2_SFX_DarkSea_Step_4.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b82c9d8dcede95548a14f7967d483514 +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/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset deleted file mode 100644 index d0131cd..0000000 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/New UltraCombos.DShowClip.asset +++ /dev/null @@ -1,17 +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: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: New UltraCombos.DShowClip - m_EditorClassIdentifier: - m_VideoLocation: 1 - m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Build-19050-08_DarkSea\Material\Video_buttombracket.avi - animationClip: {fileID: 0}