Merge remote-tracking branch 'original/main'

This commit is contained in:
Maroxy 2021-10-24 19:46:08 +02:00
commit bbcddd099b
10 changed files with 18 additions and 14 deletions

3
.gitignore vendored
View file

@ -5,4 +5,5 @@ yarn.lock
wineprefix-installation.log
public/css/index.css
public/css/settings.css
public/js
public/js
repository-pics/logo.xcf

View file

@ -1,4 +1,4 @@
<img src="repository-pics/logo.png">
<img src="repository-pics/logo.jpg">
<img src="repository-pics/launcher-main.png">
@ -10,7 +10,7 @@
| Game version | Launcher version | Patch version |
| :---: | :---: | :---: |
| 2.2.0 | 2.2.0-beta6 ⚠️ | 2.2.0-stable ✅ |
| 2.2.0 | 2.2.0-beta7 ⚠️ | 2.2.0-stable ✅ |
Download from [Releases](https://notabug.org/nobody/an-anime-game-launcher/releases)

View file

@ -1,6 +1,6 @@
{
"name": "an-anime-game-linux-launcher",
"version": "2.2.0-beta6",
"version": "2.2.0-beta7",
"description": "An Anime Game Linux Launcher",
"author": "Nikita Podvirnyy <suimin.tu.mu.ga.mi@gmail.com>",
"contributors": [

Binary file not shown.

Before

Width:  |  Height:  |  Size: 673 KiB

After

Width:  |  Height:  |  Size: 670 KiB

BIN
repository-pics/logo.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

View file

@ -70,6 +70,9 @@ body
font-size: 18px
cursor: pointer
&:hover
background-color: #eff2ff
> div
width: auto
height: 52px
@ -86,10 +89,9 @@ body
margin: auto
.list-item:hover,
.list-item-active
background-color: #eff2ff
color: #657ef8
background-color: #657ef8 !important
color: white !important
.list-item-disabled
background-color: #f1f4f9 !important
@ -169,8 +171,9 @@ body
.select-options
position: absolute
display: none
overflow: auto
height: 230px
overflow: auto
background-color: white
border-radius: 12px

View file

@ -69,24 +69,24 @@ export class Genshinlib
public static getRunners (): Promise<[{ title: string, runners: Runner[] }]>
{
return new Promise((resolve, reject) => {
/*return new Promise((resolve, reject) => {
fetch(this.runnersUri)
.then(response => response.json())
.then(runners => resolve(runners));
});
});*/
// return JSON.parse(fs.readFileSync(path.join(__dirname, '..', '..', 'runners.json')));
return new Promise(resolve => resolve(JSON.parse(fs.readFileSync(path.join(path.dirname(__dirname), '..', 'runners.json')))));
}
public static getDXVKs (): Promise<DXVK[]>
{
return new Promise((resolve, reject) => {
/*return new Promise((resolve, reject) => {
fetch(this.dxvksUri)
.then(response => response.json())
.then(dxvks => resolve(dxvks));
});
});*/
// return new Promise(resolve => resolve(JSON.parse(fs.readFileSync(path.join(__dirname, '..', '..', 'dxvks.json')))));
return new Promise(resolve => resolve(JSON.parse(fs.readFileSync(path.join(path.dirname(__dirname), '..', 'dxvks.json')))));
}
public static getConfig (property: string|null = null): any