Skip to content

Commit f570c6d

Browse files
jcs090218jcs090218
committed
chore: Update JCSUnity
1 parent c3882eb commit f570c6d

File tree

17 files changed

+173
-75
lines changed

17 files changed

+173
-75
lines changed

‎Assets/JCSUnity/Scripts/Actions/3D/JCS_3DGoStraightAction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace JCSUnity
1414
/// <summary>
1515
/// Move forward base on their own direction.
1616
/// </summary>
17-
public class JCS_3DGoStraightAction : MonoBehaviour , JCS_IAction
17+
public class JCS_3DGoStraightAction : MonoBehaviour, JCS_IAction
1818
{
1919
/* Variables */
2020

‎Assets/JCSUnity/Scripts/Effects/3D/JCS_3DShakeEffect.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ public void DoShake()
169169
}
170170
public void DoShake(bool force)
171171
{
172-
DoShake(mTime, mMargin, force);
172+
DoShake(mTime, mMargin, mSteps, force);
173173
}
174-
public void DoShake(float time, float margin, bool force)
174+
public void DoShake(float time, float margin, float steps, bool force)
175175
{
176176
if (!force)
177177
{
@@ -186,6 +186,7 @@ public void DoShake(float time, float margin, bool force)
186186
mTime = time;
187187
mTimer = 0.0f;
188188
mMargin = margin;
189+
mSteps = steps;
189190

190191
RevertShakeByTransformType(mDelta);
191192

‎Assets/JCSUnity/Scripts/Effects/JCS_ScaleEffect.cs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ public class JCS_ScaleEffect : JCS_UnityObject
7676

7777
[Tooltip("Event trigger type to active the the slide effect.")]
7878
[SerializeField]
79-
private EventTriggerType mActiveEventTriggerType = EventTriggerType.PointerEnter;
79+
private EventTriggerType[] mActiveEventTriggerType = null;
8080

8181
[Tooltip("Event trigger type to deactive the the slide effect.")]
8282
[SerializeField]
83-
private EventTriggerType mDeactiveEventTriggerType = EventTriggerType.PointerExit;
83+
private EventTriggerType[] mDeactiveEventTriggerType = null;
8484

8585
/* Setter & Getter */
8686

@@ -105,14 +105,17 @@ private void Start()
105105
{
106106
// Event trigger is the must if we need to add the
107107
// event to event trigger system.
108+
mEventTrigger = gameObject.GetOrAddComponent<EventTrigger>();
109+
110+
foreach (EventTriggerType evt in mActiveEventTriggerType)
108111
{
109-
mEventTrigger = GetComponent<EventTrigger>();
110-
if (mEventTrigger == null)
111-
mEventTrigger = gameObject.AddComponent<EventTrigger>();
112+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseOver);
112113
}
113114

114-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, mActiveEventTriggerType, JCS_OnMouseOver);
115-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, mDeactiveEventTriggerType, JCS_OnMouseExit);
115+
foreach (EventTriggerType evt in mDeactiveEventTriggerType)
116+
{
117+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseExit);
118+
}
116119
}
117120
}
118121

‎Assets/JCSUnity/Scripts/Effects/JCS_SlideEffect.cs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ public class JCS_SlideEffect : JCS_UnityObject
8888

8989
[Tooltip("Event trigger type to active the the slide effect.")]
9090
[SerializeField]
91-
private EventTriggerType mActiveEventTriggerType = EventTriggerType.PointerEnter;
91+
private EventTriggerType[] mActiveEventTriggerType = null;
9292

9393
[Tooltip("Event trigger type to deactive the the slide effect.")]
9494
[SerializeField]
95-
private EventTriggerType mDeactiveEventTriggerType = EventTriggerType.PointerExit;
95+
private EventTriggerType[] mDeactiveEventTriggerType = null;
9696

9797
[Header("Sound")]
9898

@@ -196,14 +196,17 @@ private void Start()
196196
{
197197
// Event trigger is the must if we need to add the
198198
// event to event trigger system.
199+
mEventTrigger = gameObject.GetOrAddComponent<EventTrigger>();
200+
201+
foreach (EventTriggerType evt in mActiveEventTriggerType)
199202
{
200-
mEventTrigger = GetComponent<EventTrigger>();
201-
if (mEventTrigger == null)
202-
mEventTrigger = gameObject.AddComponent<EventTrigger>();
203+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseOver);
203204
}
204205

