From 0e82bc616daf1e4efc97a3a306f4e711d77ebd15 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Sun, 17 Sep 2017 22:32:08 +0800
Subject: [PATCH] v1.9.38.0

---
 card/guozhan.js      |  1 +
 character/gwent.js   |  1 +
 character/ow.js      |  2 +-
 character/yijiang.js |  3 +++
 game/game.js         | 12 +++++++++---
 game/update.js       | 16 ++++++++--------
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/card/guozhan.js b/card/guozhan.js
index 264b7539c..52afec4f2 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -315,6 +315,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				filterTarget:function(card,player,target){
 					return target!=player;
 				},
+				selectTarget:[1,2],
 				content:function(){
 					target.addTempSkill('diaohulishan');
 				},
diff --git a/character/gwent.js b/character/gwent.js
index ab623b9ae..205c424b9 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -107,6 +107,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(player.isUnderControl(true)){
 							if(_status.gameStarted&&player.storage.gwjingtian>0&&!player.hasSkill('gwjingtian2')){
 								dialog.add(ui.create.div('.menubutton.pointerdiv','点击发动',function(){
+									this.remove();
 									lib.skill.gwjingtian.clickable(player);
 								}));
 							}
diff --git a/character/ow.js b/character/ow.js
index cc57fbc84..1481abc4f 100644
--- a/character/ow.js
+++ b/character/ow.js
@@ -4,7 +4,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		name:'ow',
 	    character:{
 	        ow_liekong:['female','shu',3,['shanxian','shanhui']],
-	        ow_sishen:['male','shu',3,['xiandan','yihun','shouge']],
+	        ow_sishen:['male','shu',4,['xiandan','yihun','shouge']],
 	        ow_tianshi:['female','qun',3,['shouhu','ziyu','feiying']],
 	        ow_falaozhiying:['female','shu',3,['feidan','huoyu','feiying']],
 	        ow_zhixuzhiguang:['female','qun',3,['guangshu']],
diff --git a/character/yijiang.js b/character/yijiang.js
index d5dc46783..a1ad7020a 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -6892,6 +6892,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				return player.countCards('he')>=num;
     			},
     			check:function(card){
+                    if(ui.selected.cards.length>=2){
+                        return 4-get.value(card);
+                    }
     				return 6-get.value(card);
     			},
     			selectCard:function(card){
diff --git a/game/game.js b/game/game.js
index 2d4dc02f8..26284a9eb 100644
--- a/game/game.js
+++ b/game/game.js
@@ -9023,13 +9023,16 @@
     					event.bool=false;
     					return;
     				}
+					_status.imchoosing=true;
     				game.pause();
     				"step 3"
+					_status.imchoosing=false;
     				if(event.bool){
     					if(game.changeCoin){
     						game.changeCoin(-3);
     					}
     					var hs=game.me.getCards('h');
+						game.addVideo('lose',game.me,[get.cardsInfo(hs),[],[]]);
     					for(var i=0;i<hs.length;i++){
     						hs[i].discard(false);
     					}
@@ -25015,6 +25018,9 @@
 			ui.control.show();
 			ui.clear();
             game.stopCountChoose();
+			if(ui.time3){
+				clearInterval(ui.time3.interval);
+			}
 			if(game.layout=='long2'&&!game.chess){
 				ui.arena.classList.add('choose-character');
 				ui.me.hide();
@@ -43106,15 +43112,15 @@
 						}
 						else if(lib.skill[skills[i]].clickable&&node.isIn()&&node.isUnderControl(true)){
 							var intronode=uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i])+'<br><div class="menubutton skillbutton" style="position:relative;margin-top:5px">点击发动</div></div></div>').querySelector('.skillbutton');
-							intronode.link=node;
-							intronode.func=lib.skill[skills[i]].clickable;
-							intronode.listen(ui.click.skillbutton);
 							if(!_status.gameStarted||(lib.skill[skills[i]].clickableFilter&&!lib.skill[skills[i]].clickableFilter(node))){
 								intronode.classList.add('disabled');
 								intronode.style.opacity=0.5;
 							}
 							else{
+								intronode.link=node;
+								intronode.func=lib.skill[skills[i]].clickable;
 								intronode.classList.add('pointerdiv');
+								intronode.listen(ui.click.skillbutton);
 							}
 						}
 						else if(lib.skill[skills[i]].nobracket){
diff --git a/game/update.js b/game/update.js
index 58a5d8cf8..83d5c394b 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,6 +1,6 @@
 window.noname_update={
-    version:'1.9.38',
-    update:'1.9.37.2',
+    version:'1.9.38.0',
+    update:'1.9.38',
     changeLog:[
         'bug修复'
     ],
@@ -10,11 +10,11 @@ window.noname_update={
         // 'game/config.js',
         // 'game/source.js',
         // 'game/pressure.js',
-        'game/asset.js',
+        // 'game/asset.js',
         // 'card/*',
         // 'card/standard.js',
         // 'card/gwent.js',
-        // 'card/gujian.js',
+        'card/guozhan.js',
         // 'character/*',
         // 'character/hearth.js',
         'character/gwent.js',
@@ -22,13 +22,13 @@ window.noname_update={
         // 'character/standard.js',
         // 'character/sp.js',
         // 'character/swd.js',
-        'character/rank.js',
+        // 'character/rank.js',
         // 'character/yijiang.js',
         // 'character/xianjian.js',
         // 'mode/identity.js',
-        'mode/boss.js',
+        // 'mode/boss.js',
         // 'mode/guozhan.js',
-        'mode/versus.js',
+        // 'mode/versus.js',
         // 'mode/connect.js',
         // 'mode/chess.js',
         // 'mode/tafang.js',
@@ -46,6 +46,6 @@ window.noname_update={
         // 'layout/mobile/layout.css',
         // 'layout/newlayout/global.css',
         // 'layout/mode/chess.css',
-        'extension/boss/extension.js',
+        // 'extension/boss/extension.js',
     ]
 }