b

character/yijiang.js

@@ -95,8 +95,24 @@ character.yijiang={
 		jyzongshi:{
 			audio:2,
 			trigger:{player:['chooseToCompareAfter','compareMultipleAfter'],target:['chooseToCompareAfter','compareMultipleAfter']},
-			filter:function(event){
-				return !event.preserve;
+			filter:function(event,player){
+				if(event.preserve) return false;
+				if(player==event.player){
+					if(event.card1.number>event.card2.number){
+						return !get.owner(event.card2);
+					}
+					else{
+						return !get.owner(event.card1);
+					}
+				}
+				else{
+					if(event.card1.number<event.card2.number){
+						return !get.owner(event.card1);
+					}
+					else{
+						return !get.owner(event.card2);
+					}
+				}
 			},
 			check:function(event,player){
 				if(player==event.player){
@@ -4329,8 +4345,7 @@ character.yijiang={
 		},
 		qiaoshui3:{
 			trigger:{player:'useCard'},
-			forced:true,
-			popup:false,
+			direct:true,
 			filter:function(event,player){
 				var type=get.type(event.card);
 				return type=='basic'||type=='trick';
@@ -4359,6 +4374,11 @@ character.yijiang={
 						return ai.get.effect(target,trigger.card,player,player);
 					});
 				}
+				else{
+					if(!info.multitarget&&trigger.targets&&trigger.targets.length>1){
+						event.goto(3);
+					}
+				}
 				'step 1'
 				if(result.bool){
 					game.delay(0.5);
@@ -4372,6 +4392,31 @@ character.yijiang={
 					player.logSkill('qiaoshui',event.target);
 					trigger.targets.add(event.target);
 				}
+				event.finish();
+				'step 3'
+				player.chooseTarget('巧说：是否减少一名'+get.translation(trigger.card)+'的目标？',function(card,player,target){
+					return _status.event.getTrigger().targets.contains(target);
+				}).set('ai',function(target){
+					var trigger=_status.event.getTrigger();
+					return -ai.get.effect(target,trigger.card,trigger.player,_status.event.player);
+				});
+				'step 4'
+				if(result.bool){
+					event.targets=result.targets;
+					if(event.isMine()){
+						player.logSkill('qiaoshui',event.targets);
+						event.finish();
+					}
+					for(var i=0;i<result.targets.length;i++){
+						trigger.targets.remove(result.targets[i]);
+					}
+					game.delay();
+				}
+				else{
+					event.finish();
+				}
+				'step 5'
+				player.logSkill('qiaoshui',event.targets);
 			}
 		},
 		jyzongshi_old:{

layout/default/phone.css

@@ -74,6 +74,11 @@
     left: 10px !important;
 }
 
+#system{
+    width: calc(100% - 12px) !important;
+    left: 0 !important;
+}
+
 #arena.phonetop{
     top:80px !important;
 }

layout/long2/layout.css

@@ -54,6 +54,25 @@
 #arena:not(.mobile).single-handcard #handcards1{
     width: calc(100% - 120px);
 }
+#window.rightbar #system,
+#window.leftbar #system{
+    width: calc(100% - 62px);
+}
+#window.leftbar #system{
+    left: 50px;
+}
+#window.rightbar #historybar{
+    left: calc(100% - 50px);
+    border-radius: 0;
+    top: 0;
+    height: 100%;
+}
+#window.leftbar #historybar{
+    left: 0;
+    border-radius: 0;
+    top: 0;
+    height: 100%;
+}
 #window.leftbar #arena:not(.chess)>#me,
 #window.leftbar #arena:not(.chess)>#mebg,
 #window.leftbar #arena:not(.chess)>#autonode{