From 8a445fc0209a334d0d5e263d6986328d965c668f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 30 五月 2025 12:22:14 +0800
Subject: [PATCH] 16 卡牌服务端(GM调试属性修改;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py           |    3 +--
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py            |    2 ++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |    8 ++++----
 3 files changed, 7 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 cb412c8..c3ca851 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:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 8ff4d3e..26b114e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -1356,6 +1356,8 @@
 def GetPlatform():
     return ReadChConfig.GetPyMongoConfig("platform", "PlatformName")
 
+def IsTestPlatform(platform): return platform in ["test", "yun"]
+
 #===============================================================================
 # ##获得当前服务器ID
 # # @param 无
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index 997db21..bcc26a4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -101,7 +101,6 @@
 import PlayerFace
 import PlayerMail
 import ChPlayer
-import GMShell
 import GameObj
 
 import random
@@ -4707,12 +4706,13 @@
     def __DoRefreshGMAttr(self):
         ## 刷新GM测试属性
         curPlayer = self.__Player
-        platform = GameWorld.GetPlatform()
-        if platform not in GMShell.TestPlatformList:
-            return
         if curPlayer.GetGMLevel() != ChConfig.Def_GM_LV_God:
             return
         
+        platform = GameWorld.GetPlatform()
+        if not GameWorld.IsTestPlatform(platform):
+            return
+        
         ipyDataMgr = IpyGameDataPY.IPY_Data()
         if not ipyDataMgr.GetGMAttrCount():
             return

--
Gitblit v1.8.0