Browse Source

Merge branch 'dev' of github.com:eesast/THUAI6 into dev

tags/v0.1.0
Shawqeem 2 years ago
parent
commit
8d5b5a8196
43 changed files with 540 additions and 728 deletions
  1. +5
    -5
      CAPI/cpp/API/include/structures.h
  2. +4
    -4
      CAPI/cpp/API/include/utils.hpp
  3. +8
    -8
      CAPI/cpp/API/src/DebugAPI.cpp
  4. +2
    -2
      CAPI/cpp/API/src/logic.cpp
  5. +200
    -332
      CAPI/cpp/proto/Message2Clients.pb.cc
  6. +92
    -236
      CAPI/cpp/proto/Message2Clients.pb.h
  7. +0
    -2
      CAPI/cpp/proto/Services.grpc.pb.h
  8. +8
    -8
      CAPI/python/PyAPI/DebugAPI.py
  9. +0
    -3
      CAPI/python/PyAPI/structures.py
  10. +0
    -3
      CAPI/python/PyAPI/utils.py
  11. +1
    -1
      CAPI/python/run.sh
  12. +4
    -4
      dependency/proto/Message2Clients.proto
  13. +0
    -0
      dependency/proto/Proto.sln
  14. +7
    -7
      docs/GameRules.md
  15. +97
    -0
      docs/游戏机制与平衡性调整更新草案.md
  16. +10
    -0
      docs/版本更新说明.md
  17. +0
    -1
      logic/GameClass/GameObj/Bullet/BombedBullet.cs
  18. +6
    -8
      logic/GameClass/GameObj/Bullet/Bullet.Ghost.cs
  19. +6
    -7
      logic/GameClass/GameObj/Bullet/Bullet.cs
  20. +0
    -1
      logic/GameClass/GameObj/Character/Character.Skill.cs
  21. +2
    -3
      logic/GameClass/GameObj/Character/Character.cs
  22. +9
    -20
      logic/GameClass/GameObj/GameObj.cs
  23. +0
    -1
      logic/GameClass/GameObj/Map/Chest.cs
  24. +17
    -1
      logic/GameClass/GameObj/Map/Door.cs
  25. +0
    -1
      logic/GameClass/GameObj/Map/Doorway.cs
  26. +0
    -1
      logic/GameClass/GameObj/Map/EmergencyExit.cs
  27. +0
    -1
      logic/GameClass/GameObj/Map/Generator.cs
  28. +0
    -1
      logic/GameClass/GameObj/Map/Wall.cs
  29. +0
    -1
      logic/GameClass/GameObj/Map/Window.cs
  30. +17
    -11
      logic/GameClass/GameObj/Moveable.cs
  31. +0
    -1
      logic/GameClass/GameObj/OutOfBoundBlock.cs
  32. +0
    -1
      logic/GameClass/GameObj/PickedProp.cs
  33. +23
    -24
      logic/GameClass/GameObj/Prop.cs
  34. +4
    -4
      logic/GameEngine/MoveEngine.cs
  35. +7
    -7
      logic/Gaming/ActionManager.cs
  36. +1
    -1
      logic/Gaming/AttackManager.cs
  37. +1
    -1
      logic/Gaming/CharacterManager .cs
  38. +6
    -6
      logic/Gaming/PropManager.cs
  39. +0
    -1
      logic/Preparation/Interface/IGameObj.cs
  40. +1
    -2
      logic/Preparation/Interface/IMoveable.cs
  41. +0
    -1
      logic/Preparation/Utility/GameData.cs
  42. +1
    -5
      logic/Server/CopyInfo.cs
  43. +1
    -1
      logic/cmd/gameServerAndClient.cmd

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

@@ -197,7 +197,7 @@ namespace THUAI6


PlayerType playerType; // 玩家类型 PlayerType playerType; // 玩家类型
std::vector<PropType> props; std::vector<PropType> props;
PlaceType place; // 所处格子的类型
// PlaceType place; // 所处格子的类型
BulletType bulletType; BulletType bulletType;


PlayerState playerState; PlayerState playerState;
@@ -232,9 +232,9 @@ namespace THUAI6
double facingDirection; // 朝向 double facingDirection; // 朝向
int64_t guid; // 全局唯一ID int64_t guid; // 全局唯一ID
PlayerType team; // 子弹所属队伍 PlayerType team; // 子弹所属队伍
PlaceType place; // 所处格子的类型
double bombRange; // 炸弹爆炸范围
int32_t speed; // 子弹速度
// PlaceType place; // 所处格子的类型
double bombRange; // 炸弹爆炸范围
int32_t speed; // 子弹速度
}; };


struct BombedBullet struct BombedBullet
@@ -253,7 +253,7 @@ namespace THUAI6
int32_t y; int32_t y;
int64_t guid; int64_t guid;
PropType type; PropType type;
PlaceType place;
// PlaceType place;
double facingDirection; // 朝向 double facingDirection; // 朝向
}; };




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

@@ -227,7 +227,7 @@ namespace Proto2THUAI6
tricker->timeUntilSkillAvailable.clear(); tricker->timeUntilSkillAvailable.clear();
for (int i = 0; i < trickerMsg.time_until_skill_available().size(); i++) for (int i = 0; i < trickerMsg.time_until_skill_available().size(); i++)
tricker->timeUntilSkillAvailable.push_back(trickerMsg.time_until_skill_available(i)); tricker->timeUntilSkillAvailable.push_back(trickerMsg.time_until_skill_available(i));
tricker->place = placeTypeDict[trickerMsg.place()];
// tricker->place = placeTypeDict[trickerMsg.place()];
tricker->playerState = playerStateDict[trickerMsg.player_state()]; tricker->playerState = playerStateDict[trickerMsg.player_state()];
tricker->props.clear(); tricker->props.clear();
for (int i = 0; i < trickerMsg.prop().size(); i++) for (int i = 0; i < trickerMsg.prop().size(); i++)
@@ -269,7 +269,7 @@ namespace Proto2THUAI6
student->props.clear(); student->props.clear();
for (int i = 0; i < studentMsg.prop().size(); i++) for (int i = 0; i < studentMsg.prop().size(); i++)
student->props.push_back(propTypeDict[studentMsg.prop(i)]); student->props.push_back(propTypeDict[studentMsg.prop(i)]);
student->place = placeTypeDict[studentMsg.place()];
// student->place = placeTypeDict[studentMsg.place()];
student->playerState = playerStateDict[studentMsg.player_state()]; student->playerState = playerStateDict[studentMsg.player_state()];
student->determination = studentMsg.determination(); student->determination = studentMsg.determination();
student->addiction = studentMsg.addiction(); student->addiction = studentMsg.addiction();
@@ -286,7 +286,7 @@ namespace Proto2THUAI6
prop->x = propMsg.x(); prop->x = propMsg.x();
prop->y = propMsg.y(); prop->y = propMsg.y();
prop->type = propTypeDict[propMsg.type()]; prop->type = propTypeDict[propMsg.type()];
prop->place = placeTypeDict[propMsg.place()];
// prop->place = placeTypeDict[propMsg.place()];
prop->guid = propMsg.guid(); prop->guid = propMsg.guid();
prop->facingDirection = propMsg.facing_direction(); prop->facingDirection = propMsg.facing_direction();
return prop; return prop;
@@ -313,7 +313,7 @@ namespace Proto2THUAI6
bullet->facingDirection = bulletMsg.facing_direction(); bullet->facingDirection = bulletMsg.facing_direction();
bullet->guid = bulletMsg.guid(); bullet->guid = bulletMsg.guid();
bullet->team = playerTypeDict[bulletMsg.team()]; bullet->team = playerTypeDict[bulletMsg.team()];
bullet->place = placeTypeDict[bulletMsg.place()];
// bullet->place = placeTypeDict[bulletMsg.place()];
bullet->bombRange = bulletMsg.bomb_range(); bullet->bombRange = bulletMsg.bomb_range();
bullet->speed = bulletMsg.speed(); bullet->speed = bulletMsg.speed();
return bullet; return bullet;


+ 8
- 8
CAPI/cpp/API/src/DebugAPI.cpp View File

