From ca1c349868f465be7c6ddd613715eb420e924c3b Mon Sep 17 00:00:00 2001 From: DragonAura Date: Tue, 23 May 2023 19:11:09 +0800 Subject: [PATCH 1/2] fix(CAPI): :pencil2: fix wrong duration of summon golem --- CAPI/cpp/API/include/constants.h | 2 +- CAPI/python/PyAPI/constants.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CAPI/cpp/API/include/constants.h b/CAPI/cpp/API/include/constants.h index fa821b9..f04daed 100644 --- a/CAPI/cpp/API/include/constants.h +++ b/CAPI/cpp/API/include/constants.h @@ -317,7 +317,7 @@ namespace Constants struct SummonGolem { SCCI int32_t skillCD = commonSkillCD * 4 / 3; - SCCI int32_t durationTime = commonSkillTime * 6; + SCCI int32_t durationTime = commonSkillTime * 3 / 5; }; struct CommonAttackOfTricker diff --git a/CAPI/python/PyAPI/constants.py b/CAPI/python/PyAPI/constants.py index ddd7cb2..588ebab 100644 --- a/CAPI/python/PyAPI/constants.py +++ b/CAPI/python/PyAPI/constants.py @@ -159,14 +159,14 @@ class Teacher: moveSpeed = (int)(0.9 * Constants.basicStudentSpeed) maxHp = (int)(10.0 * Constants.basicHp) maxAddiction = (int)(10.0 * Constants.basicMaxGamingAddiction) - LearnSpeed = (int)( Constants.basicLearnSpeed* 50//123) + LearnSpeed = (int)(Constants.basicLearnSpeed * 50 // 123) EncourageSpeed = (int)(0.8 * Constants.basicEncourageSpeed) concealment = 0.5 * Constants.basicConcealment alertnessRadius = (int)(Constants.basicStudentAlertnessRadius * 2 // 3) viewRange = (int)(0.8 * Constants.basicStudentViewRange) speedOfOpeningOrLocking = (int)(1.0 * Constants.basicSpeedOfOpeningOrLocking) speedOfClimbingThroughWindows = (int)( - Constants.basicStudentSpeedOfClimbingThroughWindows* 1000 // 1222 + Constants.basicStudentSpeedOfClimbingThroughWindows * 1000 // 1222 ) speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest) @@ -305,7 +305,7 @@ class WriteAnswers: class SummonGolem: skillCD = (int)(Constants.commonSkillCD * 4 // 3) - durationTime = (int)(6.0 * Constants.commonSkillTime) + durationTime = (int)(0.6 * Constants.commonSkillTime) class CommonAttackOfTricker: From 652ee2a82d450f642d647bca94dadf587886a00d Mon Sep 17 00:00:00 2001 From: DragonAura Date: Thu, 25 May 2023 00:23:36 +0800 Subject: [PATCH 2/2] fix: :bug: fix python error --- dependency/shell/run.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dependency/shell/run.sh b/dependency/shell/run.sh index 3657e62..556a0b2 100644 --- a/dependency/shell/run.sh +++ b/dependency/shell/run.sh @@ -1,6 +1,7 @@ #!/usr/local python_dir=/usr/local/PlayerCode/CAPI/python/PyAPI +python_main_dir=/usr/local/PlayerCode/CAPI/python playback_dir=/usr/local/playback if [ $EXPOSED -eq 1 ]; then @@ -19,8 +20,9 @@ do do j=$((i - 1)) if [ -f "./player$i.py" ]; then - cp -f ./player$i.py $python_dir/AI.py - nice -0 python3 $python_dir/main.py -I 127.0.0.1 -P 8888 -p $j > $playback_dir/team$k-player$j.log 2>&1 & + cp -r $python_main_dir $python_main_dir$i + cp -f ./player$i.py $python_main_dir$i/PyAPI/AI.py + nice -0 python3 $python_main_dir$i/PyAPI/main.py -I 127.0.0.1 -P 8888 -p $j > $playback_dir/team$k-player$j.log 2>&1 & elif [ -f "./capi$i" ]; then nice -0 ./capi$i -I 127.0.0.1 -P 8888 -p $j > $playback_dir/team$k-player$j.log 2>&1 & else @@ -32,8 +34,9 @@ do do j=$((i - 1)) if [ -f "./player$i.py" ]; then - cp -f ./player$i.py $python_dir/AI.py - nice -0 python3 $python_dir/main.py -I 127.0.0.1 -P 8888 -p $j > $playback_dir/team$k-player$j.log 2>&1 & + cp -r $python_main_dir $python_main_dir$i + cp -f ./player$i.py $python_main_dir$i/PyAPI/AI.py + nice -0 python3 $python_main_dir$i/PyAPI/main.py -I 127.0.0.1 -P 8888 -p $j > $playback_dir/team$k-player$j.log 2>&1 & elif [ -f "./capi$i" ]; then nice -0 ./capi$i -I 127.0.0.1 -P 8888 -p $j > $playback_dir/team$k-player$j.log 2>&1 & else