Update to v2.7.0

- Fix a bug about purchase discount
- Fix a bug about database synchronization, which may make 'api_login' table empty
- For Arcaea 3.8.8
- Update a logout api

README.md

@@ -53,7 +53,9 @@ It is just so interesting. What it can do is under exploration.
 ## 下载 Download
 [这里 Here](https://github.com/Lost-MSth/Arcaea-server/releases)
 
-[Arcaea](https://konmai.cn/#arcaea)
+[Arcaea-CN official](https://arcaea.lowiro.com/zh)  
+[Arcaea-lowi.ro](https://lowi.ro)  
+[Arcaea-RhyDown](https://rhydown.com)
 
 ## 更新日志 Update log
 只保留最新版本 Only keep the latest version.
@@ -62,26 +64,25 @@ 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.5
+### Version 2.7.0
-- 适用于Arcaea 3.6.2版本 For Arcaea 3.6.2
+- 适用于Arcaea 3.9.0版本 For Arcaea 3.9.0
 - 更新了歌曲数据库 Update the song database.
-- 新增世界排名 Add global rank.
+- 新搭档 **爱丽丝 & 坦尼尔（小步舞曲）** 已解锁 Unlock the new character **Alice & Tenniel (Minuet)**.
-- 新增世界模式的奖励获取 Add reward acquisition of new world mode.
+- 新搭档 **对立（挽歌）** 已解锁 Unlock the new character **Tairitsu (Elegy)**.
-- 完善角色系统，包括： Improve the character system, including
+- 搭档 **爱托** 已觉醒 Uncap the character **Eto**.
-  - 角色升级 Level up
+- 搭档 **露娜** 已觉醒 Uncap the character **Luna**.
-  - 角色觉醒 Upcapping
+- 新增爱托和露娜的觉醒技能（可能有问题） Add the uncapped skills of Eto and Luna (There may be bugs.).
-  - 角色核心 Character cores
+- 新增是否同步角色表的设置选项 Add the setting option of whether updating the character table.
-  - 世界模式下的数值计算 Numerical calculation in world mode
-  - 某些场景下的角色解锁 Character unlocking in some cases
 
-- 新增了一些设置选项和后台功能 Add some setting options and background functions.
+- 以下是累积更新 The following are cumulative updates:
-- 正在构建API接口 Building API interface.
+  - 添加购买物品含有以太之滴的支持 Add support for purchasing items containing generic cores.
-- 打算重新写后台界面 Plan to rewrite the background interface.
+  - 修复关于购买物品打折的问题 Fix a bug about purchase discount.
-- 修复了一些Bug Fix some bugs.
+  - 修复关于数据库同步的问题，这可能导致api_login表为空 Fix a bug about database synchronization, which may make 'api_login' table empty.
-  - 登录时获取信息的并行计算导致的数据库锁错误 Database lock error caused by parallel computing of getting information during login
+  - 新增登出API接口 Update a logout API.
+
+> 提示：某些数据可能尚不完整，某个单曲的解锁和某两个角色的数据可能会有问题  
+> Tips: Some data may not be complete, so there may be problems with the unlocking of a single song and the data of two characters.
 
-> 提醒：由于时间仓促，本版本可能存在较多问题与漏洞，请谨慎使用  
-> Tips: Due to lack of time, this version may have many bugs, please use it with caution.
 
 ## 运行环境与依赖 Running environment and requirements
 - Windows/Linux/Mac OS/Android
@@ -93,11 +94,11 @@ It is just so interesting. What it can do is under exploration.
 ## 环境搭建 Environment construction
 [中文](https://github.com/Lost-MSth/Arcaea-server/wiki/%E7%8E%AF%E5%A2%83%E6%90%AD%E5%BB%BA)  
 [English](https://github.com/Lost-MSth/Arcaea-server/wiki/Environment-construction)
+-->
 
 ## 使用说明 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)  

latest version/api/api_auth.py

@@ -1,5 +1,7 @@
 import hashlib
+import base64
 import time
+import random
 from server.sql import Connect
 import functools
 from setting import Config
@@ -14,14 +16,50 @@ class User():
         self.power = power
 
 
-def login():
+def login(auth: str, ip: str):
-    # 登录接口
+    # 登录接口，返回字典和错误码
-    return {'token': 1}, 0
+
+    try:
+        auth_decode = bytes.decode(base64.b64decode(auth))
+    except:
+        return {}, -100
+
+    if not ':' in auth_decode:
+        return {}, -100
+
+    name, password = auth_decode.split(':', 1)
+
+    with Connect() as c:
+        hash_pwd = hashlib.sha256(password.encode("utf8")).hexdigest()
+        c.execute('''select user_id, password from user where name = :name''', {
+            'name': name})
+        x = c.fetchone()
+        if x is None:
+            return {}, -201
+        if x[1] == '':
+            return {}, -202
+        if hash_pwd != x[1]:
+            return {}, -201
+
+        user_id = str(x[0])
+        now = int(time.time() * 1000)
+        token = hashlib.sha256(
+            (user_id + str(random.randint(10000, 99999)) + str(now)).encode("utf8")).hexdigest()
+        c.execute('''delete from api_login where user_id=?''', (user_id,))
+        c.execute('''insert into api_login values(?,?,?,?)''',
+                  (user_id, token, now, ip))
+
+    return {'token': token, 'user_id': user_id}, 0
 
 
-def logout():
+def logout(user: User):
-    # 登出接口
+    # 登出接口，返回错误码
-    pass
+    code = 999
+    with Connect() as c:
+        c.execute('''delete from api_login where user_id=?''', (user.user_id,))
+        code = 0
+
+    return code
 
 
 def id_get_role_id(c, user_id):
@@ -86,7 +124,7 @@ def role_required(request, power=[]):
                 return jsonify({'status': 400, 'code': -1, 'data': {}, 'msg': 'Payload must be a valid json'})
 
             if not 'Token' in request.headers:
-                return jsonify({'status': 401, 'code': -1, 'data': {}, 'msg': 'No Token'})
+                return jsonify({'status': 401, 'code': -1, 'data': {}, 'msg': 'No token'})
 
             user = User()
             if Config.API_TOKEN == request.headers['Token'] and Config.API_TOKEN != '':
@@ -98,7 +136,7 @@ def role_required(request, power=[]):
                     user.user_id = api_token_get_id(
                         c, request.headers['Token'])
                     if user.user_id is None:
-                        return jsonify({'status': 404, 'code': -1, 'data': {}, 'msg': ''})
+                        return jsonify({'status': 401, 'code': -1, 'data': {}, 'msg': 'No token'})
 
                     role_id = id_get_role_id(c, user.user_id)
                     user.role = role_id_get_role(c, role_id)

latest version/api/api_code.py

@@ -6,10 +6,14 @@ def code_get_msg(code):
         '-2': 'No data',
         '-3': 'No data or user',
         '-4': 'No user_id',
+        '-100': 'Wrong post data',
         '-101': 'Wrong data type',
         '-102': 'Wrong query parameter',
         '-103': 'Wrong sort parameter',
-        '-104': 'Wrong sort order parameter'
+        '-104': 'Wrong sort order parameter',
+        '-201': 'Wrong username or password',
+        '-202': 'User is banned',
+        '-999': 'Unknown error'
     }
 
     return msg[str(code)]

latest version/api/api_main.py

@@ -1,6 +1,7 @@
 from flask import (
     Blueprint, request, jsonify
 )
+import functools
 import api.api_auth
 import api.users
 import api.songs
@@ -10,93 +11,112 @@ from api.api_code import code_get_msg
 bp = Blueprint('api', __name__, url_prefix='/api/v1')
 
 
-def get_query_parameter(request, query_able=[], sort_able=[]):
+class Query():
-    # 提取查询请求参数，返回四个参数和code
+    # 查询类，当查询附加参数的数据类型用
+    def __init__(self, limit=-1, offset=0, query={}, sort=[]) -> None:
+        self.limit = limit
+        self.offset = offset
+        self.query = query  # {'name': 'admin'}
+        self.sort = sort  # [{'column': 'user_id', 'order': 'ASC'}, ...]
 
-    limit = -1
+
-    offset = 0
+def get_query_parameter(request, query_able=[], sort_able=[]):
-    query = {}  # {'name': 'admin'}
+    # 提取查询请求参数，返回Query类查询参数，写成修饰器
-    sort = []  # [{'column': 'user_id', 'order': 'ASC'}, ...]
+
+    def decorator(view):
+        @functools.wraps(view)
+        def wrapped_view(*args, **kwargs):
+
+            re = Query()
 
             if 'limit' in request.json:
                 try:
-            limit = int(request.json['limit'])
+                    re.limit = int(request.json['limit'])
                 except:
-            return -1, 0, {}, {}, -101
+                    return jsonify({'status': 200, 'code': -101, 'data': {}, 'msg': code_get_msg(-101)})
+
             if 'offset' in request.json:
                 try:
-            offset = int(request.json['offset'])
+                    re.offset = int(request.json['offset'])
                 except:
-            return -1, 0, {}, {}, -101
+                    return jsonify({'status': 200, 'code': -101, 'data': {}, 'msg': code_get_msg(-101)})
             if 'query' in request.json:
-        query = request.json['query']
+                re.query = request.json['query']
-        for i in query:
+                for i in re.query:
                     if i not in query_able:
-                return -1, 0, {}, {}, -102
+                        return jsonify({'status': 200, 'code': -102, 'data': {}, 'msg': code_get_msg(-102)})
             if 'sort' in request.json:
-        sort = request.json['sort']
+                re.sort = request.json['sort']
-        for i in sort:
+                for i in re.sort:
                     if 'column' not in i or i['column'] not in sort_able:
-                return -1, 0, {}, {}, -103
+                        return jsonify({'status': 200, 'code': -103, 'data': {}, 'msg': code_get_msg(-103)})
                     if not 'order' in i:
                         i['order'] = 'ASC'
                     else:
                         if i['order'] not in ['ASC', 'DESC']:
-                    return -1, 0, {}, {}, -104
+                            return jsonify({'status': 200, 'code': -104, 'data': {}, 'msg': code_get_msg(-104)})
 
-    return limit, offset, query, sort, 0
+            return view(re, *args, **kwargs)
+
+        return wrapped_view
+    return decorator
+
+
+def return_encode(code: int = 0, data: dict = {}, status: int = 200, msg: str = ''):
+    # 构造返回，返回jsonify处理过后的response_class
+    if msg == '':
+        msg = code_get_msg(code)
+    if code < 0:
+        return jsonify({'status': status, 'code': code, 'data': {}, 'msg': msg})
+    else:
+        return jsonify({'status': status, 'code': code, 'data': data, 'msg': msg})
 
 
 @bp.route('/')
 def ping():
-    return jsonify({'status': 200, 'code': 0, 'data': {}, 'msg': ''})
+    return return_encode()
 
 
 @bp.route('/token', methods=['POST'])
 def token_post():
     # 登录，获取token
+    # {'auth': `base64(user_id:password)`}
 
     if 'auth' in request.json:
         data, code = api.api_auth.login(
-            request.json['auth'], request.remote_addr)
+            str(request.json['auth']), request.remote_addr)
-        if code < 0:
+        return return_encode(code, data)
-            return jsonify({'status': 200, 'code': code, 'data': {}, 'msg': code_get_msg(code)})
     else:
-            return jsonify({'status': 200, 'code': 0, 'data': data, 'msg': ''})
+        return return_encode(-1, {}, 401, 'No authentication')
-    else:
-        return jsonify({'status': 401, 'code': -1, 'data': {}, 'msg': 'No authentication'})
 
 
 @bp.route('/token', methods=['GET'])
 @api.api_auth.role_required(request, ['select_me', 'select'])
 def token_get(user):
     # 判断登录有效性
-    return jsonify({'status': 200, 'code': 0, 'data': {}, 'msg': ''})
+    return return_encode()
 
 
 @bp.route('/token', methods=['DELETE'])
 @api.api_auth.role_required(request, ['change_me', 'select_me', 'select'])
 def token_delete(user):
     # 登出
-    return jsonify({'status': 200, 'code': 0, 'data': {}, 'msg': ''})
+    return return_encode(api.api_auth.logout(user))
 
 
 @bp.route('/users', methods=['GET'])
 @api.api_auth.role_required(request, ['select'])
-def users_get(user):
+@get_query_parameter(request, ['user_id', 'name', 'user_code'], [
+    'user_id', 'name', 'user_code', 'join_date', 'rating_ptt', 'time_played', 'ticket', 'world_rank_score'])
+def users_get(query, user):
     # 查询全用户信息
 
-    limit, offset, query, sort, code = get_query_parameter(request, ['user_id', 'name', 'user_code'], [
+    data = api.users.get_users(query)
-        'user_id', 'name', 'user_code', 'join_date', 'rating_ptt', 'time_played', 'ticket', 'world_rank_score'])
-    if code < 0:
-        return jsonify({'status': 200, 'code': code, 'data': {}, 'msg': code_get_msg(code)})
-
-    data = api.users.get_users(limit, offset, query, sort)
 
     if not data:
-        return jsonify({'status': 200, 'code': -2, 'data': {}, 'msg': code_get_msg(-2)})
+        return return_encode(-2)
 
-    return jsonify({'status': 200, 'code': 0, 'data': data, 'msg': ''})
+    return return_encode(0, data)
 
 
 @bp.route('/users/<int:user_id>', methods=['GET'])
@@ -108,17 +128,17 @@ def users_user_get(user, user_id):
         user_id = user.user_id
 
     if user_id <= 0:
-        return jsonify({'status': 200, 'code': -4, 'data': {}, 'msg': code_get_msg(-4)})
+        return return_encode(-4)
 
     if user_id != user.user_id and not 'select' in user.power and user.user_id != 0:  # 查别人需要select权限
-        return jsonify({'status': 403, 'code': -1, 'data': {}, 'msg': 'No permission'})
+        return return_encode(-1, {}, 403, 'No permission')
 
     data = api.users.get_user_info(user_id)
 
     if not data:
-        return jsonify({'status': 200, 'code': -3, 'data': {}, 'msg': code_get_msg(-3)})
+        return return_encode(-3)
 
-    return jsonify({'status': 200, 'code': 0, 'data': data, 'msg': ''})
+    return return_encode(0, data)
 
 
 @bp.route('/users/<int:user_id>/b30', methods=['GET'])
@@ -126,48 +146,39 @@ def users_user_get(user, user_id):
 def users_user_b30_get(user, user_id):
     # 查询用户b30
 
-    if user_id == 'me':
-        user_id = user.user_id
-
     if user_id <= 0:
-        return jsonify({'status': 200, 'code': -4, 'data': {}, 'msg': code_get_msg(-4)})
+        return return_encode(-4)
 
     if user_id != user.user_id and not 'select' in user.power and user.user_id != 0:  # 查别人需要select权限
-        return jsonify({'status': 403, 'code': -1, 'data': {}, 'msg': 'No permission'})
+        return return_encode(-1, {}, 403, 'No permission')
 
     data = api.users.get_user_b30(user_id)
 
     if data['data'] == []:
-        return jsonify({'status': 200, 'code': -3, 'data': {}, 'msg': code_get_msg(-3)})
+        return return_encode(-3)
 
-    return jsonify({'status': 200, 'code': 0, 'data': data, 'msg': ''})
+    return return_encode(0, data)
 
 
 @bp.route('/users/<int:user_id>/best', methods=['GET'])
 @api.api_auth.role_required(request, ['select', 'select_me'])
-def users_user_best_get(user, user_id):
+@get_query_parameter(request, ['song_id', 'difficulty'], [
+    'song_id', 'difficulty', 'score', 'time_played', 'rating'])
+def users_user_best_get(query, user, user_id):
     # 查询用户所有best成绩
 
-    if user_id == 'me':
-        user_id = user.user_id
-
     if user_id <= 0:
-        return jsonify({'status': 200, 'code': -4, 'data': {}, 'msg': code_get_msg(-4)})
+        return return_encode(-4)
 
     if user_id != user.user_id and not 'select' in user.power and user.user_id != 0:  # 查别人需要select权限
-        return jsonify({'status': 403, 'code': -1, 'data': {}, 'msg': 'No permission'})
+        return return_encode(-1, {}, 403, 'No permission')
 
-    limit, offset, query, sort, code = get_query_parameter(request, ['song_id', 'difficulty'], [
+    data = api.users.get_user_best(user_id, query)
-        'song_id', 'difficulty', 'score', 'time_played', 'rating'])
-    if code < 0:
-        return jsonify({'status': 200, 'code': code, 'data': {}, 'msg': code_get_msg(code)})
-
-    data = api.users.get_user_best(user_id, limit, offset, query, sort)
 
     if data['data'] == []:
-        return jsonify({'status': 200, 'code': -3, 'data': {}, 'msg': code_get_msg(-3)})
+        return return_encode(-3)
 
-    return jsonify({'status': 200, 'code': 0, 'data': data, 'msg': ''})
+    return return_encode(0, data)
 
 
 @bp.route('/users/<int:user_id>/r30', methods=['GET'])
@@ -175,21 +186,18 @@ def users_user_best_get(user, user_id):
 def users_user_r30_get(user, user_id):
     # 查询用户r30
 
-    if user_id == 'me':
-        user_id = user.user_id
-
     if user_id <= 0:
-        return jsonify({'status': 200, 'code': -4, 'data': {}, 'msg': code_get_msg(-4)})
+        return return_encode(-4)
 
     if user_id != user.user_id and not 'select' in user.power and user.user_id != 0:  # 查别人需要select权限
-        return jsonify({'status': 403, 'code': -1, 'data': {}, 'msg': 'No permission'})
+        return return_encode(-1, {}, 403, 'No permission')
 
     data = api.users.get_user_r30(user_id)
 
     if data['data'] == []:
-        return jsonify({'status': 200, 'code': -3, 'data': {}, 'msg': code_get_msg(-3)})
+        return return_encode(-3)
 
-    return jsonify({'status': 200, 'code': 0, 'data': data, 'msg': ''})
+    return return_encode(0, data)
 
 
 @bp.route('/songs/<string:song_id>', methods=['GET'])
@@ -200,24 +208,21 @@ def songs_song_get(user, song_id):
     data = api.songs.get_song_info(song_id)
 
     if not data:
-        return jsonify({'status': 200, 'code': -2, 'data': {}, 'msg': code_get_msg(-2)})
+        return return_encode(-2)
 
-    return jsonify({'status': 200, 'code': 0, 'data': data, 'msg': ''})
+    return return_encode(0, data)
 
 
 @bp.route('/songs', methods=['GET'])
 @api.api_auth.role_required(request, ['select', 'select_song_info'])
-def songs_get(user):
+@get_query_parameter(request, ['sid', 'name_en', 'name_jp', 'pakset', 'artist'], [
+    'sid', 'name_en', 'name_jp', 'pakset', 'artist', 'date', 'rating_pst', 'rating_prs', 'rating_ftr', 'rating_byn'])
+def songs_get(query, user):
     # 查询全歌曲信息
 
-    limit, offset, query, sort, code = get_query_parameter(request, ['sid', 'name_en', 'name_jp', 'pakset', 'artist'], [
+    data = api.songs.get_songs(query)
-                                                           'sid', 'name_en', 'name_jp', 'pakset', 'artist', 'date', 'rating_pst', 'rating_prs', 'rating_ftr', 'rating_byn'])
-    if code < 0:
-        return jsonify({'status': 200, 'code': code, 'data': {}, 'msg': code_get_msg(code)})
-
-    data = api.songs.get_songs(limit, offset, query, sort)
 
     if not data:
-        return jsonify({'status': 200, 'code': -2, 'data': {}, 'msg': code_get_msg(-2)})
+        return return_encode(-2)
 
-    return jsonify({'status': 200, 'code': 0, 'data': data, 'msg': ''})
+    return return_encode(0, data)

latest version/api/songs.py

@@ -30,12 +30,12 @@ def get_song_info(song_id):
     return r
 
 
-def get_songs(limit=-1, offset=0, query={}, sort=[]):
+def get_songs(query=None):
     # 查询全部歌曲信息，返回字典列表
     r = []
 
     with Connect('./database/arcsong.db') as c:
-        x = Sql.select(c, 'songs', [], limit, offset, query, sort)
+        x = Sql.select(c, 'songs', [], query)
 
         if x:
             for i in x:

latest version/api/users.py

@@ -5,12 +5,12 @@ import web.webscore
 import server.info
 
 
-def get_users(limit=-1, offset=0, query={}, sort=[]):
+def get_users(query=None):
     # 获取全用户信息，返回字典列表
 
     r = []
     with Connect() as c:
-        x = Sql.select(c, 'user', [], limit, offset, query, sort)
+        x = Sql.select(c, 'user', [], query)
 
         if x:
             for i in x:
@@ -62,12 +62,12 @@ def get_user_b30(user_id):
     return {'user_id': user_id, 'b30_ptt': bestptt / 30, 'data': r}
 
 
-def get_user_best(user_id, limit=-1, offset=0, query={}, sort=[]):
+def get_user_best(user_id, query=None):
     # 获取用户b30信息，返回字典
 
     r = []
     with Connect() as c:
-        x = Sql.select(c, 'best_score', [], limit, offset, query, sort)
+        x = Sql.select(c, 'best_score', [], query)
         if x:
             for i in x:
                 r.append({

latest version/database/database_initialize.py

@@ -4,7 +4,7 @@ import json
 
 # 数据库初始化文件，删掉arcaea_database.db文件后运行即可，谨慎使用
 
-ARCAEA_SERVER_VERSION = 'v2.5'
+ARCAEA_SERVER_VERSION = 'v2.7.0'
 
 
 def main(path='./'):
@@ -44,7 +44,11 @@ def main(path='./'):
     ticket int,
     prog_boost int,
     email text,
-    world_rank_score int
+    world_rank_score int,
+    ban_flag text,
+    next_fragstam_ts int,
+    max_stamina_ts int,
+    stamina int
     );''')
     c.execute('''create table if not exists login(access_token text,
     user_id int,
@@ -224,6 +228,7 @@ def main(path='./'):
     c.execute('''create table if not exists purchase_item(purchase_name text,
     item_id text,
     type text,
+    amount int,
     primary key(purchase_name, item_id, type)
     );''')
     c.execute('''create table if not exists user_save(user_id int primary key,
@@ -238,26 +243,36 @@ def main(path='./'):
     );''')
     c.execute('''create table if not exists present(present_id text primary key,
     expire_ts int,
-    items text,
     description text
     );''')
     c.execute('''create table if not exists user_present(user_id int,
     present_id text,
     primary key(user_id, present_id)
     );''')
+    c.execute('''create table if not exists present_item(present_id text,
+    item_id text,
+    type text,
+    amount int,
+    primary key(present_id, item_id, type)
+    );''')
     c.execute('''create table if not exists songfile(song_id text,
     file_type int,
     md5 text,
     primary key(song_id, file_type)
     );''')
     c.execute('''create table if not exists redeem(code text primary key,
-    items text,
     type int
     );''')
     c.execute('''create table if not exists user_redeem(user_id int,
     code text,
     primary key(user_id, code)
     );''')
+    c.execute('''create table if not exists redeem_item(code text,
+    item_id text,
+    type text,
+    amount int,
+    primary key(code, item_id, type)
+    );''')
 
     c.execute('''create table if not exists role(role_id int primary key,
     role_name text,
@@ -284,46 +299,46 @@ def main(path='./'):
 
     # 搭档初始化
     char = ['hikari', 'tairitsu', 'kou', 'sapphire', 'lethe', '', 'Tairitsu(Axium)', 'Tairitsu(Grievous Lady)', 'stella', 'Hikari & Fisica', 'ilith', 'eto', 'luna', 'shirabe', 'Hikari(Zero)', 'Hikari(Fracture)', 'Hikari(Summer)', 'Tairitsu(Summer)', 'Tairitsu & Trin',
-            'ayu', 'Eto & Luna', 'yume', 'Seine & Hikari', 'saya', 'Tairitsu & Chuni Penguin', 'Chuni Penguin', 'haruna', 'nono', 'MTA-XXX', 'MDA-21', 'kanae', 'Hikari(Fantasia)', 'Tairitsu(Sonata)', 'sia', 'DORO*C', 'Tairitsu(Tempest)', 'brillante', 'Ilith(Summer)', 'etude', 'Alice & Tenniel', 'Luna & Mia', 'areus', 'seele', 'isabelle', 'mir', 'lagrange']
+            'ayu', 'Eto & Luna', 'yume', 'Seine & Hikari', 'saya', 'Tairitsu & Chuni Penguin', 'Chuni Penguin', 'haruna', 'nono', 'MTA-XXX', 'MDA-21', 'kanae', 'Hikari(Fantasia)', 'Tairitsu(Sonata)', 'sia', 'DORO*C', 'Tairitsu(Tempest)', 'brillante', 'Ilith(Summer)', 'etude', 'Alice & Tenniel', 'Luna & Mia', 'areus', 'seele', 'isabelle', 'mir', 'lagrange', 'linka', 'nami', 'Saya & Elizabeth', 'lily', 'kanae(midsummer)', 'alice&tenniel(minuet)', 'tairitsu(elegy)']
 
     skill_id = ['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', '', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange']
+                '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', '', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', '', '']
 
-    skill_id_uncap = ['', '', 'frags_kou', '', 'visual_ink', '', '', '', '', '', '', '', '', 'shirabe_entry_fee',
+    skill_id_uncap = ['', '', 'frags_kou', '', 'visual_ink', '', '', '', '', '', '', 'eto_uncap', 'luna_uncap', 'shirabe_entry_fee',
-                      '', '', '', '', '', '', '', 'frags_yume', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']
+                      '', '', '', '', '', '', '', 'frags_yume', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']
 
     skill_unlock_level = [0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0,
-                          0, 0, 0, 8, 0, 14, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0]
+                          0, 0, 0, 8, 0, 14, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
     frag1 = [55, 55, 60, 50, 47, 0, 47, 57, 41, 22, 50, 54, 60, 56, 78, 42, 41, 61, 52, 50, 52, 32,
-             42, 55, 45, 58, 43, 0.5, 68, 50, 62, 45, 45, 52, 44, 27, 59, 0, 45, 50, 50, 47, 47, 61, 43, 42]
+             42, 55, 45, 58, 43, 0.5, 68, 50, 62, 45, 45, 52, 44, 27, 59, 0, 45, 50, 50, 47, 47, 61, 43, 42, 50, 25, 58, 50, 61, 55, 55]
 
     prog1 = [35, 55, 47, 50, 60, 0, 60, 70, 58, 45, 70, 45, 42, 46, 61, 67, 49, 44, 28, 45, 24, 46, 52,
-             59, 62, 33, 58, 25, 63, 69, 50, 45, 45, 51, 34, 70, 62, 70, 45, 32, 32, 61, 47, 47, 37, 42]
+             59, 62, 33, 58, 25, 63, 69, 50, 45, 45, 51, 34, 70, 62, 70, 45, 32, 32, 61, 47, 47, 37, 42, 50, 50, 45, 41, 61, 55, 55]
 
     overdrive1 = [35, 55, 25, 50, 47, 0, 72, 57, 41, 7, 10, 32, 65, 31, 61, 53, 31, 47, 38, 12, 39, 18,
-                  48, 65, 45, 55, 44, 25, 46, 44, 33, 45, 45, 37, 25, 27, 50, 20, 45, 63, 21, 47, 61, 47, 65, 80]
+                  48, 65, 45, 55, 44, 25, 46, 44, 33, 45, 45, 37, 25, 27, 50, 20, 45, 63, 21, 47, 61, 47, 65, 80, 50, 30, 49, 15, 34, 55, 55]
 
     frag20 = [78, 80, 90, 75, 70, 0, 70, 79, 65, 40, 50, 80, 90, 82, 0, 61, 67, 92, 85, 50, 86, 52,
-              65, 85, 67, 88, 64, 0.5, 95, 70, 95, 50, 80, 87, 71, 50, 85, 0, 80, 75, 50, 70, 70, 90, 65, 80]
+              65, 85, 67, 88, 64, 0.5, 95, 70, 95, 50, 80, 87, 71, 50, 85, 0, 80, 75, 50, 70, 70, 90, 65, 80, 100, 50, 68, 60, 90, 80, 80]
 
     prog20 = [61, 80, 70, 75, 90, 0, 90, 102, 84, 78, 105, 67, 63, 68, 0, 99, 80, 66, 46, 83, 40, 73,
-              80, 90, 93, 50, 86, 78, 89, 98, 75, 80, 50, 64, 55, 100, 90, 110, 80, 50, 74, 90, 70, 70, 56, 80]
+              80, 90, 93, 50, 86, 78, 89, 98, 75, 80, 50, 64, 55, 100, 90, 110, 80, 50, 74, 90, 70, 70, 56, 80, 100, 55, 65, 59, 90, 80, 80]
 
     overdrive20 = [61, 80, 47, 75, 70, 0, 95, 79, 65, 31, 50, 59, 90, 58, 0, 78, 50, 70, 62, 49, 64,
-                   46, 73, 95, 67, 84, 70, 78, 69, 70, 50, 80, 80, 63, 25, 50, 72, 55, 50, 95, 55, 70, 90, 70, 99, 80]
+                   46, 73, 95, 67, 84, 70, 78, 69, 70, 50, 80, 80, 63, 25, 50, 72, 55, 50, 95, 55, 70, 90, 70, 99, 80, 100, 40, 69, 62, 51, 80, 80]
 
-    frag30 = [88, 90, 100, 75, 80, 0, 70, 79, 65, 40, 50, 80, 90, 92, 0, 61, 67, 92, 85, 50, 86, 62,
+    frag30 = [88, 90, 100, 75, 80, 0, 70, 79, 65, 40, 50, 90, 100, 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, 80]
+              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, 100, 50, 68, 60, 90, 80, 80]
 
-    prog30 = [71, 90, 80, 75, 100, 0, 90, 102, 84, 78, 105, 67, 63, 78, 0, 99, 80, 66, 46, 83, 40, 83,
+    prog30 = [71, 90, 80, 75, 100, 0, 90, 102, 84, 78, 105, 77, 73, 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, 80]
+              80, 90, 93, 50, 96, 88, 99, 108, 75, 80, 50, 64, 55, 100, 100, 110, 80, 50, 74, 90, 80, 80, 56, 80, 100, 55, 65, 59, 90, 80, 80]
 
-    overdrive30 = [71, 90, 57, 75, 80, 0, 95, 79, 65, 31, 50, 59, 90, 68, 0, 78, 50, 70, 62, 49, 64,
+    overdrive30 = [71, 90, 57, 75, 80, 0, 95, 79, 65, 31, 50, 69, 100, 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, 99, 80]
+                   56, 73, 95, 67, 84, 80, 88, 79, 80, 50, 80, 80, 63, 25, 50, 82, 55, 50, 95, 55, 70, 100, 80, 99, 80, 100, 40, 69, 62, 51, 80, 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]
+                 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, 0, 0, 0, 0, 0, 0, 0]
 
     char_core = {
         0: [{'core_id': 'core_hollow', 'amount': 25}, {'core_id': 'core_desolate', 'amount': 5}],
@@ -338,18 +353,20 @@ def main(path='./'):
         29: [{'core_id': 'core_chunithm', 'amount': 15}],
         36: [{'core_id': 'core_chunithm', 'amount': 15}],
         42: [{'core_id': 'core_chunithm', 'amount': 15}],
-        43: [{'core_id': 'core_chunithm', 'amount': 15}]
+        43: [{'core_id': 'core_chunithm', 'amount': 15}],
+        11: [{'core_id': 'core_binary', 'amount': 25}, {'core_id': 'core_hollow', 'amount': 5}],
+        12: [{'core_id': 'core_binary', 'amount': 25}, {'core_id': 'core_desolate', 'amount': 5}]
     }
 
-    for i in range(0, 46):
+    for i in range(0, 53):
         skill_requires_uncap = 1 if i == 2 else 0
 
-        if i in [0, 1, 2, 4, 13, 26, 27, 28, 29, 36, 21, 42, 43]:
+        if i in [0, 1, 2, 4, 13, 26, 27, 28, 29, 36, 21, 42, 43, 11, 12]:
             sql = '''insert into character values(?,?,30,?,?,?,?,?,?,?,?,?,?,?,?,?,?,1)'''
             c.execute(sql, (i, char[i], frag1[i], prog1[i], overdrive1[i], frag20[i], prog20[i], overdrive20[i],
                             frag30[i], prog30[i], overdrive30[i], skill_id[i], skill_unlock_level[i], skill_requires_uncap, skill_id_uncap[i], char_type[i]))
         else:
-            if i != 5:
+            if i != 5 and i != 46:
                 sql = '''insert into character values(?,?,20,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)'''
                 c.execute(sql, (i, char[i], frag1[i], prog1[i], overdrive1[i], frag20[i], prog20[i], overdrive20[i],
                                 frag30[i], prog30[i], overdrive30[i], skill_id[i], skill_unlock_level[i], skill_requires_uncap, skill_id_uncap[i], char_type[i]))
@@ -359,13 +376,13 @@ def main(path='./'):
             c.execute('''insert into char_item values(?,?,'core',?)''',
                       (i, j['core_id'], j['amount']))
     cores = ['core_hollow', 'core_desolate', 'core_chunithm', 'core_crimson',
-             'core_ambivalent', 'core_scarlet', 'core_groove', 'core_generic']
+             'core_ambivalent', 'core_scarlet', 'core_groove', 'core_generic', 'core_binary']
 
     for i in cores:
         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"]
+                   "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", "quonwacca3", "bluecomet", "energysynergymatrix", "gengaozo", "lastendconductor3"]
     for i in world_songs:
         c.execute('''insert into item values(?,"world_song",1,'')''', (i,))
 
@@ -374,6 +391,11 @@ def main(path='./'):
     for i in world_unlocks:
         c.execute('''insert into item values(?,"world_unlock",1,'')''', (i,))
 
+    c.execute('''insert into item values(?,?,?,?)''',
+              ('fragment', 'fragment', 1, ''))
+    c.execute('''insert into item values(?,?,?,?)''',
+              ('memory', 'memory', 1, ''))
+
     def insert_items(c, items):
         # 物品数据导入
         for i in items:
@@ -392,10 +414,17 @@ def main(path='./'):
                     _id = ''
                 else:
                     _id = j['_id']
+                c.execute(
+                    '''select exists(select * from item where item_id=?)''', (j['id'],))
+                if c.fetchone() == (0,):
                     c.execute('''insert into item values(?,?,?,?)''',
                               (j['id'], j['type'], j['is_available'], _id))
-                c.execute('''insert into purchase_item values(?,?,?)''',
+                if 'amount' in j:
-                          (i['name'], j['id'], j['type']))
+                    amount = j['amount']
+                else:
+                    amount = 1
+                c.execute('''insert into purchase_item values(?,?,?,?)''',
+                          (i['name'], j['id'], j['type'], amount))
 
     # item初始化
     f = open(path+'singles.json', 'r')

latest version/database/map/byd_bookmaker.json

@@ -0,0 +1,376 @@
+{
+	"map_id": "byd_bookmaker",
+	"is_legacy": false,
+	"chapter": 1001,
+	"available_from": -1,
+	"available_to": 9999999999999,
+	"is_repeatable": false,
+	"require_id": "bookmaker2",
+	"require_type": "chart_unlock",
+	"coordinate": "-650,-650",
+	"is_beyond": true,
+	"stamina_cost": 3,
+	"beyond_health": 300,
+	"character_affinity": [
+		23,
+		34,
+		47
+	],
+	"affinity_multiplier": [
+		1.3,
+		5,
+		3.8
+	],
+	"step_count": 31,
+	"custom_bg": "",
+	"curr_position": 3,
+	"curr_capture": 35.81730523472207,
+	"is_locked": false,
+	"steps": [
+		{
+			"map_id": "byd_bookmaker",
+			"position": 0,
+			"capture": 10
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 1,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 2,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 3,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			],
+			"restrict_ids": [
+				"bookmaker",
+				"viciousheroism",
+				"battlenoone",
+				"galaxyfriends",
+				"rekkaresonance"
+			],
+			"restrict_type": "song_id"
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 4,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 5,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 6,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 7,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 8,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 9,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 10,
+			"capture": 10,
+			"items": [
+				{
+					"type": "core",
+					"id": "core_generic",
+					"amount": 1
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 11,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 12,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 13,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 14,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 15,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 16,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 17,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 18,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 19,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 20,
+			"capture": 10,
+			"items": [
+				{
+					"type": "core",
+					"id": "core_generic",
+					"amount": 1
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 21,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 22,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 23,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 24,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 25,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 26,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 27,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 28,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 29,
+			"capture": 10,
+			"items": [
+				{
+					"type": "fragment",
+					"amount": 30
+				}
+			]
+		},
+		{
+			"map_id": "byd_bookmaker",
+			"position": 30,
+			"capture": 0,
+			"items": [
+				{
+					"id": "bookmaker3",
+					"type": "world_song"
+				}
+			]
+		}
+	]
+}

latest version/database/packs.json

@@ -1,250 +1,515 @@
-[{
+[
+	{
 		"name": "core",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "core",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "shiawase",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "shiawase",
 				"is_available": true
-	}, {
+			},
+			{
 				"type": "character",
 				"id": "kou",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "dynamix",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "dynamix",
 				"is_available": true
-	}, {
+			},
+			{
 				"type": "character",
 				"id": "sapphire",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "mirai",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "mirai",
 				"is_available": true
-	}, {
+			},
+			{
 				"type": "character",
 				"id": "lethe",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "yugamu",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "yugamu",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "lanota",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "lanota",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "nijuusei",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "nijuusei",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "rei",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "rei",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "tonesphere",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "tonesphere",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "groovecoaster",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "groovecoaster",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "zettai",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "zettai",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "chunithm",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "chunithm",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 3,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 300,
 		"orig_price": 300
-}, {
+	},
+	{
 		"name": "prelude",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "prelude",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 4,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 400,
 		"orig_price": 400,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "omatsuri",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "omatsuri",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "vs",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "vs",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"price": 500,
 		"orig_price": 500,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "extend",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "extend",
 				"is_available": true
-	}],
+			},
-	"price": 700,
+			{
+				"type": "core",
+				"amount": 7,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"price": 0,
 		"orig_price": 700,
 		"discount_from": 1615248000000,
 		"discount_to": 1615852799000
-}, {
+	},
+	{
 		"name": "alice",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "alice",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"orig_price": 500,
 		"price": 500
-}, {
+	},
+	{
 		"name": "alice_append_1",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "alice_append_1",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 3,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"orig_price": 300,
 		"price": 300
-}, {
+	},
+	{
 		"name": "ongeki",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "ongeki",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 4,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"orig_price": 400,
 		"price": 400
-}, {
+	},
+	{
 		"name": "maimai",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "maimai",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 4,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"orig_price": 400,
 		"price": 400
-}, {
+	},
+	{
 		"name": "chunithm_append_1",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "chunithm_append_1",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 3,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"orig_price": 300,
 		"price": 300
-}, {
+	},
+	{
 		"name": "observer_append_1",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "observer_append_1",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 3,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"orig_price": 300,
 		"price": 300
-}, {
+	},
+	{
 		"name": "observer",
-	"items": [{
+		"items": [
+			{
 				"type": "pack",
 				"id": "observer",
 				"is_available": true
-	}],
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
 		"orig_price": 500,
 		"price": 500
-}]
+	},
+	{
+		"name": "observer_append_2",
+		"items": [
+			{
+				"type": "pack",
+				"id": "observer_append_2",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 3,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 300,
+		"price": 300
+	},
+	{
+		"name": "wacca",
+		"items": [
+			{
+				"type": "pack",
+				"id": "wacca",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 5,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 500,
+		"price": 500
+	},
+	{
+		"name": "nijuusei_append_1",
+		"items": [
+			{
+				"type": "pack",
+				"id": "nijuusei_append_1",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 3,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 300,
+		"price": 300
+	}
+]

latest version/main.py

@@ -113,13 +113,14 @@ def add_url_prefix(url, strange_flag=False):
     return prefix + r
 
 
-def error_return(error_code):  # 错误返回
+def error_return(error_code, extra={}):  # 错误返回
     # -7 处理交易时发生了错误
     # -5 所有的曲目都已经下载完毕
     # -4 您的账号已在别处登录
     # -3 无法连接至服务器
     # 2 Arcaea服务器正在维护
     # 5 请更新Arcaea到最新版本
+    # 9 新版本请等待几分钟
     # 100 无法在此ip地址下登录游戏
     # 101 用户名占用
     # 102 电子邮箱已注册
@@ -156,6 +157,13 @@ def error_return(error_code):  # 错误返回
     # 9907 更新数据时发生了问题
     # 9908 服务器只支持最新的版本，请更新Arcaea
     # 其它 发生未知错误
+    if extra:
+        return jsonify({
+            "success": False,
+            "error_code": error_code,
+            "extra": extra
+        })
+    else:
         return jsonify({
             "success": False,
             "error_code": error_code
@@ -182,7 +190,7 @@ 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})
+                return error_return(5)
 
     headers = request.headers
     id_pwd = headers['Authorization']
@@ -193,12 +201,15 @@ def login():
     else:
         device_id = 'low_version'
 
-    token, error_code = server.auth.arc_login(
+    token, error_code, extra = server.auth.arc_login(
         name, password, device_id, request.remote_addr)
     if not error_code:
         r = {"success": True, "token_type": "Bearer"}
         r['access_token'] = token
         return jsonify(r)
+    else:
+        if extra:
+            return error_return(error_code, extra)
         else:
             return error_return(error_code)
 
@@ -208,7 +219,7 @@ 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})
+                return error_return(5)
 
     name = request.form['name']
     password = request.form['password']
@@ -240,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):
@@ -263,9 +283,7 @@ def character_change(user_id):
 @app.route(add_url_prefix('/<path:path>/toggle_uncap', True), methods=['POST'])
 @server.auth.auth_required(request)
 def character_uncap(user_id, path):
-    while '//' in path:
+    character_id = int(path[path.find('character')+10:])
-        path = path.replace('//', '/')
-    character_id = int(path[21:])
     r = server.setme.change_char_uncap(user_id, character_id)
     if r is not None:
         return jsonify({
@@ -283,9 +301,7 @@ def character_uncap(user_id, path):
 @app.route(add_url_prefix('/<path:path>/uncap', True), methods=['POST'])
 @server.auth.auth_required(request)
 def character_first_uncap(user_id, path):
-    while '//' in path:
+    character_id = int(path[path.find('character')+10:])
-        path = path.replace('//', '/')
-    character_id = int(path[21:])
     r = server.character.char_uncap(user_id, character_id)
     if r is not None:
         return jsonify({
@@ -300,9 +316,7 @@ def character_first_uncap(user_id, path):
 @app.route(add_url_prefix('/<path:path>/exp', True), methods=['POST'])
 @server.auth.auth_required(request)
 def character_exp(user_id, path):
-    while '//' in path:
+    character_id = int(path[path.find('character')+10:])
-        path = path.replace('//', '/')
-    character_id = int(path[21:])
     amount = int(request.form['amount'])
     r = server.character.char_use_core(user_id, character_id, amount)
     if r is not None:
@@ -457,15 +471,14 @@ def score_token():
 @server.auth.auth_required(request)
 def score_token_world(user_id):
     args = request.args
-    server.arcworld.play_world_song(user_id, args)
+    r = server.arcworld.play_world_song(user_id, args)
+    if r:
         return jsonify({
             "success": True,
-        "value": {
+            "value": r
-            "stamina": 12,
-            "max_stamina_ts": 1599547603825,
-            "token": "13145201919810"
-        }
         })
+    else:
+        return error_return(108)
 
 
 @app.route(add_url_prefix('/user/me/save'), methods=['GET'])  # 从云端同步
@@ -536,6 +549,28 @@ def claim_present(user_id, present_id):
         return error_return(108)
 
 
+# 购买体力
+@app.route(add_url_prefix('/purchase/me/stamina/<buy_stamina_type>'), methods=['POST'])
+@server.auth.auth_required(request)
+def purchase_stamina(user_id, buy_stamina_type):
+
+    if buy_stamina_type == 'fragment':
+        r, error_code = server.arcworld.buy_stamina_by_fragment(user_id)
+    else:
+        return error_return(108)
+
+    if error_code:
+        return error_return(error_code)
+    else:
+        if r:
+            return jsonify({
+                "success": True,
+                "value": r
+            })
+        else:
+            return error_return(108)
+
+
 # 购买，world模式boost
 @app.route(add_url_prefix('/purchase/me/item'), methods=['POST'])
 @server.auth.auth_required(request)
@@ -551,6 +586,16 @@ def prog_boost(user_id):
                 "success": True,
                 "value": {'ticket': ticket}
             }
+
+        elif request.form['item_id'] == 'stamina6':
+            r, error_code = server.arcworld.buy_stamina_by_ticket(user_id)
+            if error_code:
+                return error_return(error_code)
+
+            re = {
+                "success": True,
+                "value": r
+            }
     return jsonify(re)
 
 
@@ -587,12 +632,13 @@ def world_all(user_id):
     })
 
 
-@app.route(add_url_prefix('/world/map/me/'), methods=['POST'])  # 进入地图
+@app.route(add_url_prefix('/world/map/me'), methods=['POST'])  # 进入地图
 @server.auth.auth_required(request)
 def world_in(user_id):
     map_id = request.form['map_id']
+    flag = server.arcworld.unlock_user_world(user_id, map_id)
     return jsonify({
-        "success": True,
+        "success": flag,
         "value": server.arcworld.get_user_world(user_id, map_id)
     })
 
@@ -652,7 +698,7 @@ def download(file_path):
 @app.route(add_url_prefix('/<path:path>', True), methods=['POST'])
 @server.auth.auth_required(request)
 def sys_set(user_id, path):
-    set_arg = path[10:]
+    set_arg = path[5:]
     value = request.form['value']
     server.setme.arc_sys_set(user_id, value, set_arg)
     r = server.info.arc_aggregate_small(user_id)

latest version/run.bat

@@ -1 +1,2 @@
+cd /d %~dp0
 python -B main.py

latest version/server/arcpurchase.py

@@ -25,16 +25,36 @@ def get_purchase(c, type='pack'):
     for i in x:
         items = []
         c.execute(
-            '''select a.* from item a, purchase_item b where a.item_id=b.item_id and a.type=b.type and b.purchase_name=:name''', {'name': i[0]})
+            '''select a.*, b.amount from item a, purchase_item b where a.item_id=b.item_id and a.type=b.type and b.purchase_name=:name''', {'name': i[0]})
         y = c.fetchall()
+        t = None
         if y:
             for j in y:
+                if j[3]:
+                    amount = j[3]
+                else:
+                    amount = 1
+                if i[0] == j[0]:
+                    # 物品排序，否则客户端报错
+                    t = {
+                        "type": j[1],
+                        "id": j[0],
+                        "is_available": int2b(j[2]),
+                        'amount': amount
+                    }
+                else:
                     items.append({
                         "type": j[1],
                         "id": j[0],
-                    "is_available": int2b(j[2])
+                        "is_available": int2b(j[2]),
+                        "amount": amount
                     })
 
+
+            if t is not None:
+                # 放到列表头
+                items = [t, items]
+
         r = {"name": i[0],
              "items": items,
              "price": i[1],
@@ -104,7 +124,7 @@ def buy_thing(user_id, purchase_id):
             }
 
         c.execute(
-            '''select item_id, type from purchase_item where purchase_name=:a''', {'a': purchase_id})
+            '''select item_id, type, amount from purchase_item where purchase_name=:a''', {'a': purchase_id})
         x = c.fetchall()
         if x:
             now = int(time.time() * 1000)
@@ -115,7 +135,11 @@ def buy_thing(user_id, purchase_id):
 
             if flag:
                 for i in x:
-                    server.item.claim_user_item(c, user_id, i[0], i[1])
+                    if i[2]:
+                        amount = i[2]
+                    else:
+                        amount = 1
+                    server.item.claim_user_item(c, user_id, i[0], i[1], amount)
 
                 success_flag = True
         else:
@@ -165,10 +189,22 @@ def get_user_present(c, user_id):
     if x:
         for i in x:
             if now <= int(i[1]):
+                c.execute(
+                    '''select * from present_item where present_id=?''', (i[0],))
+                y = c.fetchall()
+                items = []
+                if y:
+                    for j in y:
+                        if j is not None:
+                            items.append({
+                                "type": j[2],
+                                "id": j[1],
+                                "amount": j[3]
+                            })
                 re.append({'expire_ts': i[1],
-                           'description': i[3],
+                           'description': i[2],
                            'present_id': i[0],
-                           'items': json.loads(i[2])
+                           'items': items
                            })
 
     return re
@@ -189,16 +225,16 @@ def claim_user_present(user_id, present_id):
             now = int(time.time() * 1000)
             if now <= int(x[1]):
                 # 处理memory
-                items = json.loads(x[2])
+                c.execute(
-                for i in items:
+                    '''select * from present_item where present_id=?''', (x[0],))
-                    if i['id'] == 'memory':
+                y = c.fetchall()
-                        c.execute('''select ticket from user where user_id=:a''', {
-                            'a': user_id})
-                        ticket = int(c.fetchone()[0])
-                        ticket += int(i['amount'])
-                        c.execute('''update user set ticket=:b where user_id=:a''', {
-                            'a': user_id, 'b': ticket})
                 flag = True
+                if y:
+                    for j in y:
+                        if j is not None:
+                            flag = flag and server.item.claim_user_item(
+                                c, user_id, j[1], j[2], j[3])
+
             else:
                 # 过期
                 flag = False
@@ -216,12 +252,12 @@ def claim_user_redeem(user_id, code):
         if not x:
             return 0, 504
 
-        if x[2] == 0:  # 一次性
+        if x[1] == 0:  # 一次性
             c.execute(
                 '''select exists(select * from user_redeem where code=:a)''', {'a': code})
             if c.fetchone() == (1,):
                 return 0, 505
-        elif x[2] == 1:  # 每个玩家一次
+        elif x[1] == 1:  # 每个玩家一次
             c.execute('''select exists(select * from user_redeem where code=:a and user_id=:b)''',
                       {'a': code, 'b': user_id})
             if c.fetchone() == (1,):
@@ -230,17 +266,17 @@ def claim_user_redeem(user_id, code):
         c.execute('''insert into user_redeem values(:b,:a)''',
                   {'a': code, 'b': user_id})
 
-        items = json.loads(x[1])
+        c.execute('''select * from redeem_item where code=?''', (code,))
-        for i in items:
+        x = c.fetchall()
-            if i['type'] == 'fragment':
+        flag = True
-                fragment = i['amount']
+        if x:
-            if i['type'] == 'memory':
+            for i in x:
-                c.execute('''select ticket from user where user_id=:a''', {
+                if i[2] == 'fragment':
-                    'a': user_id})
+                    fragment += i[3]
-                ticket = int(c.fetchone()[0])
+                else:
-                ticket += int(i['amount'])
+                    flag = flag and server.item.claim_user_item(
-                c.execute('''update user set ticket=:b where user_id=:a''', {
+                        c, user_id, i[1], i[2], i[3])
-                    'a': user_id, 'b': ticket})
+        if flag:
             error_code = None
 
     return fragment, error_code

latest version/server/arcscore.py

@@ -38,14 +38,14 @@ def get_score(c, user_id, song_id, difficulty):
               {'a': user_id, 'b': song_id, 'c': difficulty})
     x = c.fetchone()
     if x is not None:
-        c.execute('''select name, character_id, is_skill_sealed, is_char_uncapped, favorite_character from user where user_id = :a''', {
+        c.execute('''select name, character_id, is_skill_sealed, is_char_uncapped, is_char_uncapped_override, favorite_character from user where user_id = :a''', {
                   'a': user_id})
         y = c.fetchone()
         if y is not None:
             character = y[1]
             is_char_uncapped = int2b(y[3])
-            if y[4] != -1:
+            if y[5] != -1:
-                character = y[4]
+                character = y[5]
                 if not Config.CHARACTER_FULL_UNLOCK:
                     c.execute('''select is_uncapped, is_uncapped_override from user_char where user_id=:a and character_id=:b''', {
                         'a': user_id, 'b': character})
@@ -58,6 +58,9 @@ def get_score(c, user_id, song_id, difficulty):
                         is_char_uncapped = int2b(z[0])
                     else:
                         is_char_uncapped = False
+            else:
+                if y[4] == 1:
+                    is_char_uncapped = False
 
             return {
                 "user_id": x[0],
@@ -173,6 +176,8 @@ def arc_score_me(user_id, song_id, difficulty, limit=20):
                 x = c.fetchall()
                 if x != []:
                     rank = amount - limit
+                    if rank < 0:
+                        rank = 0
                     for i in x:
                         rank += 1
                         y = get_score(c, i[0], song_id, difficulty)
@@ -277,10 +282,12 @@ def get_user_ptt_float(c, user_id) -> float:
     c.execute('''select rating from best_score where user_id = :a order by rating DESC limit 30''', {
               'a': user_id})
     x = c.fetchall()
+    if not Config.USE_B10_AS_R10:
         if x != []:
             for i in x:
                 sumr += float(i[0])
-    c.execute('''select * from recent30 where user_id = :a''', {'a': user_id})
+        c.execute('''select * from recent30 where user_id = :a''',
+                  {'a': user_id})
         x = c.fetchone()
         if x is not None:
             r30 = []
@@ -292,7 +299,8 @@ def get_user_ptt_float(c, user_id) -> float:
                 else:
                     r30.append(0)
                     s30.append('')
-        r30, s30 = (list(t) for t in zip(*sorted(zip(r30, s30), reverse=True)))
+            r30, s30 = (list(t)
+                        for t in zip(*sorted(zip(r30, s30), reverse=True)))
             songs = []
             i = 0
             while len(songs) < 10 and i <= 29 and s30[i] != '' and s30[i] is not None:
@@ -300,6 +308,13 @@ def get_user_ptt_float(c, user_id) -> float:
                     sumr += r30[i]
                     songs.append(s30[i])
                 i += 1
+    else:
+        if x != []:
+            for i in range(len(x)):
+                t = float(x[i][0])
+                sumr += t
+                if i < 10:
+                    sumr += t
     return sumr/40
 
 
@@ -869,6 +884,36 @@ def arc_all_get(user_id):
             "mi": 6,
             "c": True,
             "r": True
+        }, {
+            "ma": 7,
+            "mi": 1,
+            "c": True,
+            "r": True
+        }, {
+            "ma": 7,
+            "mi": 2,
+            "c": True,
+            "r": True
+        }, {
+            "ma": 7,
+            "mi": 3,
+            "c": True,
+            "r": True
+        }, {
+            "ma": 7,
+            "mi": 4,
+            "c": True,
+            "r": True
+        }, {
+            "ma": 7,
+            "mi": 5,
+            "c": True,
+            "r": True
+        }, {
+            "ma": 7,
+            "mi": 6,
+            "c": True,
+            "r": True
         }, {
             "ma": 9,
             "mi": 1,
@@ -900,50 +945,50 @@ def arc_all_get(user_id):
             "c": True,
             "r": True
         }, {
-            "ma": 6,
+            "ma": 10,
             "mi": 1,
             "c": True,
             "r": True
         }, {
-            "ma": 6,
+            "ma": 10,
             "mi": 2,
             "c": True,
             "r": True
         }, {
-            "ma": 6,
+            "ma": 10,
             "mi": 3,
             "c": True,
             "r": True
         }, {
-            "ma": 7,
+            "ma": 10,
-            "mi": 1,
-            "c": True,
-            "r": True
-        }, {
-            "ma": 7,
-            "mi": 2,
-            "c": True,
-            "r": True
-        }, {
-            "ma": 7,
-            "mi": 3,
-            "c": True,
-            "r": True
-        }, {
-            "ma": 7,
             "mi": 4,
             "c": True,
             "r": True
         }, {
-            "ma": 7,
+            "ma": 10,
             "mi": 5,
             "c": True,
             "r": True
         }, {
-            "ma": 7,
+            "ma": 10,
             "mi": 6,
             "c": True,
             "r": True
+        }, {
+            "ma": 6,
+            "mi": 1,
+            "c": True,
+            "r": True
+        }, {
+            "ma": 6,
+            "mi": 2,
+            "c": True,
+            "r": True
+        }, {
+            "ma": 6,
+            "mi": 3,
+            "c": True,
+            "r": True
         }, {
             "ma": 8,
             "mi": 1,
@@ -966,42 +1011,30 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "worldexecuteme|2|0",
             "complete": 1
-        }, {
-            "unlock_key": "viyellastears|2|0",
-            "complete": 1
         }, {
             "unlock_key": "viciousheroism|2|0",
             "complete": 1
         }, {
-            "unlock_key": "loschen|2|0",
+            "unlock_key": "vector|1|0",
             "complete": 1
         }, {
-            "unlock_key": "vector|2|0",
+            "unlock_key": "valhallazero|1|0",
             "complete": 1
         }, {
-            "unlock_key": "corpssansorganes|2|0",
+            "unlock_key": "tiferet|2|0",
-            "complete": 1
-        }, {
-            "unlock_key": "valhallazero|2|0",
             "complete": 1
         }, {
             "unlock_key": "tiferet|1|0",
             "complete": 1
         }, {
-            "unlock_key": "ouroboros|2|0",
+            "unlock_key": "tiemedowngently|2|0",
             "complete": 1
         }, {
-            "unlock_key": "tiemedowngently|1|0",
+            "unlock_key": "tempestissimo|2|101",
-            "complete": 1
-        }, {
-            "unlock_key": "aegleseeker|2|3|crystalgravity|2",
-            "complete": 10
-        }, {
-            "unlock_key": "tempestissimo|0|101",
             "complete": 100
         }, {
-            "unlock_key": "syro|2|0",
+            "unlock_key": "tempestissimo|1|101",
-            "complete": 1
+            "complete": 100
         }, {
             "unlock_key": "ringedgenesis|2|0",
             "complete": 1
@@ -1011,11 +1044,14 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "snowwhite|2|0",
             "complete": 1
+        }, {
+            "unlock_key": "senkyou|1|0",
+            "complete": 1
         }, {
             "unlock_key": "senkyou|2|0",
             "complete": 1
         }, {
-            "unlock_key": "senkyou|1|0",
+            "unlock_key": "seclusion|1|0",
             "complete": 1
         }, {
             "unlock_key": "scarletlance|2|0",
@@ -1041,6 +1077,12 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "reinvent|2|0",
             "complete": 1
+        }, {
+            "unlock_key": "felis|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "rekkaresonance|2|0",
+            "complete": 1
         }, {
             "unlock_key": "reinvent|1|0",
             "complete": 1
@@ -1088,7 +1130,7 @@ def arc_all_get(user_id):
             "complete": 1
         }, {
             "unlock_key": "saikyostronger|2|3|einherjar|2",
-            "complete": 3
+            "complete": 6
         }, {
             "unlock_key": "cyanine|2|0",
             "complete": 1
@@ -1099,7 +1141,10 @@ def arc_all_get(user_id):
             "unlock_key": "purgatorium|1|0",
             "complete": 1
         }, {
-            "unlock_key": "pragmatism|2|0",
+            "unlock_key": "tiemedowngently|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "ouroboros|2|0",
             "complete": 1
         }, {
             "unlock_key": "ringedgenesis|1|0",
@@ -1149,6 +1194,12 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "melodyoflove|1|0",
             "complete": 1
+        }, {
+            "unlock_key": "mazymetroplex|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "seclusion|2|0",
+            "complete": 1
         }, {
             "unlock_key": "lucifer|2|0",
             "complete": 1
@@ -1164,9 +1215,6 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "lostdesire|2|0",
             "complete": 1
-        }, {
-            "unlock_key": "tiemedowngently|2|0",
-            "complete": 1
         }, {
             "unlock_key": "solitarydream|1|0",
             "complete": 1
@@ -1179,12 +1227,30 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "loschen|1|0",
             "complete": 1
+        }, {
+            "unlock_key": "syro|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "aegleseeker|2|3|paperwitch|2",
+            "complete": 10
+        }, {
+            "unlock_key": "livefastdieyoung|1|0",
+            "complete": 1
         }, {
             "unlock_key": "shadesoflight|1|0",
             "complete": 1
         }, {
             "unlock_key": "kanagawa|2|0",
             "complete": 1
+        }, {
+            "unlock_key": "ifi|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "kanagawa|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "jump|1|0",
+            "complete": 1
         }, {
             "unlock_key": "grievouslady|1|101",
             "complete": 100
@@ -1201,28 +1267,7 @@ def arc_all_get(user_id):
             "unlock_key": "ignotus|2|0",
             "complete": 1
         }, {
-            "unlock_key": "snowwhite|1|0",
+            "unlock_key": "ignotus|1|0",
-            "complete": 1
-        }, {
-            "unlock_key": "partyvinyl|1|0",
-            "complete": 1
-        }, {
-            "unlock_key": "viciousheroism|1|0",
-            "complete": 1
-        }, {
-            "unlock_key": "gloryroad|0|0",
-            "complete": 1
-        }, {
-            "unlock_key": "axiumcrisis|1|0",
-            "complete": 1
-        }, {
-            "unlock_key": "kanagawa|1|0",
-            "complete": 1
-        }, {
-            "unlock_key": "ifi|2|0",
-            "complete": 1
-        }, {
-            "unlock_key": "jump|2|0",
             "complete": 1
         }, {
             "unlock_key": "nhelv|1|0",
@@ -1233,9 +1278,6 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "guardina|2|0",
             "complete": 1
-        }, {
-            "unlock_key": "guardina|1|0",
-            "complete": 1
         }, {
             "unlock_key": "lethaeus|1|0",
             "complete": 1
@@ -1245,9 +1287,6 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "guardina|0|0",
             "complete": 1
-        }, {
-            "unlock_key": "jump|1|0",
-            "complete": 1
         }, {
             "unlock_key": "oshamascramble|2|0",
             "complete": 1
@@ -1263,9 +1302,6 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "darakunosono|1|0",
             "complete": 1
-        }, {
-            "unlock_key": "valhallazero|1|0",
-            "complete": 1
         }, {
             "unlock_key": "grimheart|1|0",
             "complete": 1
@@ -1275,27 +1311,33 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "gothiveofra|1|0",
             "complete": 1
-        }, {
-            "unlock_key": "cyanine|1|0",
-            "complete": 1
-        }, {
-            "unlock_key": "tempestissimo|3|101",
-            "complete": 100
-        }, {
-            "unlock_key": "overwhelm|2|0",
-            "complete": 1
-        }, {
-            "unlock_key": "chronostasis|2|0",
-            "complete": 1
-        }, {
-            "unlock_key": "gloryroad|2|0",
-            "complete": 1
         }, {
             "unlock_key": "etherstrike|1|0",
             "complete": 1
         }, {
             "unlock_key": "singularity|2|0",
             "complete": 1
+        }, {
+            "unlock_key": "viciousheroism|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "axiumcrisis|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "gloryroad|0|0",
+            "complete": 1
+        }, {
+            "unlock_key": "guardina|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "pragmatism|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "oracle|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "genocider|2|0",
+            "complete": 1
         }, {
             "unlock_key": "buchigireberserker|2|3|gothiveofra|2",
             "complete": 1
@@ -1326,9 +1368,6 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "flyburg|2|0",
             "complete": 1
-        }, {
-            "unlock_key": "oracle|2|0",
-            "complete": 1
         }, {
             "unlock_key": "clotho|2|0",
             "complete": 1
@@ -1362,12 +1401,39 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "espebranch|2|0",
             "complete": 1
+        }, {
+            "unlock_key": "syro|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "anokumene|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "equilibrium_challenge|2|102",
+            "complete": 1
+        }, {
+            "unlock_key": "overwhelm|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "chronostasis|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "gloryroad|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "equilibrium_challenge|1|102",
+            "complete": 1
         }, {
             "unlock_key": "aterlbus|2|0",
             "complete": 1
         }, {
             "unlock_key": "dreaminattraction|2|0",
             "complete": 1
+        }, {
+            "unlock_key": "dreaminattraction|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "divinelight|2|0",
+            "complete": 1
         }, {
             "unlock_key": "goodtek|2|0",
             "complete": 1
@@ -1386,24 +1452,27 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "dandelion|1|0",
             "complete": 1
+        }, {
+            "unlock_key": "aegleseeker_challenge|0|102",
+            "complete": 1
         }, {
             "unlock_key": "oblivia|1|0",
             "complete": 1
         }, {
             "unlock_key": "cyberneciacatharsis|1|0",
             "complete": 1
+        }, {
+            "unlock_key": "blrink|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "livefastdieyoung|2|0",
+            "complete": 1
         }, {
             "unlock_key": "corpssansorganes|0|0",
             "complete": 1
-        }, {
-            "unlock_key": "vector|1|0",
-            "complete": 1
         }, {
             "unlock_key": "conflict|2|0",
             "complete": 1
-        }, {
-            "unlock_key": "ignotus|1|0",
-            "complete": 1
         }, {
             "unlock_key": "monochromeprincess|1|0",
             "complete": 1
@@ -1455,15 +1524,27 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "blaster|1|0",
             "complete": 1
+        }, {
+            "unlock_key": "genocider|1|0",
+            "complete": 1
         }, {
             "unlock_key": "rise|1|0",
             "complete": 1
+        }, {
+            "unlock_key": "tempestissimo|0|101",
+            "complete": 100
+        }, {
+            "unlock_key": "aegleseeker|2|3|crystalgravity|2",
+            "complete": 10
+        }, {
+            "unlock_key": "tempestissimo|3|101",
+            "complete": 100
+        }, {
+            "unlock_key": "cyanine|1|0",
+            "complete": 1
         }, {
             "unlock_key": "axiumcrisis|2|0",
             "complete": 1
-        }, {
-            "unlock_key": "tempestissimo|2|101",
-            "complete": 100
         }, {
             "unlock_key": "solitarydream|2|0",
             "complete": 1
@@ -1480,16 +1561,34 @@ def arc_all_get(user_id):
             "unlock_key": "linearaccelerator|1|0",
             "complete": 1
         }, {
-            "unlock_key": "tempestissimo|1|101",
+            "unlock_key": "valhallazero|2|0",
-            "complete": 100
+            "complete": 1
+        }, {
+            "unlock_key": "corpssansorganes|2|0",
+            "complete": 1
         }, {
             "unlock_key": "conflict|1|0",
             "complete": 1
+        }, {
+            "unlock_key": "mazymetroplex|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "viyellastears|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "equilibrium_challenge|0|102",
+            "complete": 1
         }, {
             "unlock_key": "grievouslady|0|101",
             "complete": 100
         }, {
-            "unlock_key": "dreaminattraction|1|0",
+            "unlock_key": "snowwhite|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "partyvinyl|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "jump|2|0",
             "complete": 1
         }, {
             "unlock_key": "saikyostronger|2|3|izana|2",
@@ -1500,33 +1599,27 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "halcyon|1|0",
             "complete": 1
-        }, {
-            "unlock_key": "felis|1|0",
-            "complete": 1
-        }, {
-            "unlock_key": "overwhelm|1|0",
-            "complete": 1
-        }, {
-            "unlock_key": "toaliceliddell|2|0",
-            "complete": 1
-        }, {
-            "unlock_key": "blrink|1|0",
-            "complete": 1
         }, {
             "unlock_key": "heavensdoor|2|0",
             "complete": 1
         }, {
             "unlock_key": "genesis|2|0",
             "complete": 1
+        }, {
+            "unlock_key": "vector|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "loschen|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "divinelight|1|0",
+            "complete": 1
         }, {
             "unlock_key": "viyellastears|1|0",
             "complete": 1
         }, {
             "unlock_key": "aegleseeker|2|103",
             "complete": 1
-        }, {
-            "unlock_key": "tiferet|2|0",
-            "complete": 1
         }, {
             "unlock_key": "grimheart|2|0",
             "complete": 1
@@ -1542,42 +1635,34 @@ def arc_all_get(user_id):
         }, {
             "unlock_key": "sheriruth|2|0",
             "complete": 1
-        }, {
-            "unlock_key": "aegleseeker|2|3|paperwitch|2",
-            "complete": 10
         }, {
             "unlock_key": "sheriruth|1|0",
             "complete": 1
         }, {
             "unlock_key": "aegleseeker|2|3|loschen|2",
             "complete": 10
-        }, {
-            "unlock_key": "cyberneciacatharsis|2|0",
-            "complete": 1
         }, {
             "unlock_key": "essenceoftwilight|2|0",
             "complete": 1
-        }, {
-            "unlock_key": "syro|1|0",
-            "complete": 1
-        }, {
-            "unlock_key": "anokumene|2|0",
-            "complete": 1
-        }, {
-            "unlock_key": "freefall|1|0",
-            "complete": 1
         }, {
             "unlock_key": "darakunosono|2|0",
             "complete": 1
+        }, {
+            "unlock_key": "freefall|1|0",
+            "complete": 1
+        }, {
+            "unlock_key": "toaliceliddell|2|0",
+            "complete": 1
+        }, {
+            "unlock_key": "overwhelm|1|0",
+            "complete": 1
         }, {
             "unlock_key": "nirvluce|2|0",
             "complete": 1
-        },
+        }, {
-            {
+            "unlock_key": "cyberneciacatharsis|2|0",
-            "unlock_key": "aegleseeker_challenge|0|102",
             "complete": 1
-        }
+        }]
-        ]
 
     return {
         "user_id": user_id,

latest version/server/arcworld.py

@@ -3,7 +3,14 @@ from server.sql import Connect
 from setting import Config
 import server.item
 import server.character
+import server.info
+import server.arcpurchase
 import os
+import time
+
+
+ETO_UNCAP_BONUS_PROGRESS = 7
+LUNA_UNCAP_BONUS_PROGRESS = 7
 
 
 def int2b(x):
@@ -14,6 +21,23 @@ def int2b(x):
         return True
 
 
+def calc_stamina(max_stamina_ts, curr_stamina):
+    # 计算体力，返回剩余体力数值
+
+    stamina = int(server.info.MAX_STAMINA - (max_stamina_ts -
+                                             int(time.time()*1000)) / server.info.STAMINA_RECOVER_TICK)
+
+    if stamina >= server.info.MAX_STAMINA:
+        if curr_stamina >= server.info.MAX_STAMINA:
+            stamina = curr_stamina
+        else:
+            stamina = server.info.MAX_STAMINA
+    if stamina < 0:
+        stamina = 0
+
+    return stamina
+
+
 def get_world_name(file_dir='./database/map'):
     # 获取所有地图名称，返回列表
     L = []
@@ -45,7 +69,10 @@ def get_user_world_info(user_id, map_id):
             info['curr_capture'] = x[3]
             info['is_locked'] = int2b(x[4])
         else:
-            c.execute('''insert into user_world values(:a,:b,0,0,0)''', {
+            info['curr_position'] = 0
+            info['curr_capture'] = 0
+            info['is_locked'] = True
+            c.execute('''insert into user_world values(:a,:b,0,0,1)''', {
                 'a': user_id, 'b': map_id})
 
     return info
@@ -67,8 +94,8 @@ def get_current_map(user_id):
 def get_world_all(user_id):
     # 读取所有地图信息并处理，返回字典列表
     re = []
-    with Connect() as c:
     worlds = get_world_name()
+    with Connect() as c:
         for map_id in worlds:
             info = get_world_info(map_id)
             steps = info['steps']
@@ -87,7 +114,10 @@ def get_world_all(user_id):
                 info['curr_capture'] = x[3]
                 info['is_locked'] = int2b(x[4])
             else:
-                c.execute('''insert into user_world values(:a,:b,0,0,0)''', {
+                info['curr_position'] = 0
+                info['curr_capture'] = 0
+                info['is_locked'] = True
+                c.execute('''insert into user_world values(:a,:b,0,0,1)''', {
                     'a': user_id, 'b': map_id})
 
             re.append(info)
@@ -95,6 +125,23 @@ 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']
+        try:
+            del info['is_locked']
+            del info['curr_position']
+            del info['curr_capture']
+        except:
+            pass
+        re.append(info)
+
+    return re
+
+
 def get_user_world(user_id, map_id):
     # 获取用户图信息，返回字典
     re = {}
@@ -106,7 +153,7 @@ def get_user_world(user_id, map_id):
             "user_id": user_id,
             "curr_position": 0,
             "curr_capture": 0,
-            "is_locked": False,
+            "is_locked": True,
             "map_id": map_id
         }
         if x:
@@ -114,12 +161,40 @@ def get_user_world(user_id, map_id):
             re['curr_capture'] = x[3]
             re['is_locked'] = int2b(x[4])
         else:
-            c.execute('''insert into user_world values(:a,:b,0,0,0)''', {
+            c.execute('''insert into user_world values(:a,:b,0,0,1)''', {
                 'a': user_id, 'b': map_id})
 
     return re
 
 
+def unlock_user_world(user_id, map_id):
+    # 解锁用户的图，返回成功与否布尔值
+
+    with Connect() as c:
+        c.execute(
+            '''select is_locked from user_world where map_id=? and user_id=?''', (map_id, user_id))
+        x = c.fetchone()
+        if x:
+            is_locked = x[0]
+        else:
+            is_locked = 1
+            c.execute('''insert into user_world values(:a,:b,0,0,1)''', {
+                'a': user_id, 'b': map_id})
+        if is_locked == 1:
+            map_info = get_world_info(map_id)
+            if 'require_type' in map_info and map_info['require_type'] != '':
+                if map_info['require_type'] in ['pack', 'single']:
+                    c.execute('''select exists(select * from user_item where user_id=? and item_id=? and type=?)''',
+                              (user_id, map_info['require_id'], map_info['require_type']))
+                    if c.fetchone() == (0,):
+                        return False
+
+            c.execute(
+                '''update user_world set is_locked=0 where user_id=? and map_id=?''', (user_id, map_id))
+
+    return True
+
+
 def change_user_current_map(user_id, map_id):
     # 改变用户当前图
     with Connect() as c:
@@ -129,7 +204,8 @@ def change_user_current_map(user_id, map_id):
 
 
 def play_world_song(user_id, args):
-    # 声明是世界模式的打歌，并且记录加成信息
+    # 声明是世界模式的打歌，并且记录加成信息，返回字典
+    r = {}
     with Connect() as c:
         stamina_multiply = 1
         fragment_multiply = 100
@@ -150,7 +226,34 @@ def play_world_song(user_id, args):
         c.execute('''insert into world_songplay values(:a,:b,:c,:d,:e,:f)''', {
             'a': user_id, 'b': args['song_id'], 'c': args['difficulty'], 'd': stamina_multiply, 'e': fragment_multiply, 'f': prog_boost_multiply})
 
-    return None
+        c.execute('''select current_map from user where user_id = :a''', {
+                  'a': user_id})
+        map_id = c.fetchone()[0]
+        info = get_world_info(map_id)
+        # 体力计算
+        c.execute(
+            '''select max_stamina_ts, stamina from user where user_id=?''', (user_id,))
+        x = c.fetchone()
+        max_stamina_ts = x[0] if x and x[0] is not None else 0
+        stamina = x[1] if x and x[1] is not None else 12
+        now = int(time.time() * 1000)
+
+        # 体力不足
+        if calc_stamina(max_stamina_ts, stamina) < info['stamina_cost']:
+            return {}
+        stamina = calc_stamina(max_stamina_ts, stamina) - \
+            info['stamina_cost'] * stamina_multiply
+        max_stamina_ts = now + server.info.STAMINA_RECOVER_TICK * \
+            (server.info.MAX_STAMINA - stamina)
+        c.execute('''update user set max_stamina_ts=?, stamina=? where user_id=?''',
+                  (max_stamina_ts, stamina, user_id))
+        r = {
+            "stamina": stamina,
+            "max_stamina_ts": max_stamina_ts,
+            "token": "13145201919810"
+        }
+
+    return r
 
 
 def climb_step(user_id, map_id, step, prev_capture, prev_position):
@@ -263,10 +366,24 @@ def world_update(c, user_id, song_id, difficulty, rating, clear_type, beyond_gau
     c.execute('''delete from world_songplay where user_id=:a and song_id=:b and difficulty=:c''', {
         'a': user_id, 'b': song_id, 'c': difficulty})
 
-    c.execute('''select character_id from user where user_id=?''', (user_id,))
+    c.execute(
+        '''select character_id, max_stamina_ts, stamina, is_skill_sealed, is_char_uncapped, is_char_uncapped_override from user where user_id=?''', (user_id,))
     x = c.fetchone()
-    character_id = x[0] if x else 0
+    character_id = x[0] if x and x[0] is not None else 0
-    c.execute('''select frag1,prog1,overdrive1,frag20,prog20,overdrive20,frag30,prog30,overdrive30 from character where character_id=?''', (character_id,))
+    max_stamina_ts = x[1] if x and x[1] is not None else 0
+    stamina = x[2] if x and x[2] is not None else 12
+    is_skill_sealed = x[3] if x and x[3] is not None else 1
+    skill = False
+    skill_uncap = False
+    if not is_skill_sealed:
+        if x:
+            skill = True
+            if x[4] is not None and x[4] == 1:
+                skill_uncap = True
+            if x[5] is not None and x[5] == 1:
+                skill_uncap = False
+
+    c.execute('''select frag1,prog1,overdrive1,frag20,prog20,overdrive20,frag30,prog30,overdrive30,skill_id,skill_id_uncap from character where character_id=?''', (character_id,))
     x = c.fetchone()
 
     if Config.CHARACTER_FULL_UNLOCK:
@@ -287,10 +404,20 @@ def world_update(c, user_id, song_id, difficulty, rating, clear_type, beyond_gau
         flag = server.character.calc_char_value(level, x[0], x[3], x[6])
         prog = server.character.calc_char_value(level, x[1], x[4], x[7])
         overdrive = server.character.calc_char_value(level, x[2], x[5], x[8])
+        if x[9] is not None and x[9] != '' and skill:
+            skill = x[9]
+        else:
+            skill = None
+        if x[10] is not None and x[9] != '' and skill_uncap:
+            skill_uncap = x[10]
+        else:
+            skill_uncap = None
     else:
         flag = 0
         prog = 0
         overdrive = 0
+        skill = None
+        skill_uncap = None
 
     c.execute('''select current_map from user where user_id = :a''', {
         'a': user_id})
@@ -317,13 +444,53 @@ def world_update(c, user_id, song_id, difficulty, rating, clear_type, beyond_gau
     c.execute('''select * from user_world where user_id = :a and map_id =:b''',
               {'a': user_id, 'b': map_id})
     y = c.fetchone()
+    if y[4] == 1:  # 图不可用
+        return {}
+
     rewards, steps, curr_position, curr_capture, info = climb_step(
         user_id, map_id, step, y[3], y[2])
+    # Eto和Luna的技能
+    character_bonus_progress = None
+    skill_special = ''
+    if skill_uncap is not None and skill_uncap and skill_uncap in ['eto_uncap', 'luna_uncap']:
+        skill_special = skill_uncap
+    elif skill is not None and skill and skill in ['eto_uncap', 'luna_uncap']:
+        skill_special = skill
+    if skill_special == 'eto_uncap':
+        # eto觉醒技能，获得残片奖励时世界模式进度加7
+        fragment_flag = False
+        for i in rewards:
+            for j in i['items']:
+                if j['type'] == 'fragment':
+                    fragment_flag = True
+                    break
+            if fragment_flag:
+                break
+        if fragment_flag:
+            character_bonus_progress = ETO_UNCAP_BONUS_PROGRESS
+            step += character_bonus_progress * step_times
+        rewards, steps, curr_position, curr_capture, info = climb_step(
+            user_id, map_id, step, y[3], y[2])  # 二次爬梯，重新计算
+
+    elif skill_special == 'luna_uncap':
+        # luna觉醒技能，限制格开始时世界模式进度加7
+        if 'restrict_id' in steps[0] and 'restrict_type' in steps[0] and steps[0]['restrict_type'] != '' and steps[0]['restrict_id'] != '':
+            character_bonus_progress = LUNA_UNCAP_BONUS_PROGRESS
+            step += character_bonus_progress * step_times
+        rewards, steps, curr_position, curr_capture, info = climb_step(
+            user_id, map_id, step, y[3], y[2])  # 二次爬梯，重新计算
+
     for i in rewards:  # 物品分发
         for j in i['items']:
             amount = j['amount'] if 'amount' in j else 1
             item_id = j['id'] if 'id' in j else ''
             server.item.claim_user_item(c, user_id, item_id, j['type'], amount)
+
+    if 'step_type' in steps[-1]:
+        if 'plusstamina' in steps[-1]['step_type'] and 'plus_stamina_value' in steps[-1]:
+            # 体力格子
+            max_stamina_ts, stamina = add_stamina(
+                c, user_id, int(steps[-1]['plus_stamina_value']))
     # 角色升级
     if not Config.CHARACTER_FULL_UNLOCK:
         exp, level = server.character.calc_level_up(
@@ -357,8 +524,8 @@ def world_update(c, user_id, song_id, difficulty, rating, clear_type, beyond_gau
                 "prog": prog,
                 "overdrive": overdrive
             },
-            "current_stamina": 12,
+            "current_stamina": calc_stamina(max_stamina_ts, stamina),
-            "max_stamina_ts": 1586274871917
+            "max_stamina_ts": max_stamina_ts
         }
     else:
         re = {
@@ -384,10 +551,13 @@ def world_update(c, user_id, song_id, difficulty, rating, clear_type, beyond_gau
                 "prog": prog,
                 "overdrive": overdrive
             },
-            "current_stamina": 12,
+            "current_stamina": calc_stamina(max_stamina_ts, stamina),
-            "max_stamina_ts": 1586274871917
+            "max_stamina_ts": max_stamina_ts
         }
 
+    if character_bonus_progress is not None:
+        re['character_bonus_progress'] = character_bonus_progress
+
     if stamina_multiply != 1:
         re['stamina_multiply'] = stamina_multiply
     if fragment_multiply != 100:
@@ -401,3 +571,77 @@ def world_update(c, user_id, song_id, difficulty, rating, clear_type, beyond_gau
         'a': curr_position, 'b': curr_capture, 'c': user_id, 'd': map_id})
 
     return re
+
+
+def add_stamina(c, user_id, add_stamina):
+    # 增添体力，返回max_stamina_ts和stamina
+
+    now = int(time.time() * 1000)
+    c.execute(
+        '''select max_stamina_ts, stamina from user where user_id=?''', (user_id,))
+    x = c.fetchone()
+    if x and x[0] is not None and x[1] is not None:
+        stamina = calc_stamina(x[0], x[1]) + add_stamina
+        max_stamina_ts = now - \
+            (stamina-server.info.MAX_STAMINA) * \
+            server.info.STAMINA_RECOVER_TICK
+    else:
+        max_stamina_ts = now
+        stamina = server.info.MAX_STAMINA
+
+    c.execute('''update user set max_stamina_ts=?, stamina=? where user_id=?''',
+              (max_stamina_ts, stamina, user_id))
+
+    return max_stamina_ts, stamina
+
+
+def buy_stamina_by_fragment(user_id):
+    # 残片买体力，返回字典和错误码
+    r = {}
+
+    with Connect() as c:
+        c.execute(
+            '''select next_fragstam_ts from user where user_id=?''', (user_id,))
+        x = c.fetchone()
+        if x:
+            now = int(time.time() * 1000)
+            next_fragstam_ts = x[0] if x[0] else 0
+
+            if now < next_fragstam_ts:
+                return {}, 905
+
+            next_fragstam_ts = now + 24*3600*1000
+            max_stamina_ts, stamina = add_stamina(c, user_id, 6)
+            c.execute('''update user set next_fragstam_ts=?, max_stamina_ts=?, stamina=? where user_id=?''',
+                      (next_fragstam_ts, max_stamina_ts, stamina, user_id))
+
+            r = {
+                "user_id": user_id,
+                "stamina": stamina,
+                "max_stamina_ts": max_stamina_ts,
+                "next_fragstam_ts": next_fragstam_ts
+            }
+
+    return r, None
+
+
+def buy_stamina_by_ticket(user_id):
+    # 源点买体力，返回字典和错误码
+    r = {}
+
+    with Connect() as c:
+        flag, ticket = server.arcpurchase.buy_item(c, user_id, 50)
+        if flag:
+            max_stamina_ts, stamina = add_stamina(c, user_id, 6)
+            c.execute('''update user set max_stamina_ts=?, stamina=? where user_id=?''',
+                      (max_stamina_ts, stamina, user_id))
+            r = {
+                "user_id": user_id,
+                "stamina": stamina,
+                "max_stamina_ts": max_stamina_ts,
+                "ticket": ticket
+            }
+        else:
+            return None, 501
+
+    return r, None

latest version/server/auth.py

@@ -5,9 +5,11 @@ import functools
 from setting import Config
 from flask import jsonify
 
+BAN_TIME = [1, 3, 7, 15, 31]
+
 
 def arc_login(name: str, password: str, device_id: str, ip: str):  # 登录判断
-    # 查询数据库中的user表，验证账号密码，返回并记录token，多返回个error code
+    # 查询数据库中的user表，验证账号密码，返回并记录token，多返回个error code和extra
     # token采用user_id和时间戳连接后hash生成（真的是瞎想的，没用bear）
     # 密码和token的加密方式为 SHA-256
 
@@ -15,16 +17,21 @@ def arc_login(name: str, password: str, device_id: str, ip: str):  # 登录判
     token = None
     with Connect() as c:
         hash_pwd = hashlib.sha256(password.encode("utf8")).hexdigest()
-        c.execute('''select user_id, password from user where name = :name''', {
+        c.execute('''select user_id, password, ban_flag from user where name = :name''', {
             'name': name})
         x = c.fetchone()
         if x is not None:
+            now = int(time.time() * 1000)
+            if x[2] is not None and x[2] != '':
+                # 自动封号检查
+                ban_timestamp = int(x[2].split(':', 1)[1])
+                if ban_timestamp > now:
+                    return None, 105, {'remaining_ts': ban_timestamp-now}
             if x[1] == '':
                 # 账号封禁
                 error_code = 106
             elif x[1] == hash_pwd:
                 user_id = str(x[0])
-                now = int(time.time() * 1000)
                 token = hashlib.sha256(
                     (user_id + str(now)).encode("utf8")).hexdigest()
                 c.execute(
@@ -49,6 +56,13 @@ def arc_login(name: str, password: str, device_id: str, ip: str):  # 登录判
                                 device_list) + 1 - device_list.count(device_id) - Config.LOGIN_DEVICE_NUMBER_LIMIT
 
                     if should_delete_num >= 1:  # 删掉多余token
+                        if not Config.ALLOW_LOGIN_SAME_DEVICE and Config.ALLOW_BAN_MULTIDEVICE_USER_AUTO:  # 自动封号检查
+                            c.execute(
+                                '''select count(*) from login where user_id=? and login_time>?''', (user_id, now-86400000))
+                            if c.fetchone()[0] >= Config.LOGIN_DEVICE_NUMBER_LIMIT:
+                                remaining_ts = arc_auto_ban(c, user_id, now)
+                                return None, 105, {'remaining_ts': remaining_ts}
+
                         c.execute('''delete from login where rowid in (select rowid from login where user_id=:user_id limit :a);''',
                                   {'user_id': user_id, 'a': int(should_delete_num)})
 
@@ -62,7 +76,7 @@ def arc_login(name: str, password: str, device_id: str, ip: str):  # 登录判
             # 用户名错误
             error_code = 104
 
-    return token, error_code
+    return token, error_code, None
 
 
 def arc_register(name: str, password: str, device_id: str, email: str, ip: str):  # 注册
@@ -195,3 +209,24 @@ def auth_required(request):
 
         return wrapped_view
     return decorator
+
+
+def arc_auto_ban(c, user_id, now):
+    # 多设备自动封号机制，返回封号时长
+    c.execute('''delete from login where user_id=?''', (user_id, ))
+    c.execute('''select ban_flag from user where user_id=?''', (user_id,))
+    x = c.fetchone()
+    if x and x[0] != '' and x[0] is not None:
+        last_ban_time = int(x[0].split(':', 1)[0])
+        i = 0
+        while i < len(BAN_TIME) - 1 and BAN_TIME[i] <= last_ban_time:
+            i += 1
+        ban_time = BAN_TIME[i]
+    else:
+        ban_time = BAN_TIME[0]
+
+    ban_flag = ':'.join((str(ban_time), str(now + ban_time*24*60*60*1000)))
+    c.execute('''update user set ban_flag=? where user_id=?''',
+              (ban_flag, user_id))
+
+    return ban_time*24*60*60*1000

latest version/server/character.py

@@ -1,5 +1,6 @@
 from setting import Config
 from server.sql import Connect
+import server.info
 import server.item
 import server.setme
 
@@ -212,7 +213,7 @@ def char_use_core(user_id, character_id, amount):
             x = c.fetchone()
             if x:
                 exp, level = calc_level_up(
-                    c, user_id, character_id, x[0], amount*250)
+                    c, user_id, character_id, x[0], amount*server.info.CORE_EXP)
                 c.execute('''update user_char set level=?, exp=? where user_id=? and character_id=?''',
                       (level, exp, user_id, character_id))
                 server.item.claim_user_item(
@@ -244,10 +245,10 @@ def char_uncap(user_id, character_id):
                 break
 
         if success:
-            for i in x:
-                server.item.claim_user_item(c, user_id, i[1], i[2], -i[3])
             c.execute('''update user_char set is_uncapped=1, is_uncapped_override=0 where user_id=? and character_id=?''',
                       (user_id, character_id))
+            for i in x:
+                server.item.claim_user_item(c, user_id, i[1], i[2], -i[3])
 
         r = {'character': [get_one_character(c, user_id, character_id)]}
         r['cores'] = server.item.get_user_cores(c, user_id)

latest version/server/info.py

@@ -7,6 +7,10 @@ import server.item
 import time
 from setting import Config
 
+MAX_STAMINA = 12
+STAMINA_RECOVER_TICK = 1800000
+CORE_EXP = 250
+
 
 def int2b(x):
     # int与布尔值转换
@@ -100,6 +104,8 @@ def get_user_friend(c, user_id):
                     "user_id": i[0]
                 })
 
+    s.sort(key=lambda item: item["recent_score"][0]["time_played"] if len(
+        item["recent_score"]) > 0 else 0, reverse=True)
     return s
 
 
@@ -122,11 +128,12 @@ def get_user_me(c, user_id):
                 '''update user set character_id=0 where user_id=?''', (user_id,))
 
         favorite_character_id = x[23]
-        if favorite_character_id not in characters:
+        if favorite_character_id not in characters:  # 这是考虑有可能favourite_character设置了用户未拥有的角色
             favorite_character_id = -1
             c.execute(
                 '''update user set favorite_character=-1 where user_id=?''', (user_id,))
 
+        # 计算世界排名
         c.execute(
             '''select world_rank_score from user where user_id=?''', (user_id,))
         y = c.fetchone()
@@ -141,12 +148,24 @@ def get_user_me(c, user_id):
         else:
             world_rank = 0
 
+        # 源点强化
         prog_boost = 0
         if x[27] and x[27] != 0:
             prog_boost = 300
 
+        # 体力计算
+        next_fragstam_ts = -1
+        max_stamina_ts = 1586274871917
+        stamina = 12
+        if x[31]:
+            next_fragstam_ts = x[31]
+        if x[32]:
+            max_stamina_ts = x[32]
+        if x[33]:
+            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": {
@@ -164,9 +183,9 @@ def get_user_me(c, user_id):
              "is_skill_sealed": int2b(x[7]),
              "current_map": x[25],
              "prog_boost": prog_boost,
-             "next_fragstam_ts": -1,
+             "next_fragstam_ts": next_fragstam_ts,
-             "max_stamina_ts": 1586274871917,
+             "max_stamina_ts": max_stamina_ts,
-             "stamina": 12,
+             "stamina": server.arcworld.calc_stamina(max_stamina_ts, stamina),
              "world_unlocks": server.item.get_user_items(c, user_id, 'world_unlock'),
              "world_songs": server.item.get_user_items(c, user_id, 'world_song'),
              "singles": server.item.get_user_items(c, user_id, 'single'),
@@ -220,12 +239,12 @@ def arc_aggregate_big(user_id):
              }, {
                  "id": 3,
                  "value": {
-                     "max_stamina": 12,
+                     "max_stamina": MAX_STAMINA,
-                     "stamina_recover_tick": 1800000,
+                     "stamina_recover_tick": STAMINA_RECOVER_TICK,
-                     "core_exp": 250,
+                     "core_exp": CORE_EXP,
-                     "curr_ts": int(time.time())*1000,
+                     "curr_ts": int(time.time()*1000),
                      "level_steps": server.character.get_level_steps(),
-                     "world_ranking_enabled": False,
+                     "world_ranking_enabled": True,
                      "is_byd_chapter_unlocked": True
                  }
              }, {

latest version/server/sql.py

@@ -30,10 +30,11 @@ class Connect():
 
         return True
 
+
 class Sql():
 
     @staticmethod
-    def select(c, table_name, target_column=[], limit=-1, offset=0, query={}, sort=[]):
+    def select(c, table_name, target_column=[], query=None):
         # 执行查询单句sql语句，返回fetchall数据
         # 使用准确查询，且在单表内
 
@@ -51,9 +52,10 @@ class Sql():
 
         where_field = []
         where_value = []
-        for i in query:
+        if query:
+            for i in query.query:
                 where_field.append(i)
-            where_value.append(query[i])
+                where_value.append(query.query[i])
 
         if where_field and where_value:
             sql += ' where '
@@ -64,16 +66,17 @@ class Sql():
                     sql_dict[where_field[i]] = where_value[i]
                     sql += ' and ' + where_field[i] + '=:' + where_field[i]
 
-        if sort:
+        if query and query.sort:
-            sql += ' order by ' + sort[0]['column'] + ' ' + sort[0]['order']
+            sql += ' order by ' + \
-            if len(sort) >= 2:
+                query.sort[0]['column'] + ' ' + query.sort[0]['order']
-                for i in range(1, len(sort)):
+            for i in range(1, len(query.sort)):
-                    sql += ', ' + sort[i]['column'] + ' ' + sort[i]['order']
+                sql += ', ' + query.sort[i]['column'] + \
+                    ' ' + query.sort[i]['order']
 
-        if limit >= 0:
+        if query and query.limit >= 0:
             sql += ' limit :limit offset :offset'
-            sql_dict['limit'] = limit
+            sql_dict['limit'] = query.limit
-            sql_dict['offset'] = offset
+            sql_dict['offset'] = query.offset
 
         c.execute(sql, sql_dict)
 

latest version/setting.py

@@ -8,7 +8,7 @@ class Config():
     主机的地址和端口号
     Host and port of your server
     '''
-    HOST = '192.168.1.101'
+    HOST = '0.0.0.0'
     PORT = '80'
     '''
     --------------------
@@ -19,7 +19,7 @@ class Config():
     游戏API地址前缀
     Game API's URL prefix
     '''
-    GAME_API_PREFIX = '/blockchain/14'
+    GAME_API_PREFIX = '/earlgrey/16'
     '''
     --------------------
     '''
@@ -30,7 +30,8 @@ class Config():
     Allowed game versions
     If it is blank, all are allowed.
     '''
-    ALLOW_APPVERSION = ['3.5.3', '3.5.3c', '3.6.2', '3.6.2c']
+    ALLOW_APPVERSION = ['3.5.3', '3.5.3c',
+                        '3.9.0', '3.9.0c', '3.9.1', '3.9.1c']
     '''
     --------------------
     '''
@@ -68,6 +69,16 @@ class Config():
     --------------------
     '''
 
+    '''
+    --------------------
+    世界模式当前活动图设置
+    Current available maps in world mode
+    '''
+    AVAILABLE_MAP = []  # Ex. ['test', 'test2']
+    '''
+    --------------------
+    '''
+
     '''
     --------------------
     Web后台管理页面的用户名和密码
@@ -135,10 +146,17 @@ class Config():
     LOGIN_DEVICE_NUMBER_LIMIT = 1
     '''
     是否允许同设备多应用共存登录
+    请注意，这个选项设置为True时，下一个选项将自动变为False
     If logging in from multiple applications on the same device is allowed
+    Note that when this option is set to True, the next option automatically becomes False
     '''
     ALLOW_LOGIN_SAME_DEVICE = False
     '''
+    24小时内登陆设备数超过最大允许设备数量时，是否自动封号（1天、3天、7天、15天、31天）
+    When the number of login devices exceeds the maximum number of devices allowed to log in Arcaea within 24 hours, whether the account will be automatically banned (1 day, 3 days, 7 days, 15 days, 31 days)
+    '''
+    ALLOW_BAN_MULTIDEVICE_USER_AUTO = True
+    '''
     --------------------
     '''
 
@@ -162,6 +180,18 @@ class Config():
     --------------------
     '''
 
+    '''
+    --------------------
+    数据库更新时，是否采用最新的角色数据，如果你想采用最新的官方角色数据
+    注意：如果是，旧的数据将丢失；如果否，某些角色的数据变动将无法同步
+    If using the latest character data when updating database. If you want to only keep newest official character data, please set it `True`.
+    Note: If `True`, the old data will be lost; If `False`, the data changes of some characters will not be synchronized.
+    '''
+    UPDATE_WITH_NEW_CHARACTER_DATA = True
+    '''
+    --------------------
+    '''
+
     '''
     --------------------
     是否全解锁搭档
@@ -201,3 +231,13 @@ class Config():
     '''
     --------------------
     '''
+
+    '''
+    --------------------
+    是否使用最好的 10 条记录（而不是最近的 30 条记录中较好的 10 条）来计算 PTT
+    Calculate PTT with best 10 instead of recent best 10
+    '''
+    USE_B10_AS_R10 = False
+    '''
+    --------------------
+    '''

latest version/templates/web/allpresent.html

@@ -20,10 +20,28 @@
     <span class="char-num">{{present['description']}}</span>
     <br />
 
-    <span>Items: </span>
+    {% if present['items'] %}<br />
-    <span class="char-num" style='white-space:pre'>{{present['items']}}</span>
+    {% for x in present['items'] %}
+    <span>Item id: </span>
+    <span class="char-num">{{x['item_id']}}</span>
     <br />
 
+    <span>Item type: </span>
+    <span class="char-num">{{x['type']}}</span>
+    <br />
+
+    <span>Amount: </span>
+    <span class="char-num">{{x['amount']}}</span>
+    <br />
+
+
+
+    {% if not loop.last %}
+    <br />
+    {% endif %}
+    {% endfor %}
+    {% endif %}
+
 
 </div>
 {% if not loop.last %}

latest version/templates/web/allpurchase.html

@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% block header %}
-<h1>{% block title %}All items{% endblock %}</h1>
+<h1>{% block title %}All purchases{% endblock %}</h1>
 {% endblock %}
 
 {% block content %}
@@ -37,6 +37,10 @@
     <span class="char-num">{{x['type']}}</span>
     <br />
 
+    <span>Amount: </span>
+    <span class="char-num">{{x['amount']}}</span>
+    <br />
+
 
 
     {% if not loop.last %}

latest version/templates/web/allredeem.html

@@ -22,9 +22,28 @@
     </span>
     <br />
 
-    <span>Items: </span>
+    {% if redeem['items'] %}<br />
-    <span class="char-num" style='white-space:pre'>{{redeem['items']}}</span>
+    {% for x in redeem['items'] %}
+    <span>Item id: </span>
+    <span class="char-num">{{x['item_id']}}</span>
     <br />
+
+    <span>Item type: </span>
+    <span class="char-num">{{x['type']}}</span>
+    <br />
+
+    <span>Amount: </span>
+    <span class="char-num">{{x['amount']}}</span>
+    <br />
+
+
+
+    {% if not loop.last %}
+    <br />
+    {% endif %}
+    {% endfor %}
+    {% endif %}
+
     <div><a href="/web/redeem/{{redeem['code']}}">使用者 Players who have used it.</a></div>
 
 </div>

latest version/templates/web/changepresent.html

@@ -14,15 +14,25 @@
     <label for="expire_ts">Expire time</label>
     <input type="datetime-local" name="expire_ts" id="expire_ts" required>
     <br />
-    <div>Items:</div>
-    <label for="fragment">Fragments</label>
-    <input name="fragment" id="fragment">
-    <label for="ticket">Memories</label>
-    <input name="ticket" id="ticket">
 
-    <div class="content">两种奖励只能有一个，另一个请留空。如果都填写，以记忆源点优先。</div>
+    <label for="item_id">ID of the item</label>
-    <div class="content">There can only be one of the two kinds of present. Please leave the other one blank. If you
+    <input name="item_id" id="item_id" required>
-        fill both, the memories will be given priority.</div>
+    <label for="type">Type</label>
+    <div>
+        <select name="type">
+            <option value='single' selected>Single song</option>
+            <option value='world_song'>World song</option>
+            <option value='world_unlock'>World unlock scene</option>
+            <option value='character'>Character</option>
+            <option value='core'>Character core</option>
+            <option value='fragment'>Fragment</option>
+            <option value='memory'>Memory</option>
+        </select>
+    </div>
+    <label for="amount">Amount</label>
+    <input name="amount" id="amount" value="1" required>
+    <br />
+
     <div class="content">时间填写是一个HTML5控件</div>
     <div class="content">Time filling is an HTML5 control.</div>
     <input type="submit" value="Add">

latest version/templates/web/changepurchaseitem.html

@@ -13,12 +13,15 @@
     <label for="type">Type</label>
     <div>
         <select name="type">
-            <option value='single' selected>Single</option>
+            <option value='single' selected>Single song</option>
-            <option value='pack'>Pack</option>
+            <option value='pack'>Song pack</option>
             <option value='world_song'>World song</option>
             <option value='character'>Character</option>
+            <option value='core'>Core</option>
         </select>
     </div>
+    <label for="amount">Amount</label>
+    <input name="amount" id="amount" value="1" required>
     <br />
     <input type="submit" value="Add">
 </form>
@@ -36,6 +39,7 @@
             <option value='pack'>Pack</option>
             <option value='world_song'>World song</option>
             <option value='character'>Character</option>
+            <option value='core'>Core</option>
         </select>
     </div>
     <br />

latest version/templates/web/changeredeem.html

@@ -11,27 +11,40 @@
     <input name="code" id="code">
     <div>Or</div>
     <div>随机批量生成 Batch generation at random</div>
-    <label for="amount">Amount</label>
+    <label for="redeem_amount">Redeem code amount</label>
-    <input name="amount" id="amount">
+    <input name="redeem_amount" id="redeem_amount">
     <br />
-    <div>Type:
+    <div>Redeem code type:
         <br />
         <br />
-        <label><input type="radio" name="type" value="0" checked>仅可使用一次 It can only be used once.</label>
+        <label><input type="radio" name="redeem_type" value="0" checked>仅可使用一次 It can only be used once.</label>
         <br />
-        <label><input type="radio" name="type" value="1">每个用户仅可以使用一次 Each user can only use it once.</label>
+        <label><input type="radio" name="redeem_type" value="1">每个用户仅可以使用一次 Each user can only use it once.</label>
     </div>
 
 
     <br />
-    <div>Items:</div>
-    <label for="fragment">Fragments</label>
-    <input name="fragment" id="fragment">
-    <label for="ticket">Memories</label>
-    <input name="ticket" id="ticket">
 
-    <div class="content">两种奖励可以都有，不需要请留空。</div>
+    <label for="item_id">ID of the item</label>
-    <div class="content">You can have both kinds of items. Please leave it blank if you don't need it.</div>
+    <input name="item_id" id="item_id" required>
+    <label for="type">Type</label>
+    <div>
+        <select name="type">
+            <option value='single' selected>Single song</option>
+            <option value='pack'>Song pack</option>
+            <option value='world_song'>World song</option>
+            <option value='world_unlock'>World unlock scene</option>
+            <option value='character'>Character</option>
+            <option value='core'>Character core</option>
+            <option value='fragment'>Fragment</option>
+            <option value='memory'>Memory</option>
+        </select>
+    </div>
+    <label for="amount">Amount</label>
+    <input name="amount" id="amount" value="1" required>
+    <br />
+
+
     <div class="content">兑换码长度为10~20。</div>
     <div class="content">The length of redeem code is 10 ~ 20.</div>
     <div class="content">随机生成数量不得超过1000。</div>

latest version/templates/web/updatedatabase.html

@@ -10,10 +10,10 @@
     <input type="submit" value="Submit">
 </form>
 <div class="content">
-    这里可以将旧版本的数据库同步到新版本的数据库，并刷新用户拥有的角色列表。<br />
+    这里可以将旧版本的数据库同步到新版本的数据库，并刷新用户拥有的全角色列表。<br />
     可上传文件: arcaea_database.db和arcsong.db<br />
     新数据库不存在的数据会被添加，存在的重复数据也会被改变。<br /><br />
-    Here you can synchronize the old version of the database to the new version of the database and refresh the list of
+    Here you can synchronize the old version of the database to the new version of the database and refresh the list of full
     characters owned by players.<br />
     Uploadable files: arcaea_database.db & arcsong.db<br />
     Data that does not exist in the new database will be added and the existing duplicate data will also be changed.

latest version/web/index.py

@@ -1,5 +1,5 @@
 from flask import (
-    Blueprint, flash, g, redirect, render_template, request, url_for
+    Blueprint, flash, redirect, render_template, request, url_for
 )
 from web.login import login_required
 from werkzeug.utils import secure_filename
@@ -418,7 +418,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', 'skill_lagrange']
+                 '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', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', 'eto_uncap', 'luna_uncap']
     return render_template('web/changechar.html', skill_ids=skill_ids)
 
 
@@ -604,7 +604,8 @@ def edit_user_purchase():
             if method == '0':
                 web.system.unlock_all_user_item(c)
             else:
-                c.execute('''delete from user_item''')
+                c.execute(
+                    '''delete from user_item where type in ('pack', 'single')''')
 
             flash("全部用户购买信息修改成功 Successfully edit all the users' purchase information.")
 
@@ -629,8 +630,8 @@ def edit_user_purchase():
                 if method == '0':
                     web.system.unlock_user_item(c, user_id)
                 else:
-                    c.execute('''delete from user_item where user_id=:a''', {
+                    c.execute('''delete from user_item where type in ('pack', 'single') and user_id = :user_id''', {
-                        'a': user_id})
+                        'user_id': user_id})
                 flash('用户购买信息修改成功 Successfully edit the user purchase information.')
 
             else:
@@ -776,12 +777,12 @@ def change_purchase():
                 discount_from = int(time.mktime(time.strptime(
                     discount_from, "%Y-%m-%dT%H:%M"))) * 1000
             else:
-                discount_from = None
+                discount_from = -1
             if discount_to:
                 discount_to = int(time.mktime(time.strptime(
                     discount_to, "%Y-%m-%dT%H:%M"))) * 1000
             else:
-                discount_to = None
+                discount_to = -1
         except:
             error = '数据错误 Wrong data.'
             flash(error)
@@ -846,6 +847,7 @@ def change_purchase_item():
             purchase_name = request.form['purchase_name']
             item_id = request.form['item_id']
             item_type = request.form['type']
+            amount = int(request.form['amount'])
         except:
             error = '数据错误 Wrong data.'
             flash(error)
@@ -861,8 +863,8 @@ def change_purchase_item():
                     c.execute(
                         '''select exists(select * from item where item_id=? and type=?)''', (item_id, item_type))
                     if c.fetchone() == (1,):
-                        c.execute('''insert into purchase_item values(?,?,?)''',
+                        c.execute('''insert into purchase_item values(?,?,?,?)''',
-                                  (purchase_name, item_id, item_type))
+                                  (purchase_name, item_id, item_type, amount))
                         flash('''购买项目的物品添加成功 Successfully add the purchase's item.''')
                     else:
                         error = '''物品不存在 The item does not exist.'''
@@ -975,16 +977,19 @@ def all_present():
         if x:
             posts = []
             for i in x:
-                items = json.loads(i[2])
+                items = []
-                items_string = ''
+                c.execute(
-                for j in items:
+                    '''select * from present_item where present_id=?''', (i[0],))
-                    items_string = items_string + '\n' + \
+                y = c.fetchall()
-                        str(j['id']) + ': ' + str(j['amount'])
+                for j in y:
+                    if j is not None:
+                        items.append(
+                            {'item_id': j[1], 'type': j[2], 'amount': j[3]})
 
                 posts.append({'present_id': i[0],
                               'expire_ts': time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(int(i[1])//1000)),
-                              'items': items_string,
+                              'items': items,
-                              'description': i[3]
+                              'description': i[2]
                               })
         else:
             error = '没有奖励数据 No present data.'
@@ -1010,13 +1015,15 @@ def add_present():
     present_id = request.form['present_id']
     expire_ts = request.form['expire_ts']
     description = request.form['description']
-    fragment = request.form['fragment']
+    item_id = request.form['item_id']
-    ticket = request.form['ticket']
+    item_type = request.form['type']
+    item_amount = request.form['amount']
+
     try:
-        if ticket:
+        if item_amount:
-            ticket = int(ticket)
+            item_amount = int(item_amount)
-        if fragment:
+        else:
-            fragment = int(fragment)
+            item_amount = 1
         expire_ts = int(time.mktime(time.strptime(
             expire_ts, "%Y-%m-%dT%H:%M"))) * 1000
     except:
@@ -1028,18 +1035,8 @@ def add_present():
     if len(description) >= 256:
         description = description[:200]
 
-    items = []
-    if ticket:
-        items.append({'type': 'memory', 'id': 'memory', 'amount': ticket})
-    if fragment:
-        items.append(
-            {'type': 'fragment', 'id': 'fragment', 'amount': fragment})
-    if items == []:
-        flash('奖励为空 No items.')
-        return redirect(url_for('index.change_present'))
-
     message = web.system.add_one_present(
-        present_id, expire_ts, description, json.dumps(items))
+        present_id, expire_ts, description, item_id, item_type, item_amount)
 
     if message:
         flash(message)
@@ -1128,15 +1125,18 @@ def all_redeem():
         if x:
             posts = []
             for i in x:
-                items = json.loads(i[1])
+                items = []
-                items_string = ''
+                c.execute(
-                for j in items:
+                    '''select * from redeem_item where code=?''', (i[0],))
-                    items_string = items_string + '\n' + \
+                y = c.fetchall()
-                        str(j['id']) + ': ' + str(j['amount'])
+                for j in y:
+                    if j is not None:
+                        items.append(
+                            {'item_id': j[1], 'type': j[2], 'amount': j[3]})
 
                 posts.append({'code': i[0],
-                              'items': items_string,
+                              'items': items,
-                              'type': i[2]
+                              'type': i[1]
                               })
         else:
             error = '没有兑换码数据 No redeem code data.'
@@ -1159,48 +1159,39 @@ def change_redeem():
 @login_required
 def add_redeem():
     # 添加兑换码数据
-    print(request.form)
     code = request.form['code']
-    amount = request.form['amount']
+    redeem_amount = request.form['redeem_amount']
-    redeem_type = request.form['type']
+    redeem_type = request.form['redeem_type']
-    fragment = request.form['fragment']
+    item_id = request.form['item_id']
-    ticket = request.form['ticket']
+    item_type = request.form['type']
+    item_amount = request.form['amount']
+
     try:
-        if amount:
+        if item_amount:
-            amount = int(amount)
+            item_amount = int(item_amount)
-        if ticket:
+        else:
-            ticket = int(ticket)
+            item_amount = 1
-        if fragment:
+        if redeem_amount:
-            fragment = int(fragment)
+            redeem_amount = int(redeem_amount)
     except:
         flash('数据错误 Wrong data.')
         return redirect(url_for('index.change_redeem'))
 
-    items = []
+    if code and not redeem_amount:
-    if ticket:
-        items.append({'type': 'memory', 'id': 'memory', 'amount': ticket})
-    if fragment:
-        items.append(
-            {'type': 'fragment', 'id': 'fragment', 'amount': fragment})
-    if items == []:
-        flash('奖励为空 No items.')
-        return redirect(url_for('index.change_redeem'))
-
-    if code and not amount:
         if len(code) > 20 or len(code) < 10:
             flash('兑换码长度不合适 Inappropriate length of redeem code.')
             return redirect(url_for('index.change_redeem'))
 
         message = web.system.add_one_redeem(
-            code, redeem_type, json.dumps(items))
+            code, redeem_type, item_id, item_type, item_amount)
-    elif amount and not code:
+    elif redeem_amount and not code:
-        if amount <= 0 or amount > 1000:
+        if redeem_amount <= 0 or redeem_amount > 1000:
             flash('数量错误 Wrong amount.')
             return redirect(url_for('index.change_redeem'))
 
         message = web.system.add_some_random_redeem(
-            amount, redeem_type, json.dumps(items))
+            redeem_amount, redeem_type, item_id, item_type, item_amount)
-    elif amount and code:
+    elif redeem_amount and code:
         flash('只能使用一种添加方式 Only one add method can be used.')
         return redirect(url_for('index.change_redeem'))
     else:

latest version/web/system.py

@@ -5,6 +5,7 @@ import json
 import server.arcscore
 import hashlib
 from random import Random
+from setting import Config
 
 
 def int2b(x):
@@ -177,7 +178,7 @@ def update_user_char(c):
 
 def update_database():
     # 将old数据库不存在数据加入到新数据库上，并删除old数据库
-    # 对于arcaea_datebase.db，更新一些表，并用character数据更新user_char
+    # 对于arcaea_datebase.db，更新一些表，并用character数据更新user_char_full
     # 对于arcsong.db，更新songs
     if os.path.isfile("database/old_arcaea_database.db") and os.path.isfile("database/arcaea_database.db"):
         with Connect('./database/old_arcaea_database.db') as c1:
@@ -196,15 +197,21 @@ def update_database():
                 update_one_table(c1, c2, 'login')
                 update_one_table(c1, c2, 'present')
                 update_one_table(c1, c2, 'user_present')
+                update_one_table(c1, c2, 'present_item')
                 update_one_table(c1, c2, 'redeem')
                 update_one_table(c1, c2, 'user_redeem')
+                update_one_table(c1, c2, 'redeem_item')
                 update_one_table(c1, c2, 'role')
                 update_one_table(c1, c2, 'user_role')
                 update_one_table(c1, c2, 'power')
                 update_one_table(c1, c2, 'role_power')
-                update_one_table(c1, c2, 'api_auth')
+                update_one_table(c1, c2, 'api_login')
 
                 update_one_table(c1, c2, 'user_char')
+
+                if not Config.UPDATE_WITH_NEW_CHARACTER_DATA:
+                    update_one_table(c1, c2, 'character')
+
                 update_user_char(c2)  # 更新user_char_full
 
         os.remove('database/old_arcaea_database.db')
@@ -224,13 +231,15 @@ def unlock_all_user_item(c):
 
     c.execute('''select user_id from user''')
     x = c.fetchall()
-    c.execute('''select item_id, type from item''')
+    c.execute('''select item_id, type from purchase_item''')
     y = c.fetchall()
-    c.execute('''delete from user_item''')
     if x and y:
         for i in x:
             for j in y:
-                c.execute('''insert into user_item values(:a,:b,:c)''', {
+                c.execute('''select exists(select * from user_item where user_id=:a and item_id=:b and type=:c)''', {
+                    'a': i[0], 'b': j[0], 'c': j[1]})
+                if c.fetchone() == (0,) and j[1] != 'character':
+                    c.execute('''insert into user_item values(:a,:b,:c,1)''', {
                         'a': i[0], 'b': j[0], 'c': j[1]})
 
     return
@@ -239,14 +248,14 @@ def unlock_all_user_item(c):
 def unlock_user_item(c, user_id):
     # 解锁用户购买
 
-    c.execute('''select item_id, type from item''')
+    c.execute('''select item_id, type from purchase_item''')
     y = c.fetchall()
 
     for j in y:
         c.execute('''select exists(select * from user_item where user_id=:a and item_id=:b and type=:c)''', {
             'a': user_id, 'b': j[0], 'c': j[1]})
-        if c.fetchone() == (0,):
+        if c.fetchone() == (0,) and j[1] != 'character':
-            c.execute('''insert into user_item values(:a,:b,:c)''', {
+            c.execute('''insert into user_item values(:a,:b,:c,1)''', {
                 'a': user_id, 'b': j[0], 'c': j[1]})
 
     return
@@ -293,7 +302,7 @@ def get_all_purchase():
                 items = []
                 if y:
                     for j in y:
-                        items.append({'item_id': j[1], 'type': j[2]})
+                        items.append({'item_id': j[1], 'type': j[2], 'amount':j[3]})
 
                 re.append({'purchase_name': i[0],
                            'price': i[1],
@@ -360,7 +369,7 @@ def update_all_save(c):
     return
 
 
-def add_one_present(present_id, expire_ts, description, items):
+def add_one_present(present_id, expire_ts, description, item_id, item_type, item_amount):
     # 添加一个奖励
 
     message = None
@@ -368,9 +377,16 @@ def add_one_present(present_id, expire_ts, description, items):
         c.execute(
             '''select exists(select * from present where present_id=:a)''', {'a': present_id})
         if c.fetchone() == (0,):
-            c.execute('''insert into present values(:a,:b,:c,:d)''', {
+            c.execute(
-                'a': present_id, 'b': expire_ts, 'c': items, 'd': description})
+                '''select exists(select * from item where item_id=? and type=?)''', (item_id, item_type))
+            if c.fetchone() == (1,):
+                c.execute('''insert into present values(:a,:b,:c)''', {
+                    'a': present_id, 'b': expire_ts, 'c': description})
+                c.execute('''insert into present_item values(?,?,?,?)''',
+                          (present_id, item_id, item_type, item_amount))
                 message = '添加成功 Successfully add it.'
+            else:
+                message = '物品不存在 The item does not exist.'
         else:
             message = '奖励已存在 The present exists.'
 
@@ -389,6 +405,8 @@ def delete_one_present(present_id):
                       {'a': present_id})
             c.execute('''delete from user_present where present_id =:a''', {
                 'a': present_id})
+            c.execute('''delete from present_item where present_id =:a''', {
+                'a': present_id})
             message = '删除成功 Successfully delete it.'
         else:
             message = '奖励不存在 The present does not exist.'
@@ -431,7 +449,7 @@ def deliver_all_user_present(c, present_id):
     return
 
 
-def add_one_redeem(code, redeem_type, items):
+def add_one_redeem(code, redeem_type, item_id, item_type, item_amount):
     # 添加一个兑换码
 
     message = None
@@ -439,28 +457,41 @@ def add_one_redeem(code, redeem_type, items):
         c.execute(
             '''select exists(select * from redeem where code=:a)''', {'a': code})
         if c.fetchone() == (0,):
-            c.execute('''insert into redeem values(:a,:b,:c)''', {
+            c.execute(
-                'a': code, 'b': items, 'c': redeem_type})
+                '''select exists(select * from item where item_id=? and type=?)''', (item_id, item_type))
+            if c.fetchone() == (1,):
+                c.execute('''insert into redeem values(:a,:c)''', {
+                    'a': code, 'c': redeem_type})
+                c.execute('''insert into redeem_item values(?,?,?,?)''',
+                          (code, item_id, item_type, item_amount))
                 message = '添加成功 Successfully add it.'
+            else:
+                message = '物品不存在 The item does not exist.'
         else:
             message = '兑换码已存在 The redeem code exists.'
 
     return message
 
 
-def add_some_random_redeem(amount, redeem_type, items):
+def add_some_random_redeem(amount, redeem_type, item_id, item_type, item_amount):
     # 随机生成一堆10位的兑换码
 
     message = None
     with Connect() as c:
+        c.execute(
+            '''select exists(select * from item where item_id=? and type=?)''', (item_id, item_type))
+        if c.fetchone() == (0,):
+            return '物品不存在 The item does not exist.'
         i = 1
         while i <= amount:
             code = random_str()
             c.execute(
                 '''select exists(select * from redeem where code=:a)''', {'a': code})
             if c.fetchone() == (0,):
-                c.execute('''insert into redeem values(:a,:b,:c)''',
+                c.execute('''insert into redeem values(:a,:c)''',
-                          {'a': code, 'b': items, 'c': redeem_type})
+                          {'a': code, 'c': redeem_type})
+                c.execute('''insert into redeem_item values(?,?,?,?)''',
+                          (code, item_id, item_type, item_amount))
                 i += 1
 
         message = '添加成功 Successfully add it.'
@@ -479,6 +510,8 @@ def delete_one_redeem(code):
             c.execute('''delete from redeem where code = :a''', {'a': code})
             c.execute(
                 '''delete from user_redeem where code =:a''', {'a': code})
+            c.execute(
+                '''delete from redeem_item where code =:a''', {'a': code})
             message = '删除成功 Successfully delete it.'
         else:
             message = '兑换码不存在 The redeem code does not exist.'