@@ -684,7 +684,7 @@ void StudentDebugAPI::PrintStudent() const
{ {
logger->info("******Student Info******"); logger->info("******Student Info******");
logger->info("playerID={}, GUID={}, x={}, y={}", student->playerID, student->guid, student->x, student->y); logger->info("playerID={}, GUID={}, x={}, y={}", student->playerID, student->guid, student->x, student->y);
logger->info("speed={}, view range={}, place={}, radius={}", student->speed, student->viewRange, THUAI6::placeTypeDict[student->place], student->radius);
logger->info("speed={}, view range={}, radius={}", student->speed, student->viewRange, student->radius);
std::string skillTime = ""; std::string skillTime = "";
for (const auto& time : student->timeUntilSkillAvailable) for (const auto& time : student->timeUntilSkillAvailable)
skillTime += std::to_string(time) + ", "; skillTime += std::to_string(time) + ", ";
@@ -709,7 +709,7 @@ void TrickerDebugAPI::PrintStudent() const
{ {
logger->info("******Student Info******"); logger->info("******Student Info******");
logger->info("playerID={}, GUID={}, x={}, y={}", student->playerID, student->guid, student->x, student->y); logger->info("playerID={}, GUID={}, x={}, y={}", student->playerID, student->guid, student->x, student->y);
logger->info("speed={}, view range={}, place={}, radius={}", student->speed, student->viewRange, THUAI6::placeTypeDict[student->place], student->radius);
logger->info("speed={}, view range={}, radius={}", student->speed, student->viewRange, student->radius);
std::string skillTime = ""; std::string skillTime = "";
for (const auto& time : student->timeUntilSkillAvailable) for (const auto& time : student->timeUntilSkillAvailable)
skillTime += std::to_string(time) + ", "; skillTime += std::to_string(time) + ", ";
@@ -734,7 +734,7 @@ void StudentDebugAPI::PrintTricker() const
{ {
logger->info("******Tricker Info******"); logger->info("******Tricker Info******");
logger->info("playerID={}, GUID={}, x={}, y={}", tricker->playerID, tricker->guid, tricker->x, tricker->y); logger->info("playerID={}, GUID={}, x={}, y={}", tricker->playerID, tricker->guid, tricker->x, tricker->y);
logger->info("speed={}, view range={}, place={}, radius={}", tricker->speed, tricker->viewRange, THUAI6::placeTypeDict[tricker->place], tricker->radius);
logger->info("speed={}, view range={}, radius={}", tricker->speed, tricker->viewRange, tricker->radius);
std::string skillTime = ""; std::string skillTime = "";
for (const auto& time : tricker->timeUntilSkillAvailable) for (const auto& time : tricker->timeUntilSkillAvailable)
skillTime += std::to_string(time) + ", "; skillTime += std::to_string(time) + ", ";
@@ -758,7 +758,7 @@ void TrickerDebugAPI::PrintTricker() const
{ {
logger->info("******Tricker Info******"); logger->info("******Tricker Info******");
logger->info("playerID={}, GUID={}, x={}, y={}", tricker->playerID, tricker->guid, tricker->x, tricker->y); logger->info("playerID={}, GUID={}, x={}, y={}", tricker->playerID, tricker->guid, tricker->x, tricker->y);
logger->info("speed={}, view range={}, place={}, radius={}", tricker->speed, tricker->viewRange, THUAI6::placeTypeDict[tricker->place], tricker->radius);
logger->info("speed={}, view range={}, radius={}", tricker->speed, tricker->viewRange, tricker->radius);
std::string skillTime = ""; std::string skillTime = "";
for (const auto& time : tricker->timeUntilSkillAvailable) for (const auto& time : tricker->timeUntilSkillAvailable)
skillTime += std::to_string(time) + ", "; skillTime += std::to_string(time) + ", ";
@@ -781,7 +781,7 @@ void StudentDebugAPI::PrintProp() const
for (auto prop : logic.GetProps()) for (auto prop : logic.GetProps())
{ {
logger->info("******Prop Info******"); logger->info("******Prop Info******");
logger->info("GUID={}, x={}, y={}, place={}, facing direction={}", prop->guid, prop->x, prop->y, THUAI6::placeTypeDict[prop->place], prop->facingDirection);
logger->info("GUID={}, x={}, y={}, facing direction={}", prop->guid, prop->x, prop->y, prop->facingDirection);
logger->info("*********************\n"); logger->info("*********************\n");
} }
} }
@@ -791,7 +791,7 @@ void TrickerDebugAPI::PrintProp() const
for (auto prop : logic.GetProps()) for (auto prop : logic.GetProps())
{ {
logger->info("******Prop Info******"); logger->info("******Prop Info******");
logger->info("GUID={}, x={}, y={}, place={}, facing direction={}", prop->guid, prop->x, prop->y, THUAI6::placeTypeDict[prop->place], prop->facingDirection);
logger->info("GUID={}, x={}, y={}, facing direction={}", prop->guid, prop->x, prop->y, prop->facingDirection);
logger->info("*********************\n"); logger->info("*********************\n");
} }
} }
@@ -801,7 +801,7 @@ void StudentDebugAPI::PrintSelfInfo() const
auto student = logic.StudentGetSelfInfo(); auto student = logic.StudentGetSelfInfo();
logger->info("******Self Info******"); logger->info("******Self Info******");
logger->info("playerID={}, GUID={}, x={}, y={}", student->playerID, student->guid, student->x, student->y); logger->info("playerID={}, GUID={}, x={}, y={}", student->playerID, student->guid, student->x, student->y);
logger->info("speed={}, view range={}, place={}, radius={}", student->speed, student->viewRange, THUAI6::placeTypeDict[student->place], student->radius);
logger->info("speed={}, view range={}, radius={}", student->speed, student->viewRange, student->radius);
std::string skillTime = ""; std::string skillTime = "";
for (const auto& time : student->timeUntilSkillAvailable) for (const auto& time : student->timeUntilSkillAvailable)
skillTime += std::to_string(time) + ", "; skillTime += std::to_string(time) + ", ";
@@ -824,7 +824,7 @@ void TrickerDebugAPI::PrintSelfInfo() const
auto tricker = logic.TrickerGetSelfInfo(); auto tricker = logic.TrickerGetSelfInfo();
logger->info("******Self Info******"); logger->info("******Self Info******");
logger->info("playerID={}, GUID={}, x={}, y={}", tricker->playerID, tricker->guid, tricker->x, tricker->y); logger->info("playerID={}, GUID={}, x={}, y={}", tricker->playerID, tricker->guid, tricker->x, tricker->y);
logger->info("speed={}, view range={}, place={}, radius={}", tricker->speed, tricker->viewRange, THUAI6::placeTypeDict[tricker->place], tricker->radius);
logger->info("speed={}, view range={}, radius={}", tricker->speed, tricker->viewRange, tricker->radius);
std::string skillTime = ""; std::string skillTime = "";
for (const auto& time : tricker->timeUntilSkillAvailable) for (const auto& time : tricker->timeUntilSkillAvailable)
skillTime += std::to_string(time) + ", "; skillTime += std::to_string(time) + ", ";


+ 2
- 2
CAPI/cpp/API/src/logic.cpp View File

@@ -589,7 +589,7 @@ void Logic::LoadBufferCase(const protobuf::MessageOfObj& item)
else if (Proto2THUAI6::newsTypeDict[news.news_case()] == THUAI6::NewsType::BinaryMessage) else if (Proto2THUAI6::newsTypeDict[news.news_case()] == THUAI6::NewsType::BinaryMessage)
{ {
messageQueue.emplace(std::make_pair(news.to_id(), news.binary_message())); messageQueue.emplace(std::make_pair(news.to_id(), news.binary_message()));
logger->debug("Add News!");
logger->debug("Add Binary News!");
} }
else else
logger->error("Unknown NewsType!"); logger->error("Unknown NewsType!");
@@ -712,7 +712,7 @@ bool Logic::HaveView(int gridX, int gridY, int selfX, int selfY, int viewRange)
void Logic::Main(CreateAIFunc createAI, std::string IP, std::string port, bool file, bool print, bool warnOnly) void Logic::Main(CreateAIFunc createAI, std::string IP, std::string port, bool file, bool print, bool warnOnly)
{ {
// 建立日志组件 // 建立日志组件
auto fileLogger = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/logic-log.txt", true);
auto fileLogger = std::make_shared<spdlog::sinks::basic_file_sink_mt>(fmt::format("logs/logic-{}-log.txt", playerID), true);
auto printLogger = std::make_shared<spdlog::sinks::stdout_color_sink_mt>(); auto printLogger = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
std::string pattern = "[logic] [%H:%M:%S.%e] [%l] %v"; std::string pattern = "[logic] [%H:%M:%S.%e] [%l] %v";
fileLogger->set_pattern(pattern); fileLogger->set_pattern(pattern);


+ 200
- 332
CAPI/cpp/proto/Message2Clients.pb.cc
File diff suppressed because it is too large
View File


+ 92
- 236
CAPI/cpp/proto/Message2Clients.pb.h View File

@@ -318,21 +318,20 @@ namespace protobuf
kSpeedFieldNumber = 3, kSpeedFieldNumber = 3,
kDeterminationFieldNumber = 4, kDeterminationFieldNumber = 4,
kAddictionFieldNumber = 5, kAddictionFieldNumber = 5,
kPlaceFieldNumber = 7,
kGuidFieldNumber = 10,
kPlayerStateFieldNumber = 9, kPlayerStateFieldNumber = 9,
kGuidFieldNumber = 10,
kBulletTypeFieldNumber = 12, kBulletTypeFieldNumber = 12,
kLearningSpeedFieldNumber = 13, kLearningSpeedFieldNumber = 13,
kTreatSpeedFieldNumber = 14,
kPlayerIdFieldNumber = 15, kPlayerIdFieldNumber = 15,
kTreatSpeedFieldNumber = 14,
kViewRangeFieldNumber = 16, kViewRangeFieldNumber = 16,
kRadiusFieldNumber = 17, kRadiusFieldNumber = 17,
kDangerAlertFieldNumber = 19,
kScoreFieldNumber = 20, kScoreFieldNumber = 20,
kDangerAlertFieldNumber = 19,
kTreatProgressFieldNumber = 21, kTreatProgressFieldNumber = 21,
kRescueProgressFieldNumber = 22, kRescueProgressFieldNumber = 22,
kStudentTypeFieldNumber = 23,
kFacingDirectionFieldNumber = 24, kFacingDirectionFieldNumber = 24,
kStudentTypeFieldNumber = 23,
}; };
// repeated double time_until_skill_available = 6; // repeated double time_until_skill_available = 6;
int time_until_skill_available_size() const; int time_until_skill_available_size() const;
@@ -452,14 +451,14 @@ namespace protobuf
void _internal_set_addiction(int32_t value); void _internal_set_addiction(int32_t value);


public: public:
// .protobuf.PlaceType place = 7;
void clear_place();
::protobuf::PlaceType place() const;
void set_place(::protobuf::PlaceType value);
// .protobuf.PlayerState player_state = 9;
void clear_player_state();
::protobuf::PlayerState player_state() const;
void set_player_state(::protobuf::PlayerState value);


private: private:
::protobuf::PlaceType _internal_place() const;
void _internal_set_place(::protobuf::PlaceType value);
::protobuf::PlayerState _internal_player_state() const;
void _internal_set_player_state(::protobuf::PlayerState value);


public: public:
// int64 guid = 10; // int64 guid = 10;
@@ -471,16 +470,6 @@ namespace protobuf
int64_t _internal_guid() const; int64_t _internal_guid() const;
void _internal_set_guid(int64_t value); void _internal_set_guid(int64_t value);


public:
// .protobuf.PlayerState player_state = 9;
void clear_player_state();
::protobuf::PlayerState player_state() const;
void set_player_state(::protobuf::PlayerState value);

private:
::protobuf::PlayerState _internal_player_state() const;
void _internal_set_player_state(::protobuf::PlayerState value);

public: public:
// .protobuf.BulletType bullet_type = 12; // .protobuf.BulletType bullet_type = 12;
void clear_bullet_type(); void clear_bullet_type();
@@ -501,16 +490,6 @@ namespace protobuf
int32_t _internal_learning_speed() const; int32_t _internal_learning_speed() const;
void _internal_set_learning_speed(int32_t value); void _internal_set_learning_speed(int32_t value);


public:
// int32 treat_speed = 14;
void clear_treat_speed();
int32_t treat_speed() const;
void set_treat_speed(int32_t value);

private:
int32_t _internal_treat_speed() const;
void _internal_set_treat_speed(int32_t value);

public: public:
// int64 player_id = 15; // int64 player_id = 15;
void clear_player_id(); void clear_player_id();
@@ -521,6 +500,16 @@ namespace protobuf
int64_t _internal_player_id() const; int64_t _internal_player_id() const;
void _internal_set_player_id(int64_t value); void _internal_set_player_id(int64_t value);


public:
// int32 treat_speed = 14;
void clear_treat_speed();
int32_t treat_speed() const;
void set_treat_speed(int32_t value);

private:
int32_t _internal_treat_speed() const;
void _internal_set_treat_speed(int32_t value);

public: public:
// int32 view_range = 16; // int32 view_range = 16;
void clear_view_range(); void clear_view_range();
@@ -541,16 +530,6 @@ namespace protobuf
int32_t _internal_radius() const; int32_t _internal_radius() const;
void _internal_set_radius(int32_t value); void _internal_set_radius(int32_t value);


public:
// double danger_alert = 19;
void clear_danger_alert();
double danger_alert() const;
void set_danger_alert(double value);

private:
double _internal_danger_alert() const;
void _internal_set_danger_alert(double value);

public: public:
// int32 score = 20; // int32 score = 20;
void clear_score(); void clear_score();
@@ -561,6 +540,16 @@ namespace protobuf
int32_t _internal_score() const; int32_t _internal_score() const;
void _internal_set_score(int32_t value); void _internal_set_score(int32_t value);


public:
// double danger_alert = 19;
void clear_danger_alert();
double danger_alert() const;
void set_danger_alert(double value);

private:
double _internal_danger_alert() const;
void _internal_set_danger_alert(double value);

public: public:
// int32 treat_progress = 21; // int32 treat_progress = 21;
void clear_treat_progress(); void clear_treat_progress();
@@ -581,16 +570,6 @@ namespace protobuf
int32_t _internal_rescue_progress() const; int32_t _internal_rescue_progress() const;
void _internal_set_rescue_progress(int32_t value); void _internal_set_rescue_progress(int32_t value);


public:
// .protobuf.StudentType student_type = 23;
void clear_student_type();
::protobuf::StudentType student_type() const;
void set_student_type(::protobuf::StudentType value);

private:
::protobuf::StudentType _internal_student_type() const;
void _internal_set_student_type(::protobuf::StudentType value);

public: public:
// double facing_direction = 24; // double facing_direction = 24;
void clear_facing_direction(); void clear_facing_direction();
@@ -601,6 +580,16 @@ namespace protobuf
double _internal_facing_direction() const; double _internal_facing_direction() const;
void _internal_set_facing_direction(double value); void _internal_set_facing_direction(double value);


public:
// .protobuf.StudentType student_type = 23;
void clear_student_type();
::protobuf::StudentType student_type() const;
void set_student_type(::protobuf::StudentType value);

private:
::protobuf::StudentType _internal_student_type() const;
void _internal_set_student_type(::protobuf::StudentType value);

public: public:
// @@protoc_insertion_point(class_scope:protobuf.MessageOfStudent) // @@protoc_insertion_point(class_scope:protobuf.MessageOfStudent)


@@ -623,21 +612,20 @@ namespace protobuf
int32_t speed_; int32_t speed_;
int32_t determination_; int32_t determination_;
int32_t addiction_; int32_t addiction_;
int place_;
int64_t guid_;
int player_state_; int player_state_;
int64_t guid_;
int bullet_type_; int bullet_type_;
int32_t learning_speed_; int32_t learning_speed_;
int32_t treat_speed_;
int64_t player_id_; int64_t player_id_;
int32_t treat_speed_;
int32_t view_range_; int32_t view_range_;
int32_t radius_; int32_t radius_;
double danger_alert_;
int32_t score_; int32_t score_;
double danger_alert_;
int32_t treat_progress_; int32_t treat_progress_;
int32_t rescue_progress_; int32_t rescue_progress_;
int student_type_;
double facing_direction_; double facing_direction_;
int student_type_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
}; };
union union
@@ -812,18 +800,17 @@ namespace protobuf
kXFieldNumber = 1, kXFieldNumber = 1,
kYFieldNumber = 2, kYFieldNumber = 2,
kSpeedFieldNumber = 3, kSpeedFieldNumber = 3,
kPlaceFieldNumber = 6,
kGuidFieldNumber = 9,
kTrickerTypeFieldNumber = 8, kTrickerTypeFieldNumber = 8,
kScoreFieldNumber = 10,
kGuidFieldNumber = 9,
kPlayerIdFieldNumber = 11, kPlayerIdFieldNumber = 11,
kScoreFieldNumber = 10,
kViewRangeFieldNumber = 12, kViewRangeFieldNumber = 12,
kRadiusFieldNumber = 13, kRadiusFieldNumber = 13,
kPlayerStateFieldNumber = 14,
kTrickDesireFieldNumber = 15, kTrickDesireFieldNumber = 15,
kClassVolumeFieldNumber = 16, kClassVolumeFieldNumber = 16,
kPlayerStateFieldNumber = 14,
kBulletTypeFieldNumber = 18,
kFacingDirectionFieldNumber = 17, kFacingDirectionFieldNumber = 17,
kBulletTypeFieldNumber = 18,
}; };
// repeated double time_until_skill_available = 5; // repeated double time_until_skill_available = 5;
int time_until_skill_available_size() const; int time_until_skill_available_size() const;
@@ -923,14 +910,14 @@ namespace protobuf
void _internal_set_speed(int32_t value); void _internal_set_speed(int32_t value);


