diff --git a/packages/origine2/src/components/IconCreator/IconCreator.tsx b/packages/origine2/src/components/IconCreator/IconCreator.tsx index eaaee0a4a..3797a4c97 100644 --- a/packages/origine2/src/components/IconCreator/IconCreator.tsx +++ b/packages/origine2/src/components/IconCreator/IconCreator.tsx @@ -48,7 +48,7 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto const [iconShape, setIconShape] = useState('square'); const [backgroundStyle, setBackgroundStyle] = useState('color'); - const [backgroundColor, setBackgroundColor] = useState('#FFFFFF'); + const [backgroundColor, setBackgroundColor] = useState('#FFFFFF00'); const [gridLineColor, setGridLineColor] = useState<'#FFFFFF' | '#000000'>('#000000'); const [icons, setIcons] = useState(null); @@ -167,7 +167,7 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto if (ctx) { ctx.clearRect(0, 0, canvasSize, canvasSize); if (backgroundStyle === 'color') { - ctx.fillStyle = tinycolor(backgroundColor).toHex8String(); + ctx.fillStyle = backgroundColor; ctx.fillRect(0, 0, canvasSize, canvasSize); } else if (backgroundStyle === 'image') { // ctx.fillStyle = '#FFFFFF'; @@ -341,9 +341,11 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto * @param imageDataUTL 要裁剪的图像 Data URL。 * @param inset 0-1 之间的值,表示裁剪区域的内边距百分比。 * @param shape 裁剪的形状。 + * @param format 图像格式。默认为 'png'。 * @returns 裁剪后的图像 Data URL。 */ - const clipImage = async (imageDataUTL: string, inset: number, shape: IIconShape): Promise => { + // eslint-disable-next-line max-params + const clipImage = async (imageDataUTL: string, inset: number, shape: IIconShape, format = 'png'): Promise => { const img = new Image(); img.src = imageDataUTL; @@ -392,7 +394,7 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto ctx.drawImage(img, drawX, drawY, img.width, img.height); - return canvas.toDataURL(); + return canvas.toDataURL(`image/${format}`); }; /** @@ -401,12 +403,15 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto * @param imageDataURL 要调整的图像 Data URL。 * @param size 新图像的尺寸。 * @param padding 0-1 之间的值,表示边距占图像大小的比例。 + * @param format 图像格式。默认为 'png'。 * @returns 调整后的图像 Data URL。 */ const resizeImage = async ( imageDataURL: string, size: number, padding = 0, + format = 'png', + // eslint-disable-next-line max-params ): Promise => { const img = new Image(); img.src = imageDataURL; @@ -433,7 +438,7 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto ctx.drawImage(img, drawX, drawY, drawWidth, drawHeight); - return canvas.toDataURL(); + return canvas.toDataURL(`image/${format}`); }; const clipIcons = async () => { @@ -453,7 +458,7 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto ]); const ico = URL.createObjectURL(new Blob([icoBlob], { type: 'image/x-icon' })); - const androidFullBleed = await getCompositedImage([background, foreground], canvasSize, backgroundStyle === 'color' ? backgroundColor : undefined); + const androidFullBleed = await getCompositedImage([background, foreground], canvasSize); if (!androidFullBleed) return null; const androidLegacyImage = await clipImage(maskable, clipInset.android.legacy, 'rounded-rectangle'); const androidRoundImage = await clipImage(maskable, clipInset.android.round, 'circle'); @@ -520,23 +525,10 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto icLauncherPlayStoreFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidFullBleed.src, 512)), 'ic_launcher-playstore.png'); await axios.post('/api/assets/upload', icLauncherPlayStoreFormData); - // values 文件夹 - if (backgroundStyle === 'color') { - const icLauncherBackgroundXmlContent = ` - - ${tinycolor(backgroundColor).toHexString()} -`; - const icLauncherBackgroundXmlBlob = new Blob([icLauncherBackgroundXmlContent], { type: 'text/xml' }); - const valuesFormData = new FormData(); - valuesFormData.append('targetDirectory', `games/${gameDir}/icons/android/values`); - valuesFormData.append('files', icLauncherBackgroundXmlBlob, 'ic_launcher_background.xml'); - await axios.post('/api/assets/upload', valuesFormData); - } - // mipmap-anydpi-v26 文件夹 const icLauncherXmlContent = ` - + `; const icLauncherXmlBlob = new Blob([icLauncherXmlContent], { type: 'text/xml' }); @@ -549,56 +541,46 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto // mipmap-xxxhdpi 文件夹 const xxxhdpiFormData = new FormData(); xxxhdpiFormData.append('targetDirectory', `games/${gameDir}/icons/android/mipmap-xxxhdpi`); - xxxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 192)), 'ic_launcher.png'); - xxxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 192)), 'ic_launcher_round.png'); - xxxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 432)), 'ic_launcher_foreground.png'); - if (backgroundStyle === 'image') { - xxxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 432)), 'ic_launcher_background.png'); - } + xxxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 192, 0, 'webp')), 'ic_launcher.webp'); + xxxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 192, 0, 'webp')), 'ic_launcher_round.webp'); + xxxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 432, 0, 'webp')), 'ic_launcher_foreground.webp'); + xxxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 432, 0, 'webp')), 'ic_launcher_background.webp'); await axios.post('/api/assets/upload', xxxhdpiFormData); // mipmap-xxhdpi 文件夹 const xxhdpiFormData = new FormData(); xxhdpiFormData.append('targetDirectory', `games/${gameDir}/icons/android/mipmap-xxhdpi`); - xxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 144)), 'ic_launcher.png'); - xxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 144)), 'ic_launcher_round.png'); - xxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 324)), 'ic_launcher_foreground.png'); - if (backgroundStyle === 'image') { - xxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 324)), 'ic_launcher_background.png'); - } + xxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 144, 0, 'webp')), 'ic_launcher.webp'); + xxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 144, 0, 'webp')), 'ic_launcher_round.webp'); + xxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 324, 0, 'webp')), 'ic_launcher_foreground.webp'); + xxhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 324, 0, 'webp')), 'ic_launcher_background.webp'); await axios.post('/api/assets/upload', xxhdpiFormData); // mipmap-xhdpi 文件夹 const xhdpiFormData = new FormData(); xhdpiFormData.append('targetDirectory', `games/${gameDir}/icons/android/mipmap-xhdpi`); - xhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 96)), 'ic_launcher.png'); - xhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 96)), 'ic_launcher_round.png'); - xhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 216)), 'ic_launcher_foreground.png'); - if (backgroundStyle === 'image') { - xhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 216)), 'ic_launcher_background.png'); - } + xhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 96, 0, 'webp')), 'ic_launcher.webp'); + xhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 96, 0, 'webp')), 'ic_launcher_round.webp'); + xhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 216, 0, 'webp')), 'ic_launcher_foreground.webp'); + xhdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 216, 0, 'webp')), 'ic_launcher_background.webp'); await axios.post('/api/assets/upload', xhdpiFormData); // mipmap-hdpi 文件夹 const hdpiFormData = new FormData(); hdpiFormData.append('targetDirectory', `games/${gameDir}/icons/android/mipmap-hdpi`); - hdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 72)), 'ic_launcher.png'); - hdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 72)), 'ic_launcher_round.png'); - hdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 162)), 'ic_launcher_foreground.png'); - if (backgroundStyle === 'image') { - hdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 162)), 'ic_launcher_background.png'); - } + hdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 72, 0, 'webp')), 'ic_launcher.webp'); + hdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 72, 0, 'webp')), 'ic_launcher_round.webp'); + hdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 162, 0, 'webp')), 'ic_launcher_foreground.webp'); + hdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 162, 0, 'webp')), 'ic_launcher_background.webp'); await axios.post('/api/assets/upload', hdpiFormData); // mipmap-mdpi 文件夹 const mdpiFormData = new FormData(); mdpiFormData.append('targetDirectory', `games/${gameDir}/icons/android/mipmap-mdpi`); - mdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 48)), 'mipmap-mdpi/ic_launcher.png'); - mdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 48)), 'mipmap-mdpi/ic_launcher_round.png'); - mdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 108)), 'mipmap-mdpi/ic_launcher_foreground.png'); - if (backgroundStyle === 'image') { - mdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 108)), 'ic_launcher_background.png'); - } + mdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidLegacy.src, 48, 0, 'webp')), 'mipmap-mdpi/ic_launcher.webp'); + mdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidRound.src, 48, 0, 'webp')), 'mipmap-mdpi/ic_launcher_round.webp'); + mdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidForeground.src, 108, 0, 'webp')), 'mipmap-mdpi/ic_launcher_foreground.webp'); + mdpiFormData.append('files', await dataURLToBlob(await resizeImage(icons.androidBackground.src, 108, 0, 'webp')), 'ic_launcher_background.webp'); await axios.post('/api/assets/upload', mdpiFormData); console.log('上传 Android 图标成功'); } catch (error) { @@ -613,7 +595,7 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto setIsOpen(false); setForegroundImage(null); setBackgroundImage(null); - setBackgroundColor('#FFFFFF'); + setBackgroundColor('#FFFFFF00'); setForegroundOffset({ x: 0, y: 0 }); setBackgroundOffset({ x: 0, y: 0 }); setForegroundScale(1); diff --git a/packages/origine2/src/locales/en.po b/packages/origine2/src/locales/en.po index 13faf6090..d6d844d3c 100644 --- a/packages/origine2/src/locales/en.po +++ b/packages/origine2/src/locales/en.po @@ -200,7 +200,7 @@ msgstr "z-index" msgid "一直显示功能区" msgstr "Always Show Toolbar" -#: src/components/IconCreator/IconCreator.tsx:792 +#: src/components/IconCreator/IconCreator.tsx:774 msgid "上一步" msgstr "Previous" @@ -213,7 +213,7 @@ msgstr "Upload" msgid "上传资源" msgstr "Upload asset" -#: src/components/IconCreator/IconCreator.tsx:789 +#: src/components/IconCreator/IconCreator.tsx:771 msgid "下一步" msgstr "Next" @@ -364,11 +364,11 @@ msgstr "Sidebar" msgid "侧边栏游戏预览" msgstr "Sidebar Game Preview" -#: src/components/IconCreator/IconCreator.tsx:811 +#: src/components/IconCreator/IconCreator.tsx:793 msgid "保存" msgstr "Save" -#: src/components/IconCreator/IconCreator.tsx:635 +#: src/components/IconCreator/IconCreator.tsx:617 #: src/pages/editor/Topbar/tabs/GameConfig/GameConfig.tsx:202 msgid "修改游戏图标" msgstr "Change game icon" @@ -578,7 +578,7 @@ msgstr "Refresh" msgid "刷新游戏" msgstr "Refresh game" -#: src/components/IconCreator/IconCreator.tsx:668 +#: src/components/IconCreator/IconCreator.tsx:650 msgid "前景" msgstr "Foreground" @@ -624,7 +624,7 @@ msgid "发现新版本" msgstr "New version detected" #: src/components/ColorPickerPopup/ColorPickerPopup.tsx:115 -#: src/components/IconCreator/IconCreator.tsx:788 +#: src/components/IconCreator/IconCreator.tsx:770 #: src/pages/editor/ChooseFile/ChooseFile.tsx:55 #: src/pages/templateEditor/TemplateEditorSidebar/TemplateEditorSidebar.tsx:171 msgid "取消" @@ -684,12 +684,12 @@ msgstr "Image" msgid "图形编辑器" msgstr "Graphical editor" -#: src/components/IconCreator/IconCreator.tsx:698 -#: src/components/IconCreator/IconCreator.tsx:704 +#: src/components/IconCreator/IconCreator.tsx:680 +#: src/components/IconCreator/IconCreator.tsx:686 msgid "图片" msgstr "Image" -#: src/components/IconCreator/IconCreator.tsx:628 +#: src/components/IconCreator/IconCreator.tsx:610 msgid "圆形" msgstr "Circle" @@ -697,7 +697,7 @@ msgstr "Circle" msgid "圆角" msgstr "Rounded corners" -#: src/components/IconCreator/IconCreator.tsx:629 +#: src/components/IconCreator/IconCreator.tsx:611 msgid "圆角矩形" msgstr "Rounded rectangle" @@ -1254,7 +1254,7 @@ msgstr "New template" msgid "新的游戏" msgstr "New game" -#: src/components/IconCreator/IconCreator.tsx:627 +#: src/components/IconCreator/IconCreator.tsx:609 msgid "方形" msgstr "Square" @@ -1714,7 +1714,7 @@ msgstr "Absolutely" #~ msgid "绿色(0-255):" #~ msgstr "Green (0-255)" -#: src/components/IconCreator/IconCreator.tsx:643 +#: src/components/IconCreator/IconCreator.tsx:625 msgid "编辑图标" msgstr "Edit icon" @@ -1744,7 +1744,7 @@ msgstr "Scale" msgid "老电影滤镜" msgstr "Old film filter" -#: src/components/IconCreator/IconCreator.tsx:696 +#: src/components/IconCreator/IconCreator.tsx:678 #: src/pages/editor/EditorSidebar/EditorSidebar.tsx:113 #: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/editorTable.ts:64 msgid "背景" @@ -1843,7 +1843,7 @@ msgstr "Get input" msgid "行脚本" msgstr "Line of script" -#: src/components/IconCreator/IconCreator.tsx:742 +#: src/components/IconCreator/IconCreator.tsx:724 msgid "裁剪形状" msgstr "Clip Shape" @@ -1949,11 +1949,11 @@ msgstr "Language" msgid "语音" msgstr "Voice" -#: src/components/IconCreator/IconCreator.tsx:688 +#: src/components/IconCreator/IconCreator.tsx:670 msgid "调整前景图片" msgstr "Resize foreground image" -#: src/components/IconCreator/IconCreator.tsx:732 +#: src/components/IconCreator/IconCreator.tsx:714 msgid "调整背景图片" msgstr "Resize background image" @@ -2011,8 +2011,8 @@ msgstr "Choose" msgid "选择动画" msgstr "Choose Animation" -#: src/components/IconCreator/IconCreator.tsx:682 -#: src/components/IconCreator/IconCreator.tsx:727 +#: src/components/IconCreator/IconCreator.tsx:664 +#: src/components/IconCreator/IconCreator.tsx:709 msgid "选择图片" msgstr "Choose Image" @@ -2201,12 +2201,12 @@ msgstr "Music" msgid "项目主页" msgstr "Project Homepage" -#: src/components/IconCreator/IconCreator.tsx:643 +#: src/components/IconCreator/IconCreator.tsx:625 msgid "预览图标" msgstr "Preview icon" -#: src/components/IconCreator/IconCreator.tsx:698 -#: src/components/IconCreator/IconCreator.tsx:703 +#: src/components/IconCreator/IconCreator.tsx:680 +#: src/components/IconCreator/IconCreator.tsx:685 #: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/editorTable.ts:44 #: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/propertyEditor/WGBackgroundEditor.tsx:49 msgid "颜色" diff --git a/packages/origine2/src/locales/ja.po b/packages/origine2/src/locales/ja.po index 3023d1196..ffcd5bf9f 100644 --- a/packages/origine2/src/locales/ja.po +++ b/packages/origine2/src/locales/ja.po @@ -200,7 +200,7 @@ msgstr "z-index" msgid "一直显示功能区" msgstr "常にツールバーを表示" -#: src/components/IconCreator/IconCreator.tsx:792 +#: src/components/IconCreator/IconCreator.tsx:774 msgid "上一步" msgstr "先の" @@ -213,7 +213,7 @@ msgstr "アップロード" msgid "上传资源" msgstr "アセットのアップロード" -#: src/components/IconCreator/IconCreator.tsx:789 +#: src/components/IconCreator/IconCreator.tsx:771 msgid "下一步" msgstr "次に" @@ -364,11 +364,11 @@ msgstr "サイドバー" msgid "侧边栏游戏预览" msgstr "サイドバーゲームプレビュー" -#: src/components/IconCreator/IconCreator.tsx:811 +#: src/components/IconCreator/IconCreator.tsx:793 msgid "保存" msgstr "セーブ" -#: src/components/IconCreator/IconCreator.tsx:635 +#: src/components/IconCreator/IconCreator.tsx:617 #: src/pages/editor/Topbar/tabs/GameConfig/GameConfig.tsx:202 msgid "修改游戏图标" msgstr "ゲームアイコンの変更" @@ -578,7 +578,7 @@ msgstr "更新" msgid "刷新游戏" msgstr "ゲームをリフレッシュ" -#: src/components/IconCreator/IconCreator.tsx:668 +#: src/components/IconCreator/IconCreator.tsx:650 msgid "前景" msgstr "Foreground" @@ -624,7 +624,7 @@ msgid "发现新版本" msgstr "新しいバージョンが検出されました" #: src/components/ColorPickerPopup/ColorPickerPopup.tsx:115 -#: src/components/IconCreator/IconCreator.tsx:788 +#: src/components/IconCreator/IconCreator.tsx:770 #: src/pages/editor/ChooseFile/ChooseFile.tsx:55 #: src/pages/templateEditor/TemplateEditorSidebar/TemplateEditorSidebar.tsx:171 msgid "取消" @@ -684,12 +684,12 @@ msgstr "画像" msgid "图形编辑器" msgstr "グラフィックエディタ" -#: src/components/IconCreator/IconCreator.tsx:698 -#: src/components/IconCreator/IconCreator.tsx:704 +#: src/components/IconCreator/IconCreator.tsx:680 +#: src/components/IconCreator/IconCreator.tsx:686 msgid "图片" msgstr "画像" -#: src/components/IconCreator/IconCreator.tsx:628 +#: src/components/IconCreator/IconCreator.tsx:610 msgid "圆形" msgstr "円形" @@ -697,7 +697,7 @@ msgstr "円形" msgid "圆角" msgstr "角丸" -#: src/components/IconCreator/IconCreator.tsx:629 +#: src/components/IconCreator/IconCreator.tsx:611 msgid "圆角矩形" msgstr "角丸方形" @@ -1254,7 +1254,7 @@ msgstr "新しいテンプレート" msgid "新的游戏" msgstr "新しいゲーム" -#: src/components/IconCreator/IconCreator.tsx:627 +#: src/components/IconCreator/IconCreator.tsx:609 msgid "方形" msgstr "方形" @@ -1714,7 +1714,7 @@ msgstr "絶対" #~ msgid "绿色(0-255):" #~ msgstr "緑(0-255):" -#: src/components/IconCreator/IconCreator.tsx:643 +#: src/components/IconCreator/IconCreator.tsx:625 msgid "编辑图标" msgstr "編集アイコン" @@ -1744,7 +1744,7 @@ msgstr "スケール" msgid "老电影滤镜" msgstr "古い映画" -#: src/components/IconCreator/IconCreator.tsx:696 +#: src/components/IconCreator/IconCreator.tsx:678 #: src/pages/editor/EditorSidebar/EditorSidebar.tsx:113 #: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/editorTable.ts:64 msgid "背景" @@ -1843,7 +1843,7 @@ msgstr "入力を取得" msgid "行脚本" msgstr " スクリプトの行、" -#: src/components/IconCreator/IconCreator.tsx:742 +#: src/components/IconCreator/IconCreator.tsx:724 msgid "裁剪形状" msgstr "クリップ形状" @@ -1949,11 +1949,11 @@ msgstr "言語" msgid "语音" msgstr "ボイス" -#: src/components/IconCreator/IconCreator.tsx:688 +#: src/components/IconCreator/IconCreator.tsx:670 msgid "调整前景图片" msgstr "前景画像のリサイズ" -#: src/components/IconCreator/IconCreator.tsx:732 +#: src/components/IconCreator/IconCreator.tsx:714 msgid "调整背景图片" msgstr "背景画像のリサイズ" @@ -2011,8 +2011,8 @@ msgstr "選択" msgid "选择动画" msgstr "アニメーションを選択" -#: src/components/IconCreator/IconCreator.tsx:682 -#: src/components/IconCreator/IconCreator.tsx:727 +#: src/components/IconCreator/IconCreator.tsx:664 +#: src/components/IconCreator/IconCreator.tsx:709 msgid "选择图片" msgstr "画像を選択" @@ -2201,12 +2201,12 @@ msgstr "BGM" msgid "项目主页" msgstr "プロジェクトホームページ" -#: src/components/IconCreator/IconCreator.tsx:643 +#: src/components/IconCreator/IconCreator.tsx:625 msgid "预览图标" msgstr "プレビューアイコン" -#: src/components/IconCreator/IconCreator.tsx:698 -#: src/components/IconCreator/IconCreator.tsx:703 +#: src/components/IconCreator/IconCreator.tsx:680 +#: src/components/IconCreator/IconCreator.tsx:685 #: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/editorTable.ts:44 #: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/propertyEditor/WGBackgroundEditor.tsx:49 msgid "颜色" diff --git a/packages/origine2/src/locales/zhCn.po b/packages/origine2/src/locales/zhCn.po index 4196dab7f..8358bf596 100644 --- a/packages/origine2/src/locales/zhCn.po +++ b/packages/origine2/src/locales/zhCn.po @@ -216,7 +216,7 @@ msgstr "z-index" msgid "一直显示功能区" msgstr "一直显示功能区" -#: src/components/IconCreator/IconCreator.tsx:792 +#: src/components/IconCreator/IconCreator.tsx:774 msgid "上一步" msgstr "上一步" @@ -229,7 +229,7 @@ msgstr "上传" msgid "上传资源" msgstr "上传资源" -#: src/components/IconCreator/IconCreator.tsx:789 +#: src/components/IconCreator/IconCreator.tsx:771 msgid "下一步" msgstr "下一步" @@ -384,11 +384,11 @@ msgstr "侧边栏" msgid "侧边栏游戏预览" msgstr "侧边栏游戏预览" -#: src/components/IconCreator/IconCreator.tsx:811 +#: src/components/IconCreator/IconCreator.tsx:793 msgid "保存" msgstr "保存" -#: src/components/IconCreator/IconCreator.tsx:635 +#: src/components/IconCreator/IconCreator.tsx:617 #: src/pages/editor/Topbar/tabs/GameConfig/GameConfig.tsx:202 msgid "修改游戏图标" msgstr "修改游戏图标" @@ -598,7 +598,7 @@ msgstr "刷新" msgid "刷新游戏" msgstr "刷新游戏" -#: src/components/IconCreator/IconCreator.tsx:668 +#: src/components/IconCreator/IconCreator.tsx:650 msgid "前景" msgstr "前景" @@ -644,7 +644,7 @@ msgid "发现新版本" msgstr "发现新版本" #: src/components/ColorPickerPopup/ColorPickerPopup.tsx:115 -#: src/components/IconCreator/IconCreator.tsx:788 +#: src/components/IconCreator/IconCreator.tsx:770 #: src/pages/editor/ChooseFile/ChooseFile.tsx:55 #: src/pages/templateEditor/TemplateEditorSidebar/TemplateEditorSidebar.tsx:171 msgid "取消" @@ -704,12 +704,12 @@ msgstr "图像" msgid "图形编辑器" msgstr "图形编辑器" -#: src/components/IconCreator/IconCreator.tsx:698 -#: src/components/IconCreator/IconCreator.tsx:704 +#: src/components/IconCreator/IconCreator.tsx:680 +#: src/components/IconCreator/IconCreator.tsx:686 msgid "图片" msgstr "图片" -#: src/components/IconCreator/IconCreator.tsx:628 +#: src/components/IconCreator/IconCreator.tsx:610 msgid "圆形" msgstr "圆形" @@ -717,7 +717,7 @@ msgstr "圆形" msgid "圆角" msgstr "圆角" -#: src/components/IconCreator/IconCreator.tsx:629 +#: src/components/IconCreator/IconCreator.tsx:611 msgid "圆角矩形" msgstr "圆角矩形" @@ -1274,7 +1274,7 @@ msgstr "新的模板" msgid "新的游戏" msgstr "新的游戏" -#: src/components/IconCreator/IconCreator.tsx:627 +#: src/components/IconCreator/IconCreator.tsx:609 msgid "方形" msgstr "方形" @@ -1742,7 +1742,7 @@ msgstr "绝对" #~ msgid "绿色(0-255):" #~ msgstr "绿色(0-255):" -#: src/components/IconCreator/IconCreator.tsx:643 +#: src/components/IconCreator/IconCreator.tsx:625 msgid "编辑图标" msgstr "编辑图标" @@ -1772,7 +1772,7 @@ msgstr "缩放" msgid "老电影滤镜" msgstr "老电影滤镜" -#: src/components/IconCreator/IconCreator.tsx:696 +#: src/components/IconCreator/IconCreator.tsx:678 #: src/pages/editor/EditorSidebar/EditorSidebar.tsx:113 #: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/editorTable.ts:64 msgid "背景" @@ -1871,7 +1871,7 @@ msgstr "获取输入" msgid "行脚本" msgstr "行脚本" -#: src/components/IconCreator/IconCreator.tsx:742 +#: src/components/IconCreator/IconCreator.tsx:724 msgid "裁剪形状" msgstr "裁剪形状" @@ -1977,11 +1977,11 @@ msgstr "语言" msgid "语音" msgstr "语音" -#: src/components/IconCreator/IconCreator.tsx:688 +#: src/components/IconCreator/IconCreator.tsx:670 msgid "调整前景图片" msgstr "调整前景图片" -#: src/components/IconCreator/IconCreator.tsx:732 +#: src/components/IconCreator/IconCreator.tsx:714 msgid "调整背景图片" msgstr "调整背景图片" @@ -2039,8 +2039,8 @@ msgstr "选择" msgid "选择动画" msgstr "选择动画" -#: src/components/IconCreator/IconCreator.tsx:682 -#: src/components/IconCreator/IconCreator.tsx:727 +#: src/components/IconCreator/IconCreator.tsx:664 +#: src/components/IconCreator/IconCreator.tsx:709 msgid "选择图片" msgstr "选择图片" @@ -2229,12 +2229,12 @@ msgstr "音乐" msgid "项目主页" msgstr "项目主页" -#: src/components/IconCreator/IconCreator.tsx:643 +#: src/components/IconCreator/IconCreator.tsx:625 msgid "预览图标" msgstr "预览图标" -#: src/components/IconCreator/IconCreator.tsx:698 -#: src/components/IconCreator/IconCreator.tsx:703 +#: src/components/IconCreator/IconCreator.tsx:680 +#: src/components/IconCreator/IconCreator.tsx:685 #: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/editorTable.ts:44 #: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/propertyEditor/WGBackgroundEditor.tsx:49 msgid "颜色" diff --git a/packages/terre2/src/Modules/manage-game/manage-game.service.ts b/packages/terre2/src/Modules/manage-game/manage-game.service.ts index 2dcdafb7b..e71b4e295 100644 --- a/packages/terre2/src/Modules/manage-game/manage-game.service.ts +++ b/packages/terre2/src/Modules/manage-game/manage-game.service.ts @@ -509,9 +509,6 @@ export class ManageGameService { // 复制图标 const icons = await this.getIcons(gameName); if (icons.platforms.includes('android')) { - this.webgalFs.deleteFileOrDirectory( - `${androidExportDir}/app/src/main/res/values/ic_launcher_background.xml`, - ); await this.webgalFs.copy( this.webgalFs.getPathFromRoot( `/public/games/${gameName}/icons/android`,