l

card/swd.js

@@ -2723,7 +2723,7 @@ card.swd={
 				return 7-ai.get.value(card);
 			},
 			filter:function(event,player){
-				return player.hp<player.maxHp;
+				return player.hp<player.maxHp&&player.num('h')>=2;
 			},
 			content:function(){
 				player.recover();

character/rank.js

@@ -225,6 +225,7 @@ window.characterRank={
         'swd_yeyaxi',
     ],
     bp:[
+        'pal_leiyuange',
         'dongbai',
         'swd_moye',
         'guohuanghou',

character/xianjian.js

@@ -19,7 +19,7 @@ character.xianjian={
 		pal_wenhui:['female','shu',4,['huxi','longxiang']],
 		pal_wangpengxu:['female','shu',3,['duxinshu','feixu']],
 		pal_xingxuan:['male','wei',3,['feizhua','leiyu','lingxue']],
-		// pal_leiyuange:['male','wei',3,[]],
+		pal_leiyuange:['male','shu',4,['feng','ya','song']],
 
 		pal_yuntianhe:['male','wu',4,['longxi','zhuyue','guanri']],
 		pal_hanlingsha:['female','shu',3,['tannang','tuoqiao']],
@@ -38,6 +38,88 @@ character.xianjian={
 		// pal_jiangcheng:['male','wei',4,[]],
 	},
 	skill:{
+		feng:{
+			unique:true,
+			init:function(player){
+				player.storage.feng=0;
+			},
+			mark:true,
+			intro:{
+				content:function(storage){
+					return '已累计摸'+storage+'次牌';
+				}
+			},
+			trigger:{player:'drawBegin'},
+			forced:true,
+			popup:false,
+			content:function(){
+				if(player.storage.feng<2){
+					player.storage.feng++;
+				}
+				else{
+					trigger.num++;
+					player.storage.feng=0;
+					player.logSkill('feng');
+				}
+				player.updateMarks();
+			}
+		},
+		ya:{
+			unique:true,
+			init:function(player){
+				player.storage.ya=0;
+			},
+			mark:true,
+			intro:{
+				content:function(storage){
+					return '已累计受到'+storage+'次伤害';
+				}
+			},
+			trigger:{player:'damageBegin'},
+			filter:function(event,player){
+				if(player.storage.ya==2) return event.num>0;
+				return true;
+			},
+			forced:true,
+			popup:false,
+			content:function(){
+				if(player.storage.ya<2){
+					player.storage.ya++;
+				}
+				else if(trigger.num>0){
+					trigger.num--;
+					player.storage.ya=0;
+					player.logSkill('ya');
+				}
+				player.updateMarks();
+			}
+		},
+		song:{
+			unique:true,
+			init:function(player){
+				player.storage.song=0;
+			},
+			mark:true,
+			intro:{
+				content:function(storage){
+					return '已累计造成'+storage+'次伤害';
+				}
+			},
+			trigger:{source:'damageBegin'},
+			forced:true,
+			popup:false,
+			content:function(){
+				if(player.storage.song<2){
+					player.storage.song++;
+				}
+				else{
+					trigger.num++;
+					player.storage.song=0;
+					player.logSkill('song');
+				}
+				player.updateMarks();
+			}
+		},
 		longxiang:{
 			trigger:{player:'shaBegin'},
 			filter:function(event,player){
@@ -2228,6 +2310,12 @@ character.xianjian={
 		pal_changqing:'长卿',
 		pal_xuanxiao:'玄霄',
 
+		feng:'风',
+		feng_info:'锁定技，当你累计摸2次牌后，你下一次摸牌时摸牌数+1',
+		ya:'雅',
+		ya_info:'锁定技，当你累计受到2次伤害后，你下一次受到的伤害-1',
+		song:'颂',
+		song_info:'锁定技，当你累计造成2次伤害后，你下一次造成的伤害+1',
 		longxiang:'龙翔',
 		longxiang_info:'当你使用杀指定目标后，你可以弃置目标若干张手牌直到其手牌数与你相同',
 		huxi:'虎袭',

game/update.js

@@ -1,13 +1,16 @@
 window.noname_update={
-    version:'1.9.5.2',
+    version:'1.9.5.3',
-    // update:'1.9.5',
+    update:'1.9.5.2',
     changeLog:[
         'bug修复',
     ],
     files:[
         // 'game/server.js',
         // 'character/swd.js',
-        // 'character/xianjian.js',
+        'character/rank.js',
-        // 'layout/long/layout.css',
+        'character/xianjian.js',
+        'card/swd.js',
+        'mode/tafang.js',
+        'layout/newlayout/global.css',
     ]
 }

layout/newlayout/global.css

@@ -9,13 +9,14 @@
 #historybar{
 	height: calc(90% - 25px);
 }
-#window>.player:not(.minskin)>.avatar,#arena.slim_player .player:not(.minskin):not(.fakeme) .avatar{
+#window>.player:not(.minskin)>.avatar,
+#arena.slim_player .player:not(.minskin):not(.fakeme) .avatar{
 	width: 136px;
 	height: 166px;
 	left:7px;
 	top:7px;
 }
-#window>.player:not(.minskin)>.avatar,#arena.uslim_player .player:not(.minskin):not(.fakeme) .avatar{
+#arena.uslim_player .player:not(.minskin):not(.fakeme) .avatar{
 	width: 144px;
 	height: 174px;
 	left:3px;

mode/tafang.js

@@ -142,7 +142,7 @@ mode.tafang={
 					clearInterval(_status.currentChessFocus);
 					delete _status.currentChessFocus;
 				}
-			});
+			},{passive:true});
 		}
 
 		ui.chessscroll1=ui.create.div('.chessscroll.left',ui.chessContainer);