e

Next-Fast · Aug 13, 2023 · 6eb911d · 6eb911d
1 parent 480cdb0
commit 6eb911d
Show file tree

Hide file tree

Showing 89 changed files with 564 additions and 2,256 deletions.
diff --git a/FodyWeavers.xml b/FodyWeavers.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<student>
-  <Weavers>
-    <Costura>
-      <IncludeAssemblies>
-        Csv
-        Downloader
-      </IncludeAssemblies>
-    </Costura>
-  </Weavers>
-</student>
+<Weavers>
+  <Costura>
+    <IncludeAssemblies>
+      Csv
+      Downloader
+    </IncludeAssemblies>
+  </Costura>
+</Weavers>
diff --git a/NextShip/Buttons/ButtonBase.cs b/NextShip/Buttons/ButtonBase.cs
@@ -6,34 +6,26 @@ namespace NextShip.Buttons;
 
 public class ButtonBase
 {
-    public string name;
     public Action Action;
     public ActionButton ActionButton;
     public GameObject ButtonGameObject;
+    public string name;
     public string text;
 
     public ButtonBase()
     {
         ButtonGameObject = new GameObject(base.ToString());
     }
 
-    public ButtonBase Create(string name = "", GameObject clonetarget = null,ActionButton ActionButton = null, Action action = null)
+    public ButtonBase Create(string name = "", GameObject clonetarget = null, ActionButton ActionButton = null,
+        Action action = null)
     {
         this.name = name;
-        if (clonetarget != null)
-        {
-            ButtonGameObject = Object.Instantiate(clonetarget);
-        }
+        if (clonetarget != null) ButtonGameObject = Object.Instantiate(clonetarget);
 
-        if (action != null)
-        {
-            Action = action;
-        }
+        if (action != null) Action = action;
 
-        if (ActionButton != null)
-        {
-            this.ActionButton = ActionButton;
-        }
+        if (ActionButton != null) this.ActionButton = ActionButton;
         return this;
     }
 }
diff --git a/NextShip/Buttons/ButtonsManager.cs b/NextShip/Buttons/ButtonsManager.cs
@@ -4,6 +4,6 @@ namespace NextShip.Buttons;
 
 public class ButtonsManager
 {
-    public static List<ButtonBase> _AllButtons = new List<ButtonBase>();
-    public static List<RoleButton> _AllRoleButton = new List<RoleButton>();
+    public static List<ButtonBase> _AllButtons = new();
+    public static List<RoleButton> _AllRoleButton = new();
 }
diff --git a/NextShip/Buttons/RoleButtonBase.cs b/NextShip/Buttons/RoleButtonBase.cs
@@ -6,5 +6,4 @@ protected RoleButton()
     {
         Create();
     }
-
 }
diff --git a/NextShip/Chat/Commands.cs b/NextShip/Chat/Commands.cs
@@ -0,0 +1,32 @@
+using HarmonyLib;
+
+namespace NextShip.Chat;
+
+[HarmonyPatch]
+public static class Commands
+{
+    [HarmonyPatch(typeof(ChatController), nameof(ChatController.SendChat))]
+    private static class SendChatPatch
+    {
+        public static bool Prefix(ChatController __instance)
+        {
+            __instance.timeSinceLastMessage = 3f;
+            var text = __instance.freeChatField.Text;
+            var args = text.Split(' ');
+            var canceled = false;
+            var cancelVal = "";
+            switch (args[0])
+            {
+
+            }
+
+            if (canceled)
+            {
+                __instance.freeChatField.Clear();
+                __instance.freeChatField.textArea.SetText(cancelVal);
+            }
+
+            return !canceled;
+        }
+    }
+}
diff --git a/NextShip/Cosmetics/Patches/HatManagerPatch.cs b/NextShip/Cosmetics/Patches/HatManagerPatch.cs
@@ -1,69 +1,85 @@
 using System;
 using System.Collections.Generic;
 using HarmonyLib;
