From 591e52321b173065983f172fc2567a514abbc9f2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 十二月 2023 09:39:39 +0800
Subject: [PATCH] 1111 同步 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig.ini
---
ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossActServerIDChange.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossActServerIDChange.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossActServerIDChange.py
index 7cb503f..a29659b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossActServerIDChange.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossActServerIDChange.py
@@ -45,7 +45,7 @@
crossActInfoDict = CrossActionControl.GetCrossActInfoDict()
backMsg = {"crossActInfoDict":crossActInfoDict}
if errInfo:
- backMsg["ErrorInfo"] = errInfo
+ backMsg["ErrorInfo"] = errInfo.decode(ShareDefine.Def_Game_Character_Encoding).encode(GameWorld.GetCharacterEncoding())
GMCommon.GMCommandResult(orderId, gmCmdDict, GMCommon.Def_ParamErr, backMsg)
return
@@ -66,6 +66,9 @@
if len(kspList) != 3:
continue
actName, cfgID, _ = kspList
+ if actName not in ShareDefine.CrossActLockServerGroupIDList:
+ errInfo = "%s 不允许修改，可以直接修改活动配置表进行热更！" % actName
+ return errInfo
try:
cfgID = int(cfgID)
changeServerIDList = eval(v)
--
Gitblit v1.8.0