From 2cbf9aac044d14c2ee5233bfe247b6f57d89a602 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 13 十月 2022 16:32:39 +0800
Subject: [PATCH] 9719 【越南】【BT7】【主干】跨服全民充值（修复未启动跨服服务器或没有跨服全民充值活动时玩家登录可能导致本服报错bug）
---
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