205-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, mActiveEventTriggerType, JCS_OnMouseOver);
206-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, mDeactiveEventTriggerType, JCS_OnMouseExit);
206+
foreach (EventTriggerType evt in mDeactiveEventTriggerType)
207+
{
208+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseExit);
209+
}
207210
}
208211
}
209212

‎Assets/JCSUnity/Scripts/Input/JCS_Input.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ public static bool GetButtonUp(params string[] names)
762762
public static KeyCode GetAnyKeyByAction(JCS_KeyActionType type)
763763
{
764764
// loop through the key code list
765-
foreach (KeyCode val in JCS_Util.GetValues<KeyCode>())
765+
foreach (KeyCode val in JCS_Enum.GetValues<KeyCode>())
766766
{
767767
// if the key is pressed, return it.
768768
if (GetKeyByAction(type, val))

‎Assets/JCSUnity/Scripts/Input/JCS_InputController.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class JCS_InputController : MonoBehaviour
2121
{
2222
public static int GAMEPAD_COUNT = 0; // How many gamepad in this game?
2323

24-
public static int SELECT_GAMEPAD_TYPE= 0;
24+
public static int SELECT_GAMEPAD_TYPE = 0;
2525

2626
public static string[] GAMEPAD_PLATFORM = {
2727
"Select Platform",
@@ -185,7 +185,7 @@ public static void SetupInputManager()
185185

186186
/* Microsoft XBox */
187187
case 5: /* ==> XBox <== */
188-
188+
189189
break;
190190
case 6: /* ==> XBox 360 <== */
191191
SetupXBox360Joystick();
@@ -561,7 +561,7 @@ public static void SetupPS4Joystick()
561561

562562
for (int joystickNum = 0; joystickNum < GAMEPAD_COUNT; ++joystickNum)
563563
{
564-
foreach (JCS_JoystickButton val in JCS_Util.GetValues<JCS_JoystickButton>())
564+
foreach (JCS_JoystickButton val in JCS_Enum.GetValues<JCS_JoystickButton>())
565565
{
566566
if (val == JCS_JoystickButton.NONE)
567567
continue;
@@ -594,7 +594,7 @@ public static void SetupXBox360Joystick()
594594

595595
for (int joystickNum = 0; joystickNum < GAMEPAD_COUNT; ++joystickNum)
596596
{
597-
foreach (JCS_JoystickButton val in JCS_Util.GetValues<JCS_JoystickButton>())
597+
foreach (JCS_JoystickButton val in JCS_Enum.GetValues<JCS_JoystickButton>())
598598
{
599599
if (val == JCS_JoystickButton.NONE)
600600
continue;

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,20 @@ public class JCS_PauseManager : JCS_Manager<JCS_PauseManager>
4141

4242
[Tooltip("Key that increment the time.")]
4343
[SerializeField]
44-
private KeyCode mIncTime = KeyCode.N;
44+
private KeyCode mKeyInc = KeyCode.M;
4545

4646
[Tooltip("Key that decrement the time.")]
4747
[SerializeField]
48-
private KeyCode mDecTime = KeyCode.M;
48+
private KeyCode mKeyDec = KeyCode.N;
49+
50+
[Tooltip("Key that decrement the time.")]
51+
[SerializeField]
52+
private KeyCode mKeyReset = KeyCode.B;
4953

5054
[Tooltip("Delta value to add to the time.")]
5155
[SerializeField]
52-
[Range(0.0f, 100.0f)]
53-
private float mTimeDelta = 5.0f;
56+
[Range(0.001f, 100.0f)]
57+
private float mTimeDelta = 0.1f;
5458
#endif
5559

5660
[Separator("Check Variables (JCS_PauseManager)")]
@@ -129,33 +133,37 @@ private void Update()
129133
#if UNITY_EDITOR
130134
mTimeScale = Time.timeScale;
131135

132-
TestPauseGame();
136+
Test();
133137
#endif
134138

135139
ResizePauseActionListPeriodically();
136140
DoAsymp();
137141
}
138142

139143
#if UNITY_EDITOR
140-
private void TestPauseGame()
144+
private void Test()
141145
{
142146
if (!mTest)
143147
return;
144148

145-
if (Input.GetKeyDown(mToggleGamePause))
149+
if (Input.GetKeyUp(mToggleGamePause))
146150
{
147151
var gm = JCS_GameManager.FirstInstance();
148152

149153
gm.gamePaused = !gm.gamePaused;
150154
}
151155

152-
if (Input.GetKeyDown(mIncTime))
156+
if (Input.GetKeyUp(mKeyReset))
157+
{
158+
mTargetTimeScale = mDefaultTimeScale;
159+
}
160+
else if (Input.GetKeyUp(mKeyInc))
153161
{
154162
Time.timeScale += mTimeDelta;
155163

156164
mTargetTimeScale = Time.timeScale;
157165
}
158-
else if (Input.GetKeyDown(mDecTime))
166+
else if (Input.GetKeyUp(mKeyDec))
159167
{
160168
Time.timeScale -= mTimeDelta;
161169

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

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public class JCS_SceneManager : JCS_Manager<JCS_SceneManager>
2929
public Func<bool> onSwitchSceneIn = null;
3030
public Func<bool> onSwitchSceneOut = null;
3131

32-
private bool mIsEnteringSwitchScene = false;
32+
private bool mSwitchSceneEntering = false;
33+
34+
private bool mIsEnteringNextScene = false;
3335

3436
[Separator("Check Variables (JCS_SceneManager)")]
3537

@@ -144,6 +146,7 @@ private void Awake()
144146
{
145147
RegisterInstance(this);
146148

149+
// Load early for better execution order for scripts.
147150
HandleAdditive();
148151

149152
switch (mSwitchSceneType)
@@ -260,7 +263,7 @@ private void Start()
260263

261264
private void Update()
262265
{
263-
if (mIsEnteringSwitchScene)
266+
if (mSwitchSceneEntering)
264267
DoEnterSwitchScene();
265268
else
266269
DoExitSwitchScene();
@@ -298,6 +301,7 @@ private void OnOverlaySceneLoaded(Scene scene, LoadSceneMode mode)
298301

299302
string sceneName = scene.name;
300303

304+
// Prevent scene loaded twice.
301305
mLoadedOverlaySceneNames.Add(sceneName);
302306

303307
// Execute event.
@@ -381,7 +385,7 @@ public void LoadScene(string sceneName, LoadSceneMode mode,
381385
}
382386

383387
// Mark loading scene.
384-
mIsEnteringSwitchScene = true;
388+
mSwitchSceneEntering = true;
385389

386390
switch (mSwitchSceneType)
387391
{
@@ -678,9 +682,18 @@ private void DoExitSwitchScene()
678682
/// </summary>
679683
private void EnterNextScene()
680684
{
685+
if (mIsEnteringNextScene)
686+
return;
687+
688+
mIsEnteringNextScene = true;
689+
690+
// Don't set it to low, or else it will still be
691+
// not fade out when trying to load the next scnee.
692+
const float delay = 0.1f;
693+
681694
// Delay a bit of time to make sure it's completely
682695
// fade out.
683-
Invoke(nameof(InvokeEnterNextScene), 0.01f);
696+
Invoke(nameof(InvokeEnterNextScene), delay);
684697
}
685698
private void InvokeEnterNextScene()
686699
{

‎Assets/JCSUnity/Scripts/Network/Interface/JCS_PacketProcessor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected void InitPacketHandlersArray<K>()
4141
}
4242

4343
int maxRecvOp = 0;
44-
foreach (K op in JCS_Util.GetValues<K>())
44+
foreach (K op in JCS_Enum.GetValues<K>())
4545
{
4646
int opId = Convert.ToInt32(op);
4747

‎Assets/JCSUnity/Scripts/UI/Dropdown/JCS_DropdownScreenResolution.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ private void AddListener()
7070
{
7171
OnValueChanged_TMP(mDropdownTMP);
7272
});
73-
74-
// Run once.
75-
OnValueChanged_Legacy(mDropdownLegacy);
76-
OnValueChanged_TMP(mDropdownTMP);
7773
}
7874

7975
/// <summary>

0 commit comments

Comments
 (0)