public: public:
// .protobuf.PlaceType place = 6;
void clear_place();
::protobuf::PlaceType place() const;
void set_place(::protobuf::PlaceType value);
// .protobuf.TrickerType tricker_type = 8;
void clear_tricker_type();
::protobuf::TrickerType tricker_type() const;
void set_tricker_type(::protobuf::TrickerType value);


private: private:
::protobuf::PlaceType _internal_place() const;
void _internal_set_place(::protobuf::PlaceType value);
::protobuf::TrickerType _internal_tricker_type() const;
void _internal_set_tricker_type(::protobuf::TrickerType value);


public: public:
// int64 guid = 9; // int64 guid = 9;
@@ -943,14 +930,14 @@ namespace protobuf
void _internal_set_guid(int64_t value); void _internal_set_guid(int64_t value);


public: public:
// .protobuf.TrickerType tricker_type = 8;
void clear_tricker_type();
::protobuf::TrickerType tricker_type() const;
void set_tricker_type(::protobuf::TrickerType value);
// int64 player_id = 11;
void clear_player_id();
int64_t player_id() const;
void set_player_id(int64_t value);


private: private:
::protobuf::TrickerType _internal_tricker_type() const;
void _internal_set_tricker_type(::protobuf::TrickerType value);
int64_t _internal_player_id() const;
void _internal_set_player_id(int64_t value);


public: public:
// int32 score = 10; // int32 score = 10;
@@ -962,16 +949,6 @@ namespace protobuf
int32_t _internal_score() const; int32_t _internal_score() const;
void _internal_set_score(int32_t value); void _internal_set_score(int32_t value);


public:
// int64 player_id = 11;
void clear_player_id();
int64_t player_id() const;
void set_player_id(int64_t value);

private:
int64_t _internal_player_id() const;
void _internal_set_player_id(int64_t value);

public: public:
// int32 view_range = 12; // int32 view_range = 12;
void clear_view_range(); void clear_view_range();
@@ -992,6 +969,16 @@ namespace protobuf
int32_t _internal_radius() const; int32_t _internal_radius() const;
void _internal_set_radius(int32_t value); void _internal_set_radius(int32_t value);


public:
// .protobuf.PlayerState player_state = 14;
void clear_player_state();
::protobuf::PlayerState player_state() const;
void set_player_state(::protobuf::PlayerState value);

private:
::protobuf::PlayerState _internal_player_state() const;
void _internal_set_player_state(::protobuf::PlayerState value);

public: public:
// double trick_desire = 15; // double trick_desire = 15;
void clear_trick_desire(); void clear_trick_desire();
@@ -1013,14 +1000,14 @@ namespace protobuf
void _internal_set_class_volume(double value); void _internal_set_class_volume(double value);


public: public:
// .protobuf.PlayerState player_state = 14;
void clear_player_state();
::protobuf::PlayerState player_state() const;
void set_player_state(::protobuf::PlayerState value);
// double facing_direction = 17;
void clear_facing_direction();
double facing_direction() const;
void set_facing_direction(double value);


private: private:
::protobuf::PlayerState _internal_player_state() const;
void _internal_set_player_state(::protobuf::PlayerState value);
double _internal_facing_direction() const;
void _internal_set_facing_direction(double value);


public: public:
// .protobuf.BulletType bullet_type = 18; // .protobuf.BulletType bullet_type = 18;
@@ -1032,16 +1019,6 @@ namespace protobuf
::protobuf::BulletType _internal_bullet_type() const; ::protobuf::BulletType _internal_bullet_type() const;
void _internal_set_bullet_type(::protobuf::BulletType value); void _internal_set_bullet_type(::protobuf::BulletType value);


public:
// double facing_direction = 17;
void clear_facing_direction();
double facing_direction() const;
void set_facing_direction(double value);

private:
double _internal_facing_direction() const;
void _internal_set_facing_direction(double value);

public: public:
// @@protoc_insertion_point(class_scope:protobuf.MessageOfTricker) // @@protoc_insertion_point(class_scope:protobuf.MessageOfTricker)


@@ -1062,18 +1039,17 @@ namespace protobuf
int32_t x_; int32_t x_;
int32_t y_; int32_t y_;
int32_t speed_; int32_t speed_;
int place_;
int64_t guid_;
int tricker_type_; int tricker_type_;
int32_t score_;
int64_t guid_;
int64_t player_id_; int64_t player_id_;
int32_t score_;
int32_t view_range_; int32_t view_range_;
int32_t radius_; int32_t radius_;
int player_state_;
double trick_desire_; double trick_desire_;
double class_volume_; double class_volume_;
int player_state_;
int bullet_type_;
double facing_direction_; double facing_direction_;
int bullet_type_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
}; };
union union
@@ -1249,7 +1225,6 @@ namespace protobuf
kTeamFieldNumber = 6, kTeamFieldNumber = 6,
kGuidFieldNumber = 5, kGuidFieldNumber = 5,
kBombRangeFieldNumber = 8, kBombRangeFieldNumber = 8,
kPlaceFieldNumber = 7,
kSpeedFieldNumber = 9, kSpeedFieldNumber = 9,
}; };
// .protobuf.BulletType type = 1; // .protobuf.BulletType type = 1;
@@ -1321,16 +1296,6 @@ namespace protobuf
double _internal_bomb_range() const; double _internal_bomb_range() const;
void _internal_set_bomb_range(double value); void _internal_set_bomb_range(double value);


public:
// .protobuf.PlaceType place = 7;
void clear_place();
::protobuf::PlaceType place() const;
void set_place(::protobuf::PlaceType value);

private:
::protobuf::PlaceType _internal_place() const;
void _internal_set_place(::protobuf::PlaceType value);

public: public:
// int32 speed = 9; // int32 speed = 9;
void clear_speed(); void clear_speed();
@@ -1360,7 +1325,6 @@ namespace protobuf
int team_; int team_;
int64_t guid_; int64_t guid_;
double bomb_range_; double bomb_range_;
int place_;
int32_t speed_; int32_t speed_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
}; };
@@ -1785,9 +1749,8 @@ namespace protobuf
kTypeFieldNumber = 1, kTypeFieldNumber = 1,
kXFieldNumber = 2, kXFieldNumber = 2,
kFacingDirectionFieldNumber = 4, kFacingDirectionFieldNumber = 4,
kYFieldNumber = 3,
kPlaceFieldNumber = 6,
kGuidFieldNumber = 5, kGuidFieldNumber = 5,
kYFieldNumber = 3,
}; };
// .protobuf.PropType type = 1; // .protobuf.PropType type = 1;
void clear_type(); void clear_type();
@@ -1818,26 +1781,6 @@ namespace protobuf
double _internal_facing_direction() const; double _internal_facing_direction() const;
void _internal_set_facing_direction(double value); void _internal_set_facing_direction(double value);


public:
// int32 y = 3;
void clear_y();
int32_t y() const;
void set_y(int32_t value);

private:
int32_t _internal_y() const;
void _internal_set_y(int32_t value);

public:
// .protobuf.PlaceType place = 6;
void clear_place();
::protobuf::PlaceType place() const;
void set_place(::protobuf::PlaceType value);

private:
::protobuf::PlaceType _internal_place() const;
void _internal_set_place(::protobuf::PlaceType value);

public: public:
// int64 guid = 5; // int64 guid = 5;
void clear_guid(); void clear_guid();
@@ -1848,6 +1791,16 @@ namespace protobuf
int64_t _internal_guid() const; int64_t _internal_guid() const;
void _internal_set_guid(int64_t value); void _internal_set_guid(int64_t value);


public:
// int32 y = 3;
void clear_y();
int32_t y() const;
void set_y(int32_t value);

private:
int32_t _internal_y() const;
void _internal_set_y(int32_t value);

public: public:
// @@protoc_insertion_point(class_scope:protobuf.MessageOfProp) // @@protoc_insertion_point(class_scope:protobuf.MessageOfProp)


@@ -1863,9 +1816,8 @@ namespace protobuf
int type_; int type_;
int32_t x_; int32_t x_;
double facing_direction_; double facing_direction_;
int32_t y_;
int place_;
int64_t guid_; int64_t guid_;
int32_t y_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
}; };
union union
@@ -5502,30 +5454,6 @@ namespace protobuf
return _internal_mutable_time_until_skill_available(); return _internal_mutable_time_until_skill_available();
} }


// .protobuf.PlaceType place = 7;
inline void MessageOfStudent::clear_place()
{
_impl_.place_ = 0;
}
inline ::protobuf::PlaceType MessageOfStudent::_internal_place() const
{
return static_cast<::protobuf::PlaceType>(_impl_.place_);
}
inline ::protobuf::PlaceType MessageOfStudent::place() const
{
// @@protoc_insertion_point(field_get:protobuf.MessageOfStudent.place)
return _internal_place();
}
inline void MessageOfStudent::_internal_set_place(::protobuf::PlaceType value)
{
_impl_.place_ = value;
}
inline void MessageOfStudent::set_place(::protobuf::PlaceType value)
{
_internal_set_place(value);
// @@protoc_insertion_point(field_set:protobuf.MessageOfStudent.place)
}

// repeated .protobuf.PropType prop = 8; // repeated .protobuf.PropType prop = 8;
inline int MessageOfStudent::_internal_prop_size() const inline int MessageOfStudent::_internal_prop_size() const
{ {
@@ -6105,30 +6033,6 @@ namespace protobuf
return _internal_mutable_time_until_skill_available(); return _internal_mutable_time_until_skill_available();
} }


// .protobuf.PlaceType place = 6;
inline void MessageOfTricker::clear_place()
{
_impl_.place_ = 0;
}
inline ::protobuf::PlaceType MessageOfTricker::_internal_place() const
{
return static_cast<::protobuf::PlaceType>(_impl_.place_);
}
inline ::protobuf::PlaceType MessageOfTricker::place() const
{
// @@protoc_insertion_point(field_get:protobuf.MessageOfTricker.place)
return _internal_place();
}
inline void MessageOfTricker::_internal_set_place(::protobuf::PlaceType value)
{
_impl_.place_ = value;
}
inline void MessageOfTricker::set_place(::protobuf::PlaceType value)
{
_internal_set_place(value);
// @@protoc_insertion_point(field_set:protobuf.MessageOfTricker.place)
}

