Commit dd3ad4b5 authored by SherryChaos's avatar SherryChaos

new multi platform struct

parent 0816fc25
File deleted
...@@ -18,6 +18,8 @@ ExportedObj/ ...@@ -18,6 +18,8 @@ ExportedObj/
*.svd *.svd
*.pdb *.pdb
/.utmp/ /.utmp/
.DS_Store
.vscode/
# Unity3D generated files # Unity3D generated files
[Ll]ibrary/ [Ll]ibrary/
...@@ -36,7 +38,6 @@ sysinfo.txt ...@@ -36,7 +38,6 @@ sysinfo.txt
*.gradle *.gradle
# MDPro3 Assets # MDPro3 Assets
/Android/
/AssetsUnused/ /AssetsUnused/
/[Dd]eck/ /[Dd]eck/
/[Ee]xpansions/ /[Ee]xpansions/
...@@ -45,7 +46,7 @@ sysinfo.txt ...@@ -45,7 +46,7 @@ sysinfo.txt
/[Pp]uzzle/ /[Pp]uzzle/
/[Rr]eplay/ /[Rr]eplay/
/[Ss]ound/ /[Ss]ound/
/StandaloneWindows64/ /Platforms/
/TempFolder/ /TempFolder/
Tools/YGO Classes/build/windows/build/ Tools/YGO Classes/build/windows/build/
Tools/YGO Classes/build/android/libs/ Tools/YGO Classes/build/android/libs/
......
...@@ -61,7 +61,7 @@ namespace MDPro3 ...@@ -61,7 +61,7 @@ namespace MDPro3
ret.len = 0; ret.len = 0;
var fileName2 = fileName.TrimStart('.', '/'); var fileName2 = fileName.TrimStart('.', '/');
if (fileName.StartsWith(Program.puzzlePath) || fileName.StartsWith(Program.tempFolder)) if (fileName.StartsWith(Program.puzzlePath) || fileName.StartsWith(Program.PATH_TEMP_FOLDER))
{ {
if (File.Exists(fileName)) if (File.Exists(fileName))
{ {
......
...@@ -32,10 +32,10 @@ namespace MDPro3.Duel.YGOSharp ...@@ -32,10 +32,10 @@ namespace MDPro3.Duel.YGOSharp
if (file.ToLower().EndsWith("lflist.conf")) if (file.ToLower().EndsWith("lflist.conf"))
{ {
var e = zip[file]; var e = zip[file];
if (!Directory.Exists(Program.tempFolder)) if (!Directory.Exists(Program.PATH_TEMP_FOLDER))
Directory.CreateDirectory(Program.tempFolder); Directory.CreateDirectory(Program.PATH_TEMP_FOLDER);
var tempFile = Path.Combine(Path.GetFullPath(Program.tempFolder), file); var tempFile = Path.Combine(Path.GetFullPath(Program.PATH_TEMP_FOLDER), file);
e.Extract(Path.GetFullPath(Program.tempFolder), ExtractExistingFileAction.OverwriteSilently); e.Extract(Path.GetFullPath(Program.PATH_TEMP_FOLDER), ExtractExistingFileAction.OverwriteSilently);
reader = new StreamReader(tempFile); reader = new StreamReader(tempFile);
InitializeFromReader(reader); InitializeFromReader(reader);
reader.Close(); reader.Close();
......
...@@ -43,10 +43,10 @@ namespace MDPro3.Duel.YGOSharp ...@@ -43,10 +43,10 @@ namespace MDPro3.Duel.YGOSharp
if (file.ToLower().EndsWith(".cdb")) if (file.ToLower().EndsWith(".cdb"))
{ {
var e = zip[file]; var e = zip[file];
if (!Directory.Exists(Program.tempFolder)) if (!Directory.Exists(Program.PATH_TEMP_FOLDER))
Directory.CreateDirectory(Program.tempFolder); Directory.CreateDirectory(Program.PATH_TEMP_FOLDER);
var tempFile = Path.Combine(Path.GetFullPath(Program.tempFolder), file); var tempFile = Path.Combine(Path.GetFullPath(Program.PATH_TEMP_FOLDER), file);
e.Extract(Path.GetFullPath(Program.tempFolder), ExtractExistingFileAction.OverwriteSilently); e.Extract(Path.GetFullPath(Program.PATH_TEMP_FOLDER), ExtractExistingFileAction.OverwriteSilently);
LoadCDB(tempFile, isPreCards : Path.GetFileName(zip.Name) == "ygopro-super-pre.ypk"); LoadCDB(tempFile, isPreCards : Path.GetFileName(zip.Name) == "ygopro-super-pre.ypk");
File.Delete(tempFile); File.Delete(tempFile);
} }
...@@ -76,10 +76,10 @@ namespace MDPro3.Duel.YGOSharp ...@@ -76,10 +76,10 @@ namespace MDPro3.Duel.YGOSharp
if (file.ToLower().EndsWith(".cdb")) if (file.ToLower().EndsWith(".cdb"))
{ {
var e = zip[file]; var e = zip[file];
if (!Directory.Exists(Program.tempFolder)) if (!Directory.Exists(Program.PATH_TEMP_FOLDER))
Directory.CreateDirectory(Program.tempFolder); Directory.CreateDirectory(Program.PATH_TEMP_FOLDER);
var tempFile = Path.Combine(Path.GetFullPath(Program.tempFolder), file); var tempFile = Path.Combine(Path.GetFullPath(Program.PATH_TEMP_FOLDER), file);
e.Extract(Path.GetFullPath(Program.tempFolder), ExtractExistingFileAction.OverwriteSilently); e.Extract(Path.GetFullPath(Program.PATH_TEMP_FOLDER), ExtractExistingFileAction.OverwriteSilently);
LoadCDB(tempFile, true, isPreCards: Path.GetFileName(zip.Name) == "ygopro-super-pre.ypk"); LoadCDB(tempFile, true, isPreCards: Path.GetFileName(zip.Name) == "ygopro-super-pre.ypk");
File.Delete(tempFile); File.Delete(tempFile);
} }
......
...@@ -39,10 +39,10 @@ namespace MDPro3 ...@@ -39,10 +39,10 @@ namespace MDPro3
if (file.ToLower().EndsWith(".cdb")) if (file.ToLower().EndsWith(".cdb"))
{ {
var e = zip[file]; var e = zip[file];
if (!Directory.Exists(Program.tempFolder)) if (!Directory.Exists(Program.PATH_TEMP_FOLDER))
Directory.CreateDirectory(Program.tempFolder); Directory.CreateDirectory(Program.PATH_TEMP_FOLDER);
var tempFile = Path.Combine(Path.GetFullPath(Program.tempFolder), file); var tempFile = Path.Combine(Path.GetFullPath(Program.PATH_TEMP_FOLDER), file);
e.Extract(Path.GetFullPath(Program.tempFolder), ExtractExistingFileAction.OverwriteSilently); e.Extract(Path.GetFullPath(Program.PATH_TEMP_FOLDER), ExtractExistingFileAction.OverwriteSilently);
returnValue.Add(tempFile); returnValue.Add(tempFile);
} }
} }
......
...@@ -267,15 +267,23 @@ namespace MDPro3 ...@@ -267,15 +267,23 @@ namespace MDPro3
#region MonoBehaviors #region MonoBehaviors
public const string tempFolder = "TempFolder/"; public const string PATH_ROOT_EDITOR = "Platforms/";
public const string rootWindows64 = "StandaloneWindows64/"; public const string PATH_ROOT_WINDOWS64 = "StandaloneWindows64/";
public const string rootAndroid = "Android/"; public const string PATH_ROOT_ANDROID = "Android/";
public static string root = rootWindows64; public const string PATH_ROOT_IOS = "iOS/";
public const string PATH_TEMP_FOLDER = "TempFolder/";
public static string root = PATH_ROOT_WINDOWS64;
void Awake() void Awake()
{ {
#if UNITY_ANDROID #if UNITY_ANDROID
root = rootAndroid; root = PATH_ROOT_ANDROID;
#elif UNITY_IOS
root = PATH_ROOT_IOS;
#endif
#if UNITY_EDITOR
root = PATH_ROOT_EDITOR + root;
#endif #endif
instance = this; instance = this;
Initialize(); Initialize();
...@@ -420,8 +428,8 @@ namespace MDPro3 ...@@ -420,8 +428,8 @@ namespace MDPro3
string cachePath = cacheDir.Call<string>("getAbsolutePath"); string cachePath = cacheDir.Call<string>("getAbsolutePath");
Tools.ClearDirectoryRecursively(new DirectoryInfo(cachePath)); Tools.ClearDirectoryRecursively(new DirectoryInfo(cachePath));
#else #else
if (Directory.Exists(tempFolder)) if (Directory.Exists(PATH_TEMP_FOLDER))
Directory.Delete(tempFolder, true); Directory.Delete(PATH_TEMP_FOLDER, true);
#endif #endif
} }
......
...@@ -462,7 +462,7 @@ namespace MDPro3.Servant ...@@ -462,7 +462,7 @@ namespace MDPro3.Servant
public void CameraZoomToMate0() public void CameraZoomToMate0()
{ {
if (Program.root == Program.rootAndroid) if (Program.root == Program.PATH_ROOT_ANDROID)
return; return;
if (Config.Get("MateViewTips", "0") == "0") if (Config.Get("MateViewTips", "0") == "0")
...@@ -487,7 +487,7 @@ namespace MDPro3.Servant ...@@ -487,7 +487,7 @@ namespace MDPro3.Servant
public void CameraZoomToMate1() public void CameraZoomToMate1()
{ {
if (Program.root == Program.rootAndroid) if (Program.root == Program.PATH_ROOT_ANDROID)
return; return;
if (Config.Get("MateViewTips", "0") == "0") if (Config.Get("MateViewTips", "0") == "0")
......
...@@ -136,9 +136,9 @@ namespace YgomGame.Bg ...@@ -136,9 +136,9 @@ namespace YgomGame.Bg
foreach(var ani in animator.parameters) foreach(var ani in animator.parameters)
animatorParams.Add(ani.name); animatorParams.Add(ani.name);
} }
if (disableLowEndPlatform && Program.root != Program.rootWindows64) if (disableLowEndPlatform && Program.root != Program.PATH_ROOT_WINDOWS64)
Destroy(gameObject); Destroy(gameObject);
if (enableLowEndPlatformOnly && Program.root == Program.rootWindows64) if (enableLowEndPlatformOnly && Program.root == Program.PATH_ROOT_WINDOWS64)
Destroy(gameObject); Destroy(gameObject);
if (playingOnlyActive) if (playingOnlyActive)
...@@ -147,12 +147,12 @@ namespace YgomGame.Bg ...@@ -147,12 +147,12 @@ namespace YgomGame.Bg
public bool PlayEffect(TriggerLabelDefine triggerLabel) public bool PlayEffect(TriggerLabelDefine triggerLabel)
{ {
if (disableLowEndPlatform && Program.root != Program.rootWindows64) if (disableLowEndPlatform && Program.root != Program.PATH_ROOT_WINDOWS64)
{ {
gameObject.SetActive(false); gameObject.SetActive(false);
return false; return false;
} }
if(enableLowEndPlatformOnly && Program.root == Program.rootWindows64) if(enableLowEndPlatformOnly && Program.root == Program.PATH_ROOT_WINDOWS64)
{ {
gameObject.SetActive(false); gameObject.SetActive(false);
return false; return false;
......
...@@ -23,9 +23,9 @@ namespace YgomSystem.UI.PropertyOverrider ...@@ -23,9 +23,9 @@ namespace YgomSystem.UI.PropertyOverrider
private void Start() private void Start()
{ {
if (m_Active.m_DefaultValue && Program.root != Program.rootWindows64) if (m_Active.m_DefaultValue && Program.root != Program.PATH_ROOT_WINDOWS64)
Destroy(gameObject); Destroy(gameObject);
if (m_Active.m_MobileValue && Program.root == Program.rootWindows64) if (m_Active.m_MobileValue && Program.root == Program.PATH_ROOT_WINDOWS64)
Destroy(gameObject); Destroy(gameObject);
} }
} }
......
...@@ -14,23 +14,29 @@ using System; ...@@ -14,23 +14,29 @@ using System;
public class AssetBundleRobber : MonoBehaviour public class AssetBundleRobber : MonoBehaviour
{ {
public Text text; public Text text;
static Text sText; private static Text sText;
string masterDuelAssetBundlePath;
string masterDuelWindowsAssetBundlePath = "D:/Game/Steam/steamapps/common/Yu-Gi-Oh! Master Duel/LocalData/16165626/0000/"; private string pathAB;
string masterDuelAndroidAssetBundlePath = "D:/Game/Steam/steamapps/common/Yu-Gi-Oh! Master Duel/LocalData/Android/0000/"; private string pathStore;
string workingPlace;
private const string PATH_AB_WINDOWS = "D:/Game/Steam/steamapps/common/Yu-Gi-Oh! Master Duel/LocalData/16165626/0000/";
private const string PATH_AB_ANDROID = "D:/Game/Steam/steamapps/common/Yu-Gi-Oh! Master Duel/LocalData/Android/0000/";
private const string PATH_AB_IOS = "D:/Game/Steam/steamapps/common/Yu-Gi-Oh! Master Duel/LocalData/iOS/0000/";
private const string PATH_STORE_WINDOWS = "Platforms/StandaloneWindows64/Robber/";
private const string PATH_STORE_ANDROID = "Platforms/Android/Robber/";
private const string PATH_STORE_IOS = "Platforms/iOS/Robber/";
public static int fileCount; public static int fileCount;
public static int currentFileCount; public static int currentFileCount;
readonly object _lock = new object(); private readonly object _lock = new();
bool noSave = false; private bool noSave = false;
ConcurrentQueue<string> logQueue = new ConcurrentQueue<string>(); private readonly ConcurrentQueue<string> logQueue = new();
int count = 0; private int count = 0;
AssetStudio.AssetsManager assetManager; private AssetStudio.AssetsManager assetManager;
bool fullCopy; private bool fullCopy;
string androindWorkingPlace = "Android/Robber/"; private readonly int threads = 32;
string windowsWorkingPlace = "StandaloneWindows64/Robber/";
int threads = 32;
public struct AssetbundleInfo public struct AssetbundleInfo
{ {
...@@ -58,11 +64,15 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -58,11 +64,15 @@ public class AssetBundleRobber : MonoBehaviour
//masterDuelAssetBundlePath = masterDuelWindowsAssetBundlePath; //masterDuelAssetBundlePath = masterDuelWindowsAssetBundlePath;
//workingPlace = windowsWorkingPlace; //workingPlace = windowsWorkingPlace;
masterDuelAssetBundlePath = masterDuelAndroidAssetBundlePath;
workingPlace = androindWorkingPlace;
//fullCopy = true; //pathAB = PATH_AB_ANDROID;
fullCopy = false; //pathStore = PATH_STORE_ANDROID;
pathAB = PATH_AB_IOS;
pathStore = PATH_STORE_IOS;
fullCopy = true;
//fullCopy = false;
Initialize(); Initialize();
...@@ -76,11 +86,11 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -76,11 +86,11 @@ public class AssetBundleRobber : MonoBehaviour
{ {
if (file.path == path) if (file.path == path)
{ {
Directory.CreateDirectory(workingPlace + path); Directory.CreateDirectory(pathStore + path);
File.Copy(GetFullPath(file.path), workingPlace + path + "/" + file.path); File.Copy(GetFullPath(file.path), pathStore + path + "/" + file.path);
foreach (var dep in file.dependencies) foreach (var dep in file.dependencies)
{ {
File.Copy(GetFullPath(dep), workingPlace + path + "/" + dep); File.Copy(GetFullPath(dep), pathStore + path + "/" + dep);
} }
} }
...@@ -91,11 +101,11 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -91,11 +101,11 @@ public class AssetBundleRobber : MonoBehaviour
void Initialize() void Initialize()
{ {
if (!Directory.Exists(workingPlace)) if (!Directory.Exists(pathStore))
Directory.CreateDirectory(workingPlace); Directory.CreateDirectory(pathStore);
var fullText = ""; var fullText = "";
if (File.Exists(workingPlace + "FileList.txt")) if (File.Exists(pathStore + "FileList.txt"))
fullText = File.ReadAllText(workingPlace + "FileList.txt"); fullText = File.ReadAllText(pathStore + "FileList.txt");
else else
noSave = true; noSave = true;
var lines = fullText.Replace("\r", "").Split('\n'); var lines = fullText.Replace("\r", "").Split('\n');
...@@ -169,7 +179,7 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -169,7 +179,7 @@ public class AssetBundleRobber : MonoBehaviour
IEnumerator RefreshFileResources() IEnumerator RefreshFileResources()
{ {
var ie = assetManager.LoadFolderAsync(masterDuelAssetBundlePath); var ie = assetManager.LoadFolderAsync(pathAB);
StartCoroutine(ie); StartCoroutine(ie);
while (ie.MoveNext()) while (ie.MoveNext())
yield return null; yield return null;
...@@ -192,13 +202,13 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -192,13 +202,13 @@ public class AssetBundleRobber : MonoBehaviour
{ {
text.text = "Logging: " + count + "/" + assetManager.assetsFileList.Count; text.text = "Logging: " + count + "/" + assetManager.assetsFileList.Count;
if (logQueue.TryDequeue(out var log)) if (logQueue.TryDequeue(out var log))
File.AppendAllText(workingPlace + "FileList.txt", log); File.AppendAllText(pathStore + "FileList.txt", log);
yield return null; yield return null;
} }
while (logQueue.TryDequeue(out var log)) while (logQueue.TryDequeue(out var log))
{ {
File.AppendAllText(workingPlace + "FileList.txt", log); File.AppendAllText(pathStore + "FileList.txt", log);
text.text = "Writing Left: " + logQueue.Count; text.text = "Writing Left: " + logQueue.Count;
yield return null; yield return null;
} }
...@@ -294,42 +304,42 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -294,42 +304,42 @@ public class AssetBundleRobber : MonoBehaviour
var type = GetAssetType(file.name); var type = GetAssetType(file.name);
if (type == AssetType.AvatarStand) if (type == AssetType.AvatarStand)
{ {
if (!Directory.Exists(workingPlace + "AvatarStand")) if (!Directory.Exists(pathStore + "AvatarStand"))
Directory.CreateDirectory(workingPlace + "AvatarStand"); Directory.CreateDirectory(pathStore + "AvatarStand");
var targetName = workingPlace + "AvatarStand/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("avatarstand_", "AvatarStand_"); var targetName = pathStore + "AvatarStand/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("avatarstand_", "AvatarStand_");
if (!File.Exists(targetName)) if (!File.Exists(targetName))
File.Copy(GetFullPath(file.path), targetName); File.Copy(GetFullPath(file.path), targetName);
} }
else if (type == AssetType.Frame) else if (type == AssetType.Frame)
{ {
if (!Directory.Exists(workingPlace + "Frame")) if (!Directory.Exists(pathStore + "Frame"))
Directory.CreateDirectory(workingPlace + "Frame"); Directory.CreateDirectory(pathStore + "Frame");
var targetName = workingPlace + "Frame/" + Path.GetFileName(file.name).Replace(".mat", "").Replace("profileframemat", "ProfileFrameMat"); var targetName = pathStore + "Frame/" + Path.GetFileName(file.name).Replace(".mat", "").Replace("profileframemat", "ProfileFrameMat");
File.Copy(GetFullPath(file.path), targetName); File.Copy(GetFullPath(file.path), targetName);
} }
else if (type == AssetType.Grave) else if (type == AssetType.Grave)
{ {
if (!Directory.Exists(workingPlace + "Grave")) if (!Directory.Exists(pathStore + "Grave"))
Directory.CreateDirectory(workingPlace + "Grave"); Directory.CreateDirectory(pathStore + "Grave");
var targetName = workingPlace + "Grave/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("grave_", "Grave_"); var targetName = pathStore + "Grave/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("grave_", "Grave_");
if (!File.Exists(targetName)) if (!File.Exists(targetName))
File.Copy(GetFullPath(file.path), targetName); File.Copy(GetFullPath(file.path), targetName);
} }
else if (type == AssetType.Mat) else if (type == AssetType.Mat)
{ {
if (!Directory.Exists(workingPlace + "Mat")) if (!Directory.Exists(pathStore + "Mat"))
Directory.CreateDirectory(workingPlace + "Mat"); Directory.CreateDirectory(pathStore + "Mat");
var targetName = workingPlace + "Mat/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("mat_", "Mat_"); var targetName = pathStore + "Mat/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("mat_", "Mat_");
if (!File.Exists(targetName)) if (!File.Exists(targetName))
File.Copy(GetFullPath(file.path), targetName); File.Copy(GetFullPath(file.path), targetName);
} }
else if (type == AssetType.Mate) else if (type == AssetType.Mate)
{ {
if (!Directory.Exists(workingPlace + "Mate")) if (!Directory.Exists(pathStore + "Mate"))
Directory.CreateDirectory(workingPlace + "Mate"); Directory.CreateDirectory(pathStore + "Mate");
var targetName = workingPlace + "Mate/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("_model", "_Model").Replace("_sd_", "_SD_").Replace("m", "M").Replace("v", "V"); var targetName = pathStore + "Mate/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("_model", "_Model").Replace("_sd_", "_SD_").Replace("m", "M").Replace("v", "V");
if (file.dependencies.Count == 0) if (file.dependencies.Count == 0)
{ {
...@@ -356,10 +366,10 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -356,10 +366,10 @@ public class AssetBundleRobber : MonoBehaviour
} }
else if (type == AssetType.Protector) else if (type == AssetType.Protector)
{ {
if (!Directory.Exists(workingPlace + "Protector")) if (!Directory.Exists(pathStore + "Protector"))
Directory.CreateDirectory(workingPlace + "Protector"); Directory.CreateDirectory(pathStore + "Protector");
string subDir = "107" + Regex.Split(file.name, "/")[4]; string subDir = "107" + Regex.Split(file.name, "/")[4];
var targetFolder = workingPlace + "Protector/" + subDir; var targetFolder = pathStore + "Protector/" + subDir;
var targetName = targetFolder + "/" + Path.GetFileName(file.name).Replace("pmat.mat", subDir).Replace("protectoricon", "ProtectorIcon").Replace(".png", ""); var targetName = targetFolder + "/" + Path.GetFileName(file.name).Replace("pmat.mat", subDir).Replace("protectoricon", "ProtectorIcon").Replace(".png", "");
if (!Directory.Exists(targetFolder)) if (!Directory.Exists(targetFolder))
...@@ -368,10 +378,10 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -368,10 +378,10 @@ public class AssetBundleRobber : MonoBehaviour
} }
else if (type == AssetType.Wallpaper) else if (type == AssetType.Wallpaper)
{ {
if (!Directory.Exists(workingPlace + "Wallpaper")) if (!Directory.Exists(pathStore + "Wallpaper"))
Directory.CreateDirectory(workingPlace + "Wallpaper"); Directory.CreateDirectory(pathStore + "Wallpaper");
var subDir = Path.GetFileName(file.name).Replace(".prefab", "").Replace("front", "Front"); var subDir = Path.GetFileName(file.name).Replace(".prefab", "").Replace("front", "Front");
var targetFolder = workingPlace + "Wallpaper/" + subDir; var targetFolder = pathStore + "Wallpaper/" + subDir;
if (!Directory.Exists(targetFolder)) if (!Directory.Exists(targetFolder))
Directory.CreateDirectory(targetFolder); Directory.CreateDirectory(targetFolder);
File.Copy(GetFullPath(file.path), targetFolder + "/" + subDir); File.Copy(GetFullPath(file.path), targetFolder + "/" + subDir);
...@@ -386,10 +396,10 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -386,10 +396,10 @@ public class AssetBundleRobber : MonoBehaviour
} }
else if (type == AssetType.Background) else if (type == AssetType.Background)
{ {
if (!Directory.Exists(workingPlace + "Background")) if (!Directory.Exists(pathStore + "Background"))
Directory.CreateDirectory(workingPlace + "Background"); Directory.CreateDirectory(pathStore + "Background");
string subDir = Path.GetFileName(file.name).Replace("back", "Back").Replace(".prefab", ""); string subDir = Path.GetFileName(file.name).Replace("back", "Back").Replace(".prefab", "");
var targetFolder = workingPlace + "Background/" + subDir; var targetFolder = pathStore + "Background/" + subDir;
if (!Directory.Exists(targetFolder)) if (!Directory.Exists(targetFolder))
Directory.CreateDirectory(targetFolder); Directory.CreateDirectory(targetFolder);
if (!File.Exists(targetFolder + "/" + subDir)) if (!File.Exists(targetFolder + "/" + subDir))
...@@ -407,15 +417,15 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -407,15 +417,15 @@ public class AssetBundleRobber : MonoBehaviour
} }
else if (type == AssetType.Card) else if (type == AssetType.Card)
{ {
if (!Directory.Exists(workingPlace + "Card")) if (!Directory.Exists(pathStore + "Card"))
Directory.CreateDirectory(workingPlace + "Card"); Directory.CreateDirectory(pathStore + "Card");
string subDir = int.Parse(Regex.Split(file.name, "/")[6].Replace("ef", "")).ToString(); string subDir = int.Parse(Regex.Split(file.name, "/")[6].Replace("ef", "")).ToString();
subDir = GetYdkID(subDir); subDir = GetYdkID(subDir);
if (file.name.Contains("/highend_hd/")) if (file.name.Contains("/highend_hd/"))
subDir = "HD" + subDir; subDir = "HD" + subDir;
else if (file.name.Contains("/sd/")) else if (file.name.Contains("/sd/"))
subDir = "SD" + subDir; subDir = "SD" + subDir;
var targetFolder = workingPlace + "Card/" + subDir; var targetFolder = pathStore + "Card/" + subDir;
if (!Directory.Exists(targetFolder)) if (!Directory.Exists(targetFolder))
Directory.CreateDirectory(targetFolder); Directory.CreateDirectory(targetFolder);
File.Copy(GetFullPath(file.path), targetFolder + "/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("ef", "Ef")); File.Copy(GetFullPath(file.path), targetFolder + "/" + Path.GetFileName(file.name).Replace(".prefab", "").Replace("ef", "Ef"));
...@@ -434,13 +444,13 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -434,13 +444,13 @@ public class AssetBundleRobber : MonoBehaviour
else if (type == AssetType.MonsterCutin) else if (type == AssetType.MonsterCutin)
{ {
if (file.name.Contains("/sd/")) if (file.name.Contains("/sd/"))
if (workingPlace.Contains("Windows")) if (pathStore.Contains("Windows"))
continue; continue;
if (!Directory.Exists(workingPlace + "MonsterCutin")) if (!Directory.Exists(pathStore + "MonsterCutin"))
Directory.CreateDirectory(workingPlace + "MonsterCutin"); Directory.CreateDirectory(pathStore + "MonsterCutin");
string subDir = Regex.Split(file.name, "/")[7].Replace("p", ""); string subDir = Regex.Split(file.name, "/")[7].Replace("p", "");
subDir = GetYdkID(subDir); subDir = GetYdkID(subDir);
var targetFolder = workingPlace + "MonsterCutin/" + subDir; var targetFolder = pathStore + "MonsterCutin/" + subDir;
if (!Directory.Exists(targetFolder)) if (!Directory.Exists(targetFolder))
Directory.CreateDirectory(targetFolder); Directory.CreateDirectory(targetFolder);
File.Copy(GetFullPath(file.path), targetFolder + "/" + file.path); File.Copy(GetFullPath(file.path), targetFolder + "/" + file.path);
...@@ -459,10 +469,10 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -459,10 +469,10 @@ public class AssetBundleRobber : MonoBehaviour
else if (type == AssetType.SpecialWin) else if (type == AssetType.SpecialWin)
{ {
if (file.name.Contains("/sd/")) if (file.name.Contains("/sd/"))
if (workingPlace.Contains("Windows")) if (pathStore.Contains("Windows"))
continue; continue;
if (!Directory.Exists(workingPlace + "SpecialWin")) if (!Directory.Exists(pathStore + "SpecialWin"))
Directory.CreateDirectory(workingPlace + "SpecialWin"); Directory.CreateDirectory(pathStore + "SpecialWin");
string subDir = Regex.Split(file.name, "/")[8]; string subDir = Regex.Split(file.name, "/")[8];
if (subDir.Contains(".prefab"))//4027 艾克佐迪亚 if (subDir.Contains(".prefab"))//4027 艾克佐迪亚
{ {
...@@ -471,7 +481,7 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -471,7 +481,7 @@ public class AssetBundleRobber : MonoBehaviour
else else
subDir = subDir.Replace("p", ""); subDir = subDir.Replace("p", "");
subDir = GetYdkID(subDir); subDir = GetYdkID(subDir);
var targetFolder = workingPlace + "SpecialWin/" + subDir; var targetFolder = pathStore + "SpecialWin/" + subDir;
if (!Directory.Exists(targetFolder)) if (!Directory.Exists(targetFolder))
Directory.CreateDirectory(targetFolder); Directory.CreateDirectory(targetFolder);
File.Copy(GetFullPath(file.path), targetFolder + "/" + subDir); File.Copy(GetFullPath(file.path), targetFolder + "/" + subDir);
...@@ -489,37 +499,37 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -489,37 +499,37 @@ public class AssetBundleRobber : MonoBehaviour
} }
else if (type == AssetType.BGM) else if (type == AssetType.BGM)
{ {
if (!Directory.Exists(workingPlace + "Sound/BGM")) if (!Directory.Exists(pathStore + "Sound/BGM"))
Directory.CreateDirectory(workingPlace + "Sound/BGM"); Directory.CreateDirectory(pathStore + "Sound/BGM");
var targetName = workingPlace + "Sound/BGM/" + Path.GetFileName(file.name).Replace(".wav", ""); var targetName = pathStore + "Sound/BGM/" + Path.GetFileName(file.name).Replace(".wav", "");
File.Copy(GetFullPath(file.path), targetName); File.Copy(GetFullPath(file.path), targetName);
} }
else if (type == AssetType.SE_DUEL) else if (type == AssetType.SE_DUEL)
{ {
if (!Directory.Exists(workingPlace + "Sound/SE_DUEL")) if (!Directory.Exists(pathStore + "Sound/SE_DUEL"))
Directory.CreateDirectory(workingPlace + "Sound/SE_DUEL"); Directory.CreateDirectory(pathStore + "Sound/SE_DUEL");
var targetName = workingPlace + "Sound/SE_DUEL/" + Path.GetFileName(file.name).Replace(".wav", ""); var targetName = pathStore + "Sound/SE_DUEL/" + Path.GetFileName(file.name).Replace(".wav", "");
File.Copy(GetFullPath(file.path), targetName); File.Copy(GetFullPath(file.path), targetName);
} }
else if (type == AssetType.SE_FIELD) else if (type == AssetType.SE_FIELD)
{ {
if (!Directory.Exists(workingPlace + "Sound/SE_FIELD")) if (!Directory.Exists(pathStore + "Sound/SE_FIELD"))
Directory.CreateDirectory(workingPlace + "Sound/SE_FIELD"); Directory.CreateDirectory(pathStore + "Sound/SE_FIELD");
var targetName = workingPlace + "Sound/SE_FIELD/" + Path.GetFileName(file.name).Replace(".wav", ""); var targetName = pathStore + "Sound/SE_FIELD/" + Path.GetFileName(file.name).Replace(".wav", "");
File.Copy(GetFullPath(file.path), targetName); File.Copy(GetFullPath(file.path), targetName);
} }
else if (type == AssetType.SE_MATE) else if (type == AssetType.SE_MATE)
{ {
if (!Directory.Exists(workingPlace + "Sound/SE_MATE")) if (!Directory.Exists(pathStore + "Sound/SE_MATE"))
Directory.CreateDirectory(workingPlace + "Sound/SE_MATE"); Directory.CreateDirectory(pathStore + "Sound/SE_MATE");
var targetName = workingPlace + "Sound/SE_MATE/" + Path.GetFileName(file.name).Replace(".wav", ""); var targetName = pathStore + "Sound/SE_MATE/" + Path.GetFileName(file.name).Replace(".wav", "");
File.Copy(GetFullPath(file.path), targetName); File.Copy(GetFullPath(file.path), targetName);
} }
else if (type == AssetType.SE_SYS) else if (type == AssetType.SE_SYS)
{ {
if (!Directory.Exists(workingPlace + "Sound/SE_SYS")) if (!Directory.Exists(pathStore + "Sound/SE_SYS"))
Directory.CreateDirectory(workingPlace + "Sound/SE_SYS"); Directory.CreateDirectory(pathStore + "Sound/SE_SYS");
var targetName = workingPlace + "Sound/SE_SYS/" + Path.GetFileName(file.name).Replace(".wav", ""); var targetName = pathStore + "Sound/SE_SYS/" + Path.GetFileName(file.name).Replace(".wav", "");
try try
{ {
File.Copy(GetFullPath(file.path), targetName); File.Copy(GetFullPath(file.path), targetName);
...@@ -749,7 +759,7 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -749,7 +759,7 @@ public class AssetBundleRobber : MonoBehaviour
Debug.Log("Too short: " + path); Debug.Log("Too short: " + path);
return string.Empty; return string.Empty;
} }
var returnValue = masterDuelAssetBundlePath + path.Substring(0, 2) + "/" + path; var returnValue = pathAB + path.Substring(0, 2) + "/" + path;
//Debug.Log(path + ": " + returnValue); //Debug.Log(path + ": " + returnValue);
return returnValue; return returnValue;
} }
......
...@@ -6,9 +6,13 @@ Unity version: 6000.0.10f1 ...@@ -6,9 +6,13 @@ Unity version: 6000.0.10f1
### Other required folders ### Other required folders
* Android: You can find it from the Android apk. * Platforms/Android: You can find it from the Android apk.
* StandaloneWindows64: You can find it from the released MDPro3(windows). * Platforms/StandaloneWindows64: You can find it from the released MDPro3(windows).
* Platforms/iOS: You can find it from the released MDPro3(iOS).
* Platforms/Mac: You can find it from the released MDPro3(Mac).
* Picture/Art: https://code.mycard.moe/mycard/hd-arts * Picture/Art: https://code.mycard.moe/mycard/hd-arts
......
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