Merge branch 'Test' of https://github.com/Unicorn369/YGOPro2_Droid into Android

Assets/ArtSystem/deckManager/MonoCardInDeckManager.cs

@@ -5,6 +5,7 @@ using System;
 public class MonoCardInDeckManager : MonoBehaviour {
     int loadedPicCode = 0;
     YGOSharp.Banlist loaded_banlist = null;
+    public bool dying = false;
     bool died = false;
     public YGOSharp.Card cardData=new YGOSharp.Card();
 
@@ -61,6 +62,7 @@ public class MonoCardInDeckManager : MonoBehaviour {
         }
         else
         {
+            dying = true;
             died = true;
             gameObject.SetActive(false);
         }
@@ -96,12 +98,13 @@ public class MonoCardInDeckManager : MonoBehaviour {
     {
         physicalON();
         isDraging = false;
-        if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl)||getIfAlive()==false)
+        if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl) || getIfAlive() == false)
         {
             Vector3 form_position = getGoodPosition(4);
             Vector3 to_position = getGoodPosition(0);
             Vector3 delta_position = to_position - form_position;
-            GetComponent<Rigidbody>().AddForce(delta_position * 200);
+            GetComponent<Rigidbody>().AddForce(delta_position * 1000);
+            dying = true;
         }
     }
 

Assets/NGUI/Scripts/UI/UICamera.cs

@@ -236,7 +236,7 @@ public class UICamera : MonoBehaviour
 	/// Whether the joystick and controller events will be processed.
 	/// </summary>
 
-	public bool useController = true;
+	public bool useController = false;
 
 	[System.Obsolete("Use new OnDragStart / OnDragOver / OnDragOut / OnDragEnd events instead")]
 	public bool stickyPress { get { return true; } }
@@ -372,7 +372,7 @@ public class UICamera : MonoBehaviour
 		}
 	}
 
-	static bool mDisableController = false;
+	static bool mDisableController = true;
 	static Vector2 mLastPos = Vector2.zero;
 
 	/// <summary>

Assets/SibylSystem/MonoHelpers/SuperScrollView.cs

