From cdbcd188e47110e5461f02e49bff21793725ae97 Mon Sep 17 00:00:00 2001 From: shijian <2954700422@qq.com> Date: Thu, 12 Oct 2023 19:42:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9.eslintrc.json=E7=9A=84?= =?UTF-8?q?=E7=BC=A9=E8=BF=9B=EF=BC=8C=E6=B3=A8=E9=87=8A=E6=8E=89=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.json | 2 +- card/yunchou.js | 2 +- character/diy.js | 2 +- character/huicui.js | 4 ++-- character/mobile.js | 8 ++++---- character/shiji.js | 2 +- character/tw.js | 2 +- character/xianding.js | 10 +++++----- game/game.js | 20 ++++++++++---------- layout/default/layout.css | 4 ++++ 10 files changed, 30 insertions(+), 26 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 8d79549ec..88229aedd 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": "chrome 46", + "extends": "chrome 46", "env": { "browser": true, "node": true, diff --git a/card/yunchou.js b/card/yunchou.js index ca76a5e3c..3ed73a7e0 100644 --- a/card/yunchou.js +++ b/card/yunchou.js @@ -268,7 +268,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ return target.countCards('h')>0&&game.hasPlayer(function(current){ return target.canCompare(current); }); - return ui.selected.targets[0].canCompare(target); + //return ui.selected.targets[0].canCompare(target); }, filterAddedTarget:function(card,player,target,preTarget){ return target!=player&&preTarget.canCompare(target); diff --git a/character/diy.js b/character/diy.js index 7a1dcc2ed..7d5776420 100755 --- a/character/diy.js +++ b/character/diy.js @@ -680,7 +680,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(evt.gaintag_map[i].includes('fuuko_chuanyuan')) return true; } }); - return false; + //return false; }, content:function(){ trigger.addCount=false; diff --git a/character/huicui.js b/character/huicui.js index da20ed7c5..da6048410 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -5044,7 +5044,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(evtx3.gaintag_map[i].contains('dcliuzhuan_tag')) return true; } }); - return false; + //return false; } else if(event.name=='lose'){ if(event.player!=current||event.position!=ui.discardPile) return false; @@ -5268,7 +5268,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(target.group!=current.group) return false; if(!ui.selected.targets.length) return true; return ui.selected.targets[0]==current; - return current==target; + //return current==target; }).set('ai',function(target){ var player=_status.event.player; return get.effect(target,{name:'sha'},player,player); diff --git a/character/mobile.js b/character/mobile.js index 4526dce5b..414a2d36f 100644 --- a/character/mobile.js +++ b/character/mobile.js @@ -9902,10 +9902,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var att=get.attitude(player,target); return -att; //if(cards.length==1) return -att; - if(player==target) att/=2; - if(target.hasSkill('pingkou')) att*=1.4; - att*=(1+target.countCards('j')/2); - return att; + // if(player==target) att/=2; + // if(target.hasSkill('pingkou')) att*=1.4; + // att*=(1+target.countCards('j')/2); + // return att; }); "step 3" if(result.bool){ diff --git a/character/shiji.js b/character/shiji.js index fabf6e632..9191f86ee 100644 --- a/character/shiji.js +++ b/character/shiji.js @@ -4715,7 +4715,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var player=_status.event.player,evt=_status.event.getParent(); if(get.value(evt.card,evt.player)*get.attitude(player,evt.player)>0) return 0; return Math.random()>(get.value(evt.card,evt.player)/6)?1:0; - return 1; + //return 1; }); 'step 2' if(result.index+event.addIndex==0){ diff --git a/character/tw.js b/character/tw.js index 29d783d7c..32f94914b 100644 --- a/character/tw.js +++ b/character/tw.js @@ -8218,7 +8218,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return names.length>0&&player.hasCard(function(card){ return names.includes(get.name(card)); },'hs'); - return false; + //return false; }, group:'twchaofeng_compare', chooseButton:{ diff --git a/character/xianding.js b/character/xianding.js index 90d0fcdd1..c4b87a521 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -11025,11 +11025,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.judge(function(card){ var type=get.subtype(card); return ['equip1','equip4','equip3','equip6'].contains(type)?6:-6; - switch(type){ - case 'equip':return 4; - case 'trick':return -4; - default:return 0; - } + // switch(type){ + // case 'equip':return 4; + // case 'trick':return -4; + // default:return 0; + // } }).judge2=function(result){ return result.bool; }; diff --git a/game/game.js b/game/game.js index 6fcc89298..8353dc4a7 100644 --- a/game/game.js +++ b/game/game.js @@ -58520,16 +58520,16 @@ m=game.checkMod(from,to,m,'attackFrom',from); m=game.checkMod(from,to,m,'attackTo',to); return m; - const attakRange=from.getEquipRange(); - m+=(1-attakRange); - for(let i=0;i