Skip to content

Commit da1c02e

Browse files
authored
v2.0.1 (#13)
1 parent 66da313 commit da1c02e

30 files changed

Lines changed: 7697 additions & 7137 deletions

Assets/Samples/AudioConductorSample/AudioConductorEditorSettings.asset

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ MonoBehaviour:
1313
m_Name: AudioConductorEditorSettings
1414
m_EditorClassIdentifier:
1515
colorDefineList:
16-
- id: c60e0c63-75da-4392-9979-ecf7bafab9e4
16+
- id: 336429b2-171b-430e-89c8-41d304dcd956
1717
name: WIP
1818
color: {r: 0.9, g: 0.3, b: 0.3, a: 1}
19-
- id: 617312f4-1252-4dcf-a2ae-b7dc08a7978c
19+
- id: d94d3263-b09f-4c37-83f9-18013515f113
2020
name: InGame
2121
color: {r: 0.3, g: 0.5, b: 0.9, a: 1}
22-
- id: 9998d808-d82a-4d5b-b201-d48e7642b0f5
22+
- id: 200801ba-085d-466d-a1c7-07b9569758ca
2323
name: Cutscene
2424
color: {r: 0.3, g: 0.8, b: 0.4, a: 1}

Assets/Samples/AudioConductorSample/BGM_Battle.asset

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ MonoBehaviour:
4646
randomWeight: 0
4747
priority: 0
4848
fadeTime: 0
49-
id: 532237e2-98e2-49ee-87a7-53e18a7d143b
49+
id: ccb23b9e-b082-42dd-9589-9d546b6fd2a0
5050
colorId:
51-
id: 46b16ead-c158-454f-b4ce-0ce29016abc4
52-
colorId: 617312f4-1252-4dcf-a2ae-b7dc08a7978c
53-
id: ef65292e-9c1b-4a68-929c-b714bc1494c8
51+
id: df7d7f51-769f-4f8f-ab20-bee17e1cb662
52+
colorId: d94d3263-b09f-4c37-83f9-18013515f113
53+
id: edfc7130-16df-4c26-bfba-39b930a63920

Assets/Samples/AudioConductorSample/BGM_Field.asset

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ MonoBehaviour:
4646
randomWeight: 0
4747
priority: 0
4848
fadeTime: 0
49-
id: 2c3e288e-6e3a-4b76-95b3-930f5eb9bcc3
49+
id: 28b032da-4b44-4ec4-a06c-1a59adfc5c78
5050
colorId:
51-
id: 24b5bc48-649c-4cfe-ba78-6c8ddd712f5f
52-
colorId: 617312f4-1252-4dcf-a2ae-b7dc08a7978c
53-
id: 2937d470-52d9-4749-aef3-2009079bc9cc
51+
id: 6a364d0f-10cd-4505-892b-50d645ed0764
52+
colorId: d94d3263-b09f-4c37-83f9-18013515f113
53+
id: 635977cb-1806-417d-ba7e-be95d1b06941

Assets/Samples/AudioConductorSample/Resources/CueSheets/Voice.asset

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ MonoBehaviour:
4646
randomWeight: 0
4747
priority: 0
4848
fadeTime: 0
49-
id: 50e3c925-73cf-4813-886f-af4e69dc1372
49+
id: 6d05f3b1-f5d0-4670-bee1-3f18ca7f04fa
5050
colorId:
5151
- name: Voice02
5252
audioClip: {fileID: 8300000, guid: 51ad22bd14d9f41c1ad2d43354dc6d8a, type: 3}
@@ -62,8 +62,8 @@ MonoBehaviour:
6262
randomWeight: 0
6363
priority: 0
6464
fadeTime: 0
65-
id: 6a0601f7-2d7e-43b9-8897-18b298e92f36
65+
id: 74a86a0b-6d8e-4b81-b67f-93380eedc580
6666
colorId:
67-
id: 5ec0b745-0fb5-42f3-a66c-3eace15d353f
68-
colorId: 9998d808-d82a-4d5b-b201-d48e7642b0f5
69-
id: 81d7f873-b92d-4eac-ba7a-8e185cfe9578
67+
id: 5857b66c-bcb3-40e9-bcd6-bd0395ea6ddd
68+
colorId: 200801ba-085d-466d-a1c7-07b9569758ca
69+
id: 6801d2a4-1d8a-4de6-86be-f3560f1623d9

Assets/Samples/AudioConductorSample/SE.asset

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ MonoBehaviour:
4646
randomWeight: 0
4747
priority: 0
4848
fadeTime: 0
49-
id: a3535021-53e4-4d46-982a-7baed996f74d
49+
id: 77a7c9be-35cb-4dd6-94e8-ee3e57dda5c3
5050
colorId:
5151
- name: SE02
5252
audioClip: {fileID: 8300000, guid: 8e03a037200214ac0af462fda28f22f2, type: 3}
@@ -62,7 +62,7 @@ MonoBehaviour:
6262
randomWeight: 0
6363
priority: 0
6464
fadeTime: 0
65-
id: 07f5188e-295f-4c5d-bebd-90ea000a25a5
65+
id: 4aeae58a-c32f-4421-ad71-1f5df9c72a93
6666
colorId:
6767
- name: SE03
6868
audioClip: {fileID: 8300000, guid: 79418f84333ea4d068a9e8ac160b4232, type: 3}
@@ -78,8 +78,8 @@ MonoBehaviour:
7878
randomWeight: 0
7979
priority: 0
8080
fadeTime: 0
81-
id: e05b4df5-f7b2-4dae-b07a-987a9bb2e09c
81+
id: cc30b15e-88b3-4e87-a09a-73015fbc7744
8282
colorId:
83-
id: 50e21bb6-4192-4d9a-836b-a29dcb0856f7
84-
colorId: 617312f4-1252-4dcf-a2ae-b7dc08a7978c
85-
id: ad2bcbc0-ea22-432a-ae8d-b6ff24119883
83+
id: 94e08ce1-f821-4562-8029-70ec4c9f07a0
84+
colorId: d94d3263-b09f-4c37-83f9-18013515f113
85+
id: 304719d2-2277-41ba-b80c-76581f617628

Assets/Samples/AudioConductorSample/SampleScene.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,11 @@ public void PlaySE()
173173
public void PlayVoice()
174174
{
175175
if (_seVoiceConductor == null) return;
176-
_voicePlayback = _seVoiceConductor.Play(_voiceSheetHandle, "Voice");
176+
_voicePlayback = _seVoiceConductor.Play(_voiceSheetHandle, "Voice", new PlayOptions
177+
{
178+
OnEnd = () => Debug.Log("[AudioConductor] Voice playback ended naturally."),
179+
OnStop = () => Debug.Log("[AudioConductor] Voice playback stopped.")
180+
});
177181
_voicePaused = false;
178182
}
179183

0 commit comments

Comments
 (0)