@@ -212,7 +212,8 @@ public class SuperScrollView
     {
         moveFloat = panel.baseClipRegion.y + (panel.GetViewSize().y - heightOfEach) / 2 - 10;
         maxFloat = -(heightOfEach * Items.Count - panel.GetViewSize().y + 20);
-        if (maxFloat > 0)
+        // 1900x1000 resolution and 11 cards displayed caused this value to reach exactly 0 and crash the game. 
+        if (maxFloat >= 0)
         {
             maxFloat = -0.001f;
         }

Assets/SibylSystem/MonoHelpers/UIHelper.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using System.Runtime.InteropServices;
 using UnityEngine;
 using YGOSharp.OCGWrapper.Enums;
@@ -11,31 +12,45 @@ public static class UIHelper
     [DllImport("user32")]
     static extern bool FlashWindow(IntPtr handle, bool invert);
 
-    public delegate bool WNDENUMPROC(IntPtr hwnd, uint lParam);
+    public delegate bool WNDENUMPROC(IntPtr hwnd, IntPtr lParam);
     [DllImport("user32", SetLastError = true)]
-    static extern bool EnumWindows(WNDENUMPROC lpEnumFunc, uint lParam);
+    static extern bool EnumWindows(WNDENUMPROC lpEnumFunc, IntPtr lParam);
 
     [DllImport("user32", SetLastError = true)]
     static extern IntPtr GetParent(IntPtr hWnd);
     [DllImport("user32")]
-    static extern uint GetWindowThreadProcessId(IntPtr hWnd, ref uint lpdwProcessId);
+    static extern uint GetWindowThreadProcessId(IntPtr hWnd, ref IntPtr lpdwProcessId);
+    [DllImport("user32")]
+    static extern int GetClassNameW(IntPtr hWnd, [MarshalAs(UnmanagedType.LPWStr)]StringBuilder lpString, int nMaxCount);
+    [DllImport("user32")]
+    static extern bool IsZoomed(IntPtr hWnd);
+    [DllImport("user32")]
+    static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
 
     [DllImport("kernel32")]
     static extern void SetLastError(uint dwErrCode);
 
+    static IntPtr myHWND = IntPtr.Zero;
+
     static IntPtr GetProcessWnd()
     {
+        if (myHWND != IntPtr.Zero)
+            return myHWND;
+
         IntPtr ptrWnd = IntPtr.Zero;
-        uint pid = (uint)System.Diagnostics.Process.GetCurrentProcess().Id;  // 当前进程 ID
+        IntPtr pid = (IntPtr)System.Diagnostics.Process.GetCurrentProcess().Id;  // 当前进程 ID
 
-        bool bResult = EnumWindows(new WNDENUMPROC(delegate (IntPtr hwnd, uint lParam)
+        bool bResult = EnumWindows(new WNDENUMPROC(delegate (IntPtr hwnd, IntPtr mypid)
         {
-            uint id = 0;
+            IntPtr id = IntPtr.Zero;
 
-            if (GetParent(hwnd) == IntPtr.Zero)
+            StringBuilder ClassName = new StringBuilder(256);
+            GetClassNameW(hwnd, ClassName, ClassName.Capacity);
+            
+            if (string.Compare(ClassName.ToString(), "UnityWndClass", true, System.Globalization.CultureInfo.InvariantCulture) == 0)
             {
                 GetWindowThreadProcessId(hwnd, ref id);
-                if (id == lParam)    // 找到进程对应的主窗口句柄
+                if (id == mypid)    // 找到进程对应的主窗口句柄
                 {
                     ptrWnd = hwnd;   // 把句柄缓存起来
                     SetLastError(0);    // 设置无错误
@@ -47,7 +62,12 @@ public static class UIHelper
 
         }), pid);
 
-        return (!bResult && Marshal.GetLastWin32Error() == 0) ? ptrWnd : IntPtr.Zero;
+        if (!bResult && Marshal.GetLastWin32Error() == 0)
+        {
+            myHWND = ptrWnd;
+        }
+
+        return myHWND;
     }
 
     public static void Flash()
@@ -55,6 +75,35 @@ public static class UIHelper
         FlashWindow(GetProcessWnd(), true);
     }
 
+    public static bool isMaximized()
+    {
+#if UNITY_STANDALONE_WIN
+        return IsZoomed(GetProcessWnd());
+#else
+        // not a easy thing to check window status on non-windows desktop...
+        return false;
+#endif
+    }
+
+    public static void MaximizeWindow()
+    {
+#if UNITY_STANDALONE_WIN
+        ShowWindow(GetProcessWnd(), 3); // SW_MAXIMIZE
+#endif
+    }
+
+    public static void RestoreWindow()
+    {
+#if UNITY_STANDALONE_WIN
+        ShowWindow(GetProcessWnd(), 9); // SW_RESTORE
+#endif
+    }
+
+    public static bool shouldMaximize()
+    {
+        return fromStringToBool(Config.Get("maximize_", "0"));
+    }
+
     public enum RenderingMode
     {
         Opaque,

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -6649,7 +6649,7 @@ public class Ocgcore : ServantWithCardDescription
                             //op_m[m].isMinBlockMode = true;
                             if (Program.getVerticalTransparency() >= 0.5f)
                             {
-                                gameField.isLong = true;    //这个设定暂时取消了
+                                gameField.isLong = Program.longField;    //这个设定恢复（？）了
                             }
                         }
                     }

Assets/SibylSystem/Program.cs

@@ -1166,6 +1166,8 @@ public class Program : MonoBehaviour
     {
         preWid = Screen.width;
         preheight = Screen.height;
+        //if (setting != null)
+        //    setting.setScreenSizeValue();
         Program.notGo(fixScreenProblems);
         Program.go(500, fixScreenProblems);
     }
@@ -1177,8 +1179,24 @@ public class Program : MonoBehaviour
 #endif
     }
 
+    public static void PrintToChat(object o)
+    {
+        try
+        {
+            instance.cardDescription.mLog(o.ToString());
+        }
+        catch
+        {
+            DEBUGLOG(o);
+        }
+    }
+
     void gameStart()
     {
+        if (UIHelper.shouldMaximize())
+        {
+            UIHelper.MaximizeWindow();
+        }
         backGroundPic.show();
         shiftToServant(menu);
     }
@@ -1188,6 +1206,7 @@ public class Program : MonoBehaviour
     public static bool MonsterCloud = false;
 
     public static float fieldSize = 1;
+    public static bool longField = false;
 
     void OnApplicationQuit()
     {
@@ -1223,6 +1242,10 @@ public class Program : MonoBehaviour
 
     #endregion
 
+    public static void gugugu()
+    {
+        PrintToChat(InterString.Get("非常抱歉，因为技术原因，此功能暂时无法使用。请关注官方网站获取更多消息。"));
+    }
     //递归创建目录
     private static void DirPaths(string filefullpath)
     {

Assets/SibylSystem/SelectDeck/selectDeck.cs

@@ -32,6 +32,12 @@ public class selectDeck : WindowServantSP
         UIHelper.registEvent(gameObject, "copy_", onCopy);
         UIHelper.registEvent(gameObject, "rename_", onRename);
         UIHelper.registEvent(gameObject, "code_", onCode);
+        if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
+        {
+            UIHelper.getByName<UILabel>(gameObject, "!default").text = "搜索卡组";
+        } else {
+            UIHelper.getByName<UILabel>(gameObject, "!default").text = "Search";
+        }
         searchInput = UIHelper.getByName<UIInput>(gameObject, "search_");
         superScrollView.install();
         for (int i = 0; i < quickCards.Length; i++)

Assets/SibylSystem/Setting/Setting.cs

@@ -15,15 +15,15 @@ public class Setting : WindowServant2D
         UIHelper.registEvent(gameObject, "full_", resizeScreen);
         UIHelper.registEvent(gameObject, "resize_", resizeScreen);
         UIHelper.getByName<UIToggle>(gameObject, "full_").value = Screen.fullScreen;
-        UIHelper.getByName<UIPopupList>(gameObject, "screen_").value = Screen.width.ToString() + "*" + Screen.height.ToString();
         UIHelper.getByName<UIToggle>(gameObject, "ignoreWatcher_").value = UIHelper.fromStringToBool(Config.Get("ignoreWatcher_", "0"));
         UIHelper.getByName<UIToggle>(gameObject, "ignoreOP_").value = UIHelper.fromStringToBool(Config.Get("ignoreOP_", "0"));
         UIHelper.getByName<UIToggle>(gameObject, "smartSelect_").value = UIHelper.fromStringToBool(Config.Get("smartSelect_", "1"));
         UIHelper.getByName<UIToggle>(gameObject, "autoChain_").value = UIHelper.fromStringToBool(Config.Get("autoChain_", "1"));
-        UIHelper.getByName<UIToggle>(gameObject, "handPosition_").value = UIHelper.fromStringToBool(Config.Get("handPosition_", "0"));
-        UIHelper.getByName<UIToggle>(gameObject, "handmPosition_").value = UIHelper.fromStringToBool(Config.Get("handmPosition_", "0"));
+        UIHelper.getByName<UIToggle>(gameObject, "handPosition_").value = UIHelper.fromStringToBool(Config.Get("handPosition_", "1"));
+        UIHelper.getByName<UIToggle>(gameObject, "handmPosition_").value = UIHelper.fromStringToBool(Config.Get("handmPosition_", "1"));
         UIHelper.getByName<UIToggle>(gameObject, "spyer_").value = UIHelper.fromStringToBool(Config.Get("spyer_", "1"));
         UIHelper.getByName<UIToggle>(gameObject, "resize_").value = UIHelper.fromStringToBool(Config.Get("resize_", "0"));
+        UIHelper.getByName<UIToggle>(gameObject, "longField_").value = UIHelper.fromStringToBool(Config.Get("longField_", "0"));
         if (QualitySettings.GetQualityLevel() < 3)
         {
             UIHelper.getByName<UIToggle>(gameObject, "high_").value = false;
@@ -40,11 +40,12 @@ public class Setting : WindowServant2D
         UIHelper.registEvent(gameObject, "handmPosition_", save);
         UIHelper.registEvent(gameObject, "spyer_", save);
         UIHelper.registEvent(gameObject, "high_", save);
+        UIHelper.registEvent(gameObject, "longField_", onChangeLongField);
         UIHelper.registEvent(gameObject, "size_", onChangeSize);
-        UIHelper.registEvent(gameObject, "alpha_", onChangeAlpha);
+        //UIHelper.registEvent(gameObject, "alpha_", onChangeAlpha);
         UIHelper.registEvent(gameObject, "vSize_", onChangeVsize);
         sliderSize = UIHelper.getByName<UISlider>(gameObject, "size_");
-        sliderAlpha = UIHelper.getByName<UISlider>(gameObject, "alpha_");
+        //sliderAlpha = UIHelper.getByName<UISlider>(gameObject, "alpha_");
         sliderVsize = UIHelper.getByName<UISlider>(gameObject, "vSize_");
         Program.go(2000, readVales);
         var collection = gameObject.GetComponentsInChildren<UIToggle>();
@@ -77,6 +78,7 @@ public class Setting : WindowServant2D
         UIHelper.registEvent(setting.Vlink.gameObject, onCP);
         onchangeMouse();
         onchangeCloud();
+        setScreenSizeValue();
     }
 
     private void onchangeFPS()
@@ -96,7 +98,7 @@ public class Setting : WindowServant2D
             setting.sliderVolum.forceValue(((float)(int.Parse(Config.Get("vol_", "750")))) / 1000f);
             setting.sliderSize.forceValue(((float)(int.Parse(Config.Get("size_", "500")))) / 1000f);
             setting.sliderSizeDrawing.forceValue(((float)(int.Parse(Config.Get("vSize_", "500")))) / 1000f);
-            setting.sliderAlpha.forceValue(((float)(int.Parse(Config.Get("alpha_", "666")))) / 1000f);
+            //setting.sliderAlpha.forceValue(((float)(int.Parse(Config.Get("alpha_", "666")))) / 1000f);
             onChangeAlpha();
             onChangeSize();
         }
@@ -121,6 +123,14 @@ public class Setting : WindowServant2D
         Program.I().mouseParticle.SetActive(setting.mouseEffect.value);
     }
 
+    //private int dontResizeTwice = 2;
+
+    public void setScreenSizeValue()
+    {
+        //dontResizeTwice = 3;
+        UIHelper.getByName<UIPopupList>(gameObject, "screen_").value = Screen.width.ToString() + "*" + Screen.height.ToString();
+    }
+
     void onCP()
     {
         try
@@ -182,8 +192,14 @@ public class Setting : WindowServant2D
         {
             Program.transparency = 1.5f * sliderAlpha.value;
         }
+        Program.transparency = 1f;
     }
 
+    void onChangeLongField()
+    {
+        Program.longField = UIHelper.getByName<UIToggle>(gameObject, "longField_").value;
+        onCP();
+    }
 
     UISlider sliderVsize;
     void onChangeVsize()
@@ -221,6 +237,14 @@ public class Setting : WindowServant2D
 
     void resizeScreen()
     {
+        //if (dontResizeTwice > 0)
+        //{
+        //    dontResizeTwice--;
+        //    return;
+        //}
+        //dontResizeTwice = 2;
+        if (UIHelper.isMaximized())
+            UIHelper.RestoreWindow();
         string[] mats = UIHelper.getByName<UIPopupList>(gameObject, "screen_").value.Split(new string[] { "*" }, StringSplitOptions.RemoveEmptyEntries);
         if (mats.Length == 2)
         {
@@ -234,7 +258,8 @@ public class Setting : WindowServant2D
         Config.Set("vol_", ((int)(UIHelper.getByName<UISlider>(gameObject, "vol_").value * 1000)).ToString());
         Config.Set("size_", ((int)(UIHelper.getByName<UISlider>(gameObject, "size_").value * 1000)).ToString());
         Config.Set("vSize_", ((int)(UIHelper.getByName<UISlider>(gameObject, "vSize_").value * 1000)).ToString());
-        Config.Set("alpha_", ((int)(UIHelper.getByName<UISlider>(gameObject, "alpha_").value * 1000)).ToString());
+        //Config.Set("alpha_", ((int)(UIHelper.getByName<UISlider>(gameObject, "alpha_").value * 1000)).ToString());
+        Config.Set("longField_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "longField_").value));
         var collection = gameObject.GetComponentsInChildren<UIToggle>();
         for (int i = 0; i < collection.Length; i++)
         {
@@ -247,6 +272,7 @@ public class Setting : WindowServant2D
         Config.Set("showoffStar", setting.showoffStar.value.ToString());
         Config.Set("LimFPS", setting.LimFPS.value.ToString());
         Config.Set("resize_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "resize_").value));
+        Config.Set("maximize_", UIHelper.fromBoolToString(UIHelper.isMaximized()));
     }
 
     public void save()

Assets/SibylSystem/deckManager/DeckManager.cs

@@ -655,6 +655,16 @@ public class DeckManager : ServantWithCardDescription
 
     public YGOSharp.Banlist currentBanlist = null;
 
+    bool checkBanlistAvail(int cardid)
+    {
+        return deck.GetCardCount(cardid) < currentBanlist.GetQuantity(cardid);
+    }
+
+    bool isBanned(int cardid)
+    {
+        return currentBanlist.GetQuantity(cardid) == 0;
+    }
+
     List<YGOSharp.Card> PrintedResult = new List<YGOSharp.Card>();
 
     void print(List<YGOSharp.Card> result)
@@ -1257,15 +1267,15 @@ public class DeckManager : ServantWithCardDescription
 
     public override void ES_HoverOverGameObject(GameObject gameObject)
     {
-        MonoCardInDeckManager MonoCardInDeckManager_ = gameObject.GetComponent<MonoCardInDeckManager>();
-        if (MonoCardInDeckManager_ != null)
+        MonoCardInDeckManager cardInDeck = gameObject.GetComponent<MonoCardInDeckManager>();
+        if (cardInDeck != null)
         {
-            ((CardDescription)(Program.I().cardDescription)).setData(MonoCardInDeckManager_.cardData, GameTextureManager.myBack);
+            ((CardDescription)(Program.I().cardDescription)).setData(cardInDeck.cardData, GameTextureManager.myBack);
         }
-        cardPicLoader cardPicLoader_ = gameObject.GetComponent<cardPicLoader>();
-        if (cardPicLoader_ != null)
+        cardPicLoader cardInSearchResult = gameObject.GetComponent<cardPicLoader>();
+        if (cardInSearchResult != null)
         {
-            ((CardDescription)(Program.I().cardDescription)).setData(cardPicLoader_.data, GameTextureManager.myBack);
+            ((CardDescription)(Program.I().cardDescription)).setData(cardInSearchResult.data, GameTextureManager.myBack);
         }
     }
 
@@ -1285,14 +1295,15 @@ public class DeckManager : ServantWithCardDescription
         }
         goLast = gameObject;
         timeLastDown = Program.TimePassed();
-        MonoCardInDeckManager MonoCardInDeckManager_ = gameObject.GetComponent<MonoCardInDeckManager>();
-        if (MonoCardInDeckManager_ != null)
+        MonoCardInDeckManager cardInDeck = gameObject.GetComponent<MonoCardInDeckManager>();
+        cardPicLoader cardInSearchResult = gameObject.GetComponent<cardPicLoader>();
+        if (cardInDeck != null && !cardInDeck.dying)
         {
-            if (doubleClick && condition == Condition.editDeck && deck.GetCardCount(MonoCardInDeckManager_.cardData.Id) < currentBanlist.GetQuantity(MonoCardInDeckManager_.cardData.Id))
+            if (doubleClick && condition == Condition.editDeck && checkBanlistAvail(cardInDeck.cardData.Id))
             {
                 MonoCardInDeckManager card = createCard();
-                card.transform.position = MonoCardInDeckManager_.transform.position;
-                MonoCardInDeckManager_.cardData.cloneTo(card.cardData);
+                card.transform.position = cardInDeck.transform.position;
+                cardInDeck.cardData.cloneTo(card.cardData);
                 card.gameObject.layer = 16;
                 deck.IMain.Add(card);
                 deckDirty = true;
@@ -1301,26 +1312,23 @@ public class DeckManager : ServantWithCardDescription
             }
             else
             {
-                cardInDragging = MonoCardInDeckManager_;
-                MonoCardInDeckManager_.beginDrag();
+                cardInDragging = cardInDeck;
+                cardInDeck.beginDrag();
             }
         }
-
-        if (condition == Condition.editDeck)
+        else if (cardInSearchResult != null)
         {
-            cardPicLoader cardPicLoader_ = gameObject.GetComponent<cardPicLoader>();
-            if (cardPicLoader_ != null)
+            if (condition == Condition.editDeck)
             {
-                if (deck.GetCardCount(cardPicLoader_.data.Id) < currentBanlist.GetQuantity(cardPicLoader_.data.Id))
+                if (checkBanlistAvail(cardInSearchResult.data.Id))
                 {
-                    if ((cardPicLoader_.data.Type & (UInt32)CardType.Token) == 0)
+                    if ((cardInSearchResult.data.Type & (UInt32)CardType.Token) == 0)
                     {
                         MonoCardInDeckManager card = createCard();
                         card.transform.position = card.getGoodPosition(4);
-                        card.cardData = cardPicLoader_.data;
+                        card.cardData = cardInSearchResult.data;
                         card.gameObject.layer = 16;
                         deck.IMain.Add(card);
-                        deckDirty = true;
                         cardInDragging = card;
                         card.beginDrag();
                     }
@@ -1339,7 +1347,8 @@ public class DeckManager : ServantWithCardDescription
             }
             else
             {
-                deckDirty = true;
+                if (cardInDragging.getIfAlive())
+                    deckDirty = true;
                 ArrangeObjectDeck(true);
                 ShowObjectDeck();
             }
@@ -1354,62 +1363,53 @@ public class DeckManager : ServantWithCardDescription
         {
             if (condition == Condition.editDeck)
             {
-                MonoCardInDeckManager MonoCardInDeckManager_ = Program.pointedGameObject.GetComponent<MonoCardInDeckManager>();
-                if (MonoCardInDeckManager_ != null)
+                MonoCardInDeckManager cardInDeck = Program.pointedGameObject.GetComponent<MonoCardInDeckManager>();
+                if (cardInDeck != null)
                 {
-                    MonoCardInDeckManager_.killIt();
+                    cardInDeck.killIt();
                     ArrangeObjectDeck(true);
                     ShowObjectDeck();
                 }
-                cardPicLoader cardPicLoader_ = Program.pointedGameObject.GetComponent<cardPicLoader>();
-                if (cardPicLoader_ != null)
+                cardPicLoader cardInSearchResult = Program.pointedGameObject.GetComponent<cardPicLoader>();
+                if (cardInSearchResult != null)
                 {
-                    CreateMonoCard(cardPicLoader_.data);
+                    CreateMonoCard(cardInSearchResult.data);
                     ShowObjectDeck();
                 }
             }
             else
             {
-                MonoCardInDeckManager MonoCardInDeckManager_ = Program.pointedGameObject.GetComponent<MonoCardInDeckManager>();
-                if (MonoCardInDeckManager_ != null)
+                MonoCardInDeckManager cardInDeck = Program.pointedGameObject.GetComponent<MonoCardInDeckManager>();
+                if (cardInDeck != null)
                 {
                     bool isSide = false;
-                    for (int i = 0; i < deck.ISide.Count; i++)
+                    for (int i = 0; i < deck.ISide.Count; i++)  
                     {
-                        if (MonoCardInDeckManager_ == deck.ISide[i])
+                        if (cardInDeck== deck.ISide[i])
                         {
                             isSide = true;
                         }
                     }
                     if (isSide)
                     {
-                        if (
-                        (MonoCardInDeckManager_.cardData.Type & (UInt32)CardType.Fusion) > 0
-                         ||
-                        (MonoCardInDeckManager_.cardData.Type & (UInt32)CardType.Synchro) > 0
-                         ||
-                        (MonoCardInDeckManager_.cardData.Type & (UInt32)CardType.Xyz) > 0
-                          ||
-                        (MonoCardInDeckManager_.cardData.Type & (UInt32)CardType.Link) > 0
-                        )
+                        if (cardInDeck.cardData.IsExtraCard())
                         {
-                            deck.IExtra.Add(MonoCardInDeckManager_);
-                            deck.ISide.Remove(MonoCardInDeckManager_);
+                            deck.IExtra.Add(cardInDeck);
+                            deck.ISide.Remove(cardInDeck);
                         }
                         else
                         {
-                            deck.IMain.Add(MonoCardInDeckManager_);
-                            deck.ISide.Remove(MonoCardInDeckManager_);
+                            deck.IMain.Add(cardInDeck);
+                            deck.ISide.Remove(cardInDeck);
                         }
                     }
                     else
                     {
-                        deck.ISide.Add(MonoCardInDeckManager_);
-                        deck.IMain.Remove(MonoCardInDeckManager_);
-                        deck.IExtra.Remove(MonoCardInDeckManager_);
-                    }
-                    deckDirty = true;
-                    ShowObjectDeck();
+                        deck.ISide.Add(cardInDeck);
+                        deck.IMain.Remove(cardInDeck);
+                        deck.IExtra.Remove(cardInDeck);
+                    }
+                    ShowObjectDeck();
                 }
             }
         }
@@ -1417,26 +1417,13 @@ public class DeckManager : ServantWithCardDescription
 
     private void CreateMonoCard(YGOSharp.Card data)
     {
-        if (deck.GetCardCount(data.Id) < currentBanlist.GetQuantity(data.Id))
+        if (checkBanlistAvail(data.Id))
         {
             MonoCardInDeckManager card = createCard();
             card.transform.position = card.getGoodPosition(4);
             card.cardData = data;
             card.gameObject.layer = 16;
-            if (Input.GetKey(KeyCode.LeftShift) || (Input.GetKey(KeyCode.RightShift)))
-            {
-                deck.ISide.Add(card);
-                deck.Side.Add(card.cardData.Id);
-            }
-            else if (
-                (data.Type & (UInt32)CardType.Fusion) > 0
-                  ||
-                (data.Type & (UInt32)CardType.Synchro) > 0
-                  ||
-                (data.Type & (UInt32)CardType.Xyz) > 0
-                ||
-                (data.Type & (UInt32)CardType.Link) > 0
-                )
+            if (data.IsExtraCard())
             {
                 deck.IExtra.Add(card);
                 deck.Extra.Add(card.cardData.Id);
@@ -1445,7 +1432,7 @@ public class DeckManager : ServantWithCardDescription
             {
                 deck.IMain.Add(card);
                 deck.Main.Add(card.cardData.Id);
-            }
+            }
             deckDirty = true;
         }
     }
@@ -1496,8 +1483,35 @@ public class DeckManager : ServantWithCardDescription
                     }
                     if (code > 100)
                     {
+                        YGOSharp.Card card = YGOSharp.CardsManager.Get(code);
+                        if (card.Id > 0 && flag != 3)
+                        {
+                            if (card.IsExtraCard())
+                            {
+                                deck.Extra.Add(code);
+                                deck.Deck_O.Extra.Add(code);
+                            }
+                            else
+                            {
+                                deck.Main.Add(code);
+                                deck.Deck_O.Main.Add(code);
+                            }
+                        }
+                        else
                         switch (flag)
                         {
+                            case 1:
+                                {
+                                    deck.Main.Add(code);
+                                    deck.Deck_O.Main.Add(code);
+                                }
+                                break;
+                            case 2:
+                                {
+                                    deck.Extra.Add(code);
+                                    deck.Deck_O.Extra.Add(code);
+                                }
+                                break;
                             case 3:
                                 {
                                     deck.Side.Add(code);
@@ -1505,25 +1519,6 @@ public class DeckManager : ServantWithCardDescription
                                 }
                                 break;
                             default:
-                                {
-                                    YGOSharp.Card card = YGOSharp.CardsManager.Get(code);
-                                    if ((card.Type & (UInt32)CardType.Fusion) > 0
-                                        ||
-                                        (card.Type & (UInt32)CardType.Synchro) > 0
-                                        ||
-                                        (card.Type & (UInt32)CardType.Xyz) > 0
-                                        ||
-                                        (card.Type & (UInt32)CardType.Link) > 0)
-                                    {
-                                        deck.Extra.Add(code);
-                                        deck.Deck_O.Extra.Add(code);
-                                    }
-                                    else
-                                    {
-                                        deck.Main.Add(code);
-                                        deck.Deck_O.Main.Add(code);
-                                    }
-                                }
                                 break;
                         }
                     }
@@ -1623,15 +1618,7 @@ public class DeckManager : ServantWithCardDescription
             {
                 if (p.z > -8)
                 {
-                    if (
-                        (deckTemp[i].cardData.Type & (UInt32)CardType.Fusion) > 0
-                         ||
-                        (deckTemp[i].cardData.Type & (UInt32)CardType.Synchro) > 0
-                         ||
-                        (deckTemp[i].cardData.Type & (UInt32)CardType.Xyz) > 0
-                        ||
-                        (deckTemp[i].cardData.Type & (UInt32)CardType.Link) > 0
-                        )
+                    if (deckTemp[i].cardData.IsExtraCard())
                     {
                         deck.IExtra.Add(deckTemp[i]);
                     }
@@ -1844,31 +1831,20 @@ public class DeckManager : ServantWithCardDescription
         {
             UnityEngine.Debug.Log(e);
         }
-        List<YGOSharp.Card> result = new List<YGOSharp.Card>();
         if (side)
         {
+            List<YGOSharp.Card> result = new List<YGOSharp.Card>();
             foreach (var item in Program.I().ocgcore.sideReference)
             {
                 result.Add(YGOSharp.CardsManager.Get(item.Value));
             }
+            print(result);
+            UIHelper.trySetLableText(gameObjectSearch, "title_", result.Count.ToString());
         }
         else
         {
-            foreach (var item in deck.Main)
-            {
-                result.Add(YGOSharp.CardsManager.Get(item));
-            }
-            foreach (var item in deck.Extra)
-            {
-                result.Add(YGOSharp.CardsManager.Get(item));
-            }
-            foreach (var item in deck.Side)
-            {
-                result.Add(YGOSharp.CardsManager.Get(item));
-            }
+            UIHelper.trySetLableText(gameObjectSearch, "title_", InterString.Get("在此搜索卡片，拖动加入卡组"));
         }
-        print(result);
-        UIHelper.trySetLableText(gameObjectSearch, "title_", result.Count.ToString());
         Program.go(50, superScrollView.toTop);
         Program.go(100, superScrollView.toTop);
         Program.go(200, superScrollView.toTop);

Assets/SibylSystem/selectServer/SelectServer.cs

@@ -25,7 +25,12 @@ public class SelectServer : WindowServantSP
         UIHelper.registEvent(gameObject, "join_", onClickJoin);
         serversList = UIHelper.getByName<UIPopupList>(gameObject, "server");
         //serversList.fontSize = 30;
-        serversList.value = Config.Get("serversPicker", "[Custom]");
+        if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
+        {
+            serversList.value = Config.Get("serversPicker", "[自定义]");
+        } else {
+            serversList.value = Config.Get("serversPicker", "[Custom]");
+        }
         UIHelper.registEvent(gameObject, "server", pickServer);
         UIHelper.getByName<UIInput>(gameObject, "name_").value = Config.Get("name", "YGOPro2 User");
         list = UIHelper.getByName<UIPopupList>(gameObject, "history_");
@@ -39,7 +44,7 @@ public class SelectServer : WindowServantSP
         //inputVersion = UIHelper.getByName<UIInput>(gameObject, "version_");
         set_version("0x" + String.Format("{0:X}", Config.ClientVersion));
 
-        if (Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
+        if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
         {}
         else //如果非要改成其他语言的话
         {
@@ -54,7 +59,13 @@ public class SelectServer : WindowServantSP
         serversList.items.Add("[TCG]Koishi");
         serversList.items.Add("[轮抽服]2Pick");
         serversList.items.Add("[OCG&TCG]한국서버");
-        serversList.items.Add("[Custom]");
+        serversList.items.Add("[OCG&TCG]YGOhollow (JP)");
+        if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
+        {
+            serversList.items.Add("[自定义]");
+        } else {
+            serversList.items.Add("[Custom]");
+        }
 
         SetActiveFalse();
     }
@@ -119,9 +130,25 @@ public class SelectServer : WindowServantSP
                 inputPort_.enabled = false;
                 break;
             }
+            case "[OCG&TCG]YGOhollow (JP)":
+            {
+                UIHelper.getByName<UIInput>(gameObject, "ip_").value = "ygosvrjp.tk";
+                UIHelper.getByName<UIInput>(gameObject, "port_").value = "7911";
+                Config.Set("serversPicker", "[OCG&TCG]YGOhollow (JP)");
+
+                list.enabled = false;
+                inputIP_.enabled = false;
+                inputPort_.enabled = false;
+                break;
+            }
             default:
             {
-                Config.Set("serversPicker", "[Custom]");
+                if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
+                {
+                    Config.Set("serversPicker", "[自定义]");
+                } else {
+                    Config.Set("serversPicker", "[Custom]");
+                }
 
                 list.enabled = true;
                 inputIP_.enabled = true;

Assets/transUI/prefab/trans_setting.prefab

@@ -1613,7 +1613,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &157382
 GameObject:
   m_ObjectHideFlags: 1
@@ -2992,7 +2992,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 145416}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 12, y: -93, z: 0}
+  m_LocalPosition: {x: 12, y: -70, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 445292}
@@ -3015,7 +3015,7 @@ Transform:
   - {fileID: 453648}
   - {fileID: 493200}
   m_Father: {fileID: 463726}
-  m_RootOrder: 24
+  m_RootOrder: 25
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &401690
 Transform:
@@ -3251,7 +3251,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 174428}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -157.19998, y: 145, z: 0}
+  m_LocalPosition: {x: -157.19998, y: 175, z: 0}
   m_LocalScale: {x: 0.99846995, y: 0.99846995, z: 0.99846995}
   m_Children:
   - {fileID: 404514}
@@ -3280,7 +3280,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 196340}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: -145, z: 0}
+  m_LocalPosition: {x: -309.6, y: -125, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 441956}
@@ -3322,7 +3322,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 186530}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: -175, z: 0}
+  m_LocalPosition: {x: -309.6, y: -155, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 413668}
@@ -3431,7 +3431,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 157382}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: -25, z: 0}
+  m_LocalPosition: {x: -309.6, y: -5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 423648}
@@ -3447,7 +3447,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 185900}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -157, y: 265, z: 0}
+  m_LocalPosition: {x: -157, y: 295, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 401194}
@@ -3505,7 +3505,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 176336}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: 95, z: 0}
+  m_LocalPosition: {x: -309.6, y: 115, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 451274}
@@ -3677,7 +3677,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 149734}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: 5, z: 0}
+  m_LocalPosition: {x: -309.6, y: 25, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 463944}
@@ -3972,7 +3972,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 113076}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -157.2, y: 225, z: 0}
+  m_LocalPosition: {x: -157.2, y: 255, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 409202}
@@ -4056,7 +4056,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 164062}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: 35, z: 0}
+  m_LocalPosition: {x: -309.6, y: 55, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 466984}
@@ -4385,6 +4385,7 @@ Transform:
   - {fileID: 431416}
   - {fileID: 4748048495216516}
   - {fileID: 4808535323606856}
