Skip to content

Commit c85e93f

Browse files
committed
feat: Replace built-in audio solution with Unity's audio solution
1 parent 7a9c162 commit c85e93f

32 files changed

+3430
-2074
lines changed

Assets/JCSUnity/Audio.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!244 &-5867466121415165962
4+
AudioMixerEffectController:
5+
m_ObjectHideFlags: 3
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name:
10+
m_EffectID: a616330dfb3852045bf82b97be2b85da
11+
m_EffectName: Attenuation
12+
m_MixLevel: fb292c65625632c41ae7f82aa551e40c
13+
m_Parameters: []
14+
m_SendTarget: {fileID: 0}
15+
m_EnableWetMix: 0
16+
m_Bypass: 0
17+
--- !u!244 &-4189621140016593758
18+
AudioMixerEffectController:
19+
m_ObjectHideFlags: 3
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name:
24+
m_EffectID: 88ab1b76d663645438c5359c83c51448
25+
m_EffectName: Attenuation
26+
m_MixLevel: 7fc0fb14afa869b4a8ba59a6370d2db3
27+
m_Parameters: []
28+
m_SendTarget: {fileID: 0}
29+
m_EnableWetMix: 0
30+
m_Bypass: 0
31+
--- !u!243 &-300667356125292915
32+
AudioMixerGroupController:
33+
m_ObjectHideFlags: 0
34+
m_CorrespondingSourceObject: {fileID: 0}
35+
m_PrefabInstance: {fileID: 0}
36+
m_PrefabAsset: {fileID: 0}
37+
m_Name: Music
38+
m_AudioMixer: {fileID: 24100000}
39+
m_GroupID: ac3399ada8bbbfb45934d6b7f5a81ea2
40+
m_Children: []
41+
m_Volume: 0fd51eebf0eea124cb1ce3c6bbefc137
42+
m_Pitch: bcc437e2cb4b696479d20cf660817a09
43+
m_Send: 00000000000000000000000000000000
44+
m_Effects:
45+
- {fileID: 2747168988946379581}
46+
m_UserColorIndex: 0
47+
m_Mute: 0
48+
m_Solo: 0
49+
m_BypassEffects: 0
50+
--- !u!241 &24100000
51+
AudioMixerController:
52+
m_ObjectHideFlags: 0
53+
m_CorrespondingSourceObject: {fileID: 0}
54+
m_PrefabInstance: {fileID: 0}
55+
m_PrefabAsset: {fileID: 0}
56+
m_Name: Mixer (Universal)
57+
m_OutputGroup: {fileID: 0}
58+
m_MasterGroup: {fileID: 24300002}
59+
m_Snapshots:
60+
- {fileID: 24500006}
61+
m_StartSnapshot: {fileID: 24500006}
62+
m_SuspendThreshold: -80
63+
m_EnableSuspend: 1
64+
m_UpdateMode: 0
65+
m_ExposedParameters:
66+
- guid: 604d9296f97e5304ba2e7d28b9f95d06
67+
name: Master/Effect (Volume)
68+
- guid: 9f2ae68d9d218ca4e9cd9624c28f1f26
69+
name: Master (Volume)
70+
- guid: 0fd51eebf0eea124cb1ce3c6bbefc137
71+
name: Master/Music (Volume)
72+
- guid: 5f958c2f4aaddbd468b09471bc80cc13
73+
name: Master/Skill (Volume)
74+
m_AudioMixerGroupViews:
75+
- guids:
76+
- 2be4d7977768e154eb0ca56ddd31e954
77+
- ac3399ada8bbbfb45934d6b7f5a81ea2
78+
- ea81466a7b348224c80ae679929465d0
79+
- 0f65c8b1bfe9a824e80525cff261dffe
80+
name: View
81+
m_CurrentViewIndex: 0
82+
m_TargetSnapshot: {fileID: 24500006}
83+
--- !u!243 &24300002
84+
AudioMixerGroupController:
85+
m_ObjectHideFlags: 0
86+
m_CorrespondingSourceObject: {fileID: 0}
87+
m_PrefabInstance: {fileID: 0}
88+
m_PrefabAsset: {fileID: 0}
89+
m_Name: Master
90+
m_AudioMixer: {fileID: 24100000}
91+
m_GroupID: 2be4d7977768e154eb0ca56ddd31e954
92+
m_Children:
93+
- {fileID: -300667356125292915}
94+
- {fileID: 3934861744733628453}
95+
- {fileID: 6220943944615513275}
96+
m_Volume: 9f2ae68d9d218ca4e9cd9624c28f1f26
97+
m_Pitch: 2f69ab1b683246546b4b43b3c8d41803
98+
m_Send: 00000000000000000000000000000000
99+
m_Effects:
100+
- {fileID: 24400004}
101+
m_UserColorIndex: 0
102+
m_Mute: 0
103+
m_Solo: 0
104+
m_BypassEffects: 0
105+
--- !u!244 &24400004
106+
AudioMixerEffectController:
107+
m_ObjectHideFlags: 3
108+
m_CorrespondingSourceObject: {fileID: 0}
109+
m_PrefabInstance: {fileID: 0}
110+
m_PrefabAsset: {fileID: 0}
111+
m_Name:
112+
m_EffectID: c93a227da981c0348a04b3b2b85e750e
113+
m_EffectName: Attenuation
114+
m_MixLevel: fa241bf835675024fa5e9ab0ca350d75
115+
m_Parameters: []
116+
m_SendTarget: {fileID: 0}
117+
m_EnableWetMix: 0
118+
m_Bypass: 0
119+
--- !u!245 &24500006
120+
AudioMixerSnapshotController:
121+
m_ObjectHideFlags: 0
122+
m_CorrespondingSourceObject: {fileID: 0}
123+
m_PrefabInstance: {fileID: 0}
124+
m_PrefabAsset: {fileID: 0}
125+
m_Name: Snapshot
126+
m_AudioMixer: {fileID: 24100000}
127+
m_SnapshotID: 9f6f611929d8f7e4fa7bf4e1d4d3e7a8
128+
m_FloatValues:
129+
0fd51eebf0eea124cb1ce3c6bbefc137: -10.474862
130+
9f2ae68d9d218ca4e9cd9624c28f1f26: -0.037667945
131+
m_TransitionOverrides: {}
132+
--- !u!244 &2747168988946379581
133+
AudioMixerEffectController:
134+
m_ObjectHideFlags: 3
135+
m_CorrespondingSourceObject: {fileID: 0}
136+
m_PrefabInstance: {fileID: 0}
137+
m_PrefabAsset: {fileID: 0}
138+
m_Name:
139+
m_EffectID: a449c11d3b9264c45903712d71f8c6f8
140+
m_EffectName: Attenuation
141+
m_MixLevel: 7b9b78d3f57d486458479e54fed63a40
142+
m_Parameters: []
143+
m_SendTarget: {fileID: 0}
144+
m_EnableWetMix: 0
145+
m_Bypass: 0
146+
--- !u!243 &3934861744733628453
147+
AudioMixerGroupController:
148+
m_ObjectHideFlags: 0
149+
m_CorrespondingSourceObject: {fileID: 0}
150+
m_PrefabInstance: {fileID: 0}
151+
m_PrefabAsset: {fileID: 0}
152+
m_Name: Effect
153+
m_AudioMixer: {fileID: 24100000}
154+
m_GroupID: ea81466a7b348224c80ae679929465d0
155+
m_Children: []
156+
m_Volume: 604d9296f97e5304ba2e7d28b9f95d06
157+
m_Pitch: a744f9b379a395e4c9230e60090b8d10
158+
m_Send: 00000000000000000000000000000000
159+
m_Effects:
160+
- {fileID: -5867466121415165962}
161+
m_UserColorIndex: 0
162+
m_Mute: 0
163+
m_Solo: 0
164+
m_BypassEffects: 0
165+
--- !u!243 &6220943944615513275
166+
AudioMixerGroupController:
167+
m_ObjectHideFlags: 0
168+
m_CorrespondingSourceObject: {fileID: 0}
169+
m_PrefabInstance: {fileID: 0}
170+
m_PrefabAsset: {fileID: 0}
171+
m_Name: Skill
172+
m_AudioMixer: {fileID: 24100000}
173+
m_GroupID: 0f65c8b1bfe9a824e80525cff261dffe
174+
m_Children: []
175+
m_Volume: 5f958c2f4aaddbd468b09471bc80cc13
176+
m_Pitch: a1c0b4546caf68542854970cbdcabf52
177+
m_Send: 00000000000000000000000000000000
178+
m_Effects:
179+
- {fileID: -4189621140016593758}
180+
m_UserColorIndex: 0
181+
m_Mute: 0
182+
m_Solo: 0
183+
m_BypassEffects: 0

