From c99575c3f16be5e2dd948981da7befe1bc5695a7 Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 4 May 2024 09:22:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9PageDownloadClient.xaml.v?= =?UTF-8?q?b=E5=92=8CPageDownloadInstall.xaml.vb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 对4月1日版本直接判定为愚人节版 --- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 8 ++++++++ .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index 519b862..83bb44e 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -44,6 +44,14 @@ Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) End Select + '所有4月1日发布的版本可视为愚人节版，但不改动版本描述 + Select Case Version("releaseDate").Value(Of Date).ToString("MM'/'dd") + Case "04/01" + If Not Version("type") == "special" Then + Type = "愚人节版" + Version("type") = "special" + End If + End Select Case "special" '已被处理的愚人节版 Type = "愚人节版" diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 1c6f77b..108e699 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -528,6 +528,14 @@ Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) End Select + '所有4月1日发布的版本视为愚人节版，但不改动版本描述 + Select Case Version("releaseDate").Value(Of Date).ToString("MM'/'dd") + Case "04/01" + If Not Version("type") == "special" Then + Type = "愚人节版" + Version("type") = "special" + End If + End Select Case "special" '已被处理的愚人节版 Type = "愚人节版" From a95e8e8bf7f817d83c73f7331b1e131043a2605a Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 06:52:08 +0800 Subject: [PATCH 2/7] Create build-pr.yml --- .github/workflows/build-pr.yml | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/build-pr.yml diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml new file mode 100644 index 0000000..22244d2 --- /dev/null +++ b/.github/workflows/build-pr.yml @@ -0,0 +1,49 @@ +name: 构建来自 Pull Request 的 PCL + +on: + pull_request: + paths: + - 'Plain Craft Launcher 2.sln' + - 'Plain Craft Launcher 2/**' + - '.github/workflows/**' + +jobs: + + build: + + strategy: + matrix: + configuration: [Debug, Release, Snapshot, BETA, ReleaseUpdate] + + runs-on: windows-latest + + env: + Solution_Name: Plain Craft Launcher 2.sln + Wap_Project_Directory: Plain Craft Launcher 2 + Wap_Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj + Configuration: ${{ matrix.configuration }} + + steps: + - name: 签出仓库 + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + # setup msbuild + - name: 安装 MSBuild + uses: microsoft/setup-msbuild@v2 + + # # Restore the application to populate the obj folder with RuntimeIdentifiers + # - name: Restore the application + # run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration + + # Create the app package by building and packaging the Windows Application Packaging project + - name: 编译 PCL + run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /t:Rebuild + + # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact + - name: 上传编译产物 + uses: actions/upload-artifact@v4 + with: + name: ${{ env.Configuration }} + path: ${{ env.Wap_Project_Directory }}\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe From 73f8bdf4e1764ffae8011f1aa66256a8f55ca7ca Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 06:53:20 +0800 Subject: [PATCH 3/7] Delete .github/workflows/build-pr.yml --- .github/workflows/build-pr.yml | 49 ---------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 .github/workflows/build-pr.yml diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml deleted file mode 100644 index 22244d2..0000000 --- a/.github/workflows/build-pr.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: 构建来自 Pull Request 的 PCL - -on: - pull_request: - paths: - - 'Plain Craft Launcher 2.sln' - - 'Plain Craft Launcher 2/**' - - '.github/workflows/**' - -jobs: - - build: - - strategy: - matrix: - configuration: [Debug, Release, Snapshot, BETA, ReleaseUpdate] - - runs-on: windows-latest - - env: - Solution_Name: Plain Craft Launcher 2.sln - Wap_Project_Directory: Plain Craft Launcher 2 - Wap_Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj - Configuration: ${{ matrix.configuration }} - - steps: - - name: 签出仓库 - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - # setup msbuild - - name: 安装 MSBuild - uses: microsoft/setup-msbuild@v2 - - # # Restore the application to populate the obj folder with RuntimeIdentifiers - # - name: Restore the application - # run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration - - # Create the app package by building and packaging the Windows Application Packaging project - - name: 编译 PCL - run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /t:Rebuild - - # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact - - name: 上传编译产物 - uses: actions/upload-artifact@v4 - with: - name: ${{ env.Configuration }} - path: ${{ env.Wap_Project_Directory }}\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe From aa576e669d7281f6e0423088da7744176dda71d4 Mon Sep 17 00:00:00 2001 From: wuliaodexiaoluo Date: Thu, 4 Jul 2024 11:23:15 +0800 Subject: [PATCH 4/7] Fix Bugs --- Plain Craft Launcher 2/FormMain.xaml.vb | 6 +++--- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 4 ++-- .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index 5ed09e6..f4e9258 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -319,9 +319,9 @@ Public Class FormMain FrmLaunchRight.PageState = MyPageRight.PageStates.ContentStay If IsLinkRestart Then PageChange(PageType.Link, PageSubType.LinkIoi) '模式提醒 -#If DEBUG Then - Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) -#End If + If "Debug" = "Debug" Then + Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) + End If If ModeDebug Then Hint("[调试模式] PCL 正以调试模式运行，这可能会导致性能下降，若无必要请不要开启！") '尽早执行的加载池 McFolderListLoader.Start(0) '为了让下载已存在文件检测可以正常运行，必须跑一次；为了让启动按钮尽快可用，需要尽早执行；为了与 PageLaunchLeft 联动，需要为 0 而不是 GetUuid diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index 83bb44e..4464ccd 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -45,9 +45,9 @@ Version.Add("lore", GetMcFoolName(Version("id"))) End Select '所有4月1日发布的版本可视为愚人节版，但不改动版本描述 - Select Case Version("releaseDate").Value(Of Date).ToString("MM'/'dd") + Select Case Version("releaseTime").Value(Of Date).ToString("MM'/'dd") Case "04/01" - If Not Version("type") == "special" Then + If Not Version("type") = "special" Then Type = "愚人节版" Version("type") = "special" End If diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index cdbbdc9..89dd23e 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -556,9 +556,9 @@ Version.Add("lore", GetMcFoolName(Version("id"))) End Select '所有4月1日发布的版本视为愚人节版，但不改动版本描述 - Select Case Version("releaseDate").Value(Of Date).ToString("MM'/'dd") + Select Case Version("releaseTime").Value(Of Date).ToString("MM'/'dd") Case "04/01" - If Not Version("type") == "special" Then + If Not Version("type") = "special" Then Type = "愚人节版" Version("type") = "special" End If From 2f39c57e58148bcace2e144b4a2d04839adbb4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E8=81=8A=E7=9A=84=E5=B0=8F=E6=B4=9B?= Date: Thu, 4 Jul 2024 11:35:11 +0800 Subject: [PATCH 5/7] Update FormMain.xaml.vb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 之前改的没改回来 --- Plain Craft Launcher 2/FormMain.xaml.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index f4e9258..6b8bc65 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -319,9 +319,9 @@ Public Class FormMain FrmLaunchRight.PageState = MyPageRight.PageStates.ContentStay If IsLinkRestart Then PageChange(PageType.Link, PageSubType.LinkIoi) '模式提醒 - If "Debug" = "Debug" Then - Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) - End If +#If Debug Then + Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) +End If If ModeDebug Then Hint("[调试模式] PCL 正以调试模式运行，这可能会导致性能下降，若无必要请不要开启！") '尽早执行的加载池 McFolderListLoader.Start(0) '为了让下载已存在文件检测可以正常运行，必须跑一次；为了让启动按钮尽快可用，需要尽早执行；为了与 PageLaunchLeft 联动，需要为 0 而不是 GetUuid From fa7deb7500b0fd0c551c3e4bb33f4f98e62790d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E8=81=8A=E7=9A=84=E5=B0=8F=E6=B4=9B?= Date: Thu, 4 Jul 2024 11:36:00 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为什么要大写啊 --- Plain Craft Launcher 2/FormMain.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index 6b8bc65..f3a67b9 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -319,7 +319,7 @@ Public Class FormMain FrmLaunchRight.PageState = MyPageRight.PageStates.ContentStay If IsLinkRestart Then PageChange(PageType.Link, PageSubType.LinkIoi) '模式提醒 -#If Debug Then +#If DEBUG Then Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) End If If ModeDebug Then Hint("[调试模式] PCL 正以调试模式运行，这可能会导致性能下降，若无必要请不要开启！") From 10e17d48c5c4e62c5769c2b0ed3b9cca4041fbce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E8=81=8A=E7=9A=84=E5=B0=8F=E6=B4=9B?= Date: Thu, 4 Jul 2024 11:37:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=87=B4=E5=91=BD=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 败笔也 --- Plain Craft Launcher 2/FormMain.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index f3a67b9..5ed09e6 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -321,7 +321,7 @@ Public Class FormMain '模式提醒 #If DEBUG Then Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) -End If +#End If If ModeDebug Then Hint("[调试模式] PCL 正以调试模式运行，这可能会导致性能下降，若无必要请不要开启！") '尽早执行的加载池 McFolderListLoader.Start(0) '为了让下载已存在文件检测可以正常运行，必须跑一次；为了让启动按钮尽快可用，需要尽早执行；为了与 PageLaunchLeft 联动，需要为 0 而不是 GetUuid