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

1

Browse Source
This commit is contained in:
aozhiwei 2023-11-20 16:17:16 +08:00
parent 41b32e5f5f
commit a9a49026bb
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/app.cc
View File

@ -233,10 +233,10 @@ void App::UnInit()
{ {
//const char* s2 = GetEnumString<int>(); //const char* s2 = GetEnumString<int>();
//int i = static_cast<int>(Test_e::kFlyBuffId); //int i = static_cast<int>(Test_e::kFlyBuffId);
HttpProxy::Instance()->UnInit();
GGListener::Instance()->UnInit();
PlayerMgr::Instance()->UnInit(); PlayerMgr::Instance()->UnInit();
RoomMgr::Instance()->UnInit(); RoomMgr::Instance()->UnInit();
HttpProxy::Instance()->UnInit();
GGListener::Instance()->UnInit();
MapMgr::Instance()->UnInit(); MapMgr::Instance()->UnInit();
MatchMgr::Instance()->UnInit(); MatchMgr::Instance()->UnInit();
KillMgr::Instance()->UnInit(); KillMgr::Instance()->UnInit();

1
server/gameserver/app.h
View File

@ -39,6 +39,7 @@ public:
long long AllocTempHeroUniId(); long long AllocTempHeroUniId();
long long AllocTempWeaponUniId(); long long AllocTempWeaponUniId();
void Terminate() { terminated_ = true; } void Terminate() { terminated_ = true; }
bool Terminated() { return terminated_; }
int GetInstanceId() const { return instance_id_; } int GetInstanceId() const { return instance_id_; }
int GetZoneId() const { return zone_id_; } int GetZoneId() const { return zone_id_; }
int GetNodeId() const { return node_id_; } int GetNodeId() const { return node_id_; }

5
server/gameserver/httpproxy.cc
View File

@ -58,7 +58,7 @@ void HttpProxy::Init()
void HttpProxy::UnInit() void HttpProxy::UnInit()
{ {
request_hash_.clear();
} }
std::string HttpProxy::HttpGet( std::string HttpProxy::HttpGet(
@ -67,6 +67,9 @@ std::string HttpProxy::HttpGet(
a8::XObject url_params a8::XObject url_params
) )
{ {
if (App::Instance()->Terminated()) {
return "";
}
std::shared_ptr<HttpProxyRequest> request = std::make_shared<HttpProxyRequest>(); std::shared_ptr<HttpProxyRequest> request = std::make_shared<HttpProxyRequest>();
request->req_id = CreateRequestId(); request->req_id = CreateRequestId();
request->cb = cb; request->cb = cb;

2
server/gameserver/roommgr.cc
View File

@ -84,9 +84,11 @@ void RoomMgr::Init()
void RoomMgr::UnInit() void RoomMgr::UnInit()
{ {
for (auto& pair : room_hash_) { for (auto& pair : room_hash_) {
pair.second->ForceOver();
pair.second->UnInit(); pair.second->UnInit();
} }
for (auto& pair : over_room_hash_) { for (auto& pair : over_room_hash_) {
pair.second->ForceOver();
pair.second->UnInit(); pair.second->UnInit();
} }
inactive_room_hash_.clear(); inactive_room_hash_.clear();