Update to v2.4

README.md

@@ -41,6 +41,7 @@ This procedure is mainly used for study and research, and shall not be used for
 没有以下 We don't have：
 - 服务器安全性保证 Server security assurance
 - 世界模式下的搭档升级、觉醒，以及某些奖励的获取 Partner upgrading, uncapping, and receiving some rewards in the world mode
+- 世界排名 Global rank
 
 可能有问题 There may be problems：
 - Recent 30
@@ -60,24 +61,27 @@ It is just so interesting. What it can do is under exploration.
 ## 更新日志 Update log
 只保留最新版本 Only keep the latest version.
 
-> 提醒：更新时请注意保留原先的数据库，以防数据丢失。使用前请先运行**database_initialize.py**以获得初始数据库。
+> 提醒：更新时请注意保留原先的数据库，以防数据丢失。
 >
 > Tips: When updating, please keep the original database in case of data loss. 
-> Before using, please run **database_initialize.py** to get the initial database.
 
-### Version 2.3.2
+### Version 2.4
-- 适用于Arcaea 3.5.4版本 For Arcaea 3.5.4
+- 适用于Arcaea 3.6.0版本 For Arcaea 3.6.0
 - 更新了歌曲数据库 Update the song database.
-- 新增运行前关键性文件检查 Add checking critical files before running.
+- 新搭档 **拉格兰（拉格朗日！）** 已解锁 Unlock the new character **Lagrange**.
-- 新增可下载数据的客户端校验更新 Add client verification update of downloadable data.
+- 新增游戏版本校验 Add game version verification.
-- 新增歌曲成绩的谱面校验 Add checking chart file when submitting the song score.
+- 新增注册时邮箱记录 Add email recording while registering.
+- 新增登录时IP地址记录 Add IP address recording at login time.
+- 新增了一些设置选项和后台功能 Add some setting options and background functions.
+- 新增数据库自动更新功能 Add database automatic update function.
+- 正在构建API接口 Building API interface.
 - 修复了一些Bug Fix some bugs.
 
 ## 运行环境与依赖 Running environment and requirements
 - Windows/Linux/Mac OS/Android
 - Python 3
 - Flask module
-- Charles (optional)
+- Charles, IDA, proxy app... (optional)
 
 <!--
 ## 环境搭建 Environment construction
