l

card/gujian.js

@@ -5,7 +5,6 @@ card.gujian={
             fullskin:true,
             type:'food',
             enable:true,
-            markimage:'-14%',
             filterTarget:function(card,player,target){
                 return !target.hasSkill('luyugeng');
             },
@@ -55,7 +54,6 @@ card.gujian={
             fullskin:true,
             type:'food',
             enable:true,
-            markimage:'-13%',
             filterTarget:function(card,player,target){
                 return !target.hasSkill('chunbing');
             },
@@ -87,7 +85,6 @@ card.gujian={
             fullskin:true,
             type:'food',
             enable:true,
-            markimage:'-18%',
             filterTarget:function(card,player,target){
                 return !target.hasSkill('gudonggeng');
             },
@@ -139,7 +136,6 @@ card.gujian={
             fullskin:true,
             type:'food',
             enable:true,
-            markimage:'-16%',
             filterTarget:function(card,player,target){
                 return !target.hasSkill('mizhilianou');
             },
@@ -220,7 +216,6 @@ card.gujian={
             fullskin:true,
             type:'food',
             enable:true,
-            markimage:'-18%',
             filterTarget:function(card,player,target){
                 return !target.hasSkill('mapodoufu');
             },
@@ -245,7 +240,6 @@ card.gujian={
             fullskin:true,
             type:'food',
             enable:true,
-            markimage:'-16%',
             filterTarget:function(card,player,target){
                 return !target.hasSkill('qingtuan');
             },
@@ -279,7 +273,6 @@ card.gujian={
             fullskin:true,
             type:'food',
             enable:true,
-            markimage:'-16%',
             filterTarget:function(card,player,target){
                 return !target.hasSkill('yougeng');
             },
@@ -499,7 +492,6 @@ card.gujian={
 			type:'basic',
 			enable:true,
 			logv:false,
-            markimage:'-12%',
 			filterTarget:function(card,player,target){
 				return !target.hasSkill('yunvyuanshen_skill');
 			},

card/sp.js

@@ -523,6 +523,7 @@ card.sp={
 			forced:true,
 			popup:false,
 			filter:function(event,player){
+				if(event.player==player) return false;
 				var cards=player.getCards('h');
 				return cards.length==1&&cards[0].name=='jinchan';
 			},

card/swd.js

@@ -4626,11 +4626,12 @@ card.swd={
 			check:function(event,player){
 				var att=ai.get.attitude(player,event.target);
 				if(player.hasSkill('jiu')) return att>0;
-				if(event.target.hasSkillTag('maixie')){
+				if(event.target.hasSkillTag('maixie_hp')){
 					return att<=0;
 				}
-				if(event.target.hp==1) return att>0;
+				if(player.hasSkill('tianxianjiu')) return false;
 				if(event.target.hujia>0) return att<0;
+				if(event.target.hp==1) return att>0;
 				return false;
 			},
 			content:function(){

game/game.js

@@ -14990,9 +14990,9 @@
 							this.node.marks.insertBefore(node,this.node.marks.childNodes[1]);
 							node.suit=name.suit;
 							node.number=name.number;
-							if(name.name&&lib.card[name.name]&&lib.card[name.name].markimage){
+							// if(name.name&&lib.card[name.name]&&lib.card[name.name].markimage){
-								node.node.image.style.left=lib.card[name.name].markimage;
+							// 	node.node.image.style.left=lib.card[name.name].markimage;
-							}
+							// }
 							name=name.name;
 						}
 						else{

game/update.js

@@ -10,15 +10,15 @@ window.noname_update={
         // 'game/config.js',
         // 'game/source.js',
         // 'game/asset.js',
-        'card/*',
+        // 'card/*',
         // 'card/sp.js',
         // 'card/yunchou.js',
-        'character/*',
+        // 'character/*',
         // 'character/sp.js',
         // 'mode/boss.js',
         // 'mode/versus.js',
         // 'mode/guozhan.js',
-        'mode/identity.js',
+        // 'mode/identity.js',
         // 'mode/chess.js',
         // 'mode/tafang.js',
         // 'mode/guozhan.js',

layout/default/layout.css

@@ -2045,10 +2045,13 @@ div:not(.handcards)>.card>.info>span,
 	display: none;
 }
 .equips>div>.image,.judges>div>.image,.marks>div>.image {
-	width: 120%;
+	/*width: 120%;
 	height: 120%;
 	left: -20%;
-	top: -20%;
+	top: -20%;*/
+	background-size: 120%;
+    background-position: -4px -4px;
+    background-repeat: no-repeat;
 }
 /*.equips>div:hover>.info{display: inline-block;
 	animation:equip_hover 1s;

mode/identity.js

@@ -666,8 +666,11 @@ mode.identity={
 							setTimeout(function(){
 								_status.tempNoButton=false;
 							},500);
+							var link=this.link;
 							if(game.zhu.name){
-								_status.event.parent.fixedseat=get.distance(game.me,game.zhu,'absolute');
+								if(link!='random'){
+									_status.event.parent.fixedseat=get.distance(game.me,game.zhu,'absolute');
+								}
 								game.zhu.uninit();
 								delete game.zhu.isZhu;
 								delete game.zhu.identityShown;
@@ -680,7 +683,6 @@ mode.identity={
 							if(current){
 								current.classList.remove('thundertext');
 							}
-							var link=this.link;
 							if(link=='random'){
 								if(event.zhongmode){
 									link=['zhu','zhong','nei','fan','mingzhong'].randomGet();