Browse Source

feat(CAPI): add new tricker type

tags/0.1.0
DragonAura 2 years ago
parent
commit
8b6e9fcdc4
6 changed files with 17 additions and 13 deletions
  1. +2
    -1
      CAPI/cpp/API/include/structures.h
  2. +2
    -2
      CAPI/cpp/API/include/utils.hpp
  3. +5
    -6
      CAPI/cpp/proto/MessageType.pb.cc
  4. +2
    -2
      CAPI/cpp/proto/MessageType.pb.h
  5. +2
    -0
      CAPI/python/PyAPI/structures.py
  6. +4
    -2
      CAPI/python/PyAPI/utils.py

+ 2
- 1
CAPI/cpp/API/include/structures.h View File

@@ -94,7 +94,7 @@ namespace THUAI6
Assassin = 1,
Klee = 2,
ANoisyPerson = 3,
TrickerType4 = 4,
Idol = 4,
};

// 学生Buff类型
@@ -292,6 +292,7 @@ namespace THUAI6
{TrickerType::Assassin, "Assassin"},
{TrickerType::Klee, "Klee"},
{TrickerType::ANoisyPerson, "ANoisyPerson"},
{TrickerType::Idol, "Idol"},
};

inline std::map<PlayerState, std::string> playerStateDict{


+ 2
- 2
CAPI/cpp/API/include/utils.hpp View File

@@ -119,7 +119,7 @@ namespace Proto2THUAI6
{protobuf::TrickerType::ASSASSIN, THUAI6::TrickerType::Assassin},
{protobuf::TrickerType::KLEE, THUAI6::TrickerType::Klee},
{protobuf::TrickerType::A_NOISY_PERSON, THUAI6::TrickerType::ANoisyPerson},
{protobuf::TrickerType::TRICKERTYPE4, THUAI6::TrickerType::TrickerType4},
{protobuf::TrickerType::IDOL, THUAI6::TrickerType::Idol},
};

inline std::map<protobuf::StudentBuffType, THUAI6::StudentBuffType> studentBuffTypeDict{
@@ -385,7 +385,7 @@ namespace THUAI62Proto
{THUAI6::TrickerType::Assassin, protobuf::TrickerType::ASSASSIN},
{THUAI6::TrickerType::Klee, protobuf::TrickerType::KLEE},
{THUAI6::TrickerType::ANoisyPerson, protobuf::TrickerType::A_NOISY_PERSON},
{THUAI6::TrickerType::TrickerType4, protobuf::TrickerType::TRICKERTYPE4},
{THUAI6::TrickerType::Idol, protobuf::TrickerType::IDOL},
};

// inline std::map<THUAI6::TrickerBuffType, protobuf::TrickerBuffType> trickerBuffTypeDict{


+ 5
- 6
CAPI/cpp/proto/MessageType.pb.cc View File

@@ -62,17 +62,16 @@ const char descriptor_table_protodef_MessageType_2eproto[] PROTOBUF_SECTION_VARI
"\016TRICKER_PLAYER\020\002*q\n\013StudentType\022\025\n\021NULL"
"_STUDENT_TYPE\020\000\022\013\n\007ATHLETE\020\001\022\013\n\007TEACHER\020"
"\002\022\026\n\022STRAIGHT_A_STUDENT\020\003\022\t\n\005ROBOT\020\004\022\016\n\n"
"TECH_OTAKU\020\005*b\n\013TrickerType\022\025\n\021NULL_TRIC"
"TECH_OTAKU\020\005*Z\n\013TrickerType\022\025\n\021NULL_TRIC"
"KER_TYPE\020\000\022\014\n\010ASSASSIN\020\001\022\010\n\004KLEE\020\002\022\022\n\016A_"
"NOISY_PERSON\020\003\022\020\n\014TRICKERTYPE4\020\004*P\n\tGame"
"State\022\023\n\017NULL_GAME_STATE\020\000\022\016\n\nGAME_START"
"\020\001\022\020\n\014GAME_RUNNING\020\002\022\014\n\010GAME_END\020\003b\006prot"
"o3";
"NOISY_PERSON\020\003\022\010\n\004IDOL\020\004*P\n\tGameState\022\023\n"
"\017NULL_GAME_STATE\020\000\022\016\n\nGAME_START\020\001\022\020\n\014GA"
"ME_RUNNING\020\002\022\014\n\010GAME_END\020\003b\006proto3";
static ::_pbi::once_flag descriptor_table_MessageType_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_MessageType_2eproto = {
false,
false,
1482,
1474,
descriptor_table_protodef_MessageType_2eproto,
"MessageType.proto",
&descriptor_table_MessageType_2eproto_once,


+ 2
- 2
CAPI/cpp/proto/MessageType.pb.h View File

@@ -368,13 +368,13 @@ namespace protobuf
ASSASSIN = 1,
KLEE = 2,
A_NOISY_PERSON = 3,
TRICKERTYPE4 = 4,
IDOL = 4,
TrickerType_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::min(),
TrickerType_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::max()
};
bool TrickerType_IsValid(int value);
constexpr TrickerType TrickerType_MIN = NULL_TRICKER_TYPE;
constexpr TrickerType TrickerType_MAX = TRICKERTYPE4;
constexpr TrickerType TrickerType_MAX = IDOL;
constexpr int TrickerType_ARRAYSIZE = TrickerType_MAX + 1;

const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* TrickerType_descriptor();


+ 2
- 0
CAPI/python/PyAPI/structures.py View File

@@ -7,6 +7,7 @@ if sys.version_info < (3, 9):
else:
Tuple = tuple


class GameState(Enum):
NullGameState = 0
GameStart = 1
@@ -76,6 +77,7 @@ class TrickerType(Enum):
Assassin = 1
Klee = 2
ANoisyPerson = 3
Idol = 4


class StudentBuffType(Enum):


+ 4
- 2
CAPI/python/PyAPI/utils.py View File

@@ -111,7 +111,8 @@ class Proto2THUAI6(NoInstance):
MessageType.NULL_TRICKER_TYPE: THUAI6.TrickerType.NullTrickerType,
MessageType.ASSASSIN: THUAI6.TrickerType.Assassin,
MessageType.KLEE: THUAI6.TrickerType.Klee,
MessageType.A_NOISY_PERSON: THUAI6.TrickerType.ANoisyPerson, }
MessageType.A_NOISY_PERSON: THUAI6.TrickerType.ANoisyPerson,
MessageType.IDOL: THUAI6.TrickerType.Idol, }

studentBuffTypeDict: Final[dict] = {
MessageType.NULL_SBUFF_TYPE: THUAI6.StudentBuffType.NullStudentBuffType,
@@ -314,7 +315,8 @@ class THUAI62Proto(NoInstance):
THUAI6.TrickerType.NullTrickerType: MessageType.NULL_TRICKER_TYPE,
THUAI6.TrickerType.Assassin: MessageType.ASSASSIN,
THUAI6.TrickerType.Klee: MessageType.KLEE,
THUAI6.TrickerType.ANoisyPerson: MessageType.A_NOISY_PERSON, }
THUAI6.TrickerType.ANoisyPerson: MessageType.A_NOISY_PERSON,
THUAI6.TrickerType.Idol: MessageType.IDOL, }

propTypeDict: Final[dict] = {
THUAI6.PropType.NullPropType: MessageType.NULL_PROP_TYPE,


Loading…
Cancel
Save