Skip to content

Commit 15a9095

Browse files
jcs090218jcs090218
committed
style: Clean up some old code
1 parent 7465988 commit 15a9095

File tree

19 files changed

+126
-116
lines changed

19 files changed

+126
-116
lines changed

‎Assets/JCSUnity/Scripts/Actions/2D/JCS_2DReflectBulletAction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void ReflectBullet(JCS_Bullet bullet)
107107
bullet.MoveSpeed += mReflectForce;
108108

109109
// play sound from sound pool
110-
mSoundPoolAction.PlayRandomSound();
110+
mSoundPoolAction.PlayRandom();
111111

112112
// do random teleport effect
113113
RandomPosEffect(bullet);

‎Assets/JCSUnity/Scripts/Actions/2D/Shooting/JCS_ShootAction.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ public JCS_Bullet Shoot(float bulletSpeed, Vector3 pos, bool direction, int hit,
394394
}
395395

396396
// part of the SFX
397-
mRandomMultiSoundAction.PlayRandomSound();
397+
mRandomMultiSoundAction.PlayRandom();
398398

399399
return bullet;
400400
}
@@ -500,7 +500,7 @@ public JCS_Bullet Shoot(float bulletSpeed, Vector3 pos, bool direction, int[] da
500500
}
501501

502502
// part of the SFX
503-
mRandomMultiSoundAction.PlayRandomSound();
503+
mRandomMultiSoundAction.PlayRandom();
504504

505505
return bullet;
506506
}

‎Assets/JCSUnity/Scripts/Actions/JCS_SoundPoolAction.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private void Awake()
4646
/// <summary>
4747
/// Randomly play a sound from the pool.
4848
/// </summary>
49-
public void PlayRandomSound()
49+
public void PlayRandom()
5050
{
5151
if (mAudioClips.Length == 0)
5252
return;
@@ -59,7 +59,7 @@ public void PlayRandomSound()
5959
return;
6060
}
6161

62-
float soundVolume = JCS_SoundSettings.instance.GetSoundVolume(mSoundSettingType);
62+
float soundVolume = JCS_SoundSettings.instance.GetVolume(mSoundSettingType);
6363
mSoundPlayer.PlayOneShot(mAudioClips[randIndex], soundVolume);
6464
}
6565
}

‎Assets/JCSUnity/Scripts/Enums/JCS_SoundSettingType.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ namespace JCSUnity
1414
/// </summary>
1515
public enum JCS_SoundSettingType
1616
{
17-
NONE,
17+
NONE = 0,
1818

19-
BGM_SOUND,
20-
SFX_SOUND,
21-
SKILLS_SOUND,
19+
BGM = 1,
20+
EFFECT = 2,
21+
SKILL = 3,
2222
}
2323
}

‎Assets/JCSUnity/Scripts/Events/Sound/JCS_TriggerSwitchBGMEvent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class JCS_TriggerSwitchBGMEvent : MonoBehaviour
4444

4545
private void OnTriggerEnter(Collider other)
4646
{
47-
JCS_SoundManager.instance.SwitchBackgroundMusic(
47+
JCS_SoundManager.instance.SwitchBGM(
4848
mSoundClip,
4949
mSoundFadeInTime,
5050
mSoundFadeOutTime);

‎Assets/JCSUnity/Scripts/GameObject/2D/2DAudioController/JCS_2DSideScrollerPlayerAudioController.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void BasicJumpSound()
5858
return;
5959
}
6060
var ss = JCS_SoundSettings.instance;
61-
mSoundPlayer.PlayOneShot(mJumpSound[0], ss.GetSkillsSound_Volume());
61+
mSoundPlayer.PlayOneShot(mJumpSound[0], ss.GetSkill_Volume());
6262
}
6363
/// <summary>
6464
///
@@ -74,7 +74,7 @@ public void DoubleJumpSound()
7474
return;
7575
}
7676
var ss = JCS_SoundSettings.instance;
77-
mSoundPlayer.PlayOneShot(mJumpSound[1], ss.GetSkillsSound_Volume());
77+
mSoundPlayer.PlayOneShot(mJumpSound[1], ss.GetSkill_Volume());
7878
}
7979
/// <summary>
8080
///
@@ -90,7 +90,7 @@ public void TripleJumpSound()
9090
return;
9191
}
9292
var ss = JCS_SoundSettings.instance;
93-
mSoundPlayer.PlayOneShot(mJumpSound[2], ss.GetSkillsSound_Volume());
93+
mSoundPlayer.PlayOneShot(mJumpSound[2], ss.GetSkill_Volume());
9494
}
9595
/// <summary>
9696
///
@@ -112,7 +112,7 @@ public void AttackSound()
112112
return;
113113
}
114114
var ss = JCS_SoundSettings.instance;
115-
mSoundPlayer.PlayOneShot(mAttackSounds[rand], ss.GetSkillsSound_Volume());
115+
mSoundPlayer.PlayOneShot(mAttackSounds[rand], ss.GetSkill_Volume());
116116
}
117117
/// <summary>
118118
///
@@ -125,7 +125,7 @@ public void WalkSound()
125125
return;
126126
}
127127
var ss = JCS_SoundSettings.instance;
128-
mSoundPlayer.PlayOneShot(mWalkSound, ss.GetSkillsSound_Volume());
128+
mSoundPlayer.PlayOneShot(mWalkSound, ss.GetSkill_Volume());
129129
}
130130
/// <summary>
131131
///

