batch move to grave or exclude

Assets/Addressables/Text/UpdateContent.txt

@@ -10,12 +10,13 @@ MDPro v1.2.0更新：
 	③"SavedCardFormat"，".jpg"或者".png"，调整保存卡图的格式。
 	PS：新增的选项会在至少运行一次新版本游戏后才会出现。
 5.现在，成为召唤素材的卡片会在同一时间飞出。
-6.编辑卡组界面的卡片详情能翻动查看上一张或下一张卡，快捷键：左右方向键。
-7.卡片详情页面现在能放大卡图了，快捷键：方向键上（放大）方向键下（还原）。
-8.卡片详情中保存卡图新增一键[保存所有卡图]和[一键保存所有衍生物卡图]的选项。
-9.修复决斗中无法在卡片详情中保存卡图的错误。
-10.修复安卓端[天霆号 阿宙斯]的卡片特效的显示错误。
-11.修复Windbot不能读取扩展卡的错误。
+6.合并同时去往墓地或除外区域的卡的移动。
+7.编辑卡组界面的卡片详情能翻动查看上一张或下一张卡，快捷键：左右方向键。
+8.卡片详情页面现在能放大卡图了，快捷键：方向键上（放大）方向键下（还原）。
+9.卡片详情中保存卡图新增一键[保存所有卡图]和[一键保存所有衍生物卡图]的选项。
+10.修复决斗中无法在卡片详情中保存卡图的错误。
+11.修复安卓端[天霆号 阿宙斯]的卡片特效的显示错误。
+12.修复Windbot不能读取扩展卡的错误。
 
 MDPro v1.1.9更新：
 1.新增部分自定义功能，设置文件位于“Data/Settings.json“：

Assets/Main.unity

@@ -23553,7 +23553,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1581995138}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -27811,7 +27811,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 931169952}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.6103896
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -54023,7 +54023,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 476827028}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.5975252
+  m_Size: 0.6561944
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -71793,7 +71793,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 948258731}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -98445,7 +98445,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 761159127}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.6629212
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -103723,7 +103723,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 2083794100}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.5588235
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -116507,7 +116507,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -1099.9994, y: 0}
+  m_AnchoredPosition: {x: -1099.9991, y: 0}
   m_SizeDelta: {x: -1100, y: 128}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1661354805
@@ -122766,7 +122766,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -59.999878, y: 0}
+  m_AnchoredPosition: {x: -60, y: 0}
   m_SizeDelta: {x: -1080, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1766834024

Assets/Scripts/MDPro3/Managers/TextureManager.cs

@@ -383,17 +383,18 @@ namespace MDPro3
             mat.mainTexture = task.Result;
             renderer.material = mat;
         }
-        public IEnumerator LoadDummyCard(ElementObjectManager manager, int code, bool active = false)
+        public IEnumerator LoadDummyCard(ElementObjectManager manager, int code, uint player, bool active = false)
         {
             if (active)
                 manager.gameObject.SetActive(false);
+            manager.GetElement<Renderer>("DummyCardModel_side").material = cardMatSide;
+            manager.GetElement<Renderer>("DummyCardModel_back").material = player == 0 ? Program.I().ocgcore.myProtector : Program.I().ocgcore.opProtector;
 
             var task = LoadCardAsync(code, false);
             while (!task.IsCompleted)
                 yield return null;
 
             var mat = GetCardMaterial(code);
-            manager.GetElement<Renderer>("DummyCardModel_side").material = cardMatSide;
             manager.GetElement<Renderer>("DummyCardModel_front").material = mat;
             manager.GetElement<Renderer>("DummyCardModel_front").material.mainTexture = task.Result;
             if (active)

Assets/Scripts/MDPro3/Managers/TimeLineManager.cs

@@ -404,7 +404,7 @@ namespace MDPro3
             var subManager = manager.GetElement<ElementObjectManager>("DummyCardXYZ");
             dummyCard = subManager.gameObject;
 
-            var ie = Program.I().texture_.LoadDummyCard(subManager, summonCard);
+            var ie = Program.I().texture_.LoadDummyCard(subManager, summonCard, 0);
             StartCoroutine(ie);
 
             Destroy(manager.GetElement("SummonXYZShowUnitCard0" + (materials.Count > 2 ? "3" : materials.Count.ToString())));
@@ -437,7 +437,7 @@ namespace MDPro3
             dummyCard = subManager.GetElement("DummyCardLink");
 
             var cardModel = subManager.GetElement<ElementObjectManager>("DummyCardLink");
-            var ie = Program.I().texture_.LoadDummyCard(cardModel, summonCard);
+            var ie = Program.I().texture_.LoadDummyCard(cardModel, summonCard, 0);
             StartCoroutine(ie);
 
             var postLink = subManager.GetElement<Renderer>("DummyCardLinkAdd");

Assets/Scripts/Tools/AssetBundleRobber.cs

@@ -58,8 +58,8 @@ public class AssetBundleRobber : MonoBehaviour
 
         masterDuelAssetBundlePath = masterDuelWindowsAssetBundlePath;
         workingPlace = windowsWorkingPlace;
-        //masterDuelAssetBundlePath = masterDuelAndroidAssetBundlePath;
-        //workingPlace = androindWorkingPlace;
+        masterDuelAssetBundlePath = masterDuelAndroidAssetBundlePath;
+        workingPlace = androindWorkingPlace;
 
         fullCopy = true;
         //fullCopy = false;

Assets/Texture/CardRenderTexture.renderTexture

@@ -18,7 +18,7 @@ RenderTexture:
   m_MipCount: -1
   m_DepthStencilFormat: 90
   m_ColorFormat: 8
-  m_MipMap: 0
+  m_MipMap: 1
   m_GenerateMips: 1
   m_SRGB: 0
   m_UseDynamicScale: 0