From 896039ebf3997a7059afde318812ec6ed734d1dc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 02 三月 2019 15:00:52 +0800
Subject: [PATCH] 860312 优化DBOper和GM工具指令 把eval改json
---
ServerPython/db/PyMongoDataServer/GMToolLogicProcess/ProjSpecialProcess.py | 2 +-
ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py | 1 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py | 1 +
ServerPython/CoreServerGroup/GameServer/Script/IPY_GameServer1.py | 1 +
ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py | 1 +
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBOper.py | 3 ++-
6 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IPY_GameServer1.py b/ServerPython/CoreServerGroup/GameServer/Script/IPY_GameServer1.py
index f43bf20..ee540c2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IPY_GameServer1.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IPY_GameServer1.py
@@ -998,6 +998,7 @@
def SendMergeMsgToClientByGroupList(self, *args): return _IPY_GameServer1.IPY_GameWorld_SendMergeMsgToClientByGroupList(self, *args)
def SendProxyDBOper(self, *args): return _IPY_GameServer1.IPY_GameWorld_SendProxyDBOper(self, *args)
def SendMergerChildToCenterStringData(self, *args): return _IPY_GameServer1.IPY_GameWorld_SendMergerChildToCenterStringData(self, *args)
+ def SendCrossServerStateToLoginServer(self, *args): return _IPY_GameServer1.IPY_GameWorld_SendCrossServerStateToLoginServer(self, *args)
IPY_GameWorld_swigregister = _IPY_GameServer1.IPY_GameWorld_swigregister
IPY_GameWorld_swigregister(IPY_GameWorld)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
index da036c6..1edae98 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
@@ -396,6 +396,7 @@
gbProxyDBOper = _IPY_ServerDefine.gbProxyDBOper
gbSynPlayerName = _IPY_ServerDefine.gbSynPlayerName
gbMergerChildToCenter = _IPY_ServerDefine.gbMergerChildToCenter
+gbCrossServerState = _IPY_ServerDefine.gbCrossServerState
gstPlayerLogin = _IPY_ServerDefine.gstPlayerLogin
gstPlayerDetail = _IPY_ServerDefine.gstPlayerDetail
gstCreatePlayer = _IPY_ServerDefine.gstCreatePlayer
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index e00d086..051fa9f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -158,6 +158,7 @@
continue
PlayerControl.SetCrossMapID(curPlayer, 0)
+ GameWorld.GetGameWorld().SendCrossServerStateToLoginServer(isOpen)
# 通知地图
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen)
return
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBOper.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBOper.py
index 8e4f768..dd1e215 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBOper.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerDBOper.py
@@ -27,6 +27,7 @@
import IPY_GameServer
import ReadChConfig
import base64
+import json
#[isBase64, gbk]
EncodingList = ReadChConfig.GetEvalChConfig("EncodingTex")
@@ -152,7 +153,7 @@
sendDict, callFunc, extendValueList = g_dbCommandList.pop(0)
#0：不返回，1：DB返回信息到GameServer
- GameWorld.GetGameWorld().SendDBOper(1, str(sendDict))
+ GameWorld.GetGameWorld().SendDBOper(1, json.dumps(sendDict, ensure_ascii=False))
GameWorld.Log("send dbcommand:%s"%sendDict)
g_proccessCmdInfo = [callFunc, extendValueList]
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py
index 6232569..26aee35 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py
@@ -397,6 +397,7 @@
gbProxyDBOper = _IPY_ServerDefine.gbProxyDBOper
gbSynPlayerName = _IPY_ServerDefine.gbSynPlayerName
gbMergerChildToCenter = _IPY_ServerDefine.gbMergerChildToCenter
+gbCrossServerState = _IPY_ServerDefine.gbCrossServerState
gstPlayerLogin = _IPY_ServerDefine.gstPlayerLogin
gstPlayerDetail = _IPY_ServerDefine.gstPlayerDetail
gstCreatePlayer = _IPY_ServerDefine.gstCreatePlayer
diff --git a/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/ProjSpecialProcess.py b/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/ProjSpecialProcess.py
index a634f1d..2959052 100644
--- a/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/ProjSpecialProcess.py
+++ b/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/ProjSpecialProcess.py
@@ -97,7 +97,7 @@
funcName = ''
try:
# 获得gm命令信息
- gmCmdDict = eval(cmd)
+ gmCmdDict = json.loads(cmd)
funcName = gmCmdDict.get(GMCommon.Def_GMKey_Type, '')
if funcName == None:
--
Gitblit v1.8.0