Merge pull request #517 from nonameShijian/PR-Branch

修改.eslintrc.json的缩进，注释掉部分无用代码，隐藏火狐浏览器的滚动条

.eslintrc.json

@@ -1,5 +1,5 @@
 {
-	"extends": "chrome 46",
+    "extends": "chrome 46",
     "env": {
         "browser": true,
         "node": true,

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);

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;

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);

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){

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){

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:{

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;
 					};

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<equips2.length;i++){
-					let info=get.info(equips2[i]).distance;
-					if(!info) continue;
-					if(info.attaclTo){
-						m+=info.attaclTo;
-					}
-				}
-				return n;
+				// const attakRange=from.getEquipRange();
+				// m+=(1-attakRange);
+				// for(let i=0;i<equips2.length;i++){
+				// 	let info=get.info(equips2[i]).distance;
+				// 	if(!info) continue;
+				// 	if(info.attaclTo){
+				// 		m+=info.attaclTo;
+				// 	}
+				// }
+				// return n;
 			}
 			else if(method=='unchecked') return n;
 			return Math.max(1,n);

layout/default/layout.css

@@ -5528,4 +5528,8 @@ div[data-decoration="bronze"]::after{
 /*--------其它--------*/
 ::-webkit-scrollbar {
 	display: none;
+}
+/* 火狐隐藏滚动条 */
+* {
+	scrollbar-width: none;
 }