diff --git a/art/__pycache__/big.cpython-314.pyc b/art/__pycache__/big.cpython-314.pyc index 1dbceb4..fa74d8d 100644 Binary files a/art/__pycache__/big.cpython-314.pyc and b/art/__pycache__/big.cpython-314.pyc differ diff --git a/art/__pycache__/sprites.cpython-314.pyc b/art/__pycache__/sprites.cpython-314.pyc index 7c4eabd..27c212f 100644 Binary files a/art/__pycache__/sprites.cpython-314.pyc and b/art/__pycache__/sprites.cpython-314.pyc differ diff --git a/art/big.py b/art/big.py index d689c5f..cb2c950 100644 --- a/art/big.py +++ b/art/big.py @@ -167,8 +167,6 @@ def gpu_front(accent, accent_dark, brand_text, burnt=False): # 前沿斜切装饰条:品牌色 + 品牌字 for x in range(x0 + 4, x1 - 20): c.rect(x, y1 - 5, x, y1 - 3, accent if x % 11 else accent_dark) - for k in range(18): - c.rect(x0 + 4 + k, y1 - 5 - k // 2, x0 + 4 + k, y1 - 3 - k // 2 + 1, accent) text57(c, 112, 84, brand_text, 'h') # 顶沿:四根铜热管端头与 8 针供电口 for i in range(4): @@ -283,8 +281,6 @@ def gpu_back(accent, accent_dark, burnt=False): for x in range(x0 + 4, x1 - 4): c.rect(x, 56, x, 59, accent) c.put(x, 60, accent_dark) - for k in range(20): - c.rect(x1 - 6 - k, 55 - k // 2, x1 - 6 - k, 55 - k // 2 + 1, accent_dark) # 通风槽(左下) for y in range(70, 100, 6): c.rect(x0 + 10, y, x0 + 50, y + 3, 'k') diff --git a/art/sprites.py b/art/sprites.py index f866b90..807eb9b 100644 --- a/art/sprites.py +++ b/art/sprites.py @@ -186,8 +186,6 @@ def gpu_front(accent, accent_dark, burnt=False): for y in range(TOP0 + 3, TOP1 - 2): c.put(25, y, 'k'); c.put(26, y, 'x') # 品牌色斜条(从前沿向左上延伸)与前沿色条 - for k in range(0, 8): - c.put(L + 3 + k, TOP1 - 1 - k // 2, accent) for x in range(L + 1, R - 5): c.put(x, TOP1 - 1, accent if x % 9 else accent_dark) c.put(x, TOP1, accent_dark) @@ -255,8 +253,6 @@ def gpu_back(accent, accent_dark, burnt=False): for x in range(L + 1, R - 1): c.put(x, 16, accent) c.put(L + 1, 17, accent_dark); c.put(R - 2, 17, accent_dark) - for k in range(0, 7): - c.put(R - 3 - k, 15 - k // 2 if k < 4 else 14, accent_dark) # 通风槽(左下一组) for y in (19, 21, 23, 25): for x in range(L + 4, L + 14): 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 bc79271..fbf22d7 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_burnt_f.png b/src/Decentralized/ModFiles/Textures/Items/gpu_big_burnt_f.png index 03eae36..d4343f1 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_big_burnt_f.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_big_burnt_f.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 f24624a..a9f3f4e 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_pmd_f.png b/src/Decentralized/ModFiles/Textures/Items/gpu_big_pmd_f.png index e1fdf06..19fc636 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_big_pmd_f.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_big_pmd_f.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 73ba916..e1bb6df 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 diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_big_probidia_f.png b/src/Decentralized/ModFiles/Textures/Items/gpu_big_probidia_f.png index f34922b..7767ed7 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_big_probidia_f.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_big_probidia_f.png differ diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_burnt_b.png b/src/Decentralized/ModFiles/Textures/Items/gpu_burnt_b.png index f8db5bb..56a6c46 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_burnt_b.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_burnt_b.png differ diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_burnt_f.png b/src/Decentralized/ModFiles/Textures/Items/gpu_burnt_f.png index 0cea91f..1131534 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_burnt_f.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_burnt_f.png differ diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_pmd_b.png b/src/Decentralized/ModFiles/Textures/Items/gpu_pmd_b.png index 52ec906..8ecd6e4 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_pmd_b.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_pmd_b.png differ diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_pmd_f.png b/src/Decentralized/ModFiles/Textures/Items/gpu_pmd_f.png index 46ac7e9..96c3f7f 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_pmd_f.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_pmd_f.png differ diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_probidia_b.png b/src/Decentralized/ModFiles/Textures/Items/gpu_probidia_b.png index 3429faf..24563a0 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_probidia_b.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_probidia_b.png differ diff --git a/src/Decentralized/ModFiles/Textures/Items/gpu_probidia_f.png b/src/Decentralized/ModFiles/Textures/Items/gpu_probidia_f.png index 269d388..f727812 100644 Binary files a/src/Decentralized/ModFiles/Textures/Items/gpu_probidia_f.png and b/src/Decentralized/ModFiles/Textures/Items/gpu_probidia_f.png differ diff --git a/src/Decentralized/UsedDealerClient.cs b/src/Decentralized/UsedDealerClient.cs index dd31f52..4630e29 100644 --- a/src/Decentralized/UsedDealerClient.cs +++ b/src/Decentralized/UsedDealerClient.cs @@ -20,6 +20,17 @@ namespace Decentralized ModHook.OnGenerateCustomerNormal += OnGenerate; ModHelper.AddAppraisalItem(ModInfo.Id, Appraisal, Items.GpuId("RZX50"), 2, CreateForAppraisal, u => (int)CardValue.True(Items.ToUnit(u)), Items.IsGpu, null, () => L.T("appraisal.gpu")); + ModHelper.AddDebugFunction(ModInfo.Id, ModInfo.Name, "Appraisal client (test)", () => Log.Guard("鉴定客户(测试)", () => + { + while (AppraisalRankHelper.GetRank() < 2) AppraisalRankHelper.Promote(); + var pool = AppraisalItemRegistry.GetPool(AppraisalRankHelper.GetRank()); + Log.Info($"鉴定等级 {AppraisalRankHelper.GetRank()},可抽的物品:{string.Join(", ", pool.ConvertAll(t => t.id))}"); + PlayerStore.Instance.storeClientManager.AddNextClient(StoreClientListAppraisal.CreateAppraisalRandom()); + })); + ModHelper.AddDebugFunction(ModInfo.Id, ModInfo.Name, "Appraisal cards to counter (test)", () => Log.Guard("鉴定显卡(测试)", () => + { + for (int i = 0; i < 3; i++) PlayerStore.Instance.AddDirectSellingItemToTable(CreateForAppraisal()); + })); ModHelper.AddDebugFunction(ModInfo.Id, ModInfo.Name, "Used dealer visit (test)", () => Log.Guard("二手贩子(测试)", () => { var m = PlayerStore.Instance.storeClientManager;