From bd5cec3b6efdbb75bef2b19a94bba1b2c5969c19 Mon Sep 17 00:00:00 2001 From: DragonAura Date: Tue, 11 Apr 2023 19:41:13 +0800 Subject: [PATCH] style(CAPI): :art: change some func names --- CAPI/cpp/API/include/API.h | 16 +++++++------- CAPI/cpp/API/include/Communication.h | 4 ++-- CAPI/cpp/API/include/logic.h | 4 ++-- CAPI/cpp/API/src/AI.cpp | 1 + CAPI/cpp/API/src/API.cpp | 8 +++---- CAPI/cpp/API/src/Communication.cpp | 4 ++-- CAPI/cpp/API/src/DebugAPI.cpp | 16 +++++++------- CAPI/cpp/API/src/logic.cpp | 12 +++++------ CAPI/cpp/CAPI.sln | 31 ---------------------------- CAPI/python/PyAPI/AI.py | 4 ++++ CAPI/python/PyAPI/API.py | 8 +++---- CAPI/python/PyAPI/Communication.py | 4 ++-- CAPI/python/PyAPI/DebugAPI.py | 24 ++++++++++----------- CAPI/python/PyAPI/Interface.py | 8 +++---- CAPI/python/PyAPI/constants.py | 7 ++++++- CAPI/python/PyAPI/logic.py | 12 +++++------ 16 files changed, 71 insertions(+), 92 deletions(-) delete mode 100644 CAPI/cpp/CAPI.sln diff --git a/CAPI/cpp/API/include/API.h b/CAPI/cpp/API/include/API.h index c4516df..a8f3034 100644 --- a/CAPI/cpp/API/include/API.h +++ b/CAPI/cpp/API/include/API.h @@ -69,8 +69,8 @@ public: virtual bool Graduate() = 0; virtual bool StartLearning() = 0; - virtual bool StartTreatMate(int64_t mateID) = 0; - virtual bool StartRescueMate(int64_t mateID) = 0; + virtual bool StartEncourageMate(int64_t mateID) = 0; + virtual bool StartRouseMate(int64_t mateID) = 0; virtual bool OpenDoor() = 0; virtual bool CloseDoor() = 0; @@ -177,8 +177,8 @@ public: /*****学生阵营的特定函数*****/ virtual std::future StartLearning() = 0; - virtual std::future StartTreatMate(int64_t mateID) = 0; - virtual std::future StartRescueMate(int64_t mateID) = 0; + virtual std::future StartEncourageMate(int64_t mateID) = 0; + virtual std::future StartRouseMate(int64_t mateID) = 0; virtual std::future Graduate() = 0; [[nodiscard]] virtual std::shared_ptr GetSelfInfo() const = 0; }; @@ -266,8 +266,8 @@ public: [[nodiscard]] std::vector GetPlayerGUIDs() const override; std::future StartLearning() override; - std::future StartTreatMate(int64_t mateID) override; - std::future StartRescueMate(int64_t mateID) override; + std::future StartEncourageMate(int64_t mateID) override; + std::future StartRouseMate(int64_t mateID) override; std::future Graduate() override; [[nodiscard]] std::shared_ptr GetSelfInfo() const override; @@ -434,8 +434,8 @@ public: [[nodiscard]] std::vector GetPlayerGUIDs() const override; std::future StartLearning() override; - std::future StartTreatMate(int64_t mateID) override; - std::future StartRescueMate(int64_t mateID) override; + std::future StartEncourageMate(int64_t mateID) override; + std::future StartRouseMate(int64_t mateID) override; std::future Graduate() override; [[nodiscard]] virtual std::shared_ptr GetSelfInfo() const override; diff --git a/CAPI/cpp/API/include/Communication.h b/CAPI/cpp/API/include/Communication.h index 3490b75..2f75e43 100644 --- a/CAPI/cpp/API/include/Communication.h +++ b/CAPI/cpp/API/include/Communication.h @@ -39,8 +39,8 @@ public: bool Graduate(int64_t playerID); bool StartLearning(int64_t playerID); - bool StartTreatMate(int64_t playerID, int64_t mateID); - bool StartRescueMate(int64_t playerID, int64_t mateID); + bool StartEncourageMate(int64_t playerID, int64_t mateID); + bool StartRouseMate(int64_t playerID, int64_t mateID); bool Attack(double angle, int64_t playerID); diff --git a/CAPI/cpp/API/include/logic.h b/CAPI/cpp/API/include/logic.h index 2db779b..3e33682 100644 --- a/CAPI/cpp/API/include/logic.h +++ b/CAPI/cpp/API/include/logic.h @@ -125,8 +125,8 @@ private: bool StartLearning() override; - bool StartTreatMate(int64_t mateID) override; - bool StartRescueMate(int64_t mateID) override; + bool StartEncourageMate(int64_t mateID) override; + bool StartRouseMate(int64_t mateID) override; bool Attack(double angle) override; diff --git a/CAPI/cpp/API/src/AI.cpp b/CAPI/cpp/API/src/AI.cpp index 79c408b..5e94723 100644 --- a/CAPI/cpp/API/src/AI.cpp +++ b/CAPI/cpp/API/src/AI.cpp @@ -1,6 +1,7 @@ #include #include #include "AI.h" +#include "constants.h" // 为假则play()期间确保游戏状态不更新，为真则只保证游戏状态在调用相关方法时不更新 extern const bool asynchronous = false; diff --git a/CAPI/cpp/API/src/API.cpp b/CAPI/cpp/API/src/API.cpp index 03e08c7..ce38ae5 100644 --- a/CAPI/cpp/API/src/API.cpp +++ b/CAPI/cpp/API/src/API.cpp @@ -383,16 +383,16 @@ std::future StudentAPI::StartLearning() { return logic.StartLearning(); }); } -std::future StudentAPI::StartTreatMate(int64_t mateID) +std::future StudentAPI::StartEncourageMate(int64_t mateID) { return std::async(std::launch::async, [=]() - { return logic.StartTreatMate(mateID); }); + { return logic.StartEncourageMate(mateID); }); } -std::future StudentAPI::StartRescueMate(int64_t mateID) +std::future StudentAPI::StartRouseMate(int64_t mateID) { return std::async(std::launch::async, [=]() - { return logic.StartRescueMate(mateID); }); + { return logic.StartRouseMate(mateID); }); } std::future StudentAPI::Graduate() diff --git a/CAPI/cpp/API/src/Communication.cpp b/CAPI/cpp/API/src/Communication.cpp index 41a8590..01b4b25 100644 --- a/CAPI/cpp/API/src/Communication.cpp +++ b/CAPI/cpp/API/src/Communication.cpp @@ -183,7 +183,7 @@ bool Communication::StartLearning(int64_t playerID) return false; } -bool Communication::StartRescueMate(int64_t playerID, int64_t mateID) +bool Communication::StartRouseMate(int64_t playerID, int64_t mateID) { protobuf::BoolRes saveStudentResult; ClientContext context; @@ -195,7 +195,7 @@ bool Communication::StartRescueMate(int64_t playerID, int64_t mateID) return false; } -bool Communication::StartTreatMate(int64_t playerID, int64_t mateID) +bool Communication::StartEncourageMate(int64_t playerID, int64_t mateID) { protobuf::BoolRes healStudentResult; ClientContext context; diff --git a/CAPI/cpp/API/src/DebugAPI.cpp b/CAPI/cpp/API/src/DebugAPI.cpp index f307148..1bbab12 100644 --- a/CAPI/cpp/API/src/DebugAPI.cpp +++ b/CAPI/cpp/API/src/DebugAPI.cpp @@ -575,23 +575,23 @@ std::future StudentDebugAPI::StartLearning() return result; }); } -std::future StudentDebugAPI::StartRescueMate(int64_t mateID) +std::future StudentDebugAPI::StartRouseMate(int64_t mateID) { - logger->info("StartRescueMate: mate id={}, called at {}ms", mateID, Time::TimeSinceStart(startPoint)); + logger->info("StartRouseMate: mate id={}, called at {}ms", mateID, Time::TimeSinceStart(startPoint)); return std::async(std::launch::async, [=]() - { auto result = logic.StartRescueMate(mateID); + { auto result = logic.StartRouseMate(mateID); if (!result) - logger->warn("StartRescueMate: failed at {}ms", Time::TimeSinceStart(startPoint)); + logger->warn("StartRouseMate: failed at {}ms", Time::TimeSinceStart(startPoint)); return result; }); } -std::future StudentDebugAPI::StartTreatMate(int64_t mateID) +std::future StudentDebugAPI::StartEncourageMate(int64_t mateID) { - logger->info("StartTreatMate: mate id={}, called at {}ms", mateID, Time::TimeSinceStart(startPoint)); + logger->info("StartEncourageMate: mate id={}, called at {}ms", mateID, Time::TimeSinceStart(startPoint)); return std::async(std::launch::async, [=]() - { auto result = logic.StartTreatMate(mateID); + { auto result = logic.StartEncourageMate(mateID); if (!result) - logger->warn("StartTreatMate: failed at {}ms", Time::TimeSinceStart(startPoint)); + logger->warn("StartEncourageMate: failed at {}ms", Time::TimeSinceStart(startPoint)); return result; }); } diff --git a/CAPI/cpp/API/src/logic.cpp b/CAPI/cpp/API/src/logic.cpp index 4b8415c..8a83e03 100644 --- a/CAPI/cpp/API/src/logic.cpp +++ b/CAPI/cpp/API/src/logic.cpp @@ -251,16 +251,16 @@ bool Logic::StartLearning() return pComm->StartLearning(playerID); } -bool Logic::StartTreatMate(int64_t mateID) +bool Logic::StartEncourageMate(int64_t mateID) { - logger->debug("Called StartTreatMate"); - return pComm->StartTreatMate(playerID, mateID); + logger->debug("Called StartEncourageMate"); + return pComm->StartEncourageMate(playerID, mateID); } -bool Logic::StartRescueMate(int64_t mateID) +bool Logic::StartRouseMate(int64_t mateID) { - logger->debug("Called StartRescueMate"); - return pComm->StartRescueMate(playerID, mateID); + logger->debug("Called StartRouseMate"); + return pComm->StartRouseMate(playerID, mateID); } bool Logic::Attack(double angle) diff --git a/CAPI/cpp/CAPI.sln b/CAPI/cpp/CAPI.sln deleted file mode 100644 index 76cf3d8..0000000 --- a/CAPI/cpp/CAPI.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "API", "API\API.vcxproj", "{B9AC3133-177D-453C-8066-ED4702D3F36A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B9AC3133-177D-453C-8066-ED4702D3F36A}.Debug|x64.ActiveCfg = Debug|x64 - {B9AC3133-177D-453C-8066-ED4702D3F36A}.Debug|x64.Build.0 = Debug|x64 - {B9AC3133-177D-453C-8066-ED4702D3F36A}.Debug|x86.ActiveCfg = Debug|Win32 - {B9AC3133-177D-453C-8066-ED4702D3F36A}.Debug|x86.Build.0 = Debug|Win32 - {B9AC3133-177D-453C-8066-ED4702D3F36A}.Release|x64.ActiveCfg = Release|x64 - {B9AC3133-177D-453C-8066-ED4702D3F36A}.Release|x64.Build.0 = Release|x64 - {B9AC3133-177D-453C-8066-ED4702D3F36A}.Release|x86.ActiveCfg = Release|Win32 - {B9AC3133-177D-453C-8066-ED4702D3F36A}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {372B1478-522C-4EEB-A527-983D310A3F50} - EndGlobalSection -EndGlobal diff --git a/CAPI/python/PyAPI/AI.py b/CAPI/python/PyAPI/AI.py index eb4abd0..a503018 100644 --- a/CAPI/python/PyAPI/AI.py +++ b/CAPI/python/PyAPI/AI.py @@ -1,6 +1,7 @@ import PyAPI.structures as THUAI6 from PyAPI.Interface import IStudentAPI, ITrickerAPI, IAI from typing import Union, Final, cast +from PyAPI.constants import Constants import queue import time @@ -147,4 +148,7 @@ class AI(IAI): api.PrintTricker() def TrickerPlay(self, api: ITrickerAPI) -> None: + api.UseSkill(0) + api.UseSkill(1) + api.PrintSelfInfo() return diff --git a/CAPI/python/PyAPI/API.py b/CAPI/python/PyAPI/API.py index bb5522b..2a04666 100644 --- a/CAPI/python/PyAPI/API.py +++ b/CAPI/python/PyAPI/API.py @@ -157,11 +157,11 @@ class StudentAPI(IStudentAPI, IGameTimer): def StartLearning(self) -> Future[bool]: return self.__pool.submit(self.__logic.StartLearning) - def StartTreatMate(self, mateID: int) -> Future[bool]: - return self.__pool.submit(self.__logic.StartTreatMate, mateID) + def StartEncourageMate(self, mateID: int) -> Future[bool]: + return self.__pool.submit(self.__logic.StartEncourageMate, mateID) - def StartRescueMate(self, mateID: int) -> Future[bool]: - return self.__pool.submit(self.__logic.StartRescueMate, mateID) + def StartRouseMate(self, mateID: int) -> Future[bool]: + return self.__pool.submit(self.__logic.StartRouseMate, mateID) def GetSelfInfo(self) -> THUAI6.Student: return cast(THUAI6.Student, self.__logic.GetSelfInfo()) diff --git a/CAPI/python/PyAPI/Communication.py b/CAPI/python/PyAPI/Communication.py index 41c201f..adeea1f 100644 --- a/CAPI/python/PyAPI/Communication.py +++ b/CAPI/python/PyAPI/Communication.py @@ -102,7 +102,7 @@ class Communication: else: return learnResult.act_success - def StartTreatMate(self, playerID: int, mateID: int) -> bool: + def StartEncourageMate(self, playerID: int, mateID: int) -> bool: try: helpResult = self.__THUAI6Stub.StartTreatMate( THUAI62Proto.THUAI62ProtobufTreatAndRescue(playerID, mateID)) @@ -111,7 +111,7 @@ class Communication: else: return helpResult.act_success - def StartRescueMate(self, playerID: int, mateID: int) -> bool: + def StartRouseMate(self, playerID: int, mateID: int) -> bool: try: helpResult = self.__THUAI6Stub.StartRescueMate( THUAI62Proto.THUAI62ProtobufTreatAndRescue(playerID, mateID)) diff --git a/CAPI/python/PyAPI/DebugAPI.py b/CAPI/python/PyAPI/DebugAPI.py index 5e18c5f..6901474 100644 --- a/CAPI/python/PyAPI/DebugAPI.py +++ b/CAPI/python/PyAPI/DebugAPI.py @@ -414,31 +414,31 @@ class StudentDebugAPI(IStudentAPI, IGameTimer): return self.__pool.submit(logStart) - def StartTreatMate(self, mateID: int) -> Future[bool]: + def StartEncourageMate(self, mateID: int) -> Future[bool]: self.__logger.info( - f"StartTreatMate: called at {self.__GetTime()}ms") + f"StartEncourageMate: called at {self.__GetTime()}ms") - def logStartTreatMate() -> bool: - result = self.__logic.StartTreatMate(mateID) + def logStartEncourageMate() -> bool: + result = self.__logic.StartEncourageMate(mateID) if not result: self.__logger.warning( - f"StartTreatMate: failed at {self.__GetTime()}ms") + f"StartEncourageMate: failed at {self.__GetTime()}ms") return result - return self.__pool.submit(logStartTreatMate) + return self.__pool.submit(logStartEncourageMate) - def StartRescueMate(self, mateID: int) -> Future[bool]: + def StartRouseMate(self, mateID: int) -> Future[bool]: self.__logger.info( - f"StartRescueMate: called at {self.__GetTime()}ms") + f"StartRouseMate: called at {self.__GetTime()}ms") - def logStartRescueMate() -> bool: - result = self.__logic.StartRescueMate(mateID) + def logStartRouseMate() -> bool: + result = self.__logic.StartRouseMate(mateID) if not result: self.__logger.warning( - f"StartRescueMate: failed at {self.__GetTime()}ms") + f"StartRouseMate: failed at {self.__GetTime()}ms") return result - return self.__pool.submit(logStartRescueMate) + return self.__pool.submit(logStartRouseMate) def GetSelfInfo(self) -> THUAI6.Student: return cast(THUAI6.Student, self.__logic.GetSelfInfo()) diff --git a/CAPI/python/PyAPI/Interface.py b/CAPI/python/PyAPI/Interface.py index 9566363..07066f0 100644 --- a/CAPI/python/PyAPI/Interface.py +++ b/CAPI/python/PyAPI/Interface.py @@ -147,11 +147,11 @@ class ILogic(metaclass=ABCMeta): pass @abstractmethod - def StartTreatMate(self, mateID: int) -> bool: + def StartEncourageMate(self, mateID: int) -> bool: pass @abstractmethod - def StartRescueMate(self, mateID: int) -> bool: + def StartRouseMate(self, mateID: int) -> bool: pass @@ -350,11 +350,11 @@ class IStudentAPI(IAPI, metaclass=ABCMeta): pass @abstractmethod - def StartTreatMate(self, mateID: int) -> Future[bool]: + def StartEncourageMate(self, mateID: int) -> Future[bool]: pass @abstractmethod - def StartRescueMate(self, mateID: int) -> Future[bool]: + def StartRouseMate(self, mateID: int) -> Future[bool]: pass @abstractmethod diff --git a/CAPI/python/PyAPI/constants.py b/CAPI/python/PyAPI/constants.py index 783c23d..b4e4937 100644 --- a/CAPI/python/PyAPI/constants.py +++ b/CAPI/python/PyAPI/constants.py @@ -1,4 +1,9 @@ -class Constants(): +class NoInstance: + def __call__(self): + raise TypeError("This class cannot be instantiated.") + + +class Constants(NoInstance): numOfGridPerCell = 1000 # 单位坐标数 rows = 50 # 地图行数 cols = 50 # 地图列数 diff --git a/CAPI/python/PyAPI/logic.py b/CAPI/python/PyAPI/logic.py index 71f549e..205eb95 100644 --- a/CAPI/python/PyAPI/logic.py +++ b/CAPI/python/PyAPI/logic.py @@ -224,13 +224,13 @@ class Logic(ILogic): self.__logger.debug("Called StartLearning") return self.__comm.StartLearning(self.__playerID) - def StartTreatMate(self, mateID: int) -> bool: - self.__logger.debug("Called StartTreatMate") - return self.__comm.StartTreatMate(self.__playerID, mateID) + def StartEncourageMate(self, mateID: int) -> bool: + self.__logger.debug("Called StartEncourageMate") + return self.__comm.StartEncourageMate(self.__playerID, mateID) - def StartRescueMate(self, mateID: int) -> bool: - self.__logger.debug("Called StartRescueMate") - return self.__comm.StartRescueMate(self.__playerID, mateID) + def StartRouseMate(self, mateID: int) -> bool: + self.__logger.debug("Called StartRouseMate") + return self.__comm.StartRouseMate(self.__playerID, mateID) def Attack(self, angle: float) -> bool: self.__logger.debug("Called Trick")