Commit 90dd4007 authored by nanahira's avatar nanahira

point osx root to dataPath directly

parent f1f39992
Pipeline #38963 failed with stages
in 44 minutes and 54 seconds
...@@ -101,7 +101,7 @@ namespace MDPro3 ...@@ -101,7 +101,7 @@ namespace MDPro3
List<AssetBundle> bundles = new List<AssetBundle>(); List<AssetBundle> bundles = new List<AssetBundle>();
DirectoryInfo dir = new DirectoryInfo(Program.root + path); DirectoryInfo dir = new DirectoryInfo(Program.root + path);
#if !UNITY_EDITOR && (UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN) #if !UNITY_EDITOR && UNITY_STANDALONE_WIN
dir = new DirectoryInfo(Path.Combine(Application.dataPath, Program.root + path)); dir = new DirectoryInfo(Path.Combine(Application.dataPath, Program.root + path));
#endif #endif
...@@ -153,7 +153,7 @@ namespace MDPro3 ...@@ -153,7 +153,7 @@ namespace MDPro3
List<AssetBundle> bundles = new List<AssetBundle>(); List<AssetBundle> bundles = new List<AssetBundle>();
DirectoryInfo dir = new DirectoryInfo(Program.root + path); DirectoryInfo dir = new DirectoryInfo(Program.root + path);
#if !UNITY_EDITOR && (UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN) #if !UNITY_EDITOR && UNITY_STANDALONE_WIN
dir = new DirectoryInfo(Path.Combine(Application.dataPath, Program.root + path)); dir = new DirectoryInfo(Path.Combine(Application.dataPath, Program.root + path));
#endif #endif
...@@ -224,7 +224,7 @@ namespace MDPro3 ...@@ -224,7 +224,7 @@ namespace MDPro3
} }
var folder = Program.root + "MasterDuel/Protector/" + code; var folder = Program.root + "MasterDuel/Protector/" + code;
#if !UNITY_EDITOR && (UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN) #if !UNITY_EDITOR && UNITY_STANDALONE_WIN
folder = Path.Combine(Application.dataPath, folder); folder = Path.Combine(Application.dataPath, folder);
#endif #endif
if (!Directory.Exists(folder)) if (!Directory.Exists(folder))
...@@ -386,4 +386,3 @@ namespace MDPro3 ...@@ -386,4 +386,3 @@ namespace MDPro3
} }
} }
...@@ -294,6 +294,8 @@ namespace MDPro3 ...@@ -294,6 +294,8 @@ namespace MDPro3
#if UNITY_EDITOR #if UNITY_EDITOR
root = PATH_ROOT_EDITOR + root; root = PATH_ROOT_EDITOR + root;
#elif UNITY_STANDALONE_OSX
root = Path.Combine(Application.dataPath, root)
#endif #endif
instance = this; instance = this;
Initialize(); Initialize();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment