diff --git a/audio/die/key_yuri.mp3 b/audio/die/key_yuri.mp3 new file mode 100644 index 000000000..d272c9e3e Binary files /dev/null and b/audio/die/key_yuri.mp3 differ diff --git a/audio/die/sp_key_kanade.mp3 b/audio/die/sp_key_kanade.mp3 new file mode 100644 index 000000000..f9d1c51e0 Binary files /dev/null and b/audio/die/sp_key_kanade.mp3 differ diff --git a/audio/skill/kanade_benzhan1.mp3 b/audio/skill/kanade_benzhan1.mp3 new file mode 100644 index 000000000..783f4b9a6 Binary files /dev/null and b/audio/skill/kanade_benzhan1.mp3 differ diff --git a/audio/skill/kanade_benzhan2.mp3 b/audio/skill/kanade_benzhan2.mp3 new file mode 100644 index 000000000..06bf5af8a Binary files /dev/null and b/audio/skill/kanade_benzhan2.mp3 differ diff --git a/audio/skill/kanade_benzhan3.mp3 b/audio/skill/kanade_benzhan3.mp3 new file mode 100644 index 000000000..a4cf79d06 Binary files /dev/null and b/audio/skill/kanade_benzhan3.mp3 differ diff --git a/audio/skill/kanade_mapo1.mp3 b/audio/skill/kanade_mapo1.mp3 new file mode 100644 index 000000000..6e5b211f4 Binary files /dev/null and b/audio/skill/kanade_mapo1.mp3 differ diff --git a/audio/skill/kanade_mapo2.mp3 b/audio/skill/kanade_mapo2.mp3 new file mode 100644 index 000000000..d2744710c Binary files /dev/null and b/audio/skill/kanade_mapo2.mp3 differ diff --git a/audio/skill/yuri_wangxi1.mp3 b/audio/skill/yuri_wangxi1.mp3 new file mode 100644 index 000000000..e506c08d9 Binary files /dev/null and b/audio/skill/yuri_wangxi1.mp3 differ diff --git a/audio/skill/yuri_wangxi2.mp3 b/audio/skill/yuri_wangxi2.mp3 new file mode 100644 index 000000000..91e6ce9d9 Binary files /dev/null and b/audio/skill/yuri_wangxi2.mp3 differ diff --git a/audio/skill/yuri_xingdong1.mp3 b/audio/skill/yuri_xingdong1.mp3 index ac40b68e0..496c41390 100644 Binary files a/audio/skill/yuri_xingdong1.mp3 and b/audio/skill/yuri_xingdong1.mp3 differ diff --git a/audio/skill/yuri_xingdong2.mp3 b/audio/skill/yuri_xingdong2.mp3 index 07d5b2c9d..54216089a 100644 Binary files a/audio/skill/yuri_xingdong2.mp3 and b/audio/skill/yuri_xingdong2.mp3 differ diff --git a/audio/skill/yuri_xingdong3.mp3 b/audio/skill/yuri_xingdong3.mp3 new file mode 100644 index 000000000..3526340fd Binary files /dev/null and b/audio/skill/yuri_xingdong3.mp3 differ diff --git a/audio/skill/yuri_xingdong_gain1.mp3 b/audio/skill/yuri_xingdong_gain1.mp3 new file mode 100644 index 000000000..299682061 Binary files /dev/null and b/audio/skill/yuri_xingdong_gain1.mp3 differ diff --git a/audio/skill/yuri_xingdong_gain2.mp3 b/audio/skill/yuri_xingdong_gain2.mp3 new file mode 100644 index 000000000..02021de99 Binary files /dev/null and b/audio/skill/yuri_xingdong_gain2.mp3 differ diff --git a/character/diy.js b/character/diy.js index cc7234575..8a1d9eb75 100755 --- a/character/diy.js +++ b/character/diy.js @@ -7977,6 +7977,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, kanade_mapo:{ + audio:2, derivation:'mapodoufu', enable:'chooseToUse', viewAs:{name:'mapodoufu'}, @@ -7999,6 +8000,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, kanade_benzhan:{ + audio:3, trigger:{global:['useCard','respond']}, direct:true, usable:1, @@ -10927,7 +10929,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, yuri_xingdong:{ - audio:2, + audio:3, group:'yuri_xingdong_gain', subSkill:{ mark:{ @@ -10938,6 +10940,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, gain:{ + audio:2, trigger:{player:'phaseUseBegin'}, forced:true, content:function(){ @@ -11011,6 +11014,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, yuri_wangxi:{ + audio:2, trigger:{global:'dieAfter'}, direct:true, limited:true, diff --git a/game/game.js b/game/game.js index a693edc93..e788d8bf5 100644 --- a/game/game.js +++ b/game/game.js @@ -7449,16 +7449,37 @@ return false; } }); - } + } + if(!('flat' in Array.prototype)){ + Object.defineProperty(Array.prototype, "flat", { + configurable:true, + enumerable:false, + writable:true, + value:function(depth){ + if(typeof depth!='number') depth=1; + const arr=[]; + for(let i=0;i0&&Array.isArray(obj)){ + arr=arr.concat(obj.flat(depth-1)); + } + else{ + arr.push(obj); + } + } + return arr; + } + }); + } if(!Array.from){ Object.defineProperty(Array, "from", { configurable:true, enumerable:false, writable:true, value:function(args){ - var list=[]; + const list=[]; if(args&&args.length){ - for(var i=0;ithis.getEquips(num); + return this.countEnabledSlot(num)>this.getEquips(num).length; }, //以下函数将被废弃 $disableEquip:function(){}, diff --git a/mode/guozhan.js b/mode/guozhan.js index 2bf7b1aab..01aa44d71 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -16050,7 +16050,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ name2=name2.slice(name2.indexOf('_')+1); } } - var list=Object.keys(lib.perfectPair).concat(Object.values(lib.perfectPair)).flat(Infinity); + var list=Object.keys(lib.perfectPair).concat(Object.values(lib.perfectPair)).flat(); if(!list.contains(name1)||!list.contains(name2)) return false; return (lib.perfectPair[name1]&&lib.perfectPair[name1].flat(Infinity).contains(name2))||(lib.perfectPair[name2]&&lib.perfectPair[name2].flat(Infinity).contains(name1)); },