From 93367a2607db214ec6dda86bd796c1291bc06a49 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 27 三月 2019 15:29:05 +0800
Subject: [PATCH] 3167 【BUG】【2.0】拍卖,消耗了仙玉没获得拍品

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
index feafac2..928baf0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
@@ -30,6 +30,7 @@
 import traceback
 import PlayerTJG
 import FBLogic
+import GameObj
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -103,13 +104,10 @@
             del inputList[0]
             #把剩余参数转换为整型
             for i in range(0, len(inputList)):
-                if not inputList[i].isdigit():
-                    continue
-                
                 value = GameWorld.ToIntDef(inputList[i], None)
                 if value == None:
-                    GameWorld.DebugAnswer(curPlayer, "参数错误, 必须为纯数字!")
-                    return
+                    #GameWorld.DebugAnswer(curPlayer, "参数错误, 必须为纯数字!")
+                    continue
                 inputList[i] = value
                 
             callFunc(curPlayer, inputList)
@@ -161,6 +159,30 @@
                 callObj(curPlayer, value)
             else:
                 GameWorld.DebugAnswer(curPlayer, "不支持该命令!PlayerControl.%s" % callFunName)
+                return
+            
+            GameWorld.DebugAnswer(curPlayer, "%s : %s" % (callFunName, value))
+            DR_UseGMCMD(curPlayer, inputStr)
+            return
+        
+        # GameObj 的 Get、Set函数
+        if hasattr(GameObj, callFunName):
+            callObj = getattr(GameObj, callFunName)
+            argcount = callObj.func_code.co_argcount # 函数参数个数
+            
+            if argcount == 1 and callFunName.startswith("Get"):
+                value = callObj(curPlayer)
+            elif argcount == 2 and callFunName.startswith("Set"):
+                if len(inputList) < 2:
+                    GameWorld.DebugAnswer(curPlayer, "必须设定一定参数值")
+                    return
+                value = GameWorld.ToIntDef(inputList[1], None)
+                if value == None:
+                    GameWorld.DebugAnswer(curPlayer, "参数错误, 必须为纯数字!")
+                    return
+                callObj(curPlayer, value)
+            else:
+                GameWorld.DebugAnswer(curPlayer, "不支持该命令!GameObj.%s" % callFunName)
                 return
             
             GameWorld.DebugAnswer(curPlayer, "%s : %s" % (callFunName, value))
@@ -258,7 +280,7 @@
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
     
     if not curPlayer.GetMapLoadOK():
-        #未读取地图成功,不让用
+        GameWorld.DebugLog("    未读取地图成功,不让用")
         return
     
     #判断FB中是否可使用GM命令

--
Gitblit v1.8.0