Update README.md

Add character values.
Do something about #16.
Fix a problem about relative path.

README.md

@@ -39,7 +39,6 @@ This procedure is mainly used for study and research, and shall not be used for
 - 服务器日志 Server log
 
 没有以下 We don't have：
-- 角色数值 Character characteristic value
 - 服务器安全性保证 Server security assurance
 
 可能有问题 There may be problems：
@@ -64,12 +63,11 @@ 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.3
+### Version 2.3.1
-- 适用于Arcaea 3.5.2版本 For Arcaea 3.5.2
+- **不**适用于Arcaea 3.5.3版本 **Not** for Arcaea 3.5.3
-- 更新了歌曲数据库 Update the song database.
+- **新增**了一些Bug **Add** some bugs.
-- 新增服务器日志 Add server log.
+
-- 优化了代码结构 Optimize the code structure.
+> Happy April Fool's Day!
-- 修复了一些Bug，提升服务器安全性 Fix some bugs and improve server security.
 
 
 ## 运行环境与依赖 Running environment and requirements
@@ -78,6 +76,7 @@ It is just so interesting. What it can do is under exploration.
 - Flask module
 - Charles (optional)
 
+<!--
 ## 环境搭建 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)
@@ -89,6 +88,7 @@ It is just so interesting. What it can do is under exploration.
 ## 注意 Attentions
 [中文](https://github.com/Lost-MSth/Arcaea-server/wiki/%E6%B3%A8%E6%84%8F)  
 [English](https://github.com/Lost-MSth/Arcaea-server/wiki/Attentions)
+-->
 
 ## 鸣谢 Thanks
 歌曲数据库来自 Using song database from

latest version/database/database_initialize.py

@@ -244,16 +244,36 @@ skill_id = ['gauge_easy', '', '', '', 'note_mirror', '', '', 'gauge_hard', 'frag
 skill_id_uncap = ['', '', 'frags_kou', '', 'visual_ink', '', '', '', '', '', '', '', '', 'shirabe_entry_fee',
                   '', '', '', '', '', '', '', 'frags_yume', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']
 
+frag = [88, 90, 100, 75, 80, 0, 70, 79, 65, 40, 50, 80, 90, 92, 0, 61, 67, 92, 85, 50, 86, 62,
+        65, 85, 67, 88, 74, 0.5, 105, 80, 95, 50, 80, 87, 71, 50, 95, 0, 80, 75, 50, 70, 80, 100, 65]
+
+prog = [71, 90, 80, 75, 100, 0, 90, 102, 84, 78, 105, 67, 63, 78, 0, 99, 80, 66, 46, 83, 40, 83,
+        80, 90, 93, 50, 96, 88, 99, 108, 75, 80, 50, 64, 55, 100, 100, 110, 80, 50, 74, 90, 80, 80, 56]
+
+overdrive = [71, 90, 57, 75, 80, 0, 95, 79, 65, 31, 50, 59, 90, 68, 0, 78, 50, 70, 62, 49, 64,
+             56, 73, 95, 67, 84, 80, 88, 79, 80, 50, 80, 80, 63, 25, 50, 82, 55, 50, 95, 55, 70, 100, 80, 90]
+
+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]
+
+print(len(char))
+print(len(skill_id))
+print(len(skill_id_uncap))
+print(len(frag))
+print(len(prog))
+print(len(overdrive))
+print(len(char_type))
+
 for i in range(0, 45):
     if i in [0, 1, 2, 4, 13, 26, 27, 28, 29, 36, 21, 42, 43]:
-        sql = 'insert into character values('+str(
+        sql = '''insert into character values(:a,:b,30,25000,25000,:c,:d,:e,:f,0,0,:g,:h,'',1,1)'''
-            i)+',"'+char[i]+'''",30,25000,25000,90,90,90,"'''+skill_id[i]+'''",0,0,"'''+skill_id_uncap[i]+'''",0,'',1,1)'''
+        c.execute(sql, {'a': i, 'b': char[i], 'c': frag[i], 'd': prog[i],
-        c.execute(sql)
+                        'e': overdrive[i], 'f': skill_id[i], 'g': skill_id_uncap[i], 'h': char_type[i]})
     else:
         if i != 5:
-            sql = 'insert into character values('+str(
+            sql = '''insert into character values(:a,:b,20,10000,10000,:c,:d,:e,:f,0,0,:g,:h,'',0,0)'''
-                i)+',"'+char[i]+'''",30,25000,25000,90,90,90,"'''+skill_id[i]+'''",0,0,"'''+skill_id_uncap[i]+'''",0,'',0,0)'''
+            c.execute(sql, {'a': i, 'b': char[i], 'c': frag[i], 'd': prog[i],
-            c.execute(sql)
+                            'e': overdrive[i], 'f': skill_id[i], 'g': skill_id_uncap[i], 'h': char_type[i]})
 
 
 def b2int(x):

latest version/log/error.log

@@ -1 +0,0 @@
-

latest version/main.py

@@ -14,6 +14,7 @@ import server.arcworld
 import server.arcdownload
 import server.arcpurchase
 import os
+import sys
 
 
 app = Flask(__name__)
@@ -89,7 +90,11 @@ def login():
     id_pwd = headers['Authorization']
     id_pwd = base64.b64decode(id_pwd[6:]).decode()
     name, password = id_pwd.split(':', 1)
-    device_id = headers['DeviceId']
+    if 'DeviceId' in headers:
+        device_id = headers['DeviceId']
+    else:
+        device_id = 'low_version'
+
     token, error_code = server.auth.arc_login(name, password, device_id)
     if not error_code:
         r = {"success": True, "token_type": "Bearer"}
@@ -103,7 +108,11 @@ def login():
 def register():
     name = request.form['name']
     password = request.form['password']
-    device_id = request.form['device_id']
+    if 'device_id' in request.form:
+        device_id = request.form['device_id']
+    else:
+        device_id = 'low_version'
+
     user_id, token, error_code = server.auth.arc_register(
         name, password, device_id)
     if user_id is not None:
@@ -513,6 +522,7 @@ def sys_set(user_id, path):
 
 
 def main():
+    os.chdir(sys.path[0])  # 更改工作路径，以便于愉快使用相对路径
     app.config.from_mapping(SECRET_KEY=Config.SECRET_KEY)
     app.config['SESSION_TYPE'] = 'filesystem'
     app.register_blueprint(web.login.bp)

latest version/server/auth.py

@@ -111,9 +111,9 @@ def arc_register(name: str, password: str, device_id: str):  # 注册
             user_id = build_user_id(c)
             now = int(time.time() * 1000)
             c.execute('''insert into user(user_id, name, password, join_date, user_code, rating_ptt, 
-            character_id, is_skill_sealed, is_char_uncapped, is_char_uncapped_override, is_hide_rating, favorite_character, max_stamina_notification_enabled, current_map, ticket)
+            character_id, is_skill_sealed, is_char_uncapped, is_char_uncapped_override, is_hide_rating, favorite_character, max_stamina_notification_enabled, current_map, ticket, prog_boost)
-            values(:user_id, :name, :password, :join_date, :user_code, 0, 0, 0, 0, 0, 0, -1, 0, '', 0)
+            values(:user_id, :name, :password, :join_date, :user_code, 0, 0, 0, 0, 0, 0, -1, 0, '', :memories, 0)
-            ''', {'user_code': user_code, 'user_id': user_id, 'join_date': now, 'name': name, 'password': hash_pwd})
+            ''', {'user_code': user_code, 'user_id': user_id, 'join_date': now, 'name': name, 'password': hash_pwd, 'memories': Config.DEFAULT_MEMORIES})
             c.execute('''insert into recent30(user_id) values(:user_id)''', {
                 'user_id': user_id})
 

latest version/server/info.py

@@ -2,6 +2,7 @@ from server.sql import Connect
 import server.arcworld
 import server.arcpurchase
 import time
+from setting import Config
 
 
 def int2b(x):
@@ -174,7 +175,7 @@ def get_value_0(c, user_id):
         if x[27] and x[27] != 0:
             prog_boost = 300
 
-        r = {"is_aprilfools": False,
+        r = {"is_aprilfools": Config.IS_APRILFOOLS,
              "curr_available_maps": [],
              "character_stats": user_character,
              "friends": get_user_friend(c, user_id),

latest version/setting.py

@@ -8,12 +8,22 @@ class Config():
     主机的地址和端口号
     Host and port of your server
     '''
-    HOST = '192.168.1.105'
+    HOST = '192.168.1.101'
     PORT = '80'
     '''
     --------------------
     '''
 
+    '''
+    --------------------
+    愚人节模式开关
+    Switch of April Fool's Day
+    '''
+    IS_APRILFOOLS = True
+    '''
+    --------------------
+    '''
+
     '''
     --------------------
     Web后台管理页面的用户名和密码
@@ -75,3 +85,13 @@ class Config():
     '''
     --------------------
     '''
+
+    '''
+    --------------------
+    用户注册时的默认记忆源点数量
+    The default amount of memories at the time of user registration
+    '''
+    DEFAULT_MEMORIES = 0
+    '''
+    --------------------
+    '''