From 4d05b52d78b592673bd93dd29f1668147cf89039 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 16 十月 2018 15:04:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/FormulaControl.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/FormulaControl.py b/ServerPython/CoreServerGroup/GameServer/Script/FormulaControl.py
index 9c99160..c8b68da 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/FormulaControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/FormulaControl.py
@@ -47,7 +47,7 @@
 AllFormulaDist = {}
 #---------------------------------------------------------------------
 #特殊公式不能编译列表(脏话列表)
-IgnoreFormulaKeyList = ['DirtyList']
+IgnoreFormulaKeyList = ['DirtyList', 'DirtyName']
 #---------------------------------------------------------------------
 ##获取编译后的公式.
 # @param formulaKey 字典Key名

--
Gitblit v1.8.0