diff --git a/Live/CWX_AlarmChanger/AlarmChanger.cs b/Live/CWX_AlarmChanger/AlarmChanger.cs index 6da7835..e895691 100644 --- a/Live/CWX_AlarmChanger/AlarmChanger.cs +++ b/Live/CWX_AlarmChanger/AlarmChanger.cs @@ -15,6 +15,7 @@ namespace CWX_AlarmChanger CWX_GameObject = new GameObject("CWX_GameObject"); DontDestroyOnLoad(CWX_GameObject); CWX_Component = CWX_GameObject.AddComponent(); + DontDestroyOnLoad(CWX_Component); } public void Start() diff --git a/Live/CWX_AlarmChanger/AlarmChangerScript.cs b/Live/CWX_AlarmChanger/AlarmChangerScript.cs index 9720573..fa5e0bc 100644 --- a/Live/CWX_AlarmChanger/AlarmChangerScript.cs +++ b/Live/CWX_AlarmChanger/AlarmChangerScript.cs @@ -2,7 +2,6 @@ using System.IO; using System.Threading.Tasks; using System; -using EFT.Interactive; using UnityEngine.Networking; using UnityEngine; using System.Linq; diff --git a/Live/CWX_Mods.sln b/Live/CWX_Mods.sln index 884c826..e1b9ee2 100644 --- a/Live/CWX_Mods.sln +++ b/Live/CWX_Mods.sln @@ -21,7 +21,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CWX_AlarmChanger", "CWX_Ala EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test-layout", "test-layout\test-layout.csproj", "{CBDE7880-21AE-45AC-B216-D1061FD6A8A0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CWX_GrassCutter", "CWX_GrassCutter\CWX_GrassCutter.csproj", "{CC095831-11F9-4429-9A5C-BF60EF451E96}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CWX_GrassCutter", "CWX_GrassCutter\CWX_GrassCutter.csproj", "{CC095831-11F9-4429-9A5C-BF60EF451E96}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TraderScrolling", "TraderScrolling\TraderScrolling.csproj", "{C9FC19BC-2155-4900-B14D-2F16D13ED2DA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -69,6 +71,10 @@ Global {CC095831-11F9-4429-9A5C-BF60EF451E96}.Debug|Any CPU.Build.0 = Debug|Any CPU {CC095831-11F9-4429-9A5C-BF60EF451E96}.Release|Any CPU.ActiveCfg = Release|Any CPU {CC095831-11F9-4429-9A5C-BF60EF451E96}.Release|Any CPU.Build.0 = Release|Any CPU + {C9FC19BC-2155-4900-B14D-2F16D13ED2DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9FC19BC-2155-4900-B14D-2F16D13ED2DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9FC19BC-2155-4900-B14D-2F16D13ED2DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9FC19BC-2155-4900-B14D-2F16D13ED2DA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Live/TraderScrolling/TraderScrolling.cs b/Live/TraderScrolling/TraderScrolling.cs new file mode 100644 index 0000000..b877141 --- /dev/null +++ b/Live/TraderScrolling/TraderScrolling.cs @@ -0,0 +1,14 @@ +using BepInEx; +using System; + +namespace TraderScrolling +{ + [BepInPlugin("com.kaeno.TraderScrolling", "Kaeno-TraderScrolling", "1.0.0")] + public class TraderScrolling : BaseUnityPlugin + { + public void awake() + { + new TraderScrollingPatch().Enable(); + } + } +} diff --git a/Live/TraderScrolling/TraderScrolling.csproj b/Live/TraderScrolling/TraderScrolling.csproj new file mode 100644 index 0000000..4d19e99 --- /dev/null +++ b/Live/TraderScrolling/TraderScrolling.csproj @@ -0,0 +1,37 @@ + + + + net472 + + + + + ..\..\..\Shared\Aki.Reflection.dll + + + ..\..\..\Shared\Assembly-CSharp.dll + + + ..\..\..\Shared\BepInEx.dll + + + ..\..\..\Shared\Comfort.dll + + + ..\..\..\Shared\Newtonsoft.Json.dll + + + ..\..\..\Shared\UnityEngine.dll + + + ..\..\..\Shared\UnityEngine.CoreModule.dll + + + ..\..\..\Shared\UnityEngine.UI.dll + + + ..\..\..\Shared\UnityEngine.UIModule.dll + + + + diff --git a/Live/TraderScrolling/TraderScrollingPatch.cs b/Live/TraderScrolling/TraderScrollingPatch.cs new file mode 100644 index 0000000..2055939 --- /dev/null +++ b/Live/TraderScrolling/TraderScrollingPatch.cs @@ -0,0 +1,55 @@ +using Aki.Reflection.Patching; +using Aki.Reflection.Utils; +using EFT.UI; +using System.Linq; +using System.Reflection; +using UnityEngine; +using UnityEngine.UI; + +namespace TraderScrolling +{ + public class TraderScrollingPatch : ModulePatch + { + protected override MethodBase GetTargetMethod() + { + return typeof(TraderScreensGroup).GetMethod("method_4", PatchConstants.PrivateFlags); + } + + [PatchPostfix] + public static void PatchPostFix() + { + Debug.LogError("test 1"); + var traderCards = GameObject.Find("TraderCards"); + + Debug.LogError(traderCards); + var traderCardsRect = traderCards.RectTransform(); + Debug.LogError(traderCardsRect); + + traderCardsRect.anchorMax = new Vector2(1f, 1f); + traderCardsRect.anchorMin = new Vector2(0.385f, 1f); + + var menuUI = GameObject.Find("Menu UI"); + Debug.LogError(menuUI); + + var list = menuUI.GetComponentsInChildren(true).ToList(); + Debug.LogError(list.Count); + + var container = list.FirstOrDefault(x => x.name == "Container"); + Debug.LogError(container); + + var containerRect = container.RectTransform(); + Debug.LogError(containerRect); + + containerRect.anchorMin = new Vector2(1f, 1f); + containerRect.anchorMax = new Vector2(0.01f, 0f); + + var scrollrect = traderCards.AddComponent(); + Debug.LogError(scrollrect); + + scrollrect.content = traderCardsRect; + scrollrect.vertical = false; + scrollrect.movementType = ScrollRect.MovementType.Elastic; + scrollrect.viewport = containerRect; + } + } +} diff --git a/Live/TraderScrolling/TraderScrollingScript.cs b/Live/TraderScrolling/TraderScrollingScript.cs new file mode 100644 index 0000000..7872a3e --- /dev/null +++ b/Live/TraderScrolling/TraderScrollingScript.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TraderScrolling +{ + public class TraderScrollingScript + { + } +}