new card particle effects

Assets/Addressables/Text/UpdateContent.txt

 MDPro3 v1.1.3更新：
 1.现在能设置决斗开始时是否自动加速了。
 2.现在能显示已知盖卡了，设置中可以关闭。
-3.修复SelectSum消息中，可选卡片数量为1时，点击不可选卡片会导致游戏无法继续的错误。
-4.修复上版本中，更改设置中的[画面质量]导致游戏背景异常的错误。
-5.修复部分情况下立绘为空白的错误。
-6.修复弹窗确认卡片时，使用快捷键关闭弹窗时游戏无法继续的错误。
+3.新增 [超融合] [技能抽取] [无限泡影] [闪电风暴] [效果遮蒙者]特效。
+4.修复SelectSum消息中，可选卡片数量为1时，点击不可选卡片会导致游戏无法继续的错误。
+5.修复上版本中，更改设置中的[画面质量]导致游戏背景异常的错误。
+6.修复部分情况下立绘为空白的错误。
+7.修复弹窗确认卡片时，使用快捷键关闭弹窗时游戏无法继续的错误。
 
 MDPro3 v1.1.2更新：
 1.现在房主能在房间中添加AI进行游戏了。

Assets/Main.unity

@@ -40464,7 +40464,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.000030517578}
+  m_AnchoredPosition: {x: 0, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &702608002
@@ -63165,7 +63165,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.000030517578}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &1117266860

Assets/Prefabs/PopupDuelSelectCardItem.prefab

@@ -1210,7 +1210,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1422,7 +1422,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Scripts/MDPro3/Duel/GameCard.cs

@@ -905,6 +905,7 @@ namespace MDPro3
                 foreach (var card in Program.I().ocgcore.cards)
                     card.RemoveTarget(this);
                 disabled = false;
+                setOverTurn = false;
                 RefreshData();
             }
 
@@ -955,6 +956,8 @@ namespace MDPro3
                     CreateModel();
                     ModelAt(p);
                     ShowFaceDownCardOrNot(NeedShowFaceDownCard());
+                    if (IsFaceDownOnSpellZone())
+                        setOverTurn = true;
                 }
                 return 0;
             }
@@ -2823,6 +2826,7 @@ namespace MDPro3
         }
 
         int setTurn = 0;
+        public bool setOverTurn;
         public void ShowFaceDownCardOrNot(bool show)
         {
             if (model == null)
@@ -2871,6 +2875,7 @@ namespace MDPro3
                 return;
 
             manager.GetElement("EffectDisquiet").SetActive(true);
+            setOverTurn = true;
         }
 
         #endregion

Assets/Scripts/MDPro3/UI/Handler/PlaceSelector.cs

@@ -579,5 +579,20 @@ namespace MDPro3.UI
             else
                 disable.SetActive(false);
         }
+
+        public bool InTheSameLine(GPS gps)
+        {
+            if ((gps.location & ((uint)CardLocation.Deck + (uint)CardLocation.Extra)) > 0)
+                return false;
+            if ((p.location & ((uint)CardLocation.Deck + (uint)CardLocation.Extra)) > 0)
+                return false;
+
+            if ((p.sequence == gps.sequence) && (p.controller == gps.controller))
+                return true;
+            if ((p.sequence == (4 - gps.sequence)) && (p.controller != gps.controller))
+                return true;
+
+            return false;
+        }
     }
 }

Assets/Scripts/Tools/AssetBundleRobber.cs

@@ -56,8 +56,8 @@ public class AssetBundleRobber : MonoBehaviour
 
         masterDuelAssetBundlePath = masterDuelWindowsAssetBundlePath;
         workingPlace = windowsWorkingPlace;
-        //masterDuelAssetBundlePath = masterDuelAndroidAssetBundlePath;
-        //workingPlace = androindWorkingPlace;
+        masterDuelAssetBundlePath = masterDuelAndroidAssetBundlePath;
+        workingPlace = androindWorkingPlace;
 
         fullCopy = true;
         //fullCopy = false;
@@ -66,7 +66,22 @@ public class AssetBundleRobber : MonoBehaviour
 
         //StartCoroutine(RefreshFileResources());
 
-        Copy("ecf3e547");//Fusion07445TrailFieldCard01
+        Copy("b9f86e1a");//Effects/Hit/Eff_Duel_HitEffect_00
+        Copy("20f13fa0");//Effects/Hit/Eff_Duel_HitEffect_03
+        Copy("ac8758eb");//Effects/MagicTrapEffects/fxp_05740_Area
+        Copy("6d07fd50");//Effects/MagicTrapEffects/fxp_05740_Card
+        Copy("1670a856");//Effects/MagicTrapEffects/fxp_13631_Area_Loop
+        Copy("6b1dcc84");//Effects/MagicTrapEffects/fxp_13631_Area
+        Copy("aa9d693f");//Effects/MagicTrapEffects/fxp_13631_Card
+        Copy("55f66563");//Effects/MagicTrapEffects/fxp_14876
+
+        Copy("138f1dcd");//Effects/MonsterEffectProcess/fxp_mep08933_01
+        Copy("1d6fc525");//Effects/Sacrifice/fxp_Sacrifice_fsn_001
+        Copy("1bd494f3");//Effects/Sacrifice/fxp_Sacrifice_fsn_ef07445_001
+        Copy("e93b1e20");//Effects/Sacrifice/fxp_Sacrifice_rtl_001
+
+
+
     }
 
     void Copy(string path)