New UI and Fix

Author: FangkuaiYa

README.md

@@ -180,7 +180,7 @@ Thanks to miniduikboot & GD for hosting modded servers (and so much more)
 [Ninja](#ninja), [Thief](#thief), [Lawyer](#lawyer) / [Pursuer](#pursuer), [Deputy](#deputy), [Portalmaker](#portalmaker), [Guesser Modifier](#guesser-modifier) - Idea: [K3ndo](https://github.com/K3ndoo) ; Developed by [Gendelo](https://github.com/gendelo3) & [Mallöris](https://github.com/Mallaris) \
 [ugackMiner53](https://github.com/ugackMiner53/PropHunt) - Idea and core code for the Prop Hunt game mode
 Role Draft Music: [Unreal Superhero 3 by Kenët & Rez](https://www.youtube.com/watch?v=9STiQ8cCIo0)
-[TheOtherRolesGMIA](https://github.com/dabao40/TheOtherRolesGMIA) - Meta Context from **Imp11**.\
+[TheOtherRolesGMIA](https://github.com/dabao40/TheOtherRolesGMIA) - Some code from **Imp11**.\
 
 # Settings
 The mod adds a few new settings to Among Us (in addition to the role settings):

TheOtherRoles/Helpers.cs

@@ -903,39 +903,6 @@ public static Vector3 WorldToScreenPoint(Vector3 worldPos, int cameraLayer)
     {
         return FindCamera(cameraLayer)?.WorldToScreenPoint(worldPos) ?? Vector3.zero;
     }
-
-    public static Vector3 ScreenToWorldPoint(Vector3 screenPos, int cameraLayer)
-    {
-        return FindCamera(cameraLayer)?.ScreenToWorldPoint(screenPos) ?? Vector3.zero;
-    }
-
-    public static PassiveButton SetUpButton(this GameObject gameObject, bool withSound = false,
-        SpriteRenderer buttonRenderer = null, Color? defaultColor = null, Color? selectedColor = null)
-    {
-        var button = gameObject.AddComponent<PassiveButton>();
-        button.OnClick = new Button.ButtonClickedEvent();
-        button.OnMouseOut = new UnityEvent();
-        button.OnMouseOver = new UnityEvent();
-
-        if (withSound)
-        {
-            button.OnClick.AddListener((Action)(() =>
-                SoundManager.Instance.PlaySound(VanillaAsset.SelectClip, false, 0.8f)));
-            button.OnMouseOver.AddListener((Action)(() =>
-                SoundManager.Instance.PlaySound(VanillaAsset.HoverClip, false, 0.8f)));
-        }
-
-        if (buttonRenderer != null)
-        {
-            button.OnMouseOut.AddListener((Action)(() => buttonRenderer!.color = defaultColor ?? Color.white));
-            button.OnMouseOver.AddListener((Action)(() => buttonRenderer!.color = selectedColor ?? Color.green));
-        }
-
-        if (buttonRenderer != null) buttonRenderer.color = defaultColor ?? Color.white;
-
-        return button;
-    }
-
     public static SpriteRenderer CreateSharpBackground(Vector2 size, Color color, Transform transform)
     {
         var renderer = CreateObject<SpriteRenderer>("Background", transform, new Vector3(0, 0, 0.25f));
@@ -1032,4 +999,22 @@ public static bool isChinese()
             return false;
         }
     }
+    public interface Image
+    {
+        internal Sprite GetSprite();
+    }
+    public interface ISpriteLoader : Image
+    {
+    }
+    public class WrapSpriteLoader : ISpriteLoader
+    {
+        Func<Sprite> supplier;
+
+        public WrapSpriteLoader(Func<Sprite> supplier)
+        {
+            this.supplier = supplier;
+        }
+
+        public Sprite GetSprite() => supplier.Invoke();
+    }
 }

TheOtherRoles/Main.cs

@@ -19,7 +19,6 @@
 using InnerNet;
 using Reactor.Networking;
 using Reactor.Networking.Attributes;
-using TheOtherRoles.MetaContext;
 using TheOtherRoles.Modules;
 using TheOtherRoles.Modules.CustomHats;
 using TheOtherRoles.Patches;
@@ -155,10 +154,6 @@ public override void Load()
         MainMenuPatch.addSceneChangeCallbacks();
         _ = RoleInfo.loadReadme();
         AddToKillDistanceSetting.addKillDistance();
-        SceneManager.sceneLoaded += (UnityAction<Scene, LoadSceneMode>)((scene, loadMode) =>
-        {
-            new GameObject("TORManager").AddComponent<TORGUIManager>();
-        });
         Logger.LogInfo("Loading TOR completed!");
     }
 }