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

Merge branch 'libccy:PR-Branch' into PR-Branch

This commit is contained in:
157 2024-01-25 10:49:18 +08:00 committed by GitHub
parent ed2266dc76 02fdf15d2a
commit 86078f74aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
character/jsrg.js
View File

@ -1806,24 +1806,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return player.getHistory('lose').length; return player.getHistory('lose').length;
}, },
frequent:true, frequent:true,
async content(event,trigger,player){ content(){
player.judge().set('callback',()=>{ 'step 0'
const red=[],black=[]; player.judge();
'step 1'
let num = 0;
game.getGlobalHistory('cardMove',evt=>{ game.getGlobalHistory('cardMove',evt=>{
if(evt.name!='cardsDiscard'){ if(evt.name!='cardsDiscard'){
if(evt.name!='lose'||evt.position!=ui.discardPile) return false; if(evt.name!='lose'||evt.position!=ui.discardPile) return false;
} }
const cards=evt.cards.filter(card=>get.position(card,true)=='d'); num += (evt.cards.filter(i=>get.color(i,false) == result.color).length);
red.addArray(cards.filter(i=>get.color(i,false)=='red'));
black.addArray(cards.filter(i=>get.color(i,false)=='black'));
}); });
if(event.judgeResult.color=='red'&&red.length){ if (num > 0) player.draw(num);
player.draw(red.length);
}
else if(event.judgeResult.color=='black'&&black.length){
player.draw(black.length);
}
})
}, },
}, },
jsrgzunwei:{ jsrgzunwei:{

1
noname/game/index.js
View File

@ -5491,6 +5491,7 @@ export class Game extends Uninstantable {
else { else {
next.parent = event; next.parent = event;
_status.event = next; _status.event = next;
game.getGlobalHistory('everything').push(next);
} }
} }
else { else {