soarqin/DSP_Mods
1
0
Fork 0
mirror of https://github.com/soarqin/DSP_Mods.git synced 2026-02-05 01:42:25 +08:00
Code Activity

Compare commits

base: soarqin:ed8d7d61ff651d4096ff014ed801b17a0376a90e
Branches Tags
soarqin:master soarqin:logistic_hub soarqin:dev
..
compare: soarqin:2377f92589b8dcb85f7fd856f5cb63de91a3b082
Branches Tags
soarqin:master soarqin:logistic_hub soarqin:dev

2 Commits
ed8d7d61ff ... 2377f92589

Author SHA1 Message Date
Soar Qin
2377f92589 ui fix 2026-01-23 00:55:31 +08:00
Soar Qin
788ed4275e try to fix known issues 2026-01-22 23:55:52 +08:00
5 changed files with 69 additions and 53 deletions
Expand all files Collapse all files

83
UXAssist/Functions/PlanetFunctions.cs
View File

@@ -27,20 +27,30 @@ public static class PlanetFunctions
{
for (var i = sc.storage.Length - 1; i >= 0; i--)
{
var package = player.TryAddItemToPackage(sc.storage[i].itemId, sc.storage[i].count, 0, true, etd.id);
UIItemup.Up(sc.storage[i].itemId, package);
var added = player.TryAddItemToPackage(sc.storage[i].itemId, sc.storage[i].count, 0, true, etd.id);
UIItemup.Up(sc.storage[i].itemId, added);
sc.storage[i].count = 0;
}
}
sc.storage = new StationStore[sc.storage.Length];
sc.needs = new int[sc.needs.Length];
}
if (toBag)
{
player.controller.actionBuild.DoDismantleObject(etd.id);
}
else
{
factory.RemoveEntityWithComponents(etd.id, false);
for (var i = sc.storage.Length - 1; i >= 0; i--)
{
sc.storage[i].count = 0;
}
}
}
if (toBag)
{
int protoId = 0;
factory.DismantleFinally(player, etd.id, ref protoId);
}
else
{
var objId = etd.id;
factory.BeforeDismantleObject(objId);
factory.RemoveEntityWithComponents(objId, false);
factory.OnDismantleObject(objId);
}
}
}
@@ -106,28 +116,52 @@ public static class PlanetFunctions
//planet.data = new PlanetRawData(planet.precision);
//planet.data.CalcVerts();
var stationPool = factory.transport?.stationPool;
if (stationPool != null)
{
foreach (var sc in stationPool)
{
if (sc is not { id: > 0 }) continue;
for (var i = sc.storage.Length - 1; i >= 0; i--)
{
sc.storage[i].count = 0;
}
}
}
var physics = planet.physics;
var gpuiManager = GameMain.gpuiManager;
var blockContainer = factory.blockContainer;
var audio = planet.audio;
for (var id = factory.entityCursor - 1; id > 0; id--)
{
ref var ed = ref factory.entityPool[id];
if (ed.id != id) continue;
factory.BeforeDismantleObject(id);
if (ed.colliderId != 0)
{
planet.physics.RemoveLinkedColliderData(ed.colliderId);
planet.physics.NotifyObjectRemove(EObjectType.Entity, ed.id);
physics.RemoveLinkedColliderData(ed.colliderId);
physics.NotifyObjectRemove(EObjectType.Entity, ed.id);
}
if (ed.modelId != 0)
{
GameMain.gpuiManager.RemoveModel(ed.modelIndex, ed.modelId);
gpuiManager.RemoveModel(ed.modelIndex, ed.modelId);
}
if (ed.mmblockId != 0)
{
factory.blockContainer.RemoveMiniBlock(ed.mmblockId);
blockContainer.RemoveMiniBlock(ed.mmblockId);
}
if (ed.audioId == 0) continue;
planet.audio?.RemoveAudioData(ed.audioId);
if (ed.audioId != 0)
{
audio.RemoveAudioData(ed.audioId);
}
factory.OnDismantleObject(id);
}
for (var id = factory.prebuildCursor - 1; id > 0; id--)
@@ -136,11 +170,11 @@ public static class PlanetFunctions
if (pb.id != id) continue;
if (pb.colliderId != 0)
{
planet.physics.RemoveLinkedColliderData(pb.colliderId);
physics.RemoveLinkedColliderData(pb.colliderId);
}
if (pb.modelId != 0)
{
GameMain.gpuiManager.RemovePrebuildModel(pb.modelIndex, pb.modelId);
gpuiManager.RemovePrebuildModel(pb.modelIndex, pb.modelId);
}
}
@@ -181,19 +215,6 @@ public static class PlanetFunctions
UIRoot.instance.uiGame.dfAssaultTip.ClearAllSpots();
}
var stationPool = factory.transport?.stationPool;
if (stationPool != null)
{
foreach (var sc in stationPool)
{
if (sc is not { id: > 0 }) continue;
sc.storage = new StationStore[sc.storage.Length];
sc.needs = new int[sc.needs.Length];
int protoId = factory.entityPool[sc.entityId].protoId;
factory.DismantleFinally(player, sc.entityId, ref protoId);
}
}
var planetId = planet.id;
var gameScenario = GameMain.gameScenario;
if (gameScenario != null)

