From 84ede803777ff10b5cbe93b1ec0168af08f55d5e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 一月 2021 18:11:26 +0800
Subject: [PATCH] 8677 【BT】【后端】跨服冲榜活动; 新增跨服活动时间管理模块、跨服榜单;跨服邮件;跨服广播优化;相关GM命令、后台工具;

---
 ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
index 6f97c43..7a34771 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
@@ -87,13 +87,22 @@
             GameWorld.Log("###使用GM命令 = %s错误,玩家不是GM"%(callFunName), curPlayer.GetPlayerID())
             return
         
+        #把剩余参数转换为整型
+        for i in range(0, len(alist)):
+            if i == 0:
+                continue
+            value = GameWorld.ToIntDef(alist[i], None)
+            if value == None:
+                #GameWorld.DebugAnswer(curPlayer, "参数错误, 参数%s必须为纯数字!" % (i + 1))
+                continue
+            alist[i] = value
+            
         #非跨服服务器下使用跨服GM命令,则发送到跨服
         if not GameWorld.IsCrossServer():
             callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "OnGetMergeParam"))
             if callFunc != None:
                 extendParamList = callFunc(curPlayer)
-                alist.extend(extendParamList)
-                CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_GMCMD, alist)
+                CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_GMCMD, alist + extendParamList)
                 
         callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "OnExec"))
         if callFunc == None:
@@ -102,17 +111,7 @@
             GameWorld.DebugAnswer(curPlayer, 'no cmd !!!')
             return
         
-        #删除命令,只将参数传入
-        del alist[0]
-        #把剩余参数转换为整型
-        for i in range(0, len(alist)):
-            value = GameWorld.ToIntDef(alist[i], None)
-            if value == None:
-                #GameWorld.DebugAnswer(curPlayer, "参数错误, 参数%s必须为纯数字!" % (i + 1))
-                continue
-            alist[i] = value
-            
-        callFunc(curPlayer,alist)
+        callFunc(curPlayer, alist[1:])
         
     except BaseException:
         GameWorld.DebugAnswer(curPlayer, "执行GM命令错误, 请查看GameServer日志!")

--
Gitblit v1.8.0