diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index 9c8233ef..3b467bd0 100644 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -275,8 +275,8 @@ enum ObjectFlags_e enum RoomMode_e { kChiJiMode = 0, - kDestoryMode = 1, - kSurvivalMode = 2, + kDestoryMode = 2, + kSurvivalMode = 1, kRoomModeEnd }; diff --git a/server/gameserver/mapmgr.cc b/server/gameserver/mapmgr.cc index 55389a13..0f5d7f6e 100644 --- a/server/gameserver/mapmgr.cc +++ b/server/gameserver/mapmgr.cc @@ -58,7 +58,7 @@ void MapMgr::UnInit() void MapMgr::AttachRoom(Room* room, RoomInitInfo& init_info) { if (init_info.pve_instance_id) { - init_info.room_mode = (RoomMode_e)((rand() % 2) + 1 + (int)kChiJiMode); + init_info.room_mode = kSurvivalMode; room->pve_mode_meta = mt::PveGeminiMode::GetById(init_info.room_mode); if (!room->pve_mode_meta) { abort(); diff --git a/server/gameserver/mt/PveGemini.cc b/server/gameserver/mt/PveGemini.cc index 8306841d..d1c37132 100644 --- a/server/gameserver/mt/PveGemini.cc +++ b/server/gameserver/mt/PveGemini.cc @@ -23,6 +23,9 @@ namespace mt float PveGemini::GetHpMul(int num) const { +#if 1 + return 1; +#else if (num > 0 && num <= (int)hp_muls.size()) { return hp_muls[num - 1]; } @@ -30,6 +33,7 @@ namespace mt abort(); #endif return 0.5; +#endif } }