From 293979e5ad9dbcf2fe438803d60a3efccfa0d311 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Fri, 12 Aug 2016 18:09:26 +0800
Subject: [PATCH] hj

---
 character/standard.js |  2 +-
 game/game.js          | 35 ++++++++++++++++++++++++++++++++---
 game/update.js        |  8 ++++----
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/character/standard.js b/character/standard.js
index 85b1d0396..c4f1df457 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -49,7 +49,7 @@ character.standard={
 			trigger:{player:'chooseToRespondBegin'},
 			filter:function(event,player){
 				if(event.responded) return false;
-				if(!player.hasZhuSkill('jianxiong')) return false;
+				if(!player.hasZhuSkill('hujia')) return false;
 				if(event.filterCard({name:'shan'})==false) return false;
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i]!=player&&game.players[i].group=='wei') return true;
diff --git a/game/game.js b/game/game.js
index 93c37c643..ea865f956 100755
--- a/game/game.js
+++ b/game/game.js
@@ -12073,9 +12073,38 @@
 				notLink:function(){
 					return this.getParent().name!='_lianhuan'&&this.getParent().name!='_lianhuan2';
 				},
-                triggerx:function(name){
-
-                },
+                // triggerx:function(name){
+                //     if(_status.video) return;
+                //     if(name=='gameStart'){
+                //         _status.gameStarted=true;
+                //     }
+                //     for(i=0;i<game.players.length;i++){
+				// 		for(j in game.players[i].tempSkills){
+				// 			var expire=game.players[i].tempSkills[j];
+				// 			if(expire==name||
+				// 				(get.objtype(expire)=='array'&&expire.contains(name))||
+				// 				(typeof expire=='function'&&expire(event,game.players[i],name))){
+				// 				delete game.players[i].tempSkills[j];
+				// 				game.players[i].removeSkill(j);
+				// 			}
+				// 			else if(typeof expire=='object'){
+				// 				if(expire.player==name&&event.player==game.players[i]||
+				// 					expire.target==name&&event.target==game.players[i]||
+				// 					expire.source==name&&event.source==game.players[i]){
+				// 					delete game.players[i].tempSkills[j];
+				// 					game.players[i].removeSkill(j);
+				// 				}
+				// 			}
+				// 		}
+				// 	}
+                //     var event=this;
+                //     var start=event.player||game.me||game.players[0];
+                //     if(!game.players.contains(start)){
+				// 		start=game.findNext(start);
+				// 	}
+                //     var list=[];
+                //
+                // },
 				trigger:function(name){
 					if(_status.video) return;
                     if(name=='gameStart'){
diff --git a/game/update.js b/game/update.js
index 92ebcd004..1f1939ee3 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,12 +1,12 @@
 window.noname_update={
-    version:'1.9.0',
+    version:'1.8.20.3',
     changeLog:[
-        '半成品，建议退回1.8',
-        // '性能提升',
+        '修bug'
     ],
     files:{
         global:[
-            'game/game.js',
+            // 'game/game.js',
+            'character/standard.js',
         ],
     }
 }