‎Assets/JCSUnity/Scripts/GameObject/2D/JCS_2DPlayerAudioController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected virtual void Start()
4343

4444
// add it to Sound Manager so it could manage
4545
// the volume and mute!
46-
sm.AssignSoundSource(JCS_SoundSettingType.SKILLS_SOUND, mSoundPlayer.GetAudioSource());
46+
sm.AssignSoundSource(JCS_SoundSettingType.SKILL, mSoundPlayer.GetAudioSource());
4747
}
4848
}
4949
}

‎Assets/JCSUnity/Scripts/Managers/JCS_SoundManager.cs‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ public class JCS_SoundManager : JCS_Manager<JCS_SoundManager>
6363

6464
[Tooltip("Time to fade in the sound.")]
6565
[SerializeField]
66-
[Range(JCS_SoundSettings.MIN_SOUND_FADEOUT_TIME, JCS_SoundSettings.MAX_SOUND_FADEOUT_TIME)]
66+
[Range(JCS_SoundSettings.MIN_FADEOUT_TIME, JCS_SoundSettings.MAX_FADEOUT_TIME)]
6767
private float mSoundFadeInTime = 1.5f;
6868

6969
[Tooltip("Time to fade out the sound.")]
7070
[SerializeField]
71-
[Range(JCS_SoundSettings.MIN_SOUND_FADEOUT_TIME, JCS_SoundSettings.MAX_SOUND_FADEOUT_TIME)]
71+
[Range(JCS_SoundSettings.MIN_FADEOUT_TIME, JCS_SoundSettings.MAX_FADEOUT_TIME)]
7272
private float mSoundFadeOutTime = 1.5f;
7373