21
UXAssist/UI/MyComboBox.cs
View File

@@ -10,7 +10,6 @@ public class MyComboBox : MonoBehaviour
{
private RectTransform _rectTrans;
private UIComboBox _comboBox;
private Text _text;
public Action<int> OnSelChanged;
private static GameObject _baseObject;
@@ -34,7 +33,6 @@ public class MyComboBox : MonoBehaviour
if (fontSource)
{
var txtComp = cbctrl.m_ListItemRes.GetComponentInChildren<Text>();
UXAssist.Logger.LogDebug($"txtComp: [{txtComp}]");
if (txtComp)
{
txtComp.font = fontSource.font;
@@ -42,7 +40,6 @@ public class MyComboBox : MonoBehaviour
txtComp.fontStyle = fontSource.fontStyle;
}
txtComp = rect.Find("Main Button/Text")?.GetComponent<Text>();
UXAssist.Logger.LogDebug($"txtComp: [{txtComp}]");
if (txtComp)
{
txtComp.font = fontSource.font;
@@ -63,8 +60,6 @@ public class MyComboBox : MonoBehaviour
var cb = gameObject.AddComponent<MyComboBox>();
var rtrans = Util.NormalizeRectWithTopLeft(cb, x, y, parent);
cb._rectTrans = rtrans;
cb._text = gameObject.transform.Find("Main Button/Text")?.GetComponent<Text>();
UXAssist.Logger.LogDebug($"cb._text: [{cb._text}]");
var box = rtrans.GetComponent<UIComboBox>();
cb._comboBox = box;
box.onItemIndexChange.AddListener(() => { cb.OnSelChanged?.Invoke(box.itemIndex); });
@@ -81,21 +76,11 @@ public class MyComboBox : MonoBehaviour
private void UpdateComboBoxPosition()
{
var rtrans = (RectTransform)_comboBox.transform;
var oldPosition = rtrans.localPosition;
var pwidth = _text.preferredWidth;
rtrans.localPosition = new Vector3(pwidth + 5f, oldPosition.y, oldPosition.z);
_rectTrans.sizeDelta = new Vector2(rtrans.localPosition.x + 5f + rtrans.sizeDelta.x, _rectTrans.sizeDelta.y);
}
public void SetPrompt(string prompt)
{
_text.text = prompt.Translate();
UpdateComboBoxPosition();
}
public void SetFontSize(int size)
{
_text.fontSize = size;
_comboBox.ItemButtons.ForEach(b => b.GetComponentInChildren<Text>().fontSize = size);
_comboBox.m_ListItemRes.GetComponentInChildren<Text>().fontSize = size;
var txtComp = _comboBox.transform.Find("Main Button")?.GetComponentInChildren<Text>();
@@ -137,12 +122,6 @@ public class MyComboBox : MonoBehaviour
config.SettingChanged += _configChanged;
}
public MyComboBox WithPrompt(string prompt)
{
SetPrompt(prompt);
return this;
}
public MyComboBox WithFontSize(int size)
{
SetFontSize(size);

3
UXAssist/UI/MyConfigWindow.cs
View File

@@ -25,9 +25,10 @@ public class MyConfigWindow : MyWindowWithTabs
base._OnCreate();
_windowTrans = GetComponent<RectTransform>();
OnUICreated?.Invoke(this, _windowTrans);
AutoFitWindowSize();
SetCurrentTab(0);
OnUpdateUI?.Invoke();
// Delay 500ms to run AutoFitWindowSize() after the window is created
// Invoke(nameof(AutoFitWindowSize), 0f);
}
public override void _OnDestroy()

20
UXAssist/UI/MyWindow.cs
View File

@@ -30,7 +30,7 @@ public class MyWindow : ManualBehaviour
var go = Instantiate(UIRoot.instance.uiGame.inserterWindow.gameObject);
go.SetActive(false);
go.name = "my-window";
Destroy(go.GetComponent<UITankWindow>());
Destroy(go.GetComponent<UIInserterWindow>());
for (var i = go.transform.childCount - 1; i >= 0; i--)
{
var child = go.transform.GetChild(i).gameObject;
@@ -63,6 +63,11 @@ public class MyWindow : ManualBehaviour
return (T)win;
}
public override void _OnOpen()
{
AutoFitWindowSize();
}
public override void _OnFree()
{
OnFree?.Invoke();
@@ -99,6 +104,15 @@ public class MyWindow : ManualBehaviour
{
var trans = GetComponent<RectTransform>();
trans.sizeDelta = new Vector2(_maxX + Margin + TabWidth + Spacing + Margin, MaxY + TitleHeight + Margin);
// var panelBgTrans = trans.Find("panel-bg")?.GetComponent<RectTransform>();
// if (panelBgTrans != null)
// {
// panelBgTrans.anchorMax = new Vector2(0f, 1f);
// panelBgTrans.anchorMin = new Vector2(0f, 1f);
// panelBgTrans.pivot = new Vector2(0f, 1f);
// panelBgTrans.localPosition = new Vector3(0f, 0f, 0f);
// panelBgTrans.sizeDelta = new Vector2(_maxX + Margin + TabWidth + Spacing + Margin, MaxY + TitleHeight + Margin);
// }
}
private static void AddElement(float x, float y, RectTransform rect, RectTransform parent = null)
@@ -212,9 +226,9 @@ public class MyWindow : ManualBehaviour
return cb;
}
public MyComboBox AddComboBox(float x, float y, RectTransform parent, string label = "", int fontSize = 15)
public MyComboBox AddComboBox(float x, float y, RectTransform parent, int fontSize = 15)
{
var comboBox = MyComboBox.CreateComboBox(x, y, parent).WithPrompt(label).WithFontSize(fontSize);
var comboBox = MyComboBox.CreateComboBox(x, y, parent).WithFontSize(fontSize);
_maxX = Math.Max(_maxX, x + comboBox.Width);
MaxY = Math.Max(MaxY, y + comboBox.Height);
return comboBox;

3
UXAssist/UIConfigWindow.cs
View File

@@ -333,7 +333,8 @@ public static class UIConfigWindow
x = 0f;
}
y += 36f;
wnd.AddComboBox(x + 2f, y, tab1, "Process priority").WithItems("High", "Above Normal", "Normal", "Below Normal", "Idle").WithSize(100f, 0f).WithConfigEntry(WindowFunctions.ProcessPriority);
txt = wnd.AddText2(x + 2f, y, tab1, "Process priority", 15, "process-priority");
wnd.AddComboBox(x + 7f + txt.preferredWidth, y, tab1).WithItems("High", "Above Normal", "Normal", "Below Normal", "Idle").WithSize(100f, 0f).WithConfigEntry(WindowFunctions.ProcessPriority);
var tab2 = wnd.AddTab(trans, "Factory");
x = 0f;