Compare commits
6 Commits
8672693c33
...
dc8831aad2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc8831aad2 | ||
|
|
d86106ac00 | ||
|
|
77058594ec | ||
|
|
fb3860edaa | ||
|
|
06ff6351a2 | ||
|
|
bf79ec2c62 |
4
.github/workflows/build.yml
vendored
@ -562,8 +562,8 @@ jobs:
|
||||
- name: Submit to Winget
|
||||
uses: vedantmgoyal9/winget-releaser@main
|
||||
with:
|
||||
identifier: Mihomo-Party.Mihomo-Party
|
||||
identifier: Mihomo-Party.Clash-Party
|
||||
version: ${{env.VERSION}}
|
||||
release-tag: v${{env.VERSION}}
|
||||
installers-regex: 'mihomo-party-windows-.*setup\.exe$'
|
||||
installers-regex: 'clash-party-windows-.*setup\.exe$'
|
||||
token: ${{ secrets.POMPURIN404_TOKEN }}
|
||||
|
||||
24
changelog.md
@ -1,10 +1,22 @@
|
||||
## 1.8.6-dev
|
||||
|
||||
**本次更新修改了软件名称,可能导致不可预期的 BUG,请大家积极反馈**
|
||||
|
||||
### 新功能 (Feat)
|
||||
- 增加硬件加速开关,解决某些显卡驱动问题导致的渲染异常或崩溃
|
||||
- 添加回环IPv6地址无需验证
|
||||
- 增加切换代理图标变化的开关
|
||||
- 修改软件名称为 Clash Party
|
||||
- 全新设计的 Logo
|
||||
- Mihomo(Meta)内核更新至 v1.19.13
|
||||
|
||||
### 修复 (Fix)
|
||||
- 修复windows 下以非管理员模式启动后,无法自动更新的权限问题
|
||||
- 修复 icon 切换时的重复创建问题
|
||||
- 修复UWPTool没有权限的问题
|
||||
|
||||
### 样式调整 (Sytle)
|
||||
- DNS 设置部分样式微调
|
||||
|
||||
## 1.8.5
|
||||
|
||||
@ -31,15 +43,3 @@
|
||||
|
||||
### 样式调整 (Sytle)
|
||||
- 部分样式微调
|
||||
## 1.8.4
|
||||
|
||||
### 新功能 (Feat)
|
||||
- 如果当前没有以管理员模式运行,TUN 开关保持关闭
|
||||
- 区分 app 日志与 core 日志输出为不同文件
|
||||
- 完善内核权限鉴别,上一个内核以管理员模式启动的时候,弹出提示
|
||||
- 修改 MacOS 默认虚拟网卡名称为 utun1500,可自定义
|
||||
|
||||
### 修复 (Fix)
|
||||
- 修复某些系统下的悬浮窗开启崩溃的问题(开启兼容模式=关闭硬件加速)
|
||||
- 开机自启在非管理员模式下报错的问题
|
||||
- 解决某些 macos 系统下无法开启虚拟网卡的问题(tun device名称冲突)
|
||||
@ -27,9 +27,9 @@ win:
|
||||
target:
|
||||
- nsis
|
||||
- 7z
|
||||
artifactName: ${name}-windows-${version}-${arch}-portable.${ext}
|
||||
artifactName: clash-party-windows-${version}-${arch}-portable.${ext}
|
||||
nsis:
|
||||
artifactName: ${name}-windows-${version}-${arch}-setup.${ext}
|
||||
artifactName: clash-party-windows-${version}-${arch}-setup.${ext}
|
||||
uninstallDisplayName: ${productName}
|
||||
allowToChangeInstallationDirectory: true
|
||||
oneClick: false
|
||||
@ -47,7 +47,7 @@ mac:
|
||||
- NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
|
||||
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
|
||||
notarize: false
|
||||
artifactName: ${name}-macos-${version}-${arch}.${ext}
|
||||
artifactName: clash-party-macos-${version}-${arch}.${ext}
|
||||
pkg:
|
||||
allowAnywhere: false
|
||||
allowCurrentUserHome: false
|
||||
@ -64,7 +64,7 @@ linux:
|
||||
- rpm
|
||||
maintainer: mihomo-party-org
|
||||
category: Utility
|
||||
artifactName: ${name}-linux-${version}-${arch}.${ext}
|
||||
artifactName: clash-party-linux-${version}-${arch}.${ext}
|
||||
deb:
|
||||
afterInstall: 'build/linux/postinst'
|
||||
rpm:
|
||||
|
||||
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 140 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 153 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 109 KiB |
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 111 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 110 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 111 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 8.7 KiB |
@ -1,28 +1,47 @@
|
||||
import yaml from 'yaml'
|
||||
import { readFileSync, writeFileSync } from 'fs'
|
||||
import { execSync } from 'child_process'
|
||||
|
||||
const pkg = readFileSync('package.json', 'utf-8')
|
||||
let changelog = readFileSync('changelog.md', 'utf-8')
|
||||
const { version } = JSON.parse(pkg)
|
||||
const downloadUrl = `https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}`
|
||||
let { version } = JSON.parse(pkg)
|
||||
|
||||
// 获取 commit hash
|
||||
function getGitCommitHash() {
|
||||
try {
|
||||
return execSync('git rev-parse --short=7 HEAD').toString().trim()
|
||||
} catch (error) {
|
||||
console.warn('无法获取 Git commit hash,使用默认值')
|
||||
return 'unknown'
|
||||
}
|
||||
}
|
||||
|
||||
if (version.endsWith('-dev')) {
|
||||
const commitHash = getGitCommitHash()
|
||||
version = version.replace('-dev', `-${commitHash}-dev`)
|
||||
}
|
||||
const isDevVersion = version.includes('-dev')
|
||||
const downloadUrl = isDevVersion
|
||||
? `https://github.com/mihomo-party-org/clash-party/releases/download/dev`
|
||||
: `https://github.com/mihomo-party-org/clash-party/releases/download/v${version}`
|
||||
const latest = {
|
||||
version,
|
||||
changelog
|
||||
}
|
||||
|
||||
changelog += '\n### 下载地址:\n\n#### Windows10/11:\n\n'
|
||||
changelog += `- 安装版:[64位](${downloadUrl}/mihomo-party-windows-${version}-x64-setup.exe) | [32位](${downloadUrl}/mihomo-party-windows-${version}-ia32-setup.exe) | [ARM64](${downloadUrl}/mihomo-party-windows-${version}-arm64-setup.exe)\n\n`
|
||||
changelog += `- 便携版:[64位](${downloadUrl}/mihomo-party-windows-${version}-x64-portable.7z) | [32位](${downloadUrl}/mihomo-party-windows-${version}-ia32-portable.7z) | [ARM64](${downloadUrl}/mihomo-party-windows-${version}-arm64-portable.7z)\n\n`
|
||||
changelog += `- 安装版:[64位](${downloadUrl}/clash-party-windows-${version}-x64-setup.exe) | [32位](${downloadUrl}/clash-party-windows-${version}-ia32-setup.exe) | [ARM64](${downloadUrl}/clash-party-windows-${version}-arm64-setup.exe)\n\n`
|
||||
changelog += `- 便携版:[64位](${downloadUrl}/clash-party-windows-${version}-x64-portable.7z) | [32位](${downloadUrl}/clash-party-windows-${version}-ia32-portable.7z) | [ARM64](${downloadUrl}/clash-party-windows-${version}-arm64-portable.7z)\n\n`
|
||||
changelog += '\n#### Windows7/8:\n\n'
|
||||
changelog += `- 安装版:[64位](${downloadUrl}/mihomo-party-win7-${version}-x64-setup.exe) | [32位](${downloadUrl}/mihomo-party-win7-${version}-ia32-setup.exe)\n\n`
|
||||
changelog += `- 便携版:[64位](${downloadUrl}/mihomo-party-win7-${version}-x64-portable.7z) | [32位](${downloadUrl}/mihomo-party-win7-${version}-ia32-portable.7z)\n\n`
|
||||
changelog += `- 安装版:[64位](${downloadUrl}/clash-party-win7-${version}-x64-setup.exe) | [32位](${downloadUrl}/clash-party-win7-${version}-ia32-setup.exe)\n\n`
|
||||
changelog += `- 便携版:[64位](${downloadUrl}/clash-party-win7-${version}-x64-portable.7z) | [32位](${downloadUrl}/clash-party-win7-${version}-ia32-portable.7z)\n\n`
|
||||
changelog += '\n#### macOS 11+:\n\n'
|
||||
changelog += `- PKG:[Intel](${downloadUrl}/mihomo-party-macos-${version}-x64.pkg) | [Apple Silicon](${downloadUrl}/mihomo-party-macos-${version}-arm64.pkg)\n\n`
|
||||
changelog += `- PKG:[Intel](${downloadUrl}/clash-party-macos-${version}-x64.pkg) | [Apple Silicon](${downloadUrl}/clash-party-macos-${version}-arm64.pkg)\n\n`
|
||||
changelog += '\n#### macOS 10.15+:\n\n'
|
||||
changelog += `- PKG:[Intel](${downloadUrl}/mihomo-party-catalina-${version}-x64.pkg) | [Apple Silicon](${downloadUrl}/mihomo-party-catalina-${version}-arm64.pkg)\n\n`
|
||||
changelog += `- PKG:[Intel](${downloadUrl}/clash-party-catalina-${version}-x64.pkg) | [Apple Silicon](${downloadUrl}/clash-party-catalina-${version}-arm64.pkg)\n\n`
|
||||
changelog += '\n#### Linux:\n\n'
|
||||
changelog += `- DEB:[64位](${downloadUrl}/mihomo-party-linux-${version}-amd64.deb) | [ARM64](${downloadUrl}/mihomo-party-linux-${version}-arm64.deb)\n\n`
|
||||
changelog += `- RPM:[64位](${downloadUrl}/mihomo-party-linux-${version}-x86_64.rpm) | [ARM64](${downloadUrl}/mihomo-party-linux-${version}-aarch64.rpm)`
|
||||
changelog += `- DEB:[64位](${downloadUrl}/clash-party-linux-${version}-amd64.deb) | [ARM64](${downloadUrl}/clash-party-linux-${version}-arm64.deb)\n\n`
|
||||
changelog += `- RPM:[64位](${downloadUrl}/clash-party-linux-${version}-x86_64.rpm) | [ARM64](${downloadUrl}/clash-party-linux-${version}-aarch64.rpm)`
|
||||
|
||||
changelog += '\n\n### 机场推荐:\n- 高性能海外机场,稳定首选:[https://狗狗加速.com](https://party.dginv.click/#/register?code=ARdo0mXx)'
|
||||
|
||||
|
||||
@ -417,6 +417,7 @@ const App: React.FC = () => {
|
||||
className={`flex justify-between p-2 ${!useWindowFrame && platform === 'darwin' ? 'ml-[60px]' : ''}`}
|
||||
>
|
||||
<div className="flex ml-1">
|
||||
<MihomoIcon className="h-[32px] leading-[32px] text-lg mx-px" />
|
||||
<h3 className="text-lg font-bold leading-[32px]">Clash Party</h3>
|
||||
</div>
|
||||
<UpdaterButton />
|
||||
|
||||
@ -1,72 +1,67 @@
|
||||
import React from 'react'
|
||||
import { GenIcon } from 'react-icons'
|
||||
function MihomoIcon(props): JSX.Element {
|
||||
|
||||
function MihomoIcon(props: any): React.JSX.Element {
|
||||
return GenIcon({
|
||||
tag: 'svg',
|
||||
attr: { viewBox: '0 0 76.14 72.14' },
|
||||
attr: { viewBox: '0 0 128 128' },
|
||||
child: [
|
||||
{
|
||||
tag: 'path',
|
||||
tag: 'g',
|
||||
attr: {
|
||||
d: 'm38.2,35.17c-2.73,0-5.58.46-8.54,1.4-.36.12-.75.03-1.04-.23l-11.79-10.76c-.66-.6-1.69-.55-2.29.11-.27.3-.42.69-.42,1.09v25.51c0,.95-.48,1.42-1.43,1.42-3.49,0-7.45-.69-11.89-2.06-.27-.09-.46-.34-.46-.63V1.45c0-.48.24-.74.72-.78L9.19,0c.23-.02.46.06.63.21l22.99,20.97c.37.33.87.48,1.35.39,1.55-.28,2.9-.42,4.05-.42s2.5.14,4.05.43c.49.09.99-.05,1.36-.39L66.64.26c.17-.15.4-.23.63-.21l8.13.68c.48.04.72.3.72.78l-.09,49.57c0,.29-.19.54-.46.63-4.44,1.36-8.4,2.04-11.89,2.04-.95,0-1.43-.47-1.43-1.42l.05-25.51c0-.89-.72-1.62-1.62-1.62-.4,0-.79.15-1.09.42l-11.81,10.74c-.29.26-.68.34-1.04.22-2.96-.94-5.81-1.41-8.54-1.41Z'
|
||||
transform: 'matrix(-1, 0, 0, 1, 127.931404, 0)'
|
||||
},
|
||||
child: []
|
||||
},
|
||||
{
|
||||
tag: 'path',
|
||||
attr: {
|
||||
d: 'm38.6,54.9c.94.02,1.42.03,1.43.03.73.04,1.3.66,1.27,1.38,0,.19-.06.37-.15.54-.57,1.07-1.11,2.04-1.64,2.91-.11.18-.25.3-.42.37s-.38.1-.61.09c-.23,0-.43-.04-.6-.12-.17-.07-.3-.2-.4-.38-.49-.89-1-1.88-1.52-2.98-.31-.65-.02-1.44.65-1.74.17-.08.36-.12.55-.13.01,0,.49.01,1.44.03Z'
|
||||
},
|
||||
child: []
|
||||
},
|
||||
{
|
||||
tag: 'rect',
|
||||
attr: {
|
||||
x: '0',
|
||||
y: '57',
|
||||
width: '21.12',
|
||||
height: '2.7',
|
||||
rx: '.9',
|
||||
ry: '.9'
|
||||
},
|
||||
child: []
|
||||
},
|
||||
{
|
||||
tag: 'rect',
|
||||
attr: {
|
||||
x: '55.81',
|
||||
y: '57',
|
||||
width: '20.28',
|
||||
height: '2.7',
|
||||
rx: '.9',
|
||||
ry: '.9'
|
||||
},
|
||||
child: []
|
||||
},
|
||||
{
|
||||
tag: 'rect',
|
||||
attr: {
|
||||
x: '-.29',
|
||||
y: '66.23',
|
||||
width: '21.96',
|
||||
height: '2.8',
|
||||
rx: '.9',
|
||||
ry: '.9',
|
||||
transform: 'translate(-21.33 7.11) rotate(-18.9)'
|
||||
},
|
||||
child: []
|
||||
},
|
||||
{
|
||||
tag: 'rect',
|
||||
attr: {
|
||||
x: '64.5',
|
||||
y: '56.89',
|
||||
width: '2.82',
|
||||
height: '21.4',
|
||||
rx: '.9',
|
||||
ry: '.9',
|
||||
transform: 'translate(-19.39 108.06) rotate(-71.1)'
|
||||
},
|
||||
child: []
|
||||
child: [
|
||||
{
|
||||
tag: 'path',
|
||||
attr: {
|
||||
d: 'm121.3 103.3-22.3-99.3-4.3 4.3c-3.7 3.7-8.6 5.7-13.7 5.7s-10-2-13.7-5.7l-4.3-4.3-22.3 99.3c-1 4.3-.2 8.5 1.7 12l-26.9-6.4c-4.8-1.1-9.4 2.6-9.4 7.5 0 4.3 3.5 7.7 7.7 7.7h91c10.8-.1 18.9-10.2 16.5-20.8z',
|
||||
fill: '#fff',
|
||||
strokeWidth: '6'
|
||||
},
|
||||
child: []
|
||||
},
|
||||
{
|
||||
tag: 'circle',
|
||||
attr: {
|
||||
cx: '71',
|
||||
cy: '34',
|
||||
fill: '#444b54',
|
||||
r: '3',
|
||||
strokeWidth: '6'
|
||||
},
|
||||
child: []
|
||||
},
|
||||
{
|
||||
tag: 'circle',
|
||||
attr: {
|
||||
cx: '91',
|
||||
cy: '34',
|
||||
fill: '#444b54',
|
||||
r: '3',
|
||||
strokeWidth: '6'
|
||||
},
|
||||
child: []
|
||||
},
|
||||
{
|
||||
tag: 'path',
|
||||
attr: {
|
||||
d: 'm124.3 102.6-22.4-99.3c-.2-1.1-1-1.9-2.1-2.2-1-.3-2.2 0-3 .8l-4.3 4.3c-3 3.1-7.1 4.8-11.5 4.8s-8.5-1.7-11.6-4.8l-4.3-4.3c-.8-.8-1.9-1.1-3-.8s-1.9 1.2-2.1 2.2l-22.3 99.3c-1.3 5.9.1 12.1 3.9 16.8.4.5.9 1 1.4 1.5h-29.3c-2.6 0-4.7-2.1-4.7-4.7 0-1.4.6-2.8 1.8-3.7 1.1-.9 2.6-1.2 4-.9l11.9 2.8c1.6.4 3.2-.6 3.6-2.2s-.6-3.2-2.2-3.6l-11.9-2.8c-3.2-.7-6.5 0-9.1 2.1-2.6 2-4 5.1-4 8.4 0 5.9 4.8 10.7 10.7 10.7h43.5.1 1.6c1.7 0 3-1.3 3-3s-1.3-3-3-3h-1.7c-4.3 0-8.3-1.9-11-5.3-2.7-3.3-3.6-7.6-2.7-11.8l21.1-94 .4.4c4.3 4.4 9.9 6.7 15.9 6.7s11.6-2.3 15.8-6.6l.5-.4 21.2 94c.9 4.1 0 8.4-2.7 11.8s-6.7 5.3-11 5.3h-.8c-1.7 0-3 1.3-3 3s1.3 3 3 3h.8c6.1 0 11.8-2.7 15.7-7.5 3.8-4.9 5.2-11 3.8-17z',
|
||||
fill: '#444b54',
|
||||
strokeWidth: '6'
|
||||
},
|
||||
child: []
|
||||
},
|
||||
{
|
||||
tag: 'path',
|
||||
attr: {
|
||||
d: 'm102.6 71.1c-1.6-.3-3.2.7-3.5 2.4l-9 45.1c-.3 1.5-1.5 2.5-3 2.5-1.7 0-3-1.3-3-3v-34.1c0-1.7-1.3-3-3-3s-3 1.3-3 3v34c0 1.6-1.4 3-3.1 3h-1c-1.5 0-2.7-1-3-2.5l-9.1-45.1c-.3-1.6-1.9-2.7-3.5-2.3-1.6.3-2.7 1.9-2.3 3.5l9.1 45c.7 4.3 4.5 7.4 8.9 7.4h1c2.3 0 4.5-.9 6.1-2.3 1.6 1.4 3.7 2.3 6 2.3 4.3 0 7.9-3 8.8-7.3l9-45.1c.3-1.6-.8-3.2-2.4-3.5z',
|
||||
fill: '#444b54',
|
||||
strokeWidth: '6'
|
||||
},
|
||||
child: []
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
})(props)
|
||||
|
||||