Browse Source

Merge pull request #393 from eesast/dev

fix(CAPI): 🐛 fix wrong gate view
tags/0.1.0
Changli Tang GitHub 2 years ago
parent
commit
ec66927b1a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
  1. +2
    -4
      CAPI/cpp/API/src/logic.cpp
  2. +10
    -6
      dependency/shell/compile.sh

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

@@ -564,7 +564,7 @@ void Logic::LoadBufferCase(const protobuf::MessageOfObj& item)
} }
case THUAI6::MessageOfObj::GateMessage: case THUAI6::MessageOfObj::GateMessage:
{ {
if (!AssistFunction::HaveView(viewRange, x, y, item.gate_message().x(), item.gate_message().y(), bufferState->gameMap))
if (AssistFunction::HaveView(viewRange, x, y, item.gate_message().x(), item.gate_message().y(), bufferState->gameMap))
{ {
auto pos = std::make_pair(AssistFunction::GridToCell(item.gate_message().x()), AssistFunction::GridToCell(item.gate_message().y())); auto pos = std::make_pair(AssistFunction::GridToCell(item.gate_message().x()), AssistFunction::GridToCell(item.gate_message().y()));
if (bufferState->mapInfo->gateState.count(pos) == 0) if (bufferState->mapInfo->gateState.count(pos) == 0)
@@ -695,9 +695,7 @@ void Logic::Main(CreateAIFunc createAI, std::string IP, std::string port, bool f
fileLogger->set_pattern(pattern); fileLogger->set_pattern(pattern);
printLogger->set_pattern(pattern); printLogger->set_pattern(pattern);
if (file) if (file)
{
fileLogger->set_level(spdlog::level::trace);
}
fileLogger->set_level(spdlog::level::debug);
else else
fileLogger->set_level(spdlog::level::off); fileLogger->set_level(spdlog::level::off);
if (print) if (print)


+ 10
- 6
dependency/shell/compile.sh View File

@@ -3,15 +3,19 @@
i=1 i=1
flag=1 flag=1
bind=/usr/local/mnt bind=/usr/local/mnt
while (( $i <= 4 ))
while (( $i <= 5 ))
do do
mv -f $bind/player$i.cpp ./API/src/AI.cpp
cmake ./CMakeLists.txt && make >compile_log$i.txt 2>&1
mv ./capi $bind/capi$i # executable file
if [ $? -ne 0 ]; then
if [ -f "${bind}/player${i}.cpp" ]; then
cp -f $bind/player$i.cpp ./API/src/AI.cpp
cmake ./CMakeLists.txt && make >compile_log$i.txt 2>&1
mv ./capi $bind/capi$i # executable file
if [ $? -ne 0 ]; then
flag=0
fi
mv ./compile_log$i.txt $bind/compile_log$i.txt
elif [ ! -f "${bind}/player${i}.py" ]; then
flag=0 flag=0
fi fi
mv ./compile_log$i.txt $bind/compile_log$i.txt
let "i++" let "i++"
done done
# HTML request to update status. # HTML request to update status.


Loading…
Cancel
Save