@@ -87,11 +91,12 @@ It is just so interesting. What it can do is under exploration.
 ## 使用说明 Instruction for use
 [中文](https://github.com/Lost-MSth/Arcaea-server/wiki/%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E)  
 [English](https://github.com/Lost-MSth/Arcaea-server/wiki/Instruction-for-use)
+-->
 
 ## 注意 Attentions
 [中文](https://github.com/Lost-MSth/Arcaea-server/wiki/%E6%B3%A8%E6%84%8F)  
 [English](https://github.com/Lost-MSth/Arcaea-server/wiki/Attentions)
--->
+
 
 ## 鸣谢 Thanks
 歌曲数据库来自 Using song database from

latest version/database/database_initialize.py

@@ -5,7 +5,7 @@ import json
 
 # 数据库初始化文件，删掉arcaea_database.db文件后运行即可，谨慎使用
 
-ARCAEA_SERVER_VERSION = 'v2.4'
+ARCAEA_SERVER_VERSION = 'v2.4.0'
 
 
 def main(path='./'):
@@ -278,13 +278,13 @@ def main(path='./'):
                       '', '', '', '', '', '', '', 'frags_yume', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']
 
     frag = [88, 90, 100, 75, 80, 0, 70, 79, 65, 40, 50, 80, 90, 92, 0, 61, 67, 92, 85, 50, 86, 62,
-            65, 85, 67, 88, 74, 0.5, 105, 80, 95, 50, 80, 87, 71, 50, 95, 0, 80, 75, 50, 70, 80, 100, 65, 90]
+            65, 85, 67, 88, 74, 0.5, 105, 80, 95, 50, 80, 87, 71, 50, 95, 0, 80, 75, 50, 70, 80, 100, 65, 80]
 
     prog = [71, 90, 80, 75, 100, 0, 90, 102, 84, 78, 105, 67, 63, 78, 0, 99, 80, 66, 46, 83, 40, 83,
-            80, 90, 93, 50, 96, 88, 99, 108, 75, 80, 50, 64, 55, 100, 100, 110, 80, 50, 74, 90, 80, 80, 56, 90]
+            80, 90, 93, 50, 96, 88, 99, 108, 75, 80, 50, 64, 55, 100, 100, 110, 80, 50, 74, 90, 80, 80, 56, 80]
 
     overdrive = [71, 90, 57, 75, 80, 0, 95, 79, 65, 31, 50, 59, 90, 68, 0, 78, 50, 70, 62, 49, 64,
-                 56, 73, 95, 67, 84, 80, 88, 79, 80, 50, 80, 80, 63, 25, 50, 82, 55, 50, 95, 55, 70, 100, 80, 90, 90]
+                 56, 73, 95, 67, 84, 80, 88, 79, 80, 50, 80, 80, 63, 25, 50, 82, 55, 50, 95, 55, 70, 100, 80, 90, 80]
 
     char_type = [1, 0, 0, 0, 0, 0, 0, 2, 0, 1, 2, 0, 0, 0, 2, 3, 1, 0, 0, 0, 1,
                  0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, 2, 1, 0]

latest version/main.py

@@ -178,6 +178,11 @@ def favicon():
 
 @app.route(add_url_prefix('/auth/login'), methods=['POST'])  # 登录接口
 def login():
+    if 'AppVersion' in request.headers:  # 版本检查
+        if Config.ALLOW_APPVERSION:
+            if request.headers['AppVersion'] not in Config.ALLOW_APPVERSION:
+                return jsonify({"success": False, "error_code": 5})
+
     headers = request.headers
     id_pwd = headers['Authorization']
     id_pwd = base64.b64decode(id_pwd[6:]).decode()
@@ -199,6 +204,11 @@ def login():
 
 @app.route(add_url_prefix('/user/'), methods=['POST'])  # 注册接口
 def register():
+    if 'AppVersion' in request.headers:  # 版本检查
+        if Config.ALLOW_APPVERSION:
+            if request.headers['AppVersion'] not in Config.ALLOW_APPVERSION:
+                return jsonify({"success": False, "error_code": 5})
+
     name = request.form['name']
     password = request.form['password']
     email = request.form['email']

latest version/server/auth.py

@@ -172,6 +172,12 @@ def auth_required(request):
 
             user_id = None
             headers = request.headers
+
+            if 'AppVersion' in headers:  # 版本检查
+                if Config.ALLOW_APPVERSION:
+                    if headers['AppVersion'] not in Config.ALLOW_APPVERSION:
+                        return jsonify({"success": False, "error_code": 5})
+
             if 'Authorization' in headers:
                 token = headers['Authorization']
                 token = token[7:]

latest version/setting.py

@@ -24,6 +24,18 @@ class Config():
     --------------------
     '''
 
+    '''
+    --------------------
+    允许使用的游戏版本，若为空，则默认全部允许
+    Allowed game versions
+    If it is blank, all are allowed.
+    '''
+    ALLOW_APPVERSION = ['3.5.3', '3.5.3c',
+                        '3.6.0', '3.6.0c', '3.6.1', '3.6.1c']
+    '''
+    --------------------
+    '''
+
     '''
     --------------------
     SSL证书路径

latest version/web/index.py

@@ -411,7 +411,7 @@ def all_character():
 def change_character():
     # 修改角色数据
     skill_ids = ['No_skill', 'gauge_easy', 'note_mirror', 'gauge_hard', 'frag_plus_10_pack_stellights', 'gauge_easy|frag_plus_15_pst&prs', 'gauge_hard|fail_frag_minus_100', 'frag_plus_5_side_light', 'visual_hide_hp', 'frag_plus_5_side_conflict', 'challenge_fullcombo_0gauge', 'gauge_overflow', 'gauge_easy|note_mirror', 'note_mirror', 'visual_tomato_pack_tonesphere',
-                 'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', 'frags_kou', 'visual_ink', 'shirabe_entry_fee', 'frags_yume', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion']
+                 'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', 'frags_kou', 'visual_ink', 'shirabe_entry_fee', 'frags_yume', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange']
     return render_template('web/changechar.html', skill_ids=skill_ids)