From 3017a62bfd0e7fa72ef3217152d6326a2dbb2dc4 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sun, 26 Feb 2017 15:19:49 +0800
Subject: [PATCH] 2

---
 game/game.js    |  8 ++++----
 mode/guozhan.js | 22 ++++++++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/game/game.js b/game/game.js
index cc9e7b140..90bc0b639 100644
--- a/game/game.js
+++ b/game/game.js
@@ -2684,7 +2684,7 @@
 							'3':'三张',
 						},
 						init:'2',
-						// frequent:true,
+						frequent:true,
 						intro:'第一个明置身份牌的角色可获得摸牌奖励'
 					},
 					connect_zhulian:{
@@ -2709,7 +2709,7 @@
 					connect_junzhu:{
 						name:'替换君主',
 						init:true,
-						frequent:true,
+						// frequent:true,
 						restart:true,
 						intro:'开启后将使用国战君主替换原武将牌'
 					},
@@ -2765,7 +2765,7 @@
 							'3':'三张',
 						},
 						init:'2',
-						// frequent:true,
+						frequent:true,
 						intro:'第一个明置身份牌的角色可获得摸牌奖励'
 					},
 					zhulian:{
@@ -2790,7 +2790,7 @@
 					junzhu:{
 						name:'替换君主',
 						init:true,
-						frequent:true,
+						// frequent:true,
 						restart:true,
 						intro:'开启后将使用国战君主替换原武将牌'
 					},
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 8d471dcef..a7110e925 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -1371,6 +1371,18 @@ mode.guozhan={
 				}
 			}
 		},
+		_mingzhi3:{
+			trigger:{player:'phaseBegin'},
+			priority:19.1,
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				return player.isUnseen(0)&&get.is.jun(player.name1);
+			},
+			content:function(){
+				player.showCharacter(0);
+			}
+		},
 		_zhenfazhaohuan:{
 			enable:'phaseUse',
 			usable:1,
@@ -1892,7 +1904,7 @@ mode.guozhan={
 							if(lib.junList.contains(i.slice(3))) continue;
 						}
 						else{
-							if(lib.junList.contains(i.slice(7))) continue;
+							if(get.is.jun(i)) continue;
 						}
 					}
 					if(lib.character[i][2]==3||lib.character[i][2]==4||lib.character[i][2]==5)
@@ -1952,7 +1964,7 @@ mode.guozhan={
 								if(lib.junList.contains(i.slice(3))) return true;
 							}
 							else{
-								if(lib.junList.contains(i.slice(7))) return true;
+								if(get.is.jun(i)) return true;
 							}
 						}
 					},get.config('onlyguozhanexpand')?'expandall':undefined);
@@ -2090,6 +2102,12 @@ mode.guozhan={
 					list=[];
 					for(var i in lib.characterPack.mode_guozhan){
 						if(i.indexOf('gz_shibing')==0) continue;
+						if(lib.configOL.junzhu){
+							if(lib.junList.contains(i.slice(3))) continue;
+						}
+						else{
+							if(get.is.jun(i)) continue;
+						}
 						list.push(i);
 					}
 				}