From 0b52fea0c2dec053c44678d94bd66c10db1b0b91 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 06 四月 2021 17:27:57 +0800
Subject: [PATCH] 8870 【BT2】【后端】战力、伤害、玩家生命的数值调整为大数值(超21亿)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 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 aae6430..3ce42f3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
@@ -114,14 +114,14 @@
             DR_UseGMCMD(curPlayer, inputStr)
             return
         
-        # curPlayer 的 Get、Set函数
-        if hasattr(curPlayer, callFunName):
-            callObj = getattr(curPlayer, callFunName)
+        # GameObj 的 Get、Set函数
+        if hasattr(GameObj, callFunName):
+            callObj = getattr(GameObj, callFunName)
             argcount = callObj.func_code.co_argcount # 函数参数个数
             
-            if argcount == 1 and callFunName.startswith("Get"): # 这个得到的参数个数竟然是1!!!暂时先这样写
-                value = callObj()
-            elif argcount == 1 and callFunName.startswith("Set"):
+            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
@@ -129,12 +129,9 @@
                 if value == None:
                     GameWorld.DebugAnswer(curPlayer, "参数错误, 必须为纯数字!")
                     return
-                if callFunName == "SetHappyPoint":
-                    PlayerTJG.SetTJGTime(curPlayer, value)
-                else:
-                    callObj(value)
+                callObj(curPlayer, value)
             else:
-                GameWorld.DebugAnswer(curPlayer, "不支持该命令!curPlayer.%s" % callFunName)
+                GameWorld.DebugAnswer(curPlayer, "不支持该命令!GameObj.%s" % callFunName)
                 return
             
             GameWorld.DebugAnswer(curPlayer, "%s : %s" % (callFunName, value))
@@ -165,14 +162,14 @@
             DR_UseGMCMD(curPlayer, inputStr)
             return
         
-        # GameObj 的 Get、Set函数
-        if hasattr(GameObj, callFunName):
-            callObj = getattr(GameObj, callFunName)
+        # curPlayer 的 Get、Set函数
+        if hasattr(curPlayer, callFunName):
+            callObj = getattr(curPlayer, 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 argcount == 1 and callFunName.startswith("Get"): # 这个得到的参数个数竟然是1!!!暂时先这样写
+                value = callObj()
+            elif argcount == 1 and callFunName.startswith("Set"):
                 if len(inputList) < 2:
                     GameWorld.DebugAnswer(curPlayer, "必须设定一定参数值")
                     return
@@ -180,9 +177,12 @@
                 if value == None:
                     GameWorld.DebugAnswer(curPlayer, "参数错误, 必须为纯数字!")
                     return
-                callObj(curPlayer, value)
+                if callFunName == "SetHappyPoint":
+                    PlayerTJG.SetTJGTime(curPlayer, value)
+                else:
+                    callObj(value)
             else:
-                GameWorld.DebugAnswer(curPlayer, "不支持该命令!GameObj.%s" % callFunName)
+                GameWorld.DebugAnswer(curPlayer, "不支持该命令!curPlayer.%s" % callFunName)
                 return
             
             GameWorld.DebugAnswer(curPlayer, "%s : %s" % (callFunName, value))

--
Gitblit v1.8.0