Commit 0f33a907 authored by hex's avatar hex

只有当入场动画完成后(canSave=true)才允许拖动卡组内的卡片

parent 21c130be
......@@ -1609,7 +1609,9 @@ public class DeckManager : ServantWithCardDescription
{
MonoCardInDeckManager cardInDeck = gameObject.GetComponent<MonoCardInDeckManager>();
cardPicLoader cardInSearchResult = gameObject.GetComponent<cardPicLoader>();
if (cardInDeck != null && !cardInDeck.dying)
// 只有当入场动画完成后(canSave=true)才允许拖动卡组内的卡片
// 防止动画进行中操作卡片导致的位置计算错误和卡片堆叠
if (cardInDeck != null && !cardInDeck.dying && canSave)
{
// 初始化长按/拖拽状态
cardForLongPress = cardInDeck;
......
......@@ -43,7 +43,7 @@ MonoBehaviour:
width: 1512
height: 916
m_ShowMode: 4
m_Title: Hierarchy
m_Title: Console
m_RootView: {fileID: 5}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
......@@ -97,7 +97,7 @@ MonoBehaviour:
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
controlID: 6766
controlID: 1969
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -193,7 +193,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 84
controlID: 14
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -218,7 +218,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 48
controlID: 15
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -243,7 +243,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 43
controlID: 16
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -263,8 +263,8 @@ MonoBehaviour:
y: 0
width: 282
height: 424
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 17}
......@@ -289,8 +289,8 @@ MonoBehaviour:
y: 0
width: 865
height: 424
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 21}
m_Panes:
- {fileID: 18}
......@@ -316,8 +316,8 @@ MonoBehaviour:
y: 424
width: 1147
height: 442
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 19}
m_Panes:
- {fileID: 16}
......@@ -458,7 +458,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 64.99939}
m_SelectedIDs: 08cd0000
m_LastClickedID: 52488
m_ExpandedIDs: 00000000fcae0000feae000000af000002af000004af000006af00000aaf00000caf00002abc000000ca9a3bffffff7f
m_ExpandedIDs: 000000001eaf000020af000022af000024af000026af000028af00002aaf00002caf00002eaf0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -486,7 +486,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000fcae0000feae000000af000002af000004af000006af000008af00000aaf00000caf0000
m_ExpandedIDs: 000000001eaf000020af000022af000024af000026af000028af00002aaf00002caf00002eaf0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -577,7 +577,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: d8c2e1ff28c3e1fff8c6e1ff3489f0ff848af0ff208cf0ff1e8ff0ff3692f0ff5a92f0ff6092f0ffc060f1ff04fbffff
m_ExpandedIDs: e0f7f1ff34f8f1ff04fcf1fffcfaffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -1074,7 +1074,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 1}
m_TargetSize: {x: 2778, y: 1284}
m_TargetSize: {x: 1600, y: 900}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 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