juan/japanese-drum-game
1
0
Fork 0
mirror of https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git synced 2024-11-15 07:21:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

reintroduced infoFill, moved infoFill to mongo

Browse Source
This commit is contained in:
mnvdk 2020-04-17 18:35:39 +02:00
parent d02bfa8426
commit dca4948548
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/js/loader.js
View File

@ -109,7 +109,7 @@ class Loader{
assets.categories = JSON.parse(categories) assets.categories = JSON.parse(categories)
assets.categories.forEach(cat => { assets.categories.forEach(cat => {
let title = cat.title let title = cat.title
translations.categories[title] = cat.title_lang translations.categories[title] = cat.title_lang
}); });
separateStrings() //load categories into strings.js to handle multi language separateStrings() //load categories into strings.js to handle multi language
assets.categories.push({ assets.categories.push({
@ -117,7 +117,8 @@ class Loader{
songSkin: { songSkin: {
background: "#ececec", background: "#ececec",
border: ["#fbfbfb", "#8b8b8b"], border: ["#fbfbfb", "#8b8b8b"],
outline: "#656565" outline: "#656565",
infoFill: "#656565"
} }
}) })
}), "/api/categories") }), "/api/categories")

8
public/src/js/view.js
View File

@ -295,10 +295,12 @@
var _h = 22 var _h = 22
var _x = 628 - _w var _x = 628 - _w
var _y = 88 - _h var _y = 88 - _h
if(assets.categories.find(cat=>cat.title == selectedSong.category)){
ctx.fillStyle = assets.categories.find(cat=>cat.title == selectedSong.category).songSkin.outline let category = assets.categories.find(cat=>cat.title == selectedSong.category)
if(category != null && category.songSkin != null && category.songSkin.infoFill != null){
ctx.fillStyle = assets.categories.find(cat=>cat.title == selectedSong.category).songSkin.infoFill
}else{ }else{
ctx.fillStyle = assets.categories.find(cat=>cat.title == 'default').songSkin.outline ctx.fillStyle = assets.categories.find(cat=>cat.title == 'default').songSkin.infoFill
} }
this.draw.roundedRect({ this.draw.roundedRect({
ctx: ctx, ctx: ctx,