Merge branch 'patch' into 'master'

Refactor Trash Button function

See merge request sherry_chaos/MDPro3!38

Assets/Prefabs/ScriptableObjects/TextureContainer.asset

@@ -397,6 +397,9 @@ MonoBehaviour:
   chainNumSet7: {fileID: 21300000, guid: 5a4b900ee24dc5546861d48ce2e42150, type: 3}
   chainNumSet8: {fileID: 21300000, guid: 0ac64bc140f9d204886aed6f0dcf8eeb, type: 3}
   chainNumSet9: {fileID: 21300000, guid: 1514e0f4855cc744587659ea7eb86465, type: 3}
+  duelCardSelectionListFrame: {fileID: 21300000, guid: 7b65c898a762940478e77cdb545bac45, type: 3}
+  duelCardSelectionListViewIconHorizontal: {fileID: 21300000, guid: 5a5bd2c00c42fe440a5f3d62fade6359, type: 3}
+  duelCardSelectionListViewIconVertical: {fileID: 21300000, guid: 1a70faaead076664786c1564bcce5b79, type: 3}
   toggleM: {fileID: 21300000, guid: b4b6f990bf52e9e41a3157d2c0701a28, type: 3}
   toggleM_On: {fileID: 21300000, guid: 77342bb8b8bac73418a111be27a694e5, type: 3}
   toggleM_Over: {fileID: 21300000, guid: 03c22d822bdf72e4680c02fb6caa13a5, type: 3}

Assets/Prefabs/ServantUI/OcgCoreUI.prefab

@@ -1400,7 +1400,7 @@ RectTransform:
   m_Father: {fileID: 3141161628360550058}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1897,7 +1897,7 @@ RectTransform:
   m_Father: {fileID: 2601215752712795956}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -4510,7 +4510,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3547886573148048411
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4613,7 +4613,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 3411319760472490572}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.6103896
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -5858,7 +5858,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4644922332218632127
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7417,7 +7417,7 @@ RectTransform:
   m_Father: {fileID: 7903533369499340670}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -8315,7 +8315,7 @@ RectTransform:
   m_Father: {fileID: 4209928021973815270}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -10319,7 +10319,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1606593035982896797
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10904,7 +10904,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6648772700326188638
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scripts/MDPro3/ScriptableObjects/TextureContainer.cs

@@ -361,6 +361,9 @@ namespace MDPro3
         public Sprite chainNumSet9;
 
         [Header("Window")]
+        public Sprite duelCardSelectionListFrame;
+        public Sprite duelCardSelectionListViewIconHorizontal;
+        public Sprite duelCardSelectionListViewIconVertical;
         public Sprite toggleM;
         public Sprite toggleM_On;
         public Sprite toggleM_Over;