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

a

This commit is contained in:
libccy 2017-01-20 13:34:31 +08:00
parent fbe7a8c422
commit 1977093268
9 changed files with 78 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
card/guozhan.js
View File

@ -500,8 +500,9 @@ card.guozhan={
},
result:{
target:function(player,target){
if(target.num('h')<=1){
if(target==player){
var hs=target.get('h');
if(hs.length<=1){
if(target==player&&hs[0].name=='yiyi'){
return 0;
}
return 0.3;

5
card/hearth.js
View File

@ -213,7 +213,7 @@ card.hearth={
target.damage('thunder');
}
else{
target.addTempSkill('shandianjian2','phaseBegin');
target.addTempSkill('huogong2','phaseBegin');
}
game.addVideo('cardDialog',null,event.videoId);
event.dialog.close();
@ -244,7 +244,7 @@ card.hearth={
return 0;
},
target:function(player,target){
if(target.hasSkill('shandianjian2')||target.num('h')==0) return 0;
if(target.hasSkill('huogong2')||target.num('h')==0) return 0;
if(player.num('h')<=1) return 0;
if(target==player){
if(typeof _status.event.filterCard=='function'&&
@ -657,7 +657,6 @@ card.hearth={
}
}
},
shandianjian2:{},
jihuocard2:{
mod:{
maxHandcard:function(player,num){

9
card/swd.js
View File

@ -2933,16 +2933,17 @@ card.swd={
return 6-ai.get.value(card);
},
filterTarget:function(card,player,target){
return get.distance(player,target,'attack')<=1;
return target.num('h')<player.num('h');
},
content:function(){
'step 0'
var card=get.cards(0);
ui.discardPile.appendChild(card);
player.showCards('意乱',card);
event.bool=(get.color(card)=='black');
'step 1'
if(!event.bool){
target.draw();
// target.draw();
}
else{
var e5=player.get('e','5');
@ -4539,9 +4540,9 @@ card.swd={
guangshatianyi_bg:'纱',
guangshatianyi_info:'锁定技，每当你即将受到伤害，有三分之一的概率令伤害减一',
sifeizhenmian:'四非真面',
sifeizhenmian_info:'出牌阶段限一次，你可以弃置一张牌，然后指定攻击范围内的一名角色并亮出牌堆顶的一张牌，若此牌为黑色，你弃置四非真面，该角色进入混乱状态直到下一回合结束；否则该角色摸一张牌',
sifeizhenmian_info:'出牌阶段限一次，你可以弃置一张牌并指定一名手牌数少于你的角色，你亮出牌堆顶的一张牌，若此牌为黑色，你弃置四非真面，该角色进入混乱状态直到下一回合结束',
yiluan:'意乱',
yiluan_info:'出牌阶段限一次，你可以指定攻击范围内的一名角色并亮出牌堆顶的一张牌，若此牌为黑色，你弃置四非真面，该角色进入混乱状态直到下一回合结束；否则该角色摸一张牌',
yiluan_info:'出牌阶段限一次，你可以弃置一张牌并指定一名手牌数少于你的角色，你亮出牌堆顶的一张牌，若此牌为黑色，你弃置四非真面，该角色进入混乱状态直到下一回合结束',
donghuangzhong:'东皇钟',
xuanyuanjian:'轩辕剑',
xuanyuanjian2:'轩辕剑',

2
character/xianjian.js
View File

@ -2230,7 +2230,7 @@ character.xianjian={
lingyan:'灵砚',
lingyan_info:'在你使用一张装备牌时，若你的装备区的对应位置已有装备，你可以选择装备区内的一个空余位置，将此牌的装备类型永久改变至与此位置对应',
danqing:'丹青',
danqing_info:'当你累计使用了4张花色不同的牌后，你可以依次将以下4种效果分配给至多4名不同的角色：1、摸一张牌；2、获得一点护甲；3、装备一件随机装备；4、获得潜行直到下一回合开始',
danqing_info:'当你累计使用了4张花色不同的牌后，你可以选择至多4名角色分别获得以下4种效果中的随机一个：1、摸一张牌；2、获得一点护甲；3、装备一件随机装备；4、获得潜行直到下一回合开始',
zhangmu:'障目',
zhangmu_info:'每回合限一次，当你需要使用或打出一张闪时，你可以展示一张闪，视为使用或打出了此闪',
feizhua:'飞爪',

23
game/game.js
View File

@ -908,6 +908,19 @@
}
}
},
watchface:{
name:'表盘样式',
init:'none',
unfrequent:true,
item:{
none:'默认',
simple:'简约',
},
onclick:function(item){
game.saveConfig('watchface',item);
ui.roundmenu.dataset.watchface=item;
}
},
show_card_prompt:{
name:'显示出牌提示',
init:true,
@ -28120,9 +28133,12 @@
ui.create.div(ui.roundmenu);
ui.create.div(ui.roundmenu);
ui.create.div(ui.roundmenu);
if(lib.config.show_time2){
ui.roundmenu.classList.add('clock');
}
ui.roundmenu.dataset.watchface=lib.config.watchface||'none';
var resetround=function(e){
_status.draggingroundmenu=false;
@ -28339,7 +28355,12 @@
var date=new Date();
var hours=date.getHours();
var minutes=date.getMinutes();
ui.roundmenu.childNodes[13].style.transform='rotate('+get.round((hours+minutes/60+9)*30,2)+'deg)';
if(lib.config.watchface=='simple'){
ui.roundmenu.childNodes[13].style.transform='rotate('+get.round((hours+9)*30,2)+'deg)';
}
else{
ui.roundmenu.childNodes[13].style.transform='rotate('+get.round((hours+minutes/60+9)*30,2)+'deg)';
}
ui.roundmenu.childNodes[12].style.transform='rotate('+(minutes+45)*6+'deg)';
if(minutes<10){
minutes='0'+minutes.toString();

32
layout/default/layout.css
View File

@ -80,6 +80,7 @@ table{table-layout: fixed;}
text-align: center;
pointer-events: none;
display: block;
font-family: 'xinwei'
}
#shortcut{
@ -580,6 +581,34 @@ table{table-layout: fixed;}
transform-origin: 2px 2px;
border-radius: 4px 23px 23px 4px/4px 4px 4px 4px;
}
#roundmenu.clock>div:nth-of-type(15){
width: 80%;
height: 80%;
left: 10%;
top: 10%;
border-radius: 100%;
margin: 0;
padding: 0;
z-index: -1;
opacity: 0;
}
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(1),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(2),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(3),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(4),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(5),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(6),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(7),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(8),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(9),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(10),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(11),
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(12){
opacity: 0;
}
#roundmenu.clock[data-watchface="simple"]>div:nth-of-type(15){
opacity: 1;
}
#roundmenu:not(.clock)>div:nth-of-type(even){
width: 20px;
@ -609,7 +638,8 @@ table{table-layout: fixed;}
#roundmenu:not(.clock)>div:nth-of-type(11),
#roundmenu:not(.clock)>div:nth-of-type(12),
#roundmenu:not(.clock)>div:nth-of-type(13),
#roundmenu:not(.clock)>div:nth-of-type(14){
#roundmenu:not(.clock)>div:nth-of-type(14),
#roundmenu:not(.clock)>div:nth-of-type(15){
opacity: 0;
}

5
theme/music/style.css
View File

@ -104,3 +104,8 @@ body[data-background_color_music='blue'] #arena.mobile:not(.chess) .player[data-
.brown{
color: rgb(195,161,223);
}
#roundmenu.clock>div:nth-of-type(15){
background: linear-gradient(#4b4b4b, #464646);
box-shadow: rgba(0,0,0,0.6) 0 0 5px inset;
}

4
theme/simple/style.css
View File

@ -133,3 +133,7 @@ body{
.brown{
color: rgb(195,161,223);
}
#roundmenu.clock>div:nth-of-type(15){
background: rgba(0,0,0,0.3);
box-shadow: rgba(0,0,0,0.6) 0 0 5px inset;
}

5
theme/woodden/style.css
View File

@ -194,3 +194,8 @@ html{
.player .marks>div:first-child>div{
-webkit-filter: invert(0.8) sepia(1);
}
#roundmenu.clock>div:nth-of-type(15){
background: url('wood2.png');
box-shadow: rgba(0,0,0,0.5) 0 0 5px inset;
}