Skip to content

Commit e4d6b1d

Browse files
committed
fix: Remove game pause options for input
1 parent 751a608 commit e4d6b1d

File tree

5 files changed

+161
-388
lines changed

5 files changed

+161
-388
lines changed

Assets/JCSUnity/Scripts/Input/JCS_ButtonSelectionGroupController.cs

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ public class JCS_ButtonSelectionGroupController : MonoBehaviour
2828
[SerializeField]
2929
private bool mActive = true;
3030

31-
[Tooltip("JCSUnity key would not work with game pause, ignore it?")]
32-
[SerializeField]
33-
private bool mIgnoreGamePause = false;
34-
3531
[Tooltip("Key type of this controller.")]
3632
[SerializeField]
3733
private JCS_KeyActionType mKeyActionType = JCS_KeyActionType.KEY_DOWN;
@@ -167,7 +163,6 @@ public class JCS_ButtonSelectionGroupController : MonoBehaviour
167163
public JCS_ButtonSelectionGroup ButtonSelectionGroup { get { return this.mButtonSelectionGroup; } }
168164

169165
public bool Active { get { return this.mActive; } set { this.mActive = value; } }
170-
public bool IgnoreGamePause { get { return this.mIgnoreGamePause; } set { this.mIgnoreGamePause = value; } }
171166

172167
public KeyCode MNext { get { return this.mMNext; } set { this.mMNext = value; } }
173168
public KeyCode MMPrev { get { return this.mMNext; } set { this.mMNext = value; } }
@@ -274,8 +269,8 @@ private void Update()
274269
/// <returns></returns>
275270
private bool ActiveNext()
276271
{
277-
return JCS_Input.GetKeyByAction(mKeyActionType, mMNext, mIgnoreGamePause) ||
278-
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJNext, mIgnoreGamePause);
272+
return JCS_Input.GetKeyByAction(mKeyActionType, mMNext) ||
273+
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJNext);
279274
}
280275

281276
/// <summary>
@@ -284,8 +279,8 @@ private bool ActiveNext()
284279
/// <returns></returns>
285280
private bool ActivePrev()
286281
{
287-
return JCS_Input.GetKeyByAction(mKeyActionType, mMPrev, mIgnoreGamePause) ||
288-
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJPrev, mIgnoreGamePause);
282+
return JCS_Input.GetKeyByAction(mKeyActionType, mMPrev) ||
283+
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJPrev);
289284
}
290285

291286
/// <summary>
@@ -294,8 +289,8 @@ private bool ActivePrev()
294289
/// <returns></returns>
295290
private bool ActiveOkay()
296291
{
297-
return JCS_Input.GetKeyByAction(mKeyActionType, mMOkay, mIgnoreGamePause) ||
298-
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJOkay, mIgnoreGamePause);
292+
return JCS_Input.GetKeyByAction(mKeyActionType, mMOkay) ||
293+
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJOkay);
299294
}
300295

301296
/// <summary>
@@ -304,8 +299,8 @@ private bool ActiveOkay()
304299
/// <returns></returns>
305300
private bool ActiveUp()
306301
{
307-
return JCS_Input.GetKeyByAction(mKeyActionType, mMUp, mIgnoreGamePause) ||
308-
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJUp, mIgnoreGamePause);
302+
return JCS_Input.GetKeyByAction(mKeyActionType, mMUp) ||
303+
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJUp);
309304
}
310305

311306
/// <summary>
@@ -314,8 +309,8 @@ private bool ActiveUp()
314309
/// <returns></returns>
315310
private bool ActiveDown()
316311
{
317-
return JCS_Input.GetKeyByAction(mKeyActionType, mMDown, mIgnoreGamePause) ||
318-
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJDown, mIgnoreGamePause);
312+
return JCS_Input.GetKeyByAction(mKeyActionType, mMDown) ||
313+
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJDown);
319314
}
320315

321316
/// <summary>
@@ -324,8 +319,8 @@ private bool ActiveDown()
324319
/// <returns></returns>
325320
private bool ActiveRight()
326321
{
327-
return JCS_Input.GetKeyByAction(mKeyActionType, mMRight, mIgnoreGamePause) ||
328-
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJRight, mIgnoreGamePause);
322+
return JCS_Input.GetKeyByAction(mKeyActionType, mMRight) ||
323+
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJRight);
329324
}
330325

331326
/// <summary>
@@ -334,8 +329,8 @@ private bool ActiveRight()
334329
/// <returns></returns>
335330
private bool ActiveLeft()
336331
{
337-
return JCS_Input.GetKeyByAction(mKeyActionType, mMLeft, mIgnoreGamePause) ||
338-
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJLeft, mIgnoreGamePause);
332+
return JCS_Input.GetKeyByAction(mKeyActionType, mMLeft) ||
333+
JCS_Input.GetJoystickKeyByAction(mKeyActionType, mGamePadId, mJLeft);
339334
}
340335

341336
/* Play the next sound. */

0 commit comments

Comments
 (0)