diff --git a/audio/die/key_noda.mp3 b/audio/die/key_noda.mp3 new file mode 100644 index 000000000..b4922f3d6 Binary files /dev/null and b/audio/die/key_noda.mp3 differ diff --git a/audio/die/key_yui.mp3 b/audio/die/key_yui.mp3 new file mode 100644 index 000000000..ccb3b3978 Binary files /dev/null and b/audio/die/key_yui.mp3 differ diff --git a/audio/skill/noda_fengcheng1.mp3 b/audio/skill/noda_fengcheng1.mp3 new file mode 100644 index 000000000..c5ec441c6 Binary files /dev/null and b/audio/skill/noda_fengcheng1.mp3 differ diff --git a/audio/skill/noda_fengcheng2.mp3 b/audio/skill/noda_fengcheng2.mp3 new file mode 100644 index 000000000..64329d0ba Binary files /dev/null and b/audio/skill/noda_fengcheng2.mp3 differ diff --git a/audio/skill/noda_xunxin1.mp3 b/audio/skill/noda_xunxin1.mp3 new file mode 100644 index 000000000..3f7b30d9a Binary files /dev/null and b/audio/skill/noda_xunxin1.mp3 differ diff --git a/audio/skill/noda_xunxin2.mp3 b/audio/skill/noda_xunxin2.mp3 new file mode 100644 index 000000000..47fba6d00 Binary files /dev/null and b/audio/skill/noda_xunxin2.mp3 differ diff --git a/audio/skill/yui_jiang1.mp3 b/audio/skill/yui_jiang1.mp3 new file mode 100644 index 000000000..95ec3643f Binary files /dev/null and b/audio/skill/yui_jiang1.mp3 differ diff --git a/audio/skill/yui_jiang2.mp3 b/audio/skill/yui_jiang2.mp3 new file mode 100644 index 000000000..19e405b22 Binary files /dev/null and b/audio/skill/yui_jiang2.mp3 differ diff --git a/audio/skill/yui_lieyin1.mp3 b/audio/skill/yui_lieyin1.mp3 new file mode 100644 index 000000000..ba79c85a9 Binary files /dev/null and b/audio/skill/yui_lieyin1.mp3 differ diff --git a/audio/skill/yui_lieyin2.mp3 b/audio/skill/yui_lieyin2.mp3 new file mode 100644 index 000000000..d76b6cb58 Binary files /dev/null and b/audio/skill/yui_lieyin2.mp3 differ diff --git a/audio/skill/yui_takaramono1.mp3 b/audio/skill/yui_takaramono1.mp3 new file mode 100644 index 000000000..f75e1e043 Binary files /dev/null and b/audio/skill/yui_takaramono1.mp3 differ diff --git a/audio/skill/yui_takaramono2.mp3 b/audio/skill/yui_takaramono2.mp3 new file mode 100644 index 000000000..1d60f287b Binary files /dev/null and b/audio/skill/yui_takaramono2.mp3 differ diff --git a/character/diy.js b/character/diy.js index 8a1d9eb75..2576587e6 100755 --- a/character/diy.js +++ b/character/diy.js @@ -8695,6 +8695,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ ai:{expose:0.2}, }, noda_fengcheng:{ + audio:2, trigger:{ player:"gainAfter", }, @@ -8711,6 +8712,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, noda_xunxin:{ + audio:2, enable:'phaseUse', viewAs:{name:'juedou'}, filter:function(event,player){ diff --git a/character/sp.js b/character/sp.js index 0580e165d..29100a746 100755 --- a/character/sp.js +++ b/character/sp.js @@ -780,7 +780,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(!event.player.isIn()) return []; if(event.player.getNext().isIn()) list.push(event.player.getNext()); if(event.player.getPrevious().isIn()) list.push(event.player.getPrevious()); - return list.sortBySeat(); + return list.sortBySeat(_status.currentPhase); }, content:function(){ var targets=lib.skill.oltianhou_spade.logTarget(trigger); diff --git a/game/game.js b/game/game.js index 45f26ca09..bf7b227db 100644 --- a/game/game.js +++ b/game/game.js @@ -7425,7 +7425,9 @@ for(let i=0;i0&&Array.isArray(obj)){ - arr=arr.concat(obj.flat(depth-1)); + obj.flat(depth-1).forEach(function(item){ + arr.push(item) + }); } else{ arr.push(obj);