From 01e033a79a5ce63e298015d0783560a77ccffea9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 14 九月 2018 11:46:46 +0800
Subject: [PATCH] fix:3543 【后端】【主干】【1.0.15】开服红包优化 每天赠送次数
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
index 2dbdcdb..4742007 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
@@ -477,11 +477,9 @@
def GetPlayerMainServerID(accIDPlatform):
# 玩家合服后所属主服ID
# @param accIDPlatform: 玩家账号所属的平台
- #===========================================================================
- # mainServerID = ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "%sMainServerID" % accIDPlatform), None)
- # if mainServerID != None:
- # return mainServerID
- #===========================================================================
+ mainServerID = ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "%sMainServerID" % accIDPlatform), None)
+ if mainServerID != None:
+ return mainServerID
return GetServerID()
##获取玩家所属平台
@@ -987,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