diff --git a/art/__pycache__/big.cpython-314.pyc b/art/__pycache__/big.cpython-314.pyc index fa74d8d..b9d30f2 100644 Binary files a/art/__pycache__/big.cpython-314.pyc and b/art/__pycache__/big.cpython-314.pyc differ diff --git a/art/big.py b/art/big.py index cb2c950..24ef970 100644 --- a/art/big.py +++ b/art/big.py @@ -290,15 +290,17 @@ def gpu_back(accent, accent_dark, burnt=False): screw(c, sx, sy) sticker(c, 5) seal(c) - # 背面金手指(暗一档) + # 背面金手指(暗一档):触点之间是 PCB 的深绿,只有键位缺口是空的 + for y in range(y1 + 12, FING_Y1 + 1): + for x in range(x0, x1 + 1): + if NOTCH_X - 2 <= x <= NOTCH_X + 3 and y > y1 + 13: + continue + c.put(x, y, 'g2') for x in range(x0 + 2, x1 - 2): if NOTCH_X - 2 <= x <= NOTCH_X + 3 or (x - x0) % 4 == 3: continue for y in range(y1 + 14, FING_Y1 + 1): c.put(x, y, 'Y' if (x - x0) % 4 else 'p') - for y in range(y1 + 12, y1 + 14): - for x in range(x0, x1 + 1): - c.put(x, y, 'g2') if burnt: for dx, dy in ((60, 30), (130, 40), (50, 80), (100, 70), (150, 90)): c.rect(dx, dy, dx + 6, dy + 4, 'c') diff --git a/src/Decentralized/GpuInspectView.cs b/src/Decentralized/GpuInspectView.cs index 3366b86..eff3ea7 100644 --- a/src/Decentralized/GpuInspectView.cs +++ b/src/Decentralized/GpuInspectView.cs @@ -23,6 +23,7 @@ namespace Decentralized private TextMeshProUGUI flipText; private GameItem shown; private string shownSig; + private bool hidGlass; private Transform buttonTemplate; private TMP_FontAsset font; private readonly TextMeshProUGUI[] rowName = new TextMeshProUGUI[6], rowText = new TextMeshProUGUI[6]; @@ -51,12 +52,15 @@ namespace Decentralized { if (root != null && root.gameObject.activeSelf) root.gameObject.SetActive(false); shown = null; + if (hidGlass && m != null && m.magnifyingGlass != null) { m.magnifyingGlass.SetActive(true); hidGlass = false; } return; } Log.Guard("显卡检视大图", () => { if (root == null) Build(m); if (!root.gameObject.activeSelf) root.gameObject.SetActive(true); + // 检视台自带的放大镜图标会压在大图下面,显卡用不着 + if (m.magnifyingGlass != null && m.magnifyingGlass.activeSelf) { m.magnifyingGlass.SetActive(false); hidGlass = true; } var keys = new List(); string sig = Items.LookKeys(item, keys) + "|" + string.Join(",", keys) + "|" + item.unitValue + "|" + Items.Exposed(item) + "|" + (Items.GetClaim(item)?.Encode() ?? "") + "|" + GeneralHelper.IsItemOwned(item) + "|" + HasLabeler(); if (item != shown || sig != shownSig) diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_big_burnt_b.png b/src/Decentralized/ModFiles/Textures/Items/gpu_big_burnt_b.png index fbf22d7..890d15d 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_big_burnt_b.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_big_burnt_b.png differ diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_big_pmd_b.png b/src/Decentralized/ModFiles/Textures/Items/gpu_big_pmd_b.png index a9f3f4e..d35c564 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_big_pmd_b.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_big_pmd_b.png differ diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_big_probidia_b.png b/src/Decentralized/ModFiles/Textures/Items/gpu_big_probidia_b.png index e1bb6df..6e52f94 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_big_probidia_b.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_big_probidia_b.png differ