From 30bfce20df82dfe0d12b37ca775ad383f05e5144 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Fri, 24 Feb 2017 10:08:49 +0800
Subject: [PATCH] t

---
 character/sp.js |  6 ++++++
 game/game.js    | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/character/sp.js b/character/sp.js
index b75278354..7a07713b4 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -7782,6 +7782,12 @@ character.sp={
 		},
 	},
 	translate:{
+		zhangren:'张任',
+		zoushi:'邹氏',
+		zangba:'臧霸',
+		jiling:'纪灵',
+		gz_sp_dongzhuo:'董卓',
+		gz_zhangjiao:'张角',
 		litong:'李通',
 		mizhu:'糜竺',
 		buzhi:'步骘',
diff --git a/game/game.js b/game/game.js
index 794063964..2764ea923 100644
--- a/game/game.js
+++ b/game/game.js
@@ -20792,11 +20792,21 @@
 				};
 				var modecharacters=lib.characterPack['mode_'+get.mode()];
 				if(modecharacters){
-					if(modecharacters[newvid.name1]){
-						newvid.name1=get.mode()+'::'+newvid.name1;
+					if(get.mode()=='guozhan'){
+						if(modecharacters[newvid.name1]){
+							newvid.name1=newvid.name1.slice(3);
+						}
+						if(modecharacters[newvid.name2]){
+							newvid.name2=newvid.name2.slice(3);
+						}
 					}
-					if(modecharacters[newvid.name2]){
-						newvid.name2=get.mode()+'::'+newvid.name2;
+					else{
+						if(modecharacters[newvid.name1]){
+							newvid.name1=get.mode()+'::'+newvid.name1;
+						}
+						if(modecharacters[newvid.name2]){
+							newvid.name2=get.mode()+'::'+newvid.name2;
+						}
 					}
 				}
 				lib.videos.unshift(newvid);