diff --git a/character/diy.js b/character/diy.js index a2825cda0..5d5bf7d5e 100755 --- a/character/diy.js +++ b/character/diy.js @@ -1264,9 +1264,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ result:{ player:function(player){ if(player.countCards('he',function(card){ - if(get.type(card)=='equip') return 8-get.value(card); - return 6-get.value(card); - })<2) return -0.5; + if(get.type(card)=='equip') return get.value(card)<8; + return get.value(card)<6; + })<2) return 0; return player.getUseValue({name:'kaihua'}); }, }, @@ -3891,7 +3891,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var target=result.targets[0]; player.addExpose(0.2); player.line(target,'thunder'); - target.damage(); + target.damage('thunder'); }, }, hisako_zhuanyun:{ @@ -4916,7 +4916,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ check:function(button){ var player=_status.event.player; if(player.countCards('h',button.link[2])>0) return 0; - if(button.link[2]=='wugu') return 0; + if(['wugu','zhulu_card'].contains(button.link[2])) return 0; var effect=player.getUseValue(button.link[2]); if(effect>0) return effect; return 0; @@ -4940,14 +4940,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, ai:{ - order:4, + order:1, result:{ player:function(player){ var cards=player.getCards('he').sort(function(a,b){ return get.value(a)-get.value(b); }); - var num=(player.getStat('skill').haruka_shuangche||0); - if(cards.length>num){ + var num=(player.getStat('skill').haruka_shuangche||0)+1; + if(player.needsToDiscard()>=num) return 1; + if(player.hp>2) return 1; + if(cards.length>=num){ var val=0; for(var i=0;i0; + })) return 1; + return 0; + }, }, }, }, @@ -804,26 +814,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(!storage.length) return false; if(event.name=='damage') return true; if(event.type!='discard'||event.getParent('phaseDiscard').player!=player) return false; + var num=0; for(var i of event.cards2){ if(storage.filter(function(magic){ return get.type2(magic)==get.type2(i,event.hs.contains(i)?player:false); - }).length) return true; + }).length) num++; } - return false; + return num>1; }, content:function(){ - if(trigger.name=='lose'){ - for(var i of trigger.cards2){ - if(player.getStorage('zlshoufu2').filter(function(magic){ - return get.type2(magic)==get.type(i,trigger.hs.contains(i)?player:false); - }).length) player.storage.zlshoufu2_markcount++; - } - } - if(trigger.name=='damage'||player.storage.zlshoufu2_markcount>=2){ - player.unmarkSkill('zlshoufu2'); - player.removeSkill('zlshoufu2'); - } - else player.markSkill('zlshoufu2'); + player.removeSkill('zlshoufu2'); }, }, //蔡阳 @@ -15551,7 +15551,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ zlhuji_info:'锁定技,你与其他角色的距离-1,当你于回合外受到伤害后,你可进行判定,若结果为红色,视为你对伤害来源使用一张【杀】(无距离限制)。', zlshoufu:'授符', zlshoufu2:'授符', - zlshoufu_info:'出牌阶段限一次,你可摸一张牌,然后将一张手牌置于一名没有【箓】的角色的武将牌上,称为【箓】;其不能使用和打出与【箓】同类型的牌。该角色受到伤害后,或于弃牌阶段弃置至少2张与【箓】同类型的牌后,将【箓】置入弃牌堆。', + zlshoufu_info:'出牌阶段限一次,你可摸一张牌,然后将一张手牌置于一名没有【箓】的角色的武将牌上,称为【箓】;其不能使用和打出与【箓】同类型的牌。该角色受到伤害后,或于弃牌阶段弃置至少两张与【箓】同类型的牌后,将【箓】置入弃牌堆。', ol_zhangchangpu:'OL张昌蒲', olxingshen:'省身', olxingshen_info:'当你受到伤害后,你可以随机摸至多两张牌。若如此做,你获得X个“省”,且下一次发动〖严教〗展示牌时移去所有“省”并多展示等量的牌。(X为你已损失的体力值,且你至多拥有6个“省”)', diff --git a/character/sp2.js b/character/sp2.js index 21982d7dc..a87caa2f1 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -5933,6 +5933,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, ai:{ order:11, + expose:0.2, result:{ target:function(player,target){ if(ui.selected.cards.length){ diff --git a/character/yijiang.js b/character/yijiang.js index a1b91f5b5..a8316b0e4 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -2285,7 +2285,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(target.hp>1&&target.hasFriend()) return 0.8; + if(target.hp>1&&target.hasFriend()) return 0.4; } } } diff --git a/game/asset.js b/game/asset.js index 9a5d6b893..44ec4c943 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - 'v1.9.108.2.1', + 'v1.9.108.2.2', 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', 'audio/background/aozhan_rewrite.mp3', @@ -4638,8 +4638,8 @@ window.noname_asset_list=[ 'image/emotion/throw_emotion/flower2.png', 'image/emotion/throw_emotion/shoe1.png', 'image/emotion/throw_emotion/shoe2.png', - 'image/emotion/throw_emotion/shoukao1.png', - 'image/emotion/throw_emotion/shoukao2.png', + 'image/emotion/throw_emotion/jiasuo1.png', + 'image/emotion/throw_emotion/jiasuo2.png', 'image/emotion/throw_emotion/wine1.png', 'image/emotion/throw_emotion/wine2.png', 'image/emotion/throw_emotion/yuxisx1.png', diff --git a/game/game.js b/game/game.js index 4367935a6..e9b4d87d6 100644 --- a/game/game.js +++ b/game/game.js @@ -9783,7 +9783,7 @@ wine:'酒杯', shoe:'拖鞋', yuxisx:'玉玺', - shoukao:'枷锁', + jiasuo:'枷锁', junk:'平凡', common:'普通', rare:'精品', @@ -15969,24 +15969,27 @@ $throwEmotion:function(target,name){ game.addVideo('throwEmotion',this,[target.dataset.position,name]); var getLeft=function(player){ - if(player==game.me&&!ui.fakeme) return player.node.avatar.offsetWidth/2; - return player.offsetLeft+player.offsetWidth/2; + if(player==game.me&&!ui.fakeme&&!ui.chess) return player.getLeft()+player.node.avatar.offsetWidth/2; + return player.getLeft()+player.offsetWidth/2; } var player=this; - var emotion=ui.create.div('','',ui.window); - var width=30; - var height=30; + var emotion=ui.create.div('','
',game.chess?ui.chess:ui.window); + emotion.style.width='60px'; + emotion.style.height='60px'; + var width=emotion.offsetWidth/2; + var height=emotion.offsetHeight/2; + if(game.chess) width+=60; var left=getLeft(player)-width; - var top=player.offsetTop+player.offsetHeight/3-height; + var top=player.getTop()+player.offsetHeight/3-height; emotion.style.left=left+'px'; emotion.style.top=top+'px'; var left2=getLeft(target)-width; - var top2=target.offsetTop+target.offsetHeight/3-height; + 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(lib.config.background_audio) game.playAudio('effect','throw_'+name+get.rand(1,2)); setTimeout(function(){ - emotion.innerHTML=(''); + emotion.innerHTML=('
'); setTimeout(function(){ emotion.delete(); },1200); @@ -50947,7 +50950,7 @@ table.style.width='100%'; table.style.position='relative'; var listi=['wine','shoe']; - if(game.me.storage.zhuSkill_shanli) listi=['yuxisx','shoukao']; + if(game.me.storage.zhuSkill_shanli) listi=['yuxisx','jiasuo']; for(var i=0;i