1

server/gameserver/mt/AirDrop.h

@@ -7,7 +7,7 @@ namespace mt
 {
 
     DECLARE_ID_TABLE(AirDrop, mtb::AirDrop,
-                     "airDrop@airDrop.json",
+                     "airdrop@airdrop.json",
                      "id")
     public:
 

server/gameserver/mt/AirRaid.h

@@ -7,7 +7,7 @@ namespace mt
 {
 
     DECLARE_ID_TABLE(AirRaid, mtb::AirRaid,
-                     "airRaid@airRaid.json",
+                     "airraid@airraid.json",
                      "id")
     public:
 

server/gameserver/mt/Dress.cc

@@ -1,10 +0,0 @@
-#include "precompile.h"
-
-#include "mt/Dress.h"
-
-IMPL_TABLE(mt::Dress)
-
-namespace mt
-{
-
-}

server/gameserver/mt/Dress.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "mt/macro.h"
-#include "mtb/Dress.h"
-
-namespace mt
-{
-
-    DECLARE_ID_TABLE(Dress, mtb::Dress,
-                     "dress@dress.json",
-                     "id")
-    public:
-
-    };
-
-}

server/gameserver/mt/EquipUpgrade.cc

@@ -1,10 +0,0 @@
-#include "precompile.h"
-
-#include "mt/EquipUpgrade.h"
-
-IMPL_TABLE(mt::EquipUpgrade)
-
-namespace mt
-{
-
-}

server/gameserver/mt/EquipUpgrade.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "mt/macro.h"
-#include "mtb/EquipUpgrade.h"
-
-namespace mt
-{
-
-    DECLARE_ID_TABLE(EquipUpgrade, mtb::EquipUpgrade,
-                     "equipUpgrade@equipUpgrade.json",
-                     "id")
-    public:
-
-    };
-
-}

server/gameserver/mt/FormulaPvp.h

