Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	README.md
  • Loading branch information
@ketoo
ketoo committed Dec 19, 2016
2 parents 8e759bb + aeddef4 commit fcfa347
Show file tree
Hide file tree
Showing 108 changed files with 6,038 additions and 58 deletions.
7 changes: 7 additions & 0 deletions Dependencies/build_dep.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ make clean
cd ../

#mysql
# extract mysql libs
echo Extract mysql libs
unzip -o mysql_libs.zip -d ./

echo Extract mysql++ libs
unzip -o mysqlpp_libs.zip -d ./
# copy libs
cp -R -f ./lib/Release/libmysqlclient.so ../_Out/Debug/
cp -R -f ./lib/Release/libmysqlclient.so ../_Out/Release/

Expand Down
2 changes: 1 addition & 1 deletion NFComm/NFKernelPlugin/NFCSceneAOIModule.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------
// @FileName : NFCSceneAOIModule.cpp
// @Author : LvSheng.Huang
// @Date : 2012-12-15
// @Date : 2016-12-05
// @Module : NFCSceneAOIModule
//
// -------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion NFComm/NFKernelPlugin/NFCSceneAOIModule.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------
// @FileName : NFCSceneAOIModule.h
// @Author : LvSheng.Huang
// @Date : 2012-12-15
// @Date : 2016-12-05
// @Module : NFCSceneAOIModule
//
// -------------------------------------------------------------------------
Expand Down
9 changes: 4 additions & 5 deletions NFComm/NFNet/NFCNet.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// -------------------------------------------------------------------------




// @Desc : CNet
// @FileName : NFCNet.cpp
// @Author : LvSheng.Huang
// @Date : 2012-12-15
// @Module : NFCNet
// -------------------------------------------------------------------------

#include "NFCNet.h"
Expand Down
9 changes: 4 additions & 5 deletions NFComm/NFNet/NFCNet.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// -------------------------------------------------------------------------




// @Desc : CNet
// @FileName : NFCNet.h
// @Author : LvSheng.Huang
// @Date : 2012-12-15
// @Module : NFCNet
// -------------------------------------------------------------------------

#ifndef NFC_NET_H
Expand Down
9 changes: 4 additions & 5 deletions NFComm/NFNet/NFINet.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// -------------------------------------------------------------------------




// @Desc : INet
// @FileName : NFINet.h
// @Author : LvSheng.Huang
// @Date : 2012-12-15
// @Module : NFINet
// -------------------------------------------------------------------------

#ifndef NFI_NET_H
Expand Down
21 changes: 21 additions & 0 deletions NFComm/NFPluginModule/NFIChatModule.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// -------------------------------------------------------------------------
// @FileName : NFIChatModuleChatModule.h
// @Author : LvSheng.Huang
// @Date : 2016-12-18
// @Module : NFIChatModule
// @Desc :
// -------------------------------------------------------------------------


#ifndef NFI_CHAT_MODULE_H
#define NFI_CHAT_MODULE_H

#include "NFIModule.h"

class NFIChatModule : public NFIModule
{
public:

};

#endif
21 changes: 21 additions & 0 deletions NFComm/NFPluginModule/NFIGMModule.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// -------------------------------------------------------------------------
// @FileName : NFIGMModule.h
// @Author : LvSheng.Huang
// @Date : 2016-12-18
// @Module : NFIGMModule
// @Desc :
// -------------------------------------------------------------------------


#ifndef NFI_GM_MODULE_H
#define NFI_GM_MODULE_H

#include "NFIModule.h"

class NFIGMModule : public NFIModule
{
public:

};

#endif
20 changes: 0 additions & 20 deletions NFComm/NFPluginModule/NFIGmModule.h
View file

This file was deleted.

