From a87d3600239c65b17a7ac65f50adbff1ef52f7b0 Mon Sep 17 00:00:00 2001 From: jenchieh Date: Thu, 18 Jul 2019 20:00:09 +0800 Subject: [PATCH 1/2] Override this merge. --- Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs | 2 +- Assets/JCSUnity/Scripts/GUI/JCS_TextTimer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs b/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs index dbb81204..34f6a880 100644 --- a/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs +++ b/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs @@ -222,7 +222,7 @@ private void UpdateTextRender() #if TMP_PRO if (mTextContainer == null && mTextMesh == null) #else - if (mText == null) + if (mTextContainer == null) #endif { JCS_Debug.LogError("Text slot cannot be null references..."); diff --git a/Assets/JCSUnity/Scripts/GUI/JCS_TextTimer.cs b/Assets/JCSUnity/Scripts/GUI/JCS_TextTimer.cs index e9a5722b..8818137e 100644 --- a/Assets/JCSUnity/Scripts/GUI/JCS_TextTimer.cs +++ b/Assets/JCSUnity/Scripts/GUI/JCS_TextTimer.cs @@ -200,7 +200,7 @@ public void UpdateTimeUI(float hour, float minute, float second) #if TMP_PRO if (mTextContainer == null && mTextMesh == null) #else - if (mText == null) + if (mTextContainer == null) #endif { JCS_Debug.LogError("Text slot cannot be null references..."); From e36112a9a7663e0507bd329d187033fa4b1f9c7e Mon Sep 17 00:00:00 2001 From: jenchieh Date: Thu, 18 Jul 2019 20:07:25 +0800 Subject: [PATCH 2/2] Fixed compatibility. --- Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs | 2 +- .../Scripts/GUI/Text/JCS_TextAnimation.cs.meta | 11 +++++++++++ Assets/JCSUnity/Scripts/GUI/Timer/JCS_SpriteTimer.cs | 9 +++------ Assets/JCSUnity/Scripts/GUI/Timer/JCS_TextTimer.cs | 7 ++----- 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 Assets/JCSUnity/Scripts/GUI/Text/JCS_TextAnimation.cs.meta diff --git a/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs b/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs index d3d34531..fbbcae8f 100644 --- a/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs +++ b/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs @@ -9,7 +9,7 @@ /* NOTE: If you are using `TextMesh Pro` uncomment this line. */ -//#define TMP_PRO +#define TMP_PRO using System.Collections; using System.Collections.Generic; diff --git a/Assets/JCSUnity/Scripts/GUI/Text/JCS_TextAnimation.cs.meta b/Assets/JCSUnity/Scripts/GUI/Text/JCS_TextAnimation.cs.meta new file mode 100644 index 00000000..59b321f5 --- /dev/null +++ b/Assets/JCSUnity/Scripts/GUI/Text/JCS_TextAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 22d33679a7a65a64fa7e4a1f131f0ee2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JCSUnity/Scripts/GUI/Timer/JCS_SpriteTimer.cs b/Assets/JCSUnity/Scripts/GUI/Timer/JCS_SpriteTimer.cs index 98aec8ae..5607e1ca 100644 --- a/Assets/JCSUnity/Scripts/GUI/Timer/JCS_SpriteTimer.cs +++ b/Assets/JCSUnity/Scripts/GUI/Timer/JCS_SpriteTimer.cs @@ -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); } } } diff --git a/Assets/JCSUnity/Scripts/GUI/Timer/JCS_TextTimer.cs b/Assets/JCSUnity/Scripts/GUI/Timer/JCS_TextTimer.cs index c8da203b..a58ff165 100644 --- a/Assets/JCSUnity/Scripts/GUI/Timer/JCS_TextTimer.cs +++ b/Assets/JCSUnity/Scripts/GUI/Timer/JCS_TextTimer.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); } } }