Merge pull request #43 from aoiyu-dev/main

Tiny Mac Fixups
shibbo · Nov 7, 2023 · b37591e · b37591e
2 parents 858b30e + 1f76524
commit b37591e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -21,7 +21,7 @@ jobs:
       with:
         dotnet-version: 8.0.x
     - name: Install NativeFileDialogSharp
-      run: dotnet add Fushigi/Fushigi.csproj package NativeFileDialogSharp 
+      run: dotnet add Fushigi/Fushigi.csproj package NativeFileDialogSharp --version 0.6.0-alpha
     - name: Install Newtonsoft.Json
       run: dotnet add Fushigi/Fushigi.csproj package Newtonsoft.Json 
     - name: Install Silk.NET.Core

diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ Fushigi.Byml/.vs/*
 Fushigi.Byml/bin/*
 Fushigi.Byml/obj/*
 SARC/bin/*
-SARC/obj/*
+SARC/obj/*
+.DS_Store
diff --git a/Fushigi/Fushigi.csproj b/Fushigi/Fushigi.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NativeFileDialogSharp" Version="0.5.0" />
+    <PackageReference Include="NativeFileDialogSharp" Version="0.6.0-alpha" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Silk.NET.Core" Version="2.17.1" />
     <PackageReference Include="Silk.NET.GLFW" Version="2.17.1" />

diff --git a/Fushigi/param/ParamLoader.cs b/Fushigi/param/ParamLoader.cs
@@ -15,9 +15,9 @@ public static void Load()
             mParams = new Dictionary<string, ParamHolder>();
             var nodes = JsonNode.Parse(
                 File.ReadAllText(
-                    Path.Combine("res", "AreaParam.json")
-                    )
-                ).AsObject();
+                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "res", "AreaParam.json")
+                )
+            ).AsObject();
             ParamHolder areaParms = new ParamHolder();
 
             foreach (KeyValuePair<string, JsonNode> obj in nodes)