From 256577b74b871ba02ceee58165a69749754d57db Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 30 Jul 2021 06:46:30 +0000 Subject: [PATCH 1/6] 1 --- server/gameserver/constant.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index 5a0c12e..ecc8a0c 100644 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -488,11 +488,7 @@ const int ADPLAY_BUFFID = 1006; const int FIXED_OBJECT_MAXID = 20140; -#ifdef DEBUG const int MAX_ROOM_IDX = 100; -#else -const int MAX_ROOM_IDX = 1024; -#endif const int VIEW_RANGE = 512; From bad1ecf78a9508c6f765ab0dd379d63527218d88 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 30 Jul 2021 07:22:22 +0000 Subject: [PATCH 2/6] 1 --- server/gameserver/trigger.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/gameserver/trigger.cc b/server/gameserver/trigger.cc index 96f9e42..09bbf93 100644 --- a/server/gameserver/trigger.cc +++ b/server/gameserver/trigger.cc @@ -295,7 +295,7 @@ void Trigger::TryAddBuffs(int cond, std::vector& buffids) #ifdef DEBUG owner_->MustBeAddBuff(owner_, buffid); #else - owner_->TryBeAddBuff(owner_, buffid); + owner_->TryAddBuff(owner_, buffid); #endif } } @@ -307,7 +307,7 @@ void Trigger::AddBuffs(int cond, std::vector& buffids) #ifdef DEBUG owner_->MustBeAddBuff(owner_, buffid); #else - owner_->TryBeAddBuff(owner_, buffid); + owner_->TryAddBuff(owner_, buffid); #endif } } From 41ad318626643653ef8f39b8361e9043a6cd8c2f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 30 Jul 2021 08:11:54 +0000 Subject: [PATCH 3/6] 1 --- server/gameserver/roommgr.cc | 4 ++++ server/tools/protobuild/cs_proto.proto | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index ce9518d..d0baab0 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -125,6 +125,10 @@ void RoomMgr::Update(int delta_time) void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg) { + if (msg.proto_version() < 2021073001) { + JoinErrorHandle(msg, 6, hdr.socket_handle); + return; + } if (IsLimitJoin()) { JoinErrorHandle(msg, 2, hdr.socket_handle); return; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 1fbbf88..cf5a591 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -50,7 +50,7 @@ package cs; //常量 enum Constant_e { - ProtoVersion = 2020081401; //系统版本 + ProtoVersion = 2021073001; //系统版本 } //心跳 From 7ccd02df823e5ab265c93b029c1cd0a5bdb10a16 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 30 Jul 2021 08:16:27 +0000 Subject: [PATCH 4/6] 1 --- server/gameserver/roommgr.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index d0baab0..ee74392 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -125,10 +125,13 @@ void RoomMgr::Update(int delta_time) 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()) { JoinErrorHandle(msg, 2, hdr.socket_handle); return; From 7611929d2945fe1591c98a2b493fbca909d0b7ea Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 30 Jul 2021 11:29:00 +0000 Subject: [PATCH 5/6] 1 --- server/gameserver/human.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 702da18..4d08ca7 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -121,8 +121,9 @@ float Human::GetSpeed() } speed = meta->i->move_speed(); } + float old_speed = speed; speed = (speed + GetAbility()->GetBuffAttrAbs(kHAT_Speed)) * - (1 + GetAbility()->GetBuffAttrRate(kHAT_Speed)); + (1 + GetAbility()->GetAttrRate(kHAT_Speed)); if (a8::HasBitFlag(cell_flags_, kColliderTag_Water)) { speed *= MetaMgr::Instance()->water_move_coefficient; } From 7bd90e90e640898d8240fc5450dfb974225a1e92 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 30 Jul 2021 11:32:41 +0000 Subject: [PATCH 6/6] 1 --- server/gameserver/human.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 4d08ca7..db6fbf1 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -122,7 +122,7 @@ float Human::GetSpeed() speed = meta->i->move_speed(); } float old_speed = speed; - speed = (speed + GetAbility()->GetBuffAttrAbs(kHAT_Speed)) * + speed = (speed + GetAbility()->GetAttrAbs(kHAT_Speed)) * (1 + GetAbility()->GetAttrRate(kHAT_Speed)); if (a8::HasBitFlag(cell_flags_, kColliderTag_Water)) { speed *= MetaMgr::Instance()->water_move_coefficient;