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

Merge pull request #435 from PZ157/PR-Branch 

forceDie标签和修整角色检测
This commit is contained in:
Spmario233 2023-10-01 00:13:32 +08:00 committed by GitHub
parent 92e88a41ce 48191e4864
commit 1e41f64d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
character/huicui.js
View File

@ -8280,7 +8280,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
} }
}, },
trigger:{player:'dieAfter'}, trigger:{player:'dieAfter'},
forceDie:true,
filter:function(event,player){ filter:function(event,player){
for(let i of game.players){ for(let i of game.players){
if(i.hasSkill('fengxiang')) return false; if(i.hasSkill('fengxiang')) return false;
@ -8288,6 +8287,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return true; return true;
}, },
silent:true, silent:true,
forceDie:true,
charlotte:true,
content:function(){ content:function(){
game.removeGlobalSkill('fengxiang_use'); game.removeGlobalSkill('fengxiang_use');
} }

7
character/shiji.js
View File

@ -5918,10 +5918,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
spshanxi_bj:{ spshanxi_bj:{
trigger:{player:'dieAfter'}, trigger:{player:'dieAfter'},
filter:function(event,player){ filter:function(event,player){
return !game.hasPlayer(current=>current.hasSkill('spshanxi_suoming')); for(let i of game.players){
if(i.hasSkill('spshanxi_suoming')) return false;
}
return true;
}, },
forceDie:true,
silent:true, silent:true,
forceDie:true,
charlotte:true, charlotte:true,
content:function(){ content:function(){
game.removeGlobalSkill('spshanxi_bj'); game.removeGlobalSkill('spshanxi_bj');