Skip to content

Commit e36112a

Browse files
committed
Fixed compatibility.
1 parent c22784b commit e36112a

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/* NOTE: If you are using `TextMesh Pro` uncomment this line.
1111
*/
12-
//#define TMP_PRO
12+
#define TMP_PRO
1313

1414
using System.Collections;
1515
using System.Collections.Generic;

Assets/JCSUnity/Scripts/GUI/Text/JCS_TextAnimation.cs.meta

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

Assets/JCSUnity/Scripts/GUI/Timer/JCS_SpriteTimer.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* $Date: 2017-03-10 $
44
* $Revision: $
55
* $Creator: Jen-Chieh Shen $
6-
* $Notice: See LICENSE.txt for modification and distribution information
6+
* $Notice: See LICENSE.txt for modification and distribution information
77
* Copyright (c) 2016 by Shen, Jen-Chieh $
88
*/
99
using System.Collections;
@@ -165,7 +165,7 @@ public class JCS_SpriteTimer
165165
[SerializeField]
166166
private AudioClip mSecondSound = null;
167167

168-
// Track the second changes, so we are able to play the
168+
// Track the second changes, so we are able to play the
169169
// second sound.
170170
private int mTrackSecond = 0;
171171

@@ -591,11 +591,8 @@ private void PlayTimerSound(AudioClip clip)
591591
if (clip == null)
592592
return;
593593

594-
OM_SoundManager sm = OM_SoundManager.instance;
594+
JCS_SoundManager sm = JCS_SoundManager.instance;
595595
sm.GetGlobalSoundPlayer().PlayOneShot(clip);
596-
597-
//JCS_SoundPlayer sm = JCS_SoundPlayer.instance;
598-
//sm.GetGlobalSoundPlayer().PlayOneShot(clip);
599596
}
600597
}
601598
}

Assets/JCSUnity/Scripts/GUI/Timer/JCS_TextTimer.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public class JCS_TextTimer
121121
[SerializeField]
122122
private AudioClip mSecondSound = null;
123123

124-
// Track the second changes, so we are able to play the
124+
// Track the second changes, so we are able to play the
125125
// second sound.
126126
private int mTrackSecond = 0;
127127

@@ -413,11 +413,8 @@ private void PlayTimerSound(AudioClip clip)
413413
if (clip == null)
414414
return;
415415

416-
OM_SoundManager sm = OM_SoundManager.instance;
416+
JCS_SoundManager sm = JCS_SoundManager.instance;
417417
sm.GetGlobalSoundPlayer().PlayOneShot(clip);
418-
419-
//JCS_SoundPlayer sm = JCS_SoundPlayer.instance;
420-
//sm.GetGlobalSoundPlayer().PlayOneShot(clip);
421418
}
422419
}
423420
}

0 commit comments

Comments
 (0)