Merge pull request #956 from lieren2023/lieren2023-patch-3

bug fix
This commit is contained in:
Spmario233 2024-02-16 18:08:14 +08:00 committed by GitHub
commit 2bdcff18fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 24 deletions

View File

@ -11445,7 +11445,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
group:['reshuangxiong1',"reshuangxiong2"],
},
reshuangxiong1:{
audio:"shuangxiong1",
audio:"shuangxiong",
audioname:['re_yanwen'],
trigger:{
player:"phaseDrawBegin1",

View File

@ -1321,31 +1321,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){
const event=get.event();
const controls=[link=>{
const evt=get.event();
if(link=='cancel2') ui.click.cancel();
else{
if(evt.dialog&&evt.dialog.buttons){
for(let i=0;i<evt.dialog.buttons.length;i++){
const button=evt.dialog.buttons[i];
button.classList.remove('selectable');
button.classList.remove('selected');
const counterNode=button.querySelector('.caption');
if(counterNode){
counterNode.childNodes[0].innerHTML=``;
}
if(evt.dialog&&evt.dialog.buttons){
for(let i=0;i<evt.dialog.buttons.length;i++){
const button=evt.dialog.buttons[i];
button.classList.remove('selectable');
button.classList.remove('selected');
const counterNode=button.querySelector('.caption');
if(counterNode){
counterNode.childNodes[0].innerHTML=``;
}
ui.selected.buttons.length=0;
game.check();
}
return;
ui.selected.buttons.length=0;
game.check();
}
return;
}];
event.controls=['清除选择','cancel2'].map(control=>{
return ui.create.control(controls.concat(control=='清除选择'?[control,'stayleft']:control));
});
event.controls=[ui.create.control(controls.concat(['清除选择','stayleft']))];
};
if(event.isMine()) func();
else if(event.isOnline()) event.player.send(func);
var result=yield player.chooseButton(['看破:是否记录至多'+get.cnNumber(sum)+'个牌名?',[list,'vcard']],[1,sum],true).set('ai',function(button){
var result=yield player.chooseButton(['看破:是否记录至多'+get.cnNumber(sum)+'个牌名?',[list,'vcard']],[1,sum],false).set('ai',function(button){
if(ui.selected.buttons.length>=Math.max(3,game.countPlayer()/2)) return 0;
switch(button.link[2]){
case 'wuxie':return 5+Math.random();
@ -1385,7 +1380,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
if(!ui.selected.buttons.length){
const evt=event.parent;
if(evt.controls) evt.controls[0].hide();
if(evt.controls) evt.controls[0].classList.add('disabled');
}
},
},
@ -1409,7 +1404,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
counterNode.style.bottom='2px';
}
const evt=event.parent;
if(evt.controls) evt.controls[0].show();
if(evt.controls) evt.controls[0].classList.remove('disabled');
game.check();
},
}

View File

@ -5942,7 +5942,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
group:'shuangxiong1',
},
shuangxiong1:{
audio:true,
audio:"shuangxiong",
audioname:['re_yanwen'],
trigger:{player:'phaseDrawBegin1'},
check:function(event,player){
@ -5968,7 +5968,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
shuangxiong2:{
charlotte:true,
onremove:true,
audio:true,
audio:"shuangxiong",
audioname:['re_yanwen'],
enable:'chooseToUse',
viewAs:{name:'juedou'},

View File

@ -26854,7 +26854,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
spolzhouxuan_info:'①弃牌阶段开始时你可将任意张置于武将牌上称为“旋”你至多拥有五张“旋”。②当你使用牌时你随机将一张“旋”置入弃牌堆然后摸一张牌若你的手牌数不为全场唯一最多则额外摸X张牌X为“旋”数。③出牌阶段结束时你将所有“旋”置入弃牌堆。',
wuyan:'吾彦',
lanjiang:'澜疆',
lanjiang_info:'结束阶段你可以选择所有手牌数不小于你的角色。这些角色依次选择是否令你摸一张牌。然后你可以对其中一名手牌数等于你的角色造成1点伤害随后可以其中一名手牌数小于你的角色摸一张牌。',
lanjiang_info:'结束阶段你可以选择所有手牌数不小于你的角色。这些角色依次选择是否令你摸一张牌。然后你可以对其中一名手牌数等于你的角色造成1点伤害随后可以其中一名手牌数小于你的角色摸一张牌。',
ol_zhuling:'OL朱灵',
ol_zhuling_prefix:'OL',
jixian:'急陷',