Fixed ClassScheduleMenu action point being visible in h scenes

IllusionMods · Feb 28, 2021 · b9a5e65 · b9a5e65
1 parent b44214c
commit b9a5e65
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/src/KK_Fix_RestoreMissingFunctions/CalendarIcon/CalendarIconHooks.cs b/src/KK_Fix_RestoreMissingFunctions/CalendarIcon/CalendarIconHooks.cs
@@ -89,16 +89,24 @@ private static void SpawnCrestActionPoint()
 
                 var player = Singleton<Game>.Instance.actScene.Player;
                 evt.UpdateAsObservable()
-                    .Where(_ => playerInRange && ActionInput.isAction && !player.isActionNow && !Singleton<Scene>.Instance.IsNowLoadingFade)
                     .Subscribe(_ =>
                     {
-                        Singleton<Scene>.Instance.LoadReserve(new Scene.Data
+                        // Hide in H scenes and other places
+                        var isVisible = Singleton<Game>.IsInstance() && !Singleton<Game>.Instance.IsRegulate(true);
+                        if (rendererIcon.enabled != isVisible) 
+                            rendererIcon.enabled = isVisible;
+
+                        // Check if player clicked this point
+                        if (isVisible && playerInRange && ActionInput.isAction && !player.isActionNow && !Singleton<Scene>.Instance.IsNowLoadingFade)
                         {
-                            assetBundleName = "action/menu/classschedulemenu.unity3d",
-                            levelName = "ClassScheduleMenu",
-                            isAdd = true,
-                            isAsync = true
-                        }, false);
+                            Singleton<Scene>.Instance.LoadReserve(new Scene.Data
+                            {
+                                assetBundleName = "action/menu/classschedulemenu.unity3d",
+                                levelName = "ClassScheduleMenu",
+                                isAdd = true,
+                                isAsync = true
+                            }, false);
+                        }
                     })
                     .AddTo(evt);
             }