+  - {fileID: 4458734572156562}
   - {fileID: 401270}
   m_Father: {fileID: 484650}
   m_RootOrder: 3
@@ -4438,7 +4439,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 177070}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: -115, z: 0}
+  m_LocalPosition: {x: -309.6, y: -95, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 479946}
@@ -4868,7 +4869,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 116036}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: -85, z: 0}
+  m_LocalPosition: {x: -309.6, y: -65, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 407374}
@@ -4910,7 +4911,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 187840}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: -55, z: 0}
+  m_LocalPosition: {x: -309.6, y: -35, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 402524}
@@ -4965,7 +4966,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 174308}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -157.2, y: 305, z: 0}
+  m_LocalPosition: {x: -157.2, y: 335, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 464358}
@@ -5108,7 +5109,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 127118}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -309.6, y: 65, z: 0}
+  m_LocalPosition: {x: -309.6, y: 85, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 460024}
@@ -18130,6 +18131,22 @@ Prefab:
   m_ParentPrefab: {fileID: 0}
   m_RootGameObject: {fileID: 133012}
   m_IsPrefabParent: 1
+--- !u!1 &1123055992881266
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4350524413224966}
+  - component: {fileID: 114510073370377868}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1163210179715550
 GameObject:
   m_ObjectHideFlags: 1
