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

Merge pull request #554 from BauxiteAl/PR-Branch 

修改了`$throwEmotion`及其相关的一系列函数
This commit is contained in:
Spmario233 2023-10-21 00:09:15 +08:00 committed by GitHub
parent f82edbdbba 4befc99ffb
commit db3f3cbe16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
character/sp.js
View File

@ -24768,6 +24768,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
dynamicTranslate:{
shanduan:function(player){
if(player.storage.shanduan) return '锁定技。①摸牌/出牌/弃牌阶段开始时，你为本回合摸牌阶段摸牌数/攻击范围和使用【杀】的限制次数/手牌上限的默认值从数组R=['+get.translation(player.storage.shanduan)+']中分配数值。②当你于回合外受到伤害后，你令下回合〖善断①〗以此法分配的数值集合R中的最小值+1。';
return '锁定技。①摸牌/出牌/弃牌阶段开始时，你为本回合摸牌阶段摸牌数/攻击范围和使用【杀】的限制次数/手牌上限的默认值从数组R=[1，2，3，4]中分配数值。②当你于回合外受到伤害后，你令下回合〖善断①〗以此法分配的数值集合R中的最小值+1。';
},
kunfen:function(player){
if(player.storage.kunfen) return '结束阶段开始时，你可以失去1点体力，然后摸两张牌。';
return '锁定技，结束阶段开始时，你失去1点体力，然后摸两张牌。';

25
game/game.js
View File

@ -21605,7 +21605,7 @@
next.setContent('chooseToGuanxing');
return next;
}
$throwEmotion(target,name){
$throwEmotion(target,name,rotate){
game.addVideo('throwEmotion',this,[target.dataset.position,name]);
var getLeft=function(player){
if(player==game.me&&!ui.fakeme&&!ui.chess) return player.getLeft()+player.node.avatar.offsetWidth/2;
@ -21624,8 +21624,19 @@
emotion.style.top=top+'px';
var left2=getLeft(target)-width;
var top2=target.getTop()+target.offsetHeight/3-height;
if(['egg','flower','shoe'].contains(name)||rotate){
var num1=0.95+Math.random()*(1.1-0.95);
var num2=1+Math.random()*(3-1);
var left2=getLeft(target)/num1-width;
var top2=target.getTop()+target.offsetHeight/num2-height;
}
else{
var left2=getLeft(target)-width;
var top2=target.getTop()+target.offsetHeight/3-height;
}
emotion.style['z-index']=10;
emotion.style.transform='translateY('+(top2-top)+'px) translateX('+(left2-left)+'px)';
if(['egg','flower','shoe'].contains(name)||rotate) emotion.firstElementChild.style.transform='rotate(1440deg)';
if(lib.config.background_audio) game.playAudio('effect','throw_'+name+get.rand(1,2));
setTimeout(function(){
emotion.innerHTML=('<div style="text-align:center"> <img src="'+lib.assetURL+'image/emotion/throw_emotion/'+name+'2.png"> </div>');
@ -22379,10 +22390,10 @@
game.playerMap[this.playerid]=this;
return this;
}
throwEmotion(target,emotion){
game.broadcastAll(function(player,target,emotion){
player.$throwEmotion(target,emotion);
},this,target,emotion);
throwEmotion(target,emotion,rotate){
game.broadcastAll(function(player,target,emotion,rotate){
player.$throwEmotion(target,emotion,rotate);
},this,target,emotion,rotate);
}
emotion(pack,id){
var str='<img src="##assetURL##image/emotion/'+pack+'/'+id+'.gif" width="50" height="50">';
@ -33813,11 +33824,11 @@
}
}
},
throwEmotion:function(target,emotion){
throwEmotion:function(target,emotion,rotate){
if(lib.node.observing.contains(this)) return;
var player=lib.playerOL[this.id];
if(player){
player.throwEmotion(target,emotion);
player.throwEmotion(target,emotion,rotate);
}
},
emotion:function(id,pack,emotion){