* [KK, EC] Fixed rare issue where the search wouldn't work (thanks to…

… Madevil for reporting) * [AI, HS2] Fixed search bar not appearing when switching into chara with 1st accessory set
Mantas-2155X · Jul 23, 2020 · 65c883a · 65c883a
1 parent 5edafc3
commit 65c883a
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 7 deletions.
diff --git a/AI_MakerSearch/AI_MakerSearch.cs b/AI_MakerSearch/AI_MakerSearch.cs
@@ -17,7 +17,7 @@ namespace AI_MakerSearch
     [BepInPlugin(nameof(AI_MakerSearch), nameof(AI_MakerSearch), VERSION)]
     public class AI_MakerSearch : BaseUnityPlugin
     {
-        public const string VERSION = "1.1.0";
+        public const string VERSION = "1.1.1";
 
         public static bool isSteam;
         public static string searchString;

diff --git a/AI_MakerSearch/Hooks.cs b/AI_MakerSearch/Hooks.cs
@@ -49,6 +49,8 @@ private static void CustomChangeMainMenu_ChangeWindowSetting_SetMainCat(int no)
                 case 4:
                     AI_MakerSearch.category = Tools.SearchCategory.Accessories;
                     AI_MakerSearch.controller = Traverse.Create(AI_MakerSearch.cvsAccessories).Field("sscAcs").GetValue<CustomSelectScrollController>();
+
+                    Tools.fields[2].gameObject.SetActive(!Traverse.Create(AI_MakerSearch.cvsAccessories).Field("tglType").GetValue<Toggle[]>()[0].isOn);
                     break;
                 case 5:
                     AI_MakerSearch.category = Tools.SearchCategory.Extra;

diff --git a/EC_MakerSearch/EC_MakerSearch.cs b/EC_MakerSearch/EC_MakerSearch.cs
@@ -14,7 +14,7 @@ namespace EC_MakerSearch
     [BepInPlugin(nameof(EC_MakerSearch), nameof(EC_MakerSearch), VERSION)]
     public class EC_MakerSearch : BaseUnityPlugin
     {
-        public const string VERSION = "1.1.0";
+        public const string VERSION = "1.1.1";
 
         public static string searchString;
 

diff --git a/EC_MakerSearch/Hooks.cs b/EC_MakerSearch/Hooks.cs
@@ -17,7 +17,8 @@ private static void CustomSelectListCtrl_UpdateStateNew_ChangeController(CustomS
         {
             Tools.ResetSearch();
 
-            EC_MakerSearch.ctrl = __instance;
+            if(__instance.canvasGrp[0].interactable)
+                EC_MakerSearch.ctrl = __instance;
         }
 
         [HarmonyPostfix, HarmonyPatch(typeof(CustomAcsSelectKind), "UpdateCustomUI")]

diff --git a/HS2_MakerSearch/HS2_MakerSearch.cs b/HS2_MakerSearch/HS2_MakerSearch.cs
@@ -16,7 +16,7 @@ namespace HS2_MakerSearch
     [BepInPlugin(nameof(HS2_MakerSearch), nameof(HS2_MakerSearch), VERSION)]
     public class HS2_MakerSearch : BaseUnityPlugin
     {
-        public const string VERSION = "1.1.0";
+        public const string VERSION = "1.1.1";
 
         public static string searchString;
 

diff --git a/HS2_MakerSearch/Hooks.cs b/HS2_MakerSearch/Hooks.cs
@@ -49,6 +49,8 @@ private static void CustomChangeMainMenu_ChangeWindowSetting_SetMainCat(int no)
                 case 4:
                     HS2_MakerSearch.category = Tools.SearchCategory.Accessories;
                     HS2_MakerSearch.controller = Traverse.Create(HS2_MakerSearch.cvsAccessories).Field("sscAcs").GetValue<CustomSelectScrollController>();
+
+                    Tools.fields[2].gameObject.SetActive(!Traverse.Create(HS2_MakerSearch.cvsAccessories).Field("tglType").GetValue<Toggle[]>()[0].isOn);
                     break;
                 case 5:
                     HS2_MakerSearch.category = Tools.SearchCategory.Extra;

diff --git a/KK_MakerSearch/Hooks.cs b/KK_MakerSearch/Hooks.cs
@@ -17,7 +17,8 @@ private static void CustomSelectListCtrl_UpdateStateNew_ChangeController(CustomS
         {
             Tools.ResetSearch();
 
-            KK_MakerSearch.ctrl = __instance;
+            if(__instance.canvasGrp[0].interactable)
+                KK_MakerSearch.ctrl = __instance;
         }
 
         [HarmonyPostfix, HarmonyPatch(typeof(CustomAcsSelectKind), "UpdateCustomUI")]

diff --git a/KK_MakerSearch/KK_MakerSearch.cs b/KK_MakerSearch/KK_MakerSearch.cs
@@ -15,7 +15,7 @@ namespace KK_MakerSearch
     [BepInPlugin(nameof(KK_MakerSearch), nameof(KK_MakerSearch), VERSION)]
     public class KK_MakerSearch : BaseUnityPlugin
     {
-        public const string VERSION = "1.1.0";
+        public const string VERSION = "1.1.1";
 
         public static string searchString;
 

diff --git a/PH_MakerSearch/PH_MakerSearch.cs b/PH_MakerSearch/PH_MakerSearch.cs
@@ -13,7 +13,7 @@ namespace PH_MakerSearch
     [BepInPlugin(nameof(PH_MakerSearch), nameof(PH_MakerSearch), VERSION)]
     public class PH_MakerSearch : BaseUnityPlugin
     {
-        public const string VERSION = "1.1.0";
+        public const string VERSION = "1.1.1";
 
         public static string searchString;