unfinished

Assets/SibylSystem/Menu/Menu.cs

@@ -17,6 +17,7 @@ public class Menu : WindowServantSP
         UIHelper.registEvent(gameObject, "setting_", onClickSetting);
         UIHelper.registEvent(gameObject, "deck_", onClickSelectDeck);
         UIHelper.registEvent(gameObject, "online_", onClickOnline);
+        UIHelper.registEvent(gameObject, "myCard_", onClickMyCard);
         UIHelper.registEvent(gameObject, "replay_", onClickReplay);
         UIHelper.registEvent(gameObject, "single_", onClickPizzle);
         //UIHelper.registEvent(gameObject, "ai_", onClickAI);
@@ -107,6 +108,11 @@ public class Menu : WindowServantSP
         Program.I().shiftToServant(Program.I().selectServer);
     }
 
+    void onClickMyCard()
+    {
+        Program.I().shiftToServant(Program.I().mycard);
+    }
+
     void onClickAI()
     {
         Program.I().shiftToServant(Program.I().aiRoom);
@@ -199,6 +205,10 @@ public class Menu : WindowServantSP
             {
                 return;
             }
+            if (Program.I().mycard == null)
+            {
+                return;
+            }
             try
             {
                 if (File.Exists("commamd.shell") == false)

Assets/SibylSystem/MonoHelpers/TcpHelper.cs

@@ -191,7 +191,7 @@ public static class TcpHelper
         if (onDisConnected == true)
         {
             onDisConnected = false;
-            Program.I().ocgcore.returnServant = Program.I().selectServer;
+            Program.I().ocgcore.setDefaultReturnServant();
             if (TcpHelper.tcpClient != null)
             {
                 if (TcpHelper.tcpClient.Connected)
@@ -206,7 +206,7 @@ public static class TcpHelper
             {
                 if (Program.I().menu.isShowed == false) 
                 {
-                    Program.I().shiftToServant(Program.I().selectServer);
+                    Program.I().shiftToServant(Program.I().mycard.isMatchingWithMyCard ? Program.I().mycard : Program.I().selectServer);
                 }
                 if (!roomListChecking)
                 {

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -755,13 +755,21 @@ public class Ocgcore : ServantWithCardDescription
         }
     }
 
-    public void onExit()
+	public void setDefaultReturnServant() {
+		if (Program.I().mycard.isMatchingWithMyCard) {
+			returnServant = Program.I().mycard;
+		} else { 
+            returnServant = Program.I().selectServer;
+        }
+	}
+
+	public void onExit()
     {
         if (TcpHelper.tcpClient != null)
         {
             if (TcpHelper.tcpClient.Connected)
             {
-                Program.I().ocgcore.returnServant = Program.I().selectServer;
+                setDefaultReturnServant();
                 TcpHelper.tcpClient.Client.Shutdown(0);
                 TcpHelper.tcpClient.Close();
             }
@@ -776,7 +784,7 @@ public class Ocgcore : ServantWithCardDescription
         {
             /*if (TcpHelper.tcpClient.Connected)
             {
-                Program.I().ocgcore.returnServant = Program.I().selectServer;
+                setDefaultReturnServant();
                 TcpHelper.tcpClient.Client.Shutdown(0);
                 TcpHelper.tcpClient.Close();
             } */

Assets/SibylSystem/Program.cs

@@ -88,6 +88,7 @@ public class Program : MonoBehaviour
     public GameObject new_ui_setting;
     public GameObject new_ui_book;
     public GameObject new_ui_selectServer;
+    public GameObject new_ui_mycard;
     public GameObject new_ui_RoomList;
     public GameObject new_ui_gameInfo;
     public GameObject new_ui_cardDescription;
@@ -952,7 +953,8 @@ public class Program : MonoBehaviour
     public DeckManager deckManager;
     public Ocgcore ocgcore;
     public SelectServer selectServer;
-    public RoomList roomList;
+	public MyCard mycard;
+	public RoomList roomList;
     public Book book;
     public puzzleMode puzzleMode;
     public AIRoom aiRoom;
@@ -974,6 +976,8 @@ public class Program : MonoBehaviour
         servants.Add(ocgcore);
         selectServer = new SelectServer();
         servants.Add(selectServer);
+        mycard = new MyCard();
+        servants.Add(mycard);
         roomList = new RoomList();
         servants.Add(roomList);
         book = new Book();
@@ -1020,6 +1024,10 @@ public class Program : MonoBehaviour
         {
             selectServer.hide();
         }
+        if (to != mycard && mycard.isShowed)
+        {
+            mycard.hide();
+        }
         if (to != selectReplay && selectReplay.isShowed)
         {
             selectReplay.hide();
@@ -1045,6 +1053,7 @@ public class Program : MonoBehaviour
         if (to == deckManager && deckManager.isShowed == false) deckManager.show();
         if (to == ocgcore && ocgcore.isShowed == false) ocgcore.show();
         if (to == selectServer && selectServer.isShowed == false) selectServer.show();
+        if (to == mycard && mycard.isShowed == false) mycard.show();
         if (to == selectReplay && selectReplay.isShowed == false) selectReplay.show();
         if (to == puzzleMode && puzzleMode.isShowed == false) puzzleMode.show();
         if (to == aiRoom && aiRoom.isShowed == false) aiRoom.show();

Assets/SibylSystem/Room/Room.cs

@@ -87,7 +87,7 @@ public class Room : WindowServantSP
             Menu.deleteShell();
         }
         base.show();
-        Program.I().ocgcore.returnServant = Program.I().selectServer;
+        Program.I().ocgcore.setDefaultReturnServant();
         Program.I().ocgcore.handler = handler;
         UIHelper.registEvent(toolBar, "input_", onChat);
         Program.charge();
@@ -495,7 +495,7 @@ public class Room : WindowServantSP
     public void StocMessage_DuelStart(BinaryReader r)
     {
 
-        Program.I().ocgcore.returnServant = Program.I().selectServer;
+        Program.I().ocgcore.setDefaultReturnServant();
         needSide = false;
         joinWithReconnect = true;
         if (Program.I().deckManager.isShowed)

Assets/SibylSystem/selectServer/SelectServer.cs

@@ -351,7 +351,8 @@ public class SelectServer : WindowServantSP
                 }
                 File.WriteAllText("config/passwords.conf", all);
                 printFile(false);
-                (new Thread(() => { TcpHelper.join(ipString, name, portString, pswString, versionString); })).Start();
+				Program.I().mycard.isMatchingWithMyCard = false;
+				(new Thread(() => { TcpHelper.join(ipString, name, portString, pswString, versionString); })).Start();
             }
             else
             {

Assets/transUI/prefab/trans_myCardLogin.prefab

@@ -1937,7 +1937,7 @@ MonoBehaviour:
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
   mFont: {fileID: 0}
-  mText: MyCard Login
+  mText: MyCard
   mFontSize: 18
   mFontStyle: 0
   mAlignment: 1