From 13048e57f4b00f100076548f2982b53c30218b11 Mon Sep 17 00:00:00 2001 From: Lost-MSth Date: Thu, 30 Sep 2021 19:02:10 +0800 Subject: [PATCH] Update to v2.6.5 without release - Change something to make that purchase things can have some cores. - Fix the download link of Arcaea client in README > This is a small update. --- README.md | 4 +- latest version/database/arcsong.db | Bin 139264 -> 139264 bytes .../database/database_initialize.py | 20 +- latest version/database/packs.json | 127 +- latest version/database/singles.json | 1209 ++++++++++------- latest version/server/arcpurchase.py | 40 +- latest version/server/arcworld.py | 9 +- latest version/setting.py | 2 +- latest version/templates/web/allpurchase.html | 4 + .../templates/web/changepurchaseitem.html | 4 + latest version/web/index.py | 5 +- latest version/web/system.py | 2 +- 12 files changed, 935 insertions(+), 491 deletions(-) diff --git a/README.md b/README.md index fa0e311..52a02f1 100644 --- a/README.md +++ b/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](https://arcaea.lowiro.com/zh) +> Konmai下载站因不可抗力关闭,请从官方网站下载 +> Konmai download website is closed due to force majeure. Please download it from the official website. ## 更新日志 Update log 只保留最新版本 Only keep the latest version. diff --git a/latest version/database/arcsong.db b/latest version/database/arcsong.db index 274f905f31114fc7921430524bcde03c8016e8d1..6b4a5dd25c2ffea29c41f8c5d76b3e32c3f51ed0 100644 GIT binary patch delta 814 zcmZoTz|nAkV}dl}jfpbOj5it+wk9wxe6PyF&%n=Y#K1F|UzksWx1Ljk`#Lv2n+fM$ z4hi-QW+N7R))ubpjg36aJdKf!Icmn{yuwV9veWA}Fp5pD`pW3cSUr93SH|*smgfux zYPz~0Sz!)N7GZHwMkF9EE-uXr1VCCmC$YFBHLp>nF;`7i8?2rQs9qGVo{5QxQC?de zq#Ue1JvA>qF~2I`T_IH=Pa$0)Q6XQUN+I9S)Rf2t!#n*y2cO7)CKu*3R?q+O3IPg^3c(5?AV!daE0F1`;0NNmDTFG705MQ-`bI}a zk$ScV40CaLg^3Z5E#BLDxh?ELSSSyGe_CZ>B=F>+0R<-l)@3tzJz)l;`1HAd8F>QI z^K(*C^NMp4OVcw-Qj1cHFa!*ZjTu_ub~5Y$+S-V0tA=CZe-0ku|I7)@1+040>kcz2 zO&9scD7xMB8>2A`7n_=Tqe5do(ElJ?#bTMr_b=FP6dxsdCrUESX9ECQrSq!* delta 210 zcmV;@04@K3zzBfA2#^~AzmXh60l$G@wO|3E?;i%>01O3K01T546Ama1e+d)|*9#8@ zGzq;37zbztSh0aP1r32%fovu-Hw_a48660hKl1@tmzeVbcegb50W<^(swO8t4HE(v zDF~NA_5oX$p7sGkw-5UP^#lQSl?4L2lf6(j15OD@3H0OkUg03va9 zZ*F&CV`E_e{{x['type']}}
+ Amount: + {{x['amount']}} +
+ {% if not loop.last %} diff --git a/latest version/templates/web/changepurchaseitem.html b/latest version/templates/web/changepurchaseitem.html index b5ed66a..496380e 100644 --- a/latest version/templates/web/changepurchaseitem.html +++ b/latest version/templates/web/changepurchaseitem.html @@ -17,8 +17,11 @@ + + +
@@ -36,6 +39,7 @@ +
diff --git a/latest version/web/index.py b/latest version/web/index.py index 4e2e7b0..4d82291 100644 --- a/latest version/web/index.py +++ b/latest version/web/index.py @@ -847,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) @@ -862,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(?,?,?)''', - (purchase_name, item_id, item_type)) + c.execute('''insert into purchase_item values(?,?,?,?)''', + (purchase_name, item_id, item_type, amount)) flash('''购买项目的物品添加成功 Successfully add the purchase's item.''') else: error = '''物品不存在 The item does not exist.''' diff --git a/latest version/web/system.py b/latest version/web/system.py index b868e39..91405bb 100644 --- a/latest version/web/system.py +++ b/latest version/web/system.py @@ -301,7 +301,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],