Commit fc68c3f3 authored by SherryChaos's avatar SherryChaos

bug fix

parent fc32ab1e
...@@ -36,27 +36,35 @@ namespace MDPro3 ...@@ -36,27 +36,35 @@ namespace MDPro3
if (!Directory.Exists(Program.cardPicPath)) if (!Directory.Exists(Program.cardPicPath))
Directory.CreateDirectory(Program.cardPicPath); Directory.CreateDirectory(Program.cardPicPath);
var filePaths = Directory.GetFiles(Program.cardPicPath); var filePaths = Directory.GetFiles(Program.cardPicPath);
Export(filePaths); Export(filePaths, false);
} }
static void Export(string[] filePaths) static void Export(string[] filePaths, bool copy = true)
{ {
#if UNITY_ANDROID && !UNITY_EDITOR #if UNITY_ANDROID && !UNITY_EDITOR
NativeFilePicker.ExportMultipleFiles(filePaths, ExportResult); NativeFilePicker.ExportMultipleFiles(filePaths, ExportResult);
if(!copy)
foreach(var file in filePaths)
File.Delete(file);
#else #else
StandaloneFileBrowser.OpenFolderPanelAsync(InterString.Get("请选择导出目录"), "", false, (string[] paths) => StandaloneFileBrowser.OpenFolderPanelAsync(InterString.Get("请选择导出目录"), "", false, (string[] paths) =>
{ {
ExportFiles(paths, filePaths); ExportFiles(paths, filePaths, copy);
}); });
#endif #endif
} }
private static void ExportFiles(string[] result, string[] filePaths) private static void ExportFiles(string[] result, string[] filePaths, bool copy = true)
{ {
try try
{ {
foreach(var file in filePaths) foreach(var file in filePaths)
File.Copy(file, Path.Combine(result.FirstOrDefault(), Path.GetFileName(file))); {
if(copy)
File.Copy(file, Path.Combine(result.FirstOrDefault(), Path.GetFileName(file)));
else
File.Move(file, Path.Combine(result.FirstOrDefault(), Path.GetFileName(file)));
}
ExportResult(true); ExportResult(true);
} }
catch catch
......
...@@ -9,6 +9,7 @@ using YgomSystem.ElementSystem; ...@@ -9,6 +9,7 @@ using YgomSystem.ElementSystem;
using MDPro3.YGOSharp; using MDPro3.YGOSharp;
using MDPro3.YGOSharp.OCGWrapper.Enums; using MDPro3.YGOSharp.OCGWrapper.Enums;
using static MDPro3.EditDeck; using static MDPro3.EditDeck;
using DG.Tweening;
namespace MDPro3 namespace MDPro3
{ {
...@@ -370,6 +371,10 @@ namespace MDPro3 ...@@ -370,6 +371,10 @@ namespace MDPro3
var aspect = (float)tex.width / tex.height; var aspect = (float)tex.width / tex.height;
renderer.transform.localScale = new Vector3 (8f * aspect, 8f, 1f); renderer.transform.localScale = new Vector3 (8f * aspect, 8f, 1f);
renderer.gameObject.SetActive(true); renderer.gameObject.SetActive(true);
DOTween.To(() => 0f, x =>
{
renderer.transform.localScale = new Vector3(x * aspect, x, 1f);
}, 8f, 0.3f);
} }
public Texture2D GetNameMask(int code, bool cache = false) public Texture2D GetNameMask(int code, bool cache = false)
......
...@@ -193,13 +193,10 @@ namespace MDPro3 ...@@ -193,13 +193,10 @@ namespace MDPro3
loader.transform.SetParent(Program.I().container_2D, false); loader.transform.SetParent(Program.I().container_2D, false);
Destroy(loader, 1.6f); Destroy(loader, 1.6f);
if (diy) if (!diy)
{
}
else
{ {
loader.transform.GetChild(0).localPosition = Vector3.zero; loader.transform.GetChild(0).localPosition = Vector3.zero;
loader.transform.GetChild(0).GetComponent<PlayableDirector>().time = 0;
} }
//BackEffects //BackEffects
......
...@@ -135,7 +135,8 @@ PlayerSettings: ...@@ -135,7 +135,8 @@ PlayerSettings:
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 1.0.8 bundleVersion: 1.0.8
preloadedAssets: [] preloadedAssets:
- {fileID: 11400000, guid: 5fb02d2098f52054b89ce4a9f63ba9ee, type: 2}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1
......
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