v1.9.20.1

card/sp.js

@@ -8,12 +8,12 @@ card.sp={
 			ai:{
 				useful:function(){
 					var player=_status.event.player;
-					if(player.countCards('h','jinchan')>1) return 0;
+					var nj=player.countCards('h','jinchan');
 					var num=player.getHandcardLimit();
-					if(num==1){
+					if(nj>=num){
 						return 10;
 					}
-					if(num==2){
+					if(nj==num-1){
 						return 6;
 					}
 					return 1;
@@ -526,8 +526,8 @@ card.sp={
 			popup:false,
 			filter:function(event,player){
 				if(event.player==player) return false;
-				var cards=player.getCards('h');
+				var num=player.countCards('h','jinchan');
-				return cards.length==1&&cards[0].name=='jinchan';
+				return num&&num==player.countCards('h');
 			},
 			content:function(){
 				'step 0'

character/sp.js

@@ -1087,7 +1087,7 @@ character.sp={
 			skillAnimation:true,
 			forceunique:true,
 			filter:function(event,player){
-				return player.storage.fanghun2>0;
+				return player.storage.fanghun>0;
 			},
 			prompt:function(event,player){
 				var num=player.storage.fanghun2;
@@ -1098,10 +1098,11 @@ character.sp={
 				return get.prompt('fuhan')+'（体力上限：'+num+'）';
 			},
 			check:function(event,player){
-				if(player.storage.fanghun2==1) return false;
+				var num=player.storage.fanghun2;
+				if(num==1) return false;
 				if(player.hp<=1) return true;
-				if(player.storage.fanghun2==2) return false;
+				if(num==2) return false;
-				if(player.storage.fanghun2==3) return player.hp<3&&player.isLowestHp();
+				if(num==3) return player.hp<3&&player.isLowestHp();
 				return true;
 			},
 			content:function(){
@@ -1155,6 +1156,7 @@ character.sp={
 			},
 			content:function(){
 				player.storage.fanghun++;
+				player.storage.fanghun2++;
 				player.markSkill('fanghun');
 			},
 			group:['fanghun_sha','fanghun_shan','fanghun_draw'],
@@ -1168,7 +1170,6 @@ character.sp={
 					},
 					content:function(){
 						player.draw();
-						player.storage.fanghun2++;
 					}
 				},
 				sha:{

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.9.20',
+    '1.9.20.1',
     'image/background/huangtian_bg.jpg',
     'image/background/ol_bg.jpg',
     'image/background/september_bg.jpg',

game/game.js

@@ -33579,7 +33579,7 @@
 				var func;
 				var node=ui.create.div('.config');
 				ui.create.div(node).innerHTML=get.translation(name+'_config');
-				var switcher=ui.create.div('.toggle',node);
+				var switcher=ui.create.div('.toggle.pointerdiv',node);
 				switcher.name=name;
 				for(var i=0;i<arguments.length;i++){
 					if(typeof arguments[i]=='function'){
@@ -36499,12 +36499,12 @@
 				this.previousSibling.hide();
 				var node=ui.create.div('.switcher',this.parentNode).animate('start');
 				for(var i=0;i<this.choice.length;i++){
-					var choice=ui.create.div(node);
+					var choice=ui.create.div('.pointerdiv',node);
 					choice.innerHTML=get.translation(this.choice[i]);
 					choice.link=this.choice[i];
 					choice.addEventListener(lib.config.touchscreen?'touchend':'click',ui.click.choice);
 				}
-				this.parentNode.style.height=(node.offsetHeight)+'px';
+				// this.parentNode.style.height=(node.offsetHeight)+'px';
 				_status.choosing=this;
 				if(!_status.choosing.expand){
 					_status.choosing.expand=true;
@@ -39310,6 +39310,12 @@
 			if(typeof str=='string'){
 				return str;
 			}
+			if(typeof str=='number'||typeof str=='boolean'){
+				return str.toString();
+			}
+			if(str&&str.toString){
+				return str.toString();
+			}
 			return '';
 		},
 		cnNumber:function(num,two){

game/update.js

@@ -1,8 +1,8 @@
 window.noname_update={
-    version:'1.9.20',
+    version:'1.9.20.1',
     // update:'1.9.19',
     changeLog:[
-        '忠胆英杰',
+        'bug修复',
     ],
     files:[
         'game/game.js',

layout/mode/chess.css

@@ -267,6 +267,9 @@
     right: 5px;
     left:auto;
 }
+.button.newstyle .intro.showintro.tafang{
+    top: 6px;
+}
 .dialog .buttons>.button.character.squarebutton{
     height:90px;
 }