@@ -18146,6 +18163,26 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1266735915302746
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4458734572156562}
+  - component: {fileID: 114300038893591688}
+  - component: {fileID: 114529814476297920}
+  - component: {fileID: 65789896984170510}
+  - component: {fileID: 114011807457320100}
+  - component: {fileID: 114198618094421148}
+  m_Layer: 5
+  m_Name: longField_
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1334155132578260
 GameObject:
   m_ObjectHideFlags: 1
@@ -18222,6 +18259,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1469589458140040
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4447106828170874}
+  - component: {fileID: 114991790218203360}
+  m_Layer: 5
+  m_Name: '!lable'
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1487971509915834
 GameObject:
   m_ObjectHideFlags: 1
@@ -18338,6 +18391,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1915563852603240
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4230898429811844}
+  - component: {fileID: 111715099694415334}
+  - component: {fileID: 114296092899712000}
+  - component: {fileID: 114357261453108358}
+  m_Layer: 5
+  m_Name: Checkmark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!4 &4078943406314486
 Transform:
   m_ObjectHideFlags: 1
@@ -18364,6 +18435,19 @@ Transform:
   m_Father: {fileID: 4748048495216516}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4230898429811844
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1915563852603240}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10, y: 1, z: 0}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
+  m_Children: []
+  m_Father: {fileID: 4458734572156562}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4297149264326394
 Transform:
   m_ObjectHideFlags: 1