-using Exception = System.Exception;
 
 namespace NextShip.Patches;
 
 [HarmonyPatch(typeof(HatManager))]
 public static class HatManagerPatch
 {
-    public static List<HatViewData> AllCacheHatViewDatas = new();
-    public static List<NamePlateViewData> AllCacheNamePlateViewDatas = new();
-    public static List<SkinViewData> AllCacheSkinViewDatas = new();
-    public static List<VisorViewData> AllCacheVisorViewDatas = new();
-
-    public static bool initialized;
+    private static bool initialized = true;
 
     [HarmonyPatch(nameof(HatManager.Initialize))]
     [HarmonyPostfix]
     public static void InitHatCache(HatManager __instance)
     {
         if (initialized) return;
-
+
+        TaskUtils.StartTask(() => initialized = AllCosmeticsCache.StartCache(__instance));
+    }
+}
+
+public static class AllCosmeticsCache
+{
+    public static List<HatViewData> AllHatViewDatasCache = new();
+    public static List<NamePlateViewData> AllNamePlateViewDatasCache = new();
+    public static List<SkinViewData> AllSkinViewDatasCache = new();
+    public static List<VisorViewData> AllVisorViewDatasCache = new();
+    public static List<PetBehaviour> AllPetBehavioursCache = new();
+
+
+    public static bool StartCache(HatManager __instance)
+    {
         try
         {
-            __instance.allHats.Do(n => n.AddToChache());
-            __instance.allSkins.Do(n => n.AddToChache());
-            __instance.allVisors.Do(n => n.AddToChache());
-            __instance.allNamePlates.Do(n => n.AddToChache());
-            initialized = true;
+            __instance.allHats.Do(n => n.AddToCache());
+            __instance.allSkins.Do(n => n.AddToCache());
+            __instance.allVisors.Do(n => n.AddToCache());
+            __instance.allNamePlates.Do(n => n.AddToCache());
+            __instance.allPets.Do(n => n.AddToCache());
             Info("缓存成功");
+            return true;
         }
         catch (Exception e)
         {
             Exception(e);
             Error("缓存失败");
-            initialized = false;
+            return false;
         }
     }
-
 
-    public static void AddToChache(this HatData data)
+    private static void AddToCache(this HatData data)
+    {
+        var Asset = data.CreateAddressableAsset();
+        Asset.LoadAsync();
+        AllHatViewDatasCache.Add(Asset.GetAsset());
+    }
+
+    private static void AddToCache(this NamePlateData data)
     {
         var Asset = data.CreateAddressableAsset();
         Asset.LoadAsync();
-        AllCacheHatViewDatas.Add(Asset.GetAsset());
+        AllNamePlateViewDatasCache.Add(Asset.GetAsset());
     }
 
-    public static void AddToChache(this NamePlateData data)
+    private static void AddToCache(this VisorData data)
     {
         var Asset = data.CreateAddressableAsset();
         Asset.LoadAsync();
-        AllCacheNamePlateViewDatas.Add(Asset.GetAsset());
+        AllVisorViewDatasCache.Add(Asset.GetAsset());
     }
 
-    public static void AddToChache(this VisorData data)
+    private static void AddToCache(this SkinData data)
     {
         var Asset = data.CreateAddressableAsset();
         Asset.LoadAsync();
-        AllCacheVisorViewDatas.Add(Asset.GetAsset());
+        AllSkinViewDatasCache.Add(Asset.GetAsset());
     }
 
-    public static void AddToChache(this SkinData data)
+    private static void AddToCache(this PetData data)
     {
         var Asset = data.CreateAddressableAsset();
         Asset.LoadAsync();
-        AllCacheSkinViewDatas.Add(Asset.GetAsset());
+        AllPetBehavioursCache.Add(Asset.GetAsset());
     }
 }
diff --git a/NextShip/Game/GameEvents/GameEvent.cs b/NextShip/Game/GameEvents/GameEvent.cs
@@ -6,12 +6,18 @@ namespace NextShip.Game.GameEvents;
 [HarmonyPatch]
 public class GameEvent
 {
-    [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnGameEnd)), HarmonyPostfix]
+    [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnGameEnd))]
+    [HarmonyPostfix]
     public static void AmongUsClient_OnGameEnd(AmongUsClient __instance,
-        [HarmonyArgument(0)] EndGameResult endGameResult) =>
+        [HarmonyArgument(0)] EndGameResult endGameResult)
+    {
         GameEventListener.Start(nameof(IGameEvent.OnGameEnd), __instance, endGameResult);
-
-    [HarmonyPatch(typeof(GameStartManager), nameof(GameStartManager.Start)), HarmonyPostfix]
-    public static void GameStartManager_OnGameStart(GameStartManager __instance) =>
+    }
+
+    [HarmonyPatch(typeof(GameStartManager), nameof(GameStartManager.Start))]
+    [HarmonyPostfix]
+    public static void GameStartManager_OnGameStart(GameStartManager __instance)
+    {
         GameEventListener.Start(nameof(IGameEvent.OnGameStart), __instance);
+    }
 }
diff --git a/NextShip/Game/GameEvents/IGameEvent.cs b/NextShip/Game/GameEvents/IGameEvent.cs
@@ -2,18 +2,31 @@
 
 public interface IGameEvent
 {
-    public void OnPlayerJoined(AmongUsClient _amongUsClient) {}
-
-    public void OnPlayerLeft(AmongUsClient _amongUsClient) {}
+    public void OnPlayerJoined(AmongUsClient _amongUsClient)
+    {
+    }
 
-    public void OnGameStart(GameStartManager _gameStartManager) {}
-
-    public void OnCoBegin() {}
-
-    public void OnPlayerKill(PlayerControl murderer, PlayerControl target) {}
-
-    public void OnGameEnd(AmongUsClient __instance, EndGameResult endGameResult) {}
-
-    public void OnIntroCutscene(IntroCutscene _introCutscene) {}
-
+    public void OnPlayerLeft(AmongUsClient _amongUsClient)
+    {
+    }
+
+    public void OnGameStart(GameStartManager _gameStartManager)
+    {
+    }
+
+    public void OnCoBegin()
+    {
+    }
+
+    public void OnPlayerKill(PlayerControl murderer, PlayerControl target)
+    {
+    }
+
+    public void OnGameEnd(AmongUsClient __instance, EndGameResult endGameResult)
+    {
+    }
+
+    public void OnIntroCutscene(IntroCutscene _introCutscene)
+    {
+    }
 }
diff --git a/NextShip/Game/Info/HostInfo.cs b/NextShip/Game/Info/HostInfo.cs
@@ -2,9 +2,4 @@ namespace NextShip.Game.Info;
 
 public class HostInfo
 {
-    public HostInfo()
-    {
-
-    }
-}
-
+}
diff --git a/NextShip/Game/Info/PlayerInfo.cs b/NextShip/Game/Info/PlayerInfo.cs
@@ -4,10 +4,6 @@ namespace NextShip.Game.Info;
 
 public class PlayerInfo
 {
-    public PlayerInfo()
-    {
-
-    }
 }
 
 [HarmonyPatch(typeof(TaskPanelBehaviour), nameof(TaskPanelBehaviour.SetTaskText))]