From 659442fefff7a9763acdff4343db24abdca2f56e Mon Sep 17 00:00:00 2001 From: MeowZ#WR Date: Sat, 5 Oct 2024 19:20:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Fix=20=E6=9B=B4=E6=95=B4=E6=B4=81=E7=9A=84?= =?UTF-8?q?=E8=B7=A8=E7=95=8C=E4=BC=A0=E9=80=81=E8=8F=9C=E5=8D=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SimpleTweaksPlugin.csproj | 2 +- Tweaks/UiAdjustment/ImprovedWorldVisit.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SimpleTweaksPlugin.csproj b/SimpleTweaksPlugin.csproj index d9ce4ee6..bb049c6d 100644 --- a/SimpleTweaksPlugin.csproj +++ b/SimpleTweaksPlugin.csproj @@ -18,7 +18,7 @@ true - 1.10.2.1 + 1.10.2.2 false diff --git a/Tweaks/UiAdjustment/ImprovedWorldVisit.cs b/Tweaks/UiAdjustment/ImprovedWorldVisit.cs index e661ea96..ecf42e1a 100644 --- a/Tweaks/UiAdjustment/ImprovedWorldVisit.cs +++ b/Tweaks/UiAdjustment/ImprovedWorldVisit.cs @@ -38,7 +38,7 @@ private void SetupWorldTravelSelect(AtkUnitBase* unitBase) { currentWorldNode->SetHeight(24); currentWorldNode->SetXShort(25); - var orderedWorlds = Service.Data.GetExcelSheet()!.Where(w => w.DataCenter.Row == currentDc && w.IsPublic).OrderBy(w => w.Name.RawString).Select(w => w.Name.RawString).ToList(); + var orderedWorlds = Service.Data.GetExcelSheet()!.Where(w => w.DataCenter.Row == currentDc).OrderBy(w => w.Name.RawString).Select(w => w.Name.RawString).ToList(); var currentIndex = orderedWorlds.IndexOf(currentWorld.Name.RawString); var pY = -26 + 24 * currentIndex; currentWorldNode->SetYFloat(pY); From 7f14a84123e0c3a1f829386075f82f9f232648ad Mon Sep 17 00:00:00 2001 From: MeowZ#WR Date: Sat, 5 Oct 2024 21:24:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?RowId=E5=A4=A7=E4=BA=8E1000=E4=B8=8D?= =?UTF-8?q?=E7=AD=89=E4=BA=8E1200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tweaks/UiAdjustment/ImprovedWorldVisit.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tweaks/UiAdjustment/ImprovedWorldVisit.cs b/Tweaks/UiAdjustment/ImprovedWorldVisit.cs index ecf42e1a..8ee8b014 100644 --- a/Tweaks/UiAdjustment/ImprovedWorldVisit.cs +++ b/Tweaks/UiAdjustment/ImprovedWorldVisit.cs @@ -38,7 +38,7 @@ private void SetupWorldTravelSelect(AtkUnitBase* unitBase) { currentWorldNode->SetHeight(24); currentWorldNode->SetXShort(25); - var orderedWorlds = Service.Data.GetExcelSheet()!.Where(w => w.DataCenter.Row == currentDc).OrderBy(w => w.Name.RawString).Select(w => w.Name.RawString).ToList(); + var orderedWorlds = Service.Data.GetExcelSheet()!.Where(w => w.DataCenter.Row == currentDc && w.RowId > 1000 && w.RowId != 1200).OrderBy(w => w.Name.RawString).Select(w => w.Name.RawString).ToList(); var currentIndex = orderedWorlds.IndexOf(currentWorld.Name.RawString); var pY = -26 + 24 * currentIndex; currentWorldNode->SetYFloat(pY); From 1bc84586914f1343f85021697ca864dfd702cfe6 Mon Sep 17 00:00:00 2001 From: MeowZ#WR Date: Sat, 5 Oct 2024 22:43:07 +0800 Subject: [PATCH 3/4] Update actions. --- .github/workflows/build.yml | 2 +- .github/workflows/pr-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b71c47a..01e881c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,6 +89,6 @@ jobs: Expand-Archive -Force ./bin/x64/Debug/SimpleTweaksPlugin/latest.zip ./Artifact - name: Upload Build Artifact - uses: actions/upload-artifact@v2.2.1 + uses: actions/upload-artifact@v4 with: path: ./Artifact/* \ No newline at end of file diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index a4992aea..e95c7e38 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -34,7 +34,7 @@ jobs: Expand-Archive -Force ./bin/x64/Debug/SimpleTweaksPlugin/latest.zip ./Artifact - name: Upload Build Artifact - uses: actions/upload-artifact@v2.2.1 + uses: actions/upload-artifact@v4 with: name: pr-artifact path: ./Artifact/* From 609824ef9679af538327a7c92cd3d2356f58a02e Mon Sep 17 00:00:00 2001 From: MeowZ#WR Date: Sat, 5 Oct 2024 23:01:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20pr-build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index e95c7e38..0f7c7f2e 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -24,7 +24,7 @@ jobs: - name: Download Dalamud run: | - Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/v9/latest.zip -OutFile latest.zip + Invoke-WebRequest -Uri https://ottercorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev" - name: Build run: msbuild dev/SimpleTweaksPlugin.Dev.sln /p:Configuration=Debug