Skip to content

Commit

Permalink
修改目录
Browse files Browse the repository at this point in the history
修改目录
  • Loading branch information
NingLeixueR committed Jan 15, 2024
1 parent c3d0ccc commit d59c0ef
Show file tree
Hide file tree
Showing 18 changed files with 42 additions and 62 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
3part/behaviac-3.6.40
3part/3part.rar
php/phpcode
bin
bin/Debug
bin/Release
obj
lib
php
Expand Down
17 changes: 17 additions & 0 deletions bin/close.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash
path="$(cd $(dirname $0); pwd)"
pids=`ps -elf|grep node|grep -v grep|awk '{print $4}'`
function stop_pid() {
for pid in ${pids}
do
proname=`ls -l /proc/${pid}|grep exe|awk '{print $11}'`
if [[ ${proname} == ${path}/node ]];then
kill -9 ${pid}
echo "kill -9 ${pid}";

fi
done
echo "Stop Server PID is Success "
}

stop_pid
2 changes: 1 addition & 1 deletion tools/start_server/1.txt → bin/cmd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ TESTS 2000 C /time
TESTS 2000 C /time
TESTS 2000 C /time
TESTS 2000 C /chat 1 2 china
START
START
File renamed without changes.
8 changes: 8 additions & 0 deletions bin/start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CURRENT_DIR=`pwd`
nohup $CURRENT_DIR/node actor 1 1 > /dev/null 2>&1 &
nohup $CURRENT_DIR/node game 1 1 > /dev/null 2>&1 &
nohup $CURRENT_DIR/node db 1 1 > /dev/null 2>&1 &
nohup $CURRENT_DIR/node login 1 1 > /dev/null 2>&1 &
nohup $CURRENT_DIR/node gateway 1 1 > /dev/null 2>&1 &
nohup $CURRENT_DIR/node world 1 1 > /dev/null 2>&1 &
echo Done!
1 change: 1 addition & 0 deletions bin/start_rebot.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./node robot 1 1 libo 1 1
1 change: 0 additions & 1 deletion tools/rename_node.bat → bin/win_rename_node.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cd ../bin/Debug/
xcopy node.exe node_actor.exe /y
xcopy node.exe node_game.exe /y
xcopy node.exe node_db.exe /y
Expand Down
4 changes: 4 additions & 0 deletions bin/win_start_client_1.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
start node_robot robot 1 1 libo 1 1
#start node_robot robot 1 1 wac 1 1
#start node_robot robot 1 1 libo 1 1999
#start node_robot robot 1 1 wac 1 1999
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cd ../../bin/Debug/
start node_robot robot 2 1 wac 1 1999
start node_robot robot 2 1 libo 1 1999
start node_robot robot 2 1 wac 1 1
start node_robot robot 2 1 libo 1 1
#start node_robot robot 2 1 wac 1 1999
#start node_robot robot 2 1 libo 1 1999
#start node_robot robot 2 1 wac 1 1
#start node_robot robot 2 1 wac 2 2
#start node_robot robot 2 1 wac 3 3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
cd ../../bin/Debug/
#Ò»Çø
start node_actor actor 1 1
start node_game game 1 1
#start node_game game 1 2
start node_db db 1 1
#start node_login login 1 1
start node_login login 1 1
start node_gateway gateway 1 1
#start node_gateway gateway 1 2
start node_world world 1 1
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cd ../../bin/Debug/
#¶þÇø
start node_actor actor 2 1
start node_game game 2 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
cd ../../bin/Debug/
#¿ç·þ
start node_cross cross -100 1
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cd ../../bin/Debug/
set /P rebot_value1=ÇëÊäÈëÇø·þ
start node_actor actor %rebot_value1% 1
#start node_login login %rebot_value1% 1
Expand Down
File renamed without changes.
28 changes: 4 additions & 24 deletions public/logic/public/public/brief/actor_brief.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,37 +45,17 @@ namespace ngl
{

std::cout << "#####:" << (int64_t)(adata.m_data->m_vecinfo.m_data.get()) << std::endl;
return true;
if (adata.m_data->m_vecinfo.m_data == nullptr)
{
std::cout << "adata.m_vecinfo.m_data == nullptr" << std::endl;
return true;
}

if (adata.m_data->m_vecinfo.m_isbinary)
{
std::cout << "adata.m_vecinfo.m_isbinary = "<< adata.m_data->m_vecinfo.m_isbinary << std::endl;
//return true;
}
for (auto& item : *adata.m_data->m_vecinfo.m_data)
{
std::string json;
if (tools::protostr(item, json))
{
LogLocalError("recv actor_roleinfo [%]", json);
}
}
return true;
/*m_briefdb.update(*adata.m_vecinfo.m_data.get());

m_briefdb.update(*adata.m_data->m_vecinfo.m_data.get());

auto pro = std::make_shared<actor_roleinfo>();
*pro = adata;
*pro = *adata.m_data;
actor::static_send_actor(actor_guid::make_self(ACTOR_NOTICE), actor_guid::make(), pro);
actor::static_send_actor(actor_guid::make_self(ACTOR_CHAT), actor_guid::make(), pro);

actor::static_send_actor(
actor_guid::make(ACTOR_CHAT,ttab_servers::tab()->m_crossarea, actor_guid::none_actordataid()),
actor_guid::make(), pro);*/
actor_guid::make(), pro);
return true;
}

Expand Down
Binary file removed server/libmycorekkk.zip
Binary file not shown.
23 changes: 0 additions & 23 deletions tools/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions tools/start_server/start_client_1.bat

This file was deleted.

0 comments on commit d59c0ef

Please sign in to comment.