@@ -18377,6 +18461,48 @@ Transform:
   m_Father: {fileID: 4808535323606856}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4350524413224966
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1123055992881266}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10, y: 1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4458734572156562}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4447106828170874
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1469589458140040}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 27, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4458734572156562}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4458734572156562
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1266735915302746}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 15, y: 175, z: 0}
+  m_LocalScale: {x: 0.99846995, y: 0.99846995, z: 0.99846995}
+  m_Children:
+  - {fileID: 4230898429811844}
+  - {fileID: 4350524413224966}
+  - {fileID: 4447106828170874}
+  m_Father: {fileID: 463726}
+  m_RootOrder: 24
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4633398798748790
 Transform:
   m_ObjectHideFlags: 1
@@ -18468,7 +18594,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1387616484472836}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -157.2, y: 185, z: 0}
+  m_LocalPosition: {x: -157.2, y: 215, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4650414086440950}
@@ -18527,6 +18653,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 272, y: 24, z: 0}
   m_Center: {x: 136, y: 0, z: 0}
+--- !u!65 &65789896984170510
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1266735915302746}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 272, y: 24, z: 0}
+  m_Center: {x: 136, y: 0, z: 0}
 --- !u!65 &65968018635603156
 BoxCollider:
   m_ObjectHideFlags: 1
