diff --git a/.gitignore b/.gitignore index e2ba6d3b2e..be789c2f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ *.exe *.out *.app +*.dll # Visaul Studio *.iobj @@ -28,6 +29,8 @@ *.log *.ilk *.user +*.exp +*.vc.db # Codeblocks *.layout diff --git a/Dependencies/CMakeLists.txt b/Dependencies/CMakeLists.txt index a3ce48a5c6..ca6a90a8b4 100644 --- a/Dependencies/CMakeLists.txt +++ b/Dependencies/CMakeLists.txt @@ -1 +1,3 @@ +add_subdirectory(Theron) add_subdirectory(protobuf) +add_subdirectory(redis-cplusplus-client/msvc/anet_win32) \ No newline at end of file diff --git a/Dependencies/Theron/CMakeLists.txt b/Dependencies/Theron/CMakeLists.txt new file mode 100644 index 0000000000..025a10653a --- /dev/null +++ b/Dependencies/Theron/CMakeLists.txt @@ -0,0 +1,16 @@ +IF( WIN32 ) + message("win32_theron") + include_directories(Include) + file(GLOB TEMP_SRC Theron/*.cpp) + add_library(Theron ${TEMP_SRC}) + set_target_properties( Theron PROPERTIES OUTPUT_NAME_DEBUG "Theron_d") + set_target_properties( Theron PROPERTIES PREFIX "") + set_target_properties( Theron PROPERTIES + FOLDER "NFDeps" + ARCHIVE_OUTPUT_DIRECTORY ${NFOutPutDir} + RUNTIME_OUTPUT_DIRECTORY ${NFOutPutDir} + LIBRARY_OUTPUT_DIRECTORY ${NFOutPutDir} ) + add_definitions(-DTHERON_USE_STD_THREADS -D_X64) +ELSE() + message("not win32") +ENDIF() \ No newline at end of file diff --git a/Dependencies/build_dep.sh b/Dependencies/build_dep.sh index 99200dd1e6..24356ee360 100755 --- a/Dependencies/build_dep.sh +++ b/Dependencies/build_dep.sh @@ -47,6 +47,19 @@ cp -r -f ./src/.libs/*.so.* ../../_Out/Server/Release/ #cp -r -f ./src/.libs/*.so.* ../lib/ cd ../ +# compiling Theron +cd Theron +chmod -R 755 * +make library mode=debug boost=off c++11=on posix=on shared=on +cp -r -f ./Lib/libtherond.a ../lib/Debug/ +cp -r -f ./Lib/libtherond.a ../lib/ +make clean +make library mode=release boost=off c++11=on posix=on shared=on +cp -r -f ./Lib/libtheron.a ../lib/Release/ +cp -r -f ./Lib/libtheron.a ../lib/ +make clean +cd ../ + # TODO: other libs diff --git a/Dependencies/common/optional.hpp b/Dependencies/common/optional.hpp index 850fb846c0..b983522bc1 100644 --- a/Dependencies/common/optional.hpp +++ b/Dependencies/common/optional.hpp @@ -74,7 +74,8 @@ class optional return *((T*)(&m_data)); } - throw std::exception(""); + std::logic_error ex("Dependencies/common/optional.hpp::line 72 not init"); + throw std::exception(ex); } bool operator == (const optional& rhs) const diff --git a/Dependencies/redis-cplusplus-client/msvc/anet_win32/CMakeLists.txt b/Dependencies/redis-cplusplus-client/msvc/anet_win32/CMakeLists.txt new file mode 100644 index 0000000000..dc4805f658 --- /dev/null +++ b/Dependencies/redis-cplusplus-client/msvc/anet_win32/CMakeLists.txt @@ -0,0 +1,16 @@ +IF( WIN32 ) + message("win32_anet_win64") + aux_source_directory(. DIR_SRCS) + + add_library(anet_win64 anet_win32.c) + set_target_properties( anet_win64 PROPERTIES OUTPUT_NAME_DEBUG "anet_win64_d") + set_target_properties( anet_win64 PROPERTIES PREFIX "") + set_target_properties( anet_win64 PROPERTIES + FOLDER "NFDeps" + ARCHIVE_OUTPUT_DIRECTORY ${NFOutPutDir} + RUNTIME_OUTPUT_DIRECTORY ${NFOutPutDir} + LIBRARY_OUTPUT_DIRECTORY ${NFOutPutDir} ) +ELSE() + message("not win32") +ENDIF() + diff --git a/NF.workspace b/NF.workspace index 09c319d388..33dc5a3bc9 100644 --- a/NF.workspace +++ b/NF.workspace @@ -15,7 +15,6 @@ - diff --git a/NFComm/CMakeLists.txt b/NFComm/CMakeLists.txt index 97e6209fde..995537f961 100644 --- a/NFComm/CMakeLists.txt +++ b/NFComm/CMakeLists.txt @@ -1,14 +1,9 @@ - -add_subdirectory(NFCore) - +add_subdirectory(NFActorPlugin) add_subdirectory(NFConfigPlugin) - -add_subdirectory(NFPluginLoader) - +add_subdirectory(NFCore) add_subdirectory(NFKernelPlugin) - add_subdirectory(NFLogPlugin) - add_subdirectory(NFMessageDefine) - -add_subdirectory(NFNet) \ No newline at end of file +add_subdirectory(NFNet) +add_subdirectory(NFNoSqlPlugin) +add_subdirectory(NFPluginLoader) \ No newline at end of file diff --git a/NFComm/NFActorPlugin/CMakeLists.txt b/NFComm/NFActorPlugin/CMakeLists.txt new file mode 100644 index 0000000000..a2e12a0e3e --- /dev/null +++ b/NFComm/NFActorPlugin/CMakeLists.txt @@ -0,0 +1,41 @@ +set(ProjectName "NFActorPlugin") +file(GLOB NFActorPlugin_ROOT_Cpp *.cpp) +file(GLOB NFActorPlugin_ROOT_CC *.cc) +file(GLOB NFActorPlugin_ROOT_Hpp *.h) + +add_library(NFActorPlugin SHARED + ${NFActorPlugin_ROOT_Cpp} + ${NFActorPlugin_ROOT_CC} + ${NFActorPlugin_ROOT_Hpp}) + +if(UNIX) + if (CMAKE_BUILD_TYPE MATCHES "Release") + target_link_libraries(NFActorPlugin libtheron.a) + else() + target_link_libraries(NFActorPlugin libtherond.a) + endif() + add_definitions( + -D_USRDLL + -D_LIB + -DPROTOBUF_USE_DLLS + -DNFDATABASEPLUGIN_EXPORTS + -DWIN32_LEAN_AND_MEAN + ) +else() + add_dependencies(NFActorPlugin libprotobuf NFMessageDefine) + target_link_libraries(NFActorPlugin anet_win64 libprotobuf Theron NFMessageDefine) + add_definitions( + -D_USRDLL + -D_LIB + -DPROTOBUF_USE_DLLS + -DNFDATABASEPLUGIN_EXPORTS + -DWIN32_LEAN_AND_MEAN + ) +endif() +set_target_properties( NFActorPlugin PROPERTIES OUTPUT_NAME_DEBUG "NFActorPlugin_d") +set_target_properties( NFActorPlugin PROPERTIES PREFIX "") +set_target_properties( NFActorPlugin PROPERTIES + FOLDER "NFSDK" + ARCHIVE_OUTPUT_DIRECTORY ${NFOutPutDir} + RUNTIME_OUTPUT_DIRECTORY ${NFOutPutDir} + LIBRARY_OUTPUT_DIRECTORY ${NFOutPutDir} ) \ No newline at end of file diff --git a/NFComm/NFNet/CMakeLists.txt b/NFComm/NFNet/CMakeLists.txt index ac6ad207a5..da28d5a35c 100644 --- a/NFComm/NFNet/CMakeLists.txt +++ b/NFComm/NFNet/CMakeLists.txt @@ -12,9 +12,9 @@ set_target_properties( NFNet PROPERTIES OUTPUT_NAME_DEBUG "NFNet_d") set_target_properties( NFNet PROPERTIES PREFIX "") set_target_properties( NFNet PROPERTIES FOLDER "NFSDK" - ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/_Out/Comm/ - RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/_Out/Comm/ - LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/_Out/Comm/ ) + ARCHIVE_OUTPUT_DIRECTORY ${NFOutPutDir} + RUNTIME_OUTPUT_DIRECTORY ${NFOutPutDir} + LIBRARY_OUTPUT_DIRECTORY ${NFOutPutDir}) if(UNIX) if (CMAKE_BUILD_TYPE MATCHES "Release") target_link_libraries(NFNet ) diff --git a/NFComm/NFNoSqlPlugin/CMakeLists.txt b/NFComm/NFNoSqlPlugin/CMakeLists.txt new file mode 100644 index 0000000000..59747aadc3 --- /dev/null +++ b/NFComm/NFNoSqlPlugin/CMakeLists.txt @@ -0,0 +1,44 @@ +set(ProjectName "NFNoSqlPlugin") +file(GLOB NFNoSqlPlugin_ROOT_Cpp *.cpp) +file(GLOB NFNoSqlPlugin_ROOT_CC *.cc) +file(GLOB NFNoSqlPlugin_ROOT_Hpp *.h) + +if(UNIX) + add_library(NFNoSqlPlugin SHARED + ${NFNoSqlPlugin_ROOT_Cpp} + ${NFNoSqlPlugin_ROOT_CC} + ${NFNoSqlPlugin_ROOT_Hpp} + ${SolutionDir}/Dependencies/redis-cplusplus-client/anet.c + ${SolutionDir}/Dependencies/redis-cplusplus-client/anet.h) + target_include_directories(NFNoSqlPlugin PUBLIC + ${SolutionDir}/Dependencies/redis-cplusplus-client/) + if (CMAKE_BUILD_TYPE MATCHES "Release") + target_link_libraries(NFNoSqlPlugin libtheron.a) + else() + target_link_libraries(NFNoSqlPlugin libtherond.a) + endif() + add_definitions( + -D_USRDLL + -DTHERON_CPP11 + ) +else() + add_library(NFNoSqlPlugin SHARED + ${NFNoSqlPlugin_ROOT_Cpp} + ${NFNoSqlPlugin_ROOT_CC} + ${NFNoSqlPlugin_ROOT_Hpp}) + target_include_directories(NFNoSqlPlugin PUBLIC + ${SolutionDir}/Dependencies/redis-cplusplus-client/msvc/anet_win32/) + add_dependencies(NFNoSqlPlugin libprotobuf NFMessageDefine) + target_link_libraries(NFNoSqlPlugin anet_win64 libprotobuf Theron NFMessageDefine) + add_definitions( + -D_USRDLL + -DTHERON_CPP11 + ) +endif() +set_target_properties( NFNoSqlPlugin PROPERTIES OUTPUT_NAME_DEBUG "NFNoSqlPlugin_d") +set_target_properties( NFNoSqlPlugin PROPERTIES PREFIX "") +set_target_properties( NFNoSqlPlugin PROPERTIES + FOLDER "NFSDK" + ARCHIVE_OUTPUT_DIRECTORY ${NFOutPutDir} + RUNTIME_OUTPUT_DIRECTORY ${NFOutPutDir} + LIBRARY_OUTPUT_DIRECTORY ${NFOutPutDir} ) \ No newline at end of file diff --git a/NFComm/NFPluginLoader/NFPluginLoader.cpp b/NFComm/NFPluginLoader/NFPluginLoader.cpp index a26ed8b5d9..0c9d445c47 100644 --- a/NFComm/NFPluginLoader/NFPluginLoader.cpp +++ b/NFComm/NFPluginLoader/NFPluginLoader.cpp @@ -33,29 +33,27 @@ std::string strArgvList; std::string strPluginName; std::string strAppName; std::string strAppID; +std::string strTitleName; #if NF_PLATFORM == NF_PLATFORM_WIN #pragma comment( lib, "DbgHelp" ) -// ����Dump�ļ� + void CreateDumpFile(const std::string& strDumpFilePathName, EXCEPTION_POINTERS* pException) { - // ����Dump�ļ� + //Dump HANDLE hDumpFile = CreateFile(strDumpFilePathName.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - // Dump��Ϣ MINIDUMP_EXCEPTION_INFORMATION dumpInfo; dumpInfo.ExceptionPointers = pException; dumpInfo.ThreadId = GetCurrentThreadId(); dumpInfo.ClientPointers = TRUE; - // д��Dump�ļ����� MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), hDumpFile, MiniDumpNormal, &dumpInfo, NULL, NULL); CloseHandle(hDumpFile); } -// ����Unhandled Exception�Ļص����� long ApplicationCrashHandler(EXCEPTION_POINTERS* pException) { time_t t = time(0); @@ -220,6 +218,15 @@ void ProcessParameter(int argc, char* argv[]) } } + strTitleName = strAppName + strAppID;// +" PID" + NFGetPID(); + strTitleName.replace(strTitleName.find("Server"), 6, ""); + strTitleName = "NF" + strTitleName; +#if NF_PLATFORM == NF_PLATFORM_WIN + SetConsoleTitle(strTitleName.c_str()); +#else + prctl(PR_SET_NAME, strTitleName.c_str()); + //setproctitle(strTitleName.c_str()); +#endif } int main(int argc, char* argv[]) diff --git a/NFComm/NFPluginModule/NFPlatform.h b/NFComm/NFPluginModule/NFPlatform.h index 5f28ac2c9a..33044ba4e2 100644 --- a/NFComm/NFPluginModule/NFPlatform.h +++ b/NFComm/NFPluginModule/NFPlatform.h @@ -272,16 +272,23 @@ typedef int64_t NFINT64; //#define GOOGLE_GLOG_DLL_DECL= /////////////////////////////////////////////////////////////// +#include +#include +#include #include #include +#include +#include #ifndef _MSC_VER #include #include +#include #define EPOCHFILETIME 11644473600000000ULL #else #include #include +#include #define EPOCHFILETIME 11644473600000000Ui64 #endif @@ -290,10 +297,12 @@ typedef int64_t NFINT64; #define NFSPRINTF sprintf_s #define NFSTRICMP stricmp #define NFSLEEP(s) Sleep(s) +#define NFGetPID() lexical_cast(getpid()) #else #define NFSPRINTF snprintf #define NFSTRICMP strcasecmp #define NFSLEEP(s) usleep(s) +#define NFGetPID() lexical_cast(getpid()) #endif #ifndef NF_DYNAMIC_PLUGIN @@ -326,10 +335,7 @@ typedef int64_t NFINT64; #define NF_SHARE_PTR std::shared_ptr #define NF_NEW new -#include -#include -#include -#include + template bool NF_StrTo(const std::string& strValue, DTYPE& nValue) { diff --git a/NFServer/CMakeLists.txt b/NFServer/CMakeLists.txt index ef7c284a3b..49864e1dff 100644 --- a/NFServer/CMakeLists.txt +++ b/NFServer/CMakeLists.txt @@ -1,3 +1,5 @@ +add_subdirectory(NFDataAgent_NosqlPlugin) +add_subdirectory(NFGameLogicPlugin) add_subdirectory(NFGameServerNet_ClientPlugin) add_subdirectory(NFGameServerNet_ServerPlugin) add_subdirectory(NFGameServerPlugin) @@ -11,17 +13,4 @@ add_subdirectory(NFProxyServerNet_ServerPlugin) add_subdirectory(NFProxyLogicPlugin) add_subdirectory(NFWorldLogicPlugin) add_subdirectory(NFWorldNet_ClientPlugin) -add_subdirectory(NFWorldNet_ServerPlugin) - - - - - - - - - - - - - +add_subdirectory(NFWorldNet_ServerPlugin) \ No newline at end of file diff --git a/NFServer/NFDataAgent_NosqlPlugin/CMakeLists.txt b/NFServer/NFDataAgent_NosqlPlugin/CMakeLists.txt new file mode 100644 index 0000000000..a8e42c41a2 --- /dev/null +++ b/NFServer/NFDataAgent_NosqlPlugin/CMakeLists.txt @@ -0,0 +1,32 @@ +set(ProjectName "NFDataAgent_NosqlPlugin") +file(GLOB NFDataAgent_NosqlPlugin_ROOT_Cpp + *.cpp) + +file(GLOB NFDataAgent_NosqlPlugin_ROOT_Hpp + *.h) + +add_library(NFDataAgent_NosqlPlugin SHARED + ${NFDataAgent_NosqlPlugin_ROOT_Cpp} + ${NFDataAgent_NosqlPlugin_ROOT_Hpp}) + +set_target_properties( NFDataAgent_NosqlPlugin PROPERTIES OUTPUT_NAME_DEBUG "NFDataAgent_NosqlPlugin_d") +set_target_properties( NFDataAgent_NosqlPlugin PROPERTIES PREFIX "") +set_target_properties( NFDataAgent_NosqlPlugin PROPERTIES + FOLDER "NFServer/GameServer" + ARCHIVE_OUTPUT_DIRECTORY ${NFOutPutDir} + RUNTIME_OUTPUT_DIRECTORY ${NFOutPutDir} + LIBRARY_OUTPUT_DIRECTORY ${NFOutPutDir} ) +link_NFSDK("NFDataAgent_NosqlPlugin") + +if(UNIX) + add_definitions( + -D_USRDLL + -DELPP_NO_DEFAULT_LOG_FILE + ) +else() + add_definitions( + -DWIN + -D_USRDLL + -DELPP_NO_DEFAULT_LOG_FILE + ) +endif() \ No newline at end of file diff --git a/NFServer/NFGameLogicPlugin/CMakeLists.txt b/NFServer/NFGameLogicPlugin/CMakeLists.txt new file mode 100644 index 0000000000..4e3de3d22c --- /dev/null +++ b/NFServer/NFGameLogicPlugin/CMakeLists.txt @@ -0,0 +1,54 @@ +set(ProjectName "NFGameLogicPlugin") +file(GLOB NFGameLogicPlugin_ROOT_Cpp + *.cpp) + +file(GLOB NFGameLogicPlugin_ROOT_Hpp + *.h) + +remove_file(NFGameLogicPlugin_ROOT_Cpp "NFCRebornItemConsumeProcessModule.cpp") +remove_file(NFGameLogicPlugin_ROOT_Hpp "NFCRebornItemConsumeProcessModule.h") + +remove_file(NFGameLogicPlugin_ROOT_Cpp "NFCNormalConsumeProcessModule.cpp") +remove_file(NFGameLogicPlugin_ROOT_Hpp "NFCNormalConsumeProcessModule.h") + +remove_file(NFGameLogicPlugin_ROOT_Cpp "NFCBriefSkillConsumeProcessModule.cpp") +remove_file(NFGameLogicPlugin_ROOT_Hpp "NFCBriefSkillConsumeProcessModule.h") + +remove_file(NFGameLogicPlugin_ROOT_Cpp "NFCBulletSkillConsumeProcessModule.cpp") +remove_file(NFGameLogicPlugin_ROOT_Hpp "NFCBulletSkillConsumeProcessModule.h") + +remove_file(NFGameLogicPlugin_ROOT_Cpp "NFCHeroItemConsumeProcessModule.cpp") +remove_file(NFGameLogicPlugin_ROOT_Hpp "NFCHeroItemConsumeProcessModule.h") + +remove_file(NFGameLogicPlugin_ROOT_Cpp "NFCPotionItemConsumeProcessModule.cpp") +remove_file(NFGameLogicPlugin_ROOT_Hpp "NFCPotionItemConsumeProcessModule.h") + +remove_file(NFGameLogicPlugin_ROOT_Cpp "NFCItemConsumeManagerModule.cpp") +remove_file(NFGameLogicPlugin_ROOT_Hpp "NFCItemConsumeManagerModule.h") + + +add_library(NFGameLogicPlugin SHARED + ${NFGameLogicPlugin_ROOT_Cpp} + ${NFGameLogicPlugin_ROOT_Hpp}) + +set_target_properties( NFGameLogicPlugin PROPERTIES OUTPUT_NAME_DEBUG "NFGameLogicPlugin_d") +set_target_properties( NFGameLogicPlugin PROPERTIES PREFIX "") +set_target_properties( NFGameLogicPlugin PROPERTIES + FOLDER "NFServer/GameServer" + ARCHIVE_OUTPUT_DIRECTORY ${NFOutPutDir} + RUNTIME_OUTPUT_DIRECTORY ${NFOutPutDir} + LIBRARY_OUTPUT_DIRECTORY ${NFOutPutDir} ) +link_NFSDK("NFGameLogicPlugin") + +if(UNIX) + add_definitions( + -D_USRDLL + -DELPP_NO_DEFAULT_LOG_FILE + ) +else() + add_definitions( + -DWIN + -D_USRDLL + -DELPP_NO_DEFAULT_LOG_FILE + ) +endif() \ No newline at end of file diff --git a/NFServer/NFGameServerPlugin/NFGameServerPlugin.cpp b/NFServer/NFGameServerPlugin/NFGameServerPlugin.cpp index 3ff627151f..ce3cf8df8f 100644 --- a/NFServer/NFGameServerPlugin/NFGameServerPlugin.cpp +++ b/NFServer/NFGameServerPlugin/NFGameServerPlugin.cpp @@ -18,11 +18,7 @@ NF_EXPORT void DllStartPlugin(NFIPluginManager* pm) { -#if NF_PLATFORM == NF_PLATFORM_WIN - SetConsoleTitle("NFGameServer"); -#endif // NF_PLATFORM CREATE_PLUGIN(pm, NFGameServerPlugin) - }; NF_EXPORT void DllStopPlugin(NFIPluginManager* pm) diff --git a/NFServer/NFLoginLogicPlugin/NFLoginLogicPlugin.cpp b/NFServer/NFLoginLogicPlugin/NFLoginLogicPlugin.cpp index 2c627d4a4f..4c9e032ac0 100644 --- a/NFServer/NFLoginLogicPlugin/NFLoginLogicPlugin.cpp +++ b/NFServer/NFLoginLogicPlugin/NFLoginLogicPlugin.cpp @@ -15,11 +15,7 @@ NF_EXPORT void DllStartPlugin(NFIPluginManager* pm) { -#if NF_PLATFORM == NF_PLATFORM_WIN - SetConsoleTitle("NFLoginServer"); -#endif CREATE_PLUGIN(pm, NFLoginLogicPlugin) - }; NF_EXPORT void DllStopPlugin(NFIPluginManager* pm) diff --git a/NFServer/NFMasterServerPlugin/NFMasterServerPlugin.cpp b/NFServer/NFMasterServerPlugin/NFMasterServerPlugin.cpp index afa05b5981..0355543f63 100644 --- a/NFServer/NFMasterServerPlugin/NFMasterServerPlugin.cpp +++ b/NFServer/NFMasterServerPlugin/NFMasterServerPlugin.cpp @@ -16,13 +16,7 @@ NF_EXPORT void DllStartPlugin(NFIPluginManager* pm) { -#if NF_PLATFORM == NF_PLATFORM_WIN - SetConsoleTitle("NFMasterServer"); -#endif - CREATE_PLUGIN(pm, NFMasterServerPlugin) - - //std::cout << "DllStartPlugin::thread id=" << GetCurrentThreadId() << std::endl; }; NF_EXPORT void DllStopPlugin(NFIPluginManager* pm) diff --git a/NFServer/NFProxyLogicPlugin/NFCProxyLogicPlugin.cpp b/NFServer/NFProxyLogicPlugin/NFCProxyLogicPlugin.cpp index de00e254b7..99e12a8380 100644 --- a/NFServer/NFProxyLogicPlugin/NFCProxyLogicPlugin.cpp +++ b/NFServer/NFProxyLogicPlugin/NFCProxyLogicPlugin.cpp @@ -10,17 +10,11 @@ #include "NFCProxyLogicPlugin.h" #include "NFCProxyLogicModule.h" -// -// #ifdef NF_DYNAMIC_PLUGIN NF_EXPORT void DllStartPlugin(NFIPluginManager* pm) { -#if NF_PLATFORM == NF_PLATFORM_WIN - SetConsoleTitle("NFProxyServer"); -#endif CREATE_PLUGIN(pm, NFProxyLogicPlugin) - }; NF_EXPORT void DllStopPlugin(NFIPluginManager* pm) diff --git a/NFServer/NFWorldLogicPlugin/NFCWSSwichServerModule.h b/NFServer/NFWorldLogicPlugin/NFCWSSwichServerModule.h index ed47151f12..2766cd3411 100644 --- a/NFServer/NFWorldLogicPlugin/NFCWSSwichServerModule.h +++ b/NFServer/NFWorldLogicPlugin/NFCWSSwichServerModule.h @@ -16,7 +16,6 @@ #include "NFComm/NFPluginModule/NFISceneProcessModule.h" #include "NFComm/NFPluginModule/NFIPropertyModule.h" #include "NFComm/NFPluginModule/NFILogModule.h" -#include "NFComm/NFPluginModule/NFIUUIDModule.h" #include "NFComm/NFPluginModule/NFIPluginManager.h" #include "NFComm/NFMessageDefine/NFProtocolDefine.hpp" #include "NFComm/NFPluginModule/NFILevelModule.h" diff --git a/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.cpp b/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.cpp index 3c42319aa0..d5a5e2c9de 100644 --- a/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.cpp +++ b/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.cpp @@ -17,9 +17,6 @@ NF_EXPORT void DllStartPlugin(NFIPluginManager* pm) { -#if NF_PLATFORM == NF_PLATFORM_WIN - SetConsoleTitle("NFWorldServer"); -#endif // NF_PLATFORM CREATE_PLUGIN(pm, NFWorldLogicPlugin) }; diff --git a/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.vcxproj b/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.vcxproj index a03ada2bd3..6d15eb9fe5 100644 --- a/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.vcxproj +++ b/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.vcxproj @@ -96,6 +96,7 @@ + @@ -110,6 +111,7 @@ + diff --git a/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.vcxproj.filters b/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.vcxproj.filters index f7f19c5a92..2a1b938a79 100644 --- a/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.vcxproj.filters +++ b/NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.vcxproj.filters @@ -9,6 +9,7 @@ PVPMatchModule + @@ -20,6 +21,7 @@ PVPMatchModule + diff --git a/NFServer/NFWorldNet_ClientPlugin/NFCWorldToMasterModule.cpp b/NFServer/NFWorldNet_ClientPlugin/NFCWorldToMasterModule.cpp index a6d6d570d9..c4edd04ccf 100644 --- a/NFServer/NFWorldNet_ClientPlugin/NFCWorldToMasterModule.cpp +++ b/NFServer/NFWorldNet_ClientPlugin/NFCWorldToMasterModule.cpp @@ -28,7 +28,6 @@ bool NFCWorldToMasterModule::Shut() bool NFCWorldToMasterModule::AfterInit() { - m_pWorldLogicModule = pPluginManager->FindModule(); m_pClassModule = pPluginManager->FindModule(); m_pElementModule = pPluginManager->FindModule(); m_pLogModule = pPluginManager->FindModule(); diff --git a/NFServer/NFWorldNet_ClientPlugin/NFCWorldToMasterModule.h b/NFServer/NFWorldNet_ClientPlugin/NFCWorldToMasterModule.h index 4033e3e441..baf7c8c1b6 100644 --- a/NFServer/NFWorldNet_ClientPlugin/NFCWorldToMasterModule.h +++ b/NFServer/NFWorldNet_ClientPlugin/NFCWorldToMasterModule.h @@ -60,7 +60,6 @@ class NFCWorldToMasterModule NFILogModule* m_pLogModule; NFIElementModule* m_pElementModule; NFIClassModule* m_pClassModule; - NFIWorldLogicModule* m_pWorldLogicModule; NFIWorldNet_ServerModule* m_pWorldNet_ServerModule; NFINetClientModule* m_pNetClientModule; }; diff --git a/NFServer/NFWorldNet_ServerPlugin/NFCWorldNet_ServerModule.cpp b/NFServer/NFWorldNet_ServerPlugin/NFCWorldNet_ServerModule.cpp index 4918437e56..2c4bcac383 100644 --- a/NFServer/NFWorldNet_ServerPlugin/NFCWorldNet_ServerModule.cpp +++ b/NFServer/NFWorldNet_ServerPlugin/NFCWorldNet_ServerModule.cpp @@ -19,7 +19,6 @@ bool NFCWorldNet_ServerModule::Init() bool NFCWorldNet_ServerModule::AfterInit() { m_pKernelModule = pPluginManager->FindModule(); - m_pWorldLogicModule = pPluginManager->FindModule(); m_pLogModule = pPluginManager->FindModule(); m_pElementModule = pPluginManager->FindModule(); m_pClassModule = pPluginManager->FindModule(); diff --git a/NFServer/NFWorldNet_ServerPlugin/NFCWorldNet_ServerModule.h b/NFServer/NFWorldNet_ServerPlugin/NFCWorldNet_ServerModule.h index 4725aeedb2..e808f2c2b0 100644 --- a/NFServer/NFWorldNet_ServerPlugin/NFCWorldNet_ServerModule.h +++ b/NFServer/NFWorldNet_ServerPlugin/NFCWorldNet_ServerModule.h @@ -102,7 +102,6 @@ class NFCWorldNet_ServerModule NFIElementModule* m_pElementModule; NFIClassModule* m_pClassModule; - NFIWorldLogicModule* m_pWorldLogicModule; NFIKernelModule* m_pKernelModule; NFILogModule* m_pLogModule; NFINetModule* m_pNetModule; diff --git a/NoahFrame.sln b/NoahFrame.sln index b54d0413b5..6a77fb6b63 100644 --- a/NoahFrame.sln +++ b/NoahFrame.sln @@ -12,14 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NFPluginLoader", "NFComm\NF {B9833FE8-8C0B-40D6-BA01-3CDADEB21166} = {B9833FE8-8C0B-40D6-BA01-3CDADEB21166} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NFWorldLogicPlugin", "NFServer\NFWorldLogicPlugin\NFWorldLogicPlugin.vcxproj", "{45ABC2B9-730E-450F-BBE7-B9894BCDB0C6}" - ProjectSection(ProjectDependencies) = postProject - {3D9DB426-BA46-450B-BBAC-DABB6B6D69DE} = {3D9DB426-BA46-450B-BBAC-DABB6B6D69DE} - {3E283F37-A4ED-41B7-A3E6-A2D89D131A30} = {3E283F37-A4ED-41B7-A3E6-A2D89D131A30} - {403EB74F-6AF5-4250-8DA5-9D3CBFB7E545} = {403EB74F-6AF5-4250-8DA5-9D3CBFB7E545} - {B9833FE8-8C0B-40D6-BA01-3CDADEB21166} = {B9833FE8-8C0B-40D6-BA01-3CDADEB21166} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NFLoginLogicPlugin", "NFServer\NFLoginLogicPlugin\NFLoginLogicPlugin.vcxproj", "{DF5C4125-681C-42D3-8763-ECD78385888C}" ProjectSection(ProjectDependencies) = postProject {3D9DB426-BA46-450B-BBAC-DABB6B6D69DE} = {3D9DB426-BA46-450B-BBAC-DABB6B6D69DE} @@ -196,10 +188,6 @@ Global {B65A0FB2-E49B-4FE9-93F7-EAE6B8E51944}.Debug|x64.Build.0 = Debug|x64 {B65A0FB2-E49B-4FE9-93F7-EAE6B8E51944}.Release|x64.ActiveCfg = Release|x64 {B65A0FB2-E49B-4FE9-93F7-EAE6B8E51944}.Release|x64.Build.0 = Release|x64 - {45ABC2B9-730E-450F-BBE7-B9894BCDB0C6}.Debug|x64.ActiveCfg = Debug|x64 - {45ABC2B9-730E-450F-BBE7-B9894BCDB0C6}.Debug|x64.Build.0 = Debug|x64 - {45ABC2B9-730E-450F-BBE7-B9894BCDB0C6}.Release|x64.ActiveCfg = Release|x64 - {45ABC2B9-730E-450F-BBE7-B9894BCDB0C6}.Release|x64.Build.0 = Release|x64 {DF5C4125-681C-42D3-8763-ECD78385888C}.Debug|x64.ActiveCfg = Debug|x64 {DF5C4125-681C-42D3-8763-ECD78385888C}.Debug|x64.Build.0 = Debug|x64 {DF5C4125-681C-42D3-8763-ECD78385888C}.Release|x64.ActiveCfg = Release|x64 @@ -302,7 +290,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {B65A0FB2-E49B-4FE9-93F7-EAE6B8E51944} = {410C8A08-63DC-45B2-ADB9-08CD991861F0} - {45ABC2B9-730E-450F-BBE7-B9894BCDB0C6} = {7CE50BDF-4625-4704-8720-BE2205CE1769} {DF5C4125-681C-42D3-8763-ECD78385888C} = {9F68A20B-2B35-4C33-9C36-872C1CA2D5BE} {8F2AA50E-1F15-41E8-9EB9-07C7D0BB757C} = {410C8A08-63DC-45B2-ADB9-08CD991861F0} {7CE50BDF-4625-4704-8720-BE2205CE1769} = {2EDDAD6B-1B81-4FE1-B2CA-1A166883EC11} diff --git a/Tutorial/Tutorial3/Tutorial3Plugin.cpp b/Tutorial/Tutorial3/Tutorial3Plugin.cpp index 1924eb7884..d1b8beccea 100644 --- a/Tutorial/Tutorial3/Tutorial3Plugin.cpp +++ b/Tutorial/Tutorial3/Tutorial3Plugin.cpp @@ -5,11 +5,7 @@ NF_EXPORT void DllStartPlugin(NFIPluginManager* pm) { -#if NF_PLATFORM == NF_PLATFORM_WIN - SetConsoleTitle("Tutorial3"); -#endif CREATE_PLUGIN(pm, Tutorial3Plugin) - }; NF_EXPORT void DllStopPlugin(NFIPluginManager* pm) diff --git a/_Out/Server/Debug/.gitignore b/_Out/Server/Debug/.gitignore deleted file mode 100644 index 390b4a76d4..0000000000 --- a/_Out/Server/Debug/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.* -!.gitignore -!Plugin.xml -!log.conf -!log_win.conf -!RunAll.bat \ No newline at end of file diff --git a/_Out/Server/Debug/Plugin.xml b/_Out/Server/Debug/Plugin.xml index a5aa23e46c..af89b956b1 100644 --- a/_Out/Server/Debug/Plugin.xml +++ b/_Out/Server/Debug/Plugin.xml @@ -41,7 +41,6 @@ - diff --git a/_Out/Server/Debug/PluginX.xml b/_Out/Server/Debug/PluginX.xml new file mode 100644 index 0000000000..43a5cfe3c1 --- /dev/null +++ b/_Out/Server/Debug/PluginX.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/_Out/Server/Kill.bat b/_Out/Server/Kill.bat index 35bf2a0772..0f9ace6c5a 100644 --- a/_Out/Server/Kill.bat +++ b/_Out/Server/Kill.bat @@ -2,7 +2,7 @@ cd /d %~dp0 @echo off -taskkill /f /im NFPluginLoader* +taskkill /f /im NF* diff --git a/_Out/Server/Release/.gitignore b/_Out/Server/Release/.gitignore deleted file mode 100644 index 390b4a76d4..0000000000 --- a/_Out/Server/Release/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.* -!.gitignore -!Plugin.xml -!log.conf -!log_win.conf -!RunAll.bat \ No newline at end of file diff --git a/_Out/Server/Release/Plugin.xml b/_Out/Server/Release/Plugin.xml index a5aa23e46c..af89b956b1 100644 --- a/_Out/Server/Release/Plugin.xml +++ b/_Out/Server/Release/Plugin.xml @@ -41,7 +41,6 @@ - diff --git a/_Out/Server/Release/PluginX.xml b/_Out/Server/Release/PluginX.xml new file mode 100644 index 0000000000..43a5cfe3c1 --- /dev/null +++ b/_Out/Server/Release/PluginX.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/_Out/Server/Tester/rund_game.sh b/_Out/Server/Tester/rund_game.sh new file mode 100644 index 0000000000..a1ee64f547 --- /dev/null +++ b/_Out/Server/Tester/rund_game.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d Server=GameServer ID=6 + +ps -A|grep NF diff --git a/_Out/Server/Tester/rund_login.sh b/_Out/Server/Tester/rund_login.sh new file mode 100644 index 0000000000..09fe558296 --- /dev/null +++ b/_Out/Server/Tester/rund_login.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d Server=LoginServer ID=4 + +ps -A|grep NF diff --git a/_Out/Server/Tester/rund_master.sh b/_Out/Server/Tester/rund_master.sh new file mode 100644 index 0000000000..5971fd9d5a --- /dev/null +++ b/_Out/Server/Tester/rund_master.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d Server=MasterServer ID=3 + +ps -A|grep NF diff --git a/_Out/Server/Tester/rund_proxy.sh b/_Out/Server/Tester/rund_proxy.sh new file mode 100644 index 0000000000..7d965a3438 --- /dev/null +++ b/_Out/Server/Tester/rund_proxy.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d Server=ProxyServer ID=5 + +ps -A|grep NF diff --git a/_Out/Server/Tester/rund_world.sh b/_Out/Server/Tester/rund_world.sh new file mode 100644 index 0000000000..0b96f1f6d8 --- /dev/null +++ b/_Out/Server/Tester/rund_world.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d Server=WorldServer ID=7 + +ps -A|grep NF diff --git a/_Out/Server/Tester/rundx_game.sh b/_Out/Server/Tester/rundx_game.sh new file mode 100644 index 0000000000..54a28121f2 --- /dev/null +++ b/_Out/Server/Tester/rundx_game.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d PluginX.xml Server=GameServer ID=6 + +ps -A|grep NF diff --git a/_Out/Server/Tester/rundx_login.sh b/_Out/Server/Tester/rundx_login.sh new file mode 100644 index 0000000000..09fe558296 --- /dev/null +++ b/_Out/Server/Tester/rundx_login.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d Server=LoginServer ID=4 + +ps -A|grep NF diff --git a/_Out/Server/Tester/rundx_master.sh b/_Out/Server/Tester/rundx_master.sh new file mode 100644 index 0000000000..3b9ca84337 --- /dev/null +++ b/_Out/Server/Tester/rundx_master.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d PluginX.xml Server=MasterServer ID=3 + +ps -A|grep NF diff --git a/_Out/Server/Tester/rundx_proxy.sh b/_Out/Server/Tester/rundx_proxy.sh new file mode 100644 index 0000000000..8e7427c344 --- /dev/null +++ b/_Out/Server/Tester/rundx_proxy.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d PluginX.xml Server=ProxyServer ID=5 + +ps -A|grep NF diff --git a/_Out/Server/Tester/rundx_world.sh b/_Out/Server/Tester/rundx_world.sh new file mode 100644 index 0000000000..d2907f24fe --- /dev/null +++ b/_Out/Server/Tester/rundx_world.sh @@ -0,0 +1,9 @@ +export LC_ALL="C" + +cd ../Debug/ + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d PluginX.xml Server=WorldServer ID=7 + +ps -A|grep NF diff --git a/_Out/Server/kill.sh b/_Out/Server/kill.sh index 541b2902cc..f2cae01491 100755 --- a/_Out/Server/kill.sh +++ b/_Out/Server/kill.sh @@ -1,3 +1,3 @@ -kill -9 $(pidof NFPluginLoader_d) +pgrep NF | xargs kill -s 9 -ps -A|grep NF +ps -A|grep Svr diff --git a/_Out/Server/rund.sh b/_Out/Server/rund.sh old mode 100644 new mode 100755 diff --git a/_Out/Server/runxd.bat b/_Out/Server/runxd.bat new file mode 100644 index 0000000000..4ca8a43608 --- /dev/null +++ b/_Out/Server/runxd.bat @@ -0,0 +1,30 @@ +cd Debug + +echo Starting NFMasterServer... +start "NFMasterServer" "NFPluginLoader_d.exe" "Server=MasterServer" "ID=3" "PluginX.xml" + +choice /t 2 /d y /n >nul +echo Starting NFWorldServer... +start "NFWorldServer" "NFPluginLoader_d.exe" "Server=WorldServer" "ID=7" "PluginX.xml" + + +choice /t 5 /d y /n >nul + +echo Starting NFLoginServer... +start "NFLoginServer" "NFPluginLoader_d.exe" "Server=LoginServer" "ID=4" "PluginX.xml" + +choice /t 2 /d y /n >nul + +echo Starting NFGameServer... +start "NFGameServer" "NFPluginLoader_d.exe" "Server=GameServer" "ID=6" "PluginX.xml" + +choice /t 4 /d y /n >nul + +echo Starting NFProxyServer... +start "NFProxyServer" "NFPluginLoader_d.exe" "Server=ProxyServer" "ID=5" "PluginX.xml" + + + + + + diff --git a/_Out/Server/runxd.sh b/_Out/Server/runxd.sh new file mode 100755 index 0000000000..05cbae47b6 --- /dev/null +++ b/_Out/Server/runxd.sh @@ -0,0 +1,17 @@ +export LC_ALL="C" + +cd Debug + +chmod -R 777 NFPluginLoader_d + +./NFPluginLoader_d -d PluginX.xml Server=MasterServer ID=3 + +./NFPluginLoader_d -d PluginX.xml Server=WorldServer ID=7 + +./NFPluginLoader_d -d PluginX.xml Server=LoginServer ID=4 + +./NFPluginLoader_d -d PluginX.xml Server=GameServer ID=6 + +./NFPluginLoader_d -d PluginX.xml Server=ProxyServer ID=5 + +ps -A|grep NF diff --git a/_Out/Server/runxr.bat b/_Out/Server/runxr.bat new file mode 100644 index 0000000000..c75b398678 --- /dev/null +++ b/_Out/Server/runxr.bat @@ -0,0 +1,24 @@ +cd Release + +echo Starting NFMasterServer... +start "NFMasterServer" "NFPluginLoader.exe" "Server=MasterServer" "ID=3" "PluginX.xml" + +choice /t 2 /d y /n >nul +echo Starting NFWorldServer... +start "NFWorldServer" "NFPluginLoader.exe" "Server=WorldServer" "ID=7" "PluginX.xml" + + +choice /t 5 /d y /n >nul + +echo Starting NFLoginServer... +start "NFLoginServer" "NFPluginLoader.exe" "Server=LoginServer" "ID=4" "PluginX.xml" + +choice /t 2 /d y /n >nul + +echo Starting NFGameServer... +start "NFGameServer" "NFPluginLoader.exe" "Server=GameServer" "ID=6" "PluginX.xml" + +choice /t 4 /d y /n >nul + +echo Starting NFProxyServer... +start "NFProxyServer" "NFPluginLoader.exe" "Server=ProxyServer" "ID=5" "PluginX.xml" \ No newline at end of file diff --git a/_Out/Server/runxr.sh b/_Out/Server/runxr.sh new file mode 100755 index 0000000000..4c7ac570cc --- /dev/null +++ b/_Out/Server/runxr.sh @@ -0,0 +1,17 @@ +export LC_ALL="C" + +cd Release + +chmod -R 777 NFPluginLoader + +./NFPluginLoader -d PluginX.xml Server=MasterServer ID=3 + +./NFPluginLoader -d PluginX.xml Server=WorldServer ID=7 + +./NFPluginLoader -d PluginX.xml Server=LoginServer ID=4 + +./NFPluginLoader -d PluginX.xml Server=GameServer ID=6 + +./NFPluginLoader -d PluginX.xml Server=ProxyServer ID=5 + +ps -A|grep NF diff --git a/install4cmake.sh b/install4cmake.sh index 20669b1019..b233e5b831 100755 --- a/install4cmake.sh +++ b/install4cmake.sh @@ -36,7 +36,12 @@ chmod -R 755 ./BuildNF.CMake.Release.sh ./BuildNF.CMake.Release.sh cd ../../ +cd _Out/Server/ +chmod 777 *.sh +cd Tester/ +chmod 777 *.sh +cd ../../../ # generate makefile #chmod -R 755 Build4Makefile.sh #./Build4Makefile.sh