From 07ec059e24f8cbae50a524c6d4296d96f6731bd6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 16 Jun 2020 17:49:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90masterserver?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/masterserver/typeconvert.cc | 48 ++++++++++++++++++++----------
 server/masterserver/typeconvert.h  |  6 ++--
 server/masterserver/types.h        |  2 +-
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/server/masterserver/typeconvert.cc b/server/masterserver/typeconvert.cc
index dcdacb3..625fbad 100644
--- a/server/masterserver/typeconvert.cc
+++ b/server/masterserver/typeconvert.cc
@@ -4,34 +4,50 @@
 #include "cs_proto.pb.h"
 #include "ss_proto.pb.h"
 
-void TypeConvert::Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& base_data_pb)
-{
-
-}
-
-void TypeConvert::Convert(const ss::MFBaseUserDataDB& base_data_pb, const BaseUserData& base_data)
-{
-
-}
-
 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& tmpe_custom_data_pb,
+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& tmpe_custom_data_pb)
+                          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/masterserver/typeconvert.h b/server/masterserver/typeconvert.h
index 174f26f..8d8a89d 100644
--- a/server/masterserver/typeconvert.h
+++ b/server/masterserver/typeconvert.h
@@ -14,12 +14,10 @@ namespace ss
 class TypeConvert
 {
  public:
-    static void Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& base_data_pb);
-    static void Convert(const ss::MFBaseUserDataDB& base_data_pb, const BaseUserData& base_data);
     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& tmpe_custom_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& tmpe_custom_data_pb);
+                        cs::MFUserTempCustomData& temp_custom_data_pb);
 };
diff --git a/server/masterserver/types.h b/server/masterserver/types.h
index 3fa483e..be52745 100755
--- a/server/masterserver/types.h
+++ b/server/masterserver/types.h
@@ -22,7 +22,7 @@ struct BaseUserData
     long long user_value2 = 0;
     long long user_value3 = 0;
 
-    long long data_version1 = 0;
+    long long base_data_version = 0;
 };
 
 struct UserTempCustomData