pengtaihao
/
com.unity.uiextensions.nosample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unity 2020 patchfix

release
Simon (darkside) Jackson 2020-10-31 15:45:21 +00:00
parent a7a17afcc5
commit da2cec1ef2
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Scripts/Effects/UIParticleSystem.cs
View File

@ -223,7 +223,7 @@ namespace UnityEngine.UI.Extensions
frame = Mathf.FloorToInt(frameProgress * textureSheetAnimation.numTilesX); frame = Mathf.FloorToInt(frameProgress * textureSheetAnimation.numTilesX);
int row = textureSheetAnimation.rowIndex; int row = textureSheetAnimation.rowIndex;
#if UNITY_2019_OR_NEWER #if UNITY_2020 || UNITY_2019_OR_NEWER
if (textureSheetAnimation.rowMode == ParticleSystemAnimationRowMode.Random) if (textureSheetAnimation.rowMode == ParticleSystemAnimationRowMode.Random)
#else #else
if (textureSheetAnimation.useRandomRow) if (textureSheetAnimation.useRandomRow)

32
Runtime/Scripts/Utilities/UIExtensionsInputManager.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Controls;
#endif #endif
@ -13,7 +13,7 @@ namespace UnityEngine.UI.Extensions
{ {
public static class UIExtensionsInputManager public static class UIExtensionsInputManager
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
private static bool[] mouseButtons = new bool[3] { false, false, false }; private static bool[] mouseButtons = new bool[3] { false, false, false };
private static Dictionary<KeyCode, bool> keys = new Dictionary<KeyCode, bool>(); private static Dictionary<KeyCode, bool> keys = new Dictionary<KeyCode, bool>();
private static Dictionary<String, bool> buttons = new Dictionary<String, bool>(); private static Dictionary<String, bool> buttons = new Dictionary<String, bool>();
@ -21,7 +21,7 @@ namespace UnityEngine.UI.Extensions
public static bool GetMouseButton(int button) public static bool GetMouseButton(int button)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
if (Mouse.current == null) if (Mouse.current == null)
{ {
return false; return false;
@ -35,7 +35,7 @@ namespace UnityEngine.UI.Extensions
public static bool GetMouseButtonDown(int button) public static bool GetMouseButtonDown(int button)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
if (Mouse.current == null) if (Mouse.current == null)
{ {
return false; return false;
@ -57,7 +57,7 @@ namespace UnityEngine.UI.Extensions
public static bool GetMouseButtonUp(int button) public static bool GetMouseButtonUp(int button)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
if (Mouse.current == null) if (Mouse.current == null)
{ {
return false; return false;
@ -76,7 +76,7 @@ namespace UnityEngine.UI.Extensions
public static bool GetButton(string input) public static bool GetButton(string input)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
ButtonControl buttonPressed = GetButtonControlFromString(input); ButtonControl buttonPressed = GetButtonControlFromString(input);
if (!buttons.ContainsKey(input)) if (!buttons.ContainsKey(input))
@ -90,7 +90,7 @@ namespace UnityEngine.UI.Extensions
#endif #endif
} }
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
private static ButtonControl GetButtonControlFromString(string input) private static ButtonControl GetButtonControlFromString(string input)
{ {
if (Gamepad.current == null) if (Gamepad.current == null)
@ -112,7 +112,7 @@ namespace UnityEngine.UI.Extensions
public static bool GetButtonDown(string input) public static bool GetButtonDown(string input)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
ButtonControl buttonPressed = GetButtonControlFromString(input); ButtonControl buttonPressed = GetButtonControlFromString(input);
if (buttonPressed.isPressed) if (buttonPressed.isPressed)
@ -140,7 +140,7 @@ namespace UnityEngine.UI.Extensions
public static bool GetButtonUp(string input) public static bool GetButtonUp(string input)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
ButtonControl buttonPressed = GetButtonControlFromString(input); ButtonControl buttonPressed = GetButtonControlFromString(input);
if (buttons[input] && !buttonPressed.isPressed) if (buttons[input] && !buttonPressed.isPressed)
@ -156,7 +156,7 @@ namespace UnityEngine.UI.Extensions
public static bool GetKey(KeyCode key) public static bool GetKey(KeyCode key)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
KeyControl keyPressed = GetKeyControlFromKeyCode(key); KeyControl keyPressed = GetKeyControlFromKeyCode(key);
if (!keys.ContainsKey(key)) if (!keys.ContainsKey(key))
{ {
@ -169,7 +169,7 @@ namespace UnityEngine.UI.Extensions
#endif #endif
} }
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
private static KeyControl GetKeyControlFromKeyCode(KeyCode key) private static KeyControl GetKeyControlFromKeyCode(KeyCode key)
{ {
if (Keyboard.current == null) if (Keyboard.current == null)
@ -203,7 +203,7 @@ namespace UnityEngine.UI.Extensions
public static bool GetKeyDown(KeyCode key) public static bool GetKeyDown(KeyCode key)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
KeyControl keyPressed = GetKeyControlFromKeyCode(key); KeyControl keyPressed = GetKeyControlFromKeyCode(key);
if (keyPressed.isPressed) if (keyPressed.isPressed)
{ {
@ -230,7 +230,7 @@ namespace UnityEngine.UI.Extensions
public static bool GetKeyUp(KeyCode key) public static bool GetKeyUp(KeyCode key)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
KeyControl keyPressed = GetKeyControlFromKeyCode(key); KeyControl keyPressed = GetKeyControlFromKeyCode(key);
if (keys[key] && !keyPressed.isPressed) if (keys[key] && !keyPressed.isPressed)
{ {
@ -245,7 +245,7 @@ namespace UnityEngine.UI.Extensions
public static float GetAxisRaw(string axis) public static float GetAxisRaw(string axis)
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
if (Gamepad.current == null) if (Gamepad.current == null)
{ {
return 0f; return 0f;
@ -269,7 +269,7 @@ namespace UnityEngine.UI.Extensions
{ {
get get
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
return Mouse.current.position.ReadValue(); return Mouse.current.position.ReadValue();
#else #else
return Input.mousePosition; return Input.mousePosition;
@ -281,7 +281,7 @@ namespace UnityEngine.UI.Extensions
{ {
get get
{ {
#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER #if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
return Mouse.current.position.ReadValue(); return Mouse.current.position.ReadValue();
#else #else
return Input.mouseScrollDelta; return Input.mouseScrollDelta;