diff --git a/character/diy.js b/character/diy.js
index 631aa442d..ceeba6270 100755
--- a/character/diy.js
+++ b/character/diy.js
@@ -178,6 +178,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
ns_chengpu:['male','wu',4,['decadelihuo','decadechunlao']],
ns_sundeng:['male','wu',4,['xinkuangbi']],
ns_duji:['male','wei',3,['xinfu_andong','xinyingshi']],
+ old_majun:["male","wei",3,["xinfu_jingxie1","xinfu_qiaosi"],[]],
old_jiakui:['male','wei',4,['tongqu','xinwanlan']],
ol_guohuai:['male','wei',3,['rejingce']],
@@ -220,7 +221,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
diy_tieba:["ns_zuoci","ns_lvzhi","ns_wangyun","ns_nanhua","ns_nanhua_left","ns_nanhua_right","ns_huamulan","ns_huangzu","ns_jinke","ns_yanliang","ns_wenchou","ns_caocao","ns_caocaosp","ns_zhugeliang","ns_wangyue","ns_yuji","ns_xinxianying","ns_guanlu","ns_simazhao","ns_sunjian","ns_duangui","ns_zhangbao","ns_masu","ns_zhangxiu","ns_lvmeng","ns_shenpei","ns_yujisp","ns_yangyi","ns_liuzhang","ns_xinnanhua","ns_luyusheng"],
diy_fakenews:["diy_wenyang","ns_zhangwei","ns_caimao","ns_chengpu",'ns_sundeng','ns_duji'],
diy_xushi:["diy_feishi","diy_hanlong","diy_liufu","diy_liuyan","diy_liuzan","diy_tianyu","diy_xizhenxihong","diy_yangyi","diy_zaozhirenjun"],
- diy_default:["diy_yuji","diy_caiwenji","diy_lukang","diy_zhenji"],
+ diy_default:["diy_yuji","diy_caiwenji","diy_lukang","diy_zhenji","old_majun"],
diy_noname:['noname'],
diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_umi","key_rei","key_komari","key_yukine","key_yusa","key_misa","key_masato","key_iwasawa","key_kengo","key_yoshino","key_yui","key_tsumugi","key_saya","key_harukakanata","key_inari","key_shiina","key_sunohara","key_rin","key_sasami","key_akane","key_doruji","key_yuiko","key_riki","key_hisako","key_hinata","key_noda","key_tomoya","key_nagisa","key_ayato","key_ao","key_yuzuru","sp_key_kanade","key_mio","key_midori","key_kyoko","key_shizuru","key_shiorimiyuki","key_miki","key_shiori","key_kaori","sp_key_yuri","key_akiko","key_abyusa","key_godan","key_yuu","key_ryoichi","key_kotori","key_jojiro","key_shiroha","key_shizuku","key_hiroto","key_sakuya","key_youta","key_rumi","key_chihaya","key_yukito","key_asara","key_kotomi","key_mia","key_kano","db_key_liyingxia","key_erika","key_satomi","key_iriya","key_fuuko"],
diy_trashbin:['old_jiakui','ol_guohuai','junk_zhangrang','old_bulianshi','junk_sunquan','ol_maliang','junk_liubei','junk_huangyueying','junk_lidian','junk_duanwei','junk_xuyou'],
@@ -19027,6 +19028,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
junk_liubei_prefix:'旧界',
junk_huangyueying:'旧界黄月英',
junk_huangyueying_prefix:'旧界',
+ old_majun:'骰子马钧',
+ old_majun_prefix:'骰子',
diy_tieba:'吧友设计',
diy_xushi:'玩点论杀·虚实篇',
diff --git a/character/old.js b/character/old.js
index 0345247b9..ce1b929f0 100755
--- a/character/old.js
+++ b/character/old.js
@@ -16,7 +16,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
old_yijiang67:["ol_zhangrang",'old_huanghao','old_liyan'],
old_sp:["old_wanglang","old_maliang","old_zhangxingcai","old_wangyun",'old_dingfeng'],
old_yingbian:['junk_simayi','old_yangyan','old_yangzhi'],
- old_mobile:["old_caochun",'old_majun'],
+ old_mobile:["old_caochun"],
},
},
character:{
@@ -48,7 +48,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
old_xiaoqiao:['female','wu',3,['tianxiang','hongyan']],
weiyan:['male','shu',4,['kuanggu']],
xiahouyuan:['male','wei',4,['shensu']],
- old_majun:["male","wei",3,["xinfu_jingxie1","xinfu_qiaosi"],[]],
old_zhangxingcai:['female','shu',3,['oldshenxian','qiangwu']],
old_fuhuanghou:['female','qun',3,['oldzhuikong','oldqiuyuan']],
old_caochong:['male','wei',3,['oldrenxin','oldchengxiang']],
@@ -1012,7 +1011,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
translate:{
old_zhangxingcai:'旧张星彩',
old_zhangxingcai_prefix:'旧',
- old_majun:'骰子马钧',
old_xusheng:'旧徐盛',
old_xusheng_prefix:'旧',
old_lingtong:'旧凌统',
@@ -1066,7 +1064,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
old_wangyi:'旧王异',
old_wangyi_prefix:'旧',
xin_yujin:'节钺于禁',
+ xin_yujin_prefix:'节钺',
re_yujin:'毅重于禁',
+ re_yujin_prefix:'毅重',
old_guhuo:"蛊惑",
old_guhuo_info:"你可以扣置一张手牌当做一张基本牌或普通锦囊牌使用或打出，体力值不为0的其他角色依次选择是否质疑。然后，若有质疑的角色，你展示此牌：若为假，此牌作废，这些角色摸一张牌；若为真，这些角色失去1点体力，且若此牌不为♥，此牌作废。",
diff --git a/character/sp.js b/character/sp.js
index b0b932c9e..25c9b9b4b 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -945,7 +945,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.finish();
}
else player.draw(3);
- 'step 2'
+ 'step 1'
player.chooseToDiscard('h','技能：弃置至少一半手牌',[Math.floor(player.countCards('h')/2),Infinity],true).set('ai',card=>{
var player=_status.event.player;
if(player.hasSkill('skill_feiyi_B')&&player.countCards('h')-ui.selected.cards.length>1) return 1/(get.value(card)||0.5);
diff --git a/font/suits.woff2 b/font/suits.woff2
index 6f4cbf50a..70f4e7aa3 100644
Binary files a/font/suits.woff2 and b/font/suits.woff2 differ
diff --git a/game/game.js b/game/game.js
index cc127f782..0901cc9c7 100644
--- a/game/game.js
+++ b/game/game.js
@@ -33756,12 +33756,28 @@
color:'#a4a4a4',
nature:'black',
}],
+ ['节钺',{
+ color:'#a4a4a4',
+ nature:'black',
+ }],
+ ['毅重',{
+ color:'#a4a4a4',
+ nature:'black',
+ }],
['★SP',{
showName:'★',
}],
['K系列',{
showName:'Ｋ',
}],
+ ['经典',{
+ showName:'典',
+ }],
+ ['骰子',{
+ getSpan:()=>{
+ return `🎲`;
+ }
+ }],
['SP',{
getSpan:(prefix,name)=>{
return `SP`;
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 63a6dd957..622ba0a2f 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -2789,7 +2789,7 @@ div:not(.handcards)>.card>.info>span,
.player.minskin .count {
right: 20px;
}
-#arena:not(.stone) div:not(.character):not(.button)>.identity {
+.identity {
left: 90px;
top: 5px;
}
diff --git a/layout/newlayout/global.css b/layout/newlayout/global.css
index 7c13c8be8..691d4bc6e 100644
--- a/layout/newlayout/global.css
+++ b/layout/newlayout/global.css
@@ -322,6 +322,7 @@
.player .identity{
right: -6px;
top: -5px;
+ left: auto;
}
.player.minskin .identity{
left:102px;