rename skin -> tank

server/gameserver/android.cc

@@ -26,14 +26,14 @@ void Android::Initialize()
 {
     Human::Initialize();
     SetSkinInfo(MetaMgr::Instance()->RandTank());
-    skin_meta = MetaMgr::Instance()->GetTank(SkinId());
+    tank_meta = MetaMgr::Instance()->GetTank(TankId());
-    if (skin_meta) {
+    if (tank_meta) {
-        skill_meta = MetaMgr::Instance()->GetSkill(skin_meta->i->skill_id());
+        skill_meta = MetaMgr::Instance()->GetSkill(tank_meta->i->skill_id());
     }
     GiveEquip();
-    MetaData::TankSkin* tank_skin_meta = MetaMgr::Instance()->GetTankSkin(SkinId());
+    MetaData::TankSkin* tank_tank_meta = MetaMgr::Instance()->GetTankSkin(TankId());
-    if (tank_skin_meta) {
+    if (tank_tank_meta) {
-        tankskin.skin_id = tank_skin_meta->i->tank_id();
+        tankskin.skin_id = tank_tank_meta->i->tank_id();
         tankskin.skin_lv = 1;
     }
     RecalcBaseAttr();
@@ -49,8 +49,8 @@ void Android::Update(int delta_time)
 
 void Android::GiveEquip()
 {
-    if (skin_meta) {
+    if (tank_meta) {
-        MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(skin_meta->i->bullet_id());
+        MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(tank_meta->i->bullet_id());
         if (weapon_meta) {
             weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;
             weapons[GUN_SLOT1].weapon_id = weapon_meta->i->id();

server/gameserver/human.cc

@@ -121,7 +121,7 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
     p->set_downed(downed);
     #endif
     p->set_disconnected(disconnected);
-    skin.ToPB(p->mutable_skin());
+    tank.ToPB(p->mutable_skin());
     p->set_backpack(backpack);
     p->set_helmet(helmet);
     p->set_chest(chest);
@@ -705,7 +705,7 @@ void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data)
             player_data->set_action_target_id(action_target_id);
         }
     }
-    skin.ToPB(player_data->mutable_skin());
+    tank.ToPB(player_data->mutable_skin());
     player_data->set_backpack(backpack);
     player_data->set_helmet(helmet);
     player_data->set_chest(chest);
@@ -1131,25 +1131,25 @@ int Human::GetSkinConfigLv(int skin_id)
 
 void Human::SetSkinInfo(int skin_id)
 {
-    skin.skin_id = skin_id;
+    tank.skin_id = skin_id;
-    if (skin.skin_id != 0){
+    if (tank.skin_id != 0){
-        skin.skin_lv = std::max(1, GetSkinConfigLv(skin.skin_id));
+        tank.skin_lv = std::max(1, GetSkinConfigLv(tank.skin_id));
     }
 }
 
-const Skin& Human::GetSkin()
+const Skin& Human::GetTank()
 {
-    return skin;
+    return tank;
 }
 
-int Human::SkinId()
+int Human::TankId()
 {
-    return skin.skin_id;
+    return tank.skin_id;
 }
 
-int Human::SkinLv()
+int Human::TankLv()
 {
-    return skin.skin_lv;
+    return tank.skin_lv;
 }
 
 int Human::GetSkillLeftTime()
@@ -1534,21 +1534,21 @@ float* Human::GetAbilityById(int attr_id)
 void Human::RecalcBaseAttr()
 {
     ability = HumanAbility();
-    if (skin_meta) {
+    if (tank_meta) {
-        for (auto& pair : skin_meta->attr_init) {
+        for (auto& pair : tank_meta->attr_init) {
             float* p_attr = GetAbilityById(pair.first);
             if (p_attr) {
                 *p_attr += pair.second;
             }
         }
-        for (auto& pair : skin_meta->attr_up) {
+        for (auto& pair : tank_meta->attr_up) {
             float* p_attr = GetAbilityById(pair.first);
             if (p_attr) {
-                *p_attr += (SkinLv() / std::get<1>(pair.second)) * std::get<0>(pair.second);
+                *p_attr += (TankLv() / std::get<1>(pair.second)) * std::get<0>(pair.second);
             }
         }
     }
-    if (driver_meta && skin_meta && driver_meta->i->g_type() == skin_meta->i->type()) {
+    if (driver_meta && tank_meta && driver_meta->i->g_type() == tank_meta->i->type()) {
         for (auto& pair : driver_meta->attr_up) {
             float* p_attr = GetAbilityById(pair.first);
             if (p_attr) {

server/gameserver/human.h

@@ -41,7 +41,7 @@ class Human : public Entity
     MetaData::Player* meta = nullptr;
     MetaData::Equip* helmet_meta = nullptr;
     MetaData::Equip* chest_meta = nullptr;
-    MetaData::Tank* skin_meta = nullptr;
+    MetaData::Tank* tank_meta = nullptr;
     MetaData::Skill* skill_meta = nullptr;
     MetaData::Driver* driver_meta = nullptr;
     HumanAbility ability;
@@ -183,9 +183,9 @@ class Human : public Entity
     int GetWeaponConfigLv(int weapon_id);
     int GetSkinConfigLv(int skin_id);
     void SetSkinInfo(int skin_id);
-    const Skin& GetSkin();
+    const Skin& GetTank();
-    int SkinId();
+    int TankId();
-    int SkinLv();
+    int TankLv();
     int GetSkillLeftTime();
     int GetSkillCd();
     void TriggerBuff(MetaData::Skill* sender_skill_meta,
@@ -266,7 +266,7 @@ private:
     bool already_report_battle_ = false;
     bool sent_game_end_ = false;
 
-    Skin skin;
+    Skin tank;
 
     xtimer_list* grass_hide_timer_list_ = nullptr;
     xtimer_list* leave_grass_timer_list_ = nullptr;

server/gameserver/metamgr.cc

@@ -33,7 +33,7 @@ public:
     std::list<MetaData::Dress> dress_list;
     std::list<metatable::Tank> tank_meta_list;
     std::list<MetaData::Tank> tank_list;
-    std::list<metatable::TankSkin> tankskin_meta_list;
+    std::list<metatable::TankSkin> tanktank_meta_list;
     std::list<MetaData::TankSkin> tankskin_list;
     std::list<metatable::Driver> driver_meta_list;
     std::list<MetaData::Driver> driver_list;
@@ -98,7 +98,7 @@ public:
         f8::ReadCsvMetaFile(res_path + "map@map.csv", map_meta_list);
         f8::ReadCsvMetaFile(res_path + "safearea@safearea.csv", safearea_meta_list);
         f8::ReadCsvMetaFile(res_path + "tank@tank.csv", tank_meta_list);
-        f8::ReadCsvMetaFile(res_path + "tankskin@tankskin.csv", tankskin_meta_list);
+        f8::ReadCsvMetaFile(res_path + "tankskin@tankskin.csv", tanktank_meta_list);
         f8::ReadCsvMetaFile(res_path + "driver@driver.csv", driver_meta_list);
         f8::ReadCsvMetaFile(res_path + "item@item.csv", item_meta_list);
         f8::ReadCsvMetaFile(res_path + "equip@equip.csv", equip_meta_list);
@@ -214,7 +214,7 @@ private:
             tankid_list.push_back(meta.id());
         }
 
-        for (auto& meta : tankskin_meta_list) {
+        for (auto& meta : tanktank_meta_list) {
             MetaData::TankSkin& item = a8::FastAppend(tankskin_list);
             item.i = &meta;
             tankskin_hash[item.i->tank_id()] = &item;

server/gameserver/player.cc

@@ -30,10 +30,10 @@ Player::~Player()
 void Player::Initialize()
 {
     Human::Initialize();
-    skin_meta = MetaMgr::Instance()->GetTank(SkinId());
+    tank_meta = MetaMgr::Instance()->GetTank(TankId());
-    if (skin_meta) {
+    if (tank_meta) {
-        skill_meta = MetaMgr::Instance()->GetSkill(skin_meta->i->skill_id());
+        skill_meta = MetaMgr::Instance()->GetSkill(tank_meta->i->skill_id());
-        MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(skin_meta->i->bullet_id());
+        MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(tank_meta->i->bullet_id());
         if (weapon_meta) {
             weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;
             weapons[GUN_SLOT1].weapon_id = weapon_meta->i->id();

server/gameserver/room.cc

@@ -500,7 +500,7 @@ Hero* Room::CreateHero(Human* hum)
     hero->move_dir = hum->move_dir;
     hero->attack_dir = hum->attack_dir;
     hero->master = hum;
-    hero->skin = hum->GetSkin();
+    hero->skin = hum->GetTank();
     hero->backpack = hum->backpack;
     hero->helmet = hum->helmet;
     hero->chest = hum->chest;