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

c

This commit is contained in:
libccy 2017-02-12 00:25:09 +08:00
parent a55fb8c5e7
commit e15c3557aa
7 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
card/yunchou.js
View File

@ -147,7 +147,7 @@ card.yunchou={
player:1, player:1,
target:function(player,target){ target:function(player,target){
if(target.num('h')==0) return 0; if(target.num('h')==0) return 0;
return (Math.sqrt(target.num('h'))-get.distance(player,target,'absolute')/countPlayer()/3)/2; return (Math.sqrt(target.num('h'))-get.distance(player,target,'absolute')/game.countPlayer()/3)/2;
} }
}, },
tag:{ tag:{

10
layout/default/layout.css
View File

@ -2613,7 +2613,13 @@ div:not(.handcards)>.card>.info>span,
} }
#window:not(.nopointer) .player .judges>.card, #window:not(.nopointer) .player .judges>.card,
#window:not(.nopointer) .player .marks>.card, #window:not(.nopointer) .player .marks>.card{
cursor: context-menu;
}
#window:not(.nopointer) .player .identity.guessing{
cursor: help;
}
#window:not(.nopointer) #system>div>div:not(.hidden), #window:not(.nopointer) #system>div>div:not(.hidden),
#window:not(.nopointer) .choosedouble.character, #window:not(.nopointer) .choosedouble.character,
#window:not(.nopointer) .pointernode div, #window:not(.nopointer) .pointernode div,
@ -2628,7 +2634,7 @@ div:not(.handcards)>.card>.info>span,
cursor: pointer; cursor: pointer;
} }
#arena.dragging{ #arena.dragging{
cursor: move; cursor: -webkit-grabbing;
} }
#arena.selecting:not(.video) .player[data-position='0'] .marks>.card:not(.selectable)>.image, #arena.selecting:not(.video) .player[data-position='0'] .marks>.card:not(.selectable)>.image,

4
layout/default/menu.css
View File

@ -335,6 +335,10 @@
line-height:25px; line-height:25px;
position:relative; position:relative;
} }
#window:not(.nopointer) .config.switcher>div,
#window:not(.nopointer) .config.toggle>div{
cursor: pointer;
}
.config.switcher>div, .config.switcher>div,
.config.toggle>div{ .config.toggle>div{
position:absolute; position:absolute;

11
layout/mobile/equip.css
View File

@ -22,6 +22,17 @@
transform:scale(0.73); transform:scale(0.73);
transform-origin:bottom left; transform-origin:bottom left;
} }
#arena:not(.chess).textequip .player[data-position='0'] .equips>.card::after,
#arena:not(.chess).textequip .player[data-position='0'] .equips>.card::before,
.player:not([data-position='0']) .equips>.card::after,
.player:not([data-position='0']) .equips>.card::before,
#arena.chess .player .equips>.card::after,
#arena.chess .player .equips>.card::before{
visibility: hidden;
}
#arena:not(.chess).textequip .player[data-position='0'] .equips>.card, #arena:not(.chess).textequip .player[data-position='0'] .equips>.card,
.player:not([data-position='0']) .equips>.card, .player:not([data-position='0']) .equips>.card,
#arena.chess .player .equips>.card{ #arena.chess .player .equips>.card{

4
layout/newlayout/equip.css
View File

