From 1624ee9293f386608519eb0e00067448cdaf60e9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 9 Sep 2022 09:45:39 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 12 ------------ server/gameserver/human.h | 5 ----- server/gameserver/playermgr.cc | 28 ---------------------------- 3 files changed, 45 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 028fb9a0..be8b6ab0 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -1888,18 +1888,6 @@ void Human::SendShowCountdown(const std::string& msg, int countdown) SendNotifyMsg(notifymsg); } -int Human::GetWeaponConfigLv(int weapon_id) -{ - auto itr = weapon_configs.find(weapon_id); - return itr != weapon_configs.end() ? itr->second : 0; -} - -int Human::GetSkinConfigLv(int skin_id) -{ - auto itr = skin_configs.find(skin_id); - return itr != skin_configs.end() ? itr->second : 0; -} - void Human::_UpdateMove(int speed) { if (HasBuffEffect(kBET_Vertigo)) { diff --git a/server/gameserver/human.h b/server/gameserver/human.h index 305d6053..df5de64b 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -213,9 +213,6 @@ class Human : public Creature long long send_msg_times = 0; std::vector spec_weapons; - Weapon grow_weapon; - std::map weapon_configs; - std::map skin_configs; std::map spoils_items; std::map battlein_items; @@ -310,8 +307,6 @@ class Human : public Creature void SendWxVoip(); void SendSysPiaoMsg(const std::string& msg, int color, int duration); void SendShowCountdown(const std::string& msg, int countdown); - int GetWeaponConfigLv(int weapon_id); - int GetSkinConfigLv(int skin_id); void OnDie(); void FreeDownedTimer(); void FreeReviveTimer(); diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc index 75c8baa5..fa183320 100644 --- a/server/gameserver/playermgr.cc +++ b/server/gameserver/playermgr.cc @@ -79,7 +79,6 @@ Player* PlayerMgr::CreatePlayerByCMJoin(Player* hum, if (item_meta && item_meta->i->type() == 7) { MetaData::Equip* equip_meta = MetaMgr::Instance()->GetEquip(item_meta->i->relationship()); if (equip_meta && equip_meta->i->equip_type() == EQUIP_TYPE_WEAPON) { - //hum->weapon_configs[weapon.weapon_id()] = weapon_lv; Weapon& spec_weapon = a8::FastAppend(hum->spec_weapons); spec_weapon.weapon_uniid = a8::XValue(weapon.weapon_uniid()); spec_weapon.weapon_id = item_meta->i->relationship(); @@ -90,33 +89,6 @@ Player* PlayerMgr::CreatePlayerByCMJoin(Player* hum, } } } -#if 0 - for (auto& weapon : msg.grow_weapons()) { - if (weapon.weapon_id() != 0) { - hum->grow_weapon.weapon_id = weapon.weapon_id(); - hum->grow_weapon.weapon_lv = weapon.weapon_lv(); - hum->grow_weapon.ammo = weapon.ammo(); - } - } -#endif - #if 0 - { - for (auto& skin : msg.skins()) { - if (skin.skin_id() != 0 && skin.skin_lv() > 0) { - hum->skin_configs[skin.skin_id()] = skin.skin_lv(); - } - } - } - #endif - #if 0 - { - int idx = 0; - for (int skin_id : msg.baseskin()) { - hum->SetSkin(idx, skin_id); - ++idx; - } - } - #endif #if 0 for (auto& pair : msg.talent_list()) { hum->talent_list.push_back(