diff --git a/card/extra.js b/card/extra.js
index bb705eeb6..68220372f 100644
--- a/card/extra.js
+++ b/card/extra.js
@@ -984,12 +984,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						if(arg&&arg.player){
 							if(arg.player.hasSkillTag('unequip',false,{
 								name:arg.card?arg.card.name:null,
-								target:target,
+								target:player,
 								card:arg.card,
 							})) return false;
 							if(arg.player.hasSkillTag('unequip_ai',false,{
 								name:arg.card?arg.card.name:null,
-								target:target,
+								target:player,
 								card:arg.card,
 							})) return false;
 							if(arg.player.hasSkillTag('jueqing',false,player)) return false;
diff --git a/card/guozhan.js b/card/guozhan.js
index 9872ec5f1..fb821fb87 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -202,13 +202,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				fullskin:true,
 				type:'trick',
 				filterTarget:function(card,player,target){
-					return target!=player&&(get.mode()!='guozhan'||target.countCards('e')>0);
+					return target!=player&&(get.mode()!='guozhan'||_status.mode=='yingbian'||_status.mode=='free'||target.countCards('e')>0);
 				},
 				enable:true,
 				yingbian_prompt:'此牌的效果改为依次执行所有选项',
 				content:function(){
 					'step 0'
-					if(get.mode()!='guozhan'&&!get.is.single()) event.goto(2);
+					if((get.mode()!='guozhan'||_status.mode=='yingbian'||_status.mode=='free')&&!get.is.single()) event.goto(2);
 					else if(!target.countCards('e',function(card){
 						return lib.filter.cardDiscardable(card,target);
 					})){
@@ -274,7 +274,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					},
 					result:{
 						target:function(player,target){
-							if(get.mode()!='guozhan'&&!get.is.single()){
+							if(!get.is.single()&&(get.mode()!='guozhan'||_status.mode=='yingbian'||_status.mode=='free')){
 								if(target.countCards('e',function(card){
 									return get.value(card,target)<=0;
 								})>1) return 1;
diff --git a/card/standard.js b/card/standard.js
index ad09ded83..1b30503e1 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -451,7 +451,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					},
 					equipValue:function(card,player){
 						if(!game.hasPlayer(function(current){
-							return player.canUse('sha',current)&&get.distance(player,current)<=1&&get.effect(current,{name:'sha'},player,player)>0;
+							return get.distance(player,current)<=1&&player.canUse('sha',current)&&get.effect(current,{name:'sha'},player,player)>0;
 						})){
 							return 1;
 						}
@@ -1362,7 +1362,18 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					expose:0.2
 				},
 				notarget:true,
-				yingbian_prompt:'当此牌生效后，你获得此牌响应的目标牌',
+				yingbian_prompt:function(card){
+					var suit=card.suit;
+					if(suit=='club'||suit=='spade') return '当你声明使用此牌时，你摸一张牌';
+					else return '当此牌生效后，你获得此牌响应的目标牌';
+				},
+				yingbian:function(event){
+					if(event.card.cards&&event.card.cards.length==1){
+						var suit=event.card.cards[0].suit;
+						if(suit=='heart'||suit=='diamond') return;
+					}
+					event.player.draw();
+				},
 				contentBefore:function(){
 					'step 0'
 					if(get.mode()=='guozhan'&&get.cardtag(card,'guo')){
@@ -1403,8 +1414,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						}
 					}
 					if(event.card.yingbian){
+						if(!event.card.cards||event.card.cards.length!=1) return;
+						var suit=event.card.cards[0].suit;
+						if(suit!='heart'&&suit!='diamond') return;
 						var cardx=event.getParent().respondTo;
-						if(cardx&&cardx[1]&&cardx[1].cards&&cardx[1].cards.filterInD().length) player.gain(cardx[1].cards.filterInD(),'gain2','log');
+						if(cardx&&cardx[1]&&cardx[1].cards&&cardx[1].cards.filterInD().length) player.gain(cardx[1].cards.filterInD('od'),'gain2','log');
 					}
 				},
 			},
@@ -1872,10 +1886,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				ai:{
 					directHit_ai:true,
 					skillTagFilter:function(player,tag,arg){
-						if(get.attitude(player,arg.target)<0&&arg.card.name=='sha'&&player.countCards('he',function(card){
+						if(player._guanshi_temp) return;
+						player._guanshi_temp=true;
+						var bool=(get.attitude(player,arg.target)<0&&arg.card.name=='sha'&&player.countCards('he',function(card){
 							return card!=player.getEquip('guanshi')&&card!=arg.card&&(!arg.card.cards||!arg.card.cards.contains(card))&&get.value(card)<5;
-						})>1) return true;
-						return false;
+						})>1);
+						delete player._guanshi_temp;
+						return bool;
 					},
 				},
 			},
diff --git a/card/yingbian.js b/card/yingbian.js
index 62d2ea117..e43136a25 100644
--- a/card/yingbian.js
+++ b/card/yingbian.js
@@ -433,6 +433,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				popup:false,
 				firstDo:true,
 				ruleSkill:true,
+				forceLoad:true,
 				filter:function(event,player){
 					if(event.card.yingbian) return false;
 					var bool=player.hasSkillTag('forceYingbian');
@@ -474,7 +475,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						if(skillState){
 							player.applySkills(skillState);
 						}
-						var type=get.type(card);
+						var type=get.type2(card);
 						var str=get.translation(source);
 						if(targets&&targets.length){
 							str+='对';
@@ -483,7 +484,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						str+='使用了';
 						var next=player.chooseCard({
 							filterCard:function(card){
-								return get.type(card)==type&&lib.filter.cardDiscardable.apply(this,arguments);
+								return get.type2(card)==type&&lib.filter.cardDiscardable.apply(this,arguments);
 							},
 							prompt:str+=(get.translation(card)+'，是否弃置一张'+get.translation(type)+'为其助战？'),
 							position:'h',
@@ -507,12 +508,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						}
 					};
 					'step 2'
-					var type=get.type(card);
+					var type=get.type2(card);
 					var list=game.filterPlayer(function(current){
 						if(current==player) return false;
 						if(!current.countCards('h')) return false;
 						return _status.connectMode||current.countCards('h',function(cardx){
-							return get.type(cardx)==type;
+							return get.type2(cardx)==type;
 						})
 					});
 					event.list=list;
diff --git a/character/diy.js b/character/diy.js
index 820eaabf6..d505a71f6 100755
--- a/character/diy.js
+++ b/character/diy.js
@@ -142,6 +142,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			old_jiakui:['male','wei',4,['tongqu','xinwanlan']],
 			ol_guohuai:['male','wei',3,['rejingce']],
 			junk_zhangrang:['male','qun',3,['junktaoluan']],
+			junk_simayi:['male','jin',3,['buchen','smyyingshi','xiongzhi','xinquanbian'],['hiddenSkill']],
 		},
 		characterFilter:{
 			key_jojiro:function(mode){
@@ -171,7 +172,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				diy_fakenews:["diy_wenyang","ns_zhangwei","ns_caimao"],
 				diy_default:["diy_feishi","diy_liuyan","diy_yuji","diy_caiwenji","diy_lukang","diy_zhenji","diy_liufu","diy_xizhenxihong","diy_liuzan","diy_zaozhirenjun","diy_yangyi","diy_tianyu"],
 				diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_umi","key_rei","key_komari","key_yukine","key_yusa","key_misa","key_masato","key_iwasawa","key_kengo","key_yoshino","key_yui","key_tsumugi","key_saya","key_harukakanata","key_inari","key_shiina","key_sunohara","key_rin","key_sasami","key_akane","key_doruji","key_yuiko","key_riki","key_hisako","key_hinata","key_noda","key_tomoya","key_nagisa","key_ayato","key_ao","key_yuzuru","sp_key_kanade","key_mio","key_midori","key_kyoko","key_shizuru","key_shiorimiyuki","key_miki","key_shiori","key_kaori","sp_key_yuri","key_akiko","key_abyusa","key_godan","key_yuu","key_ryoichi","key_kotori","key_jojiro","key_shiroha","key_shizuku","key_hiroto"],
-				diy_trashbin:['old_jiakui','ol_guohuai','junk_zhangrang'],
+				diy_trashbin:['old_jiakui','ol_guohuai','junk_zhangrang','junk_simayi'],
 			},
 		},
 		characterIntro:{
@@ -4362,7 +4363,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						trigger.directHit.add(target);
 					}
 					if(result.suit=='spade'||result.suit=='heart'){
-						var evt=event.getParent();
+						var evt=trigger.getParent();
 						if(evt.addCount!==false){
 							evt.addCount=false;
 							player.getStat().card.sha--;
@@ -12359,6 +12360,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			ns_caimao:'蔡瑁',
 			nsdingzhou:'定州',
 			nsdingzhou_info:'出牌阶段限一次，你可以选择一名区域内有牌的其他角色。你随机获得其区域内的一张牌，然后摸一张牌。若你以此法获得了两张颜色不同的牌，则你失去1点体力。',
+			junk_simayi:'止息司马懿',
+			ol_guohuai_ab:'郭淮',
+			junk_zhangrang_ab:'张让',
+			old_jiakui_ab:'贾逵',
+			junk_simayi_ab:'司马懿',
 			diy_tieba:'吧友设计',
 			diy_default:'常规',
 			diy_key:'论外',
diff --git a/character/mobile.js b/character/mobile.js
index 9d818ef78..da5258a34 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -3823,7 +3823,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 			},
 			remoucheng:{
-				derivation:'rejingong',
+				derivation:'jingong',
 				trigger:{
 					player:'remoucheng_awaken'
 				},
@@ -3835,59 +3835,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					player.awakenSkill('remoucheng');
 					player.removeSkill('relianji');
-					player.addSkill('rejingong');
+					player.addSkill('jingong');
 					player.gainMaxHp();
 					player.recover();
 				},
 			},
-			rejingong:{
-				audio:'jingong',
-				enable:'phaseUse',
-				delay:0,
-				usable:1,
-				content:function(){
-					'step 0'
-					var list=get.inpile('trick').randomGets(2);
-					if(Math.random()<0.5){
-						list.push('wy_meirenji');
-					}
-					else{
-						list.push('wy_xiaolicangdao');
-					}
-					for(var i=0;i<list.length;i++){
-						list[i]=['锦囊','',list[i]];
-					}
-					player.chooseButton(['矜功',[list,'vcard']]).set('filterButton',function(button,player){
-						return game.hasPlayer(function(current){
-							return player.canUse(button.link[2],current,true,false);
-						});
-					}).set('ai',function(button){
-						var player=_status.event.player;
-						var name=button.link[2];
-						if(game.hasPlayer(function(current){
-							return player.canUse(name,current)&&get.effect(current,{name:name},player,player)>0;
-						})){
-							if(name=='wy_meirenji'||name=='wy_xiaolicangdao') return Math.random()+0.5;
-							return Math.random();
-						}
-						return 0;
-					});
-					'step 1'
-					if(result.bool){
-						player.chooseUseTarget(result.links[0][2],true);
-						player.addTempSkill('jingong2');
-					}
-				},
-				ai:{
-					order:2,
-					result:{
-						player:function(player){
-							if((player.hp<=2||player.needsToDiscard())&&!player.getStat('damage')) return 0;
-							return 1;
-						}
-					}
-				}
-			},	
 			shouye:{
 				audio:2,
 				group:'shouye_after',
@@ -6441,8 +6393,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			relianji_info:'出牌阶段限一次，你可以选择两名其他角色。第一名角色随机使用牌堆中的一张武器牌，然后这名角色视为对另一名角色随机使用一张下列的牌名的牌：【决斗】、【火攻】、【南蛮入侵】、【万箭齐发】或普【杀】。然后若此牌造成伤害，你获得X枚“连计”标记（X为此次扣减的体力值点数）。',
 			remoucheng:'谋逞',
 			remoucheng_info:'觉醒技，当一名角色造成伤害后，若你拥有的“连计”标记数大于2，你加1点体力上限，回复1点体力，失去“连计”，获得“矜功”。',
-			rejingong:'矜功',
-			rejingong_info:'每回合可以用三个随机锦囊中的一个，三个锦囊中有一个是专属锦囊，本回合未造成伤害会失去1点体力。',
 			mobile_default:'常规',
 			mobile_others:'其他',
 			
diff --git a/character/shenhua.js b/character/shenhua.js
index f3570ab75..5d184b883 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -7614,7 +7614,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			xiaoqiao:'旧小乔',
 			zhoutai:'界周泰',
 			zhangjiao:'张角',
-			yuji:'于吉',
+			//yuji:'于吉',
 			shensu:'神速',
 			shensu1:'神速',
 			shensu2:'神速',
diff --git a/character/sp.js b/character/sp.js
index 585a2c54e..9a64e8092 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -988,7 +988,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					},
 					backup:function(links,player){
 						return {
-							audio:'xinjingong',
+							audio:'jingong',
 							filterCard:true,
 							popname:true,
 							position:'he',
@@ -3764,63 +3764,61 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			jingong:{
 				audio:2,
 				enable:'phaseUse',
+				usable:1,
 				filter:function(event,player){
-					return player.countCards('he',function(card){
+					return event.xinjingong_list&&player.countCards('he',function(card){
 						return card.name=='sha'||get.type(card)=='equip';
 					});
 				},
-				delay:false,
-				usable:1,
-				content:function(){
-					'step 0'
-					var list=get.inpile('trick').randomGets(2);
-					if(Math.random()<0.5){
-						list.push('wy_meirenji');
+				onChooseToUse:function(event){
+					if(!game.online){
+						var evt=event.getParent();
+						if(evt.name!='phaseUse') return;
+						if(!evt.xinjingong_list){
+							var list=get.inpile('trick').randomGets(2);
+							if(Math.random()<0.5){
+								list.push('wy_meirenji');
+							}
+							else{
+								list.push('wy_xiaolicangdao');
+							}
+							evt.xinjingong_list=list;
+						}
+						if(!event.xinjingong_list) event.set('xinjingong_list',evt.xinjingong_list);
 					}
-					else{
-						list.push('wy_xiaolicangdao');
-					}
-					for(var i=0;i<list.length;i++){
-						list[i]=['锦囊','',list[i]];
-					}
-					player.chooseButton(['矜功',[list,'vcard']]).set('filterButton',function(button,player){
-						return game.hasPlayer(function(current){
-							return player.canUse(button.link[2],current,true,false);
-						});
-					}).set('ai',function(button){
-						var player=_status.event.player;
-						return player.getUseValue(button.link[2]);
-					});
-					'step 1'
-					if(result.bool){
-						var name=result.links[0][2];
-						event.fakecard={name:name};
-						player.chooseCardTarget({
+				},
+				chooseButton:{
+					dialog:function(event,player){
+						var list=[];
+						for(var i of event.xinjingong_list) list.push(['锦囊','',i]);
+						return ui.create.dialog('矜功',[list,'vcard']);
+					},
+					filter:function(button,player){
+						return lib.filter.filterCard({name:button.link[2]},player,_status.event.getParent());
+					},
+					check:function(button){
+						return _status.event.player.getUseValue({name:button.link[2]});
+					},
+					backup:function(links,player){
+						return {
+							audio:'jingong',
+							filterCard:true,
+							popname:true,
+							position:'he',
+							viewAs:{name:links[0][2]},
+							check:function(card){
+								return 6-get.value(card);
+							},
 							filterCard:function(card){
 								return card.name=='sha'||get.type(card)=='equip';
 							},
-							position:'he',
-							filterTarget:lib.filter.filterTarget,
-							selectTarget:lib.filter.selectTarget,
-							ai1:function(card){
-								return 7-get.value(card);
+							precontent:function(){
+								player.addTempSkill('jingong2');
 							},
-							ai2:function(target){
-								var card=_status.event.fakecard;
-								var player=_status.event.player;
-								return get.effect(target,card,player,player);
-							},
-							_get_card:event.fakecard,
-							prompt:'将一张装备牌或【杀】当作'+get.translation(name)+'使用'
-						}).set('fakecard',event.fakecard);
-					}
-					else{
-						event.finish();
-					}
-					'step 2'
-					if(result.bool){
-						player.useCard(event.fakecard,result.cards,result.targets);
-						player.addTempSkill('jingong2');
+						};
+					},
+					prompt:function(links,player){
+						return '将一张【杀】或装备牌当做'+get.translation(links[0][2])+'使用';
 					}
 				},
 				ai:{
diff --git a/character/sp2.js b/character/sp2.js
index d7418f42e..3b2506a41 100644
--- a/character/sp2.js
+++ b/character/sp2.js
@@ -101,6 +101,67 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			}
 		},
 		skill:{
+			xinquanbian:{
+				audio:'quanbian',
+				trigger:{player:['useCard','respond']},
+				filter:function(event,player){
+					var phase=event.getParent('phaseUse');
+					if(!phase||phase.player!=player) return false;
+					var suit=get.suit(event.card);
+					if(!lib.suit.contains(suit)||!lib.skill.quanbian.hasHand(event)) return false;
+					return player.getHistory('useCard',function(evt){
+						return evt!=event&&get.suit(evt.card)==suit&&lib.skill.quanbian.hasHand(evt)&&evt.getParent('phaseUse')==phase;
+					}).length+player.getHistory('respond',function(evt){
+						return evt!=event&&get.suit(evt.card)==suit&&lib.skill.quanbian.hasHand(evt)&&evt.getParent('phaseUse')==phase;
+					}).length==0;
+				},
+				content:function(){
+					'step 0'
+					var cards=get.cards(Math.min(5,player.maxHp));
+					event.cards=cards;
+					var suit=get.suit(trigger.card);
+					player.chooseButton(['权变：获得一张不为'+get.translation(suit)+'花色的牌',cards]).set('suit',suit).set('filterButton',function(button){
+						return get.suit(button)!=_status.event.suit;
+					});
+					'step 1'
+					if(result.bool){
+						var card=result.links[0];
+						cards.remove(card);
+						player.gain(card,'gain2','log');
+						if(!cards.length) event.finish();
+					}
+					'step 2'
+					player.chooseCardButton(cards.length,true,cards,'按顺序将卡牌置于牌堆顶（先选择的在上）');
+					'step 3'
+					if(result.bool){
+						var list=result.links.slice(0);
+						while(list.length){
+							ui.cardPile.insertBefore(list.pop(),ui.cardPile.firstChild);
+						}
+						game.updateRoundNumber();
+					}
+				},
+				group:'xinquanbian_count',
+			},
+			xinquanbian_count:{
+				trigger:{player:'useCard1'},
+				silent:true,
+				firstDo:true,
+				filter:function(event,player){
+					return player.isPhaseUsing()&&lib.skill.quanbian.hasHand(event);
+				},
+				content:function(){
+					var stat=player.getStat('skill');
+					if(!stat.quanbian) stat.quanbian=0;
+					stat.quanbian++;
+				},
+				mod:{
+					cardEnabled2:function(card,player){
+						var stat=player.getStat('skill');
+						if(stat.quanbian&&stat.quanbian>=player.maxHp&&get.position(card)=='h') return false;
+					},
+				},
+			},
 			taoyin:{
 				audio:2,
 				trigger:{player:'showCharacterAfter'},
@@ -1128,7 +1189,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var card=get.cards()[0];
 					event.card=card;
 					player.showCards(card);
-					if(!player.hasUseTarget(card)) event.finish();
+					if(!player.hasUseTarget(card)){
+						card.fix();
+						ui.cardPile.insertBefore(card,ui.cardPile.firstChild);
+						game.updateRoundNumber();
+						event.finish();
+					}
 					'step 2'
 					var next=player.chooseUseTarget(card,true);
 					if(get.info(card).updateUsable=='phaseUse') next.addCount=false;
@@ -8122,6 +8188,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				return '出牌阶段限'+(player.hasSkill('recaishi2')?'两':'一')+'次，你可以选择一名本回合内未选择过的角色。你令其获得一项效果直至你的下回合开始：①其下次造成伤害后弃置两张牌，然后你摸一张牌。②其下次受到伤害后摸两张牌，然后你摸一张牌。'
 			},
 		},
+		perfectPair:{
+			jin_simayi:['jin_zhangchunhua'],
+			jin_simazhao:['jin_wangyuanji'],
+			jin_simashi:['jin_xiahouhui'],
+		},
 		characterReplace:{
 			lijue:['lijue','ns_lijue'],
 			fanchou:['fanchou','ns_fanchou'],
@@ -8189,7 +8260,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			"xz_xunxun":"恂恂",
 			"xz_xunxun_info":"摸牌阶段，你可以观看牌堆顶的四张牌，然后将其中的两张牌置于牌堆顶，并将其余的牌以任意顺序置于牌堆底。",
 			"xinfu_xingzhao":"兴棹",
-			"xinfu_xingzhao_info":"锁定技，若场上的已受伤角色合计为：1个以上，你视为拥有技能〖恂恂〗；2个以上，当你使用装备牌时，摸一张牌；3个以上，弃牌阶段开始时，你跳过此阶段。",
+			"xinfu_xingzhao_info":"锁定技，若X≥1，你视为拥有技能〖恂恂〗。若X≥2，当你使用装备牌时，你摸一张牌。若X≥3，弃牌阶段开始时，你跳过此阶段。（X为场上已受伤的角色数）",
 			"xinfu_xingzhao2":"兴棹",
 			"xinfu_xingzhao2_info":"",
 			"xinfu_dianhu":"点虎",
@@ -8597,8 +8668,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			tairan:'泰然',
 			tairan2:'泰然',
 			tairan_info:'锁定技，回合结束时，你回复Y点体力，并将手牌摸至X张。出牌阶段开始时，你失去Y点体力，弃置上次以此法获得的牌。（X为你的体力上限，且至多为5；Y=X-你的体力值）',
+			gz_jin_simayi:'司马懿',
+			gz_jin_zhangchunhua:'张春华',
+			gz_jin_simazhao:'司马昭',
+			gz_jin_wangyuanji:'王元姬',
+			gz_jin_simashi:'司马师',
+			gz_jin_xiahouhui:'夏侯徽',
+			xinquanbian:'权变',
+			xinquanbian_info:'出牌阶段，每当你首次使用/打出一种花色的手牌时，你可以从牌堆顶的X张牌中获得一张与此牌花色不同的牌，并将其余牌以任意顺序置于牌堆顶。出牌阶段，你至多可使用X张手牌。（X为你的体力上限）',
 			
-			sp_yingbian:'应变篇',
+			sp_yingbian:'文德武备',
 			sp_whlw:"文和乱武",
 			sp_zlzy:"逐鹿中原",
 			sp_longzhou:"同舟共济",
diff --git a/character/standard.js b/character/standard.js
index 7a7d522ec..a5f902c97 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -2687,7 +2687,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		characterReplace:{
 			caocao:['re_caocao','caocao'],
 			guojia:['re_guojia','guojia'],
-			simayi:['jin_simayi','re_simayi','simayi'],
+			simayi:['jin_simayi','re_simayi','junk_simayi','simayi'],
 			zhenji:['re_zhenji','zhenji'],
 			xuzhu:['re_xuzhu','xuzhu'],
 			zhangliao:['re_zhangliao','sp_zhangliao','yj_zhangliao','zhangliao'],
diff --git a/game/asset.js b/game/asset.js
index 3cc94a2a0..662ee6007 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-	'v1.9.108.3',
+	'v1.9.108.3.2',
 	'audio/background/aozhan_chaoming.mp3',
 	'audio/background/aozhan_online.mp3',
 	'audio/background/aozhan_rewrite.mp3',
@@ -3658,6 +3658,7 @@ window.noname_asset_list=[
 	'image/character/zhanghuyuechen.jpg',
 	'image/character/zhangling.jpg',
 	'image/character/xin_zhangfei.jpg',
+	'image/character/junk_simayi.jpg',
 	
 	'image/character/baiwuchang.jpg',
 	'image/character/baosanniang.jpg',
diff --git a/game/game.js b/game/game.js
index 6248402f4..6b25d7807 100644
--- a/game/game.js
+++ b/game/game.js
@@ -4710,6 +4710,18 @@
 							map.connect_junzhu.hide();
 						}
 					},
+					connect_guozhan_mode:{
+						name:'游戏模式',
+						init:'normal',
+						item:{
+							normal:'势备',
+							yingbian:'应变',
+							old:'怀旧',
+						},
+						frequent:true,
+						restart:true,
+						intro:'<li>势备：默认模式，使用线下《君临天下·势备篇》的牌堆进行游戏。<br><li>应变：使用OL的应变国战牌堆进行游戏。<br><li>怀旧：使用传统国战的牌堆进行游戏。',
+					},
 					connect_player_number:{
 						name:'游戏人数',
 						init:'8',
@@ -4753,19 +4765,6 @@
 						// frequent:true,
 						intro:'主将和副将都明置后，若为特定组合，可获得【珠联璧合】标记'
 					},
-					connect_guozhanpile:{
-						name:'使用国战牌堆',
-						init:true,
-						frequent:true,
-						restart:true,
-					},
-					connect_onlyguozhan:{
-						name:'使用国战武将',
-						init:true,
-						frequent:true,
-						restart:true,
-						intro:'开启武将技能将替换为国战版本并禁用非国战武将'
-					},
 					connect_junzhu:{
 						name:'替换君主',
 						init:true,
@@ -4803,10 +4802,14 @@
 						name:'游戏模式',
 						init:'normal',
 						item:{
-							normal:'标准',
-							mingjiang:'明将'
+							normal:'势备',
+							yingbian:'应变',
+							old:'怀旧',
+							free:'自由',
 						},
 						frequent:true,
+						restart:true,
+						intro:'<li>势备：默认模式，使用线下《君临天下·势备篇》的牌堆进行游戏。<br><li>应变：使用OL的应变国战牌堆进行游戏。<br><li>怀旧：使用传统国战的牌堆进行游戏。<br><li>自由：使用玩家的自定义牌堆进行游戏。',
 					},
 					player_number:{
 						name:'游戏人数',
@@ -4865,12 +4868,6 @@
 						// frequent:true,
 						intro:'主将和副将都明置后，若为特定组合，可获得【珠联璧合】标记'
 					},
-					guozhanpile:{
-						name:'使用国战牌堆',
-						init:true,
-						frequent:true,
-						restart:true,
-					},
 					changeViceType:{
 						name:'副将变更方式',
 						init:'default',
@@ -26728,6 +26725,11 @@
 								}
 							}
 							game.finishCards();
+							if(mode.characterPack){
+								for(var i in mode.characterPack){
+									lib.characterPack[i]=mode.characterPack[i];
+								}
+							}
 							_status.event={
 								finished:true,
 								next:[],
@@ -36950,7 +36952,7 @@
 											updateActive();
 										},
 									};
-									if(mode.indexOf('mode_')==0&&mode.indexOf('mode_extension_')!=0){
+									if(mode.indexOf('mode_')==0&&mode.indexOf('mode_extension_')!=0&&mode.indexOf('mode_guozhan')!=0){
 										cfgnodeY.clear=true;
 										delete cfgnodeY.onclick;
 									}
@@ -49082,6 +49084,12 @@
 					case 'zhong':return '忠胆英杰';
 				}
 			}
+			else if(config.mode=='guozhan'&&config.guozhan_mode!='normal'){
+				switch(config.guozhan_mode){
+					case 'yingbian':return '应变国战';
+					case 'old':return '怀旧国战';
+				}
+			}
 			else{
 				if(server){
 					return get.translation(config.mode)+'模式';
diff --git a/game/update.js b/game/update.js
index 204c0d037..564427af1 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,43 +1,42 @@
 window.noname_update={
-	version:'1.9.108.3.1',
-	update:'1.9.108.3',
+	version:'1.9.108.3.2',
+	update:'1.9.108.3.1',
 	changeLog:[
-		'手杀厉勇张飞',
-		'晋势力技能修改（司马懿除外）',
-		'手牌标记机制',
+		'应变国战',
+		'止息晋司马懿',
 		'bug修复',
 	],
 	files:[
 		'card/extra.js',
 		//'card/gujian.js',
-		//'card/guozhan.js',
+		'card/guozhan.js',
 		//'card/gwent.js',
 		//'card/huanlekapai.js',
 		//'card/mtg.js',
 		//'card/sp.js',
-		//'card/standard.js',
+		'card/standard.js',
 		//'card/swd.js',
 		//'card/yunchou.js',
-		//'card/yingbian.js',
+		'card/yingbian.js',
 		//'card/zhenfa.js',
 		//'card/zhulu.js',
-		//'character/diy.js',
+		'character/diy.js',
 		//'character/extra.js',
 		//'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
         //'character/hearth.js',
-		//'character/mobile.js',
+		'character/mobile.js',
 		//'character/mtg.js',
 		//'character/old.js',
 		//'character/ow.js',
 		//'character/rank.js',
 		//'character/refresh.js',
-		//'character/shenhua.js',
-		//'character/sp.js',
-		//'character/sp2.js',
+		'character/shenhua.js',
+		'character/sp.js',
+		'character/sp2.js',
 		//'character/tw.js',
-		//'character/standard.js',
+		'character/standard.js',
 		//'character/swd.js',
 		//'character/xianjian.js',
 		//'character/xinghuoliaoyuan.js',
@@ -47,9 +46,9 @@ window.noname_update={
 		//'layout/default/layout.css',
 		//'layout/default/menu.css',
 		//'layout/nova/layout.css',
-		//'mode/identity.js',
+		'mode/identity.js',
 		//'mode/doudizhu.js',
-		//'mode/guozhan.js',
+		'mode/guozhan.js',
 		//'mode/chess.js',
 		//'mode/tafang.js',
 		//'mode/single.js',
@@ -57,7 +56,7 @@ window.noname_update={
 		//'mode/brawl.js',
 		//'mode/versus.js',
 		//'mode/boss.js',
-		//'game/game.js',
+		'game/game.js',
 		//'game/keyWords.js',
 		//'game/NoSleep.js',
 		//'game/config.js',
diff --git a/image/character/baosanniang.jpg b/image/character/baosanniang.jpg
index 823cbd759..fcf521192 100644
Binary files a/image/character/baosanniang.jpg and b/image/character/baosanniang.jpg differ
diff --git a/image/character/beimihu.jpg b/image/character/beimihu.jpg
index bf4a73bc3..660e0f89b 100644
Binary files a/image/character/beimihu.jpg and b/image/character/beimihu.jpg differ
diff --git a/image/character/bianfuren.jpg b/image/character/bianfuren.jpg
index 36262e83d..61d2ad5ad 100644
Binary files a/image/character/bianfuren.jpg and b/image/character/bianfuren.jpg differ
diff --git a/image/character/bulianshi.jpg b/image/character/bulianshi.jpg
index 96eb22fe0..b0732b3b2 100755
Binary files a/image/character/bulianshi.jpg and b/image/character/bulianshi.jpg differ
diff --git a/image/character/buzhi.jpg b/image/character/buzhi.jpg
index 53f44590f..97ca54b5f 100644
Binary files a/image/character/buzhi.jpg and b/image/character/buzhi.jpg differ
diff --git a/image/character/caifuren.jpg b/image/character/caifuren.jpg
index 75e2bf7f0..4f79acbb5 100644
Binary files a/image/character/caifuren.jpg and b/image/character/caifuren.jpg differ
diff --git a/image/character/caiwenji.jpg b/image/character/caiwenji.jpg
index f54c1775d..cc2e1e835 100644
Binary files a/image/character/caiwenji.jpg and b/image/character/caiwenji.jpg differ
diff --git a/image/character/caiyong.jpg b/image/character/caiyong.jpg
index 47b1374eb..5e4d6b247 100644
Binary files a/image/character/caiyong.jpg and b/image/character/caiyong.jpg differ
diff --git a/image/character/caoang.jpg b/image/character/caoang.jpg
index ecde94768..1acb4d0d0 100755
Binary files a/image/character/caoang.jpg and b/image/character/caoang.jpg differ
diff --git a/image/character/caocao.jpg b/image/character/caocao.jpg
index ddb57470b..363605516 100644
Binary files a/image/character/caocao.jpg and b/image/character/caocao.jpg differ
diff --git a/image/character/caochong.jpg b/image/character/caochong.jpg
index 7a27389e3..83fbd8149 100644
Binary files a/image/character/caochong.jpg and b/image/character/caochong.jpg differ
diff --git a/image/character/caochun.jpg b/image/character/caochun.jpg
index 33a6cdc4d..1446c3a98 100644
Binary files a/image/character/caochun.jpg and b/image/character/caochun.jpg differ
diff --git a/image/character/caohong.jpg b/image/character/caohong.jpg
index ed5ff3a87..5212b6e00 100644
Binary files a/image/character/caohong.jpg and b/image/character/caohong.jpg differ
diff --git a/image/character/caojie.jpg b/image/character/caojie.jpg
index 5b79a7673..881bc4b0f 100644
Binary files a/image/character/caojie.jpg and b/image/character/caojie.jpg differ
diff --git a/image/character/caopi.jpg b/image/character/caopi.jpg
index e00692c2f..205bc675f 100644
Binary files a/image/character/caopi.jpg and b/image/character/caopi.jpg differ
diff --git a/image/character/caoren.jpg b/image/character/caoren.jpg
index 7377d91e6..f4d8ef460 100644
Binary files a/image/character/caoren.jpg and b/image/character/caoren.jpg differ
diff --git a/image/character/caorui.jpg b/image/character/caorui.jpg
index df41a7097..394488b21 100644
Binary files a/image/character/caorui.jpg and b/image/character/caorui.jpg differ
diff --git a/image/character/caoxiu.jpg b/image/character/caoxiu.jpg
index a760e9a18..4a0ac1035 100644
Binary files a/image/character/caoxiu.jpg and b/image/character/caoxiu.jpg differ
diff --git a/image/character/caoying.jpg b/image/character/caoying.jpg
index df149bc0c..1a837f8c6 100644
Binary files a/image/character/caoying.jpg and b/image/character/caoying.jpg differ
diff --git a/image/character/caozhang.jpg b/image/character/caozhang.jpg
index d63948c1c..21f39be37 100755
Binary files a/image/character/caozhang.jpg and b/image/character/caozhang.jpg differ
diff --git a/image/character/caozhen.jpg b/image/character/caozhen.jpg
index c62c37a08..4ca7e8b42 100644
Binary files a/image/character/caozhen.jpg and b/image/character/caozhen.jpg differ
diff --git a/image/character/caozhi.jpg b/image/character/caozhi.jpg
index 237615381..874eee842 100644
Binary files a/image/character/caozhi.jpg and b/image/character/caozhi.jpg differ
diff --git a/image/character/cenhun.jpg b/image/character/cenhun.jpg
index 1d86fb00a..67a04e14a 100644
Binary files a/image/character/cenhun.jpg and b/image/character/cenhun.jpg differ
diff --git a/image/character/chendao.jpg b/image/character/chendao.jpg
index b247d34b4..a37d9594c 100644
Binary files a/image/character/chendao.jpg and b/image/character/chendao.jpg differ
diff --git a/image/character/chendong.jpg b/image/character/chendong.jpg
index 573aca6f6..f27a5e0ec 100644
Binary files a/image/character/chendong.jpg and b/image/character/chendong.jpg differ
diff --git a/image/character/chengong.jpg b/image/character/chengong.jpg
index e4e11e1a2..3a2b77db9 100644
Binary files a/image/character/chengong.jpg and b/image/character/chengong.jpg differ
diff --git a/image/character/chengpu.jpg b/image/character/chengpu.jpg
index 658f9ad56..d5335b474 100644
Binary files a/image/character/chengpu.jpg and b/image/character/chengpu.jpg differ
diff --git a/image/character/chengyu.jpg b/image/character/chengyu.jpg
index ba75c7682..30123c3d3 100644
Binary files a/image/character/chengyu.jpg and b/image/character/chengyu.jpg differ
diff --git a/image/character/chenlin.jpg b/image/character/chenlin.jpg
index 143d6bace..051966bfd 100644
Binary files a/image/character/chenlin.jpg and b/image/character/chenlin.jpg differ
diff --git a/image/character/chenqun.jpg b/image/character/chenqun.jpg
index 0e3c50a66..ddc872d9e 100644
Binary files a/image/character/chenqun.jpg and b/image/character/chenqun.jpg differ
diff --git a/image/character/cuimao.jpg b/image/character/cuimao.jpg
index 8303ed481..7f62f34df 100644
Binary files a/image/character/cuimao.jpg and b/image/character/cuimao.jpg differ
diff --git a/image/character/cuiyan.jpg b/image/character/cuiyan.jpg
index 9cc6b7f96..3e93c1c48 100644
Binary files a/image/character/cuiyan.jpg and b/image/character/cuiyan.jpg differ
diff --git a/image/character/daqiao.jpg b/image/character/daqiao.jpg
index 2ea337f6d..958edfcf3 100644
Binary files a/image/character/daqiao.jpg and b/image/character/daqiao.jpg differ
diff --git a/image/character/daxiaoqiao.jpg b/image/character/daxiaoqiao.jpg
index 6f9aabeff..4a93aac5f 100644
Binary files a/image/character/daxiaoqiao.jpg and b/image/character/daxiaoqiao.jpg differ
diff --git a/image/character/dengai.jpg b/image/character/dengai.jpg
index 995b776fa..934499389 100644
Binary files a/image/character/dengai.jpg and b/image/character/dengai.jpg differ
diff --git a/image/character/dianwei.jpg b/image/character/dianwei.jpg
index 52a19a343..347aca5ae 100644
Binary files a/image/character/dianwei.jpg and b/image/character/dianwei.jpg differ
diff --git a/image/character/diaochan.jpg b/image/character/diaochan.jpg
index d8c9db5e7..a5057c243 100644
Binary files a/image/character/diaochan.jpg and b/image/character/diaochan.jpg differ
diff --git a/image/character/dingfeng.jpg b/image/character/dingfeng.jpg
index 173aac2aa..b2921ec6b 100644
Binary files a/image/character/dingfeng.jpg and b/image/character/dingfeng.jpg differ
diff --git a/image/character/dongbai.jpg b/image/character/dongbai.jpg
index 82b036bcb..2c53fa523 100644
Binary files a/image/character/dongbai.jpg and b/image/character/dongbai.jpg differ
diff --git a/image/character/dongyun.jpg b/image/character/dongyun.jpg
index 2cbf4aaa6..c02288878 100644
Binary files a/image/character/dongyun.jpg and b/image/character/dongyun.jpg differ
diff --git a/image/character/dongzhuo.jpg b/image/character/dongzhuo.jpg
index 27402266a..15d53b732 100644
Binary files a/image/character/dongzhuo.jpg and b/image/character/dongzhuo.jpg differ
diff --git a/image/character/duji.jpg b/image/character/duji.jpg
index 50f30d738..cdec0d778 100644
Binary files a/image/character/duji.jpg and b/image/character/duji.jpg differ
diff --git a/image/character/fanchou.jpg b/image/character/fanchou.jpg
index 9c47a454a..f0d67da8d 100644
Binary files a/image/character/fanchou.jpg and b/image/character/fanchou.jpg differ
diff --git a/image/character/fazheng.jpg b/image/character/fazheng.jpg
index 030a57cf1..493313c96 100644
Binary files a/image/character/fazheng.jpg and b/image/character/fazheng.jpg differ
diff --git a/image/character/fuhuanghou.jpg b/image/character/fuhuanghou.jpg
index 6e457f6c0..aaa234a42 100644
Binary files a/image/character/fuhuanghou.jpg and b/image/character/fuhuanghou.jpg differ
diff --git a/image/character/fuwan.jpg b/image/character/fuwan.jpg
index 1a116ca91..33a75d4b9 100644
Binary files a/image/character/fuwan.jpg and b/image/character/fuwan.jpg differ
diff --git a/image/character/ganfuren.jpg b/image/character/ganfuren.jpg
index 1a87f3732..ba943d6c9 100644
Binary files a/image/character/ganfuren.jpg and b/image/character/ganfuren.jpg differ
diff --git a/image/character/ganning.jpg b/image/character/ganning.jpg
index 14a0b2c0e..aa4466afb 100644
Binary files a/image/character/ganning.jpg and b/image/character/ganning.jpg differ
diff --git a/image/character/gaoshun.jpg b/image/character/gaoshun.jpg
index 4b38c5235..cb21d6d07 100644
Binary files a/image/character/gaoshun.jpg and b/image/character/gaoshun.jpg differ
diff --git a/image/character/gexuan.jpg b/image/character/gexuan.jpg
index c6f01ab2e..c31915c65 100644
Binary files a/image/character/gexuan.jpg and b/image/character/gexuan.jpg differ
diff --git a/image/character/gongsunyuan.jpg b/image/character/gongsunyuan.jpg
index 3f0c436d3..b7db7c001 100644
Binary files a/image/character/gongsunyuan.jpg and b/image/character/gongsunyuan.jpg differ
diff --git a/image/character/gongsunzan.jpg b/image/character/gongsunzan.jpg
index 0c2712e91..1279b9946 100644
Binary files a/image/character/gongsunzan.jpg and b/image/character/gongsunzan.jpg differ
diff --git a/image/character/guanlu.jpg b/image/character/guanlu.jpg
index 362c7ceba..922652d03 100644
Binary files a/image/character/guanlu.jpg and b/image/character/guanlu.jpg differ
diff --git a/image/character/guanping.jpg b/image/character/guanping.jpg
index 3b33dd3c4..f344018b2 100644
Binary files a/image/character/guanping.jpg and b/image/character/guanping.jpg differ
diff --git a/image/character/guanqiujian.jpg b/image/character/guanqiujian.jpg
index b7ffa53a4..f516f84d1 100644
Binary files a/image/character/guanqiujian.jpg and b/image/character/guanqiujian.jpg differ
diff --git a/image/character/guansuo.jpg b/image/character/guansuo.jpg
index 5d55fa3e2..a14e8ca16 100644
Binary files a/image/character/guansuo.jpg and b/image/character/guansuo.jpg differ
diff --git a/image/character/guanyinping.jpg b/image/character/guanyinping.jpg
index 09ef22642..897e48e8a 100644
Binary files a/image/character/guanyinping.jpg and b/image/character/guanyinping.jpg differ
diff --git a/image/character/guanyu.jpg b/image/character/guanyu.jpg
index 28f577526..385782cb1 100644
Binary files a/image/character/guanyu.jpg and b/image/character/guanyu.jpg differ
diff --git a/image/character/guanzhang.jpg b/image/character/guanzhang.jpg
index 6be2b8a58..80aa90380 100644
Binary files a/image/character/guanzhang.jpg and b/image/character/guanzhang.jpg differ
diff --git a/image/character/guohuai.jpg b/image/character/guohuai.jpg
index ea6798148..4ac65deab 100644
Binary files a/image/character/guohuai.jpg and b/image/character/guohuai.jpg differ
diff --git a/image/character/guohuanghou.jpg b/image/character/guohuanghou.jpg
index 7da030c60..916fcc987 100644
Binary files a/image/character/guohuanghou.jpg and b/image/character/guohuanghou.jpg differ
diff --git a/image/character/guojia.jpg b/image/character/guojia.jpg
index fef06b9f9..609a46dcf 100755
Binary files a/image/character/guojia.jpg and b/image/character/guojia.jpg differ
diff --git a/image/character/guosi.jpg b/image/character/guosi.jpg
index ba942046f..8bcca7606 100644
Binary files a/image/character/guosi.jpg and b/image/character/guosi.jpg differ
diff --git a/image/character/guotufengji.jpg b/image/character/guotufengji.jpg
index f19c02549..fd94a7f71 100644
Binary files a/image/character/guotufengji.jpg and b/image/character/guotufengji.jpg differ
diff --git a/image/character/guyong.jpg b/image/character/guyong.jpg
index 1a556b251..b8ec2803a 100644
Binary files a/image/character/guyong.jpg and b/image/character/guyong.jpg differ
diff --git a/image/character/gz_caohong.jpg b/image/character/gz_caohong.jpg
index 3cdc337fe..5bb36683d 100644
Binary files a/image/character/gz_caohong.jpg and b/image/character/gz_caohong.jpg differ
diff --git a/image/character/gz_caopi.jpg b/image/character/gz_caopi.jpg
index d474ab336..ba04528d2 100644
Binary files a/image/character/gz_caopi.jpg and b/image/character/gz_caopi.jpg differ
diff --git a/image/character/gz_dengai.jpg b/image/character/gz_dengai.jpg
index 99da56191..88cd7d84d 100644
Binary files a/image/character/gz_dengai.jpg and b/image/character/gz_dengai.jpg differ
diff --git a/image/character/gz_diaochan.jpg b/image/character/gz_diaochan.jpg
index 053981fe4..243933980 100644
Binary files a/image/character/gz_diaochan.jpg and b/image/character/gz_diaochan.jpg differ
diff --git a/image/character/gz_dingfeng.jpg b/image/character/gz_dingfeng.jpg
index db54cfc24..6c855972a 100644
Binary files a/image/character/gz_dingfeng.jpg and b/image/character/gz_dingfeng.jpg differ
diff --git a/image/character/gz_fazheng.jpg b/image/character/gz_fazheng.jpg
index 02b3d3382..8b337ab83 100644
Binary files a/image/character/gz_fazheng.jpg and b/image/character/gz_fazheng.jpg differ
diff --git a/image/character/gz_ganfuren.jpg b/image/character/gz_ganfuren.jpg
index e9ab0f552..ffafa0525 100644
Binary files a/image/character/gz_ganfuren.jpg and b/image/character/gz_ganfuren.jpg differ
diff --git a/image/character/gz_guojia.jpg b/image/character/gz_guojia.jpg
index 4ebe789b0..6a00ad0d4 100644
Binary files a/image/character/gz_guojia.jpg and b/image/character/gz_guojia.jpg differ
diff --git a/image/character/gz_hetaihou.jpg b/image/character/gz_hetaihou.jpg
index e8863aaad..e37732f29 100644
Binary files a/image/character/gz_hetaihou.jpg and b/image/character/gz_hetaihou.jpg differ
diff --git a/image/character/gz_huangyueying.jpg b/image/character/gz_huangyueying.jpg
index 7df55cba1..32130a2a4 100644
Binary files a/image/character/gz_huangyueying.jpg and b/image/character/gz_huangyueying.jpg differ
diff --git a/image/character/gz_jiangwei.jpg b/image/character/gz_jiangwei.jpg
index 8ff822f21..b9ca1f4b7 100644
Binary files a/image/character/gz_jiangwei.jpg and b/image/character/gz_jiangwei.jpg differ
diff --git a/image/character/gz_jiaxu.jpg b/image/character/gz_jiaxu.jpg
index ae169e345..1f48b43a4 100644
Binary files a/image/character/gz_jiaxu.jpg and b/image/character/gz_jiaxu.jpg differ
diff --git a/image/character/gz_lingtong.jpg b/image/character/gz_lingtong.jpg
index e03b79bda..0c54640eb 100644
Binary files a/image/character/gz_lingtong.jpg and b/image/character/gz_lingtong.jpg differ
diff --git a/image/character/gz_lukang.jpg b/image/character/gz_lukang.jpg
index c403a61f7..9c417a859 100644
Binary files a/image/character/gz_lukang.jpg and b/image/character/gz_lukang.jpg differ
diff --git a/image/character/gz_luxun.jpg b/image/character/gz_luxun.jpg
index 73b37b4ea..54d7cd226 100644
Binary files a/image/character/gz_luxun.jpg and b/image/character/gz_luxun.jpg differ
diff --git a/image/character/gz_lvbu.jpg b/image/character/gz_lvbu.jpg
index b2481e6b7..3ad86f92c 100644
Binary files a/image/character/gz_lvbu.jpg and b/image/character/gz_lvbu.jpg differ
diff --git a/image/character/gz_madai.jpg b/image/character/gz_madai.jpg
index 065ca26a6..cf3e48726 100644
Binary files a/image/character/gz_madai.jpg and b/image/character/gz_madai.jpg differ
diff --git a/image/character/gz_masu.jpg b/image/character/gz_masu.jpg
index 85a30e84d..b1005c340 100644
Binary files a/image/character/gz_masu.jpg and b/image/character/gz_masu.jpg differ
diff --git a/image/character/gz_panfeng.jpg b/image/character/gz_panfeng.jpg
index 5476767ba..5b88cfdee 100644
Binary files a/image/character/gz_panfeng.jpg and b/image/character/gz_panfeng.jpg differ
diff --git a/image/character/gz_re_yuanshao.jpg b/image/character/gz_re_yuanshao.jpg
index 1dcf41fcc..17a5bb9fb 100644
Binary files a/image/character/gz_re_yuanshao.jpg and b/image/character/gz_re_yuanshao.jpg differ
diff --git a/image/character/gz_shamoke.jpg b/image/character/gz_shamoke.jpg
index afc97a2b1..be2deb321 100644
Binary files a/image/character/gz_shamoke.jpg and b/image/character/gz_shamoke.jpg differ
diff --git a/image/character/gz_sp_zhugeliang.jpg b/image/character/gz_sp_zhugeliang.jpg
index f0f98b7c7..2d1a1076a 100644
Binary files a/image/character/gz_sp_zhugeliang.jpg and b/image/character/gz_sp_zhugeliang.jpg differ
diff --git a/image/character/gz_sunce.jpg b/image/character/gz_sunce.jpg
index 24060ab52..4d71494ba 100644
Binary files a/image/character/gz_sunce.jpg and b/image/character/gz_sunce.jpg differ
diff --git a/image/character/gz_wangping.jpg b/image/character/gz_wangping.jpg
index edfff0b99..86c0fdd0b 100644
Binary files a/image/character/gz_wangping.jpg and b/image/character/gz_wangping.jpg differ
diff --git a/image/character/gz_xiaoqiao.jpg b/image/character/gz_xiaoqiao.jpg
index ae166c7bd..61d9b75f1 100644
Binary files a/image/character/gz_xiaoqiao.jpg and b/image/character/gz_xiaoqiao.jpg differ
diff --git a/image/character/gz_xunyou.jpg b/image/character/gz_xunyou.jpg
index 062080400..302bcbb6c 100644
Binary files a/image/character/gz_xunyou.jpg and b/image/character/gz_xunyou.jpg differ
diff --git a/image/character/gz_xusheng.jpg b/image/character/gz_xusheng.jpg
index 1ee01423a..55076352e 100644
Binary files a/image/character/gz_xusheng.jpg and b/image/character/gz_xusheng.jpg differ
diff --git a/image/character/gz_yuanshu.jpg b/image/character/gz_yuanshu.jpg
index 335f371b5..de29b7054 100644
Binary files a/image/character/gz_yuanshu.jpg and b/image/character/gz_yuanshu.jpg differ
diff --git a/image/character/gz_yuejin.jpg b/image/character/gz_yuejin.jpg
index 7a873a554..cdddf10c6 100644
Binary files a/image/character/gz_yuejin.jpg and b/image/character/gz_yuejin.jpg differ
diff --git a/image/character/gz_yuji.jpg b/image/character/gz_yuji.jpg
index f9694e3a5..4b82dc3f0 100644
Binary files a/image/character/gz_yuji.jpg and b/image/character/gz_yuji.jpg differ
diff --git a/image/character/gz_yujin.jpg b/image/character/gz_yujin.jpg
index ea86259a6..0f3817910 100644
Binary files a/image/character/gz_yujin.jpg and b/image/character/gz_yujin.jpg differ
diff --git a/image/character/gz_zhangxiu.jpg b/image/character/gz_zhangxiu.jpg
index 267237ead..1851a10b2 100644
Binary files a/image/character/gz_zhangxiu.jpg and b/image/character/gz_zhangxiu.jpg differ
diff --git a/image/character/gz_zhenji.jpg b/image/character/gz_zhenji.jpg
index e6a4cdddf..3d5bedadf 100644
Binary files a/image/character/gz_zhenji.jpg and b/image/character/gz_zhenji.jpg differ
diff --git a/image/character/gz_zhouyu.jpg b/image/character/gz_zhouyu.jpg
index 24cb88771..21aa7e7b7 100644
Binary files a/image/character/gz_zhouyu.jpg and b/image/character/gz_zhouyu.jpg differ
diff --git a/image/character/gz_zhugeliang.jpg b/image/character/gz_zhugeliang.jpg
index 46e7fc81e..738280119 100644
Binary files a/image/character/gz_zhugeliang.jpg and b/image/character/gz_zhugeliang.jpg differ
diff --git a/image/character/gz_zuoci.jpg b/image/character/gz_zuoci.jpg
index 72e5ca56d..ea8258b14 100644
Binary files a/image/character/gz_zuoci.jpg and b/image/character/gz_zuoci.jpg differ
diff --git a/image/character/hanba.jpg b/image/character/hanba.jpg
index d0d88ea0d..3868828ab 100644
Binary files a/image/character/hanba.jpg and b/image/character/hanba.jpg differ
diff --git a/image/character/handang.jpg b/image/character/handang.jpg
index 7efd670c7..a93bf697f 100755
Binary files a/image/character/handang.jpg and b/image/character/handang.jpg differ
diff --git a/image/character/hanhaoshihuan.jpg b/image/character/hanhaoshihuan.jpg
index 76dfc1334..af1d211a7 100644
Binary files a/image/character/hanhaoshihuan.jpg and b/image/character/hanhaoshihuan.jpg differ
diff --git a/image/character/hansui.jpg b/image/character/hansui.jpg
index 1a46bbff6..79f6d20b2 100644
Binary files a/image/character/hansui.jpg and b/image/character/hansui.jpg differ
diff --git a/image/character/haozhao.jpg b/image/character/haozhao.jpg
index d21ba6fd3..fcad1fe54 100644
Binary files a/image/character/haozhao.jpg and b/image/character/haozhao.jpg differ
diff --git a/image/character/hejin.jpg b/image/character/hejin.jpg
index ceeab8f7c..d70c29102 100644
Binary files a/image/character/hejin.jpg and b/image/character/hejin.jpg differ
diff --git a/image/character/heqi.jpg b/image/character/heqi.jpg
index aa0c9efa7..0094fab2e 100644
Binary files a/image/character/heqi.jpg and b/image/character/heqi.jpg differ
diff --git a/image/character/hetaihou.jpg b/image/character/hetaihou.jpg
index 51c3470da..d2622f877 100644
Binary files a/image/character/hetaihou.jpg and b/image/character/hetaihou.jpg differ
diff --git a/image/character/huaman.jpg b/image/character/huaman.jpg
index a82fd7971..336170613 100644
Binary files a/image/character/huaman.jpg and b/image/character/huaman.jpg differ
diff --git a/image/character/huangfusong.jpg b/image/character/huangfusong.jpg
index 8123bada8..fbc693f51 100644
Binary files a/image/character/huangfusong.jpg and b/image/character/huangfusong.jpg differ
diff --git a/image/character/huanggai.jpg b/image/character/huanggai.jpg
index abf1d7770..0a4e1a3d1 100644
Binary files a/image/character/huanggai.jpg and b/image/character/huanggai.jpg differ
diff --git a/image/character/huanghao.jpg b/image/character/huanghao.jpg
index 3ff68404f..fd0393763 100644
Binary files a/image/character/huanghao.jpg and b/image/character/huanghao.jpg differ
diff --git a/image/character/huangjinleishi.jpg b/image/character/huangjinleishi.jpg
index b3020bf13..563dadc11 100644
Binary files a/image/character/huangjinleishi.jpg and b/image/character/huangjinleishi.jpg differ
diff --git a/image/character/huangyueying.jpg b/image/character/huangyueying.jpg
index 5105d0477..f446bbdb5 100644
Binary files a/image/character/huangyueying.jpg and b/image/character/huangyueying.jpg differ
diff --git a/image/character/huangzhong.jpg b/image/character/huangzhong.jpg
index 74faba852..9a0e0cbcc 100644
Binary files a/image/character/huangzhong.jpg and b/image/character/huangzhong.jpg differ
diff --git a/image/character/huatuo.jpg b/image/character/huatuo.jpg
index 43181a272..ef71a8dd9 100644
Binary files a/image/character/huatuo.jpg and b/image/character/huatuo.jpg differ
diff --git a/image/character/huaxiong.jpg b/image/character/huaxiong.jpg
index acc9084e0..ce9bd7a90 100644
Binary files a/image/character/huaxiong.jpg and b/image/character/huaxiong.jpg differ
diff --git a/image/character/hujinding.jpg b/image/character/hujinding.jpg
index f3ae839d5..cd1523a29 100644
Binary files a/image/character/hujinding.jpg and b/image/character/hujinding.jpg differ
diff --git a/image/character/jiangfei.jpg b/image/character/jiangfei.jpg
index 6a7d3e20b..a4d160371 100755
Binary files a/image/character/jiangfei.jpg and b/image/character/jiangfei.jpg differ
diff --git a/image/character/jianggan.jpg b/image/character/jianggan.jpg
index ebd1ea7b6..b30b9daf1 100644
Binary files a/image/character/jianggan.jpg and b/image/character/jianggan.jpg differ
diff --git a/image/character/jiangqing.jpg b/image/character/jiangqing.jpg
index 01609eae2..a8876d00a 100644
Binary files a/image/character/jiangqing.jpg and b/image/character/jiangqing.jpg differ
diff --git a/image/character/jiangwei.jpg b/image/character/jiangwei.jpg
index 776c65256..dfd39cce7 100644
Binary files a/image/character/jiangwei.jpg and b/image/character/jiangwei.jpg differ
diff --git a/image/character/jianyong.jpg b/image/character/jianyong.jpg
index dd6d0f679..dbf748cfc 100644
Binary files a/image/character/jianyong.jpg and b/image/character/jianyong.jpg differ
diff --git a/image/character/jiaxu.jpg b/image/character/jiaxu.jpg
index f10ac78ac..d873d1dac 100644
Binary files a/image/character/jiaxu.jpg and b/image/character/jiaxu.jpg differ
diff --git a/image/character/jikang.jpg b/image/character/jikang.jpg
index bdaec5f05..776b34a35 100644
Binary files a/image/character/jikang.jpg and b/image/character/jikang.jpg differ
diff --git a/image/character/jiling.jpg b/image/character/jiling.jpg
index 0a5fc5455..e74888bd8 100644
Binary files a/image/character/jiling.jpg and b/image/character/jiling.jpg differ
diff --git a/image/character/jsp_caoren.jpg b/image/character/jsp_caoren.jpg
index f21d5c979..c51f63dd7 100644
Binary files a/image/character/jsp_caoren.jpg and b/image/character/jsp_caoren.jpg differ
diff --git a/image/character/jsp_guanyu.jpg b/image/character/jsp_guanyu.jpg
index f3955a29c..e165754fd 100644
Binary files a/image/character/jsp_guanyu.jpg and b/image/character/jsp_guanyu.jpg differ
diff --git a/image/character/jsp_huangyueying.jpg b/image/character/jsp_huangyueying.jpg
index 4af74de52..7f262e3a3 100755
Binary files a/image/character/jsp_huangyueying.jpg and b/image/character/jsp_huangyueying.jpg differ
diff --git a/image/character/jsp_zhaoyun.jpg b/image/character/jsp_zhaoyun.jpg
index cefcec237..ad5150077 100644
Binary files a/image/character/jsp_zhaoyun.jpg and b/image/character/jsp_zhaoyun.jpg differ
diff --git a/image/character/jun_caocao.jpg b/image/character/jun_caocao.jpg
index fcc6fce5d..2e4f7300c 100644
Binary files a/image/character/jun_caocao.jpg and b/image/character/jun_caocao.jpg differ
diff --git a/image/character/jun_liubei.jpg b/image/character/jun_liubei.jpg
index e7734d409..1713e7bd0 100644
Binary files a/image/character/jun_liubei.jpg and b/image/character/jun_liubei.jpg differ
diff --git a/image/character/jun_sunquan.jpg b/image/character/jun_sunquan.jpg
index ac376e0eb..8fbda97b8 100644
Binary files a/image/character/jun_sunquan.jpg and b/image/character/jun_sunquan.jpg differ
diff --git a/image/character/jun_zhangjiao.jpg b/image/character/jun_zhangjiao.jpg
index 6c7515da6..403be9234 100644
Binary files a/image/character/jun_zhangjiao.jpg and b/image/character/jun_zhangjiao.jpg differ
diff --git a/image/character/junk_simayi.jpg b/image/character/junk_simayi.jpg
new file mode 100644
index 000000000..54bf2a418
Binary files /dev/null and b/image/character/junk_simayi.jpg differ
diff --git a/image/character/kaisa.jpg b/image/character/kaisa.jpg
index fe3a79718..d0c88b101 100644
Binary files a/image/character/kaisa.jpg and b/image/character/kaisa.jpg differ
diff --git a/image/character/kanze.jpg b/image/character/kanze.jpg
index 705c6677f..6d607bf1f 100644
Binary files a/image/character/kanze.jpg and b/image/character/kanze.jpg differ
diff --git a/image/character/key_jojiro.jpg b/image/character/key_jojiro.jpg
new file mode 100644
index 000000000..dddb09002
Binary files /dev/null and b/image/character/key_jojiro.jpg differ
diff --git a/image/character/kongrong.jpg b/image/character/kongrong.jpg
index 861a4ea10..ff5e60711 100644
Binary files a/image/character/kongrong.jpg and b/image/character/kongrong.jpg differ
diff --git a/image/character/kuailiangkuaiyue.jpg b/image/character/kuailiangkuaiyue.jpg
index 392438d7d..47bbccbd2 100755
Binary files a/image/character/kuailiangkuaiyue.jpg and b/image/character/kuailiangkuaiyue.jpg differ
diff --git a/image/character/liaohua.jpg b/image/character/liaohua.jpg
index e80d13960..b2776f17d 100644
Binary files a/image/character/liaohua.jpg and b/image/character/liaohua.jpg differ
diff --git a/image/character/lifeng.jpg b/image/character/lifeng.jpg
index 3f12867d7..dc46b7419 100644
Binary files a/image/character/lifeng.jpg and b/image/character/lifeng.jpg differ
diff --git a/image/character/lijue.jpg b/image/character/lijue.jpg
index 32b9d2eb3..db8841f47 100755
Binary files a/image/character/lijue.jpg and b/image/character/lijue.jpg differ
diff --git a/image/character/lingcao.jpg b/image/character/lingcao.jpg
index a80c6f95e..14882b876 100644
Binary files a/image/character/lingcao.jpg and b/image/character/lingcao.jpg differ
diff --git a/image/character/lingju.jpg b/image/character/lingju.jpg
index ecde49494..c7b46706e 100644
Binary files a/image/character/lingju.jpg and b/image/character/lingju.jpg differ
diff --git a/image/character/lingtong.jpg b/image/character/lingtong.jpg
index e815482d2..caf629fcc 100644
Binary files a/image/character/lingtong.jpg and b/image/character/lingtong.jpg differ
diff --git a/image/character/liqueguosi.jpg b/image/character/liqueguosi.jpg
index ca4edd9c1..86f89aa59 100644
Binary files a/image/character/liqueguosi.jpg and b/image/character/liqueguosi.jpg differ
diff --git a/image/character/liru.jpg b/image/character/liru.jpg
index e626de7ac..638c5ab3a 100644
Binary files a/image/character/liru.jpg and b/image/character/liru.jpg differ
diff --git a/image/character/lisu.jpg b/image/character/lisu.jpg
index 26e335a62..d803b16b6 100644
Binary files a/image/character/lisu.jpg and b/image/character/lisu.jpg differ
diff --git a/image/character/litong.jpg b/image/character/litong.jpg
index 9b9955ce4..f5bf6c224 100644
Binary files a/image/character/litong.jpg and b/image/character/litong.jpg differ
diff --git a/image/character/liubei.jpg b/image/character/liubei.jpg
index f800d2f5a..7e2978e4e 100644
Binary files a/image/character/liubei.jpg and b/image/character/liubei.jpg differ
diff --git a/image/character/liubiao.jpg b/image/character/liubiao.jpg
index 3df898741..98d31bb57 100644
Binary files a/image/character/liubiao.jpg and b/image/character/liubiao.jpg differ
diff --git a/image/character/liuchen.jpg b/image/character/liuchen.jpg
index 707972d1c..66303d37d 100644
Binary files a/image/character/liuchen.jpg and b/image/character/liuchen.jpg differ
diff --git a/image/character/liufeng.jpg b/image/character/liufeng.jpg
index 68bb3a0ad..6834e2fd5 100644
Binary files a/image/character/liufeng.jpg and b/image/character/liufeng.jpg differ
diff --git a/image/character/liushan.jpg b/image/character/liushan.jpg
index aec290e84..57485e6d1 100644
Binary files a/image/character/liushan.jpg and b/image/character/liushan.jpg differ
diff --git a/image/character/liuxie.jpg b/image/character/liuxie.jpg
index 984f86376..acdd54514 100644
Binary files a/image/character/liuxie.jpg and b/image/character/liuxie.jpg differ
diff --git a/image/character/liuyan.jpg b/image/character/liuyan.jpg
index faa77bdd4..4ea700905 100644
Binary files a/image/character/liuyan.jpg and b/image/character/liuyan.jpg differ
diff --git a/image/character/liuyao.jpg b/image/character/liuyao.jpg
index d2df01a91..4a77cc3c5 100644
Binary files a/image/character/liuyao.jpg and b/image/character/liuyao.jpg differ
diff --git a/image/character/liuye.jpg b/image/character/liuye.jpg
index 23aab98fb..53c7433f1 100644
Binary files a/image/character/liuye.jpg and b/image/character/liuye.jpg differ
diff --git a/image/character/liuyu.jpg b/image/character/liuyu.jpg
index 6e9cfa84d..8676e9bed 100644
Binary files a/image/character/liuyu.jpg and b/image/character/liuyu.jpg differ
diff --git a/image/character/liuzan.jpg b/image/character/liuzan.jpg
index d834c8fec..cd735e369 100644
Binary files a/image/character/liuzan.jpg and b/image/character/liuzan.jpg differ
diff --git a/image/character/liyan.jpg b/image/character/liyan.jpg
index 78c4045ef..885a79e72 100644
Binary files a/image/character/liyan.jpg and b/image/character/liyan.jpg differ
diff --git a/image/character/luji.jpg b/image/character/luji.jpg
index 59cbc8fc3..c128f2597 100755
Binary files a/image/character/luji.jpg and b/image/character/luji.jpg differ
diff --git a/image/character/lukang.jpg b/image/character/lukang.jpg
index 3808d7bc6..8a152e181 100644
Binary files a/image/character/lukang.jpg and b/image/character/lukang.jpg differ
diff --git a/image/character/lusu.jpg b/image/character/lusu.jpg
index dce3017fd..02825cb77 100644
Binary files a/image/character/lusu.jpg and b/image/character/lusu.jpg differ
diff --git a/image/character/luxun.jpg b/image/character/luxun.jpg
index 9833d7263..abffe9266 100644
Binary files a/image/character/luxun.jpg and b/image/character/luxun.jpg differ
diff --git a/image/character/luzhi.jpg b/image/character/luzhi.jpg
index b6720d4c7..ab1198573 100644
Binary files a/image/character/luzhi.jpg and b/image/character/luzhi.jpg differ
diff --git a/image/character/lvbu.jpg b/image/character/lvbu.jpg
index 507d520a3..4047cf526 100644
Binary files a/image/character/lvbu.jpg and b/image/character/lvbu.jpg differ
diff --git a/image/character/lvdai.jpg b/image/character/lvdai.jpg
index 043cdfa36..1ae782bf0 100644
Binary files a/image/character/lvdai.jpg and b/image/character/lvdai.jpg differ
diff --git a/image/character/lvfan.jpg b/image/character/lvfan.jpg
index 384b5e0e1..20059e7a2 100644
Binary files a/image/character/lvfan.jpg and b/image/character/lvfan.jpg differ
diff --git a/image/character/lvkai.jpg b/image/character/lvkai.jpg
index 81e332d51..d80adc648 100644
Binary files a/image/character/lvkai.jpg and b/image/character/lvkai.jpg differ
diff --git a/image/character/lvmeng.jpg b/image/character/lvmeng.jpg
index 2c68b3269..830cc4f46 100644
Binary files a/image/character/lvmeng.jpg and b/image/character/lvmeng.jpg differ
diff --git a/image/character/lvqian.jpg b/image/character/lvqian.jpg
index 045d9414d..67245db7c 100644
Binary files a/image/character/lvqian.jpg and b/image/character/lvqian.jpg differ
diff --git a/image/character/machao.jpg b/image/character/machao.jpg
index 4c5b5be89..ee324828f 100644
Binary files a/image/character/machao.jpg and b/image/character/machao.jpg differ
diff --git a/image/character/madai.jpg b/image/character/madai.jpg
index a7969c0da..44126fd08 100644
Binary files a/image/character/madai.jpg and b/image/character/madai.jpg differ
diff --git a/image/character/majun.jpg b/image/character/majun.jpg
index 5863fe050..3b887f825 100644
Binary files a/image/character/majun.jpg and b/image/character/majun.jpg differ
diff --git a/image/character/maliang.jpg b/image/character/maliang.jpg
index 2e642191c..1a11e2adb 100644
Binary files a/image/character/maliang.jpg and b/image/character/maliang.jpg differ
diff --git a/image/character/manchong.jpg b/image/character/manchong.jpg
index 423e147af..d4451e356 100644
Binary files a/image/character/manchong.jpg and b/image/character/manchong.jpg differ
diff --git a/image/character/mangyachang.jpg b/image/character/mangyachang.jpg
index b09f017b7..c60fa2110 100644
Binary files a/image/character/mangyachang.jpg and b/image/character/mangyachang.jpg differ
diff --git a/image/character/masu.jpg b/image/character/masu.jpg
index d2eb5bf91..3e1afa721 100644
Binary files a/image/character/masu.jpg and b/image/character/masu.jpg differ
diff --git a/image/character/mateng.jpg b/image/character/mateng.jpg
index 80e043206..a3555ce65 100644
Binary files a/image/character/mateng.jpg and b/image/character/mateng.jpg differ
diff --git a/image/character/mayunlu.jpg b/image/character/mayunlu.jpg
index ad6125865..b4e3bf1a7 100644
Binary files a/image/character/mayunlu.jpg and b/image/character/mayunlu.jpg differ
diff --git a/image/character/mazhong.jpg b/image/character/mazhong.jpg
index 30b62d78a..3df91d63d 100644
Binary files a/image/character/mazhong.jpg and b/image/character/mazhong.jpg differ
diff --git a/image/character/menghuo.jpg b/image/character/menghuo.jpg
index 310a6a202..1efcd470b 100644
Binary files a/image/character/menghuo.jpg and b/image/character/menghuo.jpg differ
diff --git a/image/character/mifuren.jpg b/image/character/mifuren.jpg
index 283f9e613..614b9ba10 100644
Binary files a/image/character/mifuren.jpg and b/image/character/mifuren.jpg differ
diff --git a/image/character/miheng.jpg b/image/character/miheng.jpg
index bf66f070f..140b6945f 100644
Binary files a/image/character/miheng.jpg and b/image/character/miheng.jpg differ
diff --git a/image/character/mizhu.jpg b/image/character/mizhu.jpg
index 5cf0cc377..e108c87f5 100644
Binary files a/image/character/mizhu.jpg and b/image/character/mizhu.jpg differ
diff --git a/image/character/nashime.jpg b/image/character/nashime.jpg
index 6a0126729..351f244de 100644
Binary files a/image/character/nashime.jpg and b/image/character/nashime.jpg differ
diff --git a/image/character/niujin.jpg b/image/character/niujin.jpg
index 5898c6190..de8ffaf77 100644
Binary files a/image/character/niujin.jpg and b/image/character/niujin.jpg differ
diff --git a/image/character/ol_guansuo.jpg b/image/character/ol_guansuo.jpg
index c501195bd..69c4f012f 100644
Binary files a/image/character/ol_guansuo.jpg and b/image/character/ol_guansuo.jpg differ
diff --git a/image/character/ol_guohuai.jpg b/image/character/ol_guohuai.jpg
index 5b693e1c5..ae8d22d1b 100644
Binary files a/image/character/ol_guohuai.jpg and b/image/character/ol_guohuai.jpg differ
diff --git a/image/character/ol_liaohua.jpg b/image/character/ol_liaohua.jpg
index 733bbdd6e..061eb0a59 100644
Binary files a/image/character/ol_liaohua.jpg and b/image/character/ol_liaohua.jpg differ
diff --git a/image/character/ol_liuyu.jpg b/image/character/ol_liuyu.jpg
index a755f24fd..021824600 100644
Binary files a/image/character/ol_liuyu.jpg and b/image/character/ol_liuyu.jpg differ
diff --git a/image/character/ol_manchong.jpg b/image/character/ol_manchong.jpg
index eb250ae7e..6ade484aa 100644
Binary files a/image/character/ol_manchong.jpg and b/image/character/ol_manchong.jpg differ
diff --git a/image/character/ol_wuyi.jpg b/image/character/ol_wuyi.jpg
index 72b176e2f..1bc626d75 100644
Binary files a/image/character/ol_wuyi.jpg and b/image/character/ol_wuyi.jpg differ
diff --git a/image/character/ol_xinxianying.jpg b/image/character/ol_xinxianying.jpg
index 0f9d22592..0e0090228 100644
Binary files a/image/character/ol_xinxianying.jpg and b/image/character/ol_xinxianying.jpg differ
diff --git a/image/character/ol_yujin.jpg b/image/character/ol_yujin.jpg
index cace74157..b26d7ec73 100644
Binary files a/image/character/ol_yujin.jpg and b/image/character/ol_yujin.jpg differ
diff --git a/image/character/ol_zhangrang.jpg b/image/character/ol_zhangrang.jpg
index 266848a38..50801acc4 100644
Binary files a/image/character/ol_zhangrang.jpg and b/image/character/ol_zhangrang.jpg differ
diff --git a/image/character/ol_zhuran.jpg b/image/character/ol_zhuran.jpg
index 502b42f87..545b7a4ac 100644
Binary files a/image/character/ol_zhuran.jpg and b/image/character/ol_zhuran.jpg differ
diff --git a/image/character/old_bulianshi.jpg b/image/character/old_bulianshi.jpg
index bc92f2dbd..584770e69 100755
Binary files a/image/character/old_bulianshi.jpg and b/image/character/old_bulianshi.jpg differ
diff --git a/image/character/old_caochong.jpg b/image/character/old_caochong.jpg
index 8a1369068..37b26594e 100644
Binary files a/image/character/old_caochong.jpg and b/image/character/old_caochong.jpg differ
diff --git a/image/character/old_caochun.jpg b/image/character/old_caochun.jpg
index 359b9a221..480255eb1 100644
Binary files a/image/character/old_caochun.jpg and b/image/character/old_caochun.jpg differ
diff --git a/image/character/old_caoren.jpg b/image/character/old_caoren.jpg
index 55c167a14..87e80ed0d 100644
Binary files a/image/character/old_caoren.jpg and b/image/character/old_caoren.jpg differ
diff --git a/image/character/old_caoxiu.jpg b/image/character/old_caoxiu.jpg
index 9185faaa8..694cedfb7 100644
Binary files a/image/character/old_caoxiu.jpg and b/image/character/old_caoxiu.jpg differ
diff --git a/image/character/old_caozhen.jpg b/image/character/old_caozhen.jpg
index 220fff6e7..8bc26e43b 100644
Binary files a/image/character/old_caozhen.jpg and b/image/character/old_caozhen.jpg differ
diff --git a/image/character/old_chenqun.jpg b/image/character/old_chenqun.jpg
index 8071bb8ef..749b4f491 100644
Binary files a/image/character/old_chenqun.jpg and b/image/character/old_chenqun.jpg differ
diff --git a/image/character/old_fuhuanghou.jpg b/image/character/old_fuhuanghou.jpg
index adc6df1bd..cd5793b59 100644
Binary files a/image/character/old_fuhuanghou.jpg and b/image/character/old_fuhuanghou.jpg differ
diff --git a/image/character/old_guanzhang.jpg b/image/character/old_guanzhang.jpg
index c9f5e3397..52f5d17ed 100644
Binary files a/image/character/old_guanzhang.jpg and b/image/character/old_guanzhang.jpg differ
diff --git a/image/character/old_huatuo.jpg b/image/character/old_huatuo.jpg
index 80b637b80..930588a86 100644
Binary files a/image/character/old_huatuo.jpg and b/image/character/old_huatuo.jpg differ
diff --git a/image/character/old_huaxiong.jpg b/image/character/old_huaxiong.jpg
index 1680129ee..80f7dd082 100644
Binary files a/image/character/old_huaxiong.jpg and b/image/character/old_huaxiong.jpg differ
diff --git a/image/character/old_lingju.jpg b/image/character/old_lingju.jpg
index edcede4ee..afefa3277 100755
Binary files a/image/character/old_lingju.jpg and b/image/character/old_lingju.jpg differ
diff --git a/image/character/old_lingtong.jpg b/image/character/old_lingtong.jpg
index 11af1dbdb..d689e8051 100644
Binary files a/image/character/old_lingtong.jpg and b/image/character/old_lingtong.jpg differ
diff --git a/image/character/old_machao.jpg b/image/character/old_machao.jpg
index d69b72aa5..d0149648b 100755
Binary files a/image/character/old_machao.jpg and b/image/character/old_machao.jpg differ
diff --git a/image/character/old_madai.jpg b/image/character/old_madai.jpg
index 9d906236b..b84d3c95d 100644
Binary files a/image/character/old_madai.jpg and b/image/character/old_madai.jpg differ
diff --git a/image/character/old_majun.jpg b/image/character/old_majun.jpg
index aeb4fd99a..94008195c 100644
Binary files a/image/character/old_majun.jpg and b/image/character/old_majun.jpg differ
diff --git a/image/character/old_maliang.jpg b/image/character/old_maliang.jpg
index ddfc243fe..7fce97d87 100644
Binary files a/image/character/old_maliang.jpg and b/image/character/old_maliang.jpg differ
diff --git a/image/character/old_quancong.jpg b/image/character/old_quancong.jpg
index 0ddb35753..60afdabfe 100644
Binary files a/image/character/old_quancong.jpg and b/image/character/old_quancong.jpg differ
diff --git a/image/character/old_wangyi.jpg b/image/character/old_wangyi.jpg
index 8fa4c3e0c..4032c0c36 100644
Binary files a/image/character/old_wangyi.jpg and b/image/character/old_wangyi.jpg differ
diff --git a/image/character/old_xusheng.jpg b/image/character/old_xusheng.jpg
index deea27a8b..16bdc165e 100644
Binary files a/image/character/old_xusheng.jpg and b/image/character/old_xusheng.jpg differ
diff --git a/image/character/old_yuanshu.jpg b/image/character/old_yuanshu.jpg
index cbd4d3511..dd420bd1a 100644
Binary files a/image/character/old_yuanshu.jpg and b/image/character/old_yuanshu.jpg differ
diff --git a/image/character/old_zhangfei.jpg b/image/character/old_zhangfei.jpg
index 6d5864851..7f07427bf 100644
Binary files a/image/character/old_zhangfei.jpg and b/image/character/old_zhangfei.jpg differ
diff --git a/image/character/old_zhangxingcai.jpg b/image/character/old_zhangxingcai.jpg
index 13fa33e1f..3a2e0152c 100644
Binary files a/image/character/old_zhangxingcai.jpg and b/image/character/old_zhangxingcai.jpg differ
diff --git a/image/character/old_zhonghui.jpg b/image/character/old_zhonghui.jpg
index e193ae0e1..6c871c895 100644
Binary files a/image/character/old_zhonghui.jpg and b/image/character/old_zhonghui.jpg differ
diff --git a/image/character/old_zhoutai.jpg b/image/character/old_zhoutai.jpg
index 7812d7227..f2afdcae8 100644
Binary files a/image/character/old_zhoutai.jpg and b/image/character/old_zhoutai.jpg differ
diff --git a/image/character/old_zhugezhan.jpg b/image/character/old_zhugezhan.jpg
index 74859c076..d6dd5bf8c 100644
Binary files a/image/character/old_zhugezhan.jpg and b/image/character/old_zhugezhan.jpg differ
diff --git a/image/character/old_zhuhuan.jpg b/image/character/old_zhuhuan.jpg
index 616d0f0a3..4434fd8ef 100644
Binary files a/image/character/old_zhuhuan.jpg and b/image/character/old_zhuhuan.jpg differ
diff --git a/image/character/old_zhuran.jpg b/image/character/old_zhuran.jpg
index 94e1648d1..b6a4ebdf0 100644
Binary files a/image/character/old_zhuran.jpg and b/image/character/old_zhuran.jpg differ
diff --git a/image/character/old_zhuzhi.jpg b/image/character/old_zhuzhi.jpg
index 0d6906759..0588c3f4a 100644
Binary files a/image/character/old_zhuzhi.jpg and b/image/character/old_zhuzhi.jpg differ
diff --git a/image/character/panfeng.jpg b/image/character/panfeng.jpg
index 6746776fe..0098e845c 100644
Binary files a/image/character/panfeng.jpg and b/image/character/panfeng.jpg differ
diff --git a/image/character/pangde.jpg b/image/character/pangde.jpg
index 48cf76a59..eb289f740 100644
Binary files a/image/character/pangde.jpg and b/image/character/pangde.jpg differ
diff --git a/image/character/pangdegong.jpg b/image/character/pangdegong.jpg
index 39cd7c47b..3d355c077 100755
Binary files a/image/character/pangdegong.jpg and b/image/character/pangdegong.jpg differ
diff --git a/image/character/pangtong.jpg b/image/character/pangtong.jpg
index a566fbd6b..ac0f3c228 100644
Binary files a/image/character/pangtong.jpg and b/image/character/pangtong.jpg differ
diff --git a/image/character/panjun.jpg b/image/character/panjun.jpg
index 3ed2ef4b1..57af97676 100644
Binary files a/image/character/panjun.jpg and b/image/character/panjun.jpg differ
diff --git a/image/character/panzhangmazhong.jpg b/image/character/panzhangmazhong.jpg
index 22f67f704..2bdc85de0 100644
Binary files a/image/character/panzhangmazhong.jpg and b/image/character/panzhangmazhong.jpg differ
diff --git a/image/character/puyuan.jpg b/image/character/puyuan.jpg
index ad8cd5d52..53bf45d83 100644
Binary files a/image/character/puyuan.jpg and b/image/character/puyuan.jpg differ
diff --git a/image/character/qinmi.jpg b/image/character/qinmi.jpg
index b890c7b6a..a76a7c74d 100644
Binary files a/image/character/qinmi.jpg and b/image/character/qinmi.jpg differ
diff --git a/image/character/quancong.jpg b/image/character/quancong.jpg
index 30bd645dd..2051c2601 100644
Binary files a/image/character/quancong.jpg and b/image/character/quancong.jpg differ
diff --git a/image/character/quyi.jpg b/image/character/quyi.jpg
index 6b8ad13ca..1b275d183 100644
Binary files a/image/character/quyi.jpg and b/image/character/quyi.jpg differ
diff --git a/image/character/re_baosanniang.jpg b/image/character/re_baosanniang.jpg
index 7e9facce0..253001d62 100644
Binary files a/image/character/re_baosanniang.jpg and b/image/character/re_baosanniang.jpg differ
diff --git a/image/character/re_caiwenji.jpg b/image/character/re_caiwenji.jpg
index 20789e194..0e21b817b 100644
Binary files a/image/character/re_caiwenji.jpg and b/image/character/re_caiwenji.jpg differ
diff --git a/image/character/re_caocao.jpg b/image/character/re_caocao.jpg
index c6abb4ea3..34389845c 100644
Binary files a/image/character/re_caocao.jpg and b/image/character/re_caocao.jpg differ
diff --git a/image/character/re_caopi.jpg b/image/character/re_caopi.jpg
index 0abb094d5..35ac09a53 100644
Binary files a/image/character/re_caopi.jpg and b/image/character/re_caopi.jpg differ
diff --git a/image/character/re_daqiao.jpg b/image/character/re_daqiao.jpg
index cdc3efb8a..58328ba70 100644
Binary files a/image/character/re_daqiao.jpg and b/image/character/re_daqiao.jpg differ
diff --git a/image/character/re_dengai.jpg b/image/character/re_dengai.jpg
index 7acfb8b7b..378c0ca46 100644
Binary files a/image/character/re_dengai.jpg and b/image/character/re_dengai.jpg differ
diff --git a/image/character/re_dianwei.jpg b/image/character/re_dianwei.jpg
index d6073dbf9..5a2bb686e 100644
Binary files a/image/character/re_dianwei.jpg and b/image/character/re_dianwei.jpg differ
diff --git a/image/character/re_diaochan.jpg b/image/character/re_diaochan.jpg
index c40124f7a..416c47b5b 100644
Binary files a/image/character/re_diaochan.jpg and b/image/character/re_diaochan.jpg differ
diff --git a/image/character/re_dongzhuo.jpg b/image/character/re_dongzhuo.jpg
index 7b1244c47..7955d7ba2 100644
Binary files a/image/character/re_dongzhuo.jpg and b/image/character/re_dongzhuo.jpg differ
diff --git a/image/character/re_ganning.jpg b/image/character/re_ganning.jpg
index 8446ac268..8fd38fa8a 100644
Binary files a/image/character/re_ganning.jpg and b/image/character/re_ganning.jpg differ
diff --git a/image/character/re_gongsunzan.jpg b/image/character/re_gongsunzan.jpg
index 7d942f866..d3f688b35 100644
Binary files a/image/character/re_gongsunzan.jpg and b/image/character/re_gongsunzan.jpg differ
diff --git a/image/character/re_guanyu.jpg b/image/character/re_guanyu.jpg
index 0416300ed..55cee9f3b 100644
Binary files a/image/character/re_guanyu.jpg and b/image/character/re_guanyu.jpg differ
diff --git a/image/character/re_guojia.jpg b/image/character/re_guojia.jpg
index 06b155035..edd56025c 100644
Binary files a/image/character/re_guojia.jpg and b/image/character/re_guojia.jpg differ
diff --git a/image/character/re_huanggai.jpg b/image/character/re_huanggai.jpg
index 3cee252e5..bc3e2b836 100644
Binary files a/image/character/re_huanggai.jpg and b/image/character/re_huanggai.jpg differ
diff --git a/image/character/re_huangyueying.jpg b/image/character/re_huangyueying.jpg
index 29e3b210c..e73d9fd8e 100644
Binary files a/image/character/re_huangyueying.jpg and b/image/character/re_huangyueying.jpg differ
diff --git a/image/character/re_huangzhong.jpg b/image/character/re_huangzhong.jpg
index d82b7d52a..fed42cae9 100644
Binary files a/image/character/re_huangzhong.jpg and b/image/character/re_huangzhong.jpg differ
diff --git a/image/character/re_huatuo.jpg b/image/character/re_huatuo.jpg
index 7acd0cdfb..c376db440 100644
Binary files a/image/character/re_huatuo.jpg and b/image/character/re_huatuo.jpg differ
diff --git a/image/character/re_huaxiong.jpg b/image/character/re_huaxiong.jpg
index acc9084e0..0b376db90 100644
Binary files a/image/character/re_huaxiong.jpg and b/image/character/re_huaxiong.jpg differ
diff --git a/image/character/re_jiangwei.jpg b/image/character/re_jiangwei.jpg
index 3ac12424e..78d6fd94f 100644
Binary files a/image/character/re_jiangwei.jpg and b/image/character/re_jiangwei.jpg differ
diff --git a/image/character/re_jikang.jpg b/image/character/re_jikang.jpg
index 628bc85db..196e7a287 100644
Binary files a/image/character/re_jikang.jpg and b/image/character/re_jikang.jpg differ
diff --git a/image/character/re_jsp_pangtong.jpg b/image/character/re_jsp_pangtong.jpg
index 6bb05b0b0..6144e22c1 100644
Binary files a/image/character/re_jsp_pangtong.jpg and b/image/character/re_jsp_pangtong.jpg differ
diff --git a/image/character/re_lidian.jpg b/image/character/re_lidian.jpg
index fa73b1e86..ace19ebcf 100644
Binary files a/image/character/re_lidian.jpg and b/image/character/re_lidian.jpg differ
diff --git a/image/character/re_liubei.jpg b/image/character/re_liubei.jpg
index 3fb84ca99..87c936c07 100644
Binary files a/image/character/re_liubei.jpg and b/image/character/re_liubei.jpg differ
diff --git a/image/character/re_liushan.jpg b/image/character/re_liushan.jpg
index 1ffdfa0f5..ea834417c 100644
Binary files a/image/character/re_liushan.jpg and b/image/character/re_liushan.jpg differ
diff --git a/image/character/re_lusu.jpg b/image/character/re_lusu.jpg
index 3474b7fa7..73acf0ec5 100644
Binary files a/image/character/re_lusu.jpg and b/image/character/re_lusu.jpg differ
diff --git a/image/character/re_luxun.jpg b/image/character/re_luxun.jpg
index 93b5b9930..6f037fd0f 100644
Binary files a/image/character/re_luxun.jpg and b/image/character/re_luxun.jpg differ
diff --git a/image/character/re_lvbu.jpg b/image/character/re_lvbu.jpg
index 7e4e07ee9..ec10d6846 100644
Binary files a/image/character/re_lvbu.jpg and b/image/character/re_lvbu.jpg differ
diff --git a/image/character/re_lvmeng.jpg b/image/character/re_lvmeng.jpg
index 0a5cac57b..f88f8e82e 100644
Binary files a/image/character/re_lvmeng.jpg and b/image/character/re_lvmeng.jpg differ
diff --git a/image/character/re_machao.jpg b/image/character/re_machao.jpg
index b5bbdf7e4..7656b4045 100644
Binary files a/image/character/re_machao.jpg and b/image/character/re_machao.jpg differ
diff --git a/image/character/re_menghuo.jpg b/image/character/re_menghuo.jpg
index e53ae2069..0f2a967eb 100644
Binary files a/image/character/re_menghuo.jpg and b/image/character/re_menghuo.jpg differ
diff --git a/image/character/re_pangde.jpg b/image/character/re_pangde.jpg
index c5537accf..1e29f1d22 100644
Binary files a/image/character/re_pangde.jpg and b/image/character/re_pangde.jpg differ
diff --git a/image/character/re_pangtong.jpg b/image/character/re_pangtong.jpg
index eaa92561e..3a8d345f2 100644
Binary files a/image/character/re_pangtong.jpg and b/image/character/re_pangtong.jpg differ
diff --git a/image/character/re_simayi.jpg b/image/character/re_simayi.jpg
index 0fad7b9bb..774a5e087 100644
Binary files a/image/character/re_simayi.jpg and b/image/character/re_simayi.jpg differ
diff --git a/image/character/re_sp_zhugeliang.jpg b/image/character/re_sp_zhugeliang.jpg
index 33982da6d..882d4b6a3 100644
Binary files a/image/character/re_sp_zhugeliang.jpg and b/image/character/re_sp_zhugeliang.jpg differ
diff --git a/image/character/re_sunben.jpg b/image/character/re_sunben.jpg
index 5783a1b28..9c84c4101 100644
Binary files a/image/character/re_sunben.jpg and b/image/character/re_sunben.jpg differ
diff --git a/image/character/re_sunjian.jpg b/image/character/re_sunjian.jpg
index 6ff6ce2d7..d381b8ec9 100644
Binary files a/image/character/re_sunjian.jpg and b/image/character/re_sunjian.jpg differ
diff --git a/image/character/re_sunquan.jpg b/image/character/re_sunquan.jpg
index 882db4cfd..e0af453c1 100644
Binary files a/image/character/re_sunquan.jpg and b/image/character/re_sunquan.jpg differ
diff --git a/image/character/re_sunshangxiang.jpg b/image/character/re_sunshangxiang.jpg
index cfda234a5..f5087dc05 100644
Binary files a/image/character/re_sunshangxiang.jpg and b/image/character/re_sunshangxiang.jpg differ
diff --git a/image/character/re_wangyun.jpg b/image/character/re_wangyun.jpg
index 52682aabd..8fc3c9380 100644
Binary files a/image/character/re_wangyun.jpg and b/image/character/re_wangyun.jpg differ
diff --git a/image/character/re_weiwenzhugezhi.jpg b/image/character/re_weiwenzhugezhi.jpg
index 7302f844e..42078ced9 100644
Binary files a/image/character/re_weiwenzhugezhi.jpg and b/image/character/re_weiwenzhugezhi.jpg differ
diff --git a/image/character/re_weiyan.jpg b/image/character/re_weiyan.jpg
index 2ad9f27ad..f633bae89 100644
Binary files a/image/character/re_weiyan.jpg and b/image/character/re_weiyan.jpg differ
diff --git a/image/character/re_xiahoudun.jpg b/image/character/re_xiahoudun.jpg
index fb875a18a..c2a9cf3b5 100644
Binary files a/image/character/re_xiahoudun.jpg and b/image/character/re_xiahoudun.jpg differ
diff --git a/image/character/re_xiahouyuan.jpg b/image/character/re_xiahouyuan.jpg
index 15f24fd89..5d86bf9d4 100644
Binary files a/image/character/re_xiahouyuan.jpg and b/image/character/re_xiahouyuan.jpg differ
diff --git a/image/character/re_xiaoqiao.jpg b/image/character/re_xiaoqiao.jpg
index 2610de40f..e93a22470 100644
Binary files a/image/character/re_xiaoqiao.jpg and b/image/character/re_xiaoqiao.jpg differ
diff --git a/image/character/re_xugong.jpg b/image/character/re_xugong.jpg
index b4097f17a..7afe8556d 100644
Binary files a/image/character/re_xugong.jpg and b/image/character/re_xugong.jpg differ
diff --git a/image/character/re_xuhuang.jpg b/image/character/re_xuhuang.jpg
index 2379bf247..4037f767d 100644
Binary files a/image/character/re_xuhuang.jpg and b/image/character/re_xuhuang.jpg differ
diff --git a/image/character/re_xunyu.jpg b/image/character/re_xunyu.jpg
index fa7ffb378..2171bbff8 100644
Binary files a/image/character/re_xunyu.jpg and b/image/character/re_xunyu.jpg differ
diff --git a/image/character/re_xushu.jpg b/image/character/re_xushu.jpg
index e249ae9c4..368c35bd0 100644
Binary files a/image/character/re_xushu.jpg and b/image/character/re_xushu.jpg differ
diff --git a/image/character/re_xuzhu.jpg b/image/character/re_xuzhu.jpg
index 033b51a0e..2ad16b7e6 100644
Binary files a/image/character/re_xuzhu.jpg and b/image/character/re_xuzhu.jpg differ
diff --git a/image/character/re_yanwen.jpg b/image/character/re_yanwen.jpg
index f244d5855..f86053b97 100644
Binary files a/image/character/re_yanwen.jpg and b/image/character/re_yanwen.jpg differ
diff --git a/image/character/re_yuanshao.jpg b/image/character/re_yuanshao.jpg
index 0f81c6c83..269263365 100644
Binary files a/image/character/re_yuanshao.jpg and b/image/character/re_yuanshao.jpg differ
diff --git a/image/character/re_yuanshu.jpg b/image/character/re_yuanshu.jpg
index 59b8bd5ad..91219da98 100644
Binary files a/image/character/re_yuanshu.jpg and b/image/character/re_yuanshu.jpg differ
diff --git a/image/character/re_yuji.jpg b/image/character/re_yuji.jpg
index 2a6f7dc7a..3ef3a93ef 100755
Binary files a/image/character/re_yuji.jpg and b/image/character/re_yuji.jpg differ
diff --git a/image/character/re_yujin.jpg b/image/character/re_yujin.jpg
index 9d1f851c3..b95532698 100644
Binary files a/image/character/re_yujin.jpg and b/image/character/re_yujin.jpg differ
diff --git a/image/character/re_zhangfei.jpg b/image/character/re_zhangfei.jpg
index 77fb464fb..d05375175 100644
Binary files a/image/character/re_zhangfei.jpg and b/image/character/re_zhangfei.jpg differ
diff --git a/image/character/re_zhanggong.jpg b/image/character/re_zhanggong.jpg
index 1631d42a4..cbbb1c488 100644
Binary files a/image/character/re_zhanggong.jpg and b/image/character/re_zhanggong.jpg differ
diff --git a/image/character/re_zhangjiao.jpg b/image/character/re_zhangjiao.jpg
index 6c7515da6..403be9234 100644
Binary files a/image/character/re_zhangjiao.jpg and b/image/character/re_zhangjiao.jpg differ
diff --git a/image/character/re_zhangliang.jpg b/image/character/re_zhangliang.jpg
index 1f06a050d..b56aa909d 100644
Binary files a/image/character/re_zhangliang.jpg and b/image/character/re_zhangliang.jpg differ
diff --git a/image/character/re_zhangliao.jpg b/image/character/re_zhangliao.jpg
index 54ec496bb..fef5c75e6 100755
Binary files a/image/character/re_zhangliao.jpg and b/image/character/re_zhangliao.jpg differ
diff --git a/image/character/re_zhangzhang.jpg b/image/character/re_zhangzhang.jpg
index 22ef35081..c09f32026 100644
Binary files a/image/character/re_zhangzhang.jpg and b/image/character/re_zhangzhang.jpg differ
diff --git a/image/character/re_zhaoyun.jpg b/image/character/re_zhaoyun.jpg
index bfa8dd0a8..1b94edd44 100644
Binary files a/image/character/re_zhaoyun.jpg and b/image/character/re_zhaoyun.jpg differ
diff --git a/image/character/re_zhenji.jpg b/image/character/re_zhenji.jpg
index 8ea14e909..087be10d3 100644
Binary files a/image/character/re_zhenji.jpg and b/image/character/re_zhenji.jpg differ
diff --git a/image/character/re_zhouyu.jpg b/image/character/re_zhouyu.jpg
index 39c1b54aa..bb0889c70 100644
Binary files a/image/character/re_zhouyu.jpg and b/image/character/re_zhouyu.jpg differ
diff --git a/image/character/re_zhugeliang.jpg b/image/character/re_zhugeliang.jpg
index 734dd3c95..77240149b 100644
Binary files a/image/character/re_zhugeliang.jpg and b/image/character/re_zhugeliang.jpg differ
diff --git a/image/character/re_zhurong.jpg b/image/character/re_zhurong.jpg
index cf1588a9e..d44d56f11 100644
Binary files a/image/character/re_zhurong.jpg and b/image/character/re_zhurong.jpg differ
diff --git a/image/character/re_zuoci.jpg b/image/character/re_zuoci.jpg
index a5b27d5a5..4540d80cc 100644
Binary files a/image/character/re_zuoci.jpg and b/image/character/re_zuoci.jpg differ
diff --git a/image/character/shamoke.jpg b/image/character/shamoke.jpg
index 5d28c5f11..f19c7a762 100644
Binary files a/image/character/shamoke.jpg and b/image/character/shamoke.jpg differ
diff --git a/image/character/shen_caocao.jpg b/image/character/shen_caocao.jpg
index e5570edd5..38671afea 100644
Binary files a/image/character/shen_caocao.jpg and b/image/character/shen_caocao.jpg differ
diff --git a/image/character/shen_ganning.jpg b/image/character/shen_ganning.jpg
index e1f8db134..687912fa9 100644
Binary files a/image/character/shen_ganning.jpg and b/image/character/shen_ganning.jpg differ
diff --git a/image/character/shen_guanyu.jpg b/image/character/shen_guanyu.jpg
index 8291802b6..8a560d002 100644
Binary files a/image/character/shen_guanyu.jpg and b/image/character/shen_guanyu.jpg differ
diff --git a/image/character/shen_liubei.jpg b/image/character/shen_liubei.jpg
index bcf930337..0cfb809e6 100644
Binary files a/image/character/shen_liubei.jpg and b/image/character/shen_liubei.jpg differ
diff --git a/image/character/shen_luxun.jpg b/image/character/shen_luxun.jpg
index a20f82085..a69dc02c9 100644
Binary files a/image/character/shen_luxun.jpg and b/image/character/shen_luxun.jpg differ
diff --git a/image/character/shen_lvbu.jpg b/image/character/shen_lvbu.jpg
index 35ee59d2e..00b67cd0e 100644
Binary files a/image/character/shen_lvbu.jpg and b/image/character/shen_lvbu.jpg differ
diff --git a/image/character/shen_lvmeng.jpg b/image/character/shen_lvmeng.jpg
index 4bf348397..0210fcb98 100644
Binary files a/image/character/shen_lvmeng.jpg and b/image/character/shen_lvmeng.jpg differ
diff --git a/image/character/shen_simayi.jpg b/image/character/shen_simayi.jpg
index dcbcc8008..cbda9a7a2 100644
Binary files a/image/character/shen_simayi.jpg and b/image/character/shen_simayi.jpg differ
diff --git a/image/character/shen_zhangliao.jpg b/image/character/shen_zhangliao.jpg
index cc8468d29..cab93f6d6 100644
Binary files a/image/character/shen_zhangliao.jpg and b/image/character/shen_zhangliao.jpg differ
diff --git a/image/character/shen_zhaoyun.jpg b/image/character/shen_zhaoyun.jpg
index 7e235df64..157aad06b 100644
Binary files a/image/character/shen_zhaoyun.jpg and b/image/character/shen_zhaoyun.jpg differ
diff --git a/image/character/shen_zhouyu.jpg b/image/character/shen_zhouyu.jpg
index 1ea2c2c30..badfb9928 100644
Binary files a/image/character/shen_zhouyu.jpg and b/image/character/shen_zhouyu.jpg differ
diff --git a/image/character/shen_zhugeliang.jpg b/image/character/shen_zhugeliang.jpg
index fc2b22950..f048da938 100644
Binary files a/image/character/shen_zhugeliang.jpg and b/image/character/shen_zhugeliang.jpg differ
diff --git a/image/character/shenpei.jpg b/image/character/shenpei.jpg
index ff05d4e91..4aa499b20 100644
Binary files a/image/character/shenpei.jpg and b/image/character/shenpei.jpg differ
diff --git a/image/character/shibing1.jpg b/image/character/shibing1.jpg
index 5cd817eb7..a74cc7d8b 100644
Binary files a/image/character/shibing1.jpg and b/image/character/shibing1.jpg differ
diff --git a/image/character/shibing2.jpg b/image/character/shibing2.jpg
index 307af8ace..ead8642b7 100644
Binary files a/image/character/shibing2.jpg and b/image/character/shibing2.jpg differ
diff --git a/image/character/shixie.jpg b/image/character/shixie.jpg
index 84d0b01fe..afd301c26 100644
Binary files a/image/character/shixie.jpg and b/image/character/shixie.jpg differ
diff --git a/image/character/simahui.jpg b/image/character/simahui.jpg
index d9fa027da..c61cb83eb 100644
Binary files a/image/character/simahui.jpg and b/image/character/simahui.jpg differ
diff --git a/image/character/simalang.jpg b/image/character/simalang.jpg
index 3f4d4d946..5bcc7d1a8 100644
Binary files a/image/character/simalang.jpg and b/image/character/simalang.jpg differ
diff --git a/image/character/simayi.jpg b/image/character/simayi.jpg
index 4c27c3c5f..b4678a301 100644
Binary files a/image/character/simayi.jpg and b/image/character/simayi.jpg differ
diff --git a/image/character/simazhao.jpg b/image/character/simazhao.jpg
index 1c376bf14..71c12d49e 100644
Binary files a/image/character/simazhao.jpg and b/image/character/simazhao.jpg differ
diff --git a/image/character/sp_caiwenji.jpg b/image/character/sp_caiwenji.jpg
index 772a07128..dcf5dde52 100644
Binary files a/image/character/sp_caiwenji.jpg and b/image/character/sp_caiwenji.jpg differ
diff --git a/image/character/sp_caoren.jpg b/image/character/sp_caoren.jpg
index d2bcbd5e0..510d14f14 100644
Binary files a/image/character/sp_caoren.jpg and b/image/character/sp_caoren.jpg differ
diff --git a/image/character/sp_daqiao.jpg b/image/character/sp_daqiao.jpg
index 2c765500d..5bd1511cc 100644
Binary files a/image/character/sp_daqiao.jpg and b/image/character/sp_daqiao.jpg differ
diff --git a/image/character/sp_diaochan.jpg b/image/character/sp_diaochan.jpg
index a60bae581..d6eeecf1a 100644
Binary files a/image/character/sp_diaochan.jpg and b/image/character/sp_diaochan.jpg differ
diff --git a/image/character/sp_dongzhuo.jpg b/image/character/sp_dongzhuo.jpg
index f81f03306..1fd89f2c3 100644
Binary files a/image/character/sp_dongzhuo.jpg and b/image/character/sp_dongzhuo.jpg differ
diff --git a/image/character/sp_ganning.jpg b/image/character/sp_ganning.jpg
index f95fe94a6..5914efe0d 100644
Binary files a/image/character/sp_ganning.jpg and b/image/character/sp_ganning.jpg differ
diff --git a/image/character/sp_jiangwei.jpg b/image/character/sp_jiangwei.jpg
index 78dacaa98..8c499dec2 100644
Binary files a/image/character/sp_jiangwei.jpg and b/image/character/sp_jiangwei.jpg differ
diff --git a/image/character/sp_jiaxu.jpg b/image/character/sp_jiaxu.jpg
index 26595f90e..04627e3b8 100644
Binary files a/image/character/sp_jiaxu.jpg and b/image/character/sp_jiaxu.jpg differ
diff --git a/image/character/sp_liubei.jpg b/image/character/sp_liubei.jpg
index 9d0dab06f..c945808cc 100644
Binary files a/image/character/sp_liubei.jpg and b/image/character/sp_liubei.jpg differ
diff --git a/image/character/sp_liuqi.jpg b/image/character/sp_liuqi.jpg
index 95ae3ad32..616cb70bc 100644
Binary files a/image/character/sp_liuqi.jpg and b/image/character/sp_liuqi.jpg differ
diff --git a/image/character/sp_lvmeng.jpg b/image/character/sp_lvmeng.jpg
index fd2b60ad6..da8f2210f 100644
Binary files a/image/character/sp_lvmeng.jpg and b/image/character/sp_lvmeng.jpg differ
diff --git a/image/character/sp_machao.jpg b/image/character/sp_machao.jpg
index 40aed2fa7..c4402ef53 100644
Binary files a/image/character/sp_machao.jpg and b/image/character/sp_machao.jpg differ
diff --git a/image/character/sp_pangde.jpg b/image/character/sp_pangde.jpg
index 3d521fa4c..427773258 100644
Binary files a/image/character/sp_pangde.jpg and b/image/character/sp_pangde.jpg differ
diff --git a/image/character/sp_pangtong.jpg b/image/character/sp_pangtong.jpg
index 2e856c36f..cbf32d720 100644
Binary files a/image/character/sp_pangtong.jpg and b/image/character/sp_pangtong.jpg differ
diff --git a/image/character/sp_sunshangxiang.jpg b/image/character/sp_sunshangxiang.jpg
index c3611fad8..1d1131265 100644
Binary files a/image/character/sp_sunshangxiang.jpg and b/image/character/sp_sunshangxiang.jpg differ
diff --git a/image/character/sp_taishici.jpg b/image/character/sp_taishici.jpg
index 5a7de8748..722917469 100644
Binary files a/image/character/sp_taishici.jpg and b/image/character/sp_taishici.jpg differ
diff --git a/image/character/sp_xiahoudun.jpg b/image/character/sp_xiahoudun.jpg
index acbc9bdac..e289c1135 100755
Binary files a/image/character/sp_xiahoudun.jpg and b/image/character/sp_xiahoudun.jpg differ
diff --git a/image/character/sp_xiahoushi.jpg b/image/character/sp_xiahoushi.jpg
index e84bc862b..cce810794 100755
Binary files a/image/character/sp_xiahoushi.jpg and b/image/character/sp_xiahoushi.jpg differ
diff --git a/image/character/sp_zhangfei.jpg b/image/character/sp_zhangfei.jpg
index 6ce476a07..618b656b4 100644
Binary files a/image/character/sp_zhangfei.jpg and b/image/character/sp_zhangfei.jpg differ
diff --git a/image/character/sp_zhangjiao.jpg b/image/character/sp_zhangjiao.jpg
index 02b83a808..a6d6b7dc8 100644
Binary files a/image/character/sp_zhangjiao.jpg and b/image/character/sp_zhangjiao.jpg differ
diff --git a/image/character/sp_zhaoyun.jpg b/image/character/sp_zhaoyun.jpg
index f6fcc77c7..7a58f256d 100644
Binary files a/image/character/sp_zhaoyun.jpg and b/image/character/sp_zhaoyun.jpg differ
diff --git a/image/character/sp_zhugeliang.jpg b/image/character/sp_zhugeliang.jpg
index 712ee69fb..ecfdc6b12 100644
Binary files a/image/character/sp_zhugeliang.jpg and b/image/character/sp_zhugeliang.jpg differ
diff --git a/image/character/sunce.jpg b/image/character/sunce.jpg
index 4d6977a40..8934b692b 100644
Binary files a/image/character/sunce.jpg and b/image/character/sunce.jpg differ
diff --git a/image/character/sundeng.jpg b/image/character/sundeng.jpg
index 9e6a64782..aa52fbf66 100644
Binary files a/image/character/sundeng.jpg and b/image/character/sundeng.jpg differ
diff --git a/image/character/sunhao.jpg b/image/character/sunhao.jpg
index cf2daf4f5..e43f9bfe8 100644
Binary files a/image/character/sunhao.jpg and b/image/character/sunhao.jpg differ
diff --git a/image/character/sunjian.jpg b/image/character/sunjian.jpg
index 658e0531e..eff000b43 100644
Binary files a/image/character/sunjian.jpg and b/image/character/sunjian.jpg differ
diff --git a/image/character/sunliang.jpg b/image/character/sunliang.jpg
index b64ebdf7e..5f4eb5fa4 100755
Binary files a/image/character/sunliang.jpg and b/image/character/sunliang.jpg differ
diff --git a/image/character/sunluban.jpg b/image/character/sunluban.jpg
index bbf1d9c53..8c16563e9 100644
Binary files a/image/character/sunluban.jpg and b/image/character/sunluban.jpg differ
diff --git a/image/character/sunluyu.jpg b/image/character/sunluyu.jpg
index de601d7df..5873b1f98 100644
Binary files a/image/character/sunluyu.jpg and b/image/character/sunluyu.jpg differ
diff --git a/image/character/sunqian.jpg b/image/character/sunqian.jpg
index 8c0573453..97017f1b0 100644
Binary files a/image/character/sunqian.jpg and b/image/character/sunqian.jpg differ
diff --git a/image/character/sunquan.jpg b/image/character/sunquan.jpg
index eb5c5fd5a..3140f13a0 100644
Binary files a/image/character/sunquan.jpg and b/image/character/sunquan.jpg differ
diff --git a/image/character/sunru.jpg b/image/character/sunru.jpg
index 0a93de5db..0635e453e 100644
Binary files a/image/character/sunru.jpg and b/image/character/sunru.jpg differ
diff --git a/image/character/sunshangxiang.jpg b/image/character/sunshangxiang.jpg
index 7d92afaec..58cb3f689 100755
Binary files a/image/character/sunshangxiang.jpg and b/image/character/sunshangxiang.jpg differ
diff --git a/image/character/sunxiu.jpg b/image/character/sunxiu.jpg
index 2b7083b7e..e882b6957 100644
Binary files a/image/character/sunxiu.jpg and b/image/character/sunxiu.jpg differ
diff --git a/image/character/sunziliufang.jpg b/image/character/sunziliufang.jpg
index cb0097a4c..1244921f4 100644
Binary files a/image/character/sunziliufang.jpg and b/image/character/sunziliufang.jpg differ
diff --git a/image/character/tadun.jpg b/image/character/tadun.jpg
index 9b72c2481..ce02dd619 100644
Binary files a/image/character/tadun.jpg and b/image/character/tadun.jpg differ
diff --git a/image/character/taishici.jpg b/image/character/taishici.jpg
index 8e4197d1d..2ecfac22f 100644
Binary files a/image/character/taishici.jpg and b/image/character/taishici.jpg differ
diff --git a/image/character/taoqian.jpg b/image/character/taoqian.jpg
index 3b920c5e8..458a45258 100644
Binary files a/image/character/taoqian.jpg and b/image/character/taoqian.jpg differ
diff --git a/image/character/tianfeng.jpg b/image/character/tianfeng.jpg
index 3cee80bb2..51a97537f 100644
Binary files a/image/character/tianfeng.jpg and b/image/character/tianfeng.jpg differ
diff --git a/image/character/tw_beimihu.jpg b/image/character/tw_beimihu.jpg
index c8a41c9a4..0bf7dbafe 100644
Binary files a/image/character/tw_beimihu.jpg and b/image/character/tw_beimihu.jpg differ
diff --git a/image/character/tw_caoang.jpg b/image/character/tw_caoang.jpg
index e2e30ddb1..77db3ef7a 100644
Binary files a/image/character/tw_caoang.jpg and b/image/character/tw_caoang.jpg differ
diff --git a/image/character/tw_caohong.jpg b/image/character/tw_caohong.jpg
index 65c4f0039..8316a4d42 100644
Binary files a/image/character/tw_caohong.jpg and b/image/character/tw_caohong.jpg differ
diff --git a/image/character/tw_dingfeng.jpg b/image/character/tw_dingfeng.jpg
index 5ecb9cea2..ff5d2c449 100644
Binary files a/image/character/tw_dingfeng.jpg and b/image/character/tw_dingfeng.jpg differ
diff --git a/image/character/tw_maliang.jpg b/image/character/tw_maliang.jpg
index e6d0acb45..26168631b 100644
Binary files a/image/character/tw_maliang.jpg and b/image/character/tw_maliang.jpg differ
diff --git a/image/character/tw_xiahouba.jpg b/image/character/tw_xiahouba.jpg
index 29f2296c4..6560cb1bc 100644
Binary files a/image/character/tw_xiahouba.jpg and b/image/character/tw_xiahouba.jpg differ
diff --git a/image/character/tw_zumao.jpg b/image/character/tw_zumao.jpg
index 8ecc416ad..b3ee84224 100644
Binary files a/image/character/tw_zumao.jpg and b/image/character/tw_zumao.jpg differ
diff --git a/image/character/wangcan.jpg b/image/character/wangcan.jpg
index 190612fa5..7baa00d41 100644
Binary files a/image/character/wangcan.jpg and b/image/character/wangcan.jpg differ
diff --git a/image/character/wangji.jpg b/image/character/wangji.jpg
index 676bbbea6..7bb5fd73c 100644
Binary files a/image/character/wangji.jpg and b/image/character/wangji.jpg differ
diff --git a/image/character/wanglang.jpg b/image/character/wanglang.jpg
index 9fa682558..487a7f3d6 100644
Binary files a/image/character/wanglang.jpg and b/image/character/wanglang.jpg differ
diff --git a/image/character/wangping.jpg b/image/character/wangping.jpg
index 8f5481a0e..f8efa0383 100755
Binary files a/image/character/wangping.jpg and b/image/character/wangping.jpg differ
diff --git a/image/character/wangyi.jpg b/image/character/wangyi.jpg
index fd02fac51..9d9d7b43e 100644
Binary files a/image/character/wangyi.jpg and b/image/character/wangyi.jpg differ
diff --git a/image/character/wangyuanji.jpg b/image/character/wangyuanji.jpg
index 7934461b4..d569b506d 100644
Binary files a/image/character/wangyuanji.jpg and b/image/character/wangyuanji.jpg differ
diff --git a/image/character/wangyun.jpg b/image/character/wangyun.jpg
index 4ad02fd53..1eaabbc8b 100644
Binary files a/image/character/wangyun.jpg and b/image/character/wangyun.jpg differ
diff --git a/image/character/weiwenzhugezhi.jpg b/image/character/weiwenzhugezhi.jpg
index 266f54e04..e1afc0ca1 100755
Binary files a/image/character/weiwenzhugezhi.jpg and b/image/character/weiwenzhugezhi.jpg differ
diff --git a/image/character/weiyan.jpg b/image/character/weiyan.jpg
index 82a1b19c4..cab3b3dff 100644
Binary files a/image/character/weiyan.jpg and b/image/character/weiyan.jpg differ
diff --git a/image/character/wenpin.jpg b/image/character/wenpin.jpg
index 7a81d41e7..84db34db1 100644
Binary files a/image/character/wenpin.jpg and b/image/character/wenpin.jpg differ
diff --git a/image/character/wenyang.jpg b/image/character/wenyang.jpg
index de4379817..87a4f8c22 100644
Binary files a/image/character/wenyang.jpg and b/image/character/wenyang.jpg differ
diff --git a/image/character/wuguotai.jpg b/image/character/wuguotai.jpg
index cd409c6b9..c815a5366 100644
Binary files a/image/character/wuguotai.jpg and b/image/character/wuguotai.jpg differ
diff --git a/image/character/wutugu.jpg b/image/character/wutugu.jpg
index 09539d964..652b252e8 100644
Binary files a/image/character/wutugu.jpg and b/image/character/wutugu.jpg differ
diff --git a/image/character/wuxian.jpg b/image/character/wuxian.jpg
index 252c6f407..15dbe3e40 100644
Binary files a/image/character/wuxian.jpg and b/image/character/wuxian.jpg differ
diff --git a/image/character/wuyi.jpg b/image/character/wuyi.jpg
index b9635c5b0..be46818ee 100644
Binary files a/image/character/wuyi.jpg and b/image/character/wuyi.jpg differ
diff --git a/image/character/xf_huangquan.jpg b/image/character/xf_huangquan.jpg
index 5a1065b22..ebf17fba5 100644
Binary files a/image/character/xf_huangquan.jpg and b/image/character/xf_huangquan.jpg differ
diff --git a/image/character/xf_sufei.jpg b/image/character/xf_sufei.jpg
index acc03b905..d3c9628b6 100755
Binary files a/image/character/xf_sufei.jpg and b/image/character/xf_sufei.jpg differ
diff --git a/image/character/xf_tangzi.jpg b/image/character/xf_tangzi.jpg
index f7f7e7926..71e8b4cd2 100644
Binary files a/image/character/xf_tangzi.jpg and b/image/character/xf_tangzi.jpg differ
diff --git a/image/character/xf_yiji.jpg b/image/character/xf_yiji.jpg
index 037b5b8fc..f8d6df212 100755
Binary files a/image/character/xf_yiji.jpg and b/image/character/xf_yiji.jpg differ
diff --git a/image/character/xiahouba.jpg b/image/character/xiahouba.jpg
index 4dec79d55..68291df0f 100644
Binary files a/image/character/xiahouba.jpg and b/image/character/xiahouba.jpg differ
diff --git a/image/character/xiahoudun.jpg b/image/character/xiahoudun.jpg
index d580a6e17..93dde002e 100644
Binary files a/image/character/xiahoudun.jpg and b/image/character/xiahoudun.jpg differ
diff --git a/image/character/xiahoushi.jpg b/image/character/xiahoushi.jpg
index db28ae014..e286c4a11 100644
Binary files a/image/character/xiahoushi.jpg and b/image/character/xiahoushi.jpg differ
diff --git a/image/character/xiahouyuan.jpg b/image/character/xiahouyuan.jpg
index 260055a87..77f02f494 100644
Binary files a/image/character/xiahouyuan.jpg and b/image/character/xiahouyuan.jpg differ
diff --git a/image/character/xiaoqiao.jpg b/image/character/xiaoqiao.jpg
index 9c3df0b41..6ed0e6f3d 100644
Binary files a/image/character/xiaoqiao.jpg and b/image/character/xiaoqiao.jpg differ
diff --git a/image/character/xin_fazheng.jpg b/image/character/xin_fazheng.jpg
index dea48e9f8..647ae60b3 100644
Binary files a/image/character/xin_fazheng.jpg and b/image/character/xin_fazheng.jpg differ
diff --git a/image/character/xin_liru.jpg b/image/character/xin_liru.jpg
index d48611119..6c41bb5c7 100644
Binary files a/image/character/xin_liru.jpg and b/image/character/xin_liru.jpg differ
diff --git a/image/character/xin_masu.jpg b/image/character/xin_masu.jpg
index 0731a8512..2e6a4c7e9 100644
Binary files a/image/character/xin_masu.jpg and b/image/character/xin_masu.jpg differ
diff --git a/image/character/xin_xushu.jpg b/image/character/xin_xushu.jpg
index c41994f47..fef2a63e1 100644
Binary files a/image/character/xin_xushu.jpg and b/image/character/xin_xushu.jpg differ
diff --git a/image/character/xin_yuanshao.jpg b/image/character/xin_yuanshao.jpg
index 1c2e66523..389cc76a2 100644
Binary files a/image/character/xin_yuanshao.jpg and b/image/character/xin_yuanshao.jpg differ
diff --git a/image/character/xin_yuji.jpg b/image/character/xin_yuji.jpg
index ddcf2b608..5ebc112fd 100644
Binary files a/image/character/xin_yuji.jpg and b/image/character/xin_yuji.jpg differ
diff --git a/image/character/xin_yujin.jpg b/image/character/xin_yujin.jpg
index e7b93020c..8fbc4f5e7 100644
Binary files a/image/character/xin_yujin.jpg and b/image/character/xin_yujin.jpg differ
diff --git a/image/character/xinpi.jpg b/image/character/xinpi.jpg
index 5a9f1ddbc..2bdd9c115 100644
Binary files a/image/character/xinpi.jpg and b/image/character/xinpi.jpg differ
diff --git a/image/character/xinxianying.jpg b/image/character/xinxianying.jpg
index f89cf250d..539e784d8 100644
Binary files a/image/character/xinxianying.jpg and b/image/character/xinxianying.jpg differ
diff --git a/image/character/xizhicai.jpg b/image/character/xizhicai.jpg
index a04e73091..3ea1142dd 100644
Binary files a/image/character/xizhicai.jpg and b/image/character/xizhicai.jpg differ
diff --git a/image/character/xuezong.jpg b/image/character/xuezong.jpg
index cad4ced4c..3d288bd51 100644
Binary files a/image/character/xuezong.jpg and b/image/character/xuezong.jpg differ
diff --git a/image/character/xugong.jpg b/image/character/xugong.jpg
index 5eafbcb23..827ad508b 100644
Binary files a/image/character/xugong.jpg and b/image/character/xugong.jpg differ
diff --git a/image/character/xuhuang.jpg b/image/character/xuhuang.jpg
index 2ca615642..80bfce99d 100644
Binary files a/image/character/xuhuang.jpg and b/image/character/xuhuang.jpg differ
diff --git a/image/character/xujing.jpg b/image/character/xujing.jpg
index b7fc1259a..488b225a4 100644
Binary files a/image/character/xujing.jpg and b/image/character/xujing.jpg differ
diff --git a/image/character/xunyou.jpg b/image/character/xunyou.jpg
index 99d7e5c6e..b05a457ff 100644
Binary files a/image/character/xunyou.jpg and b/image/character/xunyou.jpg differ
diff --git a/image/character/xunyu.jpg b/image/character/xunyu.jpg
index 9548d0296..74745394a 100644
Binary files a/image/character/xunyu.jpg and b/image/character/xunyu.jpg differ
diff --git a/image/character/xurong.jpg b/image/character/xurong.jpg
index 659da3d17..c0b968b95 100644
Binary files a/image/character/xurong.jpg and b/image/character/xurong.jpg differ
diff --git a/image/character/xusheng.jpg b/image/character/xusheng.jpg
index f75b832d7..c7e7c877a 100644
Binary files a/image/character/xusheng.jpg and b/image/character/xusheng.jpg differ
diff --git a/image/character/xushi.jpg b/image/character/xushi.jpg
index 9cfcd0709..2b293cb49 100644
Binary files a/image/character/xushi.jpg and b/image/character/xushi.jpg differ
diff --git a/image/character/xushu.jpg b/image/character/xushu.jpg
index f24c5b213..11c524801 100644
Binary files a/image/character/xushu.jpg and b/image/character/xushu.jpg differ
diff --git a/image/character/xuyou.jpg b/image/character/xuyou.jpg
index 0646f56a1..bda9dddc1 100644
Binary files a/image/character/xuyou.jpg and b/image/character/xuyou.jpg differ
diff --git a/image/character/xuzhu.jpg b/image/character/xuzhu.jpg
index 9e97ba503..2d987ee20 100644
Binary files a/image/character/xuzhu.jpg and b/image/character/xuzhu.jpg differ
diff --git a/image/character/yanbaihu.jpg b/image/character/yanbaihu.jpg
index 264ef4683..d0afe3d7b 100644
Binary files a/image/character/yanbaihu.jpg and b/image/character/yanbaihu.jpg differ
diff --git a/image/character/yangxiu.jpg b/image/character/yangxiu.jpg
index 422067c1f..157a791b6 100644
Binary files a/image/character/yangxiu.jpg and b/image/character/yangxiu.jpg differ
diff --git a/image/character/yanjun.jpg b/image/character/yanjun.jpg
index e416416ee..3543f814b 100644
Binary files a/image/character/yanjun.jpg and b/image/character/yanjun.jpg differ
diff --git a/image/character/yanwen.jpg b/image/character/yanwen.jpg
index dfd362da9..5560bfc8f 100644
Binary files a/image/character/yanwen.jpg and b/image/character/yanwen.jpg differ
diff --git a/image/character/yanyan.jpg b/image/character/yanyan.jpg
index f2a87ae19..1af788d81 100755
Binary files a/image/character/yanyan.jpg and b/image/character/yanyan.jpg differ
diff --git a/image/character/yj_jushou.jpg b/image/character/yj_jushou.jpg
index 19c59589f..083602e82 100644
Binary files a/image/character/yj_jushou.jpg and b/image/character/yj_jushou.jpg differ
diff --git a/image/character/yl_luzhi.jpg b/image/character/yl_luzhi.jpg
index 34f597487..6e7c49960 100755
Binary files a/image/character/yl_luzhi.jpg and b/image/character/yl_luzhi.jpg differ
diff --git a/image/character/yl_yuanshu.jpg b/image/character/yl_yuanshu.jpg
index 140086956..fa1a5efbd 100644
Binary files a/image/character/yl_yuanshu.jpg and b/image/character/yl_yuanshu.jpg differ
diff --git a/image/character/yuanshao.jpg b/image/character/yuanshao.jpg
index b4fae882a..ceba6f90c 100644
Binary files a/image/character/yuanshao.jpg and b/image/character/yuanshao.jpg differ
diff --git a/image/character/yuanshu.jpg b/image/character/yuanshu.jpg
index e03a51b8e..3d791c9dc 100644
Binary files a/image/character/yuanshu.jpg and b/image/character/yuanshu.jpg differ
diff --git a/image/character/yuantanyuanshang.jpg b/image/character/yuantanyuanshang.jpg
index 84f9c5fb8..5f0d50bb0 100644
Binary files a/image/character/yuantanyuanshang.jpg and b/image/character/yuantanyuanshang.jpg differ
diff --git a/image/character/yuejin.jpg b/image/character/yuejin.jpg
index 7b2341114..518de2447 100644
Binary files a/image/character/yuejin.jpg and b/image/character/yuejin.jpg differ
diff --git a/image/character/yufan.jpg b/image/character/yufan.jpg
index d328e5343..eafdb1122 100644
Binary files a/image/character/yufan.jpg and b/image/character/yufan.jpg differ
diff --git a/image/character/yuji.jpg b/image/character/yuji.jpg
index f8daf737d..ebd3cbe92 100644
Binary files a/image/character/yuji.jpg and b/image/character/yuji.jpg differ
diff --git a/image/character/yujin.jpg b/image/character/yujin.jpg
index 0a43d2c04..37d14b52c 100644
Binary files a/image/character/yujin.jpg and b/image/character/yujin.jpg differ
diff --git a/image/character/zangba.jpg b/image/character/zangba.jpg
index 1f9779119..3fe31db72 100644
Binary files a/image/character/zangba.jpg and b/image/character/zangba.jpg differ
diff --git a/image/character/zhangbao.jpg b/image/character/zhangbao.jpg
index dc99dcd9a..aaa9a8ae2 100644
Binary files a/image/character/zhangbao.jpg and b/image/character/zhangbao.jpg differ
diff --git a/image/character/zhangchangpu.jpg b/image/character/zhangchangpu.jpg
index 9e54786d8..599a0805b 100644
Binary files a/image/character/zhangchangpu.jpg and b/image/character/zhangchangpu.jpg differ
diff --git a/image/character/zhangchunhua.jpg b/image/character/zhangchunhua.jpg
index b97bbbb70..62db98228 100644
Binary files a/image/character/zhangchunhua.jpg and b/image/character/zhangchunhua.jpg differ
diff --git a/image/character/zhangfei.jpg b/image/character/zhangfei.jpg
index 183b2904a..d58babbab 100644
Binary files a/image/character/zhangfei.jpg and b/image/character/zhangfei.jpg differ
diff --git a/image/character/zhanggong.jpg b/image/character/zhanggong.jpg
index a92f86b42..a2af8e0e3 100644
Binary files a/image/character/zhanggong.jpg and b/image/character/zhanggong.jpg differ
diff --git a/image/character/zhanghe.jpg b/image/character/zhanghe.jpg
index c5f31a84d..642ceb27a 100644
Binary files a/image/character/zhanghe.jpg and b/image/character/zhanghe.jpg differ
diff --git a/image/character/zhangji.jpg b/image/character/zhangji.jpg
index 4da605e0c..4d8b7ed15 100644
Binary files a/image/character/zhangji.jpg and b/image/character/zhangji.jpg differ
diff --git a/image/character/zhangjiao.jpg b/image/character/zhangjiao.jpg
index edc6eb5c6..7b8a50d47 100644
Binary files a/image/character/zhangjiao.jpg and b/image/character/zhangjiao.jpg differ
diff --git a/image/character/zhangliang.jpg b/image/character/zhangliang.jpg
index 9ec494dc2..2910c1ba9 100644
Binary files a/image/character/zhangliang.jpg and b/image/character/zhangliang.jpg differ
diff --git a/image/character/zhangliao.jpg b/image/character/zhangliao.jpg
index a9816dae9..c36e84b60 100644
Binary files a/image/character/zhangliao.jpg and b/image/character/zhangliao.jpg differ
diff --git a/image/character/zhanglu.jpg b/image/character/zhanglu.jpg
index 8fcad3b42..a5dd0e059 100644
Binary files a/image/character/zhanglu.jpg and b/image/character/zhanglu.jpg differ
diff --git a/image/character/zhangqiying.jpg b/image/character/zhangqiying.jpg
index c65fabc40..d33cc8f5c 100755
Binary files a/image/character/zhangqiying.jpg and b/image/character/zhangqiying.jpg differ
diff --git a/image/character/zhangrang.jpg b/image/character/zhangrang.jpg
index 075253cf3..2946942f9 100644
Binary files a/image/character/zhangrang.jpg and b/image/character/zhangrang.jpg differ
diff --git a/image/character/zhangren.jpg b/image/character/zhangren.jpg
index 12a062deb..959b0ff44 100644
Binary files a/image/character/zhangren.jpg and b/image/character/zhangren.jpg differ
diff --git a/image/character/zhangsong.jpg b/image/character/zhangsong.jpg
index 375b28a44..611d6dada 100644
Binary files a/image/character/zhangsong.jpg and b/image/character/zhangsong.jpg differ
diff --git a/image/character/zhangwen.jpg b/image/character/zhangwen.jpg
index d06a8b0bb..b941c6d09 100644
Binary files a/image/character/zhangwen.jpg and b/image/character/zhangwen.jpg differ
diff --git a/image/character/zhangxingcai.jpg b/image/character/zhangxingcai.jpg
index 26522084e..90527acdc 100644
Binary files a/image/character/zhangxingcai.jpg and b/image/character/zhangxingcai.jpg differ
diff --git a/image/character/zhangxiu.jpg b/image/character/zhangxiu.jpg
index 9d8690e65..2a2cdd57c 100644
Binary files a/image/character/zhangxiu.jpg and b/image/character/zhangxiu.jpg differ
diff --git a/image/character/zhangyi.jpg b/image/character/zhangyi.jpg
index 0a99fbf5b..933abc7a9 100644
Binary files a/image/character/zhangyi.jpg and b/image/character/zhangyi.jpg differ
diff --git a/image/character/zhangzhang.jpg b/image/character/zhangzhang.jpg
index 3e9129895..a220af47e 100644
Binary files a/image/character/zhangzhang.jpg and b/image/character/zhangzhang.jpg differ
diff --git a/image/character/zhaotongzhaoguang.jpg b/image/character/zhaotongzhaoguang.jpg
index 103a346cd..4f92015e5 100755
Binary files a/image/character/zhaotongzhaoguang.jpg and b/image/character/zhaotongzhaoguang.jpg differ
diff --git a/image/character/zhaoxiang.jpg b/image/character/zhaoxiang.jpg
index 310b3b4ba..71ff5559c 100644
Binary files a/image/character/zhaoxiang.jpg and b/image/character/zhaoxiang.jpg differ
diff --git a/image/character/zhaoyun.jpg b/image/character/zhaoyun.jpg
index 209eabad1..f3f8372d7 100644
Binary files a/image/character/zhaoyun.jpg and b/image/character/zhaoyun.jpg differ
diff --git a/image/character/zhenji.jpg b/image/character/zhenji.jpg
index 5b6805f97..4d44caa59 100644
Binary files a/image/character/zhenji.jpg and b/image/character/zhenji.jpg differ
diff --git a/image/character/zhonghui.jpg b/image/character/zhonghui.jpg
index 30ed00c24..e0186960a 100644
Binary files a/image/character/zhonghui.jpg and b/image/character/zhonghui.jpg differ
diff --git a/image/character/zhongyao.jpg b/image/character/zhongyao.jpg
index 8b3ad1622..924103ab5 100644
Binary files a/image/character/zhongyao.jpg and b/image/character/zhongyao.jpg differ
diff --git a/image/character/zhoucang.jpg b/image/character/zhoucang.jpg
index 527478def..8b5e0e9ee 100644
Binary files a/image/character/zhoucang.jpg and b/image/character/zhoucang.jpg differ
diff --git a/image/character/zhoufang.jpg b/image/character/zhoufang.jpg
index 48159ba90..d17c03823 100644
Binary files a/image/character/zhoufang.jpg and b/image/character/zhoufang.jpg differ
diff --git a/image/character/zhoufei.jpg b/image/character/zhoufei.jpg
index 0d4af94e2..d04b8ab02 100644
Binary files a/image/character/zhoufei.jpg and b/image/character/zhoufei.jpg differ
diff --git a/image/character/zhoutai.jpg b/image/character/zhoutai.jpg
index b5d37419d..8db786342 100644
Binary files a/image/character/zhoutai.jpg and b/image/character/zhoutai.jpg differ
diff --git a/image/character/zhouyu.jpg b/image/character/zhouyu.jpg
index a573cfe8b..3fea831c1 100644
Binary files a/image/character/zhouyu.jpg and b/image/character/zhouyu.jpg differ
diff --git a/image/character/zhugedan.jpg b/image/character/zhugedan.jpg
index 775b043b2..d1e36d8a1 100755
Binary files a/image/character/zhugedan.jpg and b/image/character/zhugedan.jpg differ
diff --git a/image/character/zhugeguo.jpg b/image/character/zhugeguo.jpg
index 7fcb1863b..28c03a3da 100644
Binary files a/image/character/zhugeguo.jpg and b/image/character/zhugeguo.jpg differ
diff --git a/image/character/zhugejin.jpg b/image/character/zhugejin.jpg
index 6f9f8e5ef..1fabbd324 100644
Binary files a/image/character/zhugejin.jpg and b/image/character/zhugejin.jpg differ
diff --git a/image/character/zhugeke.jpg b/image/character/zhugeke.jpg
index b08dd3c6f..fcaa38078 100644
Binary files a/image/character/zhugeke.jpg and b/image/character/zhugeke.jpg differ
diff --git a/image/character/zhugeliang.jpg b/image/character/zhugeliang.jpg
index a2d914e2b..41c2352af 100644
Binary files a/image/character/zhugeliang.jpg and b/image/character/zhugeliang.jpg differ
diff --git a/image/character/zhugezhan.jpg b/image/character/zhugezhan.jpg
index ef739c305..72b1e808a 100644
Binary files a/image/character/zhugezhan.jpg and b/image/character/zhugezhan.jpg differ
diff --git a/image/character/zhuhuan.jpg b/image/character/zhuhuan.jpg
index b5bd2d81a..914992f4e 100644
Binary files a/image/character/zhuhuan.jpg and b/image/character/zhuhuan.jpg differ
diff --git a/image/character/zhuling.jpg b/image/character/zhuling.jpg
index 2a08a7cb5..3f413c660 100644
Binary files a/image/character/zhuling.jpg and b/image/character/zhuling.jpg differ
diff --git a/image/character/zhuran.jpg b/image/character/zhuran.jpg
index 5d19ee87b..90ee821dc 100644
Binary files a/image/character/zhuran.jpg and b/image/character/zhuran.jpg differ
diff --git a/image/character/zhurong.jpg b/image/character/zhurong.jpg
index 81be245ca..50d95995b 100644
Binary files a/image/character/zhurong.jpg and b/image/character/zhurong.jpg differ
diff --git a/image/character/zhuzhi.jpg b/image/character/zhuzhi.jpg
index 5a46bcb3b..89be3363f 100644
Binary files a/image/character/zhuzhi.jpg and b/image/character/zhuzhi.jpg differ
diff --git a/image/character/zoushi.jpg b/image/character/zoushi.jpg
index 8ced227cf..5e7d15f89 100644
Binary files a/image/character/zoushi.jpg and b/image/character/zoushi.jpg differ
diff --git a/image/character/zumao.jpg b/image/character/zumao.jpg
index 96f084e4b..dcc0ff369 100644
Binary files a/image/character/zumao.jpg and b/image/character/zumao.jpg differ
diff --git a/image/character/zuoci.jpg b/image/character/zuoci.jpg
index 50cd08946..f828c38ac 100644
Binary files a/image/character/zuoci.jpg and b/image/character/zuoci.jpg differ
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 853399738..87b441f95 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -26,7 +26,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					}
 				}
 			}
-			lib.card.sha.complexTarget=true;
 		},
 		onreinit:function(){
 			var pack=lib.characterPack.mode_guozhan;
@@ -42,6 +41,16 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					lib.translate[i]=lib.translate[i.slice(3)];
 				}
 			}
+			for(var i in lib.character){
+				if(lib.character[i][1]=='shen'){
+					if(lib.character[i][4]&&(lib.group.contains(lib.character[i][4][0])||lib.character[i][4][0]=='key')){
+						lib.character[i][1]=lib.character[i][4][0];
+					}
+					else{
+						lib.character[i][1]='qun';
+					}
+				}
+			}
 		},
 		start:function(){
 			"step 0"
@@ -68,9 +77,20 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				game.waitForPlayer();
 			}
 			else{
-				if(get.config('guozhanpile')){
-					lib.card.list=lib.guozhanPile.slice(0);
-					game.fixedPile=true;
+				_status.mode=get.config('guozhan_mode');
+				if(!['normal','yingbian','old','free'].contains(_status.mode)) _status.mode='normal';
+				//决定牌堆
+				switch(_status.mode){
+					case 'old':lib.card.list=lib.guozhanPile_old.slice(0);break;
+					case 'yingbian':
+						lib.card.list=lib.guozhanPile_yingbian.slice(0);
+						delete lib.translate.shuiyanqijunx_info_guozhan;
+						break;
+					case 'normal':lib.card.list=lib.guozhanPile.slice(0);break;
+				}
+				if(_status.mode!='free') game.fixedPile=true;
+				else{
+					delete lib.translate.shuiyanqijunx_info_guozhan;
 				}
 				game.prepareArena();
 				// game.delay();
@@ -84,20 +104,26 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			}
 			"step 1"
 			if(_status.connectMode){
-				if(lib.configOL.guozhanpile){
-					lib.card.list=lib.guozhanPile.slice(0);
-					game.fixedPile=true;
+				_status.mode=lib.configOL.guozhan_mode;
+				if(!['normal','yingbian','old'].contains(_status.mode)) _status.mode='normal';
+				//决定牌堆
+				switch(_status.mode){
+					case 'old':lib.card.list=lib.guozhanPile_old.slice(0);break;
+					case 'yingbian':lib.card.list=lib.guozhanPile_yingbian.slice(0);break;
+					default:lib.card.list=lib.guozhanPile.slice(0);break;
 				}
-				game.broadcastAll(function(pack){
+				game.fixedPile=true;
+				game.broadcastAll(function(mode){
+					_status.mode=mode;
+					if(mode=='yingbian'){
+						delete lib.translate.shuiyanqijunx_info_guozhan;
+					}
 					for(var i=0;i<game.players.length;i++){
 						game.players[i].node.name.hide();
 						game.players[i].node.name2.hide();
 					}
-					lib.characterPack.mode_guozhan=pack;
+					var pack=lib.characterPack.mode_guozhan;
 					for(var i in pack){
-						if(!lib.configOL.onlyguozhan){
-							if(lib.character[i.slice(3)]) continue;
-						}
 						lib.character[i]=pack[i];
 						if(!lib.character[i][4]){
 							lib.character[i][4]=[];
@@ -106,7 +132,17 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 							lib.translate[i]=lib.translate[i.slice(3)];
 						}
 					}
-				},lib.characterPack.mode_guozhan);
+					for(var i in lib.character){
+						if(lib.character[i][1]=='shen'){
+							if(lib.character[i][4]&&(lib.group.contains(lib.character[i][4][0])||lib.character[i][4][0]=='key')){
+								lib.character[i][1]=lib.character[i][4][0];
+							}
+							else{
+								lib.character[i][1]='qun';
+							}
+						}
+					}
+				},_status.mode);
 				game.randomMapOL();
 			}
 			else{
@@ -301,6 +337,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				guozhan_bian:["gz_liqueguosi","gz_zuoci","gz_bianfuren","gz_xunyou","gz_lingtong","gz_lvfan","gz_masu","gz_shamoke",],
 				guozhan_quan:["gz_cuimao","gz_yujin","gz_wangping","gz_fazheng","gz_wuguotai","gz_lukang","gz_yuanshu","gz_zhangxiu"],
 				guozhan_jun:["gz_jun_caocao","gz_jun_sunquan","gz_jun_liubei","gz_jun_zhangjiao"],
+				guozhan_jin:['gz_jin_simayi','gz_jin_simazhao','gz_jin_simashi','gz_jin_zhangchunhua','gz_jin_wangyuanji','gz_jin_xiahouhui'],
 				guozhan_others:["gz_lingcao","gz_lifeng","gz_beimihu","gz_jianggan"],
 			}
 		},
@@ -424,6 +461,13 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				gz_yuanshu:['male','qun',4,['gzweidi','gzyongsi'],['gzskin']],
 				gz_zhangxiu:['male','qun',4,['gzfudi','congjian'],['gzskin']],
 				gz_jun_caocao:['male','wei',4,['jianan','huibian','gzzongyu','wuziliangjiangdao'],[]],
+				
+				gz_jin_zhangchunhua:['female','jin',3,['huishi','qingleng']],
+				gz_jin_simayi:['male','jin',3,['smyyingshi','xiongzhi','xinquanbian']],
+				gz_jin_wangyuanji:['female','jin',3,['yanxi']],
+				gz_jin_simazhao:['male','jin',3,['choufa','zhaoran']],
+				gz_jin_xiahouhui:['female','jin',3,['jyishi','shiduo']],
+				gz_jin_simashi:['male','jin',3,['yimie','tairan']],
 			}
 		},
 		skill:{
@@ -5136,6 +5180,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						while(list.length){
 							ui.cardPile.insertBefore(list.pop(),ui.cardPile.firstChild);
 						}
+						game.updateRoundNumber();
 					}
 				}
 			},
@@ -6548,7 +6593,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 		game:{
 			getCharacterChoice:function(list,num){
 				var choice=list.splice(0,num);
-				var map={wei:[],shu:[],wu:[],qun:[],key:[]};
+				var map={wei:[],shu:[],wu:[],qun:[],key:[],jin:[]};
 				for(var i=0;i<choice.length;i++){
 					var group=lib.character[choice[i]][1];
 					if(map[group]){
@@ -7144,21 +7189,21 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					game.broadcastAll(function(){
 						ui.arena.classList.add('choose-character');
 					});
-					var list;
-					if(lib.configOL.onlyguozhan){
-						list=[];
+					var list=[];
+					//if(lib.configOL.onlyguozhan){
+						//list=[];
 						for(var i in lib.characterPack.mode_guozhan){
 							if(i.indexOf('gz_shibing')==0) continue;
 							if(get.is.jun(i)) continue;
-							if(lib.character[i][4].contains('hiddenSkill')) continue;
+							if(lib.config.guozhan_banned&&lib.config.guozhan_banned.contains(i)) continue;
 							list.push(i);
 						}
-					}
-					else{
-						list=get.charactersOL(function(i){
-							return lib.character[i][4].contains('hiddenSkill');
-						});
-					}
+					//}
+					//else{
+					//	list=get.charactersOL(function(i){
+					//		return lib.character[i][4].contains('hiddenSkill');
+					//	});
+					//}
 					_status.characterlist=list.slice(0);
 					_status.yeidentity=[];
 					event.list=list.slice(0);
@@ -7644,9 +7689,236 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			guozhan_bian:"君临天下·变",
 			guozhan_quan:"君临天下·权",
 			guozhan_jun:"君主武将",
+			guozhan_jin:'文德武备',
 			guozhan_others:"其他",
 		},
 		junList:['liubei','zhangjiao','sunquan','caocao'],
+		guozhanPile_yingbian:[
+			['spade',1,'juedou'],
+			['spade',1,'shandian'],
+			['spade',2,'cixiong'],
+			['spade',2,'bagua'],
+			['spade',2,'taigongyinfu'],
+			['spade',3,'shuiyanqijunx',null,['yingbian_zhuzhan']],
+			['spade',3,'zhujinqiyuan',null,['yingbian_zhuzhan']],
+			['spade',4,'guohe'],
+			['spade',4,'shuiyanqijunx',null,['yingbian_zhuzhan']],
+			['spade',5,'sha'],
+			['spade',5,'jueying'],
+			['spade',6,'qinggang'],
+			['spade',6,'sha','ice'],
+			['spade',7,'sha'],
+			['spade',7,'sha','ice'],
+			['spade',8,'sha','ice'],
+			['spade',8,'sha','ice'],
+			['spade',9,'sha'],
+			['spade',9,'jiu'],
+			['spade',10,'sha',null,['yingbian_canqu']],
+			['spade',10,'bingliang'],
+			['spade',11,'sha',null,['yingbian_canqu']],
+			['spade',11,'wuxie',null,['yingbian_kongchao']],
+			['spade',12,'zhangba'],
+			['spade',12,'tiesuo'],
+			['spade',13,'nanman',null,['yingbian_fujia']],
+			['spade',13,'wutiesuolian'],
+
+			['heart',1,'taoyuan'],
+			['heart',1,'wanjian'],
+			['heart',2,'shan'],
+			['heart',2,'chuqibuyi',null,['yingbian_zhuzhan']],
+			['heart',3,'wugu'],
+			['heart',3,'chuqibuyi',null,['yingbian_zhuzhan']],
+			['heart',4,'tao'],
+			['heart',4,'sha','fire',['yingbian_canqu']],
+			['heart',5,'qilin'],
+			['heart',5,'chitu'],
+			['heart',6,'tao'],
+			['heart',6,'lebu'],
+			['heart',7,'tao'],
+			['heart',7,'dongzhuxianji'],
+			['heart',8,'tao'],
+			['heart',8,'dongzhuxianji'],
+			['heart',9,'tao'],
+			['heart',9,'yuanjiao'],
+			['heart',10,'tao'],
+			['heart',10,'sha'],
+			['heart',11,'shan'],
+			['heart',11,'yiyi'],
+			['heart',12,'tao'],
+			['heart',12,'sha'],
+			['heart',12,'guohe'],
+			['heart',13,'shan'],
+			['heart',13,'zhuahuang'],
+
+			['diamond',1,'zhuge'],
+			['diamond',1,'wuxinghelingshan'],
+			['diamond',2,'shan'],
+			['diamond',2,'tao'],
+			['diamond',3,'shan'],
+			['diamond',3,'shunshou'],
+			['diamond',4,'yiyi'],
+			['diamond',4,'sha','fire',['yingbian_canqu']],
+			['diamond',5,'guanshi'],
+			['diamond',5,'sha','fire'],
+			['diamond',6,'shan'],
+			['diamond',6,'wuliu'],
+			['diamond',7,'shan',null,['yingbian_kongchao']],
+			['diamond',7,'shan',null,['yingbian_kongchao']],
+			['diamond',8,'shan',null,['yingbian_kongchao']],
+			['diamond',8,'shan',null,['yingbian_kongchao']],
+			['diamond',9,'shan'],
+			['diamond',9,'jiu'],
+			['diamond',10,'shan'],
+			['diamond',10,'sha'],
+			['diamond',11,'shan'],
+			['diamond',11,'sha'],
+			['diamond',12,'sha'],
+			['diamond',12,'sanjian'],
+			['diamond',12,'wuxie',null,['guo']],
+			['diamond',13,'shan'],
+			['diamond',13,'zixin'],
+
+			['club',1,'juedou'],
+			['club',1,'huxinjing'],
+			['club',2,'sha'],
+			['club',2,'tengjia'],
+			['club',2,'renwang'],
+			['club',3,'guohe'],
+			['club',3,'zhibi'],
+			['club',4,'sha',null,['yingbian_kongchao']],
+			['club',4,'zhibi'],
+			['club',5,'sha',null,['yingbian_kongchao']],
+			['club',5,'tongque'],
+			['club',6,'lebu'],
+			['club',6,'sha','thunder'],
+			['club',7,'nanman'],
+			['club',7,'sha','thunder'],
+			['club',8,'sha'],
+			['club',8,'sha','thunder'],
+			['club',9,'sha'],
+			['club',9,'jiu'],
+			['club',10,'sha'],
+			['club',10,'bingliang'],
+			['club',11,'sha'],
+			['club',11,'sha'],
+			['club',12,'zhujinqiyuan',null,['yingbian_zhuzhan']],
+			['club',12,'tiesuo'],
+			['club',13,'wuxie',null,['guo']],
+			['club',13,'tiesuo'],
+		],
+		guozhanPile_old:[
+			['spade',1,'juedou'],
+			['spade',1,'shandian'],
+			['spade',2,'cixiong'],
+			['spade',2,'bagua'],
+			['spade',2,'hanbing'],
+			['spade',3,'guohe'],
+			['spade',3,'shunshou'],
+			['spade',4,'guohe'],
+			['spade',4,'shunshou'],
+			['spade',5,'sha'],
+			['spade',5,'jueying'],
+			['spade',6,'qinggang'],
+			['spade',6,'sha','thunder'],
+			['spade',7,'sha'],
+			['spade',7,'sha','thunder'],
+			['spade',8,'sha'],
+			['spade',8,'sha'],
+			['spade',9,'sha'],
+			['spade',9,'jiu'],
+			['spade',10,'sha'],
+			['spade',10,'bingliang'],
+			['spade',11,'sha'],
+			['spade',11,'wuxie'],
+			['spade',12,'zhangba'],
+			['spade',12,'tiesuo'],
+			['spade',13,'nanman'],
+			['spade',13,'dawan'],
+
+			['club',1,'juedou'],
+			['club',1,'baiyin'],
+			['club',2,'sha'],
+			['club',2,'tengjia'],
+			['club',2,'renwang'],
+			['club',3,'sha'],
+			['club',3,'zhibi'],
+			['club',4,'sha'],
+			['club',4,'zhibi'],
+			['club',5,'sha'],
+			['club',5,'dilu'],
+			['club',6,'lebu'],
+			['club',6,'sha','thunder'],
+			['club',7,'nanman'],
+			['club',7,'sha','thunder'],
+			['club',8,'sha'],
+			['club',8,'sha','thunder'],
+			['club',9,'sha'],
+			['club',9,'jiu'],
+			['club',10,'sha'],
+			['club',10,'bingliang'],
+			['club',11,'sha'],
+			['club',11,'sha'],
+			['club',12,'jiedao'],
+			['club',12,'tiesuo'],
+			['club',13,'wuxie',null,['guo']],
+			['club',13,'tiesuo'],
+
+			['diamond',1,'zhuge'],
+			['diamond',1,'zhuque'],
+			['diamond',2,'shan'],
+			['diamond',2,'tao'],
+			['diamond',3,'shan'],
+			['diamond',3,'shunshou'],
+			['diamond',4,'yiyi'],
+			['diamond',4,'sha','fire'],
+			['diamond',5,'guanshi'],
+			['diamond',5,'sha','fire'],
+			['diamond',6,'shan'],
+			['diamond',6,'wuliu'],
+			['diamond',7,'shan'],
+			['diamond',7,'shan'],
+			['diamond',8,'shan'],
+			['diamond',8,'shan'],
+			['diamond',9,'shan'],
+			['diamond',9,'jiu'],
+			['diamond',10,'shan'],
+			['diamond',10,'sha'],
+			['diamond',11,'shan'],
+			['diamond',11,'sha'],
+			['diamond',12,'sha'],
+			['diamond',12,'sanjian'],
+			['diamond',12,'wuxie',null,['guo']],
+			['diamond',13,'shan'],
+			['diamond',13,'zixin'],
+
+			['heart',1,'taoyuan'],
+			['heart',1,'wanjian'],
+			['heart',2,'shan'],
+			['heart',2,'huogong'],
+			['heart',3,'wugu'],
+			['heart',3,'huogong'],
+			['heart',4,'tao'],
+			['heart',4,'sha','fire'],
+			['heart',5,'qilin'],
+			['heart',5,'chitu'],
+			['heart',6,'tao'],
+			['heart',6,'lebu'],
+			['heart',7,'tao'],
+			['heart',7,'wuzhong'],
+			['heart',8,'tao'],
+			['heart',8,'wuzhong'],
+			['heart',9,'tao'],
+			['heart',9,'yuanjiao'],
+			['heart',10,'tao'],
+			['heart',10,'sha'],
+			['heart',11,'shan'],
+			['heart',11,'yiyi'],
+			['heart',12,'tao'],
+			['heart',12,'sha'],
+			['heart',12,'guohe'],
+			['heart',13,'shan'],
+			['heart',13,'zhuahuang'],
+		],
 		guozhanPile:[
 			['spade',1,'juedou'],
 			['spade',1,'shandian'],
diff --git a/mode/identity.js b/mode/identity.js
index 47afffc40..3d863ca9b 100644
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -1969,7 +1969,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					if(game.zhu.group=='shen'&&!game.zhu.isUnseen(0)){
 						var list=['wei','shu','wu','qun','jin','key'];
 						for(var i=0;i<list.length;i++){
-							if(!lib.group.contains(list[i])) list[i].splice(i--,1);
+							if(!lib.group.contains(list[i])) list.splice(i--,1);
 							else list[i]=['','','group_'+list[i]];
 						}
 						game.zhu.chooseButton(['请选择神武将的势力',[list,'vcard']],true).set('ai',function(){
@@ -2050,8 +2050,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					if(shen.length){
 						var list=['wei','shu','wu','qun','jin','key'];
 						for(var i=0;i<list.length;i++){
-							if(!lib.group.contains(list[i])) list[i].splice(i--,1);
-							list[i]=['','','group_'+list[i]];
+							if(!lib.group.contains(list[i])) list.splice(i--,1);
+							else list[i]=['','','group_'+list[i]];
 						}
 						for(var i=0;i<shen.length;i++){
 							shen[i]=[shen[i],['请选择神武将的势力',[list,'vcard']],1,true];