Assets/JCSUnity/Audio/Mixer (Universal).mixer.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/JCSUnity/Resources/JCS_Managers.prefab

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ AudioSource:
187187
m_GameObject: {fileID: 135910}
188188
m_Enabled: 1
189189
serializedVersion: 4
190-
OutputAudioMixerGroup: {fileID: 0}
190+
OutputAudioMixerGroup: {fileID: 3934861744733628453, guid: 7db419a1e5067c44fb6780b4f563b20b,
191+
type: 2}
191192
m_audioClip: {fileID: 0}
192193
m_Resource: {fileID: 0}
193194
m_PlayOnAwake: 1
@@ -287,7 +288,6 @@ MonoBehaviour:
287288
m_Script: {fileID: 11500000, guid: fbfbfab4c3b19c642ac2df0576c95e0f, type: 3}
288289
m_Name:
289290
m_EditorClassIdentifier:
290-
mSoundSettingType: 0
291291
--- !u!114 &11491538
292292
MonoBehaviour:
293293
m_ObjectHideFlags: 0
@@ -300,7 +300,6 @@ MonoBehaviour:
300300
m_Script: {fileID: 11500000, guid: c7158c9b686782e44ab9208ecf28733b, type: 3}
301301
m_Name:
302302
m_EditorClassIdentifier:
303-
mBGM: {fileID: 0}
304303
mCurrentBGM: {fileID: 0}
305304
mSwitchingBGM: 0
306305
mOverrideSetting: 0

