From c8d4462c183f7336751c06295106423269bf28a2 Mon Sep 17 00:00:00 2001 From: kmyuhkyuk <2451614940@qq.com> Date: Wed, 31 Aug 2022 23:12:17 +0800 Subject: [PATCH] Update --- SkinHide/Patches/PlayerModelViewPatch.cs | 2 +- SkinHide/Patches/PlayerPatch.cs | 4 +- SkinHide/Properties/AssemblyInfo.cs | 4 +- SkinHide/SkinHidePlugin.cs | 51 +++++++++++++----------- 4 files changed, 33 insertions(+), 28 deletions(-) diff --git a/SkinHide/Patches/PlayerModelViewPatch.cs b/SkinHide/Patches/PlayerModelViewPatch.cs index d83a4c5..2e86ea0 100644 --- a/SkinHide/Patches/PlayerModelViewPatch.cs +++ b/SkinHide/Patches/PlayerModelViewPatch.cs @@ -19,7 +19,7 @@ namespace SkinHide.Patches { await __result; - SkinHidePlugin.PlayerModelView = __instance.GetComponentInChildren(); + SkinHidePlugin.PlayerModelView = __instance.PlayerBody; } } } diff --git a/SkinHide/Patches/PlayerPatch.cs b/SkinHide/Patches/PlayerPatch.cs index 202c012..bb69f40 100644 --- a/SkinHide/Patches/PlayerPatch.cs +++ b/SkinHide/Patches/PlayerPatch.cs @@ -20,11 +20,11 @@ namespace SkinHide.Patches if (__instance.IsYourPlayer) { - SkinHidePlugin.Player = __instance.GetComponentInChildren(); + SkinHidePlugin.Player = __instance.PlayerBody; } else { - SkinHidePlugin.Bot.Add(__instance.GetComponentInChildren()); + SkinHidePlugin.Bot.Add(__instance.PlayerBody); } } } diff --git a/SkinHide/Properties/AssemblyInfo.cs b/SkinHide/Properties/AssemblyInfo.cs index 03ebdb8..81251b7 100644 --- a/SkinHide/Properties/AssemblyInfo.cs +++ b/SkinHide/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.3.0")] -[assembly: AssemblyFileVersion("1.2.3.0")] +[assembly: AssemblyVersion("1.2.4.0")] +[assembly: AssemblyFileVersion("1.2.4.0")] diff --git a/SkinHide/SkinHidePlugin.cs b/SkinHide/SkinHidePlugin.cs index 39562ad..a8c98e3 100644 --- a/SkinHide/SkinHidePlugin.cs +++ b/SkinHide/SkinHidePlugin.cs @@ -10,7 +10,7 @@ using SkinHide.Patches; namespace SkinHide { - [BepInPlugin("com.kmyuhkyuk.SkinHide", "kmyuhkyuk-SkinHide", "1.2.3")] + [BepInPlugin("com.kmyuhkyuk.SkinHide", "kmyuhkyuk-SkinHide", "1.2.4")] public class SkinHidePlugin : BaseUnityPlugin { public static PlayerBody Player; @@ -19,6 +19,8 @@ namespace SkinHide public static List Bot = new List(); + private SettingsData settingsdata = new SettingsData(); + public enum Part { All, @@ -26,15 +28,6 @@ namespace SkinHide SkinDress } - public static ConfigEntry KeyPlayerSkinHide; - public static ConfigEntry KeyBotSkinHide; - - public static ConfigEntry KeyPlayerSkinHidePart; - public static ConfigEntry KeyBotSkinHidePart; - - public static ConfigEntry KBSPlayerSkinHide; - public static ConfigEntry KBSBotSkinHide; - private void Start() { Logger.LogInfo("Loaded: kmyuhkyuk-SkinHide"); @@ -43,14 +36,14 @@ namespace SkinHide string SkinHidePartSettings = "隐藏部分设置 Skin Hide Part Settings"; string KBSSettings = "快捷键设置 Keyboard Shortcut Settings"; - KeyPlayerSkinHide = Config.Bind(SkinHideSettings, "玩家服装隐藏 Player Skin Hide", false); - KeyBotSkinHide = Config.Bind(SkinHideSettings, "Bot服装隐藏 Bot Skin Hide", false); + settingsdata.KeyPlayerSkinHide = Config.Bind(SkinHideSettings, "玩家服装隐藏 Player Skin Hide", false); + settingsdata.KeyBotSkinHide = Config.Bind(SkinHideSettings, "Bot服装隐藏 Bot Skin Hide", false); - KeyPlayerSkinHidePart = Config.Bind(SkinHidePartSettings, "Player", Part.All); - KeyBotSkinHidePart = Config.Bind(SkinHidePartSettings, "Bot", Part.All); + settingsdata.KeyPlayerSkinHidePart = Config.Bind(SkinHidePartSettings, "Player", Part.All); + settingsdata.KeyBotSkinHidePart = Config.Bind(SkinHidePartSettings, "Bot", Part.All); - KBSPlayerSkinHide = Config.Bind(KBSSettings, "玩家服装隐藏快捷键 Player Skin Hide", KeyboardShortcut.Empty); - KBSBotSkinHide = Config.Bind(KBSSettings, "Bot服装隐藏快捷键 Bot Skin Hide", KeyboardShortcut.Empty); + settingsdata.KBSPlayerSkinHide = Config.Bind(KBSSettings, "玩家服装隐藏快捷键 Player Skin Hide", KeyboardShortcut.Empty); + settingsdata.KBSBotSkinHide = Config.Bind(KBSSettings, "Bot服装隐藏快捷键 Bot Skin Hide", KeyboardShortcut.Empty); new PlayerModelViewPatch().Enable(); new PlayerPatch().Enable(); @@ -58,25 +51,25 @@ namespace SkinHide void Update() { - if (KBSPlayerSkinHide.Value.IsDown()) + if (settingsdata.KBSPlayerSkinHide.Value.IsDown()) { - KeyPlayerSkinHide.Value = !KeyPlayerSkinHide.Value; + settingsdata.KeyPlayerSkinHide.Value = !settingsdata.KeyPlayerSkinHide.Value; } - if (KBSBotSkinHide.Value.IsDown()) + if (settingsdata.KBSBotSkinHide.Value.IsDown()) { - KeyBotSkinHide.Value = !KeyBotSkinHide.Value; + settingsdata.KeyBotSkinHide.Value = !settingsdata.KeyBotSkinHide.Value; } //PlayerModelView Skin Hide if (PlayerModelView != null) { - Hide(PlayerModelView, KeyPlayerSkinHidePart.Value, KeyPlayerSkinHide.Value); + Hide(PlayerModelView, settingsdata.KeyPlayerSkinHidePart.Value, settingsdata.KeyPlayerSkinHide.Value); } //Player Skin Hide if (Player != null) { - Hide(Player, KeyPlayerSkinHidePart.Value, KeyPlayerSkinHide.Value); + Hide(Player, settingsdata.KeyPlayerSkinHidePart.Value, settingsdata.KeyPlayerSkinHide.Value); } else { @@ -88,7 +81,7 @@ namespace SkinHide { foreach (PlayerBody bot in Bot) { - Hide(bot, KeyBotSkinHidePart.Value, KeyBotSkinHide.Value); + Hide(bot, settingsdata.KeyBotSkinHidePart.Value, settingsdata.KeyBotSkinHide.Value); } } } @@ -134,5 +127,17 @@ namespace SkinHide break; } } + + public class SettingsData + { + public ConfigEntry KeyPlayerSkinHide; + public ConfigEntry KeyBotSkinHide; + + public ConfigEntry KeyPlayerSkinHidePart; + public ConfigEntry KeyBotSkinHidePart; + + public ConfigEntry KBSPlayerSkinHide; + public ConfigEntry KBSBotSkinHide; + } } } \ No newline at end of file