From 81457c38d809f96e34a04027ceb68a3d178ae3f7 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 10 Feb 2023 22:22:35 +0800 Subject: [PATCH] 1 --- server/gameserver/app.cc | 4 ++- server/gameserver/constant_export.h | 56 +++++++++++++++-------------- server/gameserver/selfchecker.cc | 12 ++++++- third_party/a8 | 2 +- 4 files changed, 44 insertions(+), 30 deletions(-) diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc index edbd159f..32365e79 100644 --- a/server/gameserver/app.cc +++ b/server/gameserver/app.cc @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -116,7 +117,6 @@ static void SavePerfLog() f8::HttpClientPool::Instance()->max_user_request_delay = 0; } - bool App::Init(int argc, char* argv[]) { signal(SIGPIPE, SIG_IGN); @@ -216,6 +216,8 @@ bool App::Init(int argc, char* argv[]) void App::UnInit() { + //const char* s2 = GetEnumString(); + //int i = static_cast(Test_e::kFlyBuffId); HttpProxy::Instance()->UnInit(); GGListener::Instance()->UnInit(); PlayerMgr::Instance()->UnInit(); diff --git a/server/gameserver/constant_export.h b/server/gameserver/constant_export.h index b70e2676..3fc318ba 100644 --- a/server/gameserver/constant_export.h +++ b/server/gameserver/constant_export.h @@ -1,32 +1,34 @@ #pragma once -const int kThroughWall_BUFFID = 6003; -const int FLY_BUFFID = 7001; -const int JUMP_BUFFID = 7002; -const int DRIVER_BUFFID = 7003; -const int PASSENGER_BUFFID = 7004; -const int kRecoilBuffId = 7005; -const int kInGrassBuffId = 7006; -const int kInIceBuffId = 7008; -const int kBeRecycleBuffId = 7009; -const int kTraceBuffId = 7011; -const int kInMountainTopBuffId = 7014; -const int kDownBuffId = 7015; -const int kPoisioningBuffId = 7016; -const int kRescuerBuffId = 7017; -const int kVertigoBuffId = 7018; -const int kPeaceModeBuffId = 7019; -const int kInRescueBuffId = 7020; -const int kKeepShotAnimiBuffId = 7021; -const int kVertigoEffectBuffId = 7022; -const int kDispelEffectBuffId = 7023; -const int kImmuneEffectBuffId = 7024; -const int kInWater1BuffId = 7026; -const int kInWater2BuffId = 7027; -const int kInWater3BuffId = 7028; -const int kPullToWalkableBuffId = 8003; -const int kDiveBuffId = 8054; -const int kInvincibleBuffId = 1005; +A8_DECLARE_ENUM(SpecBuffId_e, + kThroughWall_BUFFID = 6003, + FLY_BUFFID = 7001, + JUMP_BUFFID = 7002, + DRIVER_BUFFID = 7003, + PASSENGER_BUFFID = 7004, + kRecoilBuffId = 7005, + kInGrassBuffId = 7006, + kInIceBuffId = 7008, + kBeRecycleBuffId = 7009, + kTraceBuffId = 7011, + kInMountainTopBuffId = 7014, + kDownBuffId = 7015, + kPoisioningBuffId = 7016, + kRescuerBuffId = 7017, + kVertigoBuffId = 7018, + kPeaceModeBuffId = 7019, + kInRescueBuffId = 7020, + kKeepShotAnimiBuffId = 7021, + kVertigoEffectBuffId = 7022, + kDispelEffectBuffId = 7023, + kImmuneEffectBuffId = 7024, + kInWater1BuffId = 7026, + kInWater2BuffId = 7027, + kInWater3BuffId = 7028, + kPullToWalkableBuffId = 8003, + kDiveBuffId = 8054, + kInvincibleBuffId = 1005, +); enum BuffEffectType_e { diff --git a/server/gameserver/selfchecker.cc b/server/gameserver/selfchecker.cc index fc59dbfa..b5c039a1 100644 --- a/server/gameserver/selfchecker.cc +++ b/server/gameserver/selfchecker.cc @@ -4,7 +4,17 @@ void SelfChecker::Init() { - + std::set buff_list({ + 1005, + 1025, + 1039, + 202013, + 204014, + 209016, + kThroughWall_BUFFID, + FLY_BUFFID, + JUMP_BUFFID + }); } void SelfChecker::UnInit() diff --git a/third_party/a8 b/third_party/a8 index 10831019..cdab5283 160000 --- a/third_party/a8 +++ b/third_party/a8 @@ -1 +1 @@ -Subproject commit 1083101984bfa769c5dba834bbf494b12738c878 +Subproject commit cdab528313c06e9a6df5ae740a58f624b65332d3