7474
[Tooltip("Disable the sound when window isn't focus.")]
@@ -91,7 +91,7 @@ public AudioSource GetBGMAudioSource()
9191
this.mBGM = JCS_BGMPlayer.instance.GetAudioSource();
9292
return this.mBGM;
9393
}
94-
public void SetBackgroundMusic(AudioSource music)
94+
public void SetBGM(AudioSource music)
9595
{
9696
this.mBGM = music;
9797

@@ -152,8 +152,8 @@ private void Start()
152152
var ss = JCS_SoundSettings.instance;
153153

154154
// Reset the sound every scene
155-
SetSFXSoundVolume(ss.GetSFXSound_Volume());
156-
SetSkillsSoundVolume(ss.GetSkillsSound_Volume());
155+
SetEffectVolume(ss.GetEffect_Volume());
156+
SetSkillsSoundVolume(ss.GetSkill_Volume());
157157
SetSFXSoundMute(ss.EFFECT_MUTE);
158158
SetSkillsSoundMute(ss.PERFONAL_EFFECT_MUTE);
159159
}
@@ -171,11 +171,11 @@ private void Update()
171171
/// <param name="soundClip"> clip to play. </param>
172172
/// <param name="fadeTime"> time to fade in and out. </param>
173173
/// <param name="loop"> loop music? </param>
174-
public void SwitchBackgroundMusic(AudioClip clip, bool loop = true)
174+
public void SwitchBGM(AudioClip clip, bool loop = true)
175175
{
176176
var ss = JCS_SoundSettings.instance;
177177

178-
SwitchBackgroundMusic(
178+
SwitchBGM(
179179
clip,
180180
ss.GetSoundFadeOutTimeBaseOnSetting(),
181181
ss.GetSoundFadeInTimeBaseOnSetting());
@@ -188,7 +188,7 @@ public void SwitchBackgroundMusic(AudioClip clip, bool loop = true)
188188
/// <param name="fadeInTime"> time to fade in. </param>
189189
/// <param name="fadeOutTime"> time to fade out. </param>
190190
/// <param name="loop"> loop music? </param>
191-
public void SwitchBackgroundMusic(
191+
public void SwitchBGM(
192192
AudioClip soundClip,
193193
float fadeInTime,
194194
float fadeOutTime,
@@ -244,13 +244,13 @@ public void SwitchBackgroundMusic(
244244
/// </summary>
245245
/// <param name="oneShotClip"> One shot BGM </param>
246246
/// <param name="onStackClip"> Audio clip on stack </param>
247-
public bool PlayOneShotBackgroundMusic(
247+
public bool PlayOneShotBGM(
248248
AudioClip oneShotClip,
249249
AudioClip onStackClip)
250250
{
251251
var ss = JCS_SoundSettings.instance;
252252

253-
return PlayOneShotBackgroundMusic(
253+
return PlayOneShotBGM(
254254
oneShotClip,
255255
onStackClip,
256256
ss.GetSoundFadeOutTimeBaseOnSetting(),
@@ -265,7 +265,7 @@ public bool PlayOneShotBackgroundMusic(
265265
/// <param name="onStackClip"> Audio clip on stack </param>
266266
/// <param name="fadeInTime"> time to fade in the bgm </param>
267267
/// <param name="fadeOutTime"> time to fade out the bgm </param>
268-
public bool PlayOneShotBackgroundMusic(
268+
public bool PlayOneShotBGM(
269269
AudioClip oneShotClip,
270270
AudioClip onStackClip,
271271
float fadeInTime,
@@ -282,7 +282,7 @@ public bool PlayOneShotBackgroundMusic(
282282
this.mOnStackFadeOutTime = fadeOutTime;
283283

284284
// Play one shot the BGM
285-
SwitchBackgroundMusic(
285+
SwitchBGM(
286286
oneShotClip,
287287
fadeInTime,
288288
fadeOutTime,
@@ -296,14 +296,14 @@ public bool PlayOneShotBackgroundMusic(
296296
/// Push to the sound effect into array ready for use!
297297
/// </summary>
298298
/// <param name="sound"></param>
299-
public void PlayOneShotSFXSound(int index)
299+
public void PlayOneShotEffect(int index)
300300
{
301301
AudioSource aud = mSFXSounds.at(index);
302302

303303
var ss = JCS_SoundSettings.instance;
304304

305305
if (aud.clip != null)
306-
aud.PlayOneShot(aud.clip, ss.GetSFXSound_Volume());
306+
aud.PlayOneShot(aud.clip, ss.GetEffect_Volume());
307307
}
308308

309309
/// <summary>
@@ -317,14 +317,14 @@ public void AssignSoundSource(JCS_SoundSettingType type, AudioSource source)
317317
{
318318
case JCS_SoundSettingType.NONE:
319319
return;
320-
case JCS_SoundSettingType.BGM_SOUND:
321-
SetBackgroundMusic(source);
320+
case JCS_SoundSettingType.BGM:
321+
SetBGM(source);
322322
break;
323-
case JCS_SoundSettingType.SFX_SOUND:
324-
AssignSFX_Sound(source);
323+
case JCS_SoundSettingType.EFFECT:
324+
AssignEffect(source);
325325
break;
326-
case JCS_SoundSettingType.SKILLS_SOUND:
327-
AssignSkillsSound(source);
326+
case JCS_SoundSettingType.SKILL:
327+
AssignSkill(source);
328328
break;
329329
}
330330
}
@@ -334,19 +334,19 @@ public void AssignSoundSource(JCS_SoundSettingType type, AudioSource source)
334334
/// </summary>
335335
/// <param name="type"> type of the sound you want to set. </param>
336336
/// <param name="volume"> volume of the sound. </param>
337-
public void SetSoundVolume(JCS_SoundSettingType type, float volume)
337+
public void SetVolume(JCS_SoundSettingType type, float volume)
338338
{
339339
switch (type)
340340
{
341341
case JCS_SoundSettingType.NONE:
342342
return;
343-
case JCS_SoundSettingType.BGM_SOUND:
343+
case JCS_SoundSettingType.BGM:
344344
GetBGMAudioSource().volume = volume;
345345
break;
346-
case JCS_SoundSettingType.SFX_SOUND:
347-
SetSFXSoundVolume(volume);
346+
case JCS_SoundSettingType.EFFECT:
347+
SetEffectVolume(volume);
348348
break;
349-
case JCS_SoundSettingType.SKILLS_SOUND:
349+
case JCS_SoundSettingType.SKILL:
350350
SetSkillsSoundVolume(volume);
351351
break;
352352
}
@@ -357,19 +357,19 @@ public void SetSoundVolume(JCS_SoundSettingType type, float volume)
357357
/// </summary>
358358
/// <param name="type"> type of the sound. </param>
359359
/// <param name="act"> action of the mute </param>
360-
public void SetSoundMute(JCS_SoundSettingType type, bool act)
360+
public void SetMute(JCS_SoundSettingType type, bool act)
361361
{
362362
switch (type)
363363
{
364364
case JCS_SoundSettingType.NONE:
365365
return;
366-
case JCS_SoundSettingType.BGM_SOUND:
366+
case JCS_SoundSettingType.BGM:
367367
GetBGMAudioSource().mute = act;
368368
break;
369-
case JCS_SoundSettingType.SFX_SOUND:
369+
case JCS_SoundSettingType.EFFECT:
370370
SetSFXSoundMute(act);
371371
break;
372-
case JCS_SoundSettingType.SKILLS_SOUND:
372+
case JCS_SoundSettingType.SKILL:
373373
SetSkillsSoundMute(act);
374374
break;
375375
}
@@ -380,7 +380,7 @@ public void SetSoundMute(JCS_SoundSettingType type, bool act)
380380
/// </summary>
381381
/// <param name="list"> list of the audio source </param>
382382
/// <param name="vol"> target volume. </param>
383-
private void SetSoundVolume(JCS_Vec<AudioSource> list, float vol)
383+
private void SetVolume(JCS_Vec<AudioSource> list, float vol)
384384
{
385385
for (int index = 0; index < list.length; ++index)
386386
{
@@ -393,7 +393,7 @@ private void SetSoundVolume(JCS_Vec<AudioSource> list, float vol)
393393
/// </summary>
394394
/// <param name="list"> list of the audio source. </param>
395395
/// <param name="act"> target mute action. </param>
396-
private void SetSoundtMute(JCS_Vec<AudioSource> list, bool act)
396+
private void SetMute(JCS_Vec<AudioSource> list, bool act)
397397
{
398398
for (int index = 0; index < list.length; ++index)
399399
{
@@ -405,7 +405,7 @@ private void SetSoundtMute(JCS_Vec<AudioSource> list, bool act)
405405
/// Add a SFX in to the list in order to get manage.
406406
/// </summary>
407407
/// <param name="sound"> Unity's audio source class. </param>
408-
private void AssignSFX_Sound(AudioSource sound)
408+
private void AssignEffect(AudioSource sound)
409409
{
410410
AssignSoundToList(mSFXSounds, sound);
411411
}
@@ -414,7 +414,7 @@ private void AssignSFX_Sound(AudioSource sound)
414414
/// Add a skill sound in to the list in order to get manage.
415415
/// </summary>
416416
/// <param name="sound"> Unity's audio source class. </param>
417-
private void AssignSkillsSound(AudioSource sound)
417+
private void AssignSkill(AudioSource sound)
418418
{
419419
AssignSoundToList(mSkillsSounds, sound);
420420
}
@@ -433,16 +433,16 @@ private void AssignSoundToList(JCS_Vec<AudioSource> list, AudioSource sound)
433433
}
434434

435435
list.push(sound);
436-
sound.volume = JCS_SoundSettings.instance.GetSFXSound_Volume();
436+
sound.volume = JCS_SoundSettings.instance.GetEffect_Volume();
437437
}
438438

439439
/// <summary>
440440
/// Set the SFX volume.
441441
/// </summary>
442442
/// <param name="vol"> volume to set. </param>
443-
private void SetSFXSoundVolume(float vol)
443+
private void SetEffectVolume(float vol)
444444
{
445-
SetSoundVolume(mSFXSounds, vol);
445+
SetVolume(mSFXSounds, vol);
446446
}
447447

448448
/// <summary>
@@ -451,7 +451,7 @@ private void SetSFXSoundVolume(float vol)
451451
/// <param name="vol"></param>
452452
private void SetSkillsSoundVolume(float vol)
453453
{
454-
SetSoundVolume(mSkillsSounds, vol);
454+
SetVolume(mSkillsSounds, vol);
455455
}
456456

457457
/// <summary>
@@ -460,7 +460,7 @@ private void SetSkillsSoundVolume(float vol)
460460
/// <param name="act"> target mute action. </param>
461461
private void SetSFXSoundMute(bool act)
462462
{
463-
SetSoundtMute(mSFXSounds, act);
463+
SetMute(mSFXSounds, act);
464464
}
465465

466466
/// <summary>
@@ -469,7 +469,7 @@ private void SetSFXSoundMute(bool act)
469469
/// <param name="act"> target mute action. </param>
470470
private void SetSkillsSoundMute(bool act)
471471
{
472-
SetSoundtMute(mSkillsSounds, act);
472+
SetMute(mSkillsSounds, act);
473473
}
474474

475475
/// <summary>
@@ -539,7 +539,7 @@ private void DoStackBGM()
539539
return;
540540

541541
// switch bgm
542-
SwitchBackgroundMusic(
542+
SwitchBGM(
543543
this.mOnStackAudioClip,
544544
this.mOnStackFadeInTime,
545545
this.mOnStackFadeOutTime);

0 commit comments

Comments
 (0)