// repeated .protobuf.PropType prop = 7; // repeated .protobuf.PropType prop = 7;
inline int MessageOfTricker::_internal_prop_size() const inline int MessageOfTricker::_internal_prop_size() const
{ {
@@ -6649,30 +6553,6 @@ namespace protobuf
// @@protoc_insertion_point(field_set:protobuf.MessageOfBullet.team) // @@protoc_insertion_point(field_set:protobuf.MessageOfBullet.team)
} }


// .protobuf.PlaceType place = 7;
inline void MessageOfBullet::clear_place()
{
_impl_.place_ = 0;
}
inline ::protobuf::PlaceType MessageOfBullet::_internal_place() const
{
return static_cast<::protobuf::PlaceType>(_impl_.place_);
}
inline ::protobuf::PlaceType MessageOfBullet::place() const
{
// @@protoc_insertion_point(field_get:protobuf.MessageOfBullet.place)
return _internal_place();
}
inline void MessageOfBullet::_internal_set_place(::protobuf::PlaceType value)
{
_impl_.place_ = value;
}
inline void MessageOfBullet::set_place(::protobuf::PlaceType value)
{
_internal_set_place(value);
// @@protoc_insertion_point(field_set:protobuf.MessageOfBullet.place)
}

// double bomb_range = 8; // double bomb_range = 8;
inline void MessageOfBullet::clear_bomb_range() inline void MessageOfBullet::clear_bomb_range()
{ {
@@ -6993,30 +6873,6 @@ namespace protobuf
// @@protoc_insertion_point(field_set:protobuf.MessageOfProp.guid) // @@protoc_insertion_point(field_set:protobuf.MessageOfProp.guid)
} }


// .protobuf.PlaceType place = 6;
inline void MessageOfProp::clear_place()
{
_impl_.place_ = 0;
}
inline ::protobuf::PlaceType MessageOfProp::_internal_place() const
{
return static_cast<::protobuf::PlaceType>(_impl_.place_);
}
inline ::protobuf::PlaceType MessageOfProp::place() const
{
// @@protoc_insertion_point(field_get:protobuf.MessageOfProp.place)
return _internal_place();
}
inline void MessageOfProp::_internal_set_place(::protobuf::PlaceType value)
{
_impl_.place_ = value;
}
inline void MessageOfProp::set_place(::protobuf::PlaceType value)
{
_internal_set_place(value);
// @@protoc_insertion_point(field_set:protobuf.MessageOfProp.place)
}

// ------------------------------------------------------------------- // -------------------------------------------------------------------


// MessageOfPickedProp // MessageOfPickedProp


+ 0
- 2
CAPI/cpp/proto/Services.grpc.pb.h View File

@@ -25,8 +25,6 @@
#include <grpcpp/impl/codegen/stub_options.h> #include <grpcpp/impl/codegen/stub_options.h>
#include <grpcpp/impl/codegen/sync_stream.h> #include <grpcpp/impl/codegen/sync_stream.h>


#undef SendMessage

namespace protobuf namespace protobuf
{ {




+ 8
- 8
CAPI/python/PyAPI/DebugAPI.py View File

@@ -318,7 +318,7 @@ class StudentDebugAPI(IStudentAPI, IGameTimer):
self.__logger.info( self.__logger.info(
f"playerID={student.playerID}, GUID={student.guid}, x={student.x}, y={student.y}") f"playerID={student.playerID}, GUID={student.guid}, x={student.x}, y={student.y}")
self.__logger.info( self.__logger.info(
f"speed={student.speed}, view range={student.viewRange}, place={student.place.name}, radius={student.radius}")
f"speed={student.speed}, view range={student.viewRange}, radius={student.radius}")
self.__logger.info( self.__logger.info(
f"score={student.score}, facing direction={student.facingDirection}, skill time={student.timeUntilSkillAvailable}") f"score={student.score}, facing direction={student.facingDirection}, skill time={student.timeUntilSkillAvailable}")
studentProp = "" studentProp = ""
@@ -342,7 +342,7 @@ class StudentDebugAPI(IStudentAPI, IGameTimer):
self.__logger.info( self.__logger.info(
f"playerID={tricker.playerID}, GUID={tricker.guid}, x={tricker.x}, y={tricker.y}") f"playerID={tricker.playerID}, GUID={tricker.guid}, x={tricker.x}, y={tricker.y}")
self.__logger.info( self.__logger.info(
f"speed={tricker.speed}, view range={tricker.viewRange}, place={tricker.place.name}, radius={tricker.radius}")
f"speed={tricker.speed}, view range={tricker.viewRange}, radius={tricker.radius}")
self.__logger.info( self.__logger.info(
f"score={tricker.score}, facing direction={tricker.facingDirection}, skill time={tricker.timeUntilSkillAvailable}") f"score={tricker.score}, facing direction={tricker.facingDirection}, skill time={tricker.timeUntilSkillAvailable}")
trickerProp = "" trickerProp = ""
@@ -362,7 +362,7 @@ class StudentDebugAPI(IStudentAPI, IGameTimer):
for prop in self.__logic.GetProps(): for prop in self.__logic.GetProps():
self.__logger.info("******Prop Info******") self.__logger.info("******Prop Info******")
self.__logger.info( self.__logger.info(
f"GUID={prop.guid}, x={prop.x}, y={prop.y}, place={prop.place.name}, facing direction={prop.facingDirection}")
f"GUID={prop.guid}, x={prop.x}, y={prop.y}, facing direction={prop.facingDirection}")
self.__logger.info("*********************") self.__logger.info("*********************")


def PrintSelfInfo(self) -> None: def PrintSelfInfo(self) -> None:
@@ -371,7 +371,7 @@ class StudentDebugAPI(IStudentAPI, IGameTimer):
self.__logger.info( self.__logger.info(
f"playerID={student.playerID}, GUID={student.guid}, x={student.x}, y={student.y}") f"playerID={student.playerID}, GUID={student.guid}, x={student.x}, y={student.y}")
self.__logger.info( self.__logger.info(
f"speed={student.speed}, view range={student.viewRange}, place={student.place.name}, radius={student.radius}")
f"speed={student.speed}, view range={student.viewRange}, radius={student.radius}")
self.__logger.info( self.__logger.info(
f"score={student.score}, facing direction={student.facingDirection}, skill time={student.timeUntilSkillAvailable}") f"score={student.score}, facing direction={student.facingDirection}, skill time={student.timeUntilSkillAvailable}")
studentProp = "" studentProp = ""
@@ -773,7 +773,7 @@ class TrickerDebugAPI(ITrickerAPI, IGameTimer):
self.__logger.info( self.__logger.info(
f"playerID={student.playerID}, GUID={student.guid}, x={student.x}, y={student.y}") f"playerID={student.playerID}, GUID={student.guid}, x={student.x}, y={student.y}")
self.__logger.info( self.__logger.info(
f"speed={student.speed}, view range={student.viewRange}, place={student.place.name}, radius={student.radius}")
f"speed={student.speed}, view range={student.viewRange}, radius={student.radius}")
self.__logger.info( self.__logger.info(
f"score={student.score}, facing direction={student.facingDirection}, skill time={student.timeUntilSkillAvailable}") f"score={student.score}, facing direction={student.facingDirection}, skill time={student.timeUntilSkillAvailable}")
studentProp = "" studentProp = ""
@@ -797,7 +797,7 @@ class TrickerDebugAPI(ITrickerAPI, IGameTimer):
self.__logger.info( self.__logger.info(
f"playerID={tricker.playerID}, GUID={tricker.guid}, x={tricker.x}, y={tricker.y}") f"playerID={tricker.playerID}, GUID={tricker.guid}, x={tricker.x}, y={tricker.y}")
self.__logger.info( self.__logger.info(
f"speed={tricker.speed}, view range={tricker.viewRange}, place={tricker.place.name}, radius={tricker.radius}")
f"speed={tricker.speed}, view range={tricker.viewRange}, radius={tricker.radius}")
self.__logger.info( self.__logger.info(
f"score={tricker.score}, facing direction={tricker.facingDirection}, skill time={tricker.timeUntilSkillAvailable}") f"score={tricker.score}, facing direction={tricker.facingDirection}, skill time={tricker.timeUntilSkillAvailable}")
trickerProp = "" trickerProp = ""
@@ -817,7 +817,7 @@ class TrickerDebugAPI(ITrickerAPI, IGameTimer):
for prop in self.__logic.GetProps(): for prop in self.__logic.GetProps():
self.__logger.info("******Prop Info******") self.__logger.info("******Prop Info******")
self.__logger.info( self.__logger.info(
f"GUID={prop.guid}, x={prop.x}, y={prop.y}, place={prop.place.name}, facing direction={prop.facingDirection}")
f"GUID={prop.guid}, x={prop.x}, y={prop.y}, facing direction={prop.facingDirection}")
self.__logger.info("*********************") self.__logger.info("*********************")


def PrintSelfInfo(self) -> None: def PrintSelfInfo(self) -> None:
@@ -826,7 +826,7 @@ class TrickerDebugAPI(ITrickerAPI, IGameTimer):
self.__logger.info( self.__logger.info(
f"playerID={tricker.playerID}, GUID={tricker.guid}, x={tricker.x}, y={tricker.y}") f"playerID={tricker.playerID}, GUID={tricker.guid}, x={tricker.x}, y={tricker.y}")
self.__logger.info( self.__logger.info(
f"speed={tricker.speed}, view range={tricker.viewRange}, place={tricker.place.name}, radius={tricker.radius}")
f"speed={tricker.speed}, view range={tricker.viewRange}, radius={tricker.radius}")
self.__logger.info( self.__logger.info(
f"score={tricker.score}, facing direction={tricker.facingDirection}, skill time={tricker.timeUntilSkillAvailable}") f"score={tricker.score}, facing direction={tricker.facingDirection}, skill time={tricker.timeUntilSkillAvailable}")
trickerProp = "" trickerProp = ""


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

@@ -156,7 +156,6 @@ class Player:
self.timeUntilSkillAvailable: List[float] = [] self.timeUntilSkillAvailable: List[float] = []
self.playerType: PlayerType = PlayerType.NullPlayerType self.playerType: PlayerType = PlayerType.NullPlayerType
self.prop: List[PropType] = [] self.prop: List[PropType] = []
self.place: PlaceType = PlaceType.NullPlaceType
self.bulletType: BulletType = BulletType.NullBulletType self.bulletType: BulletType = BulletType.NullBulletType
self.playerState: PlayerState = PlayerState.NullState self.playerState: PlayerState = PlayerState.NullState


@@ -190,7 +189,6 @@ class Prop:
self.y: int = 0 self.y: int = 0
self.guid: int = 0 self.guid: int = 0
self.type: PropType = PropType.NullPropType self.type: PropType = PropType.NullPropType
self.place: PlaceType = PlaceType.NullPlaceType
self.facingDirection: float = 0.0 self.facingDirection: float = 0.0




@@ -202,7 +200,6 @@ class Bullet:
self.facingDirection: float = 0.0 self.facingDirection: float = 0.0
self.guid: int = 0 self.guid: int = 0
self.team: PlayerType = PlayerType.NullPlayerType self.team: PlayerType = PlayerType.NullPlayerType
self.place: PlaceType = PlaceType.NullPlaceType
self.bombRange: float = 0.0 self.bombRange: float = 0.0
self.speed: int = 0 self.speed: int = 0




+ 0
- 3
CAPI/python/PyAPI/utils.py View File

@@ -179,7 +179,6 @@ class Proto2THUAI6(NoInstance):
tricker.bulletType = Proto2THUAI6.bulletTypeDict[trickerMsg.bullet_type] tricker.bulletType = Proto2THUAI6.bulletTypeDict[trickerMsg.bullet_type]
for time in trickerMsg.time_until_skill_available: for time in trickerMsg.time_until_skill_available:
tricker.timeUntilSkillAvailable.append(time) tricker.timeUntilSkillAvailable.append(time)
tricker.place = Proto2THUAI6.placeTypeDict[trickerMsg.place]
tricker.playerState = Proto2THUAI6.playerStateDict[trickerMsg.player_state] tricker.playerState = Proto2THUAI6.playerStateDict[trickerMsg.player_state]
for item in trickerMsg.prop: for item in trickerMsg.prop:
tricker.prop.append(Proto2THUAI6.propTypeDict[item]) tricker.prop.append(Proto2THUAI6.propTypeDict[item])
@@ -211,7 +210,6 @@ class Proto2THUAI6(NoInstance):
student.dangerAlert = studentMsg.danger_alert student.dangerAlert = studentMsg.danger_alert
for time in studentMsg.time_until_skill_available: for time in studentMsg.time_until_skill_available:
student.timeUntilSkillAvailable.append(time) student.timeUntilSkillAvailable.append(time)
student.place = Proto2THUAI6.placeTypeDict[studentMsg.place]
for item in studentMsg.prop: for item in studentMsg.prop:
student.prop.append(Proto2THUAI6.propTypeDict[item]) student.prop.append(Proto2THUAI6.propTypeDict[item])
student.studentType = Proto2THUAI6.studentTypeDict[studentMsg.student_type] student.studentType = Proto2THUAI6.studentTypeDict[studentMsg.student_type]
@@ -255,7 +253,6 @@ class Proto2THUAI6(NoInstance):
bullet.facingDirection = bulletMsg.facing_direction bullet.facingDirection = bulletMsg.facing_direction
bullet.guid = bulletMsg.guid bullet.guid = bulletMsg.guid
bullet.team = Proto2THUAI6.playerTypeDict[bulletMsg.team] bullet.team = Proto2THUAI6.playerTypeDict[bulletMsg.team]
bullet.place = Proto2THUAI6.placeTypeDict[bulletMsg.place]
bullet.bombRange = bulletMsg.bomb_range bullet.bombRange = bulletMsg.bomb_range
return bullet return bullet




+ 1
- 1
CAPI/python/run.sh View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash


python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 0 -d -o& python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 0 -d -o&
# python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 1 -o&
python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 1 -d -o&
# python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 2& # python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 2&
# python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 3& # python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 3&
# python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 4& # python PyAPI/main.py -I 172.22.32.1 -P 8888 -p 4&

+ 4
- 4
dependency/proto/Message2Clients.proto View File

@@ -12,7 +12,7 @@ message MessageOfStudent
int32 determination = 4; // 剩余的学习毅力,相当于血量 int32 determination = 4; // 剩余的学习毅力,相当于血量
int32 addiction = 5; // 沉迷程度,相当于淘汰进度 int32 addiction = 5; // 沉迷程度,相当于淘汰进度
repeated double time_until_skill_available = 6; repeated double time_until_skill_available = 6;
PlaceType place = 7;
// PlaceType place = 7;
repeated PropType prop = 8; repeated PropType prop = 8;
PlayerState player_state = 9; PlayerState player_state = 9;
int64 guid = 10; int64 guid = 10;
@@ -37,7 +37,7 @@ message MessageOfTricker
int32 y = 2; int32 y = 2;
int32 speed = 3; int32 speed = 3;
repeated double time_until_skill_available = 5; repeated double time_until_skill_available = 5;
PlaceType place = 6;
// PlaceType place = 6;
repeated PropType prop = 7; repeated PropType prop = 7;
TrickerType tricker_type = 8; TrickerType tricker_type = 8;
int64 guid = 9; int64 guid = 9;
@@ -61,7 +61,7 @@ message MessageOfBullet
double facing_direction = 4; double facing_direction = 4;
int64 guid = 5; int64 guid = 5;
PlayerType team = 6; PlayerType team = 6;
PlaceType place = 7;
// PlaceType place = 7;
double bomb_range = 8; double bomb_range = 8;
int32 speed = 9; int32 speed = 9;
} }
@@ -83,7 +83,7 @@ message MessageOfProp // 可拾取道具的信息
int32 y = 3; int32 y = 3;
double facing_direction = 4; double facing_direction = 4;
int64 guid = 5; int64 guid = 5;
PlaceType place = 6;
// PlaceType place = 6;
} }






