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

merge test

Browse Source
This commit is contained in:
aozhiwei 2021-08-02 14:50:38 +08:00
commit c4aa0c1a97
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/constant.h
View File

@ -488,11 +488,7 @@ const int ADPLAY_BUFFID = 1006;
const int FIXED_OBJECT_MAXID = 20140; const int FIXED_OBJECT_MAXID = 20140;
#ifdef DEBUG
const int MAX_ROOM_IDX = 100; const int MAX_ROOM_IDX = 100;
#else
const int MAX_ROOM_IDX = 1024;
#endif
const int VIEW_RANGE = 512; const int VIEW_RANGE = 512;

5
server/gameserver/human.cc
View File

@ -121,8 +121,9 @@ float Human::GetSpeed()
} }
speed = meta->i->move_speed(); speed = meta->i->move_speed();
} }
speed = (speed + GetAbility()->GetBuffAttrAbs(kHAT_Speed)) * float old_speed = speed;
(1 + GetAbility()->GetBuffAttrRate(kHAT_Speed)); speed = (speed + GetAbility()->GetAttrAbs(kHAT_Speed)) *
(1 + GetAbility()->GetAttrRate(kHAT_Speed));
if (a8::HasBitFlag(cell_flags_, kColliderTag_Water)) { if (a8::HasBitFlag(cell_flags_, kColliderTag_Water)) {
speed *= MetaMgr::Instance()->water_move_coefficient; speed *= MetaMgr::Instance()->water_move_coefficient;
} }

7
server/gameserver/roommgr.cc
View File

@ -125,6 +125,13 @@ void RoomMgr::Update(int delta_time)
void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg) void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
{ {
#ifdef DEBUG
#else
if (msg.proto_version() < 2021073001) {
JoinErrorHandle(msg, 6, hdr.socket_handle);
return;
}
#endif
if (IsLimitJoin()) { if (IsLimitJoin()) {
JoinErrorHandle(msg, 2, hdr.socket_handle); JoinErrorHandle(msg, 2, hdr.socket_handle);
return; return;

4
server/gameserver/trigger.cc
View File

@ -295,7 +295,7 @@ void Trigger::TryAddBuffs(int cond, std::vector<int>& buffids)
#ifdef DEBUG #ifdef DEBUG
owner_->MustBeAddBuff(owner_, buffid); owner_->MustBeAddBuff(owner_, buffid);
#else #else
owner_->TryBeAddBuff(owner_, buffid); owner_->TryAddBuff(owner_, buffid);
#endif #endif
} }
} }
@ -307,7 +307,7 @@ void Trigger::AddBuffs(int cond, std::vector<int>& buffids)
#ifdef DEBUG #ifdef DEBUG
owner_->MustBeAddBuff(owner_, buffid); owner_->MustBeAddBuff(owner_, buffid);
#else #else
owner_->TryBeAddBuff(owner_, buffid); owner_->TryAddBuff(owner_, buffid);
#endif #endif
} }
} }

2
server/tools/protobuild/cs_proto.proto
View File

@ -50,7 +50,7 @@ package cs;
//常量 //常量
enum Constant_e enum Constant_e
{ {
ProtoVersion = 2020081401; //系统版本 ProtoVersion = 2021073001; //系统版本
} }
//心跳 //心跳