Update to v2.6.1

README.md

@@ -62,19 +62,13 @@ It is just so interesting. What it can do is under exploration.
 >
 > Tips: When updating, please keep the original database in case of data loss. 
 
-### Version 2.6
-- 适用于Arcaea 3.6.4版本 For Arcaea 3.6.4
+### Version 2.6.1
+- 适用于Arcaea 3.7.0版本 For Arcaea 3.7.0
 - 更新了歌曲数据库 Update the song database.
-- 新增体力系统 Add stamina system.
-- 完善了登陆奖励系统 Improve the login present system.
-- 完善了兑换码系统 Improve the redeem code system.
-- 新增了多设备自动封号机制 Add multi device auto ban mechanism.
-- 修复了一些Bug Fix some bugs.
-  - 修复好友列表没有按照最近成绩日期排序的问题(Menci) Fix the friend list not sorted by last score date. (From Menci)
-  - 修复某些情况下跨目录运行失败的问题(MBRjun) Fix cross directory running problem in some cases. (From MBRjun)
+- 新增活动图设置 Add available event maps setting.
+- 修复了一个Bug Fix a bug.
+  - 添加了`user/me`接口 Add `user/me` interface.
 
-> 提醒：使用新版本前，可能需要清空redeem，user_redeem，present，user_present表  
-> Tips: Before using the new version, you may need to clear the redeem, user_redeem, present, user_present table.
 
 ## 运行环境与依赖 Running environment and requirements
 - Windows/Linux/Mac OS/Android

latest version/database/database_initialize.py

@@ -4,7 +4,7 @@ import json
 
 # 数据库初始化文件，删掉arcaea_database.db文件后运行即可，谨慎使用
 
-ARCAEA_SERVER_VERSION = 'v2.6'
+ARCAEA_SERVER_VERSION = 'v2.6.1'
 
 
 def main(path='./'):
@@ -379,7 +379,7 @@ def main(path='./'):
         c.execute('''insert into item values(?,"core",1,'')''', (i,))
 
     world_songs = ["babaroque", "shadesoflight", "kanagawa", "lucifer", "anokumene", "ignotus", "rabbitintheblackroom", "qualia", "redandblue", "bookmaker", "darakunosono", "espebranch", "blacklotus", "givemeanightmare", "vividtheory", "onefr", "gekka", "vexaria3", "infinityheaven3", "fairytale3", "goodtek3", "suomi", "rugie", "faintlight", "harutopia", "goodtek", "dreaminattraction", "syro", "diode", "freefall", "grimheart", "blaster",
-                   "cyberneciacatharsis", "monochromeprincess", "revixy", "vector", "supernova", "nhelv", "purgatorium3", "dement3", "crossover", "guardina", "axiumcrisis", "worldvanquisher", "sheriruth", "pragmatism", "gloryroad", "etherstrike", "corpssansorganes", "lostdesire", "blrink", "essenceoftwilight", "lapis", "solitarydream", "lumia3", "purpleverse", "moonheart3", "glow", "enchantedlove", "take", "lifeispiano", "vandalism", "nexttoyou3", "lostcivilization3", "turbocharger", "bookmaker3", "laqryma3"]
+                   "cyberneciacatharsis", "monochromeprincess", "revixy", "vector", "supernova", "nhelv", "purgatorium3", "dement3", "crossover", "guardina", "axiumcrisis", "worldvanquisher", "sheriruth", "pragmatism", "gloryroad", "etherstrike", "corpssansorganes", "lostdesire", "blrink", "essenceoftwilight", "lapis", "solitarydream", "lumia3", "purpleverse", "moonheart3", "glow", "enchantedlove", "take", "lifeispiano", "vandalism", "nexttoyou3", "lostcivilization3", "turbocharger", "bookmaker3", "laqryma3", "kyogenkigo", "hivemind", "seclusion"]
     for i in world_songs:
         c.execute('''insert into item values(?,"world_song",1,'')''', (i,))
 

latest version/database/packs.json

@@ -247,4 +247,13 @@
 	}],
 	"orig_price": 500,
 	"price": 500
+}, {
+	"name": "observer_append_2",
+	"items": [{
+		"type": "pack",
+		"id": "observer_append_2",
+		"is_available": true
+	}],
+	"orig_price": 300,
+	"price": 300
 }]

latest version/main.py

@@ -251,6 +251,15 @@ def aggregate(user_id):
     return jsonify(r)
 
 
+@app.route(add_url_prefix('/user/me'), methods=['GET'])  # 用户信息，给baa查分器用的
+@server.auth.auth_required(request)
+def user_me(user_id):
+    r = server.info.arc_aggregate_small(user_id)
+    if r['success']:
+        r['value'] = r['value'][0]['value']
+    return jsonify(r)
+
+
 @app.route(add_url_prefix('/user/me/character'), methods=['POST'])  # 角色切换
 @server.auth.auth_required(request)
 def character_change(user_id):

latest version/server/arcworld.py

@@ -90,8 +90,8 @@ def get_current_map(user_id):
 def get_world_all(user_id):
     # 读取所有地图信息并处理，返回字典列表
     re = []
+    worlds = get_world_name()
     with Connect() as c:
-        worlds = get_world_name()
         for map_id in worlds:
             info = get_world_info(map_id)
             steps = info['steps']
@@ -121,6 +121,20 @@ def get_world_all(user_id):
     return re
 
 
+def get_available_maps():
+    # 获取当前可用图（用户设定的），返回字典列表
+    re = []
+    for i in Config.AVAILABLE_MAP:
+        info = get_world_info(i)
+        del info['steps']
+        del info['is_locked']
+        del info['curr_position']
+        del info['curr_capture']
+        re.append(info)
+
+    return re
+
+
 def get_user_world(user_id, map_id):
     # 获取用户图信息，返回字典
     re = {}

latest version/server/info.py

@@ -165,7 +165,7 @@ def get_user_me(c, user_id):
             stamina = x[33]
 
         r = {"is_aprilfools": Config.IS_APRILFOOLS,
-             "curr_available_maps": [],
+             "curr_available_maps": server.arcworld.get_available_maps(),
              "character_stats": user_character,
              "friends": get_user_friend(c, user_id),
              "settings": {

latest version/setting.py

@@ -30,7 +30,7 @@ class Config():
     Allowed game versions
     If it is blank, all are allowed.
     '''
-    ALLOW_APPVERSION = ['3.5.3', '3.5.3c', '3.6.4', '3.6.4c']
+    ALLOW_APPVERSION = ['3.5.3', '3.5.3c', '3.7.0', '3.7.0c']
     '''
     --------------------
     '''
@@ -68,6 +68,16 @@ class Config():
     --------------------
     '''
 
+    '''
+    --------------------
+    世界模式当前活动图设置
+    Current available maps in world mode
+    '''
+    AVAILABLE_MAP = []  # Ex. ['test', 'test2']
+    '''
+    --------------------
+    '''
+
     '''
     --------------------
     Web后台管理页面的用户名和密码