Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Former-commit-id: 58630631635f20d068b3052835d5c38e0a39048d
Former-commit-id: 7f6271a6895cbf2b77ea501f86b9ec95a629200e
  • Loading branch information
nickyang4github committed Mar 31, 2018
2 parents 844ab7e + 8344d43 commit 6142848
Show file tree
Hide file tree
Showing 122 changed files with 2,414 additions and 1,236 deletions.
12 changes: 6 additions & 6 deletions Bin/Server/Debug/killd.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kill -9 $(pidof NFMasterServer_d)
kill -9 $(pidof NFWorldServer_d)
kill -9 $(pidof NFLoginServer_d)
kill -9 $(pidof NFGameServer_d)
kill -9 $(pidof NFProxyServer_d)
kill -9 $(pidof MasterServer)
kill -9 $(pidof WorldServer)
kill -9 $(pidof LoginServer)
kill -9 $(pidof GameServer)
kill -9 $(pidof ProxyServer)

ps -A|grep NF
ps ax | grep *Server
19 changes: 8 additions & 11 deletions Bin/Server/Debug/run.bat
Original file line number Diff line number Diff line change
Expand Up @@ -41,38 +41,35 @@ copy ..\\..\\..\\Bin\\Comm\\Debug\\AFWorld*d.dll AFWorldServer\\ /Y
copy ..\\..\\..\\Bin\\Comm\\Debug\\AFGame*d.dll AFGameServer\\ /Y

cd AFMasterServer

echo Starting AFMasterServer...
start "" "PluginLoader_d.exe"

start "" "PluginLoader_d.exe -x app_id=3 app_name=MasterServer cfg=Plugin.xml"
choice /t 2 /d y /n >nul

cd ..
cd AFWorldServer
echo Starting AFWorldServer...
start "" "PluginLoader_d.exe"


start "" "PluginLoader_d.exe -x app_id=7 app_name=WorldServer cfg=Plugin.xml"
choice /t 5 /d y /n >nul

cd ..
cd AFLoginServer
echo Starting AFLoginServer...
start "" "PluginLoader_d.exe"

start "" "PluginLoader_d.exe -x app_id=4 app_name=LoginServer cfg=Plugin.xml"
choice /t 2 /d y /n >nul

cd ..
cd AFGameServer
echo Starting AFGameServer...
start "" "PluginLoader_d.exe"

start "" "PluginLoader_d.exe -x app_id=6 app_name=GameServer cfg=Plugin.xml"
choice /t 4 /d y /n >nul

cd ..
cd AFProxyServer
echo Starting AFProxyServer...
start "" "PluginLoader_d.exe"
start "" "PluginLoader_d.exe -x app_id=5 app_name=ProxyServer cfg=Plugin.xml"


echo All processes are launching...



Expand Down
97 changes: 58 additions & 39 deletions Bin/Server/Debug/rund.sh
Original file line number Diff line number Diff line change
@@ -1,49 +1,68 @@
cp -a ../../Comm/Debug/NFPluginLoader_d ./NFMasterServer/NFMasterServer_d
cp -a ../../Comm/Debug/NFPluginLoader_d ./NFWorldServer/NFWorldServer_d
cp -a ../../Comm/Debug/NFPluginLoader_d ./NFLoginServer/NFLoginServer_d
cp -a ../../Comm/Debug/NFPluginLoader_d ./NFGameServer1/NFGameServer_d
cp -a ../../Comm/Debug/NFPluginLoader_d ./NFProxyServer1/NFProxyServer_d

