diff --git a/CHANGELOG.md b/CHANGELOG.md index d0f4d18..2278215 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - 收尾核算（`research/sim/bm_econ.py`，按 Tuning 常量算期望）：Ponero 来回 15.4%，与混币器洗掉 80% 污点的 15–18% 相当，但当天完成、清得彻底、不受制裁，所以手续费 8% → 10%（来回 19%），日额度 1000 → 600（日额度按钱包污点占比估，约够清掉稳态的污点流入，后期会成为瓶颈）；出售的最优倍率取决于玩家的资金机会成本：每天 1% 时 ×1.8，2–3% 时 ×1.5，倍率不是越高越好；订单：托管期望净 +0.02、提前放款 +0.07（现货 −0.30），所以订单是便宜进货，不是赚钱路线；订单进货再挂高价出售的套利每件约 +0.13–0.18（20 天一轮，资金占用），量小，暂不限制上架数。 - 订单改成商家货架（用户意见）：黑市页"订单"改名"商家"，每周从 6 种类型里抽 5 家（全新矿卡经销商、二手矿卡贩子、模组高科技、军火、证件芯片、药物），另有 25% 的周出现一家大宗商家（库存 10–25 件、价格系数 0.55–0.75、送货 6 天）。每家有自己的价格系数（订单价 = 基础价 × 系数，一般 0.70–0.95，全新卡 0.85–1.00，二手卡 0.65–0.90），每家 4 种货、库存 3–6 件。一次订 5 件以上 95 折、10 件以上 9 折。界面：件数按钮 ×1 / ×5 / ×10，商家按钮，所选商家的货架。药物（药片、梦尘、管制化学品）只在药物商家和大宗商家出现，也能转手出售。每周货架总值在游戏里抽样 60 周平均 13.2k（目标 1.4 万）。 +- 同时上架最多 10 件（用户意见），出售页显示"上架 n/10"，超出时提示。 - 出售：货款污点随近 7 天成交额加重（成交额达 1.4 万时概率与比例各加 30%）；出售页加"全部上架"按钮。套利核算（`bm_econ.py`，商家系数均值 0.825 再加批量折扣）：普通商家提前放款进货 + ×1.5 出售每件约 +21%，大宗商家约 +33%，一周可买的货约 1.3 万，带污点的货款约够吃满 Ponero 日额度。 - 调整（用户意见）：Ponero 手续费 10% → 6%（一进一出约 12%），日额度 600 → 1000；混币器每轮手续费 4% → 3%。黑市货架上的显卡有 15% 是全新卡（成色 100，封条完好，不会是假卡），标签显示"全新"。全新卡只有单元测试，没有在游戏里见过。 - 收尾验证（游戏内）：黑市每周刷新（第 8 天自动刷出 5 种现货、8 种订单目录）；蜜罐追查到期记罪证 300；假卡上架 8 件，有一件被看穿退货（好评下降）；其余成交后到账，其中一笔带污点；受控交付选"签收。"记罪证 136、货被查封；镇压期间黑市页显示下线（改成实时读取游戏事件，原来要等过夜才更新）。 diff --git a/src/Decentralized.Domain/BmSales.cs b/src/Decentralized.Domain/BmSales.cs index 0421824..42f363b 100644 --- a/src/Decentralized.Domain/BmSales.cs +++ b/src/Decentralized.Domain/BmSales.cs @@ -53,13 +53,15 @@ namespace Decentralized.Domain return Math.Min(Tuning.BmVolumeTaintMax, v / Tuning.BmVolumeRef * Tuning.BmVolumeTaintMax); } + public int ActiveListings => Sales.Count(x => x.State == SaleState.Listed); + public static int ListPriceOf(long refValue, double m) => (int)Math.Max(1, Math.Round(refValue * m)); public static int ListFee(int listPrice) => (int)Math.Ceiling(listPrice * Tuning.BmListFee); /// 上架：交付一件货，收上架费（付给 feeAsset 币，污点与成本按比例带走）。倍率超出范围、平台关闭或余额不足返回 null。 public BmSale List(string item, string model, string fakeOf, double health, long refValue, double m, Wallet w, string feeAsset, int day, Func price) { - if (m < Tuning.BmSellMin - 1e-9 || m > Tuning.BmSellMax + 1e-9 || refValue <= 0 || Closed(day) || feeAsset == Assets.CRC) return null; + if (m < Tuning.BmSellMin - 1e-9 || m > Tuning.BmSellMax + 1e-9 || refValue <= 0 || Closed(day) || feeAsset == Assets.CRC || ActiveListings >= Tuning.BmMaxListings) return null; int listPrice = ListPriceOf(refValue, m); double p = price(feeAsset); if (p <= 0) return null; diff --git a/src/Decentralized.Domain/Tuning.cs b/src/Decentralized.Domain/Tuning.cs index 0a01308..482e6db 100644 --- a/src/Decentralized.Domain/Tuning.cs +++ b/src/Decentralized.Domain/Tuning.cs @@ -101,11 +101,11 @@ namespace Decentralized.Domain /// 货架上除违禁品外的两类货：高科技物品（需中档声望）和显卡的出现概率、加价（在现货溢价 / 订单价之外再加），显卡里夹假卡的比例、是全新卡（成色 100、封条完好、不会是假卡）的概率。 public const double BmTechChance = 0.30, BmGpuChance = 0.30, BmTechMarkup = 0.5, BmGpuMarkup = 0.2, BmGpuFake = 0.20, BmGpuNew = 0.15; /// 玩家上架出售：标价倍率范围（相对参考价）、上架费、成交抽成、成交后货款托管天数、假卡被买家看穿的概率； - /// 倍率 ≤0.9 / 1.0 / 1.8 时的期望成交天数（之间插值）；货款带污点的概率与比例随倍率从下限涨到上限；卖家好评的初始值、看穿一次扣的点数。 + /// 倍率 ≤0.9 / 1.0 / 1.8 时的期望成交天数（之间插值）；货款带污点的概率与比例随倍率从下限涨到上限；卖家好评的初始值、看穿一次扣的点数、同时上架的件数上限。 public const double BmListFee = 0.05, BmCommission = 0.08, BmSellMin = 0.6, BmSellMax = 1.8, BmFakeDetect = 0.5; public const double BmSellDaysFast = 1, BmSellDays1 = 2, BmSellDaysMax = 14; public const double BmSaleTaintChanceMin = 0.2, BmSaleTaintChanceMax = 0.9, BmSaleTaintRatioMin = 0.2, BmSaleTaintRatioMax = 0.8; - public const int BmSaleHold = 3, BmRatingStart = 90, BmRatingFakeLoss = 10; + public const int BmSaleHold = 3, BmRatingStart = 90, BmRatingFakeLoss = 10, BmMaxListings = 10; /// 商家货架：每周的商家数（从 6 种类型里抽）、每家的货种数、每种货的库存范围；大宗商家出现概率、库存范围、送货天数； /// 各类商家的价格系数范围（订单价 = 基础价 × 系数）；批量折扣档（件数、折扣）。 public const int BmMerchantCount = 5, BmMerchantListings = 4, BmQtyMin = 3, BmQtyMax = 6, BmBulkQtyMin = 10, BmBulkQtyMax = 25, BmBulkDays = 6; diff --git a/src/Decentralized/ModFiles/Localization/en.csv b/src/Decentralized/ModFiles/Localization/en.csv index 8907602..109cd70 100644 --- a/src/Decentralized/ModFiles/Localization/en.csv +++ b/src/Decentralized/ModFiles/Localization/en.csv @@ -270,7 +270,7 @@ black.kind.Contraband.3,Contraband (high) black.kind.Tech,High-tech (markup) nightlog.bm.ready,"Black market: {0} arrived; a courier will come by once you open." item.web3guide.name,Web3 Handbook -item.web3guide.desc,"Bank: depositing turns credits into CRC; withdrawing turns CRC back into credits and goes through compliance screening. Trading: buys are paid in the quote coin, sells in the traded coin. Mixer: pick a coin, amount and rounds; each round takes a fee and lowers taint, rounds equal days of waiting, and the coins come back to the same address; the more you deposit, the worse the cleaning. Black market: coin only, no CRC, 30% above normal channels, with extra markup on high-tech goods and GPUs; the coin you pay leaves its share of taint with the seller and the goods carry no stolen tag; GPUs may be fake, inspect them yourself. Orders are cheaper than spot but take days and may be intercepted; merchants sell by type at their own price factor, 5+ items get 5% off and 10+ get 10% off, and a bulk merchant appears at random with the lowest prices but six days of waiting; escrow costs 5%, is released on delivery and refunded if the seller runs; advance release takes another 10% off, but a scammer keeps the money and only sellers with 30+ trades accept; the platform itself can rug, be taken over by enforcement, or a seller can be arrested, after which your orders get traced and crime logged; forum rumors can be warnings. An intercepted parcel sometimes turns into enforcement at your door: signing logs the crime on the spot and seizes the goods, refusing only costs the payment. Selling: on the black market's Sell page, list contraband, high-tech goods and GPUs from storage at 0.6x to 1.8x the reference price. The higher the multiplier, the slower the sale (below 0.9x about a day, 1.0x about two, 1.8x about fourteen), and the likelier and larger the taint on the payout, which also grows with how much you sold in the last 7 days; 5% listing fee, 8% commission, payout held 3 days before reaching your wallet; a fake card may be spotted and returned, hurting your rating; if the platform rugs, listed goods and unreleased payouts are gone. Ponero desk: Ponero is a privacy coin and swapping in wipes the taint on that value; 6% fee each way with a daily limit; coin swapped out of Ponero has no origin and cash-out screening gets stricter." +item.web3guide.desc,"Bank: depositing turns credits into CRC; withdrawing turns CRC back into credits and goes through compliance screening. Trading: buys are paid in the quote coin, sells in the traded coin. Mixer: pick a coin, amount and rounds; each round takes a fee and lowers taint, rounds equal days of waiting, and the coins come back to the same address; the more you deposit, the worse the cleaning. Black market: coin only, no CRC, 30% above normal channels, with extra markup on high-tech goods and GPUs; the coin you pay leaves its share of taint with the seller and the goods carry no stolen tag; GPUs may be fake, inspect them yourself. Orders are cheaper than spot but take days and may be intercepted; merchants sell by type at their own price factor, 5+ items get 5% off and 10+ get 10% off, and a bulk merchant appears at random with the lowest prices but six days of waiting; escrow costs 5%, is released on delivery and refunded if the seller runs; advance release takes another 10% off, but a scammer keeps the money and only sellers with 30+ trades accept; the platform itself can rug, be taken over by enforcement, or a seller can be arrested, after which your orders get traced and crime logged; forum rumors can be warnings. An intercepted parcel sometimes turns into enforcement at your door: signing logs the crime on the spot and seizes the goods, refusing only costs the payment. Selling: on the black market's Sell page, list contraband, high-tech goods and GPUs from storage at 0.6x to 1.8x the reference price. The higher the multiplier, the slower the sale (below 0.9x about a day, 1.0x about two, 1.8x about fourteen), and the likelier and larger the taint on the payout, which also grows with how much you sold in the last 7 days; at most 10 listings at a time, 5% listing fee, 8% commission, payout held 3 days before reaching your wallet; a fake card may be spotted and returned, hurting your rating; if the platform rugs, listed goods and unreleased payouts are gone. Ponero desk: Ponero is a privacy coin and swapping in wipes the taint on that value; 6% fee each way with a daily limit; coin swapped out of Ponero has no origin and cash-out screening gets stricter." courier.odd1,...Package is here. courier.odd2,"(His hand stays in his pocket.) Sign here." courier.sign,Sign @@ -318,3 +318,5 @@ merchant.Bulk,Bulk black.days,"{0} days delivery" black.sell.all,List all black.sell.listedall,"Listed {0} items." +black.sell.slots,"Listed {0}/{1}" +black.sell.full,"At most {0} listings at a time." diff --git a/src/Decentralized/ModFiles/Localization/zh.csv b/src/Decentralized/ModFiles/Localization/zh.csv index 2082f5a..4e9c81e 100644 --- a/src/Decentralized/ModFiles/Localization/zh.csv +++ b/src/Decentralized/ModFiles/Localization/zh.csv @@ -269,7 +269,7 @@ black.kind.Contraband.3,违禁品（高） black.kind.Tech,高科技物品（加价） nightlog.bm.ready,"黑市：{0} 到货，开店后会有快递员上门。" item.web3guide.name,Web3 手册 -item.web3guide.desc,"银行：存入把信用点换成 CRC；提取把 CRC 换回信用点，提取要过合规审查。交易：买入按计价币的数量支付，卖出按所交易币的数量卖出。混币器：选币种、填数量和轮数，每轮扣手续费并降低污点，轮数即等待天数，到期提回同一个地址；存入越多，清洗越差。黑市：只收币，不收 CRC，价格比正常渠道贵 30%，高科技物品和显卡另有加价；付出去的币带着按比例的污点留在卖家那边，货不带赃物标签；显卡不保证真假，自己鉴定。订单比现货便宜，要等几天，路上可能被截获；商家按类型卖货，价格系数各不相同，一次订 5 件以上 95 折、10 件以上 9 折，大宗商家随机出现，价格最低但要等六天；托管多付 5% 托管费，收货后放款，卖家跑路时退款；提前放款再打九折，卖家若是骗子钱就没了，只有成交 30 单以上的卖家接受；平台自己也可能跑路，也可能被执法接管，或者卖家落网，之后你的订单会被追查、记罪证；论坛上的传闻可以当预兆。被截获的包裹有时会变成执法人员上门：签收当场记罪证并查封，拒签只损失货款。出售：在黑市的出售页把储藏区里的违禁品、高科技物品和显卡上架，标价是参考价的 0.6 到 1.8 倍。倍率越高成交越慢（0.9 以下约一天，1.0 约两天，1.8 约十四天），货款带污点的可能性和比例也越高，近 7 天出售的量越大，污点越重；上架收 5% 上架费，成交扣 8% 抽成，货款托管 3 天后进钱包；卖假卡可能被买家看穿而退货，拉低好评；平台跑路时上架的货和未放款的货款都没了。Ponero 兑换处：Ponero 是隐私币，兑入时这部分价值的污点被清除；兑入、兑出各收 6% 手续费，每天有额度；从 Ponero 兑出的币来路不明，出金审查会加重。" +item.web3guide.desc,"银行：存入把信用点换成 CRC；提取把 CRC 换回信用点，提取要过合规审查。交易：买入按计价币的数量支付，卖出按所交易币的数量卖出。混币器：选币种、填数量和轮数，每轮扣手续费并降低污点，轮数即等待天数，到期提回同一个地址；存入越多，清洗越差。黑市：只收币，不收 CRC，价格比正常渠道贵 30%，高科技物品和显卡另有加价；付出去的币带着按比例的污点留在卖家那边，货不带赃物标签；显卡不保证真假，自己鉴定。订单比现货便宜，要等几天，路上可能被截获；商家按类型卖货，价格系数各不相同，一次订 5 件以上 95 折、10 件以上 9 折，大宗商家随机出现，价格最低但要等六天；托管多付 5% 托管费，收货后放款，卖家跑路时退款；提前放款再打九折，卖家若是骗子钱就没了，只有成交 30 单以上的卖家接受；平台自己也可能跑路，也可能被执法接管，或者卖家落网，之后你的订单会被追查、记罪证；论坛上的传闻可以当预兆。被截获的包裹有时会变成执法人员上门：签收当场记罪证并查封，拒签只损失货款。出售：在黑市的出售页把储藏区里的违禁品、高科技物品和显卡上架，标价是参考价的 0.6 到 1.8 倍。倍率越高成交越慢（0.9 以下约一天，1.0 约两天，1.8 约十四天），货款带污点的可能性和比例也越高，近 7 天出售的量越大，污点越重；同时最多上架 10 件，上架收 5% 上架费，成交扣 8% 抽成，货款托管 3 天后进钱包；卖假卡可能被买家看穿而退货，拉低好评；平台跑路时上架的货和未放款的货款都没了。Ponero 兑换处：Ponero 是隐私币，兑入时这部分价值的污点被清除；兑入、兑出各收 6% 手续费，每天有额度；从 Ponero 兑出的币来路不明，出金审查会加重。" courier.odd1,……东西到了。 courier.odd2,"（他的手一直放在口袋里）在这儿签个字。" courier.sign,签收 @@ -317,3 +317,5 @@ merchant.Bulk,大宗 black.days,"{0} 天到货" black.sell.all,全部上架 black.sell.listedall,"已上架 {0} 件。" +black.sell.slots,"上架 {0}/{1}" +black.sell.full,"最多同时上架 {0} 件。" diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs index e1e24f8..f711850 100644 --- a/src/Decentralized/TerminalWindow.cs +++ b/src/Decentralized/TerminalWindow.cs @@ -361,7 +361,7 @@ namespace Decentralized b.AddButton(Math.Abs(mult - _sellMult) < 1e-9 ? $"[×{n}]" : "×" + n, () => { _sellMult = mult; Open(); }); } b.End(); - b.AddLabel(L.T("mixer.balance", _payAsset, Fmt.Num(d.Hot.Avail(_payAsset))) + "　" + L.T("black.sell.rating", d.Black.Rating)); + b.AddLabel(L.T("mixer.balance", _payAsset, Fmt.Num(d.Hot.Avail(_payAsset))) + "　" + L.T("black.sell.rating", d.Black.Rating) + "　" + L.T("black.sell.slots", d.Black.ActiveListings, Tuning.BmMaxListings)); b.AddButton(L.T("black.sell.all"), ListAll); b.AddSeparator(); var items = BlackDelivery.Sellable(); @@ -412,7 +412,7 @@ namespace Decentralized if (id == null) { Open(); return; } var u = Items.IsGpu(it) ? Items.ToUnit(it) : null; var s = d.Black.List(id, u?.Model, u?.FakeOf, u?.Health ?? 0, BlackDelivery.RefValue(it), _sellMult, d.Hot, _payAsset, StoreStation.GetDayCounter(), Session.Price); - if (s == null) { _message = L.T("msg.balance"); Open(); return; } + if (s == null) { _message = d.Black.ActiveListings >= Tuning.BmMaxListings ? L.T("black.sell.full", Tuning.BmMaxListings) : L.T("msg.balance"); Open(); return; } it.Destroy(); _message = L.T("black.sell.listed", ItemName(id), s.ListPrice); Session.Save(); diff --git a/tests/Decentralized.Domain.Tests/Program.cs b/tests/Decentralized.Domain.Tests/Program.cs index fda8673..6543283 100644 --- a/tests/Decentralized.Domain.Tests/Program.cs +++ b/tests/Decentralized.Domain.Tests/Program.cs @@ -695,6 +695,9 @@ internal static class Program bool rugged = false; for (int d = 2; d < 400 && !rugged; d++) { var ev = b4.Night(d, false, w4, new Rng((ulong)d * 31), 0, price); rugged = ev.Any(e => e.Kind == "sale_rug"); } Check(rugged && b4.Sales.All(x => x.State != SaleState.Listed && x.State != SaleState.Sold), "跑路：上架与未放款全部归零"); + var b6 = new BlackMarket(); var w6 = new Wallet(); w6.Add(Assets.CRT, 100000); + int ok6 = 0; for (int i = 0; i < 15; i++) if (b6.List("c4", null, null, 0, 500, 1.0, w6, Assets.CRT, 1, price) != null) ok6++; + Check(ok6 == Tuning.BmMaxListings && b6.ActiveListings == 10, "同时最多上架 10 件"); // 镇压期间不推进 var b5 = new BlackMarket(); var w5 = new Wallet(); w5.Add(Assets.CRT, 1000); var s5 = b5.List("c4", null, null, 0, 500, 0.8, w5, Assets.CRT, 1, price);