diff --git a/card/yunchou.js b/card/yunchou.js index 0d9b6726f..5c227bf86 100644 --- a/card/yunchou.js +++ b/card/yunchou.js @@ -147,7 +147,7 @@ card.yunchou={ player:1, target:function(player,target){ 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:{ diff --git a/layout/default/layout.css b/layout/default/layout.css index 1840cbde8..81e0f4479 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -2613,7 +2613,13 @@ div:not(.handcards)>.card>.info>span, } #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) .choosedouble.character, #window:not(.nopointer) .pointernode div, @@ -2628,7 +2634,7 @@ div:not(.handcards)>.card>.info>span, cursor: pointer; } #arena.dragging{ - cursor: move; + cursor: -webkit-grabbing; } #arena.selecting:not(.video) .player[data-position='0'] .marks>.card:not(.selectable)>.image, diff --git a/layout/default/menu.css b/layout/default/menu.css index b47145195..6582c6783 100644 --- a/layout/default/menu.css +++ b/layout/default/menu.css @@ -335,6 +335,10 @@ line-height:25px; position:relative; } +#window:not(.nopointer) .config.switcher>div, +#window:not(.nopointer) .config.toggle>div{ + cursor: pointer; +} .config.switcher>div, .config.toggle>div{ position:absolute; diff --git a/layout/mobile/equip.css b/layout/mobile/equip.css index f04fadaf7..d77e79732 100644 --- a/layout/mobile/equip.css +++ b/layout/mobile/equip.css @@ -22,6 +22,17 @@ transform:scale(0.73); 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, .player:not([data-position='0']) .equips>.card, #arena.chess .player .equips>.card{ diff --git a/layout/newlayout/equip.css b/layout/newlayout/equip.css index 77a7101b7..40443eac0 100644 --- a/layout/newlayout/equip.css +++ b/layout/newlayout/equip.css @@ -17,6 +17,10 @@ transform:scale(0.73); transform-origin:bottom left; } +.player .equips>.card::after, +.player .equips>.card::before{ + visibility: hidden; +} .player .equips>.card{ position:relative; width:100%; diff --git a/mode/guozhan.js b/mode/guozhan.js index e9b65075b..07ce22a98 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -612,6 +612,7 @@ mode.guozhan={ if(game.players[i]!=game.me){ game.players[i].node.identity.firstChild.innerHTML='猜'; 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); var hiddenSkills2=lib.character[game.players[i].name2][3]; @@ -760,6 +761,7 @@ mode.guozhan={ if(game.players[i]!=game.me){ game.players[i].node.identity.firstChild.innerHTML='猜'; game.players[i].node.identity.dataset.color='unknown'; + game.players[i].node.identity.classList.add('guessing'); } game.players[i].group='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); if(info.identityShown){ this.setIdentity(info.identity); + this.node.identity.classList.remove('guessing'); } else if(this!=game.me){ this.node.identity.firstChild.innerHTML='猜'; this.node.identity.dataset.color='unknown'; + this.node.identity.classList.add('guessing'); } }, dieAfter:function(source){ @@ -919,6 +923,7 @@ mode.guozhan={ // this.node.identity.dataset.color=this.identity; this.setIdentity(this.identity); this.ai.shown=1; + this.node.identity.classList.remove('guessing'); if(_status.clickingidentity&&_status.clickingidentity[0]==this){ for(var i=0;i<_status.clickingidentity[1].length;i++){ @@ -958,6 +963,7 @@ mode.guozhan={ player.identityShown=true; player.name=name; player.sex=sex; + player.node.identity.classList.remove('guessing'); switch(num){ case 0:player.classList.remove('unseen');break; case 1:player.classList.remove('unseen2');break; diff --git a/mode/identity.js b/mode/identity.js index be3080f6f..527ff15e7 100644 --- a/mode/identity.js +++ b/mode/identity.js @@ -390,6 +390,7 @@ mode.identity={ showIdentity:function(me){ for(var i=0;i