From 3a8d46acaed6c3cc279599835b013f6ff17a0632 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 14 九月 2018 17:34:54 +0800
Subject: [PATCH] 1942 【1.0.15】【主干】队伍在准备阶段时，需要停止自动匹配
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
index 23b3ac8..4742007 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
@@ -985,4 +985,19 @@
except:
return inputText
+ return inputText
+
+# 服务器默认GBK，转配置编码如UTF8，一般用于与显示层交互，不判断是否base64
+def CodeToGBK(inputText):
+ encodingList = ReadChConfig.GetEvalChConfig("EncodingTex")
+
+ if len(encodingList) != 2:
+ ErrLog("EncodingTex.txt Error len != 2")
+ return inputText
+
+ try:
+ return inputText.decode(GetCharacterEncoding()).encode(ShareDefine.Def_Game_Character_Encoding)
+ except:
+ return inputText
+
return inputText
\ No newline at end of file
--
Gitblit v1.8.0