diff --git a/character/offline.js b/character/offline.js
index 9ccf2783b..36559222d 100644
--- a/character/offline.js
+++ b/character/offline.js
@@ -2323,7 +2323,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
game.updateRoundNumber();
}
},
- //官盗S1066☆贾诩
+ //官盗S1066★贾诩
psqupo:{
audio:2,
trigger:{global:'phaseBegin'},
@@ -6332,8 +6332,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
ns_chendao_prefix:'用间',
nsjianglie:'将烈',
nsjianglie_info:'当你使用【杀】指定目标后，你可以令其展示所有手牌，然后弃置其中一种颜色的牌。',
- ns_jiaxu:'☆贾诩',
- ns_jiaxu_prefix:'☆',
+ ns_jiaxu:'★贾诩',
+ ns_jiaxu_prefix:'★',
nsyice:'遗策',
nsyice_info:'锁定技，当你使用/打出/弃置的牌进入弃牌堆后，你将这些牌以任意顺序置于你的武将牌上，称为“策”。若这些“策”中有点数相同的牌，则你获得这两张牌中的所有牌，将这两张牌置于牌堆两端。若场上没有处于濒死状态的角色，则你对一名角色造成1点伤害。',
ns_lijue:'SP李傕',
@@ -6350,11 +6350,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
ns_fanchou_prefix:'SP',
nsyangwu:'扬武',
nsyangwu_info:'出牌阶段限一次，你可以弃置一张♥手牌并选择一名手牌数大于你的其他角色。你观看其手牌并获得其中的X张牌（X为其与你手牌数之差的一半且向上取整）。',
- jsp_liubei:'群刘备',
- jsp_liubei_ab:'刘备',
+ jsp_liubei:'★刘备',
+ jsp_liubei_prefix:'★',
jsprende:'仁德',
jsprende_info:'出牌阶段，你可以将至少一张手牌交给其他角色；若你于此阶段内给出的牌首次达到两张，你可以视为使用一张基本牌。',
- ns_caoanmin:'曹安民',
+ ns_caoanmin:'战役篇曹安民',
+ ns_caoanmin_prefix:'战役篇',
nskuishe:'窥舍',
nskuishe_info:'出牌阶段限一次，你可以选择一名其他角色A的一张牌，并将此牌交给不为A的一名角色。然后A可以对你使用一张【杀】。',
sp_xiahoushi:"SP夏侯氏",
@@ -6543,88 +6544,88 @@ game.import('character',function(lib,game,ui,get,ai,_status){
gzsuishi2:'随势',
gzsuishi_info:'锁定技，其他角色进入濒死状态时，若伤害来源与你势力相同，你摸一张牌；其他角色死亡时，若其与你势力相同，你失去1点体力。',
//线下S系列
- ps_guanyu:'☆关羽',
- ps_guanyu_prefix:'☆',
+ ps_guanyu:'★关羽',
+ ps_guanyu_prefix:'★',
pszhonghun:'忠魂',
pszhonghun_info:'当你使用或打出红色牌时，你可以亮出牌堆顶的一张牌。若此牌为红色，你获得之。',
- ps2070_guojia:'☆郭嘉',
- ps2070_guojia_prefix:'☆',
+ ps2070_guojia:'★郭嘉',
+ ps2070_guojia_prefix:'★',
psquanmou:'全谋',
psquanmou_info:'当其他角色使用锦囊牌结算结束后，若你是此牌目标，你可以弃置一张与此牌颜色相同的手牌并获得之。',
- ps1059_guojia:'☆郭嘉',
- ps1059_guojia_prefix:'☆',
+ ps1059_guojia:'★郭嘉',
+ ps1059_guojia_prefix:'★',
psqizuo:'奇佐',
psqizuo_info:'当你攻击范围内的角色造成或受到伤害时，你可以弃置一张牌并判定，若此牌颜色与结果相同，你可以令此伤害+1或-1。',
- ps2063_zhaoyun:'☆赵云',
- ps2063_zhaoyun_prefix:'☆',
+ ps2063_zhaoyun:'★赵云',
+ ps2063_zhaoyun_prefix:'★',
psqijin:'七进',
psqijin_info:'摸牌阶段，你可以改为亮出牌堆顶的七张牌，并获得其中一种颜色的所有牌。',
psqichu:'七出',
psqichu_info:'每回合限一次。当你于回合外需要使用或打出一张基本牌时，你可以观看牌堆顶的两张牌。若其中有此牌，你可以使用或打出之。',
pslongxin:'龙心',
pslongxin_info:'判定阶段开始时，你可以弃置一张装备牌，然后弃置你判定区里的一张牌。',
- ps2080_zhouyu:'☆周瑜',
- ps2080_zhouyu_prefix:'☆',
+ ps2080_zhouyu:'★周瑜',
+ ps2080_zhouyu_prefix:'★',
psshiyin:'识音',
psshiyin_info:'①游戏开始时，你可以将一张手牌置于武将牌上，称为“杂音”牌。②出牌阶段开始时，你可以用一张手牌替换“杂音”牌。',
psquwu:'曲误',
psquwu_info:'锁定技。你不能使用或打出与“杂音”牌花色相同的牌，且这些牌对你无效。',
psliaozou:'聊奏',
psliaozou_info:'出牌阶段，你可以展示所有手牌，若其中没有与“杂音”牌花色相同的牌，你摸一张牌。',
- ps1062_zhouyu:'☆周瑜',
- ps1062_zhouyu_prefix:'☆',
+ ps1062_zhouyu:'★周瑜',
+ ps1062_zhouyu_prefix:'★',
psoldshiyin:'识音',
psoldshiyin_info:'当你于回合内得到牌后，你可以展示之，然后根据你展示的牌包含的花色数令你本回合使用的下一张牌获得对应效果：不小于1，不能被响应；不小于2，造成的伤害+1；不小于3，使用时摸一张牌。',
- ps_caozhi:'☆曹植',
- ps_caozhi_prefix:'☆',
+ ps_caozhi:'★曹植',
+ ps_caozhi_prefix:'★',
psliushang:'流殇',
psliushang_info:'锁定技。①摸牌阶段，你改为摸X+1张牌，然后依次将一张手牌置于所有其他角色的武将牌上，称为“流殇”牌（X为场上角色数且至少为3）。②其他角色的准备阶段，其选择一项：1.获得其“流殇”牌，且当其于本回合对你造成伤害时，防止此伤害；2.将其“流殇”牌置入弃牌堆。',
psqibu:'七步',
psqibu_info:'限定技。当你进入濒死状态时，你可以亮出牌堆顶的七张牌，回复等同于其中♥牌数的体力，并获得所有♣牌。',
- ps_jin_simayi:'☆司马懿',
- ps_jin_simayi_prefix:'☆',
+ ps_jin_simayi:'★司马懿',
+ ps_jin_simayi_prefix:'★',
psquanyi:'权奕',
psquanyi_info:'①出牌阶段限一次。你可以与一名角色拼点，赢的角色根据所有拼点牌的花色执行以下效果：♥，其获得没赢的角色区域里的一张牌；♦其对没赢的角色造成1点伤害；♠，其失去1点体力；♣，其弃置两张牌。②当你拼点时，你可以选择牌堆顶的牌作为拼点牌。',
ps2067_zhaoyun:'武将传赵云',
- ps2067_zhaoyun_ab:'赵云',
+ ps2067_zhaoyun_prefix:'武将传',
pshuiqiang:'回枪',
pshuiqiang_info:'当你使用的【杀】被【闪】抵消后，你可以对其使用一张【杀】。',
pshuntu:'魂突',
pshuntu_info:'出牌阶段限一次。当你使用【杀】对目标角色造成伤害后，你可以对其使用一张【杀】。',
- ps_caopi:'☆曹丕',
- ps_caopi_prefix:'☆',
+ ps_caopi:'★曹丕',
+ ps_caopi_prefix:'★',
psjianwei:'僭位',
psjianwei_info:'限定技。回合开始时，你可以失去1点体力，然后与一名其他角色交换区域里的所有牌。',
- ps2068_simayi:'☆司马懿',
- ps2068_simayi_prefix:'☆',
+ ps2068_simayi:'★司马懿',
+ ps2068_simayi_prefix:'★',
pszhonghu:'冢虎',
pszhonghu_info:'当一名角色于你的回合外死亡后，你可以结束此回合，然后令所有角色于其回合开始前跳过此回合直到你的回合开始前。',
- ps_simayi:'☆司马懿',
- ps_simayi_prefix:'☆',
+ ps_simayi:'★司马懿',
+ ps_simayi_prefix:'★',
pshuxiao:'虎啸',
pshuxiao_info:'回合开始时，你可以判定。若结果为基本牌或普通锦囊牌，你于本回合内获得如下效果：你可以将与结果点数或花色相同的手牌当与判定牌牌名和属性相同的牌使用。',
- ps_zhugeliang:'☆诸葛亮',
- ps_zhugeliang_prefix:'☆',
+ ps_zhugeliang:'★诸葛亮',
+ ps_zhugeliang_prefix:'★',
psguanxing:'观星',
psguanxing_info:'准备阶段，你可以观看牌堆顶的五张牌，并将其以任意顺序置于牌堆项或牌堆底。',
pslongyin:'龙吟',
pslongyin_info:'每回合限一次。你可以将任意张点数和为13的牌当做任意一张基本牌或普通锦囊牌使用或打出。',
ps2066_zhugeliang:'武将传诸葛亮',
- ps2066_zhugeliang_ab:'诸葛亮',
+ ps2066_zhugeliang_prefix:'武将传',
pszhiji:'智激',
pszhiji_info:'出牌阶段限一次。你可以弃置两张手牌并选择两名势力不同的角色，视为这两名角色依次视为对对方使用一张【杀】。',
psjiefeng:'借风',
psjiefeng_info:'出牌阶段，你可以弃置两张手牌，然后亮出牌堆顶五张牌。若其中有至少两张红色牌，你视为使用一张【万箭齐发】。',
- ps_machao:'☆马超',
- ps_machao_prefix:'☆',
+ ps_machao:'★马超',
+ ps_machao_prefix:'★',
psweihou:'威侯',
psweihou_info:'当你判定前，你可以展示牌堆顶的两张牌，选择其中一张作为你的本次判定结果，然后将另一张置入弃牌堆。',
- ps_lvbu:'☆吕布',
- ps_lvbu_prefix:'☆',
+ ps_lvbu:'★吕布',
+ ps_lvbu_prefix:'★',
pssheji:'射戟',
pssheji_info:'出牌阶段限一次。你可以将所有手牌当一张无距离限制的【杀】使用，然后当此【杀】对目标角色造成伤害后，你获得其装备区里的所有武器牌和坐骑牌。',
- ps_jiaxu:'☆贾诩',
- ps_jiaxu_prefix:'☆',
+ ps_jiaxu:'★贾诩',
+ ps_jiaxu_prefix:'★',
psqupo:'驱魄',
psqupo_info:'一名角色A的回合开始时，你可以将一张牌交给另一名其他角色B。若此牌为：黑色，当A使用【杀】指定不为B的角色为目标时，A失去1点体力；红色，当B于本回合下一次受到伤害时，B失去1点体力。',
psbaoquan:'保全',
@@ -6680,6 +6681,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhangliang_prefix:'SP',
ol_xinxianying:'将辛宪英',
ol_xinxianying_prefix:'将',
+ chendong:'战役篇陈武董袭',
+ chendong_prefix:'战役篇',
+ jiangfei:'战役篇蒋琬费祎',
+ jiangfei_prefix:'战役篇',
+ jiangqing:'战役篇蒋钦',
+ jiangqing_prefix:'战役篇',
+ tianfeng:'战役篇田丰',
+ tianfeng_prefix:'战役篇',
+ jiling:'战役篇纪灵',
+ jiling_prefix:'战役篇',
+ kongrong:'战役篇孔融',
+ kongrong_prefix:'战役篇',
+ mateng:'战役篇马腾',
+ mateng_prefix:'战役篇',
offline_star:'桌游志·SP',
offline_sticker:'桌游志·贴纸',
diff --git a/character/shiji.js b/character/shiji.js
index 311c8483b..a11a0cfab 100644
--- a/character/shiji.js
+++ b/character/shiji.js
@@ -6624,7 +6624,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dbquedi:'却敌',
dbquedi_info:'每回合限一次。当你使用【杀】或【决斗】指定唯一目标后，你可选择：①获得目标角色的一张手牌。②弃置一张基本牌，并令此牌的伤害值基数+1。③背水：减1点体力上限，然后依次执行上述所有选项。',
dbzhuifeng:'椎锋',
- dbzhuifeng_info:'魏势力技。每回合限两次，你可以失去1点体力并视为使用一张【决斗】。当你因此【决斗】而受到伤害时，你防止此伤害并令此技能失效直到出牌阶段结束。',
+ dbzhuifeng_info:'魏势力技。每回合限两次，你可以失去1点体力并视为使用一张【决斗】（你死亡后仍然结算）。当你因此【决斗】而受到伤害时，你防止此伤害并令此技能失效直到出牌阶段结束。',
dbchongjian:'冲坚',
dbchongjian_backup:'冲坚',
dbchongjian_info:'吴势力技。你可以将一张装备牌当做一种【杀】（无距离限制且无视防具）或【酒】使用。当你以此法使用【杀】造成伤害后，你获得目标角色装备区内的X张牌（X为伤害值）。',
diff --git a/character/sp.js b/character/sp.js
index 157341497..b0b932c9e 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -24510,7 +24510,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhangren:'张任',
zoushi:'邹氏',
zangba:'臧霸',
- jiling:'纪灵',
+ gz_jiling:'纪灵',
gz_sp_dongzhuo:'董卓',
gz_zhangjiao:'张角',
litong:'李通',
@@ -24531,12 +24531,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhugejin:'诸葛瑾',
zhugeke:'诸葛恪',
guanyinping:'关银屏',
+ gz_ganfuren:'甘夫人',
ganfuren:'SP甘夫人',
ganfuren_prefix:'SP',
sunhao:'孙皓',
chengyu:'程昱',
simalang:'司马朗',
- tianfeng:'田丰',
+ gz_tianfeng:'田丰',
sp_jiaxu:'SP贾诩',
sp_jiaxu_prefix:'SP',
maliang:'马良',
@@ -24546,14 +24547,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
mifuren:'糜夫人',
sp_dongzhuo:'SP董卓',
sp_dongzhuo_prefix:'SP',
- chendong:'陈武董袭',
- jiangfei:'蒋琬费祎',
- jiangqing:'蒋钦',
+ gz_chendong:'陈武董袭',
+ gz_jiangfei:'蒋琬费祎',
+ gz_jiangqing:'蒋钦',
hetaihou:'何太后',
dingfeng:'丁奉',
zhangxingcai:'张星彩',
caoang:'曹昂',
- kongrong:'孔融',
+ gz_kongrong:'孔融',
fuwan:'伏完',
sp_pangde:'SP庞德',
sp_pangde_prefix:'SP',
@@ -24570,7 +24571,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
mayunlu:'马云騄',
zhanglu:'张鲁',
wutugu:'兀突骨',
- mateng:'马腾',
+ gz_mateng:'马腾',
sp_caiwenji:'SP蔡琰',
sp_caiwenji_prefix:'SP',
zhugeguo:'诸葛果',
@@ -25241,6 +25242,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
yanxiao_card:'言笑',
yanxiao_global:'言笑',
yanxiao_card_info:'判定阶段开始时，你获得判定区内的所有牌。',
+ gz_huangzu:'黄祖',
huangzu:'OL黄祖',
huangzu_prefix:'OL',
wangong:'挽弓',
diff --git a/character/sp2.js b/character/sp2.js
index 56b2e52b7..e10796a8a 100644
--- a/character/sp2.js
+++ b/character/sp2.js
@@ -10136,8 +10136,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhangqiying:"张琪瑛",
sp_liuqi:'刘琦',
xf_tangzi:"唐咨",
+ gz_xf_huangquan:"黄权",
xf_huangquan:"OL黄权",
xf_huangquan_prefix:"OL",
+ gz_xf_sufei:"苏飞",
xf_sufei:"OL苏飞",
xf_sufei_prefix:"OL",
"xinfu_langxi":"狼袭",
diff --git a/character/xianding.js b/character/xianding.js
index 866fb6a3c..f060428ed 100644
--- a/character/xianding.js
+++ b/character/xianding.js
@@ -199,9 +199,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
subSkill:{
minus:{
+ audio:'dcxiongmu',
trigger:{player:'damageBegin4'},
filter:function(event,player){
- return player.countCards('h')<=player.hp&&game.getGlobalHistory('everything',evt=>{
+ return player.countCards('h')<=player.getHp()&&game.getGlobalHistory('everything',evt=>{
return evt.name=='damage'&&evt.player==player;
},event).indexOf(event)==0;
},
diff --git a/character/yingbian.js b/character/yingbian.js
index 604694ef7..a8a6c443b 100644
--- a/character/yingbian.js
+++ b/character/yingbian.js
@@ -3611,6 +3611,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
xijue_xiaoguo:'骁果',
xijue_xiaoguo_info:'其他角色的结束阶段开始时，你可以弃置一张基本牌，令该角色选择一项：1.弃置一张装备牌，然后你摸一张牌；2.受到你对其造成的1点伤害。',
xijue_xiaoguo_info_guozhan:'其他角色的结束阶段开始时，你可以弃置一张基本牌，令该角色选择一项：1.弃置一张装备牌；2.受到你对其造成的1点伤害。',
+ gz_duyu:'杜预',
duyu:'晋杜预',
duyu_prefix:'晋',
sanchen:'三陈',
diff --git a/game/game.js b/game/game.js
index 229836eee..cc127f782 100644
--- a/game/game.js
+++ b/game/game.js
@@ -3199,6 +3199,16 @@
},
unfrequent:true,
},
+ buttoncharacter_prefix:{
+ name:'武将前缀',
+ init:'default',
+ item:{
+ default:'默认',
+ simple:'不显示颜色',
+ off:'不显示前缀'
+ },
+ unfrequent:true,
+ },
cursor_style:{
name:'鼠标指针',
init:'auto',
@@ -5160,7 +5170,7 @@
init:true,
onclick:function(bool){
game.saveConfig('free_choose',bool,this._link.config.mode);
- if(!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
+ if(get.mode()!=this._link.config.mode||!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
if(!ui.cheat2&&get.config('free_choose')) ui.create.cheat2();
else if(ui.cheat2&&!get.config('free_choose')){
ui.cheat2.close();
@@ -5610,7 +5620,7 @@
init:true,
onclick:function(bool){
game.saveConfig('free_choose',bool,this._link.config.mode);
- if(get.mode()!='guozhan'||!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
+ if(get.mode()!=this._link.config.mode||!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
if(!ui.cheat2&&get.config('free_choose')) ui.create.cheat2();
else if(ui.cheat2&&!get.config('free_choose')){
ui.cheat2.close();
@@ -5984,7 +5994,7 @@
onclick:function(bool){
game.saveConfig('free_choose',bool,this._link.config.mode);
if(!ui.create.cheat2) return;
- if(!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
+ if(get.mode()!=this._link.config.mode||!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
if(!ui.cheat2&&get.config('free_choose')) ui.create.cheat2();
else if(ui.cheat2&&!get.config('free_choose')){
ui.cheat2.close();
@@ -6359,7 +6369,7 @@
frequent:true,
onclick:function(bool){
game.saveConfig('free_choose',bool,this._link.config.mode);
- if(!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
+ if(get.mode()!=this._link.config.mode||!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
if(!ui.cheat2&&get.config('free_choose')) ui.create.cheat2();
else if(ui.cheat2&&!get.config('free_choose')){
ui.cheat2.close();
@@ -6530,7 +6540,7 @@
init:true,
onclick:function(bool){
game.saveConfig('free_choose',bool,this._link.config.mode);
- if(!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
+ if(get.mode()!=this._link.config.mode||!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
if(!ui.cheat2&&get.config('free_choose')) ui.create.cheat2();
else if(ui.cheat2&&!get.config('free_choose')){
ui.cheat2.close();
@@ -6959,7 +6969,7 @@
init:true,
onclick:function(bool){
game.saveConfig('free_choose',bool,this._link.config.mode);
- if(!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
+ if(get.mode()!=this._link.config.mode||!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
if(!ui.cheat2&&get.config('free_choose')) ui.create.cheat2();
else if(ui.cheat2&&!get.config('free_choose')){
ui.cheat2.close();
@@ -7247,7 +7257,7 @@
onclick:function(bool){
game.saveConfig('free_choose',bool,this._link.config.mode);
if(_status.connectMode) return;
- if(!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
+ if(get.mode()!=this._link.config.mode||!_status.event.getParent().showConfig&&!_status.event.showConfig) return;
if(!ui.cheat2&&get.config('free_choose')) ui.create.cheat2();
else if(ui.cheat2&&!get.config('free_choose')){
ui.cheat2.close();
@@ -33725,6 +33735,11 @@
nature:'thundermm',
showName:'战',
}],
+ ['武将传',{
+ color:'#c3f9ff',
+ nature:'thundermm',
+ showName:'传',
+ }],
['将',{
nature:'firemm',
}],
@@ -33764,6 +33779,7 @@
}],
['手杀',{
getSpan:(prefix,name)=>{
+ const simple=(lib.config.buttoncharacter_prefix=='simple');
if(lib.characterPack.shiji&&name in lib.characterPack.shiji){
for(let i in lib.characterSort.shiji){
if(lib.characterSort.shiji[i].includes(name)){
@@ -33771,8 +33787,10 @@
break;
}
}
+ if(simple) return `${prefix}`;
return `${prefix}`;
}
+ if(simple) return '手杀';
return `📱`;
},
}],
@@ -33818,7 +33836,7 @@
}],
['S特神',{
getSpan:(prefix,name)=>{
- return get.prefixSpan('☆')+get.prefixSpan('神')
+ return get.prefixSpan('★')+get.prefixSpan('神')
},
}],
]),
@@ -57542,13 +57560,15 @@
},
prefixSpan:function(prefix,name){
let color='#ffffff',nature=false;
- const map=lib.namePrefix.get(prefix);
+ const map=lib.namePrefix.get(prefix),config=lib.config.buttoncharacter_prefix;
+ if(config=='off') return '';
if(map){
if(map.getSpan) return map.getSpan(prefix,name);
if(map.color) color=map.color;
if(map.nature) nature=map.nature;
if(map.showName) prefix=map.showName;
}
+ if(config=='simple') return `${prefix}`
return `${prefix}`
},
slimName:function(str){
@@ -58694,9 +58714,9 @@
}
let capt=get.translation(node.name);
const characterInfo=get.character(node.name),sex=node.sex||characterInfo[0];
- if(sex&&lib.config.show_sex) capt+=` ${sex=='none'?'无':get.translation(sex)}`;
- const group=lib.group.includes(node.group)?node.group:characterInfo[1];
- if(group&&lib.config.show_group) capt+=` ${get.translation(group)}`;
+ if(sex&&sex!='unknown'&&lib.config.show_sex) capt+=` ${sex=='none'?'无':get.translation(sex)}`;
+ const group=node.group;
+ if(group&&group!='unknown'&&lib.config.show_group) capt+=` ${get.translation(group)}`;
uiintro.add(capt);
if(lib.characterTitle[node.name]){
diff --git a/game/pinyinjs.js b/game/pinyinjs.js
index 70be09dc4..cc75d26b4 100644
--- a/game/pinyinjs.js
+++ b/game/pinyinjs.js
@@ -7,8 +7,6 @@ var pinyin_dict_polyphone = {
// noname's pinyin
// START
// 武将名
- "乐蔡琰": "yuè ",
- "乐周妃": "yuè fēi",
"用间": " jiàn",
"乐进": "yuè ",
@@ -41583,17 +41581,21 @@ var pinyin_dict_withtone = "yī,dīng zhēng,kǎo qiǎo yú,qī,shàng,xià,hǎn
}
return result;
}
- for (var i = 0; i < chinese.length; i++) {
+ var m=0;
+ for (var i = 0; i < chinese.length;(i++,m++)) {
temp = '';
for (var j = 0; j < max && (i + j) < chinese.length; j++) {
- if (!/^[\u2E80-\u9FFF]+$/.test(chinese[i + j])) break; // 如果碰到非汉字直接停止本次查找
+ if (!dict.withtone[chinese[i]]) {
+ m-=(result[i].length-1);
+ break;
+ } // 如果碰到非汉字直接停止本次查找
temp += chinese[i + j];
var res = poly[temp];
if (res) // 如果找到了多音字词语
{
res = res.split(' ');
for (var k = 0; k <= j; k++) {
- if (res[k]) result[i + k] = withtone ? res[k] : pinyinUtilx.removeTone(res[k]);
+ if (res[k]) result[m + k] = withtone ? res[k] : pinyinUtilx.removeTone(res[k]);
}
break;
}
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 622ba0a2f..63a6dd957 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;
}
-.identity {
+#arena:not(.stone) div:not(.character):not(.button)>.identity {
left: 90px;
top: 5px;
}
diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css
index 49bcaab0c..46818aaae 100644
--- a/layout/mobile/layout.css
+++ b/layout/mobile/layout.css
@@ -224,7 +224,7 @@
#arena:not(.chess) .player[data-position='0'].linked>.name.name2{
left:69px;
}
-#arena:not(.chess) .player[data-position='0']>.identity{
+#arena:not(.chess):not(.stone) .player[data-position='0']>.identity{
left: 0;
width: 130px;
}
diff --git a/layout/mode/stone.css b/layout/mode/stone.css
index d699af79c..d7b67be51 100644
--- a/layout/mode/stone.css
+++ b/layout/mode/stone.css
@@ -63,7 +63,7 @@
/* } */
#arena:not(.chess).mobile .player[data-position='0']:not(.minskin)>.identity{
- left: 102px;
+ left: 100px;
top: -7px;
}
@@ -307,42 +307,42 @@
}
div[data-career='mage']{
- background-image: url('../../../image/mode/stone/career/mage.png');
+ background-image: url('../../image/mode/stone/career/mage.png');
background-size:cover;
}
div[data-career='druid']{
- background-image: url('../../../image/mode/stone/career/druid.png');
+ background-image: url('../../image/mode/stone/career/druid.png');
background-size:cover;
}
div[data-career='hunter']{
- background-image: url('../../../image/mode/stone/career/hunter.png');
+ background-image: url('../../image/mode/stone/career/hunter.png');
background-size:cover;
}
div[data-career='shaman']{
- background-image: url('../../../image/mode/stone/career/shaman.png');
+ background-image: url('../../image/mode/stone/career/shaman.png');
background-size:cover;
}
div[data-career='paladin']{
- background-image: url('../../../image/mode/stone/career/paladin.png');
+ background-image: url('../../image/mode/stone/career/paladin.png');
background-size:cover;
}
div[data-career='rogue']{
- background-image: url('../../../image/mode/stone/career/rogue.png');
+ background-image: url('../../image/mode/stone/career/rogue.png');
background-size:cover;
}
div[data-career='priest']{
- background-image: url('../../../image/mode/stone/career/priest.png');
+ background-image: url('../../image/mode/stone/career/priest.png');
background-size:cover;
}
div[data-career='warrior']{
- background-image: url('../../../image/mode/stone/career/warrior.png');
+ background-image: url('../../image/mode/stone/career/warrior.png');
background-size:cover;
}
div[data-career='warlock']{
- background-image: url('../../../image/mode/stone/career/warlock.png');
+ background-image: url('../../image/mode/stone/career/warlock.png');
background-size:cover;
}
div[data-career='knight']{
- background-image: url('../../../image/mode/stone/career/knight.png');
+ background-image: url('../../image/mode/stone/career/knight.png');
background-size:cover;
}
diff --git a/mode/brawl.js b/mode/brawl.js
index 549118fc0..493536c68 100644
--- a/mode/brawl.js
+++ b/mode/brawl.js
@@ -4065,6 +4065,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
var info=scene.players[i];
target.brawlinfo=info;
target.identity=info.identity;
+ if(target.identity=='zhu') target.isZhu=true;
target.setIdentity(info.identity);
target.node.marks.hide();
if(info.name2!='none'&&info.name2!='random'){