From 8275f054aab9d8ec55752d33cc6354ca40fdd928 Mon Sep 17 00:00:00 2001 From: Cai <13110818005@qq.com> Date: Wed, 25 Feb 2026 17:21:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(TRPEFontGen):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=8B=89=E4=B8=81=E5=AD=97=E6=AF=8D=E9=97=B4=E8=B7=9D=E8=A1=A5?= =?UTF-8?q?=E5=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TRPEFontGen/Generator.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/TRPEFontGen/Generator.cs b/TRPEFontGen/Generator.cs index 4d6c107..2cb25b8 100644 --- a/TRPEFontGen/Generator.cs +++ b/TRPEFontGen/Generator.cs @@ -13,7 +13,8 @@ namespace TRPEFontGen; public static class Generator { public static FontFile Generate(Font font, char[] chars, string name, int minusKerning = 5, - int compressSize = 2, int lineSpacing = 24, float spacing = 0, char defaultChar = '*') + int compressSize = 2, int lineSpacing = 24, float spacing = 0, char defaultChar = '*', + float latinMargin = 0.5f) { const int size = 1024; const int atlasPadding = 2; @@ -33,7 +34,6 @@ public static FontFile Generate(Font font, char[] chars, string name, int minusK float yMax = 0; byte pages = 0; - foreach (var c in chars) { var charSize = TextMeasurer.MeasureSize(c.ToString(), textOption); @@ -77,15 +77,21 @@ public static FontFile Generate(Font font, char[] chars, string name, int minusK c.ToString(), Color.White )); + + var isLatin = c is >= 'a' and <= 'z' or >= 'A' and <= 'Z'; + + var currentLeftMargin = isLatin ? latinMargin : 0f; + var currentRightMargin = isLatin ? latinMargin : 0f; var fontChar = new FontChar ( c, new Rectangle(0, 0, (int)drawWidth, (int)drawHeight + 2), new Rectangle((int)xNow, (int)yNow, (int)drawWidth, (int)drawHeight), - new Vector3(0, drawWidth - minusKerning, 0), + new Vector3(currentLeftMargin, drawWidth - minusKerning, currentRightMargin), pages ); + fontFile.Chars.Add(fontChar); xNow += actualWidth + atlasPadding; } From 8d605ead09ccd5c82f6e98536bd3a78ebdb9892a Mon Sep 17 00:00:00 2001 From: Cai <13110818005@qq.com> Date: Wed, 25 Feb 2026 18:03:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(FontGeneratorCLI):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B8=B8=E7=94=A83500=E5=AD=97=E7=AC=A6=E9=9B=86?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E5=AD=97=E4=BD=93=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FontGeneratorCLI/CharSet.cs | 37 ++++++++++++ FontGeneratorCLI/Program.cs | 109 ++++++++++++++++++++++++------------ 2 files changed, 110 insertions(+), 36 deletions(-) create mode 100644 FontGeneratorCLI/CharSet.cs diff --git a/FontGeneratorCLI/CharSet.cs b/FontGeneratorCLI/CharSet.cs new file mode 100644 index 0000000..8869b51 --- /dev/null +++ b/FontGeneratorCLI/CharSet.cs @@ -0,0 +1,37 @@ +namespace FontGeneratorCLI; + +public static class CharSet +{ + public const string CommonUseChinese = + "工才下寸丈大与万上小口山巾千乞川亿个么久勺丸夕凡及一乙二十丁厂七卜八人入儿九几了乃刀力又三干于亏士土工才下寸丈大与万上小口山巾千乞川亿个么久勺丸夕凡及广亡门义之尸已弓己卫子也女飞刃习叉马乡丰王井开夫天元无云专扎艺木五支厅不太犬区历友尤匹车巨牙屯比互切瓦止少日中贝内水冈见手午牛毛气升长仁什片仆化仇币仍仅斤爪反介父从今凶分乏公仓月氏勿风欠丹匀乌勾凤六文方火为斗忆计订户认心尺引丑巴孔队办以允予劝双书幻玉刊末未示击打巧正扑扒功扔去甘世古节本术可丙左厉石右布龙平灭轧东卡北占业旧帅归目旦且叮叶甲申号电田由只央史兄叼叫叨另叹四生失禾丘付仗代仙们仪白仔他斥瓜乎丛令用甩印乐句匆册犯外处冬鸟务包饥主市立闪兰半汁汇头汉宁穴它讨写让礼训必议讯记永司尼民出辽奶奴加召皮边孕发圣对台矛纠母幼丝式刑动扛寺吉扣考托老圾巩执扩扫地扬场耳共芒亚芝朽朴机权过臣再协西压厌在百有存而页匠夸夺灰达列死成夹轨邪划迈毕至此贞师尘尖劣光当早吐吓虫曲团同吊吃因吸吗屿帆岁回岂则刚网肉年朱先丢舌竹迁乔伟传乒乓休伍伏优伐延件任伤价份华仰仿伙伪自血向似后行舟全会杀合兆企众爷伞创肌朵杂危旬旨负各名多争色壮冲冰庄庆亦刘齐交次衣产决充妄闭问闯羊并关米灯州汗污江池汤忙兴宇守宅字安讲军许论农讽设访寻那迅尽导异孙阵阳收阶阴防奸如妇好她妈戏羽观欢买红纤约级纪驰巡寿弄麦形进戒吞远违运扶抚坛技坏扰拒找批扯址走抄坝贡攻赤折抓扮抢孝均抛投坟坑抗坊抖护壳志块扭声把报却劫芽花芹芬苍芳严芦劳克苏杆杜杠材村杏极李杨求更束豆两丽医辰励否还歼来连步坚旱盯呈时吴助县里呆园旷围呀吨足邮男困吵串员听吩吹呜吼吧别岗帐财钉针告我乱利秃秀私每兵估体何但伸作伯伶佣低你住位伴身皂佛近彻役返余希坐谷妥含邻岔肝肚肠龟免狂犹角删条卵岛迎饭饮系言冻状亩况床库疗应冷这序辛弃冶忘闲间闷判灶灿弟汪沙汽沃泛沟没沈沉怀忧快完宋宏牢究穷灾良证启评补初社识诉诊词译君灵即层尿尾迟局改张忌际陆阿陈阻附妙妖妨努忍劲鸡驱纯纱纲纳纵驳纷纸纹纺驴纽奉玩环武青责现表规抹拢拔拣坦担押抽拐拖者拍顶拆拥抵拘势抱垃拉拦幸拌招坡披拨择抬其取苦若茂苹苗英范直茄茎茅林枝杯柜析板松枪构杰述枕丧或画卧事刺枣雨卖矿码厕奔奇奋态欧垄妻轰顷转斩轮软到非叔肯齿些虎虏肾贤尚旺具果味昆国昌畅明易昂典固忠咐呼鸣咏呢岸岩帖罗帜岭凯败贩购图钓制知垂牧物乖刮秆和季委佳侍供使例版侄侦侧凭侨佩货依的迫质欣征往爬彼径所舍金命斧爸采受乳贪念贫肤肺肢肿胀朋股肥服胁周昏鱼兔狐忽狗备饰饱饲变京享店夜庙府底剂郊废净盲放刻育闸闹郑券卷单炒炊炕炎炉沫浅法泄河沾泪油泊沿泡注泻泳泥沸波泼泽治怖性怕怜怪学宝宗定宜审宙官空帘实试郎诗肩房诚衬衫视话诞询该详建肃隶录居届刷屈弦承孟孤陕降限妹姑姐姓始驾参艰线练组细驶织终驻驼绍经贯奏春帮珍玻毒型挂封持项垮挎城挠政赴赵挡挺括拴拾挑指垫挣挤拼挖按挥挪某甚革荐巷带草茧茶荒茫荡荣故胡南药标枯柄栋相查柏柳柱柿栏树要咸威歪研砖厘厚砌砍面耐耍牵残殃轻鸦皆背战点临览竖省削尝是盼眨哄哑显冒映星昨畏趴胃贵界虹虾蚁思蚂虽品咽骂哗咱响哈咬咳哪炭峡罚贱贴骨钞钟钢钥钩卸缸拜看矩怎牲选适秒香种秋科重复竿段便俩货顺修保促侮俭俗俘信皇泉鬼侵追俊盾待律很须叙剑逃食盆胆胜胞胖脉勉狭狮独狡狱狠贸怨急饶蚀饺饼弯将奖哀亭亮度迹庭疮疯疫疤姿亲音帝施闻阀阁差养美姜叛送类迷前首逆总炼炸炮烂剃洁洪洒浇浊洞测洗活派洽染济洋洲浑浓津恒恢恰恼恨举觉宣室宫宪突穿窃客冠语扁袄祖神祝误诱说诵垦退既屋昼费陡眉孩除险院娃姥姨姻娇怒架贺盈勇怠柔垒绑绒结绕骄绘给络骆绝绞统耕耗艳泰珠班素蚕顽盏匪捞栽捕振载赶起盐捎捏埋捉捆捐损都哲逝捡换挽热恐壶挨耻耽恭莲莫荷获晋恶真框桂档桐株桥桃格校核样根索哥速逗栗配翅辱唇夏础破原套逐烈殊顾轿较顿毙致柴桌虑监紧党晒眠晓鸭晃晌晕蚊哨哭恩唤啊唉罢峰圆贼贿钱钳钻铁铃铅缺氧特牺造乘敌秤租秧积秩称秘透笔笑笋债借值倚倾倒倘俱倡候俯倍倦健臭射躬息徒徐舰舱般航途拿爹爱颂翁脆脂胸胳脏胶脑狸狼逢留皱饿恋桨浆衰高席准座症病疾疼疲脊效离唐资凉站剖竞部旁旅畜阅羞瓶拳粉料益兼烤烘烦烧烛烟递涛浙涝酒涉消浩海涂浴浮流润浪浸涨烫涌悟悄悔悦害宽家宵宴宾窄容宰案请朗诸读扇袜袖袍被祥课谁调冤谅谈谊剥恳展剧屑弱陵陶陷陪娱娘通能难预桑绢绣验继球理捧堵描域掩捷排掉推堆掀授教掏掠培接控探据掘职基著勒黄萌萝菌菜萄菊萍菠营械梦梢梅检梳梯桶救副票戚爽聋袭盛雪辅辆虚雀堂常匙晨睁眯眼悬野啦晚啄距跃略蛇累唱患唯崖崭崇圈铜铲银甜梨犁移笨笼笛符第敏做袋悠偿偶偷您售停偏假得衔盘船斜盒鸽悉欲彩领脚脖脸脱象够猜猪猎猫猛馅馆凑减毫麻痒痕廊康庸鹿盗章竟商族旋望率着盖粘粗粒断剪兽清添淋淹渠渐混渔淘液淡深婆梁渗情惜惭悼惧惕惊惨惯寇寄宿窑密谋谎祸谜逮敢屠弹随蛋隆隐婚婶颈绩绪续骑绳维绵绸绿琴斑替款堪塔搭越趁趋超提堤博揭喜插揪搜煮援裁搁搂搅握揉斯期欺联散惹葬葛董葡敬葱落朝辜葵棒棋植森椅椒棵棍棉棚棕惠惑逼厨厦硬确雁殖裂雄暂雅辈悲紫辉敞赏掌晴暑最量喷晶喇遇喊景践跌跑遗蛙蛛蜓喝喂喘喉幅帽赌赔黑铸铺链销锁锄锅锈锋锐短智毯鹅剩稍程稀税筐等筑策筛筒答筋筝傲傅牌堡集焦傍储奥街惩御循艇舒番释禽腊脾腔鲁猾猴然馋装蛮就痛童阔善羡普粪尊道曾焰港湖渣湿温渴滑湾渡游滋溉愤慌惰愧愉慨割寒富窜窝窗遍裕裤裙谢谣谦属屡强粥疏隔隙絮嫂登缎缓骗编缘瑞魂肆摄摸填搏塌鼓摆携搬摇搞塘摊蒜勤鹊蓝墓幕蓬蓄蒙蒸献禁楚想槐榆楼概赖酬感碍碑碎碰碗碌雷零雾雹输督龄鉴睛睡睬鄙愚暖盟歇暗照跨跳跪路跟遣蛾蜂嗓置罪罩错锡锣锤锦键锯矮辞稠愁筹签简毁舅鼠催傻像躲微愈遥腰腥腹腾腿触解酱痰廉新韵意粮数煎塑慈煤煌满漠源滤滥滔溪溜滚滨粱滩慎誉塞谨福群殿辟障嫌嫁叠缝缠静碧璃墙嘉摧截誓境摘摔撇聚慕暮蔑蔽模榴榜榨歌遭酷酿酸磁愿需裳颗嗽蜻蜡蝇蜘赚锹锻舞稳算箩管僚鼻魄貌膜膊膀鲜疑馒裹敲豪膏遮腐瘦辣竭端旗精歉弊熄熔漆漂漫滴演漏慢寨赛察蜜谱嫩翠熊凳骡缩慧撕撒趣趟撑播撞撤增聪鞋蕉蔬横槽樱橡飘醋醉震霉瞒题暴瞎影踢踏踩踪蝶蝴嘱墨镇靠稻黎稿稼箱箭篇僵躺僻德艘膝膛熟摩颜毅糊遵潜潮懂额慰劈操燕薯薪薄颠橘整融醒餐嘴蹄器赠默镜赞篮邀衡膨雕磨凝辨辩糖糕燃澡激懒壁避缴戴擦鞠藏霜霞瞧蹈螺穗繁辫赢糟糠燥臂翼骤鞭覆蹦镰翻鹰警攀蹲颤瓣爆疆壤耀躁嚼嚷籍魔灌蠢霸露囊罐匕刁丐歹戈夭仑讥冗邓艾夯凸卢叭叽皿凹囚矢乍尔冯玄邦迂邢芋芍吏夷吁吕吆屹廷迄臼仲伦伊肋旭匈凫妆亥汛讳讶讹讼诀弛阱驮驯纫玖玛韧抠扼汞扳抡坎坞抑拟抒芙芜苇芥芯芭杖杉巫杈甫匣轩卤肖吱吠呕呐吟呛吻吭邑囤吮岖牡佑佃伺囱肛肘甸狈鸠彤灸刨庇吝庐闰兑灼沐沛汰沥沦汹沧沪忱诅诈罕屁坠妓姊妒纬玫卦坷坯拓坪坤拄拧拂拙拇拗茉昔苛苫苟苞茁苔枉枢枚枫杭郁矾奈奄殴歧卓昙哎咕呵咙呻咒咆咖帕账贬贮氛秉岳侠侥侣侈卑刽刹肴觅忿瓮肮肪狞庞疟疙疚卒氓炬沽沮泣泞泌沼怔怯宠宛衩祈诡帚屉弧弥陋陌函姆虱三绅驹绊绎契贰玷玲珊拭拷拱挟垢垛拯荆茸茬荚茵茴荞荠荤荧荔栈柑栅柠枷勃柬砂泵砚鸥轴韭虐昧盹咧昵昭盅勋哆咪哟幽钙钝钠钦钧钮毡氢秕俏俄俐侯徊衍胚胧胎狰饵峦奕咨飒闺闽籽娄烁炫洼柒涎洛恃恍恬恤宦诫诬祠诲屏屎逊陨姚娜蚤骇耕耙秦匿埂捂捍袁捌挫挚捣捅埃耿聂荸莽莱莉莹莺梆栖桦栓桅桩贾酌砸砰砾殉逞哮唠哺剔蚌蚜畔蚣蚪蚓哩圃鸯唁哼唧唆峭峻赂赃钾铆氨秫笆俺赁倔殷耸舀豺豹颁胯胰脐脓逛卿鸵鸳馁凌凄衷郭斋疹紊瓷羔烙浦涡涣涤涧涕涩悍悯窍诺诽袒谆祟恕娩骏琐麸琉琅措捺捶赦埠捻掐掂掖掷掸掺勘聊娶菱菲萎菩萤干萧萨菇彬梗梧梭曹酝酗厢硅硕奢盔匾颅彪眶晤曼晦冕啡畦趾啃蛆蚯蛉蛀唬啰唾啤啥啸崎逻崔崩婴赊铐铛铝铡铣铭矫秸秽笙笤偎傀躯兜衅徘徒舶舷舵敛翎脯逸凰猖祭烹庶庵痊阎阐眷焊焕鸿涯淑淌淮淆渊淫淳淤淀涮涵惦悴惋寂窒谍谐裆袱祷谒谓谚尉堕隅婉颇绰绷综绽缀巢琳琢琼揍堰揩揽揖彭揣搀搓壹搔葫募蒋蒂韩棱椰焚椎棺榔椭粟棘酣酥硝硫颊雳翘凿棠晰鼎喳遏晾畴跋跛蛔蜒蛤鹃喻啼喧嵌赋赎赐锉锌甥掰氮氯黍筏牍粤逾腌腋腕猩猬惫敦痘痢痪竣翔奠遂焙滞湘渤渺溃溅湃愕惶寓窖窘雇谤犀隘媒媚婿缅缆缔缕骚瑟鹉瑰搪聘斟靴靶蓖蒿蒲蓉楔椿楷榄楞楣酪碘硼碉辐辑频睹睦瞄嗜嗦暇畸跷跺蜈蜗蜕蛹嗅嗡嗤署蜀幌锚锥锨锭锰稚颓筷魁衙腻腮腺鹏肄猿颖煞雏馍馏禀痹廓痴靖誊漓溢溯溶滓溺寞窥窟寝褂裸谬媳嫉缚缤剿赘熬赫蔫摹蔓蔗蔼熙蔚兢榛榕酵碟碴碱碳辕辖雌墅嘁踊蝉嘀幔镀舔熏箍箕箫舆僧孵瘩瘟彰粹漱漩漾慷寡寥谭褐裉隧嫡缨撵撩撮撬擒墩撰鞍蕊蕴樊樟橄敷豌醇磕磅碾嘶嘲嘹蝠蝎蝌蝗蝙嘿幢镊镐稽篓膘鲤鲫褒瘪瘤瘫凛憋澎潭潦澳潘澈澜澄憔懊憎翩褥谴鹤憨履嬉豫缭撼擂擅蕾薛薇擎翰噩橱橙瓢磺霍霎辙冀踱蹂蟆螃螟噪鹦黔穆篡篷篙篱儒膳鲸瘾瘸糙燎濒憾懈窿缰壕藐檬檐檩檀礁磷瞭瞬瞳瞪曙蹋蟋蟀嚎赡镣魏簇儡徽爵朦臊鳄糜癌懦豁臀藕藤瞻嚣鳍癞瀑襟璧戳攒孽蘑藻蹭蹬簸簿蟹靡癣羹鳖鬓攘蠕巍鳞糯譬霹躏髓蘸镶瓤矗"; + + public static readonly (int Min, int Max) BasicASCIIRange = (0x0020, 0x007E); + + public static readonly (int Min, int Max) FullWidthRange = (0xFF01, 0xFF5E); + + public static readonly (int Min, int Max) CJKUnifiedRange = (0x4E00, 0x9FA5); + + public static void AddRange(HashSet chars, int start, int end) + { + var actualStart = Math.Max(0, start); + var actualEnd = Math.Min(char.MaxValue, end); + + for (var i = actualStart; i <= actualEnd; i++) chars.Add((char)i); + } + + public static void AddRange(HashSet chars, (int Min, int Max) range) + { + var actualStart = Math.Max(0, range.Min); + var actualEnd = Math.Min(char.MaxValue, range.Max); + + for (var i = actualStart; i <= actualEnd; i++) chars.Add((char)i); + } + + public static void AddString(HashSet chars, string text) + { + foreach (var c in text.Where(c => !char.IsControl(c))) + { + chars.Add(c); + } + } +} \ No newline at end of file diff --git a/FontGeneratorCLI/Program.cs b/FontGeneratorCLI/Program.cs index e77c893..c051933 100644 --- a/FontGeneratorCLI/Program.cs +++ b/FontGeneratorCLI/Program.cs @@ -69,47 +69,74 @@ private static void Run() new MultiSelectionPrompt() .Title("[yellow]请选择要包含的字符集 (空格选中/取消):[/]") .Required() - .AddChoices("基础 ASCII (0x0020-0x007E)", "常用中文字符 (0x4E00-0x9FA5)", "全角符号 (0xFF01-0xFF5E)", "从外部 TXT 读取", "自定义 Hex 范围")); + .AddChoices("基础 ASCII (0x0020-0x007E)", "常用中文字符 (0x4E00-0x9FA5)", "全角符号 (0xFF01-0xFF5E)", "中文常用3500字", "从外部 TXT 读取", "自定义 Hex 范围")); var chars = new HashSet(); - if (charOptions.Contains("基础 ASCII (0x0020-0x007E)")) AddRange(chars, 0x0020, 0x007E); - if (charOptions.Contains("常用中文字符 (0x4E00-0x9FA5)")) AddRange(chars, 0x4E00, 0x9FA5); - if (charOptions.Contains("全角符号 (0xFF01-0xFF5E)")) AddRange(chars, 0xFF01, 0xFF5E); + if (charOptions.Contains("基础 ASCII (0x0020-0x007E)")) CharSet.AddRange(chars, CharSet.BasicASCIIRange); + if (charOptions.Contains("常用中文字符 (0x4E00-0x9FA5)")) CharSet.AddRange(chars, CharSet.CJKUnifiedRange); + if (charOptions.Contains("全角符号 (0xFF01-0xFF5E)")) CharSet.AddRange(chars, CharSet.FullWidthRange); + if (charOptions.Contains("中文常用3500字")) CharSet.AddString(chars, CharSet.CommonUseChinese); if (charOptions.Contains("从外部 TXT 读取")) { - var txtPath = AnsiConsole.Ask("请输入 [blue]TXT 文件路径[/]:"); - try + while (true) { - if (File.Exists(txtPath)) + var txtPath = AnsiConsole.Ask("请输入 [blue]TXT 文件路径[/] (输入 [yellow]q[/] 结束读取):", "q"); + + if (txtPath.Trim().Equals("q", StringComparison.CurrentCultureIgnoreCase)) break; + + try { - var text = File.ReadAllText(txtPath); - foreach (var c in text.Where(c => !char.IsControl(c))) chars.Add(c); + if (File.Exists(txtPath)) + { + var text = File.ReadAllText(txtPath); + var countBefore = chars.Count; + foreach (var c in text.Where(c => !char.IsControl(c))) chars.Add(c); + + AnsiConsole.MarkupLine($"[green]成功导入![/] 新增了 [yellow]{chars.Count - countBefore}[/] 个字符。"); + } + else + { + AnsiConsole.MarkupLine($"[red]错误: 文件不存在 -> {txtPath}[/]"); + } } - else + catch (Exception ex) { - AnsiConsole.MarkupLine("[red]警告: TXT 文件不存在，已跳过。[/]"); + AnsiConsole.MarkupLine($"[red]读取失败: {ex.Message}[/]"); } } - catch (Exception ex) - { - AnsiConsole.MarkupLine($"[red]读取 TXT 失败: {ex.Message}[/]"); - } } - + if (charOptions.Contains("自定义 Hex 范围")) { - var rangeStr = AnsiConsole.Ask("请输入范围 (格式如 0x4E00-0x4E10):"); - try - { - var parts = rangeStr.Split('-'); - if (parts.Length == 2) - AddRange(chars, Convert.ToInt32(parts[0].Trim(), 16), Convert.ToInt32(parts[1].Trim(), 16)); - } - catch + while (true) { - AnsiConsole.MarkupLine("[red]Hex 格式输入错误，示例: 0x0021-0x007E[/]"); + var rangeStr = AnsiConsole.Ask("请输入 Hex 范围 (如 0x4E00-0x4E10, 输入 [yellow]q[/] 结束):", "q"); + + if (rangeStr.Trim().Equals("q", StringComparison.CurrentCultureIgnoreCase)) break; + + try + { + var parts = rangeStr.Split('-'); + if (parts.Length == 2) + { + var start = Convert.ToInt32(parts[0].Trim(), 16); + var end = Convert.ToInt32(parts[1].Trim(), 16); + + var countBefore = chars.Count; + CharSet.AddRange(chars, start, end); + AnsiConsole.MarkupLine($"[green]已添加范围![/] 该区间内新增了 [yellow]{chars.Count - countBefore}[/] 个唯一字符。"); + } + else + { + AnsiConsole.MarkupLine("[red]格式错误。正确格式示例: 0x0021-0x007E[/]"); + } + } + catch + { + AnsiConsole.MarkupLine("[red]解析失败，请确保输入的是有效的 16 进制数。[/]"); + } } } @@ -119,7 +146,17 @@ private static void Run() return; } + var outputName = AnsiConsole.Ask("请输入[green]输出文件夹/字体名[/]:", "Death_Text"); + + AnsiConsole.Write(new Rule("[yellow]排版参数微调[/]").RuleStyle("grey").LeftJustified()); + + var spacing = AnsiConsole.Ask("请输入[green]字符额外间距 (spacing)[/]:", 0f); + var minusKerning = AnsiConsole.Ask("请输入[green]负字间距 (minusKerning)[/]:", 5); + var lineSpacing = AnsiConsole.Ask("请输入[green]行间距 (lineSpacing)[/]:", 24); + var latinMargin = AnsiConsole.Ask("请输入[green]拉丁字母补偿 (latinMargin)[/]:", 0.5f); + var defaultCharInput = AnsiConsole.Ask("请输入[green]默认缺省字符 (defaultChar)[/]:", "*"); + var defaultChar = string.IsNullOrEmpty(defaultCharInput) ? '*' : defaultCharInput[0]; AnsiConsole.WriteLine(); var sw = Stopwatch.StartNew(); @@ -130,10 +167,18 @@ private static void Run() .Spinner(Spinner.Known.Dots) .Start("[bold yellow]正在生成贴图中...[/]", _ => { - var fontFile = Generator.Generate(font, chars.ToArray(), outputName); + var fontFile = Generator.Generate( + font, + chars.ToArray(), + outputName, + spacing: spacing, + minusKerning: minusKerning, + lineSpacing: lineSpacing, + latinMargin: latinMargin, + defaultChar: defaultChar + ); var savePath = Path.Combine("font", outputName); - - // 确保目录存在 + if (!Directory.Exists(savePath)) Directory.CreateDirectory(savePath); fontFile.SaveMetaData(savePath); @@ -158,12 +203,4 @@ private static void Run() AnsiConsole.WriteException(ex); } } - - private static void AddRange(HashSet chars, int start, int end) - { - var actualStart = Math.Max(0, start); - var actualEnd = Math.Min(char.MaxValue, end); - - for (var i = actualStart; i <= actualEnd; i++) chars.Add((char)i); - } } \ No newline at end of file From e67ad5aad20bbfabe18db891c85af69a9620532c Mon Sep 17 00:00:00 2001 From: Cai <13110818005@qq.com> Date: Wed, 25 Feb 2026 18:06:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore(ci):=20=E6=96=B0=E5=A2=9Elinux-x64?= =?UTF-8?q?=E5=92=8Clinux-arm64=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dotnet.yml | 103 ++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 45 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 843e0e9..bd9bee8 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -13,48 +13,61 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: recursive - - - name: Setup .NET - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 10.0.x - - - name: Restore dependencies - run: dotnet restore - - - name: Build - run: dotnet build FontGeneratorCLI/FontGeneratorCLI.csproj -c Release -r win-x64 -o ./publish - - - name: Generate Tag Name - id: tag_name - run: | - DATE=$(date +'%Y.%m.%d') - COUNT=$(git tag -l "v$DATE*" | wc -l) - if [ $COUNT -eq 0 ]; then - TAG="v$DATE" - else - TAG="v$DATE.$COUNT" - fi - echo "TAG_NAME=$TAG" >> $GITHUB_ENV - echo "final_tag=$TAG" >> $GITHUB_OUTPUT - - - name: Zip Artifact - run: zip -j FontGeneratorCLI_win-x64.zip ./publish/* - - - name: Create Tag - run: | - git tag ${{ env.TAG_NAME }} - git push origin ${{ env.TAG_NAME }} - - - name: Create Release - uses: softprops/action-gh-release@v2 - with: - tag_name: ${{ env.TAG_NAME }} - name: FontGeneratorCLI ${{ env.TAG_NAME }} - generate_release_notes: true - files: | - FontGeneratorCLI_win-x64.zip + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: recursive + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 10.0.x + + - name: Restore dependencies + run: dotnet restore + + + - name: Build Windows x64 + run: dotnet publish FontGeneratorCLI/FontGeneratorCLI.csproj -c Release -r win-x64 -o ./publish/win-x64 --self-contained true + + - name: Build Linux x64 + run: dotnet publish FontGeneratorCLI/FontGeneratorCLI.csproj -c Release -r linux-x64 -o ./publish/linux-x64 --self-contained true + + - name: Build Linux ARM64 + run: dotnet publish FontGeneratorCLI/FontGeneratorCLI.csproj -c Release -r linux-arm64 -o ./publish/linux-arm64 --self-contained true + + # --- 标签生成 --- + - name: Generate Tag Name + id: tag_name + run: | + DATE=$(date +'%Y.%m.%d') + COUNT=$(git tag -l "v$DATE*" | wc -l) + if [ $COUNT -eq 0 ]; then + TAG="v$DATE" + else + TAG="v$DATE.$COUNT" + fi + echo "TAG_NAME=$TAG" >> $GITHUB_ENV + echo "final_tag=$TAG" >> $GITHUB_OUTPUT + + - name: Zip Artifacts + run: | + zip -j FontGeneratorCLI_win-x64.zip ./publish/win-x64/* + zip -j FontGeneratorCLI_linux-x64.zip ./publish/linux-x64/* + zip -j FontGeneratorCLI_linux-arm64.zip ./publish/linux-arm64/* + + - name: Create Tag + run: | + git tag ${{ env.TAG_NAME }} + git push origin ${{ env.TAG_NAME }} + + - name: Create Release + uses: softprops/action-gh-release@v2 + with: + tag_name: ${{ env.TAG_NAME }} + name: FontGeneratorCLI ${{ env.TAG_NAME }} + generate_release_notes: true + files: | + FontGeneratorCLI_win-x64.zip + FontGeneratorCLI_linux-x64.zip + FontGeneratorCLI_linux-arm64.zip \ No newline at end of file