Merge branch 'main' into 28060

This commit is contained in:
手瓜一十雪
2024-09-16 18:52:32 +08:00
14 changed files with 65 additions and 11 deletions

View File

@@ -163,8 +163,17 @@ export function isEqual(obj1: any, obj2: any) {
export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
if (os.platform() === 'linux') {
return {
baseVersion: '3.2.12-27597',
curVersion: '3.2.12-27597',
baseVersion: '3.2.12.27254',
curVersion: '3.2.12.27254',
prevVersion: '',
onErrorVersions: [],
buildId: '27254',
};
}
if (os.platform() === 'darwin') {
return {
baseVersion: '6.9.53.27597',
curVersion: '6.9.53.27597',
prevVersion: '',
onErrorVersions: [],
buildId: '27597',

View File

@@ -61,6 +61,12 @@ export class QQBasicInfoWrapper {
return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
default:
return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
case 'linux':
return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
case 'darwin':
return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
default:
return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
}
}

View File

@@ -1 +1 @@
export const napCatVersion = '2.5.1';
export const napCatVersion = '2.5.3';