cp -a ../../Comm/Debug/*.so ./NFMasterServer/
cp -a ../../Comm/Debug/*.so ./NFWorldServer/
cp -a ../../Comm/Debug/*.so ./NFLoginServer/
cp -a ../../Comm/Debug/*.so ./NFGameServer1/
cp -a ../../Comm/Debug/*.so ./NFProxyServer1/


echo Copy common dlls...
cp -a ../../../Bin/Comm/Debug/PluginLoader_d AFLoginServer/
cp -a ../../../Bin/Comm/Debug/PluginLoader_d AFMasterServer/
cp -a ../../../Bin/Comm/Debug/PluginLoader_d AFProxyServer/
cp -a ../../../Bin/Comm/Debug/PluginLoader_d AFWorldServer/
cp -a ../../../Bin/Comm/Debug/PluginLoader_d AFGameServer/

cp -a ../../../Dep/lib/Debug/libproto*d.so AFLoginServer/
cp -a ../../../Dep/lib/Debug/libproto*d.so AFMasterServer/
cp -a ../../../Dep/lib/Debug/libproto*d.so AFProxyServer/
cp -a ../../../Dep/lib/Debug/libproto*d.so AFWorldServer/
cp -a ../../../Dep/lib/Debug/libproto*d.so AFGameServer/

cp -a ../../../Bin/Comm/Debug/AFProto*d.so AFLoginServer/
cp -a ../../../Bin/Comm/Debug/AFProto*d.so AFMasterServer/
cp -a ../../../Bin/Comm/Debug/AFProto*d.so AFProxyServer/
cp -a ../../../Bin/Comm/Debug/AFProto*d.so AFWorldServer/
cp -a ../../../Bin/Comm/Debug/AFProto*d.so AFGameServer/

cp -a ../../../Bin/Comm/Debug/AFKernelPlugin*d.so AFLoginServer/
cp -a ../../../Bin/Comm/Debug/AFKernelPlugin*d.so AFMasterServer/
cp -a ../../../Bin/Comm/Debug/AFKernelPlugin*d.so AFProxyServer/
cp -a ../../../Bin/Comm/Debug/AFKernelPlugin*d.so AFWorldServer/
cp -a ../../../Bin/Comm/Debug/AFKernelPlugin*d.so AFGameServer/

cp -a ../../../Bin/Comm/Debug/AFUtilityPlugin*d.so AFLoginServer/
cp -a ../../../Bin/Comm/Debug/AFUtilityPlugin*d.so AFMasterServer/
cp -a ../../../Bin/Comm/Debug/AFUtilityPlugin*d.so AFProxyServer/
cp -a ../../../Bin/Comm/Debug/AFUtilityPlugin*d.so AFWorldServer/
cp -a ../../../Bin/Comm/Debug/AFUtilityPlugin*d.so AFGameServer/

echo Copy self dlls
cp -a ../../../Bin/Comm/Debug/AFLogin*d.so AFLoginServer/
cp -a ../../../Bin/Comm/Debug/AFMaster*d.so AFMasterServer/
cp -a ../../../Bin/Comm/Debug/AFProxy*d.so AFProxyServer/
cp -a ../../../Bin/Comm/Debug/AFWorld*d.so AFWorldServer/
cp -a ../../../Bin/Comm/Debug/AFGame*d.so AFGameServer/

export LC_ALL="C"

cd ./NFMasterServer
chmod -R 777 NFMasterServer_d
./NFMasterServer_d -d
cd ../

cd ./NFWorldServer
chmod -R 777 NFWorldServer_d
./NFWorldServer_d -d
cd ../


cd ./NFLoginServer
chmod -R 777 NFLoginServer_d
./NFLoginServer_d -d
cd ../


cd AFMasterServer
echo Starting AFMasterServer...
./PluginLoader_d -d app_id=3 app_name=MasterServer cfg=Plugin.xml

cd ./NFGameServer1
chmod -R 777 NFGameServer_d
./NFGameServer_d -d
cd ../
cd ..
cd AFWorldServer
echo Starting AFWorldServer...
./PluginLoader_d -d app_id=7 app_name=WorldServer cfg=Plugin.xml


cd ./NFProxyServer1
chmod -R 777 NFProxyServer_d
./NFProxyServer_d -d
cd ../
cd ..
cd AFLoginServer
echo Starting AFLoginServer...
./PluginLoader_d -d app_id=4 app_name=LoginServer cfg=Plugin.xml

cd ..
cd AFGameServer
echo Starting AFGameServer...
./PluginLoader_d -d app_id=6 app_name=GameServer cfg=Plugin.xml

cd ..
cd AFProxyServer
echo Starting AFProxyServer...
./PluginLoader_d -d app_id=5 app_name=ProxyServer cfg=Plugin.xml

echo All processes are launching...

ps -A|grep NF
ps ax | grep *Server
12 changes: 6 additions & 6 deletions Bin/Server/Release/killr.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kill -9 $(pidof NFMasterServer_r)
kill -9 $(pidof NFWorldServer_r)
kill -9 $(pidof NFLoginServer_r)
kill -9 $(pidof NFGameServer_r)
kill -9 $(pidof NFProxyServer_r)
kill -9 $(pidof MasterServer)
kill -9 $(pidof WorldServer)
kill -9 $(pidof LoginServer)
kill -9 $(pidof GameServer)
kill -9 $(pidof ProxyServer)

ps -A|grep NF
ps ax | grep *Server
22 changes: 7 additions & 15 deletions Bin/Server/Release/run.bat
Original file line number Diff line number Diff line change
Expand Up @@ -53,40 +53,32 @@ copy ..\\..\\..\\Bin\\Comm\\Release\\AFGame*.dll AFGameServer\\ /Y


cd AFMasterServer

echo Starting AFMasterServer...
start "" "PluginLoader.exe"

start "" "PluginLoader.exe -x app_id=3 app_name=MasterServer cfg=Plugin.xml"
choice /t 2 /d y /n >nul

cd ..
cd AFWorldServer
echo Starting AFWorldServer...
start "" "PluginLoader.exe"


start "" "PluginLoader.exe -x app_id=7 app_name=WorldServer cfg=Plugin.xml"
choice /t 5 /d y /n >nul

cd ..
cd AFLoginServer
echo Starting AFLoginServer...
start "" "PluginLoader.exe"

start "" "PluginLoader.exe -x app_id=4 app_name=LoginServer cfg=Plugin.xml"
choice /t 2 /d y /n >nul

cd ..
cd AFGameServer
echo Starting AFGameServer...
start "" "PluginLoader.exe"

start "" "PluginLoader.exe -x app_id=6 app_name=GameServer cfg=Plugin.xml"
choice /t 4 /d y /n >nul

cd ..
cd AFProxyServer
echo Starting AFProxyServer...
start "" "PluginLoader.exe"




start "" "PluginLoader.exe -x app_id=5 app_name=ProxyServer cfg=Plugin.xml"


echo All processes are launching...
87 changes: 54 additions & 33 deletions Bin/Server/Release/runr.sh
Original file line number Diff line number Diff line change
@@ -1,47 +1,68 @@
cp -a ../../Comm/Release/NFPluginLoader_r ./NFMasterServer/NFMasterServer_r
cp -a ../../Comm/Release/NFPluginLoader_r ./NFWorldServer/NFWorldServer_r
cp -a ../../Comm/Release/NFPluginLoader_r ./NFLoginServer/NFLoginServer_r
cp -a ../../Comm/Release/NFPluginLoader_r ./NFGameServer1/NFGameServer_r
cp -a ../../Comm/Release/NFPluginLoader_r ./NFProxyServer1/NFProxyServer_r

cp -a ../../Comm/Debug/*.so ./NFMasterServer/
cp -a ../../Comm/Debug/*.so ./NFWorldServer/
cp -a ../../Comm/Debug/*.so ./NFLoginServer/
cp -a ../../Comm/Debug/*.so ./NFGameServer1/
cp -a ../../Comm/Debug/*.so ./NFProxyServer1/
echo Copy common dlls...
cp -a ../../../Bin/Comm/Release/PluginLoader AFLoginServer/
cp -a ../../../Bin/Comm/Release/PluginLoader AFMasterServer/
cp -a ../../../Bin/Comm/Release/PluginLoader AFProxyServer/
cp -a ../../../Bin/Comm/Release/PluginLoader AFWorldServer/
cp -a ../../../Bin/Comm/Release/PluginLoader AFGameServer/

export LC_ALL="C"
cp -a ../../../Dep/lib/Release/libproto*.so AFLoginServer/
cp -a ../../../Dep/lib/Release/libproto*.so AFMasterServer/
cp -a ../../../Dep/lib/Release/libproto*.so AFProxyServer/
cp -a ../../../Dep/lib/Release/libproto*.so AFWorldServer/
cp -a ../../../Dep/lib/Release/libproto*.so AFGameServer/

cd ./NFMasterServer
chmod -R 777 NFMasterServer_r
./NFMasterServer_r -d
cd ../
cp -a ../../../Bin/Comm/Release/AFProto*.so AFLoginServer/
cp -a ../../../Bin/Comm/Release/AFProto*.so AFMasterServer/
cp -a ../../../Bin/Comm/Release/AFProto*.so AFProxyServer/
cp -a ../../../Bin/Comm/Release/AFProto*.so AFWorldServer/
cp -a ../../../Bin/Comm/Release/AFProto*.so AFGameServer/

cd ./NFWorldServer
chmod -R 777 NFWorldServer_r
./NFWorldServer_r -d
cd ../
cp -a ../../../Bin/Comm/Release/AFKernelPlugin*.so AFLoginServer/
cp -a ../../../Bin/Comm/Release/AFKernelPlugin*.so AFMasterServer/
cp -a ../../../Bin/Comm/Release/AFKernelPlugin*.so AFProxyServer/
cp -a ../../../Bin/Comm/Release/AFKernelPlugin*.so AFWorldServer/
cp -a ../../../Bin/Comm/Release/AFKernelPlugin*.so AFGameServer/

cp -a ../../../Bin/Comm/Release/AFUtilityPlugin*.so AFLoginServer/
cp -a ../../../Bin/Comm/Release/AFUtilityPlugin*.so AFMasterServer/
cp -a ../../../Bin/Comm/Release/AFUtilityPlugin*.so AFProxyServer/
cp -a ../../../Bin/Comm/Release/AFUtilityPlugin*.so AFWorldServer/
cp -a ../../../Bin/Comm/Release/AFUtilityPlugin*.so AFGameServer/

cd ./NFLoginServer
chmod -R 777 NFLoginServer_r
./NFLoginServer_r -d
cd ../
echo Copy self dlls
cp -a ../../../Bin/Comm/Release/AFLogin*.so AFLoginServer/
cp -a ../../../Bin/Comm/Release/AFMaster*.so AFMasterServer/
cp -a ../../../Bin/Comm/Release/AFProxy*.so AFProxyServer/
cp -a ../../../Bin/Comm/Release/AFWorld*.so AFWorldServer/
cp -a ../../../Bin/Comm/Release/AFGame*.so AFGameServer/

export LC_ALL="C"

cd AFMasterServer
echo Starting AFMasterServer...
./PluginLoader -d app_id=3 app_name=MasterServer cfg=Plugin.xml

cd ./NFGameServer1
chmod -R 777 NFGameServer_r
./NFGameServer_r -d
cd ../
cd ..
cd AFWorldServer
echo Starting AFWorldServer...
./PluginLoader -d app_id=7 app_name=WorldServer cfg=Plugin.xml


cd ./NFProxyServer1
chmod -R 777 NFProxyServer_r
./NFProxyServer_r -d
cd ../
cd ..
cd AFLoginServer
echo Starting AFLoginServer...
./PluginLoader -d app_id=4 app_name=LoginServer cfg=Plugin.xml

cd ..
cd AFGameServer
echo Starting AFGameServer...
./PluginLoader -d app_id=6 app_name=GameServer cfg=Plugin.xml

cd ..
cd AFProxyServer
echo Starting AFProxyServer...
./PluginLoader -d app_id=5 app_name=ProxyServer cfg=Plugin.xml

echo All processes are launching...

ps -A|grep NF
ps ax | grep *Server
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Contributing to ArkGameFrame
Welcome to [report Issues](https://github.com/ArkGame/ArkGameFrame/issues) or [pull requests](https://github.com/ArkGame/ArkGameFrame/pulls). It's recommended to read the following Contributing Guide first before contributing.
# Contributing to ARK
Welcome to [report Issues](https://github.com/ArkGame/ARK/issues) or [pull requests](https://github.com/ArkGame/ARK/pulls). It's recommended to read the following Contributing Guide first before contributing.

## Issues
We use Github Issues to track public bugs and feature requests.
Expand All @@ -11,7 +11,7 @@ Please search the existing issues to see if any similar issue or feature request
If you open an issue, the more information the better. Such as detailed description, screenshot or video of your problem, logcat or code blocks for your crash.

## Pull Requests
We strongly welcome your pull request to make `ArkGameFrame` better.
We strongly welcome your pull request to make `ARK` better.

### Branch Management
There are three main branches here:
Expand All @@ -24,7 +24,7 @@ There are three main branches here:

2. `develop` branch.

(1).There is a `develop` for `ArkGameFrame` developing version. It is our stable developing branch. After full testing, `develop` branch will be merged to `master` branch for the next release.
(1).There is a `develop` for `ARK` developing version. It is our stable developing branch. After full testing, `develop` branch will be merged to `master` branch for the next release.

(2). **You are recommended to submit bugfix or feature PR on `develop` branch.**

Expand All @@ -48,5 +48,5 @@ Before submitting a pull request, please make sure the followings are done:
Try to be similar with the other authers.

## License
By contributing to `ArkGameFrame`, you agree that your contributions will be licensed
under [Apache LICENSE](https://github.com/ArkGame/ArkGameFrame/blob/master/LICENSE)
By contributing to `ARK`, you agree that your contributions will be licensed
under [Apache LICENSE](https://github.com/ArkGame/ARK/blob/master/LICENSE)
Loading

0 comments on commit 6142848

Please sign in to comment.