Commit 117ecad5 authored by SherryChaos's avatar SherryChaos

bug fixing

parent f5512878
......@@ -1194,7 +1194,8 @@ namespace MDPro3
}));
if((p.location & (uint)CardLocation.Onfield) > 0
&& cacheP != null
&& (cacheP.location & (uint)CardLocation.Onfield) == 0)
&& (cacheP.location & (uint)CardLocation.Onfield) == 0
&& (p.location & (uint)CardLocation.Overlay) == 0)
{
sequence.Join(cardPlane.DOLocalMove(Vector3.up * 15f, moveTime * 0.5f).SetEase(Ease.InOutSine).OnComplete(() =>
{
......@@ -2553,7 +2554,7 @@ namespace MDPro3
}
else
{
if (CloseupConfig())
if (CloseupConfig() && (p.location & (uint)CardLocation.MonsterZone) > 0)
{
manager.GetElement<Transform>("DefaultShow").localEulerAngles = new Vector3(0f, 180f, 0f);
manager.GetElement<Transform>("DefaultHide").localEulerAngles = new Vector3(0f, 180f, 0f);
......
......@@ -1679,7 +1679,7 @@ namespace MDPro3
else if ((to.location & (uint)CardLocation.Hand) > 0)
{
textReason = InterString.Get("回到");
if ((from.location & (uint)CardLocation.Deck) > 0)
if ((from.location & ((uint)CardLocation.Deck + (uint)CardLocation.Extra)) > 0)
textReason = InterString.Get("加入");
if ((from.location & ((uint)CardLocation.Grave + (uint)CardLocation.Removed)) > 0)
textReason = InterString.Get("回收");
......
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