Change input polling method

Use Input.GetKey to get input rather than Event.current to prevent
accidental activation when typing on IMGUI text fields.

This doesn't apply to COM3D2 in game text fields.

COM3D2.PropMyItem.Plugin/CommonUtil.cs

@@ -1,108 +1,125 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using UnityEngine;
 
 namespace COM3D2.PropMyItem.Plugin
 {
-	// Token: 0x02000003 RID: 3
-	public class CommonUtil
-	{
-		// Token: 0x06000003 RID: 3 RVA: 0x000022A0 File Offset: 0x000004A0
-		public static void Log(string text)
-		{
-			try
-			{
-				Console.WriteLine(string.Format("{0}({1}) : {2}", "PropMyItem", "2.3.0.0", text));
-			}
-			catch
-			{
-			}
-		}
+    // Token: 0x02000003 RID: 3
+    public class CommonUtil
+    {
+        public enum ModKey
+        {
+            Control, Alt, Shift
+        }
+        // Token: 0x06000003 RID: 3 RVA: 0x000022A0 File Offset: 0x000004A0
+        public static void Log(string text)
+        {
+            try
+            {
+                Console.WriteLine(string.Format("{0}({1}) : {2}", "PropMyItem", "2.3.0.0", text));
+            }
+            catch
+            {
+            }
+        }
 
-		// Token: 0x06000004 RID: 4 RVA: 0x000022DC File Offset: 0x000004DC
-		public static string WildCardMatchEvaluator(Match match)
-		{
-			string value = match.Value;
-			if (value.Equals("?"))
-			{
-				return ".";
-			}
-			if (value.Equals("*"))
-			{
-				return ".*";
-			}
-			return Regex.Escape(value);
-		}
+        // Token: 0x06000004 RID: 4 RVA: 0x000022DC File Offset: 0x000004DC
+        public static string WildCardMatchEvaluator(Match match)
+        {
+            string value = match.Value;
+            if (value.Equals("?"))
+            {
+                return ".";
+            }
+            if (value.Equals("*"))
+            {
+                return ".*";
+            }
+            return Regex.Escape(value);
+        }
 
-		// Token: 0x06000005 RID: 5 RVA: 0x0000231C File Offset: 0x0000051C
-		public static Maid GetVisibleMaid(int index)
-		{
-			Maid result = null;
-			try
-			{
-				List<Maid> visibleMaidList = CommonUtil.GetVisibleMaidList();
-				if (visibleMaidList.Count > index)
-				{
-					result = visibleMaidList[index];
-				}
-			}
-			catch (Exception ex)
-			{
-				CommonUtil.Log(ex.ToString());
-			}
-			return result;
-		}
+        // Token: 0x06000005 RID: 5 RVA: 0x0000231C File Offset: 0x0000051C
+        public static Maid GetVisibleMaid(int index)
+        {
+            Maid result = null;
+            try
+            {
+                List<Maid> visibleMaidList = CommonUtil.GetVisibleMaidList();
+                if (visibleMaidList.Count > index)
+                {
+                    result = visibleMaidList[index];
+                }
+            }
+            catch (Exception ex)
+            {
+                CommonUtil.Log(ex.ToString());
+            }
+            return result;
+        }
 
-		// Token: 0x06000006 RID: 6 RVA: 0x00002364 File Offset: 0x00000564
-		public static List<Maid> GetVisibleMaidList()
-		{
-			List<Maid> list = new List<Maid>();
-			CharacterMgr characterMgr = GameMain.Instance.CharacterMgr;
-			int maidCount = characterMgr.GetMaidCount();
-			for (int i = 0; i < maidCount; i++)
-			{
-				Maid maid = characterMgr.GetMaid(i);
-				if (maid != null && maid.isActiveAndEnabled && maid.Visible)
-				{
-					list.Add(maid);
-				}
-			}
-			int stockMaidCount = characterMgr.GetStockMaidCount();
-			for (int j = 0; j < stockMaidCount; j++)
-			{
-				Maid stockMaid = characterMgr.GetStockMaid(j);
-				if (stockMaid != null && stockMaid.isActiveAndEnabled && stockMaid.Visible && !list.Contains(stockMaid))
-				{
-					list.Add(stockMaid);
-				}
-			}
-			return list;
-		}
+        // Token: 0x06000006 RID: 6 RVA: 0x00002364 File Offset: 0x00000564
+        public static List<Maid> GetVisibleMaidList()
+        {
+            List<Maid> list = new List<Maid>();
+            CharacterMgr characterMgr = GameMain.Instance.CharacterMgr;
+            int maidCount = characterMgr.GetMaidCount();
+            for (int i = 0; i < maidCount; i++)
+            {
+                Maid maid = characterMgr.GetMaid(i);
+                if (maid != null && maid.isActiveAndEnabled && maid.Visible)
+                {
+                    list.Add(maid);
+                }
+            }
+            int stockMaidCount = characterMgr.GetStockMaidCount();
+            for (int j = 0; j < stockMaidCount; j++)
+            {
+                Maid stockMaid = characterMgr.GetStockMaid(j);
+                if (stockMaid != null && stockMaid.isActiveAndEnabled && stockMaid.Visible && !list.Contains(stockMaid))
+                {
+                    list.Add(stockMaid);
+                }
+            }
+            return list;
+        }
 
-		// Token: 0x06000007 RID: 7 RVA: 0x00002418 File Offset: 0x00000618
-		public static string GetSelectedMenuFileName(MPN? mpn, Maid maid)
-		{
-			string result = string.Empty;
-			if (mpn != null)
-			{
-				MPN? mpn2 = mpn;
-				MPN mpn3 = MPN.set_maidwear;
-				if (!(mpn2.GetValueOrDefault() == mpn3 & mpn2 != null))
-				{
-					mpn2 = mpn;
-					mpn3 = MPN.set_mywear;
-					if (!(mpn2.GetValueOrDefault() == mpn3 & mpn2 != null))
-					{
-						mpn2 = mpn;
-						mpn3 = MPN.set_underwear;
-						if (!(mpn2.GetValueOrDefault() == mpn3 & mpn2 != null))
-						{
-							result = maid.GetProp(mpn.Value).strFileName;
-						}
-					}
-				}
-			}
-			return result;
-		}
-	}
+        // Token: 0x06000007 RID: 7 RVA: 0x00002418 File Offset: 0x00000618
+        public static string GetSelectedMenuFileName(MPN? mpn, Maid maid)
+        {
+            string result = string.Empty;
+            if (mpn != null)
+            {
+                MPN? mpn2 = mpn;
+                MPN mpn3 = MPN.set_maidwear;
+                if (!(mpn2.GetValueOrDefault() == mpn3 & mpn2 != null))
+                {
+                    mpn2 = mpn;
+                    mpn3 = MPN.set_mywear;
+                    if (!(mpn2.GetValueOrDefault() == mpn3 & mpn2 != null))
+                    {
+                        mpn2 = mpn;
+                        mpn3 = MPN.set_underwear;
+                        if (!(mpn2.GetValueOrDefault() == mpn3 & mpn2 != null))
+                        {
+                            result = maid.GetProp(mpn.Value).strFileName;
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+
+        public static bool IsModKey(ModKey key)
+        {
+            switch (key)
+            {
+                case ModKey.Control: return Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl);
+                case ModKey.Alt: return Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt);
+                case ModKey.Shift: return Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift);
+                default: return false;
+            }
+        }
+
+    }
 }

COM3D2.PropMyItem.Plugin/PropMyItem.cs

@@ -10,6 +10,8 @@ using wf;
 
 namespace COM3D2.PropMyItem.Plugin
 {
+    using static CommonUtil;
+
     // Token: 0x0200000A RID: 10
     [PluginFilter("COM3D2x64")]
     [PluginFilter("COM3D2x86")]
@@ -204,7 +206,11 @@ namespace COM3D2.PropMyItem.Plugin
                     }
                 }
                 KeyCode keyCode = KeyCode.I;
-                if (EnumUtil.TryParse<KeyCode>(UserConfig.Instance.GuiVisibleKey, true, out keyCode) && UserConfig.Instance.IsControlKey == Event.current.control && UserConfig.Instance.IsAltKey == Event.current.alt && UserConfig.Instance.IsShiftKey == Event.current.shift && Event.current.keyCode == keyCode && Event.current.type == EventType.KeyUp)
+                if (EnumUtil.TryParse<KeyCode>(UserConfig.Instance.GuiVisibleKey, true, out keyCode)
+                    && UserConfig.Instance.IsControlKey == IsModKey(ModKey.Control)
+                    && UserConfig.Instance.IsAltKey == IsModKey(ModKey.Alt)
+                    && UserConfig.Instance.IsShiftKey == IsModKey(ModKey.Shift) && Input.GetKeyDown(keyCode)
+                )
                 {
                     if (_menuFilesReady)
                     {
@@ -662,7 +668,7 @@ namespace COM3D2.PropMyItem.Plugin
             float num = 200f;
             if (GUI.Button(new Rect(xPos, yPos, num, GuiStyles.ControlHeight), "プリセット保存", GuiStyles.ButtonStyle))
             {
-                List<Maid> visibleMaidList = CommonUtil.GetVisibleMaidList();
+                List<Maid> visibleMaidList = GetVisibleMaidList();
                 if (this._selectedMaid >= 0 && visibleMaidList.Count - 1 >= this._selectedMaid)
                 {
                     Maid f_maid = visibleMaidList[this._selectedMaid];