Skip to content

Commit 11be16f

Browse files
ParticleGParticleG
committed
- Update sources
1 parent 7695774 commit 11be16f

17 files changed

Lines changed: 267 additions & 181 deletions

File tree

‎index.html‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
11
<!doctype html>
22
<html>
3-
<head>
4-
<title><%= productName %></title>
3+
<head>
4+
<title><%= productName %></title>
55

6-
<meta charset="utf-8" />
7-
<meta name="description" content="<%= productDescription %>" />
8-
<meta name="format-detection" content="telephone=no" />
9-
<meta name="msapplication-tap-highlight" content="no" />
10-
<meta
11-
name="viewport"
12-
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
13-
/>
6+
<meta charset="utf-8" />
7+
<meta name="description" content="<%= productDescription %>" />
8+
<meta name="format-detection" content="telephone=no" />
9+
<meta name="msapplication-tap-highlight" content="no" />
10+
<meta
11+
name="viewport"
12+
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
13+
/>
1414

15-
<link
16-
href="icons/dark/appIcon-256.png"
17-
media="(prefers-color-scheme: dark)"
18-
rel="icon"
19-
sizes="256x256"
20-
type="image/png"
21-
/>
22-
<link
23-
href="icons/light/appIcon-256.png"
24-
media="(prefers-color-scheme: light)"
25-
rel="icon"
26-
sizes="256x256"
27-
type="image/png"
28-
/>
29-
<link
30-
href="icons/dark/appIcon-128.png"
31-
media="(prefers-color-scheme: dark)"
32-
rel="icon"
33-
sizes="128x128"
34-
type="image/png"
35-
/>
36-
<link
37-
href="icons/light/appIcon-128.png"
38-
media="(prefers-color-scheme: light)"
39-
rel="icon"
40-
sizes="128x128"
41-
type="image/png"
42-
/>
43-
<link
44-
href="icons/dark/appIcon-64.png"
45-
media="(prefers-color-scheme: dark)"
46-
rel="icon"
47-
sizes="64x64"
48-
type="image/png"
49-
/>
50-
<link
51-
href="icons/light/appIcon-64.png"
52-
media="(prefers-color-scheme: light)"
53-
rel="icon"
54-
sizes="64x64"
55-
type="image/png"
56-
/>
57-
<link
58-
href="icons/dark/appIcon-32.png"
59-
media="(prefers-color-scheme: dark)"
60-
rel="icon"
61-
sizes="32x32"
62-
type="image/png"
63-
/>
64-
<link
65-
href="icons/light/appIcon-32.png"
66-
media="(prefers-color-scheme: light)"
67-
rel="icon"
68-
sizes="32x32"
69-
type="image/png"
70-
/>
71-
<link
72-
href="favicons/dark.ico"
73-
media="(prefers-color-scheme: dark)"
74-
rel="icon"
75-
type="image/ico"
76-
/>
77-
<link
78-
href="favicons/light.ico"
79-
media="(prefers-color-scheme: light)"
80-
rel="icon"
81-
type="image/ico"
82-
/>
83-
</head>
84-
<body>
85-
<!-- quasar:entry-point -->
86-
</body>
15+
<link
16+
href="icons/dark/appIcon-256.png"
17+
media="(prefers-color-scheme: dark)"
18+
rel="icon"
19+
sizes="256x256"
20+
type="image/png"
21+
/>
22+
<link
23+
href="icons/light/appIcon-256.png"
24+
media="(prefers-color-scheme: light)"
25+
rel="icon"
26+
sizes="256x256"
27+
type="image/png"
28+
/>
29+
<link
30+
href="icons/dark/appIcon-128.png"
31+
media="(prefers-color-scheme: dark)"
32+
rel="icon"
33+
sizes="128x128"
34+
type="image/png"
35+
/>
36+
<link
37+
href="icons/light/appIcon-128.png"
38+
media="(prefers-color-scheme: light)"
39+
rel="icon"
40+
sizes="128x128"
41+
type="image/png"
42+
/>
43+
<link
44+
href="icons/dark/appIcon-64.png"
45+
media="(prefers-color-scheme: dark)"
46+
rel="icon"
47+
sizes="64x64"
48+
type="image/png"
49+
/>
50+
<link
51+
href="icons/light/appIcon-64.png"
52+
media="(prefers-color-scheme: light)"
53+
rel="icon"
54+
sizes="64x64"
55+
type="image/png"
56+
/>
57+
<link
58+
href="icons/dark/appIcon-32.png"
59+
media="(prefers-color-scheme: dark)"
60+
rel="icon"
61+
sizes="32x32"
62+
type="image/png"
63+
/>
64+
<link
65+
href="icons/light/appIcon-32.png"
66+
media="(prefers-color-scheme: light)"
67+
rel="icon"
68+
sizes="32x32"
69+
type="image/png"
70+
/>
71+
<link
72+
href="favicons/dark.ico"
73+
media="(prefers-color-scheme: dark)"
74+
rel="icon"
75+
type="image/ico"
76+
/>
77+
<link
78+
href="favicons/light.ico"
79+
media="(prefers-color-scheme: light)"
80+
rel="icon"
81+
type="image/ico"
82+
/>
83+
</head>
84+
<body>
85+
<!-- quasar:entry-point -->
86+
</body>
8787
</html>

