Inspection: hide the tray's own magnifier icon for cards; fill the gaps between back gold fingers
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
fe72ec0577
commit
0ba2845609
6 files changed
+10
-4
No files matched your search
Binary file not shown.
+6
-4
@@ -290,15 +290,17 @@ def gpu_back(accent, accent_dark, burnt=False):
|
|||||||
screw(c, sx, sy)
|
screw(c, sx, sy)
|
||||||
sticker(c, 5)
|
sticker(c, 5)
|
||||||
seal(c)
|
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):
|
for x in range(x0 + 2, x1 - 2):
|
||||||
if NOTCH_X - 2 <= x <= NOTCH_X + 3 or (x - x0) % 4 == 3:
|
if NOTCH_X - 2 <= x <= NOTCH_X + 3 or (x - x0) % 4 == 3:
|
||||||
continue
|
continue
|
||||||
for y in range(y1 + 14, FING_Y1 + 1):
|
for y in range(y1 + 14, FING_Y1 + 1):
|
||||||
c.put(x, y, 'Y' if (x - x0) % 4 else 'p')
|
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:
|
if burnt:
|
||||||
for dx, dy in ((60, 30), (130, 40), (50, 80), (100, 70), (150, 90)):
|
for dx, dy in ((60, 30), (130, 40), (50, 80), (100, 70), (150, 90)):
|
||||||
c.rect(dx, dy, dx + 6, dy + 4, 'c')
|
c.rect(dx, dy, dx + 6, dy + 4, 'c')
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ namespace Decentralized
|
|||||||
private TextMeshProUGUI flipText;
|
private TextMeshProUGUI flipText;
|
||||||
private GameItem shown;
|
private GameItem shown;
|
||||||
private string shownSig;
|
private string shownSig;
|
||||||
|
private bool hidGlass;
|
||||||
private Transform buttonTemplate;
|
private Transform buttonTemplate;
|
||||||
private TMP_FontAsset font;
|
private TMP_FontAsset font;
|
||||||
private readonly TextMeshProUGUI[] rowName = new TextMeshProUGUI[6], rowText = new TextMeshProUGUI[6];
|
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);
|
if (root != null && root.gameObject.activeSelf) root.gameObject.SetActive(false);
|
||||||
shown = null;
|
shown = null;
|
||||||
|
if (hidGlass && m != null && m.magnifyingGlass != null) { m.magnifyingGlass.SetActive(true); hidGlass = false; }
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Log.Guard("显卡检视大图", () =>
|
Log.Guard("显卡检视大图", () =>
|
||||||
{
|
{
|
||||||
if (root == null) Build(m);
|
if (root == null) Build(m);
|
||||||
if (!root.gameObject.activeSelf) root.gameObject.SetActive(true);
|
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>();
|
var keys = new List<string>();
|
||||||
string sig = Items.LookKeys(item, keys) + "|" + string.Join(",", keys) + "|" + item.unitValue + "|" + Items.Exposed(item) + "|" + (Items.GetClaim(item)?.Encode() ?? "") + "|" + GeneralHelper.IsItemOwned(item) + "|" + HasLabeler();
|
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)
|
if (item != shown || sig != shownSig)
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Reference in new issue
Block a user