Browse Source

Merge pull request #592 from eesast/dev

hotfix: 🐛 fix python error
tags/v0.1.0
DragonAura GitHub 2 years ago
parent
commit
fd7f894e37
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
  1. +1
    -1
      CAPI/cpp/API/include/constants.h
  2. +3
    -3
      CAPI/python/PyAPI/constants.py
  3. +7
    -4
      dependency/shell/run.sh

+ 1
- 1
CAPI/cpp/API/include/constants.h View File

@@ -317,7 +317,7 @@ namespace Constants
struct SummonGolem struct SummonGolem
{ {
SCCI int32_t skillCD = commonSkillCD * 4 / 3; SCCI int32_t skillCD = commonSkillCD * 4 / 3;
SCCI int32_t durationTime = commonSkillTime * 6;
SCCI int32_t durationTime = commonSkillTime * 3 / 5;
}; };


struct CommonAttackOfTricker struct CommonAttackOfTricker


+ 3
- 3
CAPI/python/PyAPI/constants.py View File

@@ -159,14 +159,14 @@ class Teacher:
moveSpeed = (int)(0.9 * Constants.basicStudentSpeed) moveSpeed = (int)(0.9 * Constants.basicStudentSpeed)
maxHp = (int)(10.0 * Constants.basicHp) maxHp = (int)(10.0 * Constants.basicHp)
maxAddiction = (int)(10.0 * Constants.basicMaxGamingAddiction) maxAddiction = (int)(10.0 * Constants.basicMaxGamingAddiction)
LearnSpeed = (int)( Constants.basicLearnSpeed* 50//123)
LearnSpeed = (int)(Constants.basicLearnSpeed * 50 // 123)
EncourageSpeed = (int)(0.8 * Constants.basicEncourageSpeed) EncourageSpeed = (int)(0.8 * Constants.basicEncourageSpeed)
concealment = 0.5 * Constants.basicConcealment concealment = 0.5 * Constants.basicConcealment
alertnessRadius = (int)(Constants.basicStudentAlertnessRadius * 2 // 3) alertnessRadius = (int)(Constants.basicStudentAlertnessRadius * 2 // 3)
viewRange = (int)(0.8 * Constants.basicStudentViewRange) viewRange = (int)(0.8 * Constants.basicStudentViewRange)
speedOfOpeningOrLocking = (int)(1.0 * Constants.basicSpeedOfOpeningOrLocking) speedOfOpeningOrLocking = (int)(1.0 * Constants.basicSpeedOfOpeningOrLocking)
speedOfClimbingThroughWindows = (int)( speedOfClimbingThroughWindows = (int)(
Constants.basicStudentSpeedOfClimbingThroughWindows* 1000 // 1222
Constants.basicStudentSpeedOfClimbingThroughWindows * 1000 // 1222
) )
speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest) speedOfOpenChest = (int)(1.0 * Constants.basicSpeedOfOpenChest)


@@ -305,7 +305,7 @@ class WriteAnswers:


class SummonGolem: class SummonGolem:
skillCD = (int)(Constants.commonSkillCD * 4 // 3) skillCD = (int)(Constants.commonSkillCD * 4 // 3)
durationTime = (int)(6.0 * Constants.commonSkillTime)
durationTime = (int)(0.6 * Constants.commonSkillTime)




class CommonAttackOfTricker: class CommonAttackOfTricker:


+ 7
- 4
dependency/shell/run.sh View File

@@ -1,6 +1,7 @@
#!/usr/local #!/usr/local


python_dir=/usr/local/PlayerCode/CAPI/python/PyAPI python_dir=/usr/local/PlayerCode/CAPI/python/PyAPI
python_main_dir=/usr/local/PlayerCode/CAPI/python
playback_dir=/usr/local/playback playback_dir=/usr/local/playback


if [ $EXPOSED -eq 1 ]; then if [ $EXPOSED -eq 1 ]; then
@@ -19,8 +20,9 @@ do
do do
j=$((i - 1)) j=$((i - 1))
if [ -f "./player$i.py" ]; then 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 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 & nice -0 ./capi$i -I 127.0.0.1 -P 8888 -p $j > $playback_dir/team$k-player$j.log 2>&1 &
else else
@@ -32,8 +34,9 @@ do
do do
j=$((i - 1)) j=$((i - 1))
if [ -f "./player$i.py" ]; then 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 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 & nice -0 ./capi$i -I 127.0.0.1 -P 8888 -p $j > $playback_dir/team$k-player$j.log 2>&1 &
else else


Loading…
Cancel
Save