Not conflict. Merge branch 'master' of https://github.com/jcs090218/JCSUnity

Author: jcs090218

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

@@ -3,7 +3,7 @@
  * $Date: 2017-03-10 $
  * $Revision: $
  * $Creator: Jen-Chieh Shen $
- * $Notice: See LICENSE.txt for modification and distribution information 
+ * $Notice: See LICENSE.txt for modification and distribution information
  *                   Copyright (c) 2016 by Shen, Jen-Chieh $
  */
 using System.Collections;
@@ -165,7 +165,7 @@ public class JCS_SpriteTimer
         [SerializeField]
         private AudioClip mSecondSound = null;
 
-        // Track the second changes, so we are able to play the 
+        // Track the second changes, so we are able to play the
         // second sound.
         private int mTrackSecond = 0;
 
@@ -591,11 +591,8 @@ private void PlayTimerSound(AudioClip clip)
             if (clip == null)
                 return;
 
-            OM_SoundManager sm = OM_SoundManager.instance;
+            JCS_SoundManager sm = JCS_SoundManager.instance;
             sm.GetGlobalSoundPlayer().PlayOneShot(clip);
-
-            //JCS_SoundPlayer sm = JCS_SoundPlayer.instance;
-            //sm.GetGlobalSoundPlayer().PlayOneShot(clip);
         }
     }
 }

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

@@ -121,7 +121,7 @@ public class JCS_TextTimer
         [SerializeField]
         private AudioClip mSecondSound = null;
 
-        // Track the second changes, so we are able to play the 
+        // Track the second changes, so we are able to play the
         // second sound.
         private int mTrackSecond = 0;
 
@@ -413,11 +413,8 @@ private void PlayTimerSound(AudioClip clip)
             if (clip == null)
                 return;
 
-            OM_SoundManager sm = OM_SoundManager.instance;
+            JCS_SoundManager sm = JCS_SoundManager.instance;
             sm.GetGlobalSoundPlayer().PlayOneShot(clip);
-
-            //JCS_SoundPlayer sm = JCS_SoundPlayer.instance;
-            //sm.GetGlobalSoundPlayer().PlayOneShot(clip);
         }
     }
 }