diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 6c0a571f..96b8d827 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -656,8 +656,6 @@ void Creature::RecalcBuffAttr() bool need_refresh_hp = false; for (auto& buff : buff_list_) { } - for (auto& tuple : talent_list) { - } if (need_refresh_hp) { SetHP(GetMaxHP()); GetTrigger()->HpChg(); diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h index db9f695e..6724e010 100644 --- a/server/gameserver/creature.h +++ b/server/gameserver/creature.h @@ -109,8 +109,6 @@ class Creature : public MoveableEntity glm::vec3 context_dir = GlmHelper::ZERO; std::shared_ptr context_ability; - std::vector> talent_list; - std::function on_loading_bullet; CreatureWeakPtr follow_target; diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 97a784ba..47496626 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -2426,13 +2426,6 @@ Player* PlayerMgr::CreatePlayerByCustomMember(Player* hum, } } #endif - #if 0 - for (auto& pair : msg.talent_list()) { - hum->talent_list.push_back( - std::make_tuple(pair.key(), pair.value()) - ); - } - #endif if (socket) { socket_hash_[socket] = hum; } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 27dd2a9c..849a2f6d 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -1539,26 +1539,10 @@ message MFBattlePreInfo message CMJoin { optional int32 server_id = 1; //serverid - optional string team_uuid = 2; //队伍唯一id (没组队时为空字符串) - optional string account_id = 3; //账号id account_id - optional int32 _team_mode = 4; //队伍模式 0:单人 1:多人 optional int32 proto_version = 5; //协议版本号Constant_e.ProtoVersion - optional bool _auto_fill = 6; //是否自动填充玩家 - optional string _name = 8; //角色名 - optional string _avatar_url = 11; //头像 - repeated MFWeapon _weapons = 17; //武器列表 + optional string account_id = 3; //账号id account_id optional string session_id = 20; //session_id - optional int32 _head_frame = 36 [default = 0]; //头像框 - optional int32 _sex = 37 [default = 0]; //性别 - repeated MFTeamMember _team_members = 51; //包括自己 - optional int32 _room_mode = 52; //0:吃鸡模式 1:pve 2:排位赛 3:moba - optional int32 _mapid = 53; //地图id 0:随机地图 - optional string _user_data = 60 [default = ""]; //用户自定义数据 - optional int32 _hero_id = 61; //英雄id - optional string _hero_uniid = 71; //英雄唯一id - optional int32 _pve_instance_id = 72; //pve副本id - optional int32 _team_slot_num = 73; //队伍槽位数1-4 - optional int32 _force_enter_newbie_room = 74; //强制进新手房 + optional string team_uuid = 2; //队伍唯一id optional string payload_data = 75; //透传数据 }