fix bug that cards moving weirdly from grave when ritual summoning

Assets/MD/Scripts/Shortcuts.cs

@@ -197,11 +197,11 @@ public class Shortcuts : MonoBehaviour
             hasChanged = false;
         }
 
-        Time.timeScale = timescale;
-        if (message != Program.I().ocgcore.currentMessage)
-        {
-            message = Program.I().ocgcore.currentMessage;
-            Debug.Log(message);
-        }
+        //Time.timeScale = timescale;
+        //if (message != Program.I().ocgcore.currentMessage)
+        //{
+        //    message = Program.I().ocgcore.currentMessage;
+        //    Debug.Log(message);
+        //}
     }
 }

Assets/MD/Scripts/TimelineSEControl.cs

@@ -196,7 +196,6 @@ public class TimelineSEControl : MonoBehaviour
         if(type == "RITUAL")
             if (director.time > (director.duration - 1f))
             {
-                Debug.Log("mark1");
                 card.gameObject.transform.position = new Vector3(0, 65f, -26.142f);
                 card.gameObject.transform.eulerAngles = new Vector3(-20f, 0f, 0f);
                 this.enabled = false;

Assets/SibylSystem/Ocgcore/OCGobjects/gameCard.cs

@@ -1231,18 +1231,40 @@ public class gameCard : OCGobject
 
                 if (fromGrave)
                 {
-                    cardAnimation.PlayDelayedAnimation("duelffromgrave", time_delay_fromGraveOrExclude);
-                    foreach (var btn in Program.I().ocgcore.gameField.gameHiddenButtons)
-                        btn.PlayParticle(p.controller, (uint)CardLocation.Grave, false, time_delay_fromGraveOrExclude);
+                    if (summonAnimation)
+                    {
+                        gameObject.transform.position = new Vector3(0, -50, 0);
+                        cardModel.localEulerAngles = new Vector3(90, 0, 0);
+                        cardModel.localScale = new Vector3(1, 1, 1);
+                        cardModel.localPosition = Vector3.zero;
+                        rise = true;
+                    }
+                    else
+                    {
+                        cardAnimation.PlayDelayedAnimation("duelffromgrave", time_delay_fromGraveOrExclude);
+                        foreach (var btn in Program.I().ocgcore.gameField.gameHiddenButtons)
+                            btn.PlayParticle(p.controller, (uint)CardLocation.Grave, false, time_delay_fromGraveOrExclude);
+                    }
                 }
                 else if (fromExclude)
                 {
-                    if(p_moveBefore != null && (p_moveBefore.position & (uint)CardPosition.FaceDown) > 0)
-                        cardAnimation.PlayDelayedAnimation("duelffromexclude_back", time_delay_fromGraveOrExclude);
+                    if (summonAnimation)
+                    {
+                        gameObject.transform.position = new Vector3(0, -50, 0);
+                        cardModel.localEulerAngles = new Vector3(90, 0, 0);
+                        cardModel.localScale = new Vector3(1, 1, 1);
+                        cardModel.localPosition = Vector3.zero;
+                        rise = true;
+                    }
                     else
-                        cardAnimation.PlayDelayedAnimation("duelffromexclude", time_delay_fromGraveOrExclude);
-                    foreach (var btn in Program.I().ocgcore.gameField.gameHiddenButtons)
-                        btn.PlayParticle(p.controller, (uint)CardLocation.Removed, false, time_delay_fromGraveOrExclude);
+                    {
+                        if (p_moveBefore != null && (p_moveBefore.position & (uint)CardPosition.FaceDown) > 0)
+                            cardAnimation.PlayDelayedAnimation("duelffromexclude_back", time_delay_fromGraveOrExclude);
+                        else
+                            cardAnimation.PlayDelayedAnimation("duelffromexclude", time_delay_fromGraveOrExclude);
+                        foreach (var btn in Program.I().ocgcore.gameField.gameHiddenButtons)
+                            btn.PlayParticle(p.controller, (uint)CardLocation.Removed, false, time_delay_fromGraveOrExclude);
+                    }
                 }
                 if (toGrave)
                 {
@@ -1261,11 +1283,12 @@ public class gameCard : OCGobject
                 }
                 if (rise)
                 {
-                    if(toExclude && (p.position & (uint)CardPosition.FaceDown) > 0)
+                    if((fromGrave || fromExclude) && summonAnimation)
+                        cardAnimation.PlayDelayedAnimation("card_rise", time_delay_move);
+                    else if(toExclude && (p.position & (uint)CardPosition.FaceDown) > 0)
                         cardAnimation.PlayDelayedAnimation("card_rise_back", time_delay_rise);
                     else
                         cardAnimation.PlayDelayedAnimation("card_rise", time_delay_rise);
-
                 }
                 if (landing)
                 {

Assets/transUI/prefab/trans_selectPuzzle.prefab

@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 441456}
   - component: {fileID: 11447568}
-  m_Layer: 5
+  m_Layer: 8
   m_Name: glass
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -106,7 +106,7 @@ GameObject:
   - component: {fileID: 11195002}
   - component: {fileID: 11465418}
   - component: {fileID: 11460658}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: exit_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -270,7 +270,7 @@ GameObject:
   m_Component:
   - component: {fileID: 441364}
   - component: {fileID: 11406652}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: GameObject
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -348,7 +348,7 @@ GameObject:
   m_Component:
   - component: {fileID: 400784}
   - component: {fileID: 11437968}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: '!lable'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -448,7 +448,7 @@ GameObject:
   - component: {fileID: 11488310}
   - component: {fileID: 6536596}
   - component: {fileID: 11429688}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: bar_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -482,10 +482,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3c8d596c16f05d949922ef16347e4cc9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  thumb: {fileID: 411742}
+  thumb: {fileID: 0}
   mBG: {fileID: 0}
   mFG: {fileID: 11483778}
-  mValue: 0.13
+  mValue: 0
   mFill: 3
   numberOfSteps: 0
   onChange: []
@@ -493,7 +493,7 @@ MonoBehaviour:
   rawValue: 1
   direction: 2
   mInverted: 0
-  mSize: 0.163
+  mSize: 0.2
   mScroll: 0.6
   mDir: 2
 --- !u!65 &6536596
@@ -570,7 +570,7 @@ GameObject:
   m_Component:
   - component: {fileID: 437448}
   - component: {fileID: 11483542}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: panel_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -649,7 +649,7 @@ GameObject:
   - component: {fileID: 6587590}
   - component: {fileID: 11437270}
   - component: {fileID: 11483778}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: Foreground
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -681,8 +681,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 10, y: 59.552002, z: 0}
-  m_Center: {x: 0, y: 94.14576, z: 0}
+  m_Size: {x: 10, y: 70.799995, z: 0}
+  m_Center: {x: 0, y: 121.600006, z: 0}
 --- !u!114 &11437270
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -740,7 +740,7 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 1
-  mColor: {r: 1, g: 1, b: 1, a: 0.27450982}
+  mColor: {r: 1, g: 1, b: 1, a: 0.5}
   mPivot: 4
   mWidth: 10
   mHeight: 314
@@ -772,7 +772,7 @@ GameObject:
   m_Component:
   - component: {fileID: 430162}
   - component: {fileID: 11473228}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: line_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -855,7 +855,7 @@ GameObject:
   - component: {fileID: 420264}
   - component: {fileID: 11432078}
   - component: {fileID: 11479770}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: deck
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -957,7 +957,7 @@ GameObject:
   - component: {fileID: 11482896}
   - component: {fileID: 6584774}
   - component: {fileID: 11496590}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: mainWindow
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1077,13 +1077,13 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 432674}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: trans_selectPuzzle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &432674
 Transform:
   m_ObjectHideFlags: 0
@@ -1093,7 +1093,7 @@ Transform:
   m_GameObject: {fileID: 186134}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
   m_Children:
   - {fileID: 441456}
   - {fileID: 441364}
@@ -1110,7 +1110,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1233342578}
   - component: {fileID: 1233342579}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: texture
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1196,7 +1196,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1557113927}
   - component: {fileID: 1557113928}
-  m_Layer: 19
+  m_Layer: 8
   m_Name: above_
   m_TagString: Untagged
   m_Icon: {fileID: 0}