@ -17,6 +17,10 @@
transform:scale(0.73); transform:scale(0.73);
transform-origin:bottom left; transform-origin:bottom left;
} }
.player .equips>.card::after,
.player .equips>.card::before{
visibility: hidden;
}
.player .equips>.card{ .player .equips>.card{
position:relative; position:relative;
width:100%; width:100%;

6
mode/guozhan.js
View File

@ -612,6 +612,7 @@ mode.guozhan={
if(game.players[i]!=game.me){ if(game.players[i]!=game.me){
game.players[i].node.identity.firstChild.innerHTML='猜'; game.players[i].node.identity.firstChild.innerHTML='猜';
game.players[i].node.identity.dataset.color='unknown'; game.players[i].node.identity.dataset.color='unknown';
game.players[i].node.identity.classList.add('guessing');
} }
game.players[i].hiddenSkills=lib.character[game.players[i].name][3].slice(0); game.players[i].hiddenSkills=lib.character[game.players[i].name][3].slice(0);
var hiddenSkills2=lib.character[game.players[i].name2][3]; var hiddenSkills2=lib.character[game.players[i].name2][3];
@ -760,6 +761,7 @@ mode.guozhan={
if(game.players[i]!=game.me){ if(game.players[i]!=game.me){
game.players[i].node.identity.firstChild.innerHTML='猜'; game.players[i].node.identity.firstChild.innerHTML='猜';
game.players[i].node.identity.dataset.color='unknown'; game.players[i].node.identity.dataset.color='unknown';
game.players[i].node.identity.classList.add('guessing');
} }
game.players[i].group='unknown'; game.players[i].group='unknown';
game.players[i].sex='unknown'; game.players[i].sex='unknown';
@ -865,10 +867,12 @@ mode.guozhan={
this.node.name_seat=ui.create.div('.name.name_seat',get.verticalStr(lib.translate[this.name].slice(0,3)),this); this.node.name_seat=ui.create.div('.name.name_seat',get.verticalStr(lib.translate[this.name].slice(0,3)),this);
if(info.identityShown){ if(info.identityShown){
this.setIdentity(info.identity); this.setIdentity(info.identity);
this.node.identity.classList.remove('guessing');
} }
else if(this!=game.me){ else if(this!=game.me){
this.node.identity.firstChild.innerHTML='猜'; this.node.identity.firstChild.innerHTML='猜';
this.node.identity.dataset.color='unknown'; this.node.identity.dataset.color='unknown';
this.node.identity.classList.add('guessing');
} }
}, },
dieAfter:function(source){ dieAfter:function(source){
@ -919,6 +923,7 @@ mode.guozhan={
// this.node.identity.dataset.color=this.identity; // this.node.identity.dataset.color=this.identity;
this.setIdentity(this.identity); this.setIdentity(this.identity);
this.ai.shown=1; this.ai.shown=1;
this.node.identity.classList.remove('guessing');
if(_status.clickingidentity&&_status.clickingidentity[0]==this){ if(_status.clickingidentity&&_status.clickingidentity[0]==this){
for(var i=0;i<_status.clickingidentity[1].length;i++){ for(var i=0;i<_status.clickingidentity[1].length;i++){
@ -958,6 +963,7 @@ mode.guozhan={
player.identityShown=true; player.identityShown=true;
player.name=name; player.name=name;
player.sex=sex; player.sex=sex;
player.node.identity.classList.remove('guessing');
switch(num){ switch(num){
case 0:player.classList.remove('unseen');break; case 0:player.classList.remove('unseen');break;
case 1:player.classList.remove('unseen2');break; case 1:player.classList.remove('unseen2');break;

12
mode/identity.js
View File

@ -390,6 +390,7 @@ mode.identity={
showIdentity:function(me){ showIdentity:function(me){
for(var i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
// if(me===false&&game.players[i]==game.me) continue; // if(me===false&&game.players[i]==game.me) continue;
game.players[i].node.identity.classList.remove('guessing');
game.players[i].identityShown=true; game.players[i].identityShown=true;
game.players[i].ai.shown=1; game.players[i].ai.shown=1;
game.players[i].setIdentity(game.players[i].identity); game.players[i].setIdentity(game.players[i].identity);
@ -800,6 +801,7 @@ mode.identity={
game.players[i].identityShown=true; game.players[i].identityShown=true;
} }
else{ else{
game.players[i].node.identity.classList.add('guessing');
game.players[i].identity=identityList[i]; game.players[i].identity=identityList[i];
game.players[i].setIdentity('cai'); game.players[i].setIdentity('cai');
if(event.zhongmode){ if(event.zhongmode){
@ -823,7 +825,9 @@ mode.identity={
game.zhu.setIdentity(); game.zhu.setIdentity();
game.zhu.identityShown=true; game.zhu.identityShown=true;
game.zhu.isZhu=(game.zhu.identity=='zhu'); game.zhu.isZhu=(game.zhu.identity=='zhu');
game.zhu.node.identity.classList.remove('guessing');
game.me.setIdentity(); game.me.setIdentity();
game.me.node.identity.classList.remove('guessing');
} }
for(i in lib.character){ for(i in lib.character){
if(chosen.contains(i)) continue; if(chosen.contains(i)) continue;
@ -1093,6 +1097,7 @@ mode.identity={
for(i=0;i<game.players.length;i++){ for(i=0;i<game.players.length;i++){
game.players[i].identity=identityList[i]; game.players[i].identity=identityList[i];
game.players[i].setIdentity('cai'); game.players[i].setIdentity('cai');
game.players[i].node.identity.classList.add('guessing');
if(event.zhongmode){ if(event.zhongmode){
if(identityList[i]=='mingzhong'){ if(identityList[i]=='mingzhong'){
game.zhu=game.players[i]; game.zhu=game.players[i];
@ -1111,17 +1116,22 @@ mode.identity={
game.zhu.setIdentity(); game.zhu.setIdentity();
game.zhu.identityShown=true; game.zhu.identityShown=true;
game.zhu.isZhu=(game.zhu.identity=='zhu'); game.zhu.isZhu=(game.zhu.identity=='zhu');
game.zhu.node.identity.classList.remove('guessing');
game.me.setIdentity(); game.me.setIdentity();
game.me.node.identity.classList.remove('guessing');
for(var i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
game.players[i].send(function(zhu,zhuid,me,identity){ game.players[i].send(function(zhu,zhuid,me,identity){
for(var i in lib.playerOL){ for(var i in lib.playerOL){
lib.playerOL[i].setIdentity('cai'); lib.playerOL[i].setIdentity('cai');
lib.playerOL[i].node.identity.classList.add('guessing');
} }
zhu.identityShown=true; zhu.identityShown=true;
zhu.identity=zhuid; zhu.identity=zhuid;
zhu.setIdentity(); zhu.setIdentity();
zhu.node.identity.classList.remove('guessing');
me.setIdentity(identity); me.setIdentity(identity);
me.node.identity.classList.remove('guessing');
ui.arena.classList.add('choose-character'); ui.arena.classList.add('choose-character');
},game.zhu,game.zhu.identity,game.players[i],game.players[i].identity); },game.zhu,game.zhu.identity,game.players[i],game.players[i].identity);
} }
@ -1312,6 +1322,7 @@ mode.identity={
game.broadcastAll(function(player){ game.broadcastAll(function(player){
player.setIdentity(player.identity); player.setIdentity(player.identity);
player.identityShown=true; player.identityShown=true;
player.node.identity.classList.remove('guessing');
},this); },this);
} }
game.checkResult(); game.checkResult();
@ -1336,6 +1347,7 @@ mode.identity={
game.zhu.ai.shown=1; game.zhu.ai.shown=1;
game.zhu.setIdentity(); game.zhu.setIdentity();
game.zhu.isZhu=true; game.zhu.isZhu=true;
game.zhu.node.identity.classList.remove('guessing');
if(lib.config.animation&&!lib.config.low_performance) game.zhu.$legend(); if(lib.config.animation&&!lib.config.low_performance) game.zhu.$legend();
delete game.zhong; delete game.zhong;
if(_status.clickingidentity&&_status.clickingidentity[0]==game.zhu){ if(_status.clickingidentity&&_status.clickingidentity[0]==game.zhu){