Assets/JCSUnity/Resources/Sound/JCS_BGMPlayer.prefab

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1001 &100100000
4-
Prefab:
5-
m_ObjectHideFlags: 1
6-
serializedVersion: 2
7-
m_Modification:
8-
m_TransformParent: {fileID: 0}
9-
m_Modifications: []
10-
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
12-
m_RootGameObject: {fileID: 1944938904925556}
13-
m_IsPrefabParent: 1
143
--- !u!1 &1944938904925556
154
GameObject:
165
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
18-
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
2010
m_Component:
2111
- component: {fileID: 4569903240588472}
2212
- component: {fileID: 114308759860158706}
@@ -31,27 +21,44 @@ GameObject:
3121
m_IsActive: 1
3222
--- !u!4 &4569903240588472
3323
Transform:
34-
m_ObjectHideFlags: 1
35-
m_PrefabParentObject: {fileID: 0}
36-
m_PrefabInternal: {fileID: 100100000}
24+
m_ObjectHideFlags: 0
25+
m_CorrespondingSourceObject: {fileID: 0}
26+
m_PrefabInstance: {fileID: 0}
27+
m_PrefabAsset: {fileID: 0}
3728
m_GameObject: {fileID: 1944938904925556}
29+
serializedVersion: 2
3830
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3931
m_LocalPosition: {x: 0, y: 0, z: 0}
4032
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_ConstrainProportionsScale: 0
4134
m_Children: []
4235
m_Father: {fileID: 0}
43-
m_RootOrder: 0
4436
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
--- !u!114 &114308759860158706
38+
MonoBehaviour:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_GameObject: {fileID: 1944938904925556}
44+
m_Enabled: 1
45+
m_EditorHideFlags: 0
46+
m_Script: {fileID: 11500000, guid: 44537bddf53394d4ba5246f002f0fbb0, type: 3}
47+
m_Name:
48+
m_EditorClassIdentifier:
4549
--- !u!82 &82101962149965360
4650
AudioSource:
47-
m_ObjectHideFlags: 1
48-
m_PrefabParentObject: {fileID: 0}
49-
m_PrefabInternal: {fileID: 100100000}
51+
m_ObjectHideFlags: 0
52+
m_CorrespondingSourceObject: {fileID: 0}
53+
m_PrefabInstance: {fileID: 0}
54+
m_PrefabAsset: {fileID: 0}
5055
m_GameObject: {fileID: 1944938904925556}
5156
m_Enabled: 1
5257
serializedVersion: 4
53-
OutputAudioMixerGroup: {fileID: 0}
58+
OutputAudioMixerGroup: {fileID: -300667356125292915, guid: 7db419a1e5067c44fb6780b4f563b20b,
59+
type: 2}
5460
m_audioClip: {fileID: 0}
61+
m_Resource: {fileID: 0}
5562
m_PlayOnAwake: 1
5663
m_Volume: 1
5764
m_Pitch: 1
@@ -137,27 +144,15 @@ AudioSource:
137144
m_PreInfinity: 2
138145
m_PostInfinity: 2
139146
m_RotationOrder: 4
140-
--- !u!114 &114308759860158706
141-
MonoBehaviour:
142-
m_ObjectHideFlags: 1
143-
m_PrefabParentObject: {fileID: 0}
144-
m_PrefabInternal: {fileID: 100100000}
145-
m_GameObject: {fileID: 1944938904925556}
146-
m_Enabled: 1
147-
m_EditorHideFlags: 0
148-
m_Script: {fileID: 11500000, guid: 44537bddf53394d4ba5246f002f0fbb0, type: 3}
149-
m_Name:
150-
m_EditorClassIdentifier:
151-
mType: 0
152147
--- !u!114 &114644776039476232
153148
MonoBehaviour:
154-
m_ObjectHideFlags: 1
155-
m_PrefabParentObject: {fileID: 0}
156-
m_PrefabInternal: {fileID: 100100000}
149+
m_ObjectHideFlags: 0
150+
m_CorrespondingSourceObject: {fileID: 0}
151+
m_PrefabInstance: {fileID: 0}
152+
m_PrefabAsset: {fileID: 0}
157153
m_GameObject: {fileID: 1944938904925556}
158154
m_Enabled: 1
159155
m_EditorHideFlags: 0
160156
m_Script: {fileID: 11500000, guid: 4999acd701f3e6743b7c5518ea7aaa17, type: 3}
161157
m_Name:
162158
m_EditorClassIdentifier:
163-
mSoundSettingType: 1

