This commit is contained in:
aozhiwei 2023-07-19 16:08:22 +08:00
parent a676e22867
commit 00ef4b98a3
4 changed files with 19 additions and 1 deletions

View File

@ -19,6 +19,8 @@ namespace mt
{ {
{ {
s_.gas_inactive_time = GetIntParam("gas_inactive_time"); s_.gas_inactive_time = GetIntParam("gas_inactive_time");
s_.rank_gas_inactive_time = GetIntParam("rank_gas_inactive_time", 40);
s_.master_rank_gas_inactive_time = GetIntParam("rank_gas_inactive_time", 60);
s_.downed_relive_recover_hp = GetIntParam("downed_relive_recover_hp"); s_.downed_relive_recover_hp = GetIntParam("downed_relive_recover_hp");

View File

@ -13,6 +13,8 @@ namespace mt
struct S { struct S {
int android_auto_combine_team = 1; int android_auto_combine_team = 1;
int gas_inactive_time = 10; int gas_inactive_time = 10;
int rank_gas_inactive_time = 40;
int master_rank_gas_inactive_time = 60;
float kill_param = 0.0f; float kill_param = 0.0f;
float rank_param = 0.0f; float rank_param = 0.0f;
int fighting_mode = 0; int fighting_mode = 0;

View File

@ -2278,10 +2278,18 @@ long long Room::GetGasInactiveTime()
#endif #endif
if (IsPveRoom()) { if (IsPveRoom()) {
return 10; return 10;
} else {
if (IsPvpRankModeRoom()) {
if (IsPvpMasterRankModeRoom()) {
return mt::Param::s().master_rank_gas_inactive_time;
} else {
return mt::Param::s().rank_gas_inactive_time;
}
} else { } else {
return mt::Param::s().gas_inactive_time; return mt::Param::s().gas_inactive_time;
} }
} }
}
long long Room::GetGasInactiveReaminTime() long long Room::GetGasInactiveReaminTime()
{ {
@ -3498,3 +3506,8 @@ bool Room::MoveCanReach(const glm::vec3& start, const glm::vec3& end)
{ {
return BulletCanReach(start, end); return BulletCanReach(start, end);
} }
bool Room::IsPvpMasterRankModeRoom()
{
return false;
}

View File

@ -116,6 +116,7 @@ public:
bool IsSurvivalRoom(); bool IsSurvivalRoom();
bool IsNewBieRoom(); bool IsNewBieRoom();
bool IsPvpRankModeRoom() { return GetRoomMode() == kPvpRankMode; } bool IsPvpRankModeRoom() { return GetRoomMode() == kPvpRankMode; }
bool IsPvpMasterRankModeRoom();
int GetPlayerNum(); int GetPlayerNum();
int GetHumanNum(); int GetHumanNum();