‎quasar.config.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,31 @@ export default defineConfig((ctx) => {
207207

208208
builder: {
209209
appId: 'org.studio26f.maa-star-resonance',
210+
asarUnpack: [
211+
'**/node_modules/@maaxyz/maa-node/agent/**/*',
212+
'**/node_modules/@maaxyz/maa-node/dist/**/*.js',
213+
],
210214
win: {
215+
files: [
216+
'**/*',
217+
'!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}',
218+
'!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}',
219+
'!**/node_modules/*.d.ts',
220+
'!**/node_modules/.bin',
221+
'!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}',
222+
'!.editorconfig',
223+
'!**/._*',
224+
'!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}',
225+
'!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}',
226+
'!**/{appveyor.yml,.travis.yml,circle.yml}',
227+
'!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}',
228+
// MAA Node dependencies
229+
'!**/node_modules/@maaxyz/maa-node/scripts/**/*',
230+
'!**/node_modules/@maaxyz/maa-node/src/**/*',
231+
'!**/node_modules/@maaxyz/maa-node-darwin-*/*',
232+
'!**/node_modules/@maaxyz/maa-node-linux-*/*',
233+
'!**/node_modules/@maaxyz/maa-node-win32-arm64/*',
234+
],
211235
icon: 'assets/icons/icon.ico',
212236
publish: [
213237
{

‎src-electron/service/app/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export class AppService implements AppServiceTrait {
5555
app.focus();
5656
this._windowService.getWindow(WindowType.main).show();
5757
});
58+
app.on('window-all-closed', () => {});
5859
app.whenReady().then(
5960
async () => {
6061
await this._maaService.create();

‎src-electron/service/game/constants.ts‎

Lines changed: 69 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -59,74 +59,75 @@ export const SELF_PERMANENT_POSITIONS_MAP: Record<number, api.FlatRect[]> = {
5959
],
6060
};
6161

62-
export const SELF_HAND_POSITIONS_MAP: Record<number, { card: api.FlatRect; cost: api.FlatRect }[]> = {
63-
1: [
64-
{
65-
card: [660, 650, 1, 1],
66-
cost: [660, 650, 1, 1]
67-
},
68-
],
69-
2: [
70-
{ card: [600, 650, 1, 1],cost:[660, 650, 1, 1] },
71-
{ card: [720, 650, 1, 1],cost:[660, 650, 1, 1] }
72-
],
73-
3: [
74-
{ card: [520, 650, 1, 1],cost:[660, 650, 1, 1] },
75-
{ card: [660, 650, 1, 1],cost:[660, 650, 1, 1] },
76-
{ card: [800, 650, 1, 1],cost:[660, 650, 1, 1] }
77-
],
78-
4: [
79-
{ card: [450, 650, 1, 1],cost:[660, 650, 1, 1] },
80-
{ card: [590, 650, 1, 1],cost:[660, 650, 1, 1] },
81-
{ card: [730, 650, 1, 1],cost:[660, 650, 1, 1] },
82-
{ card: [870, 650, 1, 1],cost:[660, 650, 1, 1] },
83-
],
84-
5: [
85-
{ card: [380, 650, 1, 1],cost:[660, 650, 1, 1] },
86-
{ card: [520, 650, 1, 1],cost:[660, 650, 1, 1] },
87-
{ card: [660, 650, 1, 1],cost:[660, 650, 1, 1] },
88-
{ card: [800, 650, 1, 1],cost:[660, 650, 1, 1] },
89-
{ card: [940, 650, 1, 1],cost:[660, 650, 1, 1] },
90-
],
91-
6: [
92-
{ card: [360, 650, 1, 1],cost:[660, 650, 1, 1] },
93-
{ card: [480, 650, 1, 1],cost:[660, 650, 1, 1] },
94-
{ card: [600, 650, 1, 1],cost:[660, 650, 1, 1] },
95-
{ card: [720, 650, 1, 1],cost:[660, 650, 1, 1] },
96-
{ card: [840, 650, 1, 1],cost:[660, 650, 1, 1] },
97-
{ card: [960, 650, 1, 1],cost:[660, 650, 1, 1] },
98-
],
99-
7: [
100-
{ card: [345, 650, 1, 1],cost:[660, 650, 1, 1] },
101-
{ card: [450, 650, 1, 1],cost:[660, 650, 1, 1] },
102-
{ card: [555, 650, 1, 1],cost:[660, 650, 1, 1] },
103-
{ card: [660, 650, 1, 1],cost:[660, 650, 1, 1] },
104-
{ card: [765, 650, 1, 1],cost:[660, 650, 1, 1] },
105-
{ card: [870, 650, 1, 1],cost:[660, 650, 1, 1] },
106-
{ card: [975, 650, 1, 1],cost:[660, 650, 1, 1] },
107-
],
108-
8: [
109-
{ card: [310, 650, 1, 1],cost:[660, 650, 1, 1] },
110-
{ card: [405, 650, 1, 1],cost:[660, 650, 1, 1] },
111-
{ card: [500, 650, 1, 1],cost:[660, 650, 1, 1] },
112-
{ card: [595, 650, 1, 1],cost:[660, 650, 1, 1] },
113-
{ card: [690, 650, 1, 1],cost:[660, 650, 1, 1] },
114-
{ card: [785, 650, 1, 1],cost:[660, 650, 1, 1] },
115-
{ card: [880, 650, 1, 1],cost:[660, 650, 1, 1] },
116-
{ card: [975, 650, 1, 1],cost:[660, 650, 1, 1] },
117-
],
118-
9: [
119-
{ card: [295, 650, 1, 1],cost:[660, 650, 1, 1] },
120-
{ card: [375, 650, 1, 1],cost:[660, 650, 1, 1] },
121-
{ card: [460, 650, 1, 1],cost:[660, 650, 1, 1] },
122-
{ card: [545, 650, 1, 1],cost:[660, 650, 1, 1] },
123-
{ card: [630, 650, 1, 1],cost:[660, 650, 1, 1] },
124-
{ card: [715, 650, 1, 1],cost:[660, 650, 1, 1] },
125-
{ card: [800, 650, 1, 1],cost:[660, 650, 1, 1] },
126-
{ card: [885, 650, 1, 1],cost:[660, 650, 1, 1] },
127-
{ card: [970, 650, 1, 1],cost:[660, 650, 1, 1] },
128-
],
129-
};
62+
export const SELF_HAND_POSITIONS_MAP: Record<number, { card: api.FlatRect; cost: api.FlatRect }[]> =
63+
{
64+
1: [
65+
{
66+
card: [660, 650, 1, 1],
67+
cost: [660, 650, 1, 1],
68+
},
69+
],
70+
2: [
71+
{ card: [600, 650, 1, 1], cost: [660, 650, 1, 1] },
72+
{ card: [720, 650, 1, 1], cost: [660, 650, 1, 1] },
73+
],
74+
3: [
75+
{ card: [520, 650, 1, 1], cost: [660, 650, 1, 1] },
76+
{ card: [660, 650, 1, 1], cost: [660, 650, 1, 1] },
77+
{ card: [800, 650, 1, 1], cost: [660, 650, 1, 1] },
78+
],
79+
4: [
80+
{ card: [450, 650, 1, 1], cost: [660, 650, 1, 1] },
81+
{ card: [590, 650, 1, 1], cost: [660, 650, 1, 1] },
82+
{ card: [730, 650, 1, 1], cost: [660, 650, 1, 1] },
83+
{ card: [870, 650, 1, 1], cost: [660, 650, 1, 1] },
84+
],
85+
5: [
86+
{ card: [380, 650, 1, 1], cost: [660, 650, 1, 1] },
87+
{ card: [520, 650, 1, 1], cost: [660, 650, 1, 1] },
88+
{ card: [660, 650, 1, 1], cost: [660, 650, 1, 1] },
89+
{ card: [800, 650, 1, 1], cost: [660, 650, 1, 1] },
90+
{ card: [940, 650, 1, 1], cost: [660, 650, 1, 1] },
91+
],
92+
6: [
93+
{ card: [360, 650, 1, 1], cost: [660, 650, 1, 1] },
94+
{ card: [480, 650, 1, 1], cost: [660, 650, 1, 1] },
95+
{ card: [600, 650, 1, 1], cost: [660, 650, 1, 1] },
96+
{ card: [720, 650, 1, 1], cost: [660, 650, 1, 1] },
97+
{ card: [840, 650, 1, 1], cost: [660, 650, 1, 1] },
98+
{ card: [960, 650, 1, 1], cost: [660, 650, 1, 1] },
99+
],
100+
7: [
101+
{ card: [345, 650, 1, 1], cost: [660, 650, 1, 1] },
102+
{ card: [450, 650, 1, 1], cost: [660, 650, 1, 1] },
103+
{ card: [555, 650, 1, 1], cost: [660, 650, 1, 1] },
104+
{ card: [660, 650, 1, 1], cost: [660, 650, 1, 1] },
105+
{ card: [765, 650, 1, 1], cost: [660, 650, 1, 1] },
106+
{ card: [870, 650, 1, 1], cost: [660, 650, 1, 1] },
107+
{ card: [975, 650, 1, 1], cost: [660, 650, 1, 1] },
108+
],
109+
8: [
110+
{ card: [310, 650, 1, 1], cost: [660, 650, 1, 1] },
111+
{ card: [405, 650, 1, 1], cost: [660, 650, 1, 1] },
112+
{ card: [500, 650, 1, 1], cost: [660, 650, 1, 1] },
113+
{ card: [595, 650, 1, 1], cost: [660, 650, 1, 1] },
114+
{ card: [690, 650, 1, 1], cost: [660, 650, 1, 1] },
115+
{ card: [785, 650, 1, 1], cost: [660, 650, 1, 1] },
116+
{ card: [880, 650, 1, 1], cost: [660, 650, 1, 1] },
117+
{ card: [975, 650, 1, 1], cost: [660, 650, 1, 1] },
118+
],
119+
9: [
120+
{ card: [295, 650, 1, 1], cost: [660, 650, 1, 1] },
121+
{ card: [375, 650, 1, 1], cost: [660, 650, 1, 1] },
122+
{ card: [460, 650, 1, 1], cost: [660, 650, 1, 1] },
123+
{ card: [545, 650, 1, 1], cost: [660, 650, 1, 1] },
124+
{ card: [630, 650, 1, 1], cost: [660, 650, 1, 1] },
125+
{ card: [715, 650, 1, 1], cost: [660, 650, 1, 1] },
126+
{ card: [800, 650, 1, 1], cost: [660, 650, 1, 1] },
127+
{ card: [885, 650, 1, 1], cost: [660, 650, 1, 1] },
128+
{ card: [970, 650, 1, 1], cost: [660, 650, 1, 1] },
129+
],
130+
};
130131

131132
export const SELF_HAND_COST_POSITIONS_MAP: Record<number, api.FlatRect[]> = {
132133
1: [[660, 650, 1, 1]],

‎src-electron/service/game/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import type { api } from '@maaxyz/maa-node';
22

3-
export type RecognizerResult = Promise<[out_box: api.Rect, out_detail: string] | null>
3+
export type RecognizerResult = Promise<[out_box: api.Rect, out_detail: string] | null>;

‎src-electron/service/game/utils/actions/common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const clickByFlatRect = async (
99
return await runCustomAction(context, {
1010
GameServiceClick: {
1111
action: 'Click',
12-
target: flatRect
12+
target: flatRect,
1313
},
1414
});
1515
};

‎src-electron/service/tray/index.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { inject, injectable } from 'inversify';
2-
import { Menu, MenuItemConstructorOptions, nativeImage, Tray } from 'electron';
2+
import { app, Menu, MenuItemConstructorOptions, nativeImage, Tray } from 'electron';
33
import { fileURLToPath } from 'node:url';
44
import { resolve } from 'path';
55

@@ -50,6 +50,11 @@ export class TrayService implements TrayServiceTrait {
5050
]),
5151
);
5252
this._tray.setToolTip(`${packageJson.productName} v${packageJson.version}`);
53+
this.registerMenuEntry(MenuEntry.Quit, () => app.quit());
54+
}
55+
56+
registerMenuEntry(entry: MenuEntry, callback: () => void) {
57+
this._menuEntryMap.set(entry, callback);
5358
}
5459

5560
private _createNormalItem(menuEntry: MenuEntry, label: string): MenuItemConstructorOptions {

0 commit comments

Comments
 (0)