Merge branch 'develop' of http://8.134.253.64:3000/huangjinghao/FishConfig into develop

GameConfig/CFG.check

@@ -1,13 +1,13 @@
 D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:-1668593709
 D:\git\newWork\Config\GameConfig\M_monster.xls:-1235680395
-D:\git\newWork\Config\GameConfig\M_i18n.xls:2045041255
+D:\git\newWork\Config\GameConfig\M_i18n.xls:675196421
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:84348074
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:949185213
 D:\git\newWork\Config\GameConfig\M_vip_config.xls:1878630432
 D:\git\newWork\Config\GameConfig\M_equipment.xls:32694818
 D:\git\newWork\Config\GameConfig\M_game_level_config.xls:-610292667
 D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-124973679
-D:\git\newWork\Config\GameConfig\M_shop.xls:-598498963
+D:\git\newWork\Config\GameConfig\M_shop.xls:81637466
 D:\git\newWork\Config\GameConfig\M_item.xls:1652899797
 D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:435403286
 D:\git\newWork\Config\GameConfig\M_Global_Config.xls:-1360155821

protocol/client2center_msg_type.pb.cc

@@ -1,101 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: client2center_msg_type.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "client2center_msg_type.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace client2center_protocols {
-
-namespace {
-
-const ::google::protobuf::EnumDescriptor* e_server_msg_type_descriptor_ = NULL;
-
-}  // namespace
-
-
-void protobuf_AssignDesc_client2center_5fmsg_5ftype_2eproto() {
-  protobuf_AddDesc_client2center_5fmsg_5ftype_2eproto();
-  const ::google::protobuf::FileDescriptor* file =
-    ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
-      "client2center_msg_type.proto");
-  GOOGLE_CHECK(file != NULL);
-  e_server_msg_type_descriptor_ = file->enum_type(0);
-}
-
-namespace {
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
-inline void protobuf_AssignDescriptorsOnce() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
-                 &protobuf_AssignDesc_client2center_5fmsg_5ftype_2eproto);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-}
-
-}  // namespace
-
-void protobuf_ShutdownFile_client2center_5fmsg_5ftype_2eproto() {
-}
-
-void protobuf_AddDesc_client2center_5fmsg_5ftype_2eproto() {
-  static bool already_here = false;
-  if (already_here) return;
-  already_here = true;
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-    "\n\034client2center_msg_type.proto\022\027client2c"
-    "enter_protocols*\271\001\n\021e_server_msg_type\022\032\n"
-    "\024e_mst_start_c2center\020\260\352\001\022#\n\035e_mst_c2cen"
-    "ter_player_connect\020\261\352\001\022\032\n\024e_mst_start_ce"
-    "nter2c\020\270\221\002\022*\n$e_mst_center2c_player_conn"
-    "ect_result\020\271\221\002\022\033\n\025e_mst_centerend_index\020"
-    "\300\270\002", 243);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "client2center_msg_type.proto", &protobuf_RegisterTypes);
-  ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_client2center_5fmsg_5ftype_2eproto);
-}
-
-// Force AddDescriptors() to be called at static initialization time.
-struct StaticDescriptorInitializer_client2center_5fmsg_5ftype_2eproto {
-  StaticDescriptorInitializer_client2center_5fmsg_5ftype_2eproto() {
-    protobuf_AddDesc_client2center_5fmsg_5ftype_2eproto();
-  }
-} static_descriptor_initializer_client2center_5fmsg_5ftype_2eproto_;
-const ::google::protobuf::EnumDescriptor* e_server_msg_type_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return e_server_msg_type_descriptor_;
-}
-bool e_server_msg_type_IsValid(int value) {
-  switch(value) {
-    case 30000:
-    case 30001:
-    case 35000:
-    case 35001:
-    case 40000:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace client2center_protocols
-
-// @@protoc_insertion_point(global_scope)

protocol/client2center_msg_type.pb.h

@@ -1,86 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: client2center_msg_type.proto
-
-#ifndef PROTOBUF_client2center_5fmsg_5ftype_2eproto__INCLUDED
-#define PROTOBUF_client2center_5fmsg_5ftype_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 2005000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 2005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_enum_reflection.h>
-// @@protoc_insertion_point(includes)
-
-namespace client2center_protocols {
-
-// Internal implementation detail -- do not call these.
-void  protobuf_AddDesc_client2center_5fmsg_5ftype_2eproto();
-void protobuf_AssignDesc_client2center_5fmsg_5ftype_2eproto();
-void protobuf_ShutdownFile_client2center_5fmsg_5ftype_2eproto();
-
-
-enum e_server_msg_type {
-  e_mst_start_c2center = 30000,
-  e_mst_c2center_player_connect = 30001,
-  e_mst_start_center2c = 35000,
-  e_mst_center2c_player_connect_result = 35001,
-  e_mst_centerend_index = 40000
-};
-bool e_server_msg_type_IsValid(int value);
-const e_server_msg_type e_server_msg_type_MIN = e_mst_start_c2center;
-const e_server_msg_type e_server_msg_type_MAX = e_mst_centerend_index;
-const int e_server_msg_type_ARRAYSIZE = e_server_msg_type_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* e_server_msg_type_descriptor();
-inline const ::std::string& e_server_msg_type_Name(e_server_msg_type value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    e_server_msg_type_descriptor(), value);
-}
-inline bool e_server_msg_type_Parse(
-    const ::std::string& name, e_server_msg_type* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<e_server_msg_type>(
-    e_server_msg_type_descriptor(), name, value);
-}
-// ===================================================================
-
-
-// ===================================================================
-
-
-// ===================================================================
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace client2center_protocols
-
-#ifndef SWIG
-namespace google {
-namespace protobuf {
-
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::client2center_protocols::e_server_msg_type>() {
-  return ::client2center_protocols::e_server_msg_type_descriptor();
-}
-
-}  // namespace google
-}  // namespace protobuf
-#endif  // SWIG
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_client2center_5fmsg_5ftype_2eproto__INCLUDED

protocol/client2center_msg_type.proto

@@ -1,18 +0,0 @@
-package client2center_protocols;
-
-enum e_server_msg_type 
-{
-    e_mst_start_c2center = 30000;
-
-	e_mst_c2center_player_connect = 30001;	// 鯤소젯쌈
-
-
-
-	// 륩蛟똥돕와빵똥---------------------------------------------------------------------------
-	e_mst_start_center2c = 35000;
-
-	e_mst_center2c_player_connect_result = 35001;  // 鯤소젯쌈럿쀼
-
-
-	e_mst_centerend_index = 40000;
-}

protocol/client2center_protocol.pb.cc

@@ -1,661 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: client2center_protocol.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "client2center_protocol.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace client2center_protocols {
-
-namespace {
-
-const ::google::protobuf::Descriptor* packetc2center_player_connect_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  packetc2center_player_connect_reflection_ = NULL;
-const ::google::protobuf::Descriptor* packetcenter2c_player_connect_result_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  packetcenter2c_player_connect_result_reflection_ = NULL;
-
-}  // namespace
-
-
-void protobuf_AssignDesc_client2center_5fprotocol_2eproto() {
-  protobuf_AddDesc_client2center_5fprotocol_2eproto();
-  const ::google::protobuf::FileDescriptor* file =
-    ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
-      "client2center_protocol.proto");
-  GOOGLE_CHECK(file != NULL);
-  packetc2center_player_connect_descriptor_ = file->message_type(0);
-  static const int packetc2center_player_connect_offsets_[2] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(packetc2center_player_connect, packet_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(packetc2center_player_connect, connectinfo_),
-  };
-  packetc2center_player_connect_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      packetc2center_player_connect_descriptor_,
-      packetc2center_player_connect::default_instance_,
-      packetc2center_player_connect_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(packetc2center_player_connect, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(packetc2center_player_connect, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(packetc2center_player_connect));
-  packetcenter2c_player_connect_result_descriptor_ = file->message_type(1);
-  static const int packetcenter2c_player_connect_result_offsets_[2] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(packetcenter2c_player_connect_result, packet_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(packetcenter2c_player_connect_result, resultinfo_),
-  };
-  packetcenter2c_player_connect_result_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      packetcenter2c_player_connect_result_descriptor_,
-      packetcenter2c_player_connect_result::default_instance_,
-      packetcenter2c_player_connect_result_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(packetcenter2c_player_connect_result, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(packetcenter2c_player_connect_result, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(packetcenter2c_player_connect_result));
-}
-
-namespace {
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
-inline void protobuf_AssignDescriptorsOnce() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
-                 &protobuf_AssignDesc_client2center_5fprotocol_2eproto);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    packetc2center_player_connect_descriptor_, &packetc2center_player_connect::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    packetcenter2c_player_connect_result_descriptor_, &packetcenter2c_player_connect_result::default_instance());
-}
-
-}  // namespace
-
-void protobuf_ShutdownFile_client2center_5fprotocol_2eproto() {
-  delete packetc2center_player_connect::default_instance_;
-  delete packetc2center_player_connect_reflection_;
-  delete packetcenter2c_player_connect_result::default_instance_;
-  delete packetcenter2c_player_connect_result_reflection_;
-}
-
-void protobuf_AddDesc_client2center_5fprotocol_2eproto() {
-  static bool already_here = false;
-  if (already_here) return;
-  already_here = true;
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::client2center_protocols::protobuf_AddDesc_client2center_5fmsg_5ftype_2eproto();
-  ::msg_type_def::protobuf_AddDesc_msg_5ftype_5fdef_2eproto();
-  ::msg_info_def::protobuf_AddDesc_msg_5finfo_5fdef_2eproto();
-  ::common_protocol::protobuf_AddDesc_common_5fprotocol_2eproto();
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-    "\n\034client2center_protocol.proto\022\027client2c"
-    "enter_protocols\032\034client2center_msg_type."
-    "proto\032\022msg_type_def.proto\032\022msg_info_def."
-    "proto\032\025common_protocol.proto\"\262\001\n\035packetc"
-    "2center_player_connect\022\\\n\tpacket_id\030\001 \001("
-    "\0162*.client2center_protocols.e_server_msg"
-    "_type:\035e_mst_c2center_player_connect\0223\n\013"
-    "connectInfo\030\002 \001(\0132\036.common_protocol.Play"
-    "erConnect\"\305\001\n$packetcenter2c_player_conn"
-    "ect_result\022c\n\tpacket_id\030\001 \001(\0162*.client2c"
-    "enter_protocols.e_server_msg_type:$e_mst"
-    "_center2c_player_connect_result\0228\n\nresul"
-    "tInfo\030\002 \001(\0132$.common_protocol.PlayerConn"
-    "ectResult", 529);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "client2center_protocol.proto", &protobuf_RegisterTypes);
-  packetc2center_player_connect::default_instance_ = new packetc2center_player_connect();
-  packetcenter2c_player_connect_result::default_instance_ = new packetcenter2c_player_connect_result();
-  packetc2center_player_connect::default_instance_->InitAsDefaultInstance();
-  packetcenter2c_player_connect_result::default_instance_->InitAsDefaultInstance();
-  ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_client2center_5fprotocol_2eproto);
-}
-
-// Force AddDescriptors() to be called at static initialization time.
-struct StaticDescriptorInitializer_client2center_5fprotocol_2eproto {
-  StaticDescriptorInitializer_client2center_5fprotocol_2eproto() {
-    protobuf_AddDesc_client2center_5fprotocol_2eproto();
-  }
-} static_descriptor_initializer_client2center_5fprotocol_2eproto_;
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int packetc2center_player_connect::kPacketIdFieldNumber;
-const int packetc2center_player_connect::kConnectInfoFieldNumber;
-#endif  // !_MSC_VER
-
-packetc2center_player_connect::packetc2center_player_connect()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void packetc2center_player_connect::InitAsDefaultInstance() {
-  connectinfo_ = const_cast< ::common_protocol::PlayerConnect*>(&::common_protocol::PlayerConnect::default_instance());
-}
-
-packetc2center_player_connect::packetc2center_player_connect(const packetc2center_player_connect& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void packetc2center_player_connect::SharedCtor() {
-  _cached_size_ = 0;
-  packet_id_ = 30001;
-  connectinfo_ = NULL;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-packetc2center_player_connect::~packetc2center_player_connect() {
-  SharedDtor();
-}
-
-void packetc2center_player_connect::SharedDtor() {
-  if (this != default_instance_) {
-    delete connectinfo_;
-  }
-}
-
-void packetc2center_player_connect::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* packetc2center_player_connect::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return packetc2center_player_connect_descriptor_;
-}
-
-const packetc2center_player_connect& packetc2center_player_connect::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_client2center_5fprotocol_2eproto();
-  return *default_instance_;
-}
-
-packetc2center_player_connect* packetc2center_player_connect::default_instance_ = NULL;
-
-packetc2center_player_connect* packetc2center_player_connect::New() const {
-  return new packetc2center_player_connect;
-}
-
-void packetc2center_player_connect::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    packet_id_ = 30001;
-    if (has_connectinfo()) {
-      if (connectinfo_ != NULL) connectinfo_->::common_protocol::PlayerConnect::Clear();
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool packetc2center_player_connect::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_c2center_player_connect];
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::client2center_protocols::e_server_msg_type_IsValid(value)) {
-            set_packet_id(static_cast< ::client2center_protocols::e_server_msg_type >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(1, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(18)) goto parse_connectInfo;
-        break;
-      }
-
-      // optional .common_protocol.PlayerConnect connectInfo = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_connectInfo:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_connectinfo()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void packetc2center_player_connect::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_c2center_player_connect];
-  if (has_packet_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->packet_id(), output);
-  }
-
-  // optional .common_protocol.PlayerConnect connectInfo = 2;
-  if (has_connectinfo()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->connectinfo(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* packetc2center_player_connect::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_c2center_player_connect];
-  if (has_packet_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->packet_id(), target);
-  }
-
-  // optional .common_protocol.PlayerConnect connectInfo = 2;
-  if (has_connectinfo()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->connectinfo(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int packetc2center_player_connect::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_c2center_player_connect];
-    if (has_packet_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->packet_id());
-    }
-
-    // optional .common_protocol.PlayerConnect connectInfo = 2;
-    if (has_connectinfo()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->connectinfo());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void packetc2center_player_connect::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const packetc2center_player_connect* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const packetc2center_player_connect*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void packetc2center_player_connect::MergeFrom(const packetc2center_player_connect& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_packet_id()) {
-      set_packet_id(from.packet_id());
-    }
-    if (from.has_connectinfo()) {
-      mutable_connectinfo()->::common_protocol::PlayerConnect::MergeFrom(from.connectinfo());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void packetc2center_player_connect::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void packetc2center_player_connect::CopyFrom(const packetc2center_player_connect& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool packetc2center_player_connect::IsInitialized() const {
-
-  return true;
-}
-
-void packetc2center_player_connect::Swap(packetc2center_player_connect* other) {
-  if (other != this) {
-    std::swap(packet_id_, other->packet_id_);
-    std::swap(connectinfo_, other->connectinfo_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata packetc2center_player_connect::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = packetc2center_player_connect_descriptor_;
-  metadata.reflection = packetc2center_player_connect_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int packetcenter2c_player_connect_result::kPacketIdFieldNumber;
-const int packetcenter2c_player_connect_result::kResultInfoFieldNumber;
-#endif  // !_MSC_VER
-
-packetcenter2c_player_connect_result::packetcenter2c_player_connect_result()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void packetcenter2c_player_connect_result::InitAsDefaultInstance() {
-  resultinfo_ = const_cast< ::common_protocol::PlayerConnectResult*>(&::common_protocol::PlayerConnectResult::default_instance());
-}
-
-packetcenter2c_player_connect_result::packetcenter2c_player_connect_result(const packetcenter2c_player_connect_result& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void packetcenter2c_player_connect_result::SharedCtor() {
-  _cached_size_ = 0;
-  packet_id_ = 35001;
-  resultinfo_ = NULL;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-packetcenter2c_player_connect_result::~packetcenter2c_player_connect_result() {
-  SharedDtor();
-}
-
-void packetcenter2c_player_connect_result::SharedDtor() {
-  if (this != default_instance_) {
-    delete resultinfo_;
-  }
-}
-
-void packetcenter2c_player_connect_result::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* packetcenter2c_player_connect_result::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return packetcenter2c_player_connect_result_descriptor_;
-}
-
-const packetcenter2c_player_connect_result& packetcenter2c_player_connect_result::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_client2center_5fprotocol_2eproto();
-  return *default_instance_;
-}
-
-packetcenter2c_player_connect_result* packetcenter2c_player_connect_result::default_instance_ = NULL;
-
-packetcenter2c_player_connect_result* packetcenter2c_player_connect_result::New() const {
-  return new packetcenter2c_player_connect_result;
-}
-
-void packetcenter2c_player_connect_result::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    packet_id_ = 35001;
-    if (has_resultinfo()) {
-      if (resultinfo_ != NULL) resultinfo_->::common_protocol::PlayerConnectResult::Clear();
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool packetcenter2c_player_connect_result::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_center2c_player_connect_result];
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::client2center_protocols::e_server_msg_type_IsValid(value)) {
-            set_packet_id(static_cast< ::client2center_protocols::e_server_msg_type >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(1, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(18)) goto parse_resultInfo;
-        break;
-      }
-
-      // optional .common_protocol.PlayerConnectResult resultInfo = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_resultInfo:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_resultinfo()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void packetcenter2c_player_connect_result::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_center2c_player_connect_result];
-  if (has_packet_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->packet_id(), output);
-  }
-
-  // optional .common_protocol.PlayerConnectResult resultInfo = 2;
-  if (has_resultinfo()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->resultinfo(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* packetcenter2c_player_connect_result::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_center2c_player_connect_result];
-  if (has_packet_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->packet_id(), target);
-  }
-
-  // optional .common_protocol.PlayerConnectResult resultInfo = 2;
-  if (has_resultinfo()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->resultinfo(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int packetcenter2c_player_connect_result::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_center2c_player_connect_result];
-    if (has_packet_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->packet_id());
-    }
-
-    // optional .common_protocol.PlayerConnectResult resultInfo = 2;
-    if (has_resultinfo()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->resultinfo());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void packetcenter2c_player_connect_result::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const packetcenter2c_player_connect_result* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const packetcenter2c_player_connect_result*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void packetcenter2c_player_connect_result::MergeFrom(const packetcenter2c_player_connect_result& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_packet_id()) {
-      set_packet_id(from.packet_id());
-    }
-    if (from.has_resultinfo()) {
-      mutable_resultinfo()->::common_protocol::PlayerConnectResult::MergeFrom(from.resultinfo());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void packetcenter2c_player_connect_result::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void packetcenter2c_player_connect_result::CopyFrom(const packetcenter2c_player_connect_result& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool packetcenter2c_player_connect_result::IsInitialized() const {
-
-  return true;
-}
-
-void packetcenter2c_player_connect_result::Swap(packetcenter2c_player_connect_result* other) {
-  if (other != this) {
-    std::swap(packet_id_, other->packet_id_);
-    std::swap(resultinfo_, other->resultinfo_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata packetcenter2c_player_connect_result::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = packetcenter2c_player_connect_result_descriptor_;
-  metadata.reflection = packetcenter2c_player_connect_result_reflection_;
-  return metadata;
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace client2center_protocols
-
-// @@protoc_insertion_point(global_scope)

protocol/client2center_protocol.pb.h

@@ -1,380 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: client2center_protocol.proto
-
-#ifndef PROTOBUF_client2center_5fprotocol_2eproto__INCLUDED
-#define PROTOBUF_client2center_5fprotocol_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 2005000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 2005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/unknown_field_set.h>
-#include "client2center_msg_type.pb.h"
-#include "msg_type_def.pb.h"
-#include "msg_info_def.pb.h"
-#include "common_protocol.pb.h"
-// @@protoc_insertion_point(includes)
-
-namespace client2center_protocols {
-
-// Internal implementation detail -- do not call these.
-void  protobuf_AddDesc_client2center_5fprotocol_2eproto();
-void protobuf_AssignDesc_client2center_5fprotocol_2eproto();
-void protobuf_ShutdownFile_client2center_5fprotocol_2eproto();
-
-class packetc2center_player_connect;
-class packetcenter2c_player_connect_result;
-
-// ===================================================================
-
-class packetc2center_player_connect : public ::google::protobuf::Message {
- public:
-  packetc2center_player_connect();
-  virtual ~packetc2center_player_connect();
-
-  packetc2center_player_connect(const packetc2center_player_connect& from);
-
-  inline packetc2center_player_connect& operator=(const packetc2center_player_connect& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const packetc2center_player_connect& default_instance();
-
-  void Swap(packetc2center_player_connect* other);
-
-  // implements Message ----------------------------------------------
-
-  packetc2center_player_connect* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const packetc2center_player_connect& from);
-  void MergeFrom(const packetc2center_player_connect& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_c2center_player_connect];
-  inline bool has_packet_id() const;
-  inline void clear_packet_id();
-  static const int kPacketIdFieldNumber = 1;
-  inline ::client2center_protocols::e_server_msg_type packet_id() const;
-  inline void set_packet_id(::client2center_protocols::e_server_msg_type value);
-
-  // optional .common_protocol.PlayerConnect connectInfo = 2;
-  inline bool has_connectinfo() const;
-  inline void clear_connectinfo();
-  static const int kConnectInfoFieldNumber = 2;
-  inline const ::common_protocol::PlayerConnect& connectinfo() const;
-  inline ::common_protocol::PlayerConnect* mutable_connectinfo();
-  inline ::common_protocol::PlayerConnect* release_connectinfo();
-  inline void set_allocated_connectinfo(::common_protocol::PlayerConnect* connectinfo);
-
-  // @@protoc_insertion_point(class_scope:client2center_protocols.packetc2center_player_connect)
- private:
-  inline void set_has_packet_id();
-  inline void clear_has_packet_id();
-  inline void set_has_connectinfo();
-  inline void clear_has_connectinfo();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::common_protocol::PlayerConnect* connectinfo_;
-  int packet_id_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
-
-  friend void  protobuf_AddDesc_client2center_5fprotocol_2eproto();
-  friend void protobuf_AssignDesc_client2center_5fprotocol_2eproto();
-  friend void protobuf_ShutdownFile_client2center_5fprotocol_2eproto();
-
-  void InitAsDefaultInstance();
-  static packetc2center_player_connect* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class packetcenter2c_player_connect_result : public ::google::protobuf::Message {
- public:
-  packetcenter2c_player_connect_result();
-  virtual ~packetcenter2c_player_connect_result();
-
-  packetcenter2c_player_connect_result(const packetcenter2c_player_connect_result& from);
-
-  inline packetcenter2c_player_connect_result& operator=(const packetcenter2c_player_connect_result& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const packetcenter2c_player_connect_result& default_instance();
-
-  void Swap(packetcenter2c_player_connect_result* other);
-
-  // implements Message ----------------------------------------------
-
-  packetcenter2c_player_connect_result* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const packetcenter2c_player_connect_result& from);
-  void MergeFrom(const packetcenter2c_player_connect_result& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_center2c_player_connect_result];
-  inline bool has_packet_id() const;
-  inline void clear_packet_id();
-  static const int kPacketIdFieldNumber = 1;
-  inline ::client2center_protocols::e_server_msg_type packet_id() const;
-  inline void set_packet_id(::client2center_protocols::e_server_msg_type value);
-
-  // optional .common_protocol.PlayerConnectResult resultInfo = 2;
-  inline bool has_resultinfo() const;
-  inline void clear_resultinfo();
-  static const int kResultInfoFieldNumber = 2;
-  inline const ::common_protocol::PlayerConnectResult& resultinfo() const;
-  inline ::common_protocol::PlayerConnectResult* mutable_resultinfo();
-  inline ::common_protocol::PlayerConnectResult* release_resultinfo();
-  inline void set_allocated_resultinfo(::common_protocol::PlayerConnectResult* resultinfo);
-
-  // @@protoc_insertion_point(class_scope:client2center_protocols.packetcenter2c_player_connect_result)
- private:
-  inline void set_has_packet_id();
-  inline void clear_has_packet_id();
-  inline void set_has_resultinfo();
-  inline void clear_has_resultinfo();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::common_protocol::PlayerConnectResult* resultinfo_;
-  int packet_id_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
-
-  friend void  protobuf_AddDesc_client2center_5fprotocol_2eproto();
-  friend void protobuf_AssignDesc_client2center_5fprotocol_2eproto();
-  friend void protobuf_ShutdownFile_client2center_5fprotocol_2eproto();
-
-  void InitAsDefaultInstance();
-  static packetcenter2c_player_connect_result* default_instance_;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-// packetc2center_player_connect
-
-// optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_c2center_player_connect];
-inline bool packetc2center_player_connect::has_packet_id() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void packetc2center_player_connect::set_has_packet_id() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void packetc2center_player_connect::clear_has_packet_id() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void packetc2center_player_connect::clear_packet_id() {
-  packet_id_ = 30001;
-  clear_has_packet_id();
-}
-inline ::client2center_protocols::e_server_msg_type packetc2center_player_connect::packet_id() const {
-  return static_cast< ::client2center_protocols::e_server_msg_type >(packet_id_);
-}
-inline void packetc2center_player_connect::set_packet_id(::client2center_protocols::e_server_msg_type value) {
-  assert(::client2center_protocols::e_server_msg_type_IsValid(value));
-  set_has_packet_id();
-  packet_id_ = value;
-}
-
-// optional .common_protocol.PlayerConnect connectInfo = 2;
-inline bool packetc2center_player_connect::has_connectinfo() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void packetc2center_player_connect::set_has_connectinfo() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void packetc2center_player_connect::clear_has_connectinfo() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void packetc2center_player_connect::clear_connectinfo() {
-  if (connectinfo_ != NULL) connectinfo_->::common_protocol::PlayerConnect::Clear();
-  clear_has_connectinfo();
-}
-inline const ::common_protocol::PlayerConnect& packetc2center_player_connect::connectinfo() const {
-  return connectinfo_ != NULL ? *connectinfo_ : *default_instance_->connectinfo_;
-}
-inline ::common_protocol::PlayerConnect* packetc2center_player_connect::mutable_connectinfo() {
-  set_has_connectinfo();
-  if (connectinfo_ == NULL) connectinfo_ = new ::common_protocol::PlayerConnect;
-  return connectinfo_;
-}
-inline ::common_protocol::PlayerConnect* packetc2center_player_connect::release_connectinfo() {
-  clear_has_connectinfo();
-  ::common_protocol::PlayerConnect* temp = connectinfo_;
-  connectinfo_ = NULL;
-  return temp;
-}
-inline void packetc2center_player_connect::set_allocated_connectinfo(::common_protocol::PlayerConnect* connectinfo) {
-  delete connectinfo_;
-  connectinfo_ = connectinfo;
-  if (connectinfo) {
-    set_has_connectinfo();
-  } else {
-    clear_has_connectinfo();
-  }
-}
-
-// -------------------------------------------------------------------
-
-// packetcenter2c_player_connect_result
-
-// optional .client2center_protocols.e_server_msg_type packet_id = 1 [default = e_mst_center2c_player_connect_result];
-inline bool packetcenter2c_player_connect_result::has_packet_id() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void packetcenter2c_player_connect_result::set_has_packet_id() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void packetcenter2c_player_connect_result::clear_has_packet_id() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void packetcenter2c_player_connect_result::clear_packet_id() {
-  packet_id_ = 35001;
-  clear_has_packet_id();
-}
-inline ::client2center_protocols::e_server_msg_type packetcenter2c_player_connect_result::packet_id() const {
-  return static_cast< ::client2center_protocols::e_server_msg_type >(packet_id_);
-}
-inline void packetcenter2c_player_connect_result::set_packet_id(::client2center_protocols::e_server_msg_type value) {
-  assert(::client2center_protocols::e_server_msg_type_IsValid(value));
-  set_has_packet_id();
-  packet_id_ = value;
-}
-
-// optional .common_protocol.PlayerConnectResult resultInfo = 2;
-inline bool packetcenter2c_player_connect_result::has_resultinfo() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void packetcenter2c_player_connect_result::set_has_resultinfo() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void packetcenter2c_player_connect_result::clear_has_resultinfo() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void packetcenter2c_player_connect_result::clear_resultinfo() {
-  if (resultinfo_ != NULL) resultinfo_->::common_protocol::PlayerConnectResult::Clear();
-  clear_has_resultinfo();
-}
-inline const ::common_protocol::PlayerConnectResult& packetcenter2c_player_connect_result::resultinfo() const {
-  return resultinfo_ != NULL ? *resultinfo_ : *default_instance_->resultinfo_;
-}
-inline ::common_protocol::PlayerConnectResult* packetcenter2c_player_connect_result::mutable_resultinfo() {
-  set_has_resultinfo();
-  if (resultinfo_ == NULL) resultinfo_ = new ::common_protocol::PlayerConnectResult;
-  return resultinfo_;
-}
-inline ::common_protocol::PlayerConnectResult* packetcenter2c_player_connect_result::release_resultinfo() {
-  clear_has_resultinfo();
-  ::common_protocol::PlayerConnectResult* temp = resultinfo_;
-  resultinfo_ = NULL;
-  return temp;
-}
-inline void packetcenter2c_player_connect_result::set_allocated_resultinfo(::common_protocol::PlayerConnectResult* resultinfo) {
-  delete resultinfo_;
-  resultinfo_ = resultinfo;
-  if (resultinfo) {
-    set_has_resultinfo();
-  } else {
-    clear_has_resultinfo();
-  }
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace client2center_protocols
-
-#ifndef SWIG
-namespace google {
-namespace protobuf {
-
-
-}  // namespace google
-}  // namespace protobuf
-#endif  // SWIG
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_client2center_5fprotocol_2eproto__INCLUDED

protocol/client2center_protocol.proto

@@ -1,24 +0,0 @@
-import "client2center_msg_type.proto";
-import "msg_type_def.proto";
-import "msg_info_def.proto";
-import "common_protocol.proto";
-
-package client2center_protocols;
-
-// 连接世界
-message packetc2center_player_connect 
-{
-	optional e_server_msg_type packet_id = 1 [default = e_mst_c2center_player_connect];	
-	
-	optional common_protocol.PlayerConnect connectInfo = 2;
-}
-
-// 连接返回
-message packetcenter2c_player_connect_result 
-{
-	optional e_server_msg_type packet_id = 1 [default = e_mst_center2c_player_connect_result];	
-	
-	optional common_protocol.PlayerConnectResult resultInfo = 2;
-}
-
- 

protocol/ws_common_request.proto

@@ -0,0 +1,14 @@
+syntax = "proto2";
+package vip.metadev.module.battle.protobuf;
+
+option java_outer_classname = "WsCommonRequestProto";
+option java_multiple_files = false;
+
+// WebSocket 消息信封 - 公共必传参数集
+message CommonRequest {
+    required string session_id = 1;              // 会话ID
+    optional string token = 2;                   // 玩家token
+    optional string client_version = 3;          // 客户端版本
+    optional string device_info = 4;             // 设备信息
+    optional string data = 5;                    // 存储json类型的参数值
+} 

protocol/ws_enter_game_request.proto

@@ -0,0 +1,19 @@
+syntax = "proto2";
+package vip.metadev.module.battle.protobuf;
+
+option java_outer_classname = "EnterGameRequestProto";
+option java_multiple_files = false;
+
+// 导入游戏模式枚举
+import "ws_game_mode.proto";
+// 导入消息类型枚举
+import "ws_message_types.proto";
+// 导入公共消息定义
+import "ws_common_request.proto";
+
+// 进入游戏请求消息
+message EnterGameRequest {
+    optional WsMessageType message_type = 1 [default = GAME_JOIN];     // 消息类型，使用枚举，默认为进入游戏
+    required GameMode game_mode = 2;    // 游戏模式
+    repeated CommonRequest envelope = 3;     // 公共必传参数集
+} 

protocol/ws_game_mode.proto

@@ -0,0 +1,13 @@
+syntax = "proto2";
+package vip.metadev.module.battle.protobuf;
+
+option java_outer_classname = "GameModeProto";
+option java_multiple_files = false;
+
+// 游戏模式枚举
+enum GameMode {
+    STORY_MODE = 1;                    // 闯关模式
+    ENDLESS_NOVICE = 2;                // 无尽模式-新手场
+    ENDLESS_INTERMEDIATE = 3;          // 无尽模式-中级场
+    ENDLESS_ADVANCED = 4;              // 无尽模式-高级场
+} 

protocol/ws_message_types.proto

@@ -0,0 +1,19 @@
+syntax = "proto2";
+package vip.metadev.module.battle.protobuf;
+
+option java_outer_classname = "WsMessageTypesProto";
+option java_multiple_files = false;
+
+// WebSocket 消息类型枚举
+enum WsMessageType {
+    // 系统消息类型 (1000-1999)
+    UNKNOWN = 0;                    // 未知消息类型
+    CONNECTION_ACK = 1000;          // 连接确认
+    HEARTBEAT = 1001;               // 心跳消息
+    AUTHENTICATION = 1002;          // 认证消息
+    AUTHENTICATION_RESPONSE = 1003; // 认证响应
+    ERROR = 1004;                   // 错误消息
+    
+    // 游戏相关消息类型 (2000-2999)
+    GAME_JOIN = 2000;               // 进入游戏
+} 

protocol/ws_protocol.proto

@@ -1,154 +1,15 @@
+syntax = "proto2";
 package vip.metadev.module.battle.protobuf;
 
-option java_outer_classname = "WsProtocol";
-option java_multiple_files = false;
-
-// WebSocket 消息信封
-message WsEnvelope {
-    required string type = 1;                    // 消息类型
-    required string message_id = 2;              // 消息ID（用于请求响应匹配）
-    required string session_id = 3;              // 会话ID
-    optional string player_id = 4;               // 玩家ID
-    optional string scene_id = 5;                // 场景ID
-    required bytes payload = 6;                  // 消息负载（二进制数据）
-    optional string client_version = 7;          // 客户端版本
-    optional string device_info = 8;             // 设备信息
-}
-
-// WebSocket 错误消息
-message WsError {
-    required string error_code = 1;              // 错误代码
-    required string error_message = 2;           // 错误消息
-}
-
-// WebSocket 心跳消息
-message WsHeartbeat {
-    required string heartbeat_id = 1;            // 心跳ID
-    required int64 client_timestamp = 2;         // 客户端时间戳
-    optional int64 server_timestamp = 3;         // 服务器时间戳
-}
-
-// WebSocket 连接确认消息
-message WsConnectionAck {
-    required string status = 1;                  // 连接状态：success/error
-    required string message = 2;                 // 连接消息
-    required int64 server_timestamp = 3;         // 服务器时间戳
-}
-
-// WebSocket 认证消息
-message WsAuthentication {
-    required string token = 1;                   // 认证令牌
-    required string player_id = 2;               // 玩家ID
-    required int64 auth_timestamp = 3;           // 认证时间戳
-}
-
-// WebSocket 认证响应
-message WsAuthenticationResponse {
-    required string result = 1;                  // 认证结果：success/error
-    required string message = 2;                 // 认证消息
-    optional PlayerInfo player_info = 3;         // 玩家信息
-    required int64 auth_timestamp = 4;           // 认证时间戳
-}
-
-// 玩家信息
-message PlayerInfo {
-    required string player_id = 1;               // 玩家ID
-    required string nickname = 2;                // 玩家昵称
-    required int32 level = 3;                    // 玩家等级
-    required int64 experience = 4;               // 玩家经验
-    required int32 vip_level = 5;                // VIP等级
-    required int64 gold = 6;                     // 金币数量
-    required int64 diamond = 7;                  // 钻石数量
-    optional string avatar_url = 8;              // 头像URL
-    required bool online = 9;                    // 在线状态
-    required int64 last_login_time = 10;         // 最后登录时间
-}
+// 导入消息类型定义
+import "ws_message_types.proto";
+import "ws_game_mode.proto";
+import "ws_common_request.proto";
 
-// WebSocket 游戏状态更新
-message WsGameStateUpdate {
-    required string game_id = 1;                 // 游戏ID
-    required string game_state = 2;              // 游戏状态：waiting/playing/paused/ended
-    required string game_mode = 3;               // 游戏模式
-    required int32 current_round = 4;            // 当前回合
-    required int32 total_rounds = 5;             // 总回合数
-    required int32 game_time = 6;                // 游戏时间（秒）
-}
-
-// WebSocket 战斗动作消息
-message WsBattleAction {
-    required string action_type = 1;             // 动作类型：attack/defend/skill/item
-    required string action_id = 2;               // 动作ID
-    optional string target_id = 3;               // 目标ID
-    required int64 action_timestamp = 4;         // 动作时间戳
-}
-
-// WebSocket 战斗结果消息
-message WsBattleResult {
-    required string battle_id = 1;               // 战斗ID
-    required string result = 2;                  // 战斗结果：victory/defeat/draw
-    optional string winner_id = 3;               // 胜利方ID
-    repeated BattleReward rewards = 4;           // 战斗奖励
-    optional BattleStats battle_stats = 5;       // 战斗统计
-    required int64 battle_timestamp = 6;         // 战斗时间戳
-}
-
-// 战斗奖励
-message BattleReward {
-    required string reward_type = 1;             // 奖励类型：gold/experience/item
-    required string reward_id = 2;               // 奖励ID
-    required int64 reward_amount = 3;            // 奖励数量
-    optional string reward_description = 4;      // 奖励描述
-}
-
-// 战斗统计
-message BattleStats {
-    required int64 total_damage = 1;             // 总伤害
-    required int64 damage_taken = 2;             // 承受伤害
-    required int32 skills_used = 3;              // 技能使用次数
-    required int32 items_used = 4;               // 物品使用次数
-    required int32 battle_duration = 5;          // 战斗时长（秒）
-}
-
-// WebSocket 物品使用消息
-message WsItemUse {
-    required string item_id = 1;                 // 物品ID
-    required string item_type = 2;               // 物品类型
-    required int32 use_amount = 3;               // 使用数量
-    optional string target_id = 4;               // 目标ID
-    required int64 use_timestamp = 5;            // 使用时间戳
-}
-
-// WebSocket 技能使用消息
-message WsSkillUse {
-    required string skill_id = 1;                // 技能ID
-    required string skill_name = 2;              // 技能名称
-    required int32 skill_level = 3;              // 技能等级
-    optional string target_id = 4;               // 目标ID
-    required int64 use_timestamp = 5;            // 使用时间戳
-}
+option java_outer_classname = "WsProtocolProto";
+option java_multiple_files = false;
 
-// WebSocket 系统通知消息
-message WsSystemNotification {
-    required string notification_type = 1;       // 通知类型：info/warning/error/success
-    required string title = 2;                   // 通知标题
-    required string content = 3;                 // 通知内容
-    required string priority = 4;                // 通知级别：low/medium/high/critical
-    required int64 notification_timestamp = 5;   // 通知时间戳
-}
+// 注意：CommonRequest 已移动到 ws_common.proto 中
+// 这个文件现在只包含协议相关的导入，不包含具体消息定义
 
-// WebSocket 玩家状态更新
-message WsPlayerStateUpdate {
-    required string player_id = 1;               // 玩家ID
-    required string state_type = 2;              // 状态类型：online/offline/away/busy
-    optional string state_description = 3;       // 状态描述
-    required int64 state_timestamp = 4;          // 状态时间戳
-}
 
-// WebSocket 场景切换消息
-message WsSceneChange {
-    required string scene_id = 1;                // 场景ID
-    required string scene_name = 2;              // 场景名称
-    required string scene_type = 3;              // 场景类型
-    optional string change_reason = 4;           // 切换原因
-    required int64 change_timestamp = 5;         // 切换时间戳
-} 

protocol/ws_response.proto

@@ -0,0 +1,17 @@
+syntax = "proto2";
+
+package vip.metadev.module.battle.protobuf;
+option java_outer_classname = "WebSocketResponseProto";
+option java_multiple_files = false;
+// 导入消息类型枚举
+import "ws_message_types.proto";
+
+// WebSocket响应消息
+message WebSocketResponse {
+    optional WsMessageType message_type = 1;     // 消息类型
+    optional string session_id = 2;              // 会话ID
+    optional string status = 3;                  // 响应状态：success/error
+    optional string error_code = 4;              // 错误代码
+    optional string error_message = 5;           // 错误消息
+    optional bytes data = 6;                     // 响应数据（可以是JSON字符串或其他二进制数据）
+}