This commit is contained in:
aozhiwei 2024-03-26 21:01:17 +08:00
parent 90d9b1d90a
commit 17ad6805f1
8 changed files with 1 additions and 15 deletions

View File

@ -1,10 +1,5 @@
#pragma once
namespace MetaData
{
struct MapTplThing;
}
namespace mt
{
struct WorldObject;

View File

@ -40,7 +40,6 @@ void GameLog::GameStart(Player* hum)
prop->SetVal("map_id", hum->room->GetMapMeta()->map_id());
prop->SetVal("map_name", hum->room->GetMapMeta()->map_name());
prop->SetVal("map_tpl_name", hum->room->GetMapTplName());
f8::TGLog::Instance()->AddTrackLog(game_id, hum->account_id, hum->ip_saddr, logclass1, logclass2, prop.get());
}
@ -80,7 +79,6 @@ void GameLog::GameEnd(Player* hum)
prop->SetVal("map_id", hum->room->GetMapMeta()->map_id());
prop->SetVal("map_name", hum->room->GetMapMeta()->map_name());
prop->SetVal("map_tpl_name", hum->room->GetMapTplName());
if (!hum->dead) {
prop->SetVal("alive_time", hum->room->GetFrameNo() * 1000.0f / SERVER_FRAME_RATE);
} else {

View File

@ -996,7 +996,7 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
params->SetVal("map_id", room->GetMapMeta()->map_id());
params->SetVal("map_name", room->GetMapMeta()->map_name());
params->SetVal("team_mode", GetTeam() && GetTeam()->GetMemberNum() > 1 ? 1 : 0);
params->SetVal("map_tpl_name", room->GetMapTplName());
//params->SetVal("map_tpl_name", room->GetMapTplName());
params->SetVal("room_uuid", room->GetRoomUuid());
params->SetVal("room_mode", room->GetRoomMode());
params->SetVal("hero_id", meta->id());

View File

@ -219,7 +219,6 @@ void MapInstance::UnInit()
void MapInstance::AttachRoom(Room* room, RoomInitInfo& init_info)
{
init_info.map_tpl_name = map_tpl_name_;
init_info.map_meta = map_meta_;
init_info.grid_service = grid_service_;
init_info.map_service = map_service_;

View File

@ -6,13 +6,11 @@ namespace mt
class Hero;
class Map;
class MapThing;
class MapTplThing;
class Attr;
class FormulaPvp;
class GunQuality;
class GunTalentGrow;
class HeroQuality;
class MapTplThingJson;
class PveGemini;
class PveGeminiContent;
class PveGeminiMode;

View File

@ -91,7 +91,6 @@ void Room::InitData(RoomInitInfo& init_info)
room_type_ = init_info.room_type;
pve_human_num = init_info.pve_human_num;
map_tpl_name_ = init_info.map_tpl_name;
grid_service = init_info.grid_service;
map_service = init_info.map_service;
map_instance = init_info.map_instance;

View File

@ -115,7 +115,6 @@ public:
RoomMode_e GetRoomMode() { return room_mode_; }
std::string GetRoomUuid() { return room_uuid_; }
int GetRoomIdx() { return room_idx_; }
std::string GetMapTplName() { return map_tpl_name_; }
const mt::Map* GetMapMeta() { return map_meta_; }
bool IsBattleStarting() { return battle_starting_; };
std::shared_ptr<CustomBattle> GetCustomBattle() { return custom_battle_; }

View File

@ -18,7 +18,6 @@ namespace cs
namespace MetaData
{
struct Map;
struct MapTplThing;
}
class GridService;
@ -37,7 +36,6 @@ struct RoomInitInfo
int pve_human_num = 0;
const mt::Map* map_meta = nullptr;
std::string map_tpl_name;
std::shared_ptr<GridService> grid_service;
std::shared_ptr<MapService> map_service;
std::shared_ptr<MapInstance> map_instance;