Unity 2020 patchfix

SimonDarksideJ · SimonDarksideJ · commit da2cec1ef264 · 2020-10-31T15:45:21.000Z
diff --git a/Runtime/Scripts/Effects/UIParticleSystem.cs b/Runtime/Scripts/Effects/UIParticleSystem.cs
@@ -223,7 +223,7 @@ protected override void OnPopulateMesh(VertexHelper vh)
                             frame = Mathf.FloorToInt(frameProgress * textureSheetAnimation.numTilesX);
 
                             int row = textureSheetAnimation.rowIndex;
-#if UNITY_2019_OR_NEWER
+#if UNITY_2020 || UNITY_2019_OR_NEWER 
                             if (textureSheetAnimation.rowMode == ParticleSystemAnimationRowMode.Random)
 #else
                             if (textureSheetAnimation.useRandomRow)
diff --git a/Runtime/Scripts/Utilities/UIExtensionsInputManager.cs b/Runtime/Scripts/Utilities/UIExtensionsInputManager.cs
@@ -4,7 +4,7 @@
 using System;
 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.Controls;
 #endif
@@ -13,15 +13,15 @@ namespace UnityEngine.UI.Extensions
 {
     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 Dictionary<KeyCode, bool> keys = new Dictionary<KeyCode, bool>();
         private static Dictionary<String, bool> buttons = new Dictionary<String, bool>();
 #endif
 
         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)
             {
                 return false;
@@ -35,7 +35,7 @@ public static bool GetMouseButton(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)
             {
                 return false;
@@ -57,7 +57,7 @@ public static bool GetMouseButtonDown(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)
             {
                 return false;
@@ -76,7 +76,7 @@ public static bool GetMouseButtonUp(int button)
 
         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);
 
             if (!buttons.ContainsKey(input))
@@ -90,7 +90,7 @@ public static bool GetButton(string input)
 #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)
         {
             if (Gamepad.current == null)
@@ -112,7 +112,7 @@ private static ButtonControl GetButtonControlFromString(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);
 
             if (buttonPressed.isPressed)
@@ -140,7 +140,7 @@ public static bool GetButtonDown(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);
 
             if (buttons[input] && !buttonPressed.isPressed)
@@ -156,7 +156,7 @@ public static bool GetButtonUp(string input)
 
         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);
             if (!keys.ContainsKey(key))
             {
@@ -169,7 +169,7 @@ public static bool GetKey(KeyCode key)
 #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)
         {
             if (Keyboard.current == null)
@@ -203,7 +203,7 @@ private static KeyControl GetKeyControlFromKeyCode(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);
             if (keyPressed.isPressed)
             {
@@ -230,7 +230,7 @@ public static bool GetKeyDown(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);
             if (keys[key] && !keyPressed.isPressed)
             {
@@ -245,7 +245,7 @@ public static bool GetKeyUp(KeyCode key)
 
         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)
             {
                 return 0f;
@@ -269,7 +269,7 @@ public static Vector3 MousePosition
         {
             get
             {
-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER
+#if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
                 return Mouse.current.position.ReadValue();
 #else
                 return Input.mousePosition;
@@ -281,7 +281,7 @@ public static Vector3 MouseScrollDelta
         {
             get
             {
-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER
+#if (UNITY_2019 || UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER
                 return Mouse.current.position.ReadValue();
 #else
                 return Input.mouseScrollDelta;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`
`7`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`7`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`8`	`8`	`using UnityEngine.InputSystem;`
`9`	`9`	`using UnityEngine.InputSystem.Controls;`
`10`	`10`	`#endif`
`@@ -13,15 +13,15 @@ namespace UnityEngine.UI.Extensions`
`13`	`13`	`{`
`14`	`14`	`public static class UIExtensionsInputManager`
`15`	`15`	`{`
`16`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`16`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`17`	`17`	`private static bool[] mouseButtons = new bool[3] { false, false, false };`
`18`	`18`	`private static Dictionary<KeyCode, bool> keys = new Dictionary<KeyCode, bool>();`
`19`	`19`	`private static Dictionary<String, bool> buttons = new Dictionary<String, bool>();`
`20`	`20`	`#endif`
`21`	`21`
`22`	`22`	`public static bool GetMouseButton(int button)`
`23`	`23`	`{`
`24`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`24`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`25`	`25`	`if (Mouse.current == null)`
`26`	`26`	`{`
`27`	`27`	`return false;`
`@@ -35,7 +35,7 @@ public static bool GetMouseButton(int button)`
`35`	`35`
`36`	`36`	`public static bool GetMouseButtonDown(int button)`
`37`	`37`	`{`
`38`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`38`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`39`	`39`	`if (Mouse.current == null)`
`40`	`40`	`{`
`41`	`41`	`return false;`
`@@ -57,7 +57,7 @@ public static bool GetMouseButtonDown(int button)`
`57`	`57`
`58`	`58`	`public static bool GetMouseButtonUp(int button)`
`59`	`59`	`{`
`60`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`60`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`61`	`61`	`if (Mouse.current == null)`
`62`	`62`	`{`
`63`	`63`	`return false;`
`@@ -76,7 +76,7 @@ public static bool GetMouseButtonUp(int button)`
`76`	`76`
`77`	`77`	`public static bool GetButton(string input)`
`78`	`78`	`{`
`79`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`79`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`80`	`80`	`ButtonControl buttonPressed = GetButtonControlFromString(input);`
`81`	`81`
`82`	`82`	`if (!buttons.ContainsKey(input))`
`@@ -90,7 +90,7 @@ public static bool GetButton(string input)`
`90`	`90`	`#endif`
`91`	`91`	`}`
`92`	`92`
`93`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`93`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`94`	`94`	`private static ButtonControl GetButtonControlFromString(string input)`
`95`	`95`	`{`
`96`	`96`	`if (Gamepad.current == null)`
`@@ -112,7 +112,7 @@ private static ButtonControl GetButtonControlFromString(string input)`
`112`	`112`
`113`	`113`	`public static bool GetButtonDown(string input)`
`114`	`114`	`{`
`115`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`115`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`116`	`116`	`ButtonControl buttonPressed = GetButtonControlFromString(input);`
`117`	`117`
`118`	`118`	`if (buttonPressed.isPressed)`
`@@ -140,7 +140,7 @@ public static bool GetButtonDown(string input)`
`140`	`140`
`141`	`141`	`public static bool GetButtonUp(string input)`
`142`	`142`	`{`
`143`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`143`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`144`	`144`	`ButtonControl buttonPressed = GetButtonControlFromString(input);`
`145`	`145`
`146`	`146`	`if (buttons[input] && !buttonPressed.isPressed)`
`@@ -156,7 +156,7 @@ public static bool GetButtonUp(string input)`
`156`	`156`
`157`	`157`	`public static bool GetKey(KeyCode key)`
`158`	`158`	`{`
`159`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`159`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`160`	`160`	`KeyControl keyPressed = GetKeyControlFromKeyCode(key);`
`161`	`161`	`if (!keys.ContainsKey(key))`
`162`	`162`	`{`
`@@ -169,7 +169,7 @@ public static bool GetKey(KeyCode key)`
`169`	`169`	`#endif`
`170`	`170`	`}`
`171`	`171`
`172`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`172`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`173`	`173`	`private static KeyControl GetKeyControlFromKeyCode(KeyCode key)`
`174`	`174`	`{`
`175`	`175`	`if (Keyboard.current == null)`
`@@ -203,7 +203,7 @@ private static KeyControl GetKeyControlFromKeyCode(KeyCode key)`
`203`	`203`
`204`	`204`	`public static bool GetKeyDown(KeyCode key)`
`205`	`205`	`{`
`206`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`206`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`207`	`207`	`KeyControl keyPressed = GetKeyControlFromKeyCode(key);`
`208`	`208`	`if (keyPressed.isPressed)`
`209`	`209`	`{`
`@@ -230,7 +230,7 @@ public static bool GetKeyDown(KeyCode key)`
`230`	`230`
`231`	`231`	`public static bool GetKeyUp(KeyCode key)`
`232`	`232`	`{`
`233`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`233`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`234`	`234`	`KeyControl keyPressed = GetKeyControlFromKeyCode(key);`
`235`	`235`	`if (keys[key] && !keyPressed.isPressed)`
`236`	`236`	`{`
`@@ -245,7 +245,7 @@ public static bool GetKeyUp(KeyCode key)`
`245`	`245`
`246`	`246`	`public static float GetAxisRaw(string axis)`
`247`	`247`	`{`
`248`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`248`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`249`	`249`	`if (Gamepad.current == null)`
`250`	`250`	`{`
`251`	`251`	`return 0f;`
`@@ -269,7 +269,7 @@ public static Vector3 MousePosition`
`269`	`269`	`{`
`270`	`270`	`get`
`271`	`271`	`{`
`272`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`272`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`273`	`273`	`return Mouse.current.position.ReadValue();`
`274`	`274`	`#else`
`275`	`275`	`return Input.mousePosition;`
`@@ -281,7 +281,7 @@ public static Vector3 MouseScrollDelta`
`281`	`281`	`{`
`282`	`282`	`get`
`283`	`283`	`{`
`284`		`-#if UNITY_2019_OR_NEWER && !ENABLE_LEGACY_INPUT_MANAGER`
	`284`	`+#if (UNITY_2019 \|\| UNITY_2020) && !ENABLE_LEGACY_INPUT_MANAGER`
`285`	`285`	`return Mouse.current.position.ReadValue();`
`286`	`286`	`#else`
`287`	`287`	`return Input.mouseScrollDelta;`