From a15a050defee3d4a3e94a6ad546c4c9e67fb2ca8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 24 Nov 2023 12:35:14 +0800 Subject: [PATCH] 1 --- server/gameserver/android.cc | 23 ----------------------- server/gameserver/app.cc | 16 +--------------- server/gameserver/app.h | 16 ---------------- server/gameserver/commands.cc | 29 ----------------------------- server/gameserver/roomobstacle.cc | 7 ------- 5 files changed, 1 insertion(+), 90 deletions(-) diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index 00848c2c..e30ac008 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -84,29 +84,6 @@ void Android::Update(int delta_time) return; } } -#ifdef MYDEBUG - if (room->BattleStarted()) { - if (!dead && - room->debug_params.find(119) != room->debug_params.end()) { - BeKill(VP_Gas, - TEXT("battle_server_killer_gas", "毒圈"), - VW_Gas, - VP_Gas, - TEXT("battle_server_killer_gas", "毒圈")); - a8::UnSetBitFlag(status, CS_Disable); - } - if (!dead && - a8::HasBitFlag(status, CS_ForceTeam) && - App::Instance()->debug_params.find(120) != App::Instance()->debug_params.end()) { - BeKill(VP_Gas, - TEXT("battle_server_killer_gas", "毒圈"), - VW_Gas, - VP_Gas, - TEXT("battle_server_killer_gas", "毒圈")); - a8::UnSetBitFlag(status, CS_Disable); - } - } -#endif InternalUpdate(delta_time); shot_hold = false; CheckShotHold(); diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc index 74cd61b6..1eb83435 100644 --- a/server/gameserver/app.cc +++ b/server/gameserver/app.cc @@ -249,8 +249,6 @@ void App::UnInit() FreeSocketMsgQueue(); msg_mutex_ = nullptr; - loop_cond_ = nullptr; - loop_mutex_ = nullptr; } int App::Run() @@ -307,7 +305,7 @@ void App::AddSocketMsg(SocketFrom_e sockfrom, } ++msgnode_size_; msg_mutex_->unlock(); - NotifyLoopCond(); + f8::App::Instance()->NotifyLoopCond(); } void App::QuickExecute(int delta_time) @@ -322,18 +320,6 @@ void App::SlowerExecute(int delta_time) { } -void App::NotifyLoopCond() -{ - std::unique_lock lk(*loop_mutex_); - loop_cond_->notify_all(); -} - -void App::Schedule() -{ - std::unique_lock lk(*loop_mutex_); - loop_cond_->wait_for(lk, std::chrono::milliseconds(1)); -} - bool App::HasTask() { { diff --git a/server/gameserver/app.h b/server/gameserver/app.h index a6cd85e8..e3a1c29f 100644 --- a/server/gameserver/app.h +++ b/server/gameserver/app.h @@ -14,9 +14,6 @@ private: friend class a8::Singleton; public: - #ifdef MYDEBUG - std::map debug_params; - #endif virtual const std::string GetPkgName() override; virtual void Init() override; @@ -34,12 +31,8 @@ public: const char *msgbody, int bodylen); - void NotifyLoopCond(); - long long AllocTempHeroUniId(); long long AllocTempWeaponUniId(); - bool IsTestMode() const { return is_test_mode_; } - int GetTestParam() const { return test_param_; } bool IsServicing() const { return servicing_; } void SetServicing(bool open) { servicing_ = open; } int GetVersion(); @@ -47,7 +40,6 @@ public: private: void QuickExecute(int delta_time); void SlowerExecute(int delta_time); - void Schedule(); bool HasTask(); void DispatchMsg(); @@ -57,19 +49,11 @@ private: void InitLog(); void UnInitLog(); - bool ParseOpt(); void FreeSocketMsgQueue(); private: - - bool is_test_mode_ = false; - int test_param_ = 0; bool servicing_ = true; - long long last_run_tick_ = 0; - std::shared_ptr loop_mutex_; - std::shared_ptr loop_cond_; - std::shared_ptr msg_mutex_; MsgNode* top_node_ = nullptr; MsgNode* bot_node_ = nullptr; diff --git a/server/gameserver/commands.cc b/server/gameserver/commands.cc index f1d65612..8bcec145 100644 --- a/server/gameserver/commands.cc +++ b/server/gameserver/commands.cc @@ -192,39 +192,10 @@ void Player::_CMExecCommand(f8::MsgHdr* hdr, const cs::CMExecCommand& msg) } return true; }); - } else if (cmd == "set_inactive_time" && cmds.size() >= 2) { - #if MYDEBUG - App::Instance()->debug_params[1] = a8::XValue(cmds[1]); - #endif - } else if (cmd == "set_born_frameno_offset" && cmds.size() >= 2) { - #if MYDEBUG - App::Instance()->debug_params[118] = a8::XValue(cmds[1]); - #endif - } else if (cmd == "chiji") { - #if MYDEBUG - room->debug_params[119] = 1; - #endif - } else if (cmd == "airraid") { - #if MYDEBUG - room->debug_params[121] = 1; - #endif } else if (cmd == "next_raid") { #if MYDEBUG - room->debug_params[121] = 1; room->GetAirRaid()->NextRaid(); #endif - } else if (cmd == "autodie") { - #if MYDEBUG - if (cmds.size() >= 2) { - if (cmds[1] == "open") { - App::Instance()->debug_params[120] = 1; - } else if (cmds[1] == "close") { - App::Instance()->debug_params.erase(120); - } - } else { - App::Instance()->debug_params[120] = 1; - } - #endif } else if (cmd == "wudi") { int buff_uniid = TryAddBuff(this, 1005); if (buff_uniid != 0) { diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index 8b76d4aa..5d9065c5 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -54,13 +54,6 @@ void RoomObstacle::Initialize() room->mine_objects[GetUniId()] = GetWeakPtrRef(); } born_frameno = room->GetFrameNo(); -#ifdef MYDEBUG - { - if (App::Instance()->debug_params.find(118) != App::Instance()->debug_params.end()) { - born_frameno += App::Instance()->debug_params[118] * 2; - } - } -#endif } void RoomObstacle::ActiveTimerFunc()