From a54fba3894b5d528bed16147f096b6a706a1fc0c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 六月 2019 15:58:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_GetPlayerFuncInfo.py |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_GetPlayerFuncInfo.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_GetPlayerFuncInfo.py
index 586a28f..d6d787b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_GetPlayerFuncInfo.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_GetPlayerFuncInfo.py
@@ -16,7 +16,6 @@
 #导入
 import GMCommon
 import ChConfig
-import PlayerManorWar
 
 #---------------------------------------------------------------------
 #全局变量
@@ -33,24 +32,15 @@
     queryType = gmCmdDict.get(GMCommon.Def_GMKey_QueryType, '')
     queryKey = gmCmdDict.get(GMCommon.Def_GMKey_FuncKey, '')
     
+    if queryType == 'accID': 
+        #玩家账户 []
+        GMCommon.GMTool_MapServer_Query(ChConfig.queryType_sqtPlayerByAccID, orderId,
+                                        playerFind, gmCmdDict, 'GetPlayerFuncInfo', [orderId,queryKey], False)
+        return
     
-    if queryKey in ['ManorWar']:
-        queryResult = 0
-        if queryKey == 'ManorWar':
-            queryResult = PlayerManorWar.GetManorWarFirstOrderInfo()
-        
-        #执行成功
-        GMCommon.GMCommandResult(orderId, gmCmdDict, GMCommon.Def_Success, queryResult)
-    else:
-        if queryType == 'accID': 
-            #玩家账户 []
-            GMCommon.GMTool_MapServer_Query(ChConfig.queryType_sqtPlayerByAccID, orderId,
-                                            playerFind, gmCmdDict, 'GetPlayerFuncInfo', [orderId,queryKey], False)
-            return
-        
-        #玩家名字 []
-        GMCommon.GMTool_MapServer_Query(ChConfig.queryType_sqtPlayerByName, orderId,
-                                          playerFind, gmCmdDict, 'GetPlayerFuncInfo', [orderId,queryKey], False)
+    #玩家名字 []
+    GMCommon.GMTool_MapServer_Query(ChConfig.queryType_sqtPlayerByName, orderId,
+                                      playerFind, gmCmdDict, 'GetPlayerFuncInfo', [orderId,queryKey], False)
     
     return
 

--
Gitblit v1.8.0