From b1daad2394ff6f0322696df50fcc53236f4ea9b1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 七月 2024 17:11:39 +0800
Subject: [PATCH] 10215 10213 【越南】【主干】【港台】【砍树】古宝升星效果与古宝共鸣(增加古宝星级属性;增加古宝共鸣;增加boss最终伤害属性;)

---
 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