11 changes: 11 additions & 0 deletions NFMidWare/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
add_subdirectory(NFChatPlugin)
add_subdirectory(NFFriendPlugin)
add_subdirectory(NFGangPlugin)
add_subdirectory(NFHeroPlugin)
add_subdirectory(NFItemBagPlugin)
add_subdirectory(NFMailPlugin)
add_subdirectory(NFRankPlugin)
add_subdirectory(NFShopPlugin)
add_subdirectory(NFSkillPlugin)
add_subdirectory(NFTaskPlugin)
add_subdirectory(NFUserGiftPlugin)
33 changes: 33 additions & 0 deletions NFMidWare/NFChatPlugin/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
set(ProjectName "NFChatPlugin")
file(GLOB NFChatPlugin_ROOT_Cpp
*.cpp)

file(GLOB NFChatPlugin_ROOT_Hpp
*.h)

add_library(NFChatPlugin SHARED
${NFChatPlugin_ROOT_Cpp}
${NFChatPlugin_ROOT_Hpp})

set_target_properties( NFChatPlugin PROPERTIES OUTPUT_NAME_DEBUG "NFChatPlugin_d")
set_target_properties( NFChatPlugin PROPERTIES PREFIX "")
set_target_properties( NFChatPlugin PROPERTIES
FOLDER "NFServer/GameServer"
ARCHIVE_OUTPUT_DIRECTORY ${NFOutPutDir}
RUNTIME_OUTPUT_DIRECTORY ${NFOutPutDir}
LIBRARY_OUTPUT_DIRECTORY ${NFOutPutDir} )
link_NFSDK("NFChatPlugin")

if(UNIX)
add_definitions(
-D_USRDLL
-DELPP_NO_DEFAULT_LOG_FILE
)

else()
add_definitions(
-DWIN
-D_USRDLL
-DELPP_NO_DEFAULT_LOG_FILE
)
endif()
39 changes: 39 additions & 0 deletions NFMidWare/NFChatPlugin/NFCChatModule.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// -------------------------------------------------------------------------
// @FileName : NFCChatModule.h
// @Author : LvSheng.Huang
// @Date : 2016-12-18
// @Module : NFCChatModule
// @Desc :

#include "NFCChatModule.h"
#include "NFComm/NFMessageDefine/NFProtocolDefine.hpp"
#include "NFComm/NFPluginModule/NFIEventModule.h"

bool NFCChatModule::Init()
{
return true;
}

bool NFCChatModule::AfterInit()
{
m_pKernelModule = pPluginManager->FindModule<NFIKernelModule>();
m_pClassModule = pPluginManager->FindModule<NFIClassModule>();
m_pElementModule = pPluginManager->FindModule<NFIElementModule>();
m_pLogModule = pPluginManager->FindModule<NFILogModule>();
m_pEventModule = pPluginManager->FindModule<NFIEventModule>();
m_pSceneAOIModule = pPluginManager->FindModule<NFISceneAOIModule>();


return true;
}

bool NFCChatModule::Shut()
{

return true;
}

bool NFCChatModule::Execute()
{
return true;
}
53 changes: 53 additions & 0 deletions NFMidWare/NFChatPlugin/NFCChatModule.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// -------------------------------------------------------------------------
// @FileName : NFCChatModule.h
// @Author : LvSheng.Huang
// @Date : 2016-12-18
// @Module : NFCChatModule
// @Desc :
// -------------------------------------------------------------------------

#ifndef NFC_CHAT_MODULE_H
#define NFC_CHAT_MODULE_H

#include <memory>
#include "NFComm/NFMessageDefine/NFMsgDefine.h"
#include "NFComm/NFPluginModule/NFINetModule.h"
#include "NFComm/NFPluginModule/NFILogModule.h"
#include "NFComm/NFPluginModule/NFIKernelModule.h"
#include "NFComm/NFPluginModule/NFIClassModule.h"
#include "NFComm/NFPluginModule/NFIChatModule.h"
#include "NFComm/NFPluginModule/NFIElementModule.h"
#include "NFComm/NFPluginModule/NFIEventModule.h"
#include "NFComm/NFPluginModule/NFISceneAOIModule.h"
////////////////////////////////////////////////////////////////////////////



