YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

族王明山bug修复

This commit is contained in:
copcap 2024-04-09 02:39:59 +08:00
parent d6f686e515
commit fc41b1289c
No known key found for this signature in database
GPG Key ID: 30E7AB6699451AEE
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
character/clan.js
View File

@ -94,23 +94,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2, audio:2,
enable:'chooseToUse', enable:'chooseToUse',
hiddenCard(player,name){ hiddenCard(player,name){
if((get.event(`clanshengmo_${player.playerid}_enabled_names`)||[]).includes(name)&&(get.event('clanshengmo_cards')||[]).length>0) return true; if(get.type(name)!='basic') return false;
if(!player.getStorage('clanshengmo').includes(name)&&(get.event('clanshengmo_cards')||[]).length>0) return true;
}, },
filter(event,player){ filter(event,player){
if(event.responded) return false; if(event.responded) return false;
const names=get.event(`clanshengmo_${player.playerid}_enabled_names`)||[],cards=get.event('clanshengmo_cards')||[]; const names=lib.inpile.filter(name=>get.type(name)=='basic'&&!player.getStorage('clanshengmo').includes(name)),cards=get.event('clanshengmo_cards')||[];
return cards.length>0&&names.some(name=>{ return cards.length>0&&names.some(name=>{
return event.filterCard({name,isCard:true},player,event); return event.filterCard({name,isCard:true},player,event);
}); });
}, },
onChooseToUse(event){ onChooseToUse(event){
if(game.online) return; if(game.online) return;
const player=event.player,propName=`clanshengmo_${player.playerid}_enabled_names`;
if(!event[propName]){
event.set(propName,lib.inpile.filter(name=>get.type(name)=='basic').removeArray(player.getAllHistory('useCard',evt=>{
return evt.card.storage&&evt.card.storage.clanshengmo;
}).map(evt=>get.name(evt.card,false))));
}
if(!event.clanshengmo_cards){ if(!event.clanshengmo_cards){
let cards=[]; let cards=[];
game.checkGlobalHistory('cardMove',evt=>{ game.checkGlobalHistory('cardMove',evt=>{
@ -127,7 +122,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
async content(event,trigger,player){ async content(event,trigger,player){
const evt = event.getParent(2); const evt = event.getParent(2);
const names = evt[`clanshengmo_${player.playerid}_enabled_names`], cards = evt.clanshengmo_cards; const names = lib.inpile.filter(name => get.type(name) == 'basic' && !player.getStorage('clanshengmo').includes(name)), cards = evt.clanshengmo_cards;
const links = await player.chooseButton(['剩墨：获得其中一张牌', cards], true).set('ai', button => { const links = await player.chooseButton(['剩墨：获得其中一张牌', cards], true).set('ai', button => {
return get.value(button.link); return get.value(button.link);
}).forResultLinks(); }).forResultLinks();
@ -171,11 +166,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}); });
evt.goto(0); evt.goto(0);
}, },
marktext:'墨',
intro:{
content:'已以此法使用过$'
},
subSkill:{ subSkill:{
backup:{ backup:{
precontent(){ precontent(){
delete event.result.skill; delete event.result.skill;
event.result.card.storage.clanshengmo = true; event.result.card.storage.clanshengmo = true;
player.markAuto('clanshengmo',event.result.card.name);
player.gain(lib.skill.clanshengmo_backup.cardToGain, 'gain2'); player.gain(lib.skill.clanshengmo_backup.cardToGain, 'gain2');
}, },
filterCard:()=>false, filterCard:()=>false,

2
game/pinyinjs.js
View File

@ -66,7 +66,7 @@ var pinyin_dict_polyphone = {
"库特莉亚芙卡": " kǎ", "库特莉亚芙卡": " kǎ",
"露娜": "lù ", "露娜": "lù ",
// 技能名 // 技能名
"弹雀": "tán ", "弹雀": "tán què",
"重身": "chóng ", "重身": "chóng ",
"畜鸣": "chù ", "畜鸣": "chù ",
"聆乐": " yuè", "聆乐": " yuè",