+ 0
- 0
dependency/proto/Proto.sln View File


+ 7
- 7
docs/GameRules.md View File

@@ -1,5 +1,5 @@
# 规则 # 规则
V5.5
V5.6
- [规则](#规则) - [规则](#规则)
- [简则](#简则) - [简则](#简则)
- [地图](#地图) - [地图](#地图)
@@ -192,7 +192,7 @@ $$
| :------------ | :--------------------- | :--------------------- | :--------------------- | :--------------------- | | :------------ | :--------------------- | :--------------------- | :--------------------- | :--------------------- |
| 移动速度/s | 3960 | 3600 | 3852 | 3600 | | 移动速度/s | 3960 | 3600 | 3852 | 3600 |
| 隐蔽度 | 1.5 | 1 | 0.8 | 0.75| | 隐蔽度 | 1.5 | 1 | 0.8 | 0.75|
| 警戒范围 | 22,100 | 17000 | 15300 | 17000
| 警戒范围 | 22100 | 17000 | 15300 | 17000|
| 视野范围 | 15600 | 13000 | 13000 | 14300| | 视野范围 | 15600 | 13000 | 13000 | 14300|
| 开锁门速度/ms | 4000 | 4000 | 4000 |4000 | | 开锁门速度/ms | 4000 | 4000 | 4000 |4000 |
| 翻窗速度/s | 2540 | 2540 | 2794 | 2540| | 翻窗速度/s | 2540 | 2540 | 2794 | 2540|
@@ -246,14 +246,14 @@ $$
| :------------ | :--------------------- | :--------------------- | :--------------------- | :--------------------- | | :------------ | :--------------------- | :--------------------- | :--------------------- | :--------------------- |
| 移动速度/s | 2700 | 3150 | 2880 | 3000 | | 移动速度/s | 2700 | 3150 | 2880 | 3000 |
| 最大毅力值 | 30000000 | 3000000 | 3300000 | 3200000 | | 最大毅力值 | 30000000 | 3000000 | 3300000 | 3200000 |
| 最大沉迷度 | 600000 | 54,000 | 78,000 | 66,000 |
| 学习一科速度 | 0 | 73 | 135 | 123 |
| 最大沉迷度 | 600000 | 54000 | 78000 | 66000 |
| 学习速度/ms | 0 | 73 | 135 | 123 |
| 勉励速度/ms | 80 | 90 | 100 | 120 | | 勉励速度/ms | 80 | 90 | 100 | 120 |
| 隐蔽度 | 0.5 | 0.9 | 0.9 | 0.8 | | 隐蔽度 | 0.5 | 0.9 | 0.9 | 0.8 |
| 警戒范围 | 7500 | 15000 | 13,500 | 15000 |
| 视野范围 | 9,000 | 11000 | 9,000 | 10000 |
| 警戒范围 | 7500 | 15000 | 13500 | 15000 |
| 视野范围 | 9000 | 11000 | 9000 | 10000 |
| 开锁门速度/ms | 4000 | 4000 | 4000 | 2800 | | 开锁门速度/ms | 4000 | 4000 | 4000 | 2800 |
| 翻窗速度/ms | 1270 | 3048 | 2116 | 2540 |
| 翻窗速度/ms | 611 | 1466 | 1018 | 1222 |
| 翻箱速度/ms | 1000 | 1000 | 1000 | 900 | | 翻箱速度/ms | 1000 | 1000 | 1000 | 900 |


#### 运动员 #### 运动员


+ 97
- 0
docs/游戏机制与平衡性调整更新草案.md View File

@@ -0,0 +1,97 @@
# 游戏机制与平衡性调整更新草案
v1.2

## 说明
- 该草案尚未完全确定,请大家不要过分依靠该文档进行修改自己的代码
- 有任何问题都可以在选手群中提出建议和讨论

## 游戏接口
删除structures.h中Player的属性place

## 游戏规则

## 游戏机制

## 攻击
- 飞刀FlyingKnife
- 前摇变为600ms
- 搞蛋鬼的一般攻击CommonAttackOfTricker
- 改为“不能攻击未写完的作业”
- 蹦蹦炸弹BombBomb
- 未攻击至目标时的后摇改为1200ms
- 增强为“可以攻击未写完的作业”
- 增强为“可以攻击使门被打开(可以重新被锁上)”
- strike(新增)
- 可以攻击未写完的作业

修改后:
| 攻击(子弹)类型 |搞蛋鬼的一般攻击CommonAttackOfTricker|飞刀FlyingKnife | 蹦蹦炸弹BombBomb | 小炸弹JumpyDumpty | strike |
| :--------------------- | :---------------------| :--------------------- | :--------------------- | :--------------------- | :--------------------- |
| 子弹爆炸范围 | 0 | 0 | 2000 | 1000 | 0 |
| 子弹攻击距离 | 2200 | 78000 | 2200 | 4400 | 2000 |
| 攻击力 | 1500000 | 1200000 | 1800000 | 900000 | 1600000 |
| 移动速度/s | 7400 | 18500 | 6000 | 8600 | 6250 |
| 前摇(ms) | 297 | 600 | 366 | - | 320 |
|未攻击至目标时的后摇(ms)| 800 | 0 | 1200 | - | 800 |
|攻击至目标时的后摇(ms) | 3700 | 0 | 3700 | - | 3700 |
| CD(ms) | 800 | 400 | 3000 | - | 800 |
| 最大子弹容量 | 1 | 1 | 1 | - | 1 |


## 职业
- 所有角色开锁门速度加速至1.25倍
- 所有角色翻箱速度加速至1.25倍

### 学生
- 先前学生翻窗数据有误

- Teacher
- 警戒范围由7500改为13000
- 翻窗速度改为1000
- 技能惩罚(Punish)强化为“使用瞬间,在**视野距离范围内(不是可视范围)的**翻窗、开锁门、攻击前后摇、**使用技能期间**的捣蛋鬼会被眩晕(3070+**500***已受伤害/基本伤害(1500000))ms”
- 技能喝茶(HaveTea)(新增)
- CD:90s
- 使用瞬间,向当前方向瞬移3000(可以穿墙),如果会碰撞则失败。
- Robot(新增)
- 无技能
- 特性
- 不可被眩晕
- 不可毕业
- 不可救人
- 无牵制得分
- 不可使用道具(可以捡起和扔道具)
- TechOtaku(新增)
- 一名TechOtaku最多可以在场上同时最多拥有3个Robot,无法共享视野
0. SummonGolem
- CD:40s,持续时间:6s
- 在持续时间中,学生进入人物状态进入UsingSpecialSkill(不能移动),进入其他状态会导致制作机器人失败。
- 在持续时间中,学生面前生成道具CraftingBench;学生进入其他状态或该道具被碰撞后,CraftingBench消失且制作机器人失败。
- 持续时间结束后,道具CraftingBench所在位置生成一个Robot,CraftingBench消失
1. UseRobot
- CD:0s,持续时间:0s
- TechOtaku的Robot的PlayerId = TechOtaku的PlayerId + n×5(一局游戏理论人数),其中1<=n<=3(自己的n为0)
- 新造的Robot的PlayerId的n总是尽量小
- 每使用一次UseRobot,TechOtaku就切换一次操控的角色,若之前操控角色的PlayerId =TechOtaku的PlayerId + j×5,其PlayerId变为PlayerId =TechOtaku的PlayerId + ((j+1)mod 4 )×5,若其不可用,则再次进行这样的操作
修改后:

| 学生职业 | 教师Teacher | 健身狂Athlete |学霸StraightAStudent | 开心果Sunshine | 机器人Robot | 技术宅TechOtaku |
| :------------ | :------------------ | :------------------ | :------------------ | :------------------ | :------------------ | :------------------ |
| 移动速度/s | 2700 | 3150 | 2880 | 3000 | 2700 | 2880 |
| 最大毅力值 | 30000000 | 3000000 | 3300000 | 3200000 | 900000 | 2700000 |
| 最大沉迷度 | 600000 | 54000 | 78000 | 60000 | 0 | 60000 |
| 学习速度/ms | 0 | 73 | 135 | 123 | 100 | 130 |
| 勉励速度/ms | 80 | 90 | 100 | 120 | 0 | 100 |
| 隐蔽度 | 0.5 | 0.9 | 0.9 | 0.8 | 0.8 | 1.1 |
| 警戒范围 | 13000 | 15000 | 13500 | 15000 | 0 | 15000 |
| 视野范围 | 9000 | 11000 | 9000 | 10000 | 0 | 9000 |
| 开锁门速度/ms | 5000 | 5000 | 5000 | 3500 | 0 | 5000 |
| 翻窗速度/ms | 1000 | 1466 | 1018 | 1222 | 1 | 1100 |
| 翻箱速度/ms | 1250 | 1250 | 1250 | 1125 | 1000 | 1100 |

### 捣蛋鬼
- Assassin
- 技能隐身(BecomeInvisible)添加约束条件“使用隐身技能后,人物状态进入UsingSpecialSkill,进入其他状态会使得隐身状态解除"
- 喧哗者ANoisyPerson
- 普通攻击改为strike
- Klee
- 被动技能Lucky!(新增):开局获得随机的一个道具(不会是钥匙)

+ 10
- 0
docs/版本更新说明.md View File

@@ -0,0 +1,10 @@
# 版本更新说明

# 说明
- 只说明对于选手较为重要的修改

# 等待更新的更改
- docs:添加了 游戏机制与平衡性调整更新草案.pdf
- docs:添加了 版本更新说明.pdf
- docs&hotfix: 修正了GameRules.pdf中学生翻窗速度的错误
- remove: 删除了Place属性

+ 0
- 1
logic/GameClass/GameObj/Bullet/BombedBullet.cs View File

@@ -13,7 +13,6 @@ namespace GameClass.GameObj
public BombedBullet(Bullet bullet) : public BombedBullet(Bullet bullet) :
base(bullet.Position, bullet.Radius, GameObjType.BombedBullet) base(bullet.Position, bullet.Radius, GameObjType.BombedBullet)
{ {
this.place = bullet.Place;
this.bulletHasBombed = bullet; this.bulletHasBombed = bullet;
this.MappingID = bullet.ID; this.MappingID = bullet.ID;
this.FacingDirection = bullet.FacingDirection; this.FacingDirection = bullet.FacingDirection;


+ 6
- 8
logic/GameClass/GameObj/Bullet/Bullet.Ghost.cs View File

@@ -5,8 +5,8 @@ namespace GameClass.GameObj
{ {
internal sealed class CommonAttackOfGhost : Bullet internal sealed class CommonAttackOfGhost : Bullet
{ {
public CommonAttackOfGhost(Character player, PlaceType placeType, XY pos, int radius = GameData.bulletRadius) :
base(player, radius, placeType, pos)
public CommonAttackOfGhost(Character player, XY pos, int radius = GameData.bulletRadius) :
base(player, radius, pos)
{ {
} }
public override double BulletBombRange => 0; public override double BulletBombRange => 0;
@@ -52,8 +52,8 @@ namespace GameClass.GameObj


internal sealed class FlyingKnife : Bullet internal sealed class FlyingKnife : Bullet
{ {
public FlyingKnife(Character player, PlaceType placeType, XY pos, int radius = GameData.bulletRadius) :
base(player, radius, placeType, pos)
public FlyingKnife(Character player, XY pos, int radius = GameData.bulletRadius) :
base(player, radius, pos)
{ {
} }
public override double BulletBombRange => 0; public override double BulletBombRange => 0;
@@ -100,8 +100,7 @@ namespace GameClass.GameObj


internal sealed class BombBomb : Bullet internal sealed class BombBomb : Bullet
{ {
public BombBomb(Character player, PlaceType placeType, XY pos, int radius = GameData.bulletRadius) :
base(player, radius, placeType, pos)
public BombBomb(Character player, XY pos, int radius = GameData.bulletRadius) : base(player, radius, pos)
{ {
} }
public override double BulletBombRange => GameData.basicBulletBombRange; public override double BulletBombRange => GameData.basicBulletBombRange;
@@ -146,8 +145,7 @@ namespace GameClass.GameObj
} }
internal sealed class JumpyDumpty : Bullet internal sealed class JumpyDumpty : Bullet
{ {
public JumpyDumpty(Character player, PlaceType placeType, XY pos, int radius = GameData.bulletRadius) :
base(player, radius, placeType, pos)
public JumpyDumpty(Character player, XY pos, int radius = GameData.bulletRadius) : base(player, radius, pos)
{ {
} }
public override double BulletBombRange => GameData.basicBulletBombRange / 2; public override double BulletBombRange => GameData.basicBulletBombRange / 2;


+ 6
- 7
logic/GameClass/GameObj/Bullet/Bullet.cs View File

@@ -41,10 +41,9 @@ namespace GameClass.GameObj
return true; return true;
return false; return false;
} }
public Bullet(Character player, int radius, PlaceType placeType, XY Position) :
public Bullet(Character player, int radius, XY Position) :
base(Position, radius, GameObjType.Bullet) base(Position, radius, GameObjType.Bullet)
{ {
this.place = placeType;
this.CanMove = true; this.CanMove = true;
this.moveSpeed = this.Speed; this.moveSpeed = this.Speed;
this.hasSpear = player.TryUseSpear(); this.hasSpear = player.TryUseSpear();
@@ -57,18 +56,18 @@ namespace GameClass.GameObj


public static class BulletFactory public static class BulletFactory
{ {
public static Bullet? GetBullet(Character character, PlaceType place, XY pos)
public static Bullet? GetBullet(Character character, XY pos)
{ {
switch (character.BulletOfPlayer) switch (character.BulletOfPlayer)
{ {
case BulletType.FlyingKnife: case BulletType.FlyingKnife:
return new FlyingKnife(character, place, pos);
return new FlyingKnife(character, pos);
case BulletType.CommonAttackOfGhost: case BulletType.CommonAttackOfGhost:
return new CommonAttackOfGhost(character, place, pos);
return new CommonAttackOfGhost(character, pos);
case BulletType.JumpyDumpty: case BulletType.JumpyDumpty:
return new JumpyDumpty(character, place, pos);
return new JumpyDumpty(character, pos);
case BulletType.BombBomb: case BulletType.BombBomb:
return new BombBomb(character, place, pos);
return new BombBomb(character, pos);
default: default:
return null; return null;
} }


+ 0
- 1
logic/GameClass/GameObj/Character/Character.Skill.cs View File

@@ -57,7 +57,6 @@ namespace GameClass.GameObj
protected Character(XY initPos, int initRadius, CharacterType characterType) : protected Character(XY initPos, int initRadius, CharacterType characterType) :
base(initPos, initRadius, GameObjType.Character) base(initPos, initRadius, GameObjType.Character)
{ {
this.place = PlaceType.Null;
this.CanMove = true; this.CanMove = true;
this.score = 0; this.score = 0;
this.buffManager = new BuffManager(); this.buffManager = new BuffManager();


+ 2
- 3
logic/GameClass/GameObj/Character/Character.cs View File

@@ -58,10 +58,10 @@ namespace GameClass.GameObj
/// 进行一次攻击 /// 进行一次攻击
/// </summary> /// </summary>
/// <returns>攻击操作发出的子弹</returns> /// <returns>攻击操作发出的子弹</returns>
public Bullet? Attack(XY pos, PlaceType place)
public Bullet? Attack(XY pos)
{ {
if (TrySubBulletNum()) if (TrySubBulletNum())
return BulletFactory.GetBullet(this, place, pos);
return BulletFactory.GetBullet(this, pos);
else else
return null; return null;
} }
@@ -365,7 +365,6 @@ namespace GameClass.GameObj
CanMove = false; CanMove = false;
IsResetting = true; IsResetting = true;
Position = GameData.PosWhoDie; Position = GameData.PosWhoDie;
place = PlaceType.Grass;
} }
} }
#endregion #endregion


+ 9
- 20
logic/GameClass/GameObj/GameObj.cs View File

@@ -14,35 +14,24 @@ namespace GameClass.GameObj


protected readonly XY birthPos; protected readonly XY birthPos;


private GameObjType type;
private readonly GameObjType type;
public GameObjType Type => type; public GameObjType Type => type;


private static long currentMaxID = 0; // 目前游戏对象的最大ID private static long currentMaxID = 0; // 目前游戏对象的最大ID
public const long invalidID = long.MaxValue; // 无效的ID public const long invalidID = long.MaxValue; // 无效的ID
public const long noneID = long.MinValue;
public long ID { get; } public long ID { get; }


private XY position;
public XY Position
{
get => position;
protected
set
{
lock (gameObjLock)
{
position = value;
}
}
}

protected PlaceType place;
public PlaceType Place { get => place; }
protected XY position;
public virtual XY Position { get; set; }


private XY facingDirection = new(1, 0); private XY facingDirection = new(1, 0);
public XY FacingDirection public XY FacingDirection
{ {
get => facingDirection;
get
{
lock (gameObjLock)
return facingDirection;
}
set set
{ {
lock (gameObjLock) lock (gameObjLock)
@@ -85,7 +74,7 @@ namespace GameClass.GameObj
public virtual bool IgnoreCollideExecutor(IGameObj targetObj) => false; public virtual bool IgnoreCollideExecutor(IGameObj targetObj) => false;
public GameObj(XY initPos, int initRadius, GameObjType initType) public GameObj(XY initPos, int initRadius, GameObjType initType)
{ {
this.Position = this.birthPos = initPos;
this.position = this.birthPos = initPos;
this.Radius = initRadius; this.Radius = initRadius;
this.type = initType; this.type = initType;
ID = Interlocked.Increment(ref currentMaxID); ID = Interlocked.Increment(ref currentMaxID);


+ 0
- 1
logic/GameClass/GameObj/Map/Chest.cs View File

@@ -11,7 +11,6 @@ namespace GameClass.GameObj
public Chest(XY initPos) : public Chest(XY initPos) :
base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Chest) base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Chest)
{ {
this.place = PlaceType.Chest;
this.CanMove = false; this.CanMove = false;
} }
public override bool IsRigid => true; public override bool IsRigid => true;


+ 17
- 1
logic/GameClass/GameObj/Map/Door.cs View File

@@ -11,9 +11,25 @@ namespace GameClass.GameObj
public Door(XY initPos, PlaceType placeType) : public Door(XY initPos, PlaceType placeType) :
base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Door) base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Door)
{ {
this.place = placeType;
switch (placeType)
{
case PlaceType.Door3:
doorNum = 3;
break;
case PlaceType.Door5:
doorNum = 5;
break;
case PlaceType.Door6:
default:
doorNum = 6;
break;
}
this.CanMove = false; this.CanMove = false;
} }

private readonly int doorNum;
public int DoorNum => doorNum;

public override bool IsRigid => !isOpen; public override bool IsRigid => !isOpen;
public override ShapeType Shape => ShapeType.Square; public override ShapeType Shape => ShapeType.Square;




+ 0
- 1
logic/GameClass/GameObj/Map/Doorway.cs View File

@@ -11,7 +11,6 @@ namespace GameClass.GameObj
public Doorway(XY initPos) : public Doorway(XY initPos) :
base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Doorway) base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Doorway)
{ {
this.place = PlaceType.Doorway;
this.CanMove = false; this.CanMove = false;
} }
public override bool IsRigid => true; public override bool IsRigid => true;


+ 0
- 1
logic/GameClass/GameObj/Map/EmergencyExit.cs View File

@@ -11,7 +11,6 @@ namespace GameClass.GameObj
public EmergencyExit(XY initPos) : public EmergencyExit(XY initPos) :
base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.EmergencyExit) base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.EmergencyExit)
{ {
this.place = PlaceType.EmergencyExit;
this.CanMove = false; this.CanMove = false;
} }
public override bool IsRigid => true; public override bool IsRigid => true;


+ 0
- 1
logic/GameClass/GameObj/Map/Generator.cs View File

@@ -10,7 +10,6 @@ namespace GameClass.GameObj
public Generator(XY initPos) : public Generator(XY initPos) :
base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Generator) base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Generator)
{ {
this.place = PlaceType.Generator;
this.CanMove = false; this.CanMove = false;
} }
public override bool IsRigid => true; public override bool IsRigid => true;


+ 0
- 1
logic/GameClass/GameObj/Map/Wall.cs View File

@@ -10,7 +10,6 @@ namespace GameClass.GameObj
public Wall(XY initPos) : public Wall(XY initPos) :
base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Wall) base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Wall)
{ {
this.place = PlaceType.Wall;
this.CanMove = false; this.CanMove = false;
} }
public override bool IsRigid => true; public override bool IsRigid => true;


+ 0
- 1
logic/GameClass/GameObj/Map/Window.cs View File

@@ -11,7 +11,6 @@ namespace GameClass.GameObj
public Window(XY initPos) : public Window(XY initPos) :
base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Window) base(initPos, GameData.numOfPosGridPerCell / 2, GameObjType.Window)
{ {
this.place = PlaceType.Window;
this.CanMove = false; this.CanMove = false;
} }
public override bool IsRigid => true; public override bool IsRigid => true;


+ 17
- 11
logic/GameClass/GameObj/Moveable.cs View File

@@ -12,6 +12,22 @@ namespace GameClass.GameObj
protected readonly object moveObjLock = new(); protected readonly object moveObjLock = new();
public object MoveLock => moveObjLock; public object MoveLock => moveObjLock;


public override XY Position
{
get
{
lock (gameObjLock)
return position;
}
set
{
lock (gameObjLock)
{
position = value;
}
}
}

private bool isMoving; private bool isMoving;
public bool IsMoving public bool IsMoving
{ {
@@ -48,27 +64,17 @@ namespace GameClass.GameObj
public int OrgMoveSpeed { get; protected set; } public int OrgMoveSpeed { get; protected set; }


// 移动,改变坐标 // 移动,改变坐标
public long MovingSetPos(XY moveVec, PlaceType place)
public long MovingSetPos(XY moveVec)
{ {
if (moveVec.x != 0 || moveVec.y != 0) if (moveVec.x != 0 || moveVec.y != 0)
lock (gameObjLock) lock (gameObjLock)
{ {
FacingDirection = moveVec; FacingDirection = moveVec;
this.Position += moveVec; this.Position += moveVec;
this.place = place;
} }
return moveVec * moveVec; return moveVec * moveVec;
} }


public void ReSetPos(XY pos, PlaceType place)
{
lock (gameObjLock)
{
this.Position = pos;
this.place = place;
}
}

/// <summary> /// <summary>
/// 设置移动速度 /// 设置移动速度
/// </summary> /// </summary>


+ 0
- 1
logic/GameClass/GameObj/OutOfBoundBlock.cs View File

@@ -11,7 +11,6 @@ namespace GameClass.GameObj
public OutOfBoundBlock(XY initPos) : public OutOfBoundBlock(XY initPos) :
base(initPos, int.MaxValue, GameObjType.OutOfBoundBlock) base(initPos, int.MaxValue, GameObjType.OutOfBoundBlock)
{ {
this.place = PlaceType.Wall;
this.CanMove = false; this.CanMove = false;
} }




+ 0
- 1
logic/GameClass/GameObj/PickedProp.cs View File

@@ -17,7 +17,6 @@ namespace GameClass.GameObj
public PickedProp(Prop prop) : public PickedProp(Prop prop) :
base(prop.Position, prop.Radius, GameObjType.PickedProp) base(prop.Position, prop.Radius, GameObjType.PickedProp)
{ {
this.place = prop.Place;
this.PropHasPicked = prop; this.PropHasPicked = prop;
this.MappingID = prop.ID; this.MappingID = prop.ID;
} }


+ 23
- 24
logic/GameClass/GameObj/Prop.cs View File

@@ -19,10 +19,9 @@ namespace GameClass.GameObj


public abstract PropType GetPropType(); public abstract PropType GetPropType();


public Prop(XY initPos, PlaceType place, int radius = GameData.PropRadius) :
public Prop(XY initPos, int radius = GameData.PropRadius) :
base(initPos, radius, GameObjType.Prop) base(initPos, radius, GameObjType.Prop)
{ {
this.place = place;
this.CanMove = false; this.CanMove = false;
this.moveSpeed = GameData.PropMoveSpeed; this.moveSpeed = GameData.PropMoveSpeed;
} }
@@ -43,8 +42,8 @@ namespace GameClass.GameObj
/// </summary> /// </summary>
public sealed class AddSpeed : Prop public sealed class AddSpeed : Prop
{ {
public AddSpeed(XY initPos, PlaceType placeType) :
base(initPos, placeType)
public AddSpeed(XY initPos) :
base(initPos)
{ {
} }
public override PropType GetPropType() => PropType.AddSpeed; public override PropType GetPropType() => PropType.AddSpeed;
@@ -54,24 +53,24 @@ namespace GameClass.GameObj
/// </summary> /// </summary>
public sealed class AddLifeOrClairaudience : Prop public sealed class AddLifeOrClairaudience : Prop
{ {
public AddLifeOrClairaudience(XY initPos, PlaceType placeType) :
base(initPos, placeType)
public AddLifeOrClairaudience(XY initPos) :
base(initPos)
{ {
} }
public override PropType GetPropType() => PropType.AddLifeOrClairaudience; public override PropType GetPropType() => PropType.AddLifeOrClairaudience;
} }
public sealed class AddHpOrAp : Prop public sealed class AddHpOrAp : Prop
{ {
public AddHpOrAp(XY initPos, PlaceType placeType) :
base(initPos, placeType)
public AddHpOrAp(XY initPos) :
base(initPos)
{ {
} }
public override PropType GetPropType() => PropType.AddHpOrAp; public override PropType GetPropType() => PropType.AddHpOrAp;
} }
public sealed class RecoveryFromDizziness : Prop public sealed class RecoveryFromDizziness : Prop
{ {
public RecoveryFromDizziness(XY initPos, PlaceType placeType) :
base(initPos, placeType)
public RecoveryFromDizziness(XY initPos) :
base(initPos)
{ {
} }
public override PropType GetPropType() => PropType.RecoveryFromDizziness; public override PropType GetPropType() => PropType.RecoveryFromDizziness;
@@ -81,35 +80,35 @@ namespace GameClass.GameObj
/// </summary> /// </summary>
public sealed class ShieldOrSpear : Prop public sealed class ShieldOrSpear : Prop
{ {
public ShieldOrSpear(XY initPos, PlaceType placeType) : base(initPos, placeType)
public ShieldOrSpear(XY initPos) : base(initPos)
{ {
} }
public override PropType GetPropType() => PropType.ShieldOrSpear; public override PropType GetPropType() => PropType.ShieldOrSpear;
} }
public sealed class Key3 : Prop public sealed class Key3 : Prop
{ {
public Key3(XY initPos, PlaceType placeType) : base(initPos, placeType)
public Key3(XY initPos) : base(initPos)
{ {
} }
public override PropType GetPropType() => PropType.Key3; public override PropType GetPropType() => PropType.Key3;
} }
public sealed class Key5 : Prop public sealed class Key5 : Prop
{ {
public Key5(XY initPos, PlaceType placeType) : base(initPos, placeType)
public Key5(XY initPos) : base(initPos)
{ {
} }
public override PropType GetPropType() => PropType.Key5; public override PropType GetPropType() => PropType.Key5;
} }
public sealed class Key6 : Prop public sealed class Key6 : Prop
{ {
public Key6(XY initPos, PlaceType placeType) : base(initPos, placeType)
public Key6(XY initPos) : base(initPos)
{ {
} }
public override PropType GetPropType() => PropType.Key6; public override PropType GetPropType() => PropType.Key6;
} }
public sealed class NullProp : Prop public sealed class NullProp : Prop
{ {
public NullProp(PlaceType placeType = PlaceType.Wall) : base(new XY(1, 1), placeType)
public NullProp() : base(new XY(1, 1))
{ {
} }
public override PropType GetPropType() => PropType.Null; public override PropType GetPropType() => PropType.Null;
@@ -143,26 +142,26 @@ namespace GameClass.GameObj
// #endregion // #endregion
public static class PropFactory public static class PropFactory
{ {
public static Prop GetProp(PropType propType, XY pos, PlaceType place)
public static Prop GetProp(PropType propType, XY pos)
{ {
switch (propType) switch (propType)
{ {
case PropType.AddSpeed: case PropType.AddSpeed:
return new AddSpeed(pos, place);
return new AddSpeed(pos);
case PropType.AddLifeOrClairaudience: case PropType.AddLifeOrClairaudience:
return new AddLifeOrClairaudience(pos, place);
return new AddLifeOrClairaudience(pos);
case PropType.ShieldOrSpear: case PropType.ShieldOrSpear:
return new ShieldOrSpear(pos, place);
return new ShieldOrSpear(pos);
case PropType.AddHpOrAp: case PropType.AddHpOrAp:
return new AddHpOrAp(pos, place);
return new AddHpOrAp(pos);
case PropType.RecoveryFromDizziness: case PropType.RecoveryFromDizziness:
return new RecoveryFromDizziness(pos, place);
return new RecoveryFromDizziness(pos);
case PropType.Key3: case PropType.Key3:
return new Key3(pos, place);
return new Key3(pos);
case PropType.Key5: case PropType.Key5:
return new Key5(pos, place);
return new Key5(pos);
case PropType.Key6: case PropType.Key6:
return new Key6(pos, place);
return new Key6(pos);
default: default:
return new NullProp(); return new NullProp();
} }


+ 4
- 4
logic/GameEngine/MoveEngine.cs View File

@@ -70,7 +70,7 @@ namespace GameEngine
XY nextPos = obj.Position + moveVec; XY nextPos = obj.Position + moveVec;
double maxLen = collisionChecker.FindMax(obj, nextPos, moveVec); double maxLen = collisionChecker.FindMax(obj, nextPos, moveVec);
maxLen = Math.Min(maxLen, obj.MoveSpeed / GameData.numOfStepPerSecond); maxLen = Math.Min(maxLen, obj.MoveSpeed / GameData.numOfStepPerSecond);
obj.MovingSetPos(new XY(moveVec, maxLen), GetPlaceType(nextPos));
obj.MovingSetPos(new XY(moveVec, maxLen));
} }


public void MoveObj(IMoveable obj, int moveTime, double direction) public void MoveObj(IMoveable obj, int moveTime, double direction)
@@ -90,7 +90,7 @@ namespace GameEngine


double moveVecLength = 0.0; double moveVecLength = 0.0;
XY res = new(direction, moveVecLength); XY res = new(direction, moveVecLength);
double deltaLen = moveVecLength - Math.Sqrt(obj.MovingSetPos(res, GetPlaceType(obj.Position + res))); // 转向,并用deltaLen存储行走的误差
double deltaLen = moveVecLength - Math.Sqrt(obj.MovingSetPos(res)); // 转向,并用deltaLen存储行走的误差
IGameObj? collisionObj = null; IGameObj? collisionObj = null;
bool isDestroyed = false; bool isDestroyed = false;


@@ -156,7 +156,7 @@ namespace GameEngine
} while (flag); } while (flag);


if (threadNum == 0 || ((ICharacter)obj).ThreadNum == threadNum) if (threadNum == 0 || ((ICharacter)obj).ThreadNum == threadNum)
deltaLen += moveVecLength - Math.Sqrt(obj.MovingSetPos(res, GetPlaceType(obj.Position + res)));
deltaLen += moveVecLength - Math.Sqrt(obj.MovingSetPos(res));


return true; return true;
}, },
@@ -175,7 +175,7 @@ namespace GameEngine
if ((collisionObj = collisionChecker.CheckCollisionWhenMoving(obj, res)) == null) if ((collisionObj = collisionChecker.CheckCollisionWhenMoving(obj, res)) == null)
{ {
if (threadNum == 0 || ((ICharacter)obj).ThreadNum == threadNum) if (threadNum == 0 || ((ICharacter)obj).ThreadNum == threadNum)
obj.MovingSetPos(res, GetPlaceType(obj.Position + res));
obj.MovingSetPos(res);
} }
else else
{ {


+ 7
- 7
logic/Gaming/ActionManager.cs View File

@@ -267,7 +267,7 @@ namespace Gaming
{ {
Prop prop = chestToOpen.PropInChest[i]; Prop prop = chestToOpen.PropInChest[i];
chestToOpen.PropInChest[i] = new NullProp(); chestToOpen.PropInChest[i] = new NullProp();
prop.ReSetPos(player.Position, gameMap.GetPlaceType(player.Position));
prop.Position = player.Position;
gameMap.Add(prop); gameMap.Add(prop);
} }
} }
@@ -295,7 +295,7 @@ namespace Gaming
if (characterInWindow != null) if (characterInWindow != null)
{ {
if (player.IsGhost() && !characterInWindow.IsGhost()) if (player.IsGhost() && !characterInWindow.IsGhost())
characterManager.BeAttacked((Student)(characterInWindow), player.Attack(characterInWindow.Position, PlaceType.Null));
characterManager.BeAttacked((Student)(characterInWindow), player.Attack(characterInWindow.Position));
return false; return false;
}*/ }*/


@@ -323,7 +323,7 @@ namespace Gaming
return; return;
} }


player.ReSetPos(windowToPlayer + windowForClimb.Position, PlaceType.Window);
player.Position = windowToPlayer + windowForClimb.Position;
player.MoveSpeed = player.SpeedOfClimbingThroughWindows; player.MoveSpeed = player.SpeedOfClimbingThroughWindows;


moveEngine.MoveObj(player, (int)(windowToPlayer.Length() * 3.0 * 1000 / player.MoveSpeed), (-1 * windowToPlayer).Angle()); moveEngine.MoveObj(player, (int)(windowToPlayer.Length() * 3.0 * 1000 / player.MoveSpeed), (-1 * windowToPlayer).Angle());
@@ -339,7 +339,7 @@ namespace Gaming
) )
.Start(); .Start();
XY PosJumpOff = windowForClimb.Position - 2 * windowToPlayer; XY PosJumpOff = windowForClimb.Position - 2 * windowToPlayer;
player.ReSetPos(PosJumpOff, gameMap.GetPlaceType(PosJumpOff));
player.Position = PosJumpOff;
player.MoveSpeed = player.ReCalculateBuff(BuffType.AddSpeed, player.OrgMoveSpeed, GameData.MaxSpeed, GameData.MinSpeed); player.MoveSpeed = player.ReCalculateBuff(BuffType.AddSpeed, player.OrgMoveSpeed, GameData.MaxSpeed, GameData.MinSpeed);
windowForClimb.WhoIsClimbing = null; windowForClimb.WhoIsClimbing = null;
// gameMap.Remove(addWall); // gameMap.Remove(addWall);
@@ -367,15 +367,15 @@ namespace Gaming
switch (prop.GetPropType()) switch (prop.GetPropType())
{ {
case PropType.Key3: case PropType.Key3:
if (doorToLock.Place == PlaceType.Door3)
if (doorToLock.DoorNum == 3)
flag = true; flag = true;
break; break;
case PropType.Key5: case PropType.Key5:
if (doorToLock.Place == PlaceType.Door5)
if (doorToLock.DoorNum == 5)
flag = true; flag = true;
break; break;
case PropType.Key6: case PropType.Key6:
if (doorToLock.Place == PlaceType.Door6)
if (doorToLock.DoorNum == 6)
flag = true; flag = true;
break; break;
default: default:


+ 1
- 1
logic/Gaming/AttackManager.cs View File

@@ -178,7 +178,7 @@ namespace Gaming
(int)(Math.Abs((player.Radius + BulletFactory.BulletRadius(player.BulletOfPlayer)) * Math.Sin(angle))) * ((Math.Sin(angle) > 0) ? 1 : -1) (int)(Math.Abs((player.Radius + BulletFactory.BulletRadius(player.BulletOfPlayer)) * Math.Sin(angle))) * ((Math.Sin(angle) > 0) ? 1 : -1)
); );


Bullet? bullet = player.Attack(res, gameMap.GetPlaceType(res));
Bullet? bullet = player.Attack(res);


if (bullet != null) if (bullet != null)
{ {


+ 1
- 1
logic/Gaming/CharacterManager .cs View File

@@ -407,7 +407,7 @@ namespace Gaming
Prop? prop = player.UseProp(i); Prop? prop = player.UseProp(i);
if (prop != null) if (prop != null)
{ {
prop.ReSetPos(player.Position, gameMap.GetPlaceType(player.Position));
prop.Position = player.Position;
gameMap.Add(prop); gameMap.Add(prop);
} }
} }


+ 6
- 6
logic/Gaming/PropManager.cs View File

@@ -124,13 +124,13 @@ namespace Gaming
if (prop.GetPropType() == PropType.Null) if (prop.GetPropType() == PropType.Null)
return; return;


prop.ReSetPos(player.Position, gameMap.GetPlaceType(player.Position));
prop.Position = player.Position;
gameMap.Add(prop); gameMap.Add(prop);
} }


private Prop ProduceOnePropNotKey(Random r, XY Pos)
private static Prop ProduceOnePropNotKey(Random r, XY Pos)
{ {
return PropFactory.GetProp((PropType)r.Next(GameData.numOfTeachingBuilding + 1, GameData.numOfPropSpecies + 1), Pos, gameMap.GetPlaceType(Pos));
return PropFactory.GetProp((PropType)r.Next(GameData.numOfTeachingBuilding + 1, GameData.numOfPropSpecies + 1), Pos);
} }


private Chest GetChest(Random r) private Chest GetChest(Random r)
@@ -153,7 +153,7 @@ namespace Gaming
{ {
++cou; ++cou;
Chest chest = GetChest(r); Chest chest = GetChest(r);
chest.PropInChest[1] = new Key3(chest.Position, PlaceType.Chest);
chest.PropInChest[1] = new Key3(chest.Position);
chest.PropInChest[0] = ProduceOnePropNotKey(r, chest.Position); chest.PropInChest[0] = ProduceOnePropNotKey(r, chest.Position);
} }
cou = 0; cou = 0;
@@ -161,7 +161,7 @@ namespace Gaming
{ {
++cou; ++cou;
Chest chest = GetChest(r); Chest chest = GetChest(r);
chest.PropInChest[1] = new Key5(chest.Position, PlaceType.Chest);
chest.PropInChest[1] = new Key5(chest.Position);
chest.PropInChest[0] = ProduceOnePropNotKey(r, chest.Position); chest.PropInChest[0] = ProduceOnePropNotKey(r, chest.Position);
} }
cou = 0; cou = 0;
@@ -169,7 +169,7 @@ namespace Gaming
{ {
++cou; ++cou;
Chest chest = GetChest(r); Chest chest = GetChest(r);
chest.PropInChest[1] = new Key6(chest.Position, PlaceType.Chest);
chest.PropInChest[1] = new Key6(chest.Position);
chest.PropInChest[0] = ProduceOnePropNotKey(r, chest.Position); chest.PropInChest[0] = ProduceOnePropNotKey(r, chest.Position);
} }




+ 0
- 1
logic/Preparation/Interface/IGameObj.cs View File

@@ -7,7 +7,6 @@ namespace Preparation.Interface
public GameObjType Type { get; } public GameObjType Type { get; }
public long ID { get; } public long ID { get; }
public XY Position { get; } // if Square, Pos equals the center public XY Position { get; } // if Square, Pos equals the center
public PlaceType Place { get; }
public XY FacingDirection { get; } public XY FacingDirection { get; }
public bool IsRigid { get; } public bool IsRigid { get; }
public ShapeType Shape { get; } public ShapeType Shape { get; }


+ 1
- 2
logic/Preparation/Interface/IMoveable.cs View File

@@ -9,8 +9,7 @@ namespace Preparation.Interface
public int MoveSpeed { get; } public int MoveSpeed { get; }
public bool IsMoving { get; set; } public bool IsMoving { get; set; }
public bool IsAvailable { get; } public bool IsAvailable { get; }
public long MovingSetPos(XY moveVec, PlaceType place);
public void ReSetPos(XY pos, PlaceType place);
public long MovingSetPos(XY moveVec);
public bool WillCollideWith(IGameObj? targetObj, XY nextPos) // 检查下一位置是否会和目标物碰撞 public bool WillCollideWith(IGameObj? targetObj, XY nextPos) // 检查下一位置是否会和目标物碰撞
{ {
if (targetObj == null) if (targetObj == null)


+ 0
- 1
logic/Preparation/Utility/GameData.cs View File

@@ -1,6 +1,5 @@
using Preparation.Interface; using Preparation.Interface;
using System; using System;
using System.Net.NetworkInformation;


namespace Preparation.Utility namespace Preparation.Utility
{ {


+ 1
- 5
logic/Server/CopyInfo.cs View File

@@ -61,7 +61,6 @@ namespace Server
Speed = player.MoveSpeed, Speed = player.MoveSpeed,
Determination = player.HP, Determination = player.HP,
Addiction = player.GamingAddiction, Addiction = player.GamingAddiction,
Place = Transformation.ToPlaceType((Preparation.Utility.PlaceType)player.Place),
Guid = player.ID, Guid = player.ID,


PlayerState = Transformation.ToPlayerState((PlayerStateType)player.PlayerState), PlayerState = Transformation.ToPlayerState((PlayerStateType)player.PlayerState),
@@ -108,7 +107,6 @@ namespace Server
X = player.Position.x, X = player.Position.x,
Y = player.Position.y, Y = player.Position.y,
Speed = player.MoveSpeed, Speed = player.MoveSpeed,
Place = Transformation.ToPlaceType((Preparation.Utility.PlaceType)player.Place),


TrickerType = Transformation.ToTrickerType(player.CharacterType), TrickerType = Transformation.ToTrickerType(player.CharacterType),
Guid = player.ID, Guid = player.ID,
@@ -152,7 +150,6 @@ namespace Server
FacingDirection = bullet.FacingDirection.Angle(), FacingDirection = bullet.FacingDirection.Angle(),
Guid = bullet.ID, Guid = bullet.ID,
Team = (bullet.Parent!.IsGhost()) ? PlayerType.TrickerPlayer : PlayerType.StudentPlayer, Team = (bullet.Parent!.IsGhost()) ? PlayerType.TrickerPlayer : PlayerType.StudentPlayer,
Place = Transformation.ToPlaceType((Preparation.Utility.PlaceType)bullet.Place),
BombRange = bullet.BulletBombRange, BombRange = bullet.BulletBombRange,
Speed = bullet.Speed Speed = bullet.Speed
} }
@@ -170,8 +167,7 @@ namespace Server
X = prop.Position.x, X = prop.Position.x,
Y = prop.Position.y, Y = prop.Position.y,
FacingDirection = prop.FacingDirection.Angle(), FacingDirection = prop.FacingDirection.Angle(),
Guid = prop.ID,
Place = Transformation.ToPlaceType((Preparation.Utility.PlaceType)prop.Place)
Guid = prop.ID
} }
}; };
return msg; return msg;


+ 1
- 1
logic/cmd/gameServerAndClient.cmd View File

@@ -1,6 +1,6 @@
@echo off @echo off


start cmd /k ..\Server\bin\Debug\net6.0\Server.exe --ip 0.0.0.0 --port 8888 --studentCount 0 --trickerCount 1 --gameTimeInSecond 600 --fileName test
start cmd /k ..\Server\bin\Debug\net6.0\Server.exe --ip 0.0.0.0 --port 8888 --studentCount 4 --trickerCount 1 --gameTimeInSecond 600 --fileName test


ping -n 2 127.0.0.1 > NUL ping -n 2 127.0.0.1 > NUL



Loading…
Cancel
Save