class NFCChatModule
: public NFIChatModule
{
public:
NFCChatModule(NFIPluginManager* p)
{
pPluginManager = p;
}
virtual bool Init();
virtual bool Shut();
virtual bool Execute();

virtual bool AfterInit();


protected:

//////////////////////////////////////////////////////////////////////////
NFIKernelModule* m_pKernelModule;
NFIClassModule* m_pClassModule;
NFILogModule* m_pLogModule;
NFIElementModule* m_pElementModule;
NFINetModule* m_pNetModule;
NFIEventModule* m_pEventModule;
NFISceneAOIModule* m_pSceneAOIModule;
//////////////////////////////////////////////////////////////////////////
};
#endif
83 changes: 83 additions & 0 deletions NFMidWare/NFChatPlugin/NFChatPlugin.cbp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="NFCChatPlugin" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Debug x64">
<Option output="$(SolutionDir)/_Out/Debug/NFCChatPlugin_d" prefix_auto="0" extension_auto="1" />
<Option object_output=".objs/Debug" />
<Option type="3" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-std=c++11" />
<Add option="-g" />
<Add option="-fPIC" />
<Add option="-D_DEBUG" />
<Add option="-D_USRDLL" />
<Add option="-DELPP_NO_DEFAULT_LOG_FILE" />
<Add directory="$(SolutionDir)" />
<Add directory="$(SolutionDir)/Dependencies/" />
<Add directory="$(SolutionDir)/Dependencies/libevent/" />
<Add directory="$(SolutionDir)/Dependencies/libevent/include/" />
<Add directory="$(SolutionDir)/Dependencies/libevent/compat/" />
<Add directory="$(SolutionDir)/Dependencies/protobuf/src/" />
<Add directory="$(SolutionDir)/Dependencies/Theron/Include/" />
</Compiler>
<Linker>
<Add library="$(SolutionDir)/_Out/Debug/NFCore_d.so" />
<Add library="$(SolutionDir)/_Out/Debug/NFMessageDefine_d.so" />
<Add library="$(SolutionDir)/_Out/Debug/NFNet_d.so" />
<Add directory="$(SolutionDir)/_Out/Debug/" />
<Add directory="$(SolutionDir)/Dependencies/lib/Debug/" />
</Linker>
<Environment>
<Variable name="SolutionDir" value="../../" />
</Environment>
</Target>
<Target title="Release x64">
<Option output="$(SolutionDir)/_Out/Release/NFCChatPlugin" prefix_auto="0" extension_auto="1" />
<Option object_output=".objs/Release" />
<Option type="3" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-std=c++11" />
<Add option="-fPIC" />
<Add option="-D_USRDLL" />
<Add option="-DELPP_NO_DEFAULT_LOG_FILE" />
<Add directory="$(SolutionDir)" />
<Add directory="$(SolutionDir)/Dependencies/" />
<Add directory="$(SolutionDir)/Dependencies/libevent/" />
<Add directory="$(SolutionDir)/Dependencies/libevent/include/" />
<Add directory="$(SolutionDir)/Dependencies/libevent/compat/" />
<Add directory="$(SolutionDir)/Dependencies/protobuf/src/" />
<Add directory="$(SolutionDir)/Dependencies/Theron/Include/" />
</Compiler>
<Linker>
<Add library="$(SolutionDir)/_Out/Release/NFCore.so" />
<Add directory="$(SolutionDir)/_Out/Release/" />
<Add directory="$(SolutionDir)/Dependencies/lib/Release/" />
</Linker>
<Environment>
<Variable name="SolutionDir" value="../../" />
</Environment>
</Target>
</Build>
<Unit filename="NFCChatModule.cpp" />
<Unit filename="NFCChatModule.h" />
<Unit filename="NFCChatModule.cpp" />
<Unit filename="NFCChatModule.h" />
<Unit filename="dllmain.cpp" />
<Extensions>
<code_completion />
<envvars />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>
Loading

0 comments on commit fcfa347

Please sign in to comment.