From 36d9603ed7d901b79085ddb0dfd144a121c9cf6e Mon Sep 17 00:00:00 2001
From: cehua_lgq <cehua_lgq@163.com>
Date: 星期一, 03 九月 2018 15:53:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/GameServerConfig/GeneralProgramme.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/CoreServerGroup/GameServer/GameServerConfig/GeneralProgramme.txt b/CoreServerGroup/GameServer/GameServerConfig/GeneralProgramme.txt
index 6f60924..4f4ce49 100644
--- a/CoreServerGroup/GameServer/GameServerConfig/GeneralProgramme.txt
+++ b/CoreServerGroup/GameServer/GameServerConfig/GeneralProgramme.txt
@@ -14,6 +14,7 @@
 ActionGoOnMerge	\ActionControl\ActionGoOnMerge	b0c3996eba3a7ed471cea0b9da44981f	"开启跨服服务器, 活动可继续开启"
 ActionControlMerge	\ActionControl\ActionControlMerge	6ba0f42237cd9711ee4543eb6f54a4f1	跨服活动总开关
 RoleNameFormat	\CreatRole\RoleNameFormat	3b06ca3aeb6e07a2cc8cf97b5e689f5f	角色名字格式
+TestAccID	\CreatRole\TestAccID	3b06ca3aeb6e07a2cc8cf97b5e689f5f	测试账号
 Exam_ZGTX	\Exam\Exam_ZGTX	7ed77cdf2d1d96523adf3552670c8cdb	题库_智冠天下
 Exam_BSL	\Exam\Exam_BSL	d8c7a4848d16ed9c14585c5d80c63392	题库_变色龙
 Exam_JQBD	\Exam\Exam_JQBD	7815c05429228f9dcaf9bfcf19c1939c	题库_举棋不定

--
Gitblit v1.8.0