From dc0b92c1e2fe9f3d24c183b325dad54d088735c1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 10 七月 2025 17:01:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py
index 0acb2a0..15dea17 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.py
@@ -30,7 +30,6 @@
 import FormulaControl
 import ConfigParser
 import ShareDefine
-import MapConfig
 #---------------------------------------------------------------------
 #全局变量
 #---------------------------------------------------------------------
@@ -114,8 +113,6 @@
     FormulaControl.ClearCompileFormulaDist()
     PyMongoDataServerConfig = None
     DBAllChConfig = {}
-    
-    MapConfig.ClearConfig()
     
     GameWorld.Log('MapServer_Reload_ChConfig')
     #关闭字典
@@ -220,7 +217,7 @@
     global PyMongoDataServerConfig
     
     if not PyMongoDataServerConfig:
-        dbAPPath = ChConfig.GetDBPath() + "\\PyMongoDataServer.ini"
+        dbAPPath = ChConfig.GetServerConfigPath() + "\\PyMongoDataServer.ini"
         
         if not os.path.isfile(dbAPPath):
             GameWorld.Log('无法找到文件 = %s'%(dbAPPath))
@@ -261,7 +258,7 @@
     if key not in Def_DBCfgFilePath:
         GameWorld.Log('DB配置中未发现Key文件 = %s' % (key))
         return
-    filePath = ChConfig.GetDBPath() + Def_DBCfgFilePath[key]
+    filePath = ChConfig.GetServerConfigPath() + Def_DBCfgFilePath[key]
     
     retData = __ReadConfigDataEx(key, filePath, needEval)
     if not retData:

--
Gitblit v1.8.0