2

card/guozhan.js

@@ -126,7 +126,7 @@ card.guozhan={
 						var num=0;
 						for(var i=0;i<game.players.length;i++){
 							if(target.isMajor()==game.players[i].isMajor()){
-								if(target.isLinked()){
+								if(game.players[i].isLinked()){
 									num+=ai.get.attitude(player,target);
 								}
 								else{
@@ -257,8 +257,13 @@ card.guozhan={
 				order:10,
 				value:4,
 				useful:2,
+				wuxie:function(){
+					return 0;
+				},
 				result:{
-					player:1,
+					player:function(player,target){
+						if(target.hp==1) return 0;
+					},
 					target:function(player,target){
 						if(target.hp==1) return 0;
 						for(var i=0;i<game.players.length;i++){

card/swd.js

@@ -682,10 +682,10 @@ card.swd={
 			check:function(event,player){
 				var att=ai.get.attitude(player,event.target);
 				if(player.skills.contains('jiu')) return att>0;
+				if(event.target.hp==1) return att>0;
 				if(event.target.hasSkillTag('maixie')){
 					return att<=0;
 				}
-				if(event.target.hp==1) return att>0;
 				if(player.skills.contains('tianxianjiu')) return false;
 				return att<=0;
 			},

character/hearth.js

@@ -1425,7 +1425,7 @@ character.hearth={
 				}
 				'step 1'
 				if(result.bool){
-					player.line(result.targets[0],'green');
+					player.logSkill('fengyin',result.targets);
 					result.targets[0].addTempSkill('fengyin2',{player:'phaseAfter'});
 				}
 			}

game/game.js

@@ -4762,7 +4762,7 @@
 				},
 				chooseToUse:function(){
 					"step 0"
-                    var skills=player.get('s');
+                    var skills=player.get('s',true);
                     game.expandSkills(skills);
                     for(var i=0;i<skills.length;i++){
                         var info=lib.skill[skills[i]];

game/update.js

@@ -1,30 +1,13 @@
 window.noname_update={
-    version:'1.8.16',
+    version:'1.8.16.2',
     changeLog:[
         '修bug',
-        '新卡（国战）',
     ],
     files:{
         global:[
-            'character/rank.js',
-            'character/ow.js',
-            'character/sp.js',
             'character/hearth.js',
-            'character/yijiang.js',
-            'character/swd.js',
             'card/swd.js',
-            'card/extra.js',
-            'card/zhenfa.js',
-            'card/hearth.js',
-            'card/guozhan.js',
-            'card/yunchou.js',
-            'mode/guozhan.js',
-            'mode/chess.js',
-            'mode/identity.js',
             'game/game.js',
-            'game/asset.js',
-            'extension/coin/extension.js',
-            'layout/default/layout.css'
         ],
         '1.8.15.4':[]
     }

theme/music/style.css

@@ -58,6 +58,12 @@ body[data-background_color_music='blue'] #arena.mobile:not(.chess) .player[data-
 .player.unseen .equips:not(*:empty){
 	border-radius:4px;
 }
+
+#arena.mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card,
+#arena:not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card{
+	background: none !important;
+}
+
 .player,#mebg{
 	/*background:url('wood.png') left repeat-y,url('wood.png') right repeat-y,linear-gradient(#4b4b4b, #464646);*/
 }

theme/simple/style.css

@@ -65,6 +65,10 @@ body{
 .player.unseen .equips:not(*:empty){
 	border-radius:4px;
 }
+#arena.mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card,
+#arena:not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card{
+	background: none !important;
+}
 #arena:not(.chess) .player[data-position='0']>.equips>.equip5 {
     border-radius: 4px;
 }

theme/woodden/style.css

@@ -41,11 +41,16 @@ html{
 	background:url('wood2.png');
 }
 
-.player.unseen .equips:not(*:empty){
+#arena.mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty),
+#arena:not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty){
 	background: url('wood.png');
 	border-radius:4px;
 	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 2px 10px;
 }
+#arena.mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card,
+#arena:not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card{
+	background: none !important;
+}
 
 .coin_menu .content>.caption>.coin_buy>.menubutton{
 	box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(0, 0, 0, 0.3) 0 0 5px !important;