Fix bug in PyAPI

CAPI/cpp/API/src/AI.cpp

@@ -1,6 +1,7 @@
 #include <vector>
 #include <thread>
 #include <array>
+#include <map>
 #include "AI.h"
 #include "constants.h"
 // 注意不要使用conio.h，Windows.h等非标准库
@@ -23,24 +24,27 @@ void AI::play(ISweeperAPI& api)
     {
         api.Move(10, 2.1);
         api.PrintSelfInfo();
+        api.Attack(1.1);
     }
     else if (this->playerID == 2)
     {
-        // 玩家2执行操作
+        api.Move(10, 2.1);
+        api.PrintSelfInfo();
     }
 
     else if (this->playerID == 3)
     {
-        // 玩家3执行操作
+        api.Move(10, 2.1);
+        api.PrintSelfInfo();
     }
     else if (this->playerID == 4)
     {
-        // 玩家4执行操作
+        api.Move(10, 2.1);
+        api.PrintSelfInfo();
     }
 }
 
 void AI::play(ITeamAPI& api)  // 默认team playerID 为0
 {
-    auto self = api.GetSelfInfo();
     api.PrintSelfInfo();
 }

CAPI/cpp/API/src/logic.cpp

@@ -652,7 +652,7 @@ void Logic::LoadBufferCase(const protobuf::MessageOfObj& item)
                         logger->debug("Update Home!");
                     }
                 }
-                else if (AssistFunction::HaveView(x, y, item.home_message().x(), item.home_message().y(), viewRange, bufferState->gameMap))
+                else if (HaveOverView(item.home_message().x(), item.home_message().y()))
                 {
                     auto pos = std::make_pair(AssistFunction::GridToCell(item.home_message().x()), AssistFunction::GridToCell(item.home_message().y()));
                     if (bufferState->mapInfo->homeState.count(pos) == 0)

CAPI/python/PyAPI/API.py

@@ -97,8 +97,8 @@ def GetPlayerGUIDs(self) -> List[int]:
     def GetSelfInfo(self) -> THUAI7.Sweeper:
         return cast(THUAI7.Sweepers, self.__logic.GetSelfInfo())
 
-    def GetMoney(self) -> int:
-        return self.__logic.GetMoney()
+    def GetEnergy(self) -> int:
+        return self.__logic.GetEnergy()
 
     def GetScore(self) -> int:
         return self.__logic.GetScore()
@@ -208,8 +208,8 @@ def GetSelfInfo(self) -> THUAI7.Home:
     def GetScore(self) -> int:
         return self.__logic.GetScore()
 
-    def GetMoney(self) -> int:
-        return self.__logic.GetMoney()
+    def GetEnergy(self) -> int:
+        return self.__logic.GetEnergy()
 
     def InstallModule(self, ID: int, type: THUAI7.ModuleType) -> Future[bool]:
         return self.__pool.submit(self.__logic.InstallModule, ID, type)

CAPI/python/PyAPI/Communication.py

@@ -18,7 +18,7 @@ def result():
 
 class Communication:
     def __init__(self, sIP: str, sPort: str):
-        aim = sIP + ':' + sPort
+        aim = sIP + ":" + sPort
         channel = grpc.insecure_channel(aim)
         self.__THUAI7Stub = Services.AvailableServiceStub(channel)
         self.__haveNewMessage = False