Skip to content

Commit 5507a3f

Browse files
committed
fix rename and msg head bugs
Former-commit-id: 14227f7cbb84184592dfae07f0aa427cc789383d Former-commit-id: 4ed235c0cf09ea465fdc6a32d0e396d825eea2df
1 parent 1af0b3a commit 5507a3f

File tree

10 files changed

+38
-21
lines changed

10 files changed

+38
-21
lines changed
File renamed without changes.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
FileProcess_d.exe %1
2-
copy ..\\proto\\NFProtocolDefine.hpp ..\\..\\..\\..\\Frame\\NFComm\\NFMessageDefine\\ /Y
2+
copy ..\\proto\\ArkProtocolDefine.hpp ..\\..\\..\\..\\Frame\\SDK\\Proto\\ /Y
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
./NFFileProcess
2-
cp -a ../proto/NFProtocolDefine.hpp ../../../../Frame/NFComm/NFMessageDefine
2+
cp -a ../proto/ArkProtocolDefine.hpp ../../../../Frame/SDK/Proto

Bin/Server/Debug/run.bat

+15-15
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,26 @@ echo Starting AFWorldServer...
2525
start "" "PluginLoader_d.exe"
2626

2727

28-
choice /t 5 /d y /n >nul
28+
REM choice /t 5 /d y /n >nul
2929

30-
cd ..
31-
cd AFLoginServer
32-
echo Starting AFLoginServer...
33-
start "" "PluginLoader_d.exe"
30+
REM cd ..
31+
REM cd AFLoginServer
32+
REM echo Starting AFLoginServer...
33+
REM start "" "PluginLoader_d.exe"
3434

35-
choice /t 2 /d y /n >nul
35+
REM choice /t 2 /d y /n >nul
3636

37-
cd ..
38-
cd AFGameServer
39-
echo Starting AFGameServer...
40-
start "" "PluginLoader_d.exe"
37+
REM cd ..
38+
REM cd AFGameServer
39+
REM echo Starting AFGameServer...
40+
REM start "" "PluginLoader_d.exe"
4141

42-
choice /t 4 /d y /n >nul
42+
REM choice /t 4 /d y /n >nul
4343

44-
cd ..
45-
cd AFProxyServer
46-
echo Starting AFProxyServer...
47-
start "" "PluginLoader_d.exe"
44+
REM cd ..
45+
REM cd AFProxyServer
46+
REM echo Starting AFProxyServer...
47+
REM start "" "PluginLoader_d.exe"
4848

4949

5050

Frame/SDK/Base/AFMacros.hpp

+17-2
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,31 @@
2222

2323
#include "AFPlatform.hpp"
2424

25+
//Input param type
26+
#ifndef IN
27+
#define IN
28+
#endif
29+
30+
//Output param type
31+
#ifndef OUT
32+
#define OUT
33+
#endif
34+
35+
//Input and output param type
36+
#ifndef INOUT
37+
#define INOUT
38+
#endif
39+
2540
#define ARRAY_CLEAR(v) memset((v), 0x0, sizeof((v)))
2641
#define MEMORY_CLEAR(v) memset(&(v), 0x0, sizeof((v)))
2742
#define MEMORY_CLEAR_POINTER(v) memset((v), 0xx, sizeof(*(v)))
28-
#define ARRAY_SIZE(v) (sizeof(v) / sizeof(v[0]))
43+
#define ARRAY_LENTGH(v) (sizeof(v) / sizeof(v[0]))
2944

3045
#define MAX_NAME 256
3146
#define MAX_BUF 256
3247

3348
#ifndef MAX_PATH
34-
# define MAX_PATH 256
49+
#define MAX_PATH 256
3550
#endif
3651

3752
#define ARK_NEW new

Frame/SDK/Base/Base.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<ClInclude Include="AFString.hpp" />
3939
<ClInclude Include="AFStringPod.hpp" />
4040
<ClInclude Include="AFTime.hpp" />
41+
<ClInclude Include="AFTimer.hpp" />
4142
<ClInclude Include="AFTimerManager.h" />
4243
<ClInclude Include="AFVector3.hpp" />
4344
</ItemGroup>

Frame/SDK/Base/Base.vcxproj.filters

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<ClInclude Include="AFArrayMap.hpp">
8989
<Filter>Base</Filter>
9090
</ClInclude>
91+
<ClInclude Include="AFTimer.hpp" />
9192
</ItemGroup>
9293
<ItemGroup>
9394
<Filter Include="Base">

Frame/SDK/Net/AFINet.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct AFIMsgHead
3737
{
3838
enum AF_Head
3939
{
40-
NF_HEAD_LENGTH = 14,
40+
NF_HEAD_LENGTH = 22,
4141
};
4242

4343
virtual int EnCode(char* strData) const = 0;
File renamed without changes.

Shell/GenerateConfigXML.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cd ..//Bin/Server/DataConfig/Tool/
2-
chmod -R 755 NFFileProcess
2+
chmod -R 755 FileProcess
33
chmod -R 755 copy_files.sh
44
./copy_files.sh
55

0 commit comments

Comments
 (0)