修复bug

.jshintrc

@@ -4,7 +4,6 @@
   "funcscope": true,
   "esnext": true,
   "eqnull": true,
-  "strict": true,
   "newcap": false,
   "browser": true,
   "unused": true,

card/standard.js

@@ -198,15 +198,15 @@ card.standard={
 					target:function(player,target){
 						if(target.num('h')<=target.hp&&target.hp>2) return 0;
 						if(target.hp<0&&target!=player&&target.identity!='zhu') return 0;
-						if(ai.get.attitude(player,target)<3) return 0;
+						var att=ai.get.attitude(player,target);
+						if(att<3&&att>=0) return 0;
 						var tri=_status.event.parent._trigger;
 						if(lib.config.mode=='identity'&&player.identity=='fan'&&target.identity=='fan'){
 							if(tri&&tri.name=='dying'&&tri.source&&tri.source.identity=='fan'&&tri.source!=target){
-								var num=target.num('h','jiu')?1:0;
 								for(var i=0;i<game.players.length;i++){
 									if(game.players[i].identity=='fan'){
 										num+=game.players[i].num('h','tao');
-										if(num>1) return 2;
+										if(num>2) return 2;
 									}
 								}
 								return 0;

character/hearth.js

@@ -154,7 +154,7 @@ character.hearth={
 					game.delay(0.5);
 					var target=result.targets[0];
 					player.logSkill('tzhenji',target,'thunder');
-					target.damage('thunder',Math.floor(Math.random()*2));
+					target.damage('thunder',0);
 					var cs=target.get('he');
 					if(cs.length){
 						target.discard(cs.randomGet());
@@ -162,7 +162,15 @@ character.hearth={
 				}
 			},
 			ai:{
-				threaten:0.7
+				threaten:1.2,
+				expose:0.3,
+				effect:{
+					target:function(card,player,target,current){
+						if(get.tag(card,'loseCard')&&target.num('he')){
+							return 0.7;
+						}
+					}
+				},
 			}
 		},
 		tzhenji_old:{
@@ -373,12 +381,12 @@ character.hearth={
 		tuteng4:{
 			mark:'image',
 			intro:{
-				content:'你的锦囊牌造成的伤害+1'
+				content:'你的属性伤害+1'
 			},
 			trigger:{source:'damageBegin'},
 			forced:true,
 			filter:function(event){
-				return event.card&&get.type(event.card)=='trick';
+				return event.nature?true:false;
 			},
 			content:function(){
 				trigger.num++;
@@ -459,7 +467,7 @@ character.hearth={
 		tuteng3:'石爪图腾',
 		tuteng4:'空气之怒图腾',
 		tzhenji:'震击',
-		tzhenji_info:'每当你因弃置而失去黑色牌，可对一名角色造成0~1点雷电伤害，然后随机弃置其一张牌',
+		tzhenji_info:'每当你因弃置而失去黑色牌，可对一名角色造成0点雷电伤害，然后随机弃置其一张牌',
 		fenliu:'分流',
 		fenliu_info:'出牌阶段限一次，你可以失去一点体力并获得3张牌',
 		hongxi:'虹吸',

character/sp.js

@@ -806,10 +806,7 @@ character.sp={
 				return event.player!=player&&_status.currentPhase==event.player;
 			},
 			content:function(){
-				"step 0"
-				trigger.player.draw();
-				"step 1"
-				player.draw();
+				game.asyncDraw([trigger.player,player]);
 			},
 			ai:{
 				expose:0.2

character/standard.js

@@ -1327,7 +1327,7 @@ character.standard={
 							return -3;
 						}
 						else{
-							return ai.get.effect(ui.selected.targets[0],{name:'juedou'},target,player);
+							return ai.get.effect(ui.selected.targets[0],{name:'juedou'},target,target);
 						}
 					}
 				},

character/swd.js

@@ -10,7 +10,7 @@ character.swd={
 			swd_nicole:['female','wu',3,['minjing','lingwu','huanjian'],['fullskin']],
 		swd_wangsiyue:['female','wei',3,['duishi','guisi','biyue']],
 		swd_weida:['female','qun',3,['yueren','zhenlie']],
-			swd_xuanyuanjianxian:['male','qun',4,['fengmo','pozhou','huajian'],['fullskin']],
+			swd_xuanyuanjianxian:['male','qun',4,['pozhou','huajian'],['fullskin']],
 
 			swd_chenjingchou:['male','wu',3,['youyin','yihua'],['fullskin']],
 			swd_duguningke:['female','qun',3,['lianji','touxi'],['fullskin']],

game/game.js

@@ -1672,6 +1672,7 @@
 					}
 					else{
 						player._damagepopup=-num;
+						player._damagenature=event.nature;
 						setTimeout(function(){
 							player.popup(player._damagepopup,player._damagenature);
 							delete player._damagepopup;
@@ -8506,6 +8507,7 @@
 							translate[1]+=e.y-ddialog._dragorigin.y;
 							ddialog.style.webkitTransform='translate('+translate[0]+'px,'+translate[1]+'px)'
 						}
+						_status.clicked=true;
 					}
 				}
 			},

mode/chess.js

@@ -194,6 +194,9 @@ mode.chess={
 				game.over(game.me.side==game.players[0].side);
 			},
 			$draw:function(num){
+				return this.$gainmod(num);
+			},
+			$drawx:function(num){
 				var cards,node;
 				if(get.itemtype(num)=='cards'){
 					cards=num;
@@ -663,6 +666,7 @@ mode.chess={
 					if(this._chessdrag){
 						this.parentNode.scrollLeft=this._chessdrag[1]-e.x+this._chessdrag[0].x;
 						this.parentNode.scrollTop=this._chessdrag[2]-e.y+this._chessdrag[0].y;
+						_status.clicked=true;
 					}
 					e.preventDefault();
 				});
@@ -820,7 +824,11 @@ mode.chess={
 		clickChessInfo:function(e){
 			if(this.link.isAlive()){
 				this.link.chessFocus();
-				ui.click.target.call(this.link,e);
+				if(this.link.classList.contains('selectable')||
+				this.link.classList.contains('selected')){
+					this.link.click();
+				}
+				// ui.click.target.call(this.link,e);
 				e.stopPropagation();
 			}
 		},
@@ -1051,6 +1059,7 @@ mode.chess={
 			game.me.node.avatar.classList.remove('glow2');
 			player.node.avatar.classList.add('glow2');
 			game.swapControl(player);
+			player.chessFocus();
 			ui.create.fakeme();
 		}
 	},
@@ -1305,7 +1314,7 @@ mode.chess={
 		zhiming:{
 			trigger:{source:'damageBegin'},
 			filter:function(event,player){
-				return get.distance(event.player,player,'attack')>1;
+				return get.distance(event.player,player,'attack')>1&&event.card&&event.card.name=='sha';
 			},
 			forced:true,
 			content:function(){

mode/versus.js

@@ -310,6 +310,11 @@ mode.versus={
 				ui.auto.show();
 				ui.wuxie.show();
 				ui.control.style.display='none';
+				setTimeout(function(){
+					ui.control.style.top='';
+					ui.control.style.display='';
+					ui.control.style.transition='';
+				},500);
 				if(ui.cheat){
 					ui.cheat.close();
 					delete ui.cheat;
@@ -419,9 +424,6 @@ mode.versus={
 					// game.enemy[i].node.identity.style.backgroundColor=get.translation(!_status.color+'Color');
 				}
 				"step 2"
-				ui.control.style.top='';
-				ui.control.style.display='';
-				ui.control.style.transition='';
 				var num=lib.storage.number;
 				if(result&&result.buttons){
 					var list=[];