From f6e55772b80bf536223e6e949e28fb7b1812a54d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 19 九月 2025 12:02:36 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(甘夫人潜能1、3;增加使用技能后触发方式9;层级buff属性支持;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py |   36 ++++++------------------------------
 1 files changed, 6 insertions(+), 30 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 cb412c8..fa2c200 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
@@ -37,7 +37,6 @@
 GameWorld.ImportAll("Script\\GM\\" , "Commands")
 GameWorld.ImportAll("Script\\GM\\" , "")
 
-TestPlatformList = ["test", "yun"]
 #---------------------------------------------------------------------
 ## 重新导入GM全部命令
 #  @param tick 当前时间
@@ -74,7 +73,7 @@
 #                curIP = curPlayer.GetIP()
 #                if (curIP.find('10.30.') == 0 or curIP.find('192.168.') == 0) and playerPF == "173on_lan":
                 #测试修改
-                if playerPF in TestPlatformList:
+                if GameWorld.IsTestPlatform(playerPF):
                     curPlayer.SetGMLevel(gmLV)
                     GameWorld.DebugAnswer(curPlayer, "SetGMLevel %s" % gmLV)
                 else:
@@ -95,6 +94,7 @@
             
         #验证权限失败
         elif not CheckGMLV(curPlayer , callFunName):
+            GameWorld.DebugAnswer(curPlayer, 'GM等级不足!')
             return
             
         callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "OnExec"))
@@ -109,10 +109,8 @@
                     continue
                 inputList[i] = value
                 
-            isSendGameServer = callFunc(curPlayer, inputList)
+            callFunc(curPlayer, inputList)
             DR_UseGMCMD(curPlayer, inputStr)
-            if isSendGameServer:
-                curPlayer.GameServer_GMCmd(inputStr)
             return
         
         # GameObj 的 Get、Set函数
@@ -187,7 +185,9 @@
             DR_UseGMCMD(curPlayer, inputStr)
             return
         
-        curPlayer.GameServer_GMCmd(inputStr)
+        #没有此命令
+        GameWorld.Log("###使用GM命令 = %s, 没有该命令!" % callFunName, curPlayer.GetPlayerID())
+        GameWorld.DebugAnswer(curPlayer, 'no cmd !!!')
     except BaseException:
         GameWorld.DebugAnswer(curPlayer, "执行GM命令错误, 请查看所在地图日志!")
         errorMsg = str(traceback.format_exc())
@@ -224,30 +224,6 @@
     if curPlayer_GMLV == 90:
         #内部测试人员,不限制
         return True
-    
-    GMLVPowerDict = ReadChConfig.GetEvalChConfig("GMLVPower")
-    if curPlayer_GMLV in GMLVPowerDict:
-        powerList = GMLVPowerDict[curPlayer_GMLV]
-        if not powerList or callFunName in powerList:
-            return True
-    
-    #验证权限
-    if callFunName in ChConfig.Def_GMPower_Disc:
-        gmPowerList = ChConfig.Def_GMPower_Disc[callFunName]
-        
-        if curPlayer_GMLV not in gmPowerList:
-            #GM等级异常
-            GameWorld.Log("###使用GM命令 = %s,GM等级 = %s异常"%(callFunName , curPlayer_GMLV) , curPlayer.GetPlayerID())
-            return
-        
-        if not gmPowerList[curPlayer_GMLV]:
-            GameWorld.Log("###使用GM命令 = %s,权限 = %s不足"%(callFunName , curPlayer_GMLV) , curPlayer.GetPlayerID())
-            return
-        
-    #内部测试用GM命令
-    else:
-        GameWorld.Log("###非内部人员, 使用调试GM命令 = %s,权限 = %s不足"%(callFunName , curPlayer_GMLV) , curPlayer.GetPlayerID())
-        return
     
     return True
             

--
Gitblit v1.8.0