diff --git a/AGENTS.md b/AGENTS.md index 6c8f691..d4fe4f8 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -51,7 +51,7 @@ ### Auto-cruise -- `PlayerPatch.AutoNavigation` is the only auto-cruise implementation. Its Harmony patches follow `AutoCruiseEnabled`; use auto-cruise terminology in user-facing text rather than the game's native autopilot terminology. +- `PlayerPatch.AutoNavigation` is the only auto-cruise implementation. Its Harmony patches follow `AutoCruiseEnabled`; use auto-cruise terminology in user-facing text rather than the game's native autopilot terminology. Keep persistent status and the current configured shortcut on the auto-cruise button, without a separate HUD label; fix its left edge so adaptive width grows rightward without overlapping the auto-construct button. - Use one navigation lifecycle path for target state and reusable obstacle data. Require a resolvable target, yield to `player.navigation.navigating`, and reject an active native autopilot before reporting that auto-cruise started. - Preserve native movement and braking conventions; manual warp input takes precedence. diff --git a/CheatEnabler/CHANGELOG.md b/CheatEnabler/CHANGELOG.md index 068bb5a..d4157f3 100644 --- a/CheatEnabler/CHANGELOG.md +++ b/CheatEnabler/CHANGELOG.md @@ -3,10 +3,9 @@ ## Changlog -* Unreleased - * Support Dyson Sphere Program 0.10.35.29057. See [compatibility analysis](../docs/GameCompatibility-0.10.35.md). - * Update `Terraform anyway` for the separate foundation and Restore Terrain workflows. Preserve soil gains and prevent negative soil balances when resources are insufficient. * 2.4.5 + * Support Dyson Sphere Program 0.10.35.29057. + * Update `Terraform anyway` for the separate foundation and Restore Terrain workflows. Preserve soil gains and prevent negative soil balances when resources are insufficient. * New button `Generate illegal dyson shells for all layers without nodes and shells`, which is used to extend dyson layers. * You must enable `IllegalDysonShellFunctionsEnabled` of `DysonSphere` section in config to see it. * `Finish build immediately`: Fix a crash when pasting a blueprint containing the first Planetary Shield Generator on a planet. @@ -195,6 +194,8 @@ ## 更新日志 * 2.4.5 + * 支持戴森球计划 0.10.35.29057。 + * 更新`强行改造地形`以适配独立地基和恢复地形的工作流程。在资源不足时保留沙土收益并防止负沙土平衡。 * 新按钮 `为所有没有节点和壳的层级生成仙术戴森壳`,用于扩展新戴森壳层面的时候。 * 你必须在设置文件里开启`DysonSphere`分类的`IllegalDysonShellFunctionsEnabled`才能看到它。 * `立即完成建造`:修复在行星上粘贴包含首座行星护盾发生器的蓝图时可能崩溃的问题。 diff --git a/CheatEnabler/CheatEnabler.csproj b/CheatEnabler/CheatEnabler.csproj index e49e019..2d9015f 100644 --- a/CheatEnabler/CheatEnabler.csproj +++ b/CheatEnabler/CheatEnabler.csproj @@ -3,7 +3,7 @@ org.soardev.cheatenabler DSP MOD - CheatEnabler - 2.4.4 + 2.4.5 CheatEnabler CheatEnabler true diff --git a/CheatEnabler/package/manifest.json b/CheatEnabler/package/manifest.json index 3fd8bb4..0fa952e 100644 --- a/CheatEnabler/package/manifest.json +++ b/CheatEnabler/package/manifest.json @@ -1,6 +1,6 @@ { "name": "CheatEnabler", - "version_number": "2.4.4", + "version_number": "2.4.5", "website_url": "https://github.com/soarqin/DSP_Mods/tree/master/CheatEnabler", "description": "Add various cheat functions while disabling abnormal determinants / 添加一些作弊功能,同时屏蔽异常检测", "dependencies": [ diff --git a/UXAssist/CHANGELOG.md b/UXAssist/CHANGELOG.md index 613ac2a..18e6b06 100644 --- a/UXAssist/CHANGELOG.md +++ b/UXAssist/CHANGELOG.md @@ -3,8 +3,15 @@ ## Changlog -* Unreleased - * Support Dyson Sphere Program 0.10.35.29057. See [compatibility analysis](../docs/GameCompatibility-0.10.35.md). +* 1.6.0 + * Support Dyson Sphere Program 0.10.35.29057. + * New feature: `Orbital Collector product limit`, with an `Apply to universe` option. + * `Auto-cruise`: Reworked navigation with a new algorithm and more options: + * `Stop on manual input`, `Use warp` (with minimum energy), `Auto boost` (with minimum energy), `Dark Fog Hive follow distance` and `Dark Fog Carrier follow distance`. + * The button now shows the configured shortcut key and active status, replacing the separate on-screen hint. + * `Auto-construct`: Improved routing, obstacle recovery, and drone travel efficiency. + * `Tweak building buffers`: Now shows original in-game default values for reference. + * Fix UI color issues on some panels and controls. * Restore expanded foundation brushes, Restore Terrain support, and player actions in globe view. * Update Ray Receiver buffers and item refunds, vein-depletion alerts, handcrafting shortcuts, and batch technology buyout controls. * Preserve soil progression when hiding soil-change tips and safely restore saved brush sizes when expanded brushes are disabled. @@ -408,6 +415,18 @@ ## 更新日志 +* 1.6.0 + * 支持戴森球计划 0.10.35.29057。 + * 新功能:`轨道采集器产物上限`,支持`应用到全宇宙`。 + * `自动巡航`:重写了导航算法并新增更多选项: + * `手动输入时停止`、`启用曲速`(含最低能量)、`自动加速`(含最低能量)、`黑雾巢穴跟踪距离`和`黑雾火种跟踪距离`。 + * 按钮上显示当前快捷键和状态,不再显示单独的屏幕提示。 + * `自动建造`:改进了路径规划、障碍恢复和运输效率。 + * `调整建筑输入缓冲`:现在显示游戏内原始默认值供参考。 + * 修复部分面板和控件的显示颜色问题。 + * 恢复扩展地基刷子、恢复地形支持以及球面视图中的玩家操作。 + * 更新射线接收器缓存和物品返还、矿脉枯竭提醒、手动制造快捷键以及批量购买科技控件。 + * 隐藏沙土变动提示时保留沙土进度,禁用扩展刷子时安全恢复已保存的刷子大小。 * 1.5.9 * `不渲染工厂建筑实体(除了传送带和分拣器)`:新增子选项`同时隐藏分拣器`,可一并隐藏分拣器,只保留传送带可见。 * 1.5.8 diff --git a/UXAssist/Common/I18NKeys.cs b/UXAssist/Common/I18NKeys.cs index 587057c..8e50d4a 100644 --- a/UXAssist/Common/I18NKeys.cs +++ b/UXAssist/Common/I18NKeys.cs @@ -160,8 +160,6 @@ public static class I18NKeys public const string AutoBoostMinimalEnergy = "Auto boost minimal energy"; public const string DarkFogHiveFollowDistance = "Dark Fog Hive follow distance"; public const string DarkFogCarrierFollowDistance = "Dark Fog Carrier follow distance"; - public const string AutoCruiseActive = "Auto-cruise active"; - public const string AutoCruiseEnableHint = "Press {0} to enable auto-cruise"; public const string AutoCruiseStarted = "Auto-cruise started"; public const string AutoCruiseStopped = "Auto-cruise stopped"; public const string AutoCruiseNoTarget = "Auto-cruise needs a navigation target"; @@ -425,8 +423,6 @@ You can set 2 shortcut keys in Settings panel: I18N.Add(AutoBoostMinimalEnergy, "Minimum energy for auto boost (MJ)", "自动加速最低能量(MJ)"); I18N.Add(DarkFogHiveFollowDistance, "Dark Fog Hive follow distance (AU)", "黑雾巢穴跟踪距离(AU)"); I18N.Add(DarkFogCarrierFollowDistance, "Dark Fog Carrier follow distance (m)", "黑雾火种跟踪距离(m)"); - I18N.Add(AutoCruiseActive, "Auto-cruise active", "自动巡航中"); - I18N.Add(AutoCruiseEnableHint, "Press {0} to enable auto-cruise", "按 {0} 启用自动巡航"); I18N.Add(AutoCruiseStarted, "Auto-cruise started", "自动巡航启动"); I18N.Add(AutoCruiseStopped, "Auto-cruise stopped", "自动巡航关闭"); I18N.Add(AutoCruiseNoTarget, "Auto-cruise needs a navigation target", "自动巡航需要先设置导航目标"); diff --git a/UXAssist/Functions/UI/AutoCruiseUI.cs b/UXAssist/Functions/UI/AutoCruiseUI.cs index e2899a3..ec58732 100644 --- a/UXAssist/Functions/UI/AutoCruiseUI.cs +++ b/UXAssist/Functions/UI/AutoCruiseUI.cs @@ -1,6 +1,7 @@ using UnityEngine; using UXAssist.Common; using UXAssist.UI; +using Util = UXAssist.UI.Util; namespace UXAssist.Functions.UI; @@ -12,7 +13,6 @@ internal static class AutoCruiseUI { if (Time.frameCount % 30 == 0) { - Patches.PlayerPatch.AutoNavigation.UpdateUiTip(); UpdateToggleAutoCruiseCheckButtonVisiblility(); } } @@ -24,13 +24,13 @@ internal static class AutoCruiseUI var rectTrans = ToggleAutoCruise.rectTrans; rectTrans.anchorMax = new Vector2(0.5f, 0f); rectTrans.anchorMin = new Vector2(0.5f, 0f); - rectTrans.pivot = new Vector2(0.5f, 0f); - rectTrans.anchoredPosition3D = new Vector3(0f, 185f, 0f); + rectTrans.pivot = new Vector2(0f, 0f); + rectTrans.anchoredPosition3D = new Vector3(-80f, 185f, 0f); rectTrans.localScale = new Vector3(1f, 1f, 1f); UpdateToggleAutoCruiseCheckButtonVisiblility(); - ToggleAutoCruise.OnChecked += UpdateToggleAutoCruiseLabel; ToggleAutoCruise.OnChecked += Patches.PlayerPatch.AutoNavigation.Toggle; + ToggleAutoCruise.OnChecked += UpdateToggleAutoCruiseCheckButtonVisiblility; } public static void UpdateToggleAutoCruiseCheckButtonVisiblility() @@ -49,8 +49,10 @@ internal static class AutoCruiseUI private static void UpdateToggleAutoCruiseLabel() { if (ToggleAutoCruise == null) return; - ToggleAutoCruise.SetLabelText(ToggleAutoCruise.Checked + var labelKey = ToggleAutoCruise.Checked ? I18NKeys.DisableAutoCruise - : I18NKeys.EnableAutoCruise); + : I18NKeys.EnableAutoCruise; + ToggleAutoCruise.SetLabelText($"{labelKey.Translate()} [{Patches.PlayerPatch.AutoNavigation.ShortcutText}]"); + ToggleAutoCruise.WithSize(Mathf.Max(160f, Util.GetPreferredWidth(ToggleAutoCruise.labelText) + 20f), 40f); } } diff --git a/UXAssist/Patches/PlayerPatch.cs b/UXAssist/Patches/PlayerPatch.cs index a29c07c..1d7bb7a 100644 --- a/UXAssist/Patches/PlayerPatch.cs +++ b/UXAssist/Patches/PlayerPatch.cs @@ -6,10 +6,8 @@ using BepInEx.Configuration; using CommonAPI.Systems; using HarmonyLib; using UnityEngine; -using UnityEngine.UI; using UXAssist.Common; using UXAssist.Common.Patching; -using Object = UnityEngine.Object; namespace UXAssist.Patches; @@ -346,7 +344,6 @@ public class PlayerPatch : PatchImpl private const double StarApproachArrivalSpeed = 300.0; private static bool _enabled; - private static Text _uiTipText; private static int _targetId; private static VectorLF3 _targetUniversePosition; @@ -363,24 +360,17 @@ public class PlayerPatch : PatchImpl public static bool IsActive => _enabled; + internal static string ShortcutText => KeyBindings.GetKeyBindingText(_autoDriveKey); protected override void OnEnable() { - EnsureUiTip(); - global::UXAssist.Common.GameLogic.OnGameBegin += EnsureUiTip; global::UXAssist.Common.GameLogic.OnGameEnd += ResetState; } protected override void OnDisable() { - global::UXAssist.Common.GameLogic.OnGameBegin -= EnsureUiTip; global::UXAssist.Common.GameLogic.OnGameEnd -= ResetState; ResetState(); - if (_uiTipText != null) - { - Object.Destroy(_uiTipText.gameObject); - _uiTipText = null; - } } public static void Awake(ConfigFile config) @@ -422,23 +412,6 @@ public class PlayerPatch : PatchImpl AutoCruiseEnabled.SettingChanged += NavigationModeChanged; } - public static void EnsureUiTip() - { - if (_uiTipText != null) - { - UpdateUiTip(); - return; - } - if (UIRoot.instance?.uiGame?.generalTips?.modeText == null) - return; - Text originText = UIRoot.instance.uiGame.generalTips.modeText; - _uiTipText = Object.Instantiate(originText, originText.transform.parent); - _uiTipText.gameObject.SetActive(false); - _uiTipText.rectTransform.anchoredPosition = new Vector2(0f, 160f); - _uiTipText.fontStyle = FontStyle.Normal; - UpdateUiTip(); - } - public static void Toggle() { if (!AutoCruiseEnabled.Value) @@ -469,7 +442,7 @@ public class PlayerPatch : PatchImpl _enabled = true; ResetTargetState(); UIRealtimeTip.Popup(I18NKeys.AutoCruiseStarted.Translate(), sound: false); - UpdateUiTip(); + global::UXAssist.Functions.UIFunctions.UpdateToggleAutoCruiseCheckButtonVisiblility(); } private static void StopAutoNavigation(bool showTip = true) @@ -479,7 +452,7 @@ public class PlayerPatch : PatchImpl ResetTargetState(); if (wasEnabled && showTip && !DSPGame.IsMenuDemo && GameMain.isRunning) UIRealtimeTip.Popup(I18NKeys.AutoCruiseStopped.Translate(), sound: false); - UpdateUiTip(); + global::UXAssist.Functions.UIFunctions.UpdateToggleAutoCruiseCheckButtonVisiblility(); } private static void ResetTargetState() @@ -509,26 +482,9 @@ public class PlayerPatch : PatchImpl // Follow the config with the Harmony patches themselves, so a user who turns auto-cruise off // does not keep a transpiler on PlayerController.GameTick and two postfixes installed. Enable(AutoCruiseEnabled.Value); - if (AutoCruiseEnabled.Value) - UpdateUiTip(); global::UXAssist.Functions.UIFunctions.UpdateToggleAutoCruiseCheckButtonVisiblility(); } - public static void UpdateUiTip() - { - if (_uiTipText == null) - return; - - bool showTip = GameMain.isRunning && !DSPGame.IsMenuDemo && AutoCruiseEnabled.Value && (_enabled || HasNavigationTarget()); - _uiTipText.gameObject.SetActive(showTip); - if (!showTip) - return; - - _uiTipText.text = _enabled - ? I18NKeys.AutoCruiseActive.Translate() - : string.Format(I18NKeys.AutoCruiseEnableHint.Translate(), KeyBindings.GetKeyBindingText(_autoDriveKey)); - } - public static bool HasNavigationTarget() { Player player = GameMain.mainPlayer; diff --git a/UXAssist/UXAssist.csproj b/UXAssist/UXAssist.csproj index 0e6d2a6..743e7b3 100644 --- a/UXAssist/UXAssist.csproj +++ b/UXAssist/UXAssist.csproj @@ -3,7 +3,7 @@ org.soardev.uxassist DSP MOD - UXAssist - 1.5.9 + 1.6.0 UXAssist UXAssist true diff --git a/UXAssist/package/manifest.json b/UXAssist/package/manifest.json index 93c4105..62ac9cf 100644 --- a/UXAssist/package/manifest.json +++ b/UXAssist/package/manifest.json @@ -1,6 +1,6 @@ { "name": "UXAssist", - "version_number": "1.5.9", + "version_number": "1.6.0", "website_url": "https://github.com/soarqin/DSP_Mods/tree/master/UXAssist", "description": "Some functions and patches for better user experience / 一些提升用户体验的功能和补丁", "dependencies": [