server/game2002
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-03 09:17:13 +08:00
parent 45a0675eb3
commit b422959442
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/gameserver/CMakeLists.txt
View File

@ -1,12 +1,7 @@
project(gameserver) project(gameserver)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
if (${GAME_ID}) set(GAME_ID 2002)
message(GAME_ID: ${GAME_ID})
else()
set(GAME_ID 2001)
message(GAME_ID: ${GAME_ID})
endif()
set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_BUILD_TYPE "Debug")
set(CMAKE_BUILD_TYPE "Release") set(CMAKE_BUILD_TYPE "Release")

2
server/gameserver/human.cc
View File

@ -1194,6 +1194,7 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
(room->frame_no - room->gas_data.gas_start_frameno); (room->frame_no - room->gas_data.gas_start_frameno);
gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000); gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000);
} else { } else {
#if 0
if (room->gas_data.old_area_meta->i->wait_time() <= 0) { if (room->gas_data.old_area_meta->i->wait_time() <= 0) {
gas_data->set_duration(0); gas_data->set_duration(0);
} else { } else {
@ -1201,6 +1202,7 @@ void Human::FillMFGasData(cs::MFGasData* gas_data)
(room->frame_no - room->gas_data.gas_start_frameno); (room->frame_no - room->gas_data.gas_start_frameno);
gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000); gas_data->set_duration(std::max(duration * 50, (long long)1000) / 1000);
} }
#endif
} }
TypeConvert::ToPb(room->gas_data.pos_old, gas_data->mutable_pos_old()); TypeConvert::ToPb(room->gas_data.pos_old, gas_data->mutable_pos_old());
TypeConvert::ToPb(room->gas_data.pos_new, gas_data->mutable_pos_new()); TypeConvert::ToPb(room->gas_data.pos_new, gas_data->mutable_pos_new());