From 6a9883b425e53e714b9a930ec70b7544999611a6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 08 五月 2025 12:01:45 +0800
Subject: [PATCH] 16 卡牌服务端（db数据备档、加载；仙盟基础转到MapServer；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 8de3a0d..c71d18d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -1384,8 +1384,8 @@
##获取玩家所属区服ID
# @param curPlayer
# @return
-def GetPlayerServerID(curPlayer):
- accID = curPlayer.GetAccID()
+def GetPlayerServerID(curPlayer): return GetAccIDServerID(curPlayer.GetAccID())
+def GetAccIDServerID(accID):
infoList = accID.split(Def_AccID_Split_Sign)
return 0 if len(infoList) < 3 else ToIntDef(infoList[-1][1:])
@@ -1879,18 +1879,12 @@
# @param inputText 输入的文字
# @return: 是否符合编码格式
def EncodingToUnicode(inputText):
- encodingList = ReadChConfig.GetEvalChConfig("EncodingTex")
-
- if len(encodingList) != 2:
- ErrLog("EncodingTex.txt Error len != 2")
- return False
-
- if encodingList[0]:
+ if IpyGameDataPY.GetFuncCfg("EncodingTex", 1):
#不檢查
return True
try:
- unicode(inputText, encodingList[1])
+ unicode(inputText, IpyGameDataPY.GetFuncCfg("EncodingTex", 2))
except:
return False
@@ -1898,23 +1892,10 @@
# 获得游戏设置的字符编码
-def GetCharacterEncoding():
- encodingList = ReadChConfig.GetEvalChConfig("EncodingTex")
-
- if len(encodingList) != 2:
- ErrLog("EncodingTex.txt Error len != 2")
- return 'utf8'
- return encodingList[1]
-
+def GetCharacterEncoding(): return IpyGameDataPY.GetFuncCfg("EncodingTex", 2)
# 服务器默认GBK，转配置编码如UTF8，一般用于与显示层交互，不判断是否base64
def GbkToCode(inputText):
- encodingList = ReadChConfig.GetEvalChConfig("EncodingTex")
-
- if len(encodingList) != 2:
- ErrLog("EncodingTex.txt Error len != 2")
- return inputText
-
try:
return inputText.decode(ShareDefine.Def_Game_Character_Encoding).encode(GetCharacterEncoding())
except:
@@ -1922,6 +1903,14 @@
return inputText
+def CodeToGbk(inputText):
+ try:
+ return inputText.decode(GetCharacterEncoding()).encode(ShareDefine.Def_Game_Character_Encoding)
+ except:
+ return inputText
+
+ return inputText
+
def IsCrossServer():
## 是否跨服服务器
return ToIntDef(ReadChConfig.GetPyMongoConfig("Merge", "IsMergeServer"), 0)
--
Gitblit v1.8.0