增加iPad使用的2100*1400分辨率；修复闪电按钮加速后无法选中的问题

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -698,6 +698,7 @@ public class Ocgcore : ServantWithCardDescription
         while (Packages.Count > 0)
         {
             Package currentPackage = Packages.Peek();
+            currentMessage = (GameMessage) currentPackage.Fuction;
             try
             {
                 logicalizeMessage(currentPackage);
@@ -722,7 +723,7 @@ public class Ocgcore : ServantWithCardDescription
             Packages.Dequeue();
         }
         keysTempCount = keys.Count;
-        if (paused == true)
+        if (paused)
         {
             EventDelegate.Execute(UIHelper.getByName<UIButton>(toolBar, "go_").onClick);
         }

Assets/YGOSharp/Card.cs

-using YGOSharp.OCGWrapper.Enums;
+using System;
 using System.Data;
-using System;
+using YGOSharp.OCGWrapper.Enums;
 
 namespace YGOSharp
 {
@@ -32,7 +32,7 @@ namespace YGOSharp
         public string packShortNam = "";
         public string packFullName = "";
         public string reality = "";
-        public string strSetName = "";  
+        public string strSetName = "";
         public int year = 0;
         public int month = 0;
         public int day = 0;
@@ -66,7 +66,7 @@ namespace YGOSharp
             return r;
         }
 
-        public void  cloneTo(Card r)
+        public void cloneTo(Card r)
         {
             r.Id = Id;
             r.Ot = Ot;
@@ -112,8 +112,9 @@ namespace YGOSharp
             return (HasType(CardType.Fusion) || HasType(CardType.Synchro) || HasType(CardType.Xyz) || HasType(CardType.Link));
         }
 
-        public bool IsCanPlayInRule(int hostInfoRule) {
-            if(hostInfoRule == -233 || hostInfoRule == 5)
+        public bool IsCanPlayInRule(int hostInfoRule)
+        {
+            if (hostInfoRule == -233 || hostInfoRule == 5)
                 return true;
             // TODO
             return true;
@@ -154,6 +155,6 @@ namespace YGOSharp
             this.Name = YGOSharp.CardsManager.nullName;
             this.Desc = YGOSharp.CardsManager.nullString;
         }
-        
+
     }
 }

Assets/old/UiverseAssests/art_plugin/attack_light_line/ocgcore/mod_ocgcore_atk_fire.prefab

@@ -4966,7 +4966,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 137080}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -20}
+  m_LocalPosition: {x: 7.3920126, y: 0, z: -10.794931}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/transUI/prefab/trans_setting.prefab

@@ -9151,6 +9151,7 @@ MonoBehaviour:
   - 1600*900
   - 1920*1080
   - 2560*1440
+  - 2100*1400
   padding: {x: 4, y: 4}
   textColor: {r: 1, g: 1, b: 1, a: 1}
   backgroundColor: {r: 0, g: 0, b: 0, a: 1}

UserSettings/Layouts/default-2021.dwlt

@@ -119,7 +119,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 73
+  controlID: 42
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 74
+  controlID: 43
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -165,11 +165,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1147
-    height: 462
+    height: 576
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 75
+  controlID: 44
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -188,9 +188,9 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 282.5
-    height: 462
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    height: 576
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -214,9 +214,9 @@ MonoBehaviour:
     x: 282.5
     y: 0
     width: 864.5
-    height: 462
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    height: 576
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 12}
@@ -233,23 +233,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 462
+    y: 576
     width: 1147
-    height: 404
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 15}
+    height: 290
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 15}
   - {fileID: 16}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -662,7 +662,7 @@ MonoBehaviour:
     x: 0
     y: 96
     width: 281.5
-    height: 441
+    height: 555
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -673,7 +673,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: a862e3fffa62e3ffd066e3ff7470e6ffc670e6ff9c74e6ff8e96e7ffe296e7ffba9ae7ff06fbffff
+      m_ExpandedIDs: a053edfff02deeff6c2eeeff902eeeff962eeeffa22eeeff2a30eeff2888f3ff209df3ff449df3ff4a9df3ff569df3ff6c9ef3ff1e9ff3fffaa0f3ff4aa1f3ff20a5f3ff92a6f3ffe2a6f3ffb8aaf3ff9e8ff4ff78a6f4ffc8f0f5ffecf0f5fff2f0f5fffef0f5ff18f2f5ff04fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -721,7 +721,7 @@ MonoBehaviour:
     x: 282.5
     y: 96
     width: 862.5
-    height: 441
+    height: 555
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -735,7 +735,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 1}
-  m_TargetSize: {x: 1600, y: 900}
+  m_TargetSize: {x: 1920, y: 1440}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -751,11 +751,11 @@ MonoBehaviour:
     - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
     pluginStates:
     - '{}'
-    scale: 21
+    scale: 20
     fitToScreenEnabled: 0
     rotationDegree: 270
     highlightSafeAreaEnabled: 0
-    friendlyName: Apple iPhone 13 Pro Max
+    friendlyName: Apple iPad Pro 12.9 (2018)
     networkReachability: 1
     systemLanguage: 10
 --- !u!114 &15
@@ -789,7 +789,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: trans_men
+    m_NameFilter: Setting
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -799,23 +799,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/ArtSystem/gameInfo
+    - Assets/SibylSystem/Menu
     m_Globs: []
-    m_OriginalText: trans_men
+    m_OriginalText: Setting
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/ArtSystem/gameInfo
+  - Assets/SibylSystem/Menu
   m_LastFoldersGridSize: -1
   m_LastProjectPath: /Users/hexzhou/Workplace/ygopro2_unity2021
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 179}
-    m_SelectedIDs: 0aaf0000
-    m_LastClickedID: 44810
-    m_ExpandedIDs: 00000000aaae0000acae0000aeae0000b0ae0000b2ae0000b4ae0000b6ae0000bcae000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 319}
+    m_SelectedIDs: d4ba0000
+    m_LastClickedID: 47828
+    m_ExpandedIDs: 00000000feae000000af000002af000004af000006af000008af00000aaf000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -843,7 +843,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000aaae0000acae0000aeae0000b0ae0000b2ae0000b4ae0000b6ae0000
+    m_ExpandedIDs: 00000000feae000000af000002af000004af000006af000008af00000aaf0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -921,9 +921,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 487
+    y: 672
     width: 1146
-    height: 454
+    height: 269
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default