diff --git a/character/refresh.js b/character/refresh.js index 02b4ef19f..498a65866 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -10589,10 +10589,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var link=result.control; player.storage.rehuashen.current2=link; if(!player.additionalSkills.rehuashen||!player.additionalSkills.rehuashen.includes(link)){ - player.addAdditionalSkill('rehuashen',link); + player.addAdditionalSkills('rehuashen',link); player.flashAvatar('rehuashen',event.card); - game.log(player,'获得了技能','#g【'+get.translation(link)+'】'); - player.popup(link); player.syncStorage('rehuashen'); player.updateMarks('rehuashen'); // lib.skill.rehuashen.createAudio(event.card,link,'re_zuoci'); @@ -10603,6 +10601,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){ character:[], map:{}, } + player.when('dieBegin').then(()=>{ + const name=player.name?player.name:player.name1; + if(name){ + const sex=get.character(name,0); + const group=get.character(name,1); + if(player.sex!=sex){ + game.broadcastAll((player,sex)=>{ + player.sex=sex; + },player,sex); + game.log(player,'将性别变为了','#y'+get.translation(sex)+'性'); + } + if(player.group!=group) player.changeGroup(group); + } + }); }, banned:['lisu','sp_xiahoudun','xushao','jsrg_xushao','zhoutai','old_zhoutai','shixie','xin_zhoutai','dc_shixie','old_shixie'], bannedType:['Charlotte','主公技','觉醒技','限定技','隐匿技','使命技'], diff --git a/character/shenhua.js b/character/shenhua.js index ce419f547..6d3d50e85 100755 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -4180,6 +4180,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){ owned:{} }; } + player.when('dieBegin').then(()=>{ + const name=player.name?player.name:player.name1; + if(name){ + const sex=get.character(name,0); + const group=get.character(name,1); + if(player.sex!=sex){ + game.broadcastAll((player,sex)=>{ + player.sex=sex; + },player,sex); + game.log(player,'将性别变为了','#y'+get.translation(sex)+'性'); + } + if(player.group!=group) player.changeGroup(group); + } + }); }, intro:{ content:function(storage,player){ @@ -4455,10 +4469,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } player.storage.huashen.current2=skill; if(!player.additionalSkills.huashen||!player.additionalSkills.huashen.includes(skill)){ - player.addAdditionalSkill('huashen',skill); + player.addAdditionalSkills('huashen',skill); player.flashAvatar('huashen',character); - game.log(player,'获得了技能','#g【'+get.translation(skill)+'】'); - player.popup(skill); player.syncStorage('huashen'); player.updateMarks('huashen'); // lib.skill.rehuashen.createAudio(character,skill,'zuoci');