@@ -18569,6 +18707,48 @@ Animation:
   m_PlayAutomatically: 0
   m_AnimatePhysics: 0
   m_CullingType: 0
+--- !u!111 &111715099694415334
+Animation:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1915563852603240}
+  m_Enabled: 0
+  serializedVersion: 3
+  m_Animation: {fileID: 7400000, guid: baa794242d9902a439adb42668119f24, type: 2}
+  m_Animations:
+  - {fileID: 7400000, guid: baa794242d9902a439adb42668119f24, type: 2}
+  m_WrapMode: 0
+  m_PlayAutomatically: 0
+  m_AnimatePhysics: 0
+  m_CullingType: 0
+--- !u!114 &114011807457320100
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1266735915302746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 1123055992881266}
+  hover: {r: 1, g: 1, b: 1, a: 1}
+  pressed: {r: 1, g: 1, b: 1, a: 1}
+  disabledColor: {r: 1, g: 1, b: 1, a: 1}
+  duration: 0.2
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick: []
+  mTextureOutNormal: 
+  mTextureOutPressed: 
 --- !u!114 &114087385098287042
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -18900,6 +19080,21 @@ MonoBehaviour:
   mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
   mSpriteName: arrodown
   mFillCenter: 1
+--- !u!114 &114198618094421148
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1266735915302746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f23d9cb4e13584439c9f9ddeed5e512, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 4350524413224966}
+  hover: {x: 0, y: 0, z: 90}
+  pressed: {x: 0, y: 0, z: 0}
+  duration: 0.2
 --- !u!114 &114216311764721446
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -18991,6 +19186,107 @@ MonoBehaviour:
   eventReceiver: {fileID: 0}
   functionName: OnActivate
   startsChecked: 0
