Skip to content

Commit c121037

Browse files
committed
added:lua configure supported
1 parent 1125e65 commit c121037

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ typedef struct
5050
struct
5151
{
5252
BOOL bEnable; //是否启用
53-
TCHAR tszPluginFile[MAX_PATH]; //配置文件地址
53+
TCHAR tszPluginLib[MAX_PATH]; //配置文件地址
54+
TCHAR tszPluginLua[MAX_PATH]; //配置文件地址
5455
}st_XPlugin;
5556
struct
5657
{

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,16 @@ BOOL CModuleConfigure_Json::ModuleConfigure_Json_File(LPCTSTR lpszConfigFile, XE
134134
_tcscpy(pSt_ServerConfig->st_XApi.tszBankUrl, st_JsonXApi["tszBankUrl"].asCString());
135135
_tcscpy(pSt_ServerConfig->st_XApi.tszTranslationUrl, st_JsonXApi["tszTranslationUrl"].asCString());
136136

137-
if (st_JsonRoot["XPlugin"].empty() || (2 != st_JsonRoot["XPlugin"].size()))
137+
if (st_JsonRoot["XPlugin"].empty() || (3 != st_JsonRoot["XPlugin"].size()))
138138
{
139139
Config_IsErrorOccur = TRUE;
140140
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XPLUGIN;
141141
return FALSE;
142142
}
143143
Json::Value st_JsonXPlugin = st_JsonRoot["XPlugin"];
144144
pSt_ServerConfig->st_XPlugin.bEnable = st_JsonXPlugin["bEnable"].asBool();
145-
_tcscpy(pSt_ServerConfig->st_XPlugin.tszPluginFile, st_JsonXPlugin["tszPluginFile"].asCString());
145+
_tcscpy(pSt_ServerConfig->st_XPlugin.tszPluginLib, st_JsonXPlugin["tszPluginLib"].asCString());
146+
_tcscpy(pSt_ServerConfig->st_XPlugin.tszPluginLua, st_JsonXPlugin["tszPluginLua"].asCString());
146147

147148
if (st_JsonRoot["XVer"].empty())
148149
{
@@ -315,13 +316,18 @@ BOOL CModuleConfigure_Json::ModuleConfigure_Json_PluginFile(LPCTSTR lpszConfigFi
315316

316317
st_PluginInfo.bEnable = st_JsonArray[i]["PluginEnable"].asBool();
317318
_tcscpy(st_PluginInfo.tszPluginFile, st_JsonArray[i]["PluginFile"].asCString());
319+
320+
if (NULL == _tcsstr(st_PluginInfo.tszPluginFile,_T(".")))
321+
{
318322
#ifdef _MSC_BUILD
319-
_tcscat(st_PluginInfo.tszPluginFile, ".dll");
323+
_tcscat(st_PluginInfo.tszPluginFile, ".dll");
320324
#elif __linux__
321-
_tcscat(st_PluginInfo.tszPluginFile, ".so");
325+
_tcscat(st_PluginInfo.tszPluginFile, ".so");
322326
#else
323-
_tcscat(st_PluginInfo.tszPluginFile, ".dylib");
327+
_tcscat(st_PluginInfo.tszPluginFile, ".dylib");
324328
#endif
329+
}
330+
325331
_tcscpy(st_PluginInfo.tszPluginMethod, st_JsonArray[i]["PluginMethod"].asCString());
326332
pSt_PluginConfig->pStl_ListPlugin->push_back(st_PluginInfo);
327333
}

0 commit comments

Comments
 (0)