Assets/JCSUnity/Scripts/Actions/2D/Skills/JCS_2DFullScreenAtkAction.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,8 @@ private void AddHitSound(ref GameObject obj)
126126
if (mHitSound == null)
127127
return;
128128

129-
JCS_SoundProxyAction spa = obj.AddComponent<JCS_SoundProxyAction>();
129+
var spa = obj.AddComponent<JCS_SoundProxyAction>();
130130
spa.audioClip = mHitSound;
131-
spa.SoundSettingType = mSoundPlayer.SoundSettingType;
132131
}
133132
}
134133
}

Assets/JCSUnity/Scripts/Actions/JCS_SoundPoolAction.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@ public class JCS_SoundPoolAction : MonoBehaviour , JCS_IAction
2727
[SerializeField]
2828
private AudioClip[] mAudioClips = null;
2929

30-
[Tooltip("Sound type you want to organized.")]
31-
[SerializeField]
32-
private JCS_SoundSettingType mSoundSettingType = JCS_SoundSettingType.NONE;
33-
3430
/* Setter & Getter */
3531

3632
public AudioClip[] AudioClips { get { return this.mAudioClips; } set { this.mAudioClips = value; } }
37-
public JCS_SoundSettingType SoundSettingType { get { return this.mSoundSettingType; } set { this.mSoundSettingType = value; } }
3833

3934
/* Functions */
4035

@@ -59,8 +54,7 @@ public void PlayRandom()
5954
return;
6055
}
6156

62-
float soundVolume = JCS_SoundSettings.instance.GetVolume(mSoundSettingType);
63-
mSoundPlayer.PlayOneShot(mAudioClips[randIndex], soundVolume);
57+
mSoundPlayer.PlayOneShot(mAudioClips[randIndex]);
6458
}
6559
}
6660
}

0 commit comments

Comments
 (0)