+--- !u!114 &114296092899712000
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1915563852603240}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 65ee607e1177db1479c3cbf94cac327e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onFinished: []
+  eventReceiver: {fileID: 0}
+  callWhenFinished: 
+--- !u!114 &114300038893591688
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1266735915302746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 3
+  mWidth: 272
+  mHeight: 24
+  mDepth: 6
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 11.333333
+--- !u!114 &114357261453108358
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1915563852603240}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 4350524413224966}
+    relative: 0.5
+    absolute: -5
+  rightAnchor:
+    target: {fileID: 4350524413224966}
+    relative: 0.5
+    absolute: 5
+  bottomAnchor:
+    target: {fileID: 4350524413224966}
+    relative: 0.5
+    absolute: -5
+  topAnchor:
+    target: {fileID: 4350524413224966}
+    relative: 0.5
+    absolute: 5
+  updateAnchors: 2
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 10
+  mHeight: 10
+  mDepth: 2
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
+  mType: 0
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
+  mSpriteName: wwhite
+  mFillCenter: 1
 --- !u!114 &114375891256782996
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -19145,6 +19441,56 @@ MonoBehaviour:
   onClick: []
   mTextureOutNormal: 
   mTextureOutPressed: 
+--- !u!114 &114510073370377868
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1123055992881266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 4458734572156562}
+    relative: 0
+    absolute: 1
+  rightAnchor:
+    target: {fileID: 4458734572156562}
+    relative: 0
+    absolute: 19
+  bottomAnchor:
+    target: {fileID: 4458734572156562}
+    relative: 0
+    absolute: 4
+  topAnchor:
+    target: {fileID: 4458734572156562}
+    relative: 1
+    absolute: -2
+  updateAnchors: 2
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 18
+  mHeight: 18
+  mDepth: 10
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
+  mSpriteName: kuang
+  mFillCenter: 1
 --- !u!114 &114529394992741522
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -19182,6 +19528,31 @@ MonoBehaviour:
   hideIfOffScreen: 0
   keepAspectRatio: 0
   aspectRatio: 11.333333
