s7

character/yxs.js

@@ -1004,8 +1004,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			sanbanfu2:{
 				trigger:{player:'shaAfter'},
-				forced:true,
-				popup:false,
 				silent:true,
 				content:function(){
 					if(player.storage.sanbanfu) player.damage(trigger.target);
@@ -1015,8 +1013,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			sanbanfu3:{
 				trigger:{source:'damageBegin'},
-				forced:true,
-				popup:false,
 				silent:true,
 				filter:function(event,player){
 					return event.card&&event.card.name=='sha'&&player.storage.sanbanfu2;

game/game.js

@@ -19490,8 +19490,6 @@
 			},
             counttrigger:{
                 trigger:{global:'phaseAfter'},
-                forced:true,
-                popup:false,
                 silent:true,
                 priority:-25,
                 content:function(){

game/update.js

@@ -1,6 +1,6 @@
 window.noname_update={
     version:'1.9.28.3',
-    update:'1.9.28',
+    // update:'1.9.28',
     changeLog:[
         'bug修复',
     ],

mode/boss.js

@@ -1026,8 +1026,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				mode:['boss'],
 				global:'boss_chiyan2x',
 				trigger:{player:'dieBegin'},
-				forced:true,
-				popup:false,
 				silent:true,
 				unique:true,
 				filter:function(event,player){
@@ -1110,8 +1108,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				mode:['boss'],
 				global:'boss_chiyan3x',
 				trigger:{player:'dieBegin'},
-				forced:true,
-				popup:false,
 				silent:true,
 				unique:true,
 				filter:function(event,player){
@@ -1196,8 +1192,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				mode:['boss'],
 				global:'boss_qingmu2x',
 				trigger:{player:'dieBegin'},
-				forced:true,
-				popup:false,
 				silent:true,
 				unique:true,
 				filter:function(event,player){
@@ -1280,8 +1274,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				mode:['boss'],
 				global:'boss_qingmu3x',
 				trigger:{player:'dieBegin'},
-				forced:true,
-				popup:false,
 				silent:true,
 				unique:true,
 				filter:function(event,player){
@@ -2936,8 +2928,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			},
 			boss_damagecount2:{
 				trigger:{source:'damageEnd'},
-				forced:true,
-				popup:false,
 				silent:true,
 				filter:function(event,player){
 					if(!ui.damageCount) return false;
@@ -3020,8 +3010,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				mode:['boss'],
 				global:'boss_bianshen2x',
 				trigger:{player:'dieBegin'},
-				forced:true,
-				popup:false,
 				silent:true,
 				content:function(){
 					player.hide();
@@ -3048,8 +3036,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				mode:['boss'],
 				global:'boss_bianshen3x',
 				trigger:{player:'dieBegin'},
-				forced:true,
-				popup:false,
 				silent:true,
 				content:function(){
 					player.hide();
@@ -3076,8 +3062,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				mode:['boss'],
 				global:'boss_bianshen4x',
 				trigger:{player:'dieBegin'},
-				forced:true,
-				popup:false,
 				silent:true,
 				content:function(){
 					player.hide();

mode/guozhan.js

@@ -653,8 +653,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					},
 					count1:{
 						trigger:{player:'loseAfter'},
-						forced:true,
-						popup:false,
 						silent:true,
 						filter:function(event,player){
 							if(event.type!='gain'&&event.type!='equip') return true;
@@ -744,8 +742,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					},
 					clear:{
 						trigger:{global:'phaseAfter'},
-						forced:true,
-						popup:false,
 						silent:true,
 						content:function(){
 							delete player.storage.zhangwu;
@@ -1157,8 +1153,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 							return event.card.name=='sha'&&event.cards.length&&
 								event.player.isFriendOf(player)&&get.cardCount(true,event.player)==1;
 						},
-						forced:true,
-						popup:false,
 						silent:true,
 						content:function(){
 							trigger.gzyongjue=player;
@@ -1283,7 +1277,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			gzduanchang:{
 				audio:'duanchang',
 				trigger:{player:'dieBegin'},
-				forced:true,
+				popup:true,
 				silent:true,
 				filter:function(event,player){
 					return event.source&&event.source.isIn()&&event.source!=player&&
@@ -1333,6 +1327,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					}
 					trigger.source.disableSkill('gzduanchang_disable',list);
 					trigger.source.syncSkills();
+					player.line(trigger.source,'green');
 				},
 				logTarget:'source',
 				ai:{
@@ -1512,8 +1507,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			},
 			gzrende1:{
 				trigger:{player:'phaseUseBegin'},
-				forced:true,
-				popup:false,
 				silent:true,
 				content:function(){
 					player.storage.gzrende=0;

mode/versus.js

@@ -4175,8 +4175,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     		},
     		versus_ladder:{
     			trigger:{global:['damageEnd','recoverEnd','dieEnd','gainEnd','phaseDiscardEnd']},
-    			forced:true,
-    			popup:false,
     			silent:true,
     			filter:function(event,player){
     				if(!_status.ladder) return false;