Skip to content

Commit fcfa347

Browse files
ketooketoo
committed
Merge branch 'develop'
# Conflicts: # README.md
2 parents 8e759bb + aeddef4 commit fcfa347

File tree

108 files changed

+6038
-58
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+6038
-58
lines changed

‎Dependencies/build_dep.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ make clean
5959
cd ../
6060

6161
#mysql
62+
# extract mysql libs
63+
echo Extract mysql libs
64+
unzip -o mysql_libs.zip -d ./
65+
66+
echo Extract mysql++ libs
67+
unzip -o mysqlpp_libs.zip -d ./
68+
# copy libs
6269
cp -R -f ./lib/Release/libmysqlclient.so ../_Out/Debug/
6370
cp -R -f ./lib/Release/libmysqlclient.so ../_Out/Release/
6471

‎NFComm/NFKernelPlugin/NFCSceneAOIModule.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -------------------------------------------------------------------------
22
// @FileName : NFCSceneAOIModule.cpp
33
// @Author : LvSheng.Huang
4-
// @Date : 2012-12-15
4+
// @Date : 2016-12-05
55
// @Module : NFCSceneAOIModule
66
//
77
// -------------------------------------------------------------------------

‎NFComm/NFKernelPlugin/NFCSceneAOIModule.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -------------------------------------------------------------------------
22
// @FileName : NFCSceneAOIModule.h
33
// @Author : LvSheng.Huang
4-
// @Date : 2012-12-15
4+
// @Date : 2016-12-05
55
// @Module : NFCSceneAOIModule
66
//
77
// -------------------------------------------------------------------------

‎NFComm/NFNet/NFCNet.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// -------------------------------------------------------------------------
2-
3-
4-
5-
6-
// @Desc : CNet
2+
// @FileName : NFCNet.cpp
3+
// @Author : LvSheng.Huang
4+
// @Date : 2012-12-15
5+
// @Module : NFCNet
76
// -------------------------------------------------------------------------
87

98
#include "NFCNet.h"

‎NFComm/NFNet/NFCNet.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// -------------------------------------------------------------------------
2-
3-
4-
5-
6-
// @Desc : CNet
2+
// @FileName : NFCNet.h
3+
// @Author : LvSheng.Huang
4+
// @Date : 2012-12-15
5+
// @Module : NFCNet
76
// -------------------------------------------------------------------------
87

98
#ifndef NFC_NET_H

‎NFComm/NFNet/NFINet.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// -------------------------------------------------------------------------
2-
3-
4-
5-
6-
// @Desc : INet
2+
// @FileName : NFINet.h
3+
// @Author : LvSheng.Huang
4+
// @Date : 2012-12-15
5+
// @Module : NFINet
76
// -------------------------------------------------------------------------
87

98
#ifndef NFI_NET_H

‎NFComm/NFPluginModule/NFIChatModule.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// -------------------------------------------------------------------------
2+
// @FileName : NFIChatModuleChatModule.h
3+
// @Author : LvSheng.Huang
4+
// @Date : 2016-12-18
5+
// @Module : NFIChatModule
6+
// @Desc :
7+
// -------------------------------------------------------------------------
8+
9+
10+
#ifndef NFI_CHAT_MODULE_H
11+
#define NFI_CHAT_MODULE_H
12+
13+
#include "NFIModule.h"
14+
15+
class NFIChatModule : public NFIModule
16+
{
17+
public:
18+
19+
};
20+
21+
#endif

‎NFComm/NFPluginModule/NFIGMModule.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// -------------------------------------------------------------------------
2+
// @FileName : NFIGMModule.h
3+
// @Author : LvSheng.Huang
4+
// @Date : 2016-12-18
5+
// @Module : NFIGMModule
6+
// @Desc :
7+
// -------------------------------------------------------------------------
8+
9+
10+
#ifndef NFI_GM_MODULE_H
11+
#define NFI_GM_MODULE_H
12+
13+
#include "NFIModule.h"
14+
15+
class NFIGMModule : public NFIModule
16+
{
17+
public:
18+
19+
};
20+
21+
#endif

‎NFComm/NFPluginModule/NFIGmModule.h‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎NFMidWare/CMakeLists.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
add_subdirectory(NFChatPlugin)
2+
add_subdirectory(NFFriendPlugin)
3+
add_subdirectory(NFGangPlugin)
4+
add_subdirectory(NFHeroPlugin)
5+
add_subdirectory(NFItemBagPlugin)
6+
add_subdirectory(NFMailPlugin)
7+
add_subdirectory(NFRankPlugin)
8+
add_subdirectory(NFShopPlugin)
9+
add_subdirectory(NFSkillPlugin)
10+
add_subdirectory(NFTaskPlugin)
11+
add_subdirectory(NFUserGiftPlugin)

0 commit comments

Comments
 (0)