mirror of
https://github.com/Lost-MSth/Arcaea-server.git
synced 2026-02-08 08:47:32 +08:00
Update to v2.6.2
This commit is contained in:
Lost-MSth
@@ -1005,12 +1005,12 @@ def arc_all_get(user_id):
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "ouroboros|2|0",
|
||||
"unlock_key": "tiemedowngently|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "tiemedowngently|1|0",
|
||||
"complete": 1
|
||||
"unlock_key": "tempestissimo|2|101",
|
||||
"complete": 100
|
||||
},
|
||||
{
|
||||
"unlock_key": "aegleseeker|2|3|crystalgravity|2",
|
||||
@@ -1165,7 +1165,11 @@ def arc_all_get(user_id):
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "pragmatism|2|0",
|
||||
"unlock_key": "tiemedowngently|1|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "ouroboros|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
@@ -1232,6 +1236,10 @@ 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
|
||||
@@ -1256,10 +1264,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
|
||||
@@ -1296,14 +1300,6 @@ def arc_all_get(user_id):
|
||||
"unlock_key": "jump|1|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "dandelion|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "infinityheaven|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "grievouslady|1|101",
|
||||
"complete": 100
|
||||
@@ -1324,6 +1320,10 @@ def arc_all_get(user_id):
|
||||
"unlock_key": "ignotus|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "ignotus|1|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "nhelv|1|0",
|
||||
"complete": 1
|
||||
@@ -1336,10 +1336,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
|
||||
@@ -1404,6 +1400,22 @@ def arc_all_get(user_id):
|
||||
"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
|
||||
@@ -1444,10 +1456,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
|
||||
@@ -1502,16 +1510,8 @@ def arc_all_get(user_id):
|
||||
},
|
||||
{
|
||||
"unlock_key": "equilibrium_challenge|2|102",
|
||||
"complete": -1
|
||||
},
|
||||
{
|
||||
"unlock_key": "cyanine|1|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "tempestissimo|3|101",
|
||||
"complete": 100
|
||||
},
|
||||
{
|
||||
"unlock_key": "overwhelm|2|0",
|
||||
"complete": 1
|
||||
@@ -1526,7 +1526,7 @@ def arc_all_get(user_id):
|
||||
},
|
||||
{
|
||||
"unlock_key": "equilibrium_challenge|1|102",
|
||||
"complete": -1
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "aterlbus|2|0",
|
||||
@@ -1548,6 +1548,14 @@ def arc_all_get(user_id):
|
||||
"unlock_key": "goodtek|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "infinityheaven|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "dandelion|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "blrink|2|0",
|
||||
"complete": 1
|
||||
@@ -1580,10 +1588,6 @@ def arc_all_get(user_id):
|
||||
"unlock_key": "conflict|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "ignotus|1|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "monochromeprincess|1|0",
|
||||
"complete": 1
|
||||
@@ -1652,18 +1656,26 @@ 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|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
|
||||
@@ -1692,6 +1704,30 @@ def arc_all_get(user_id):
|
||||
"unlock_key": "corpssansorganes|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "tempestissimo|1|101",
|
||||
"complete": 100
|
||||
},
|
||||
{
|
||||
"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": "snowwhite|1|0",
|
||||
"complete": 1
|
||||
@@ -1704,26 +1740,6 @@ def arc_all_get(user_id):
|
||||
"unlock_key": "jump|2|0",
|
||||
"complete": 1
|
||||
},
|
||||
{
|
||||
"unlock_key": "tempestissimo|1|101",
|
||||
"complete": 100
|
||||
},
|
||||
{
|
||||
"unlock_key": "conflict|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": "saikyostronger|2|3|izana|2",
|
||||
"complete": 1
|
||||
|
||||
@@ -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:
|
||||
where_field.append(i)
|
||||
where_value.append(query[i])
|
||||
if query:
|
||||
for i in query.query:
|
||||
where_field.append(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:
|
||||
sql += ' order by ' + sort[0]['column'] + ' ' + sort[0]['order']
|
||||
if len(sort) >= 2:
|
||||
for i in range(1, len(sort)):
|
||||
sql += ', ' + sort[i]['column'] + ' ' + sort[i]['order']
|
||||
if query and query.sort:
|
||||
sql += ' order by ' + \
|
||||
query.sort[0]['column'] + ' ' + query.sort[0]['order']
|
||||
for i in range(1, len(query.sort)):
|
||||
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['offset'] = offset
|
||||
sql_dict['limit'] = query.limit
|
||||
sql_dict['offset'] = query.offset
|
||||
|
||||
c.execute(sql, sql_dict)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user