+--- !u!114 &114529814476297920
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1266735915302746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 446d504799d99174383957fca80713c8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  group: 0
+  activeSprite: {fileID: 0}
+  activeAnimation: {fileID: 111715099694415334}
+  animator: {fileID: 0}
+  tween: {fileID: 0}
+  startsActive: 0
+  instantTween: 0
+  optionCanBeNone: 0
+  onChange: []
+  checkSprite: {fileID: 0}
+  checkAnimation: {fileID: 0}
+  eventReceiver: {fileID: 0}
+  functionName: OnActivate
+  startsChecked: 0
 --- !u!114 &114534012011523422
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -19470,3 +19841,69 @@ MonoBehaviour:
   hideIfOffScreen: 0
   keepAspectRatio: 0
   aspectRatio: 11.333333
+--- !u!114 &114991790218203360
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1469589458140040}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 4458734572156562}
+    relative: 0
+    absolute: 27
+  rightAnchor:
+    target: {fileID: 4458734572156562}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 4458734572156562}
+    relative: 0
+    absolute: 2
+  topAnchor:
+    target: {fileID: 4458734572156562}
+    relative: 1
+    absolute: -2
+  updateAnchors: 2
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 3
+  mWidth: 245
+  mHeight: 20
+  mDepth: 9
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 10
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  mFont: {fileID: 0}
+  mText: "\u9632\u6B62\u7ACB\u7ED8\u906E\u6321\u5BF9\u65B9\u540E\u573A"
+  mFontSize: 18
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 1
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 0
+  mMaterial: {fileID: 0}
+  mApplyGradient: 1
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mOverflowEllipsis: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1

ProjectSettings/ProjectSettings.asset

@@ -15,7 +15,7 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21176471, a: 1}
-  m_ShowUnitySplashScreen: 1
+  m_ShowUnitySplashScreen: 0
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 1
@@ -76,7 +76,7 @@ PlayerSettings:
   usePlayerLog: 1
   bakeCollisionMeshes: 0
   forceSingleInstance: 0
-  resizableWindow: 0
+  resizableWindow: 1
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
   gpuSkinning: 0