From 32520caba0c7d1eed3b48f71a6b3d1e3e3fe6037 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 21 Sep 2020 09:48:13 +0800 Subject: [PATCH] 1 --- server/rankserver/typeconvert.cc | 48 -------------------------------- server/rankserver/typeconvert.h | 17 ----------- server/rankserver/types.h | 40 -------------------------- 3 files changed, 105 deletions(-) diff --git a/server/rankserver/typeconvert.cc b/server/rankserver/typeconvert.cc index 625fbad..81bf18e 100644 --- a/server/rankserver/typeconvert.cc +++ b/server/rankserver/typeconvert.cc @@ -3,51 +3,3 @@ #include "typeconvert.h" #include "cs_proto.pb.h" #include "ss_proto.pb.h" - -void TypeConvert::Convert(const cs::MFBaseUserData& base_data_pb, BaseUserData& base_data) -{ - base_data.account_id = base_data_pb.account_id(); - base_data.nickname = base_data_pb.nickname(); - base_data.avatar_url = base_data_pb.avatar_url(); - base_data.sex = base_data_pb.sex(); - base_data.online = base_data_pb._online(); - #if 0 - base_data.group_id = base_data_pb.group_id(); - #endif - base_data.user_value1 = base_data_pb.user_value1(); - base_data.user_value2 = base_data_pb.user_value2(); - base_data.user_value3 = base_data_pb.user_value3(); - base_data.base_data_version = base_data_pb.base_data_version(); -} - -void TypeConvert::Convert(const BaseUserData& base_data, cs::MFBaseUserData& base_data_pb) -{ - base_data_pb.set_account_id(base_data.account_id); - base_data_pb.set_nickname(base_data.nickname); - base_data_pb.set_avatar_url(base_data.avatar_url); - base_data_pb.set_sex(base_data.sex); - base_data_pb.set__online(base_data.online); - #if 0 - base_data_pb.set_group_id(base_data.group_id); - #endif - base_data_pb.set_user_value1(base_data.user_value1); - base_data_pb.set_user_value2(base_data.user_value2); - base_data_pb.set_user_value3(base_data.user_value3); - base_data_pb.set_base_data_version(base_data.base_data_version); -} - -void TypeConvert::Convert(const cs::MFUserTempCustomData& temp_custom_data_pb, - UserTempCustomData& temp_custom_data) -{ - temp_custom_data.value1 = temp_custom_data_pb.value1(); - temp_custom_data.value2 = temp_custom_data_pb.value2(); - temp_custom_data.value3 = temp_custom_data_pb.value3(); -} - -void TypeConvert::Convert(const UserTempCustomData& temp_custom_data, - cs::MFUserTempCustomData& temp_custom_data_pb) -{ - temp_custom_data_pb.set_value1(temp_custom_data.value1); - temp_custom_data_pb.set_value2(temp_custom_data.value2); - temp_custom_data_pb.set_value3(temp_custom_data.value3); -} diff --git a/server/rankserver/typeconvert.h b/server/rankserver/typeconvert.h index 8d8a89d..f611181 100644 --- a/server/rankserver/typeconvert.h +++ b/server/rankserver/typeconvert.h @@ -1,23 +1,6 @@ #pragma once -namespace cs -{ - class MFBaseUserData; - class MFUserTempCustomData; -} - -namespace ss -{ - class MFBaseUserDataDB; -} - class TypeConvert { public: - static void Convert(const cs::MFBaseUserData& base_data_pb, BaseUserData& base_data); - static void Convert(const BaseUserData& base_data, cs::MFBaseUserData& base_data_pb); - static void Convert(const cs::MFUserTempCustomData& temp_custom_data_pb, - UserTempCustomData& temp_custom_data); - static void Convert(const UserTempCustomData& temp_custom_data, - cs::MFUserTempCustomData& temp_custom_data_pb); }; diff --git a/server/rankserver/types.h b/server/rankserver/types.h index 8d7f0fe..6f70f09 100755 --- a/server/rankserver/types.h +++ b/server/rankserver/types.h @@ -1,41 +1 @@ #pragma once - -struct BaseUserData -{ - std::string account_id; - std::string nickname; - std::string avatar_url; - int sex = 0; - int online = 0; - long long group_id = 0; - - long long user_value1 = 0; - long long user_value2 = 0; - long long user_value3 = 0; - - long long base_data_version = 0; -}; - -struct UserTempCustomData -{ - long long value1 = 0; - long long value2 = 0; - long long value3 = 0; -}; - -struct Friend -{ - BaseUserData base_data; - UserTempCustomData temp_custom_data; - - long long last_active_tick = 0; - list_head cache_entry; - list_head human_entry; - struct SvrNode* svr_node = nullptr; - - Friend() - { - INIT_LIST_HEAD(&human_entry); - INIT_LIST_HEAD(&cache_entry); - } -};