Merge branch 'dev' of github.com:eesast/THUAI6 into dev

CAPI/python/PyAPI/constants.py

@@ -51,22 +51,22 @@ class Constants(NoInstance):
 
     # 攻击相关
 
-    Constants.basicApOfTricker = 1500000
-    Constants.basicCD = 3000           # 初始子弹冷却
-    Constants.basicCastTime = 500      # 基本前摇时间
-    Constants.basicBackswing = 800     # 基本后摇时间
-    Constants.basicRecoveryFromHit = 3700  # 基本命中攻击恢复时长
+    basicApOfTricker = 1500000
+    basicCD = 3000           # 初始子弹冷却
+    basicCastTime = 500      # 基本前摇时间
+    basicBackswing = 800     # 基本后摇时间
+    basicRecoveryFromHit = 3700  # 基本命中攻击恢复时长
     basicStunnedTimeOfStudent = 4300
 
-    Constants.basicBulletMoveSpeed = 7400       # 基本子弹移动速度
-    Constants.basicRemoteAttackRange = 6000  # 基本远程攻击范围
-    Constants.basicAttackShortRange = 2200   # 基本近程攻击范围
-    Constants.basicBulletBombRange = 2000    # 基本子弹爆炸范围
+    basicBulletMoveSpeed = 7400       # 基本子弹移动速度
+    basicRemoteAttackRange = 6000  # 基本远程攻击范围
+    basicAttackShortRange = 2200   # 基本近程攻击范围
+    basicBulletBombRange = 2000    # 基本子弹爆炸范围
 
     # 道具相关
 
-    apPropAdd = Constants.basicApOfTricker * 12 / 10
-    apSpearAdd = Constants.basicApOfTricker * 6 / 10
+    apPropAdd = basicApOfTricker * 12 / 10
+    apSpearAdd = basicApOfTricker * 6 / 10
 
     # 技能相关
     maxNumOfSkill = 3

dependency/shell/run.sh

@@ -56,3 +56,8 @@ else
     mv -f temp.lock $playback_dir/video.thuaipb
     kill -9 $server_pid
 fi
+
+result=$(cat /usr/local/playback/result.json)
+score0=$(parse_json $result "Student")
+score1=$(parse_json $result "Tricker")
+curl $URL -X PUT -H "Content-Type: application/json" -H "Authorization: Bearer $TOKEN" -d '{"result":[{"team_id":0, "score":'${score0}'}, {"team_id":1, "score":'${score1}'}], "mode":'${MODE}'}'

docs/使用文档.md

@@ -7,9 +7,7 @@
 - 不要使用conio.h，Windows.h
 
 ## 请注意下载器不更新AI.py,AI.cpp和脚本
-- 最新版AI.cpp和AI.py
-![AIcpp](https://raw.githubusercontent.com/shangfengh/THUAI6/new/resource/AIcpp.png)
-![AIpy](https://raw.githubusercontent.com/shangfengh/THUAI6/new/resource/AIpy.png)
+- [最新版AI.cpp云盘](https://cloud.tsinghua.edu.cn/lib/54b4eb7b-956e-474c-b932-7b1ac29a9267/file/AI.cpp) 和[AI.py云盘](https://cloud.tsinghua.edu.cn/lib/54b4eb7b-956e-474c-b932-7b1ac29a9267/file/AI.py)
 
 ## C++接口使用说明