@@ -7,7 +7,7 @@ namespace mt
 {
 
     DECLARE_AUTO_ID_TABLE(FormulaPvp, mtb::FormulaPvp,
-                     "formulaPvp@formulaPvp.json"
+                     "pvp@formula.json"
                      )
     public:
 

server/gameserver/mt/GunQuality.h

@@ -7,7 +7,7 @@ namespace mt
 {
 
     DECLARE_ID_TABLE(GunQuality, mtb::GunQuality,
-                     "gunQuality@gunQuality",
+                     "gunQuality@gunQuality.json",
                      "quality")
     public:
 

server/gameserver/mt/GunTalentGrow.h

@@ -7,7 +7,7 @@ namespace mt
 {
 
     DECLARE_ID_TABLE(GunTalentGrow, mtb::GunTalentGrow,
-                     "gunTalentGrow@gunTalentGrow",
+                     "gunTalentGrow@gunTalentGrow.json",
                      "id")
     public:
 

server/gameserver/mt/HeroQuality.h

@@ -7,7 +7,7 @@ namespace mt
 {
 
     DECLARE_ID_TABLE(HeroQuality, mtb::HeroQuality,
-                     "heroQuality@heroQuality",
+                     "heroQuality@heroQuality.json",
                      "quality")
     public:
 

server/gameserver/mt/MapTplThingJson.cc

@@ -1,10 +0,0 @@
-#include "precompile.h"
-
-#include "mt/MapTplThingJson.h"
-
-IMPL_TABLE(mt::MapTplThingJson)
-
-namespace mt
-{
-
-}

server/gameserver/mt/MapTplThingJson.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "mt/macro.h"
-#include "mtb/MapTplThingJson.h"
-
-namespace mt
-{
-
-    DECLARE_AUTO_ID_TABLE(MapTplThingJson, mtb::MapTplThingJson,
-                     ""
-                     )
-    public:
-
-    };
-
-}

server/gameserver/mt/MetaMgr.cc

@@ -9,7 +9,6 @@
 #include "mt/GunQuality.h"
 #include "mt/GunTalentGrow.h"
 #include "mt/HeroQuality.h"
-#include "mt/MapTplThingJson.h"
 #include "mt/PveGemini.h"
 #include "mt/PveGeminiContent.h"
 #include "mt/PveGeminiMode.h"
@@ -24,14 +23,12 @@
 #include "mt/AirLine.h"
 #include "mt/AirRaid.h"
 #include "mt/AirDrop.h"
-#include "mt/Dress.h"
 #include "mt/Drop.h"
 #include "mt/NpcStandard.h"
 #include "mt/Buff.h"
 #include "mt/MapThing.h"
 #include "mt/SafeArea.h"
 #include "mt/Equip.h"
-#include "mt/EquipUpgrade.h"
 #include "mt/Item.h"
 #include "mt/SafeAreaPos.h"
 #include "mt/Skill.h"
@@ -76,7 +73,6 @@ namespace mt
         RegMetaTable<GunQuality>(res_path_);
         RegMetaTable<GunTalentGrow>(res_path_);
         RegMetaTable<HeroQuality>(res_path_);
-        RegMetaTable<MapTplThingJson>(res_path_);
         RegMetaTable<PveGemini>(res_path_);
         RegMetaTable<PveGeminiContent>(res_path_);
         RegMetaTable<PveGeminiMode>(res_path_);
@@ -91,14 +87,12 @@ namespace mt
         RegMetaTable<AirLine>(res_path_);
         RegMetaTable<AirRaid>(res_path_);
         RegMetaTable<AirDrop>(res_path_);
-        RegMetaTable<Dress>(res_path_);
         RegMetaTable<Drop>(res_path_);
         RegMetaTable<NpcStandard>(res_path_);
         RegMetaTable<Buff>(res_path_);
         RegMetaTable<MapThing>(res_path_);
         RegMetaTable<SafeArea>(res_path_);
         RegMetaTable<Equip>(res_path_);
-        RegMetaTable<EquipUpgrade>(res_path_);
         RegMetaTable<Item>(res_path_);
         RegMetaTable<SafeAreaPos>(res_path_);
         RegMetaTable<Skill>(res_path_);

server/gameserver/mt/SafeAreaPos.h

@@ -7,7 +7,7 @@ namespace mt
 {
 
     DECLARE_AUTO_ID_TABLE(SafeAreaPos, mtb::SafeAreaPos,
-                          "safeAreaPos@safeAreaPos.json"
+                          "safearea_pos@safearea_pos.json"
                           )
     public:
 

server/gameserver/mtb/Dress.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include <bitset>
-
-namespace mtb
-{
-
-  class Dress
-  {
-  public:
-
-    a8::reflect::Class* GetClass() const;
-    int id() const { return id_; };
-    int level() const { return level_; };
-    int skill_id() const { return skill_id_; };
-    const std::string attr_type() const { return attr_type_; };
-    int max_lv() const { return max_lv_; };
-
-    bool has_id() const { return __flags__.test(0);};
-    bool has_level() const { return __flags__.test(1);};
-    bool has_skill_id() const { return __flags__.test(2);};
-    bool has_attr_type() const { return __flags__.test(3);};
-    bool has_max_lv() const { return __flags__.test(4);};
-
-  protected:
-
-    int id_ = 0;
-    int level_ = 0;
-    int skill_id_ = 0;
-    std::string attr_type_;
-    int max_lv_ = 0;
-
-public:
-    std::bitset<5> __flags__;
-  };
-
-};

server/gameserver/mtb/EquipUpgrade.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include <bitset>
-
-namespace mtb
-{
-
-  class EquipUpgrade
-  {
-  public:
-
-    a8::reflect::Class* GetClass() const;
-    int id() const { return id_; };
-    const std::string attr_type() const { return attr_type_; };
-    const std::string spera_attr() const { return spera_attr_; };
-
-    bool has_id() const { return __flags__.test(0);};
-    bool has_attr_type() const { return __flags__.test(1);};
-    bool has_spera_attr() const { return __flags__.test(2);};
-
-  protected:
-
-    int id_ = 0;
-    std::string attr_type_;
-    std::string spera_attr_;
-
-public:
-    std::bitset<3> __flags__;
-  };
-
-};

server/gameserver/mtb/MapTplThingJson.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <bitset>
-
-namespace mtb
-{
-
-  class MapTplThingJson
-  {
-  public:
-
-    a8::reflect::Class* GetClass() const;
-
-
-  protected:
-
-
-public:
-    std::bitset<0> __flags__;
-  };
-
-};

server/gameserver/mtb/mtb.all.cc

@@ -10,7 +10,6 @@
 #include "mtb/SafeAreaPos.h"
 #include "mtb/Item.h"
 #include "mtb/Equip.h"
-#include "mtb/EquipUpgrade.h"
 #include "mtb/Hero.h"
 #include "mtb/Robot.h"
 #include "mtb/Skill.h"
@@ -21,7 +20,6 @@
 #include "mtb/AirDrop.h"
 #include "mtb/AirRaid.h"
 #include "mtb/AirLine.h"
-#include "mtb/Dress.h"
 #include "mtb/RankReward.h"
 #include "mtb/RankPoint.h"
 #include "mtb/KillReward.h"
@@ -36,7 +34,6 @@
 #include "mtb/PveGeminiContent.h"
 #include "mtb/PveGeminiMode.h"
 #include "mtb/RankRoom.h"
-#include "mtb/MapTplThingJson.h"
 
 namespace mtb
 {
@@ -291,18 +288,6 @@ namespace mtb
       return meta_class;
     }
 
-    a8::reflect::Class* EquipUpgrade::GetClass() const
-    {
-      a8::reflect::Class* meta_class = nullptr;
-      if (!meta_class) {
-        meta_class = new a8::reflect::Class("EquipUpgrade", 3, 0);
-        meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(EquipUpgrade, id_));
-        meta_class->SetSimpleField(1, "attr_type", a8::reflect::ET_STRING, my_offsetof2(EquipUpgrade, attr_type_));
-        meta_class->SetSimpleField(2, "spera_attr", a8::reflect::ET_STRING, my_offsetof2(EquipUpgrade, spera_attr_));
-      }
-      return meta_class;
-    }
-
     a8::reflect::Class* Hero::GetClass() const
     {
       a8::reflect::Class* meta_class = nullptr;
@@ -547,20 +532,6 @@ namespace mtb
       return meta_class;
     }
 
-    a8::reflect::Class* Dress::GetClass() const
-    {
-      a8::reflect::Class* meta_class = nullptr;
-      if (!meta_class) {
-        meta_class = new a8::reflect::Class("Dress", 5, 0);
-        meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Dress, id_));
-        meta_class->SetSimpleField(1, "level", a8::reflect::ET_INT32, my_offsetof2(Dress, level_));
-        meta_class->SetSimpleField(2, "skill_id", a8::reflect::ET_INT32, my_offsetof2(Dress, skill_id_));
-        meta_class->SetSimpleField(3, "attr_type", a8::reflect::ET_STRING, my_offsetof2(Dress, attr_type_));
-        meta_class->SetSimpleField(4, "max_lv", a8::reflect::ET_INT32, my_offsetof2(Dress, max_lv_));
-      }
-      return meta_class;
-    }
-
     a8::reflect::Class* RankReward::GetClass() const
     {
       a8::reflect::Class* meta_class = nullptr;
@@ -765,13 +736,4 @@ namespace mtb
       return meta_class;
     }
 
-    a8::reflect::Class* MapTplThingJson::GetClass() const
-    {
-      a8::reflect::Class* meta_class = nullptr;
-      if (!meta_class) {
-        meta_class = new a8::reflect::Class("MapTplThingJson", 0, 0);
-      }
-      return meta_class;
-    }
-
 }

server/tools/protobuild/mt.proto

@@ -211,13 +211,6 @@ message Equip
     optional int32 double_gun = 78;
 }
 
-message EquipUpgrade
-{
-    optional int32 id = 1;
-    optional string attr_type = 4;
-    optional string spera_attr = 5;
-}
-
 message Hero
 {
     optional int32 id = 1; //唯一id
@@ -422,15 +415,6 @@ message AirLine
     optional int32 map_id = 6;
 }
 
-message Dress
-{
-    optional int32 id = 1;
-    optional int32 level = 2;
-    optional int32 skill_id = 3;
-    optional string attr_type = 4;
-    optional int32 max_lv = 5;
-}
-
 message RankReward
 {
     optional int32 rank = 1;
@@ -565,11 +549,3 @@ message RankRoom
     optional int32 final_time = 9;
     optional int32 final_player_num = 10;
 }
-
-
-//end
-
-message MapTplThingJson
-{
-
-}