Merge pull request #4 from purerosefallen/Android

Android

Assets/SibylSystem/MonoHelpers/TcpHelper.cs

@@ -715,17 +715,6 @@ public static class BinaryExtensions
         {
             l2 = r.ReadInt32();
         }
-        if (((flag & (int)Query.Level) != 0) || ((flag & (int)Query.Rank) != 0))
-        {
-            if (l1 > l2)
-            {
-                data.Level = l1;
-            }
-            else
-            {
-                data.Level = l2;
-            }
-        }
 
         if ((flag & (int)Query.Attribute) != 0)
             data.Attribute = r.ReadInt32();
@@ -741,8 +730,8 @@ public static class BinaryExtensions
             r.ReadInt32();
         if ((flag & (int)Query.Reason) != 0)
             r.ReadInt32();
-        //if ((flag & (int)Query.ReasonCard) != 0)
-        //    r.ReadInt32(); 
+        if ((flag & (int)Query.ReasonCard) != 0)
+            r.ReadInt32();
         if ((flag & (int)Query.EquipCard) != 0)
         {
             cardToRefresh.addTarget(Program.I().ocgcore.GCS_cardGet(r.ReadGPS(), false));
@@ -788,6 +777,26 @@ public static class BinaryExtensions
             data.LScale = r.ReadInt32();
         if ((flag & (int)Query.RScale) != 0)
             data.RScale = r.ReadInt32();
+        int l3 = 0;
+        if ((flag & (int)Query.Link) != 0)
+        {
+            l3 = r.ReadInt32(); //link value
+            data.rDefense = r.ReadInt32(); //link marker
+        }
+        if (((flag & (int)Query.Level) != 0) || ((flag & (int)Query.Rank) != 0) || ((flag & (int)Query.Link) != 0))
+        {
+            if (l1 > l2)
+            {
+                data.Level = l1;
+            }
+            else
+            {
+                data.Level = l2;
+            }
+            if(l3 > data.Level)
+                data.Level = l3;
+        }
+
         cardToRefresh.set_data(data);
         //
     }

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -448,7 +448,7 @@ public class Ocgcore : ServantWithCardDescription
             case Condition.duel:
                 SetBar(Program.I().new_bar_duel, 0, 0);
                 UIHelper.registEvent(toolBar, "input_", onChat);
-                UIHelper.registEvent(toolBar, "gg_", onDuelResultConfirmed);
+                UIHelper.registEvent(toolBar, "gg_", onSurrender);
                 UIHelper.registEvent(toolBar, "left_", on_left);
                 UIHelper.registEvent(toolBar, "right_", on_right);
                 UIHelper.registEvent(toolBar, "rush_", on_rush);
@@ -769,6 +769,21 @@ public class Ocgcore : ServantWithCardDescription
         returnTo();
     }
 
+    public void onEmergencyExit()
+    {
+        if (TcpHelper.tcpClient != null)
+        {
+            /*if (TcpHelper.tcpClient.Connected)
+            {
+                Program.I().ocgcore.returnServant = Program.I().selectServer;
+                TcpHelper.tcpClient.Client.Shutdown(0);
+                TcpHelper.tcpClient.Close();
+            } */
+            TcpHelper.tcpClient = null;
+        }
+        returnTo();
+    }
+
     public bool surrended = false;
 
     public void onChat()
@@ -1303,6 +1318,7 @@ public class Ocgcore : ServantWithCardDescription
                 logicalClearChain();
                 surrended = false;
                 Program.I().room.duelEnded = false;
+                Program.I().room.joinWithReconnect = false;
                 turns = 0;
                 deckReserved = false;
                 keys.Insert(0, currentMessageIndex);
@@ -1367,7 +1383,7 @@ public class Ocgcore : ServantWithCardDescription
                 gameField.currentPhase = GameField.ph.dp;
                 result = duelResult.disLink;
                 deckReserved = false;
-                isFirst = true;
+                //isFirst = true;
                 gameInfo.swaped = false;
                 logicalClearChain();
                 surrended = false;
@@ -3402,8 +3418,6 @@ public class Ocgcore : ServantWithCardDescription
                 cancalable = (r.ReadByte() != 0) || finishable;
                 ES_min = r.ReadByte();
                 ES_max = r.ReadByte();
-                ES_min = finishable ? 0 : 1; // SelectUnselectCard can actually always select 1 card
-                ES_max = 1; // SelectUnselectCard can actually always select 1 card
                 ES_level = 0;
                 count = r.ReadByte();
                 for (int i = 0; i < count; i++)
@@ -3420,12 +3434,13 @@ public class Ocgcore : ServantWithCardDescription
                         allCardsInSelectMessage.Add(card);
                     }
                 }
-                count = r.ReadByte();
-                for (int i = 0; i < count; i++)
+                cardsSelected.Clear();
+                int count2 = r.ReadByte();
+                for (int i = count; i < count + count2; i++)
                 {
                     code = r.ReadInt32();
                     gps = r.ReadGPS();
-                    /*card = GCS_cardGet(gps, false);
+                    card = GCS_cardGet(gps, false);
                     if (card != null)
                     {
                         card.set_code(code);
@@ -3433,16 +3448,24 @@ public class Ocgcore : ServantWithCardDescription
                         card.forSelect = true;
                         card.selectPtr = i;
                         allCardsInSelectMessage.Add(card);
-                    }*/
+                        cardsSelected.Add(card);
+                    }
                 }
                 if (cancalable && !finishable)
                 {
                     gameInfo.addHashedButton("cancleSelected", -1, superButtonType.no, InterString.Get("取消选择@ui"));
                 }
+                if (finishable)
+                {
+                    gameInfo.addHashedButton("sendSelected", 0, superButtonType.yes, InterString.Get("完成选择@ui"));
+                }
                 realizeCardsForSelect();
+                cardsSelected.Clear();
                 if (ES_selectHint != "")
+                    ES_selectUnselectHint = ES_selectHint;
+                if (ES_selectUnselectHint != "")
                 {
-                    gameField.setHint(ES_selectHint + " " + ES_min.ToString() + "-" + ES_max.ToString());
+                    gameField.setHint(ES_selectUnselectHint + " " + ES_min.ToString() + "-" + ES_max.ToString());
                 }
                 else
                 {
@@ -5649,7 +5672,6 @@ public class Ocgcore : ServantWithCardDescription
                         }
                         break;
                     case GameMessage.SelectCard:
-                    case GameMessage.SelectUnselectCard:
                         if (cardsSelectable.Count <= ES_min)
                         {
                             autoSendCards();
@@ -5821,18 +5843,6 @@ public class Ocgcore : ServantWithCardDescription
                 real_send = true;
             }
         }
-        if (currentMessage == GameMessage.SelectUnselectCard)
-        {
-            if (cardsSelected.Count >= ES_min)
-            {
-                sendable = true;
-            }
-            if (cardsSelected.Count == ES_max || cardsSelected.Count == cardsSelectable.Count)
-            {
-                sendable = true;
-                real_send = true;
-            }
-        }
         if (currentMessage == GameMessage.SelectTribute)
         {
             int all = 0;
@@ -5879,7 +5889,7 @@ public class Ocgcore : ServantWithCardDescription
                 }
             }
         }
-        else
+        else if (currentMessage != GameMessage.SelectUnselectCard)
         {
             gameInfo.removeHashedButton("sendSelected");
         }
@@ -8079,6 +8089,8 @@ public class Ocgcore : ServantWithCardDescription
 
     string ES_phaseString = "";
 
+    string ES_selectUnselectHint = "";
+
     void toDefaultHint()
     {
         gameField.setHint(ES_turnString + ES_phaseString);
@@ -8486,7 +8498,6 @@ public class Ocgcore : ServantWithCardDescription
                 }
                 break;
             case GameMessage.SelectCard:
-            case GameMessage.SelectUnselectCard:
             case GameMessage.SelectTribute:
             case GameMessage.SelectSum:
                 if (card.forSelect)
@@ -8527,6 +8538,16 @@ public class Ocgcore : ServantWithCardDescription
                     realizeCardsForSelect();
                 }
                 break;
+            case GameMessage.SelectUnselectCard:
+                if (card.forSelect)
+                {
+                    cardsSelected.Add(card);
+                    gameInfo.removeHashedButton("sendSelected");
+                    sendSelectedCards();
+                    realize();
+                    toNearest();
+                }
+                break;
             case GameMessage.SelectChain:
                 if (card.forSelect)
                 {
@@ -8589,16 +8610,9 @@ public class Ocgcore : ServantWithCardDescription
                     {
                         BinaryMaster binaryMaster = new BinaryMaster();
                         for (int i = 0; i < allCardsInSelectMessage.Count; i++)
-                        {
-                            if (Config.ClientVersion>=0x133d)   
                         {
                             binaryMaster.writer.Write((short)allCardsInSelectMessage[i].counterSELcount);
                         }
-                            else
-                            {
-                                binaryMaster.writer.Write((byte)allCardsInSelectMessage[i].counterSELcount);
-                            }
-                        }
                         sendReturn(binaryMaster.get());
                     }
                     else
@@ -8812,8 +8826,9 @@ public class Ocgcore : ServantWithCardDescription
 
     public Dictionary<int, int> sideReference = new Dictionary<int, int>();
 
-    void onDuelResultConfirmed()
+    public void onDuelResultConfirmed()
     {
+        Program.I().room.joinWithReconnect = false;
 
         if (Program.I().room.duelEnded == true || surrended || TcpHelper.tcpClient == null || TcpHelper.tcpClient.Connected == false)
         {
@@ -8845,7 +8860,23 @@ public class Ocgcore : ServantWithCardDescription
             return;
         }
 
+        //RMSshow_yesOrNoForce(InterString.Get("你确定要投降吗？"), new messageSystemValue { value = "yes", hint = "yes" }, new messageSystemValue { value = "no", hint = "no" });
+        surrended = false;
+        Program.I().room.duelEnded = false;
+        Program.I().room.needSide = false;
+        Program.I().room.sideWaitingObserver = false;
+        onEmergencyExit();
+        return;
+    }
+
+    void onSurrender() {
+        if (Program.I().room.duelEnded == true || surrended || TcpHelper.tcpClient == null || TcpHelper.tcpClient.Connected == false || Program.I().room.needSide == true || condition != Condition.duel)
+        {
+            onDuelResultConfirmed();
+            return;
+        }
         RMSshow_yesOrNoForce(InterString.Get("你确定要投降吗？"), new messageSystemValue { value = "yes", hint = "yes" }, new messageSystemValue { value = "no", hint = "no" });
+        return;
     }
 
     private void sendSorted()

Assets/SibylSystem/Program.cs

@@ -302,7 +302,7 @@ public class Program : MonoBehaviour
         ANDROID_GAME_PATH = jo.Call<string>("GamePath", "/ygocore/");
 
         Screen.sleepTimeout = SleepTimeout.NeverSleep;
-        if (!File.Exists(ANDROID_GAME_PATH + "updates/version2.0.txt"))
+        if (!File.Exists(ANDROID_GAME_PATH + "updates/version2.2.txt"))
         {
             string filePath = Application.streamingAssetsPath + "/ygocore.zip";
             var www = new WWW(filePath);
@@ -327,7 +327,7 @@ public class Program : MonoBehaviour
 
 #elif UNITY_IPHONE //iPhone
         string GamePaths = Application.persistentDataPath + "/ygopro2/";
-        if (!File.Exists(GamePaths + "updates/version2.0.txt"))
+        if (!File.Exists(GamePaths + "updates/version2.2.txt"))
         {
                 string filePath = Application.streamingAssetsPath + "/ygocore.zip";
                 ExtractZipFile(System.IO.File.ReadAllBytes(filePath), GamePaths);
@@ -350,17 +350,38 @@ public class Program : MonoBehaviour
             InterString.initialize("config/translation.conf");
             GameTextureManager.initialize();
             Config.initialize("config/config.conf");
-            GameStringManager.initialize("strings.conf");//YGOMobile Paths
+            if (File.Exists("cdb/cards.cdb"))
+            {
+                YGOSharp.CardsManager.initialize("cdb/cards.cdb");
+            }
             if (File.Exists("cdb/strings.conf"))
             {
                 GameStringManager.initialize("cdb/strings.conf");
             }
-            if (File.Exists("expansions/strings.conf"))
+            if (File.Exists("cdb/lflist.conf"))
             {
-                GameStringManager.initialize("expansions/strings.conf");
+                YGOSharp.BanlistManager.initialize("cdb/lflist.conf");
             }
+            if (File.Exists("strings.conf"))
+            {
+                GameStringManager.initialize("strings.conf");//YGOMobile Paths
+            }
+            if (File.Exists("lflist.conf"))
+            {
                 YGOSharp.BanlistManager.initialize("lflist.conf");//YGOMobile Paths
+            }
+            if (File.Exists("cards.cdb"))
+            {
                 YGOSharp.CardsManager.initialize("cards.cdb");//YGOMobile Paths
+            }
+            if (File.Exists("expansions/lflist.conf"))
+            {
+                YGOSharp.BanlistManager.initialize("expansions/lflist.conf");
+            }
+            if (File.Exists("expansions/strings.conf"))
+            {
+                GameStringManager.initialize("expansions/strings.conf");
+            }
 
             if (Directory.Exists("expansions"))
             {
@@ -480,10 +501,21 @@ public class Program : MonoBehaviour
     {
         try
         {
+            if(!Directory.Exists("cdb")) {
+                Directory.CreateDirectory("cdb");
+            }
+
+            /*if(File.Exists("cdb/cards.cdb"))
+                File.Delete("cdb/cards.cdb");
+            if(File.Exists("cdb/lflist.conf"))
+                File.Delete("cdb/lflist.conf");
+            if(File.Exists("cdb/strings.conf"))
+                File.Delete("cdb/strings.conf");*/
+
             HttpDldFile httpDldFile = new HttpDldFile();
-            httpDldFile.Download("http://koishi.222diy.gdn/ygopro/cards.cdb", Path.Combine("cdb/", "cards.cdb"));
-            httpDldFile.Download("http://koishi.222diy.gdn/ygopro/lflist.conf", Path.Combine("config/", "lflist.conf"));
-            httpDldFile.Download("http://koishi.222diy.gdn/ygopro/strings.conf", Path.Combine("config/", "strings.conf"));
+            httpDldFile.Download("http://koishi.222diy.gdn/ygopro/cards.cdb", "cdb/cards.cdb");
+            httpDldFile.Download("http://koishi.222diy.gdn/ygopro/lflist.conf", "cdb/lflist.conf");
+            httpDldFile.Download("http://koishi.222diy.gdn/ygopro/strings.conf", "cdb/strings.conf");
         }
         catch (Exception e)
         {

Assets/SibylSystem/ResourceManagers/GameTextureManager.cs

@@ -190,7 +190,7 @@ public class GameTextureManager
 
     public static Texture2D phase = null;
 
-    public static bool AutoPicDownload=true;
+    public static bool AutoPicDownload;
 
     public static Texture2D rs = null;
 
@@ -817,8 +817,8 @@ public class GameTextureManager
             if (!File.Exists(path) && pic.code != 0 && AutoPicDownload)
             {
                 //YGOMobile (177x254)
-                df.Download("http://koishi.222diy.gdn/smallpics/" + pic.code.ToString() + ".jpg", "expansions/pics/" + pic.code.ToString() + ".jpg");
-                path = "expansions/pics/" + pic.code.ToString() + ".jpg";
+                df.Download("http://koishi.222diy.gdn/ygopro/pics/" + pic.code.ToString() + ".jpg", "picture/card/" + pic.code.ToString() + ".jpg");
+                path = "picture/card/" + pic.code.ToString() + ".jpg";
             }
             /*if (!File.Exists(path) && pic.code != 0 && AutoPicDownload)
             {

Assets/SibylSystem/ResourceManagers/HttpDldFile.cs

@@ -32,6 +32,14 @@ public class HttpDldFile
                 {
                     client.Timeout = 3500;
                 }
+                if (Path.GetExtension(filename).Contains("cdb"))
+                {
+                    client.Timeout = 15000;
+                }
+                if (Path.GetExtension(filename).Contains("conf"))
+                {
+                    client.Timeout = 3000;
+                }
                 client.DownloadFile(new Uri(url), filename + ".tmp");
             }
             flag = true;

Assets/SibylSystem/Room/Room.cs

@@ -497,6 +497,7 @@ public class Room : WindowServantSP
 
         Program.I().ocgcore.returnServant = Program.I().selectServer;
         needSide = false;
+        joinWithReconnect = true;
         if (Program.I().deckManager.isShowed)
         {
             Program.I().deckManager.hide();
@@ -524,6 +525,9 @@ public class Room : WindowServantSP
         is_host = ((type >> 4) & 0xf) != 0;
         if (is_host)
         {
+            if (selftype < 4 && roomPlayers[selftype] != null) {
+                roomPlayers[selftype].prep = false;
+            }
             UIHelper.shiftButton(startButton(), true);
             lazyRoom.start.localScale = Vector3.one;
             lazyRoom.duelist.localPosition = new Vector3(lazyRoom.duelist.localPosition.x, -94.2f, 0);
@@ -570,12 +574,16 @@ public class Room : WindowServantSP
 
     public bool needSide = false;
 
+    public bool joinWithReconnect = false;
+
     public void StocMessage_ChangeSide(BinaryReader r)
     {
         Program.I().ocgcore.surrended = false;
         Program.I().ocgcore.returnServant = Program.I().deckManager;
         needSide = true;
-        
+        if(Program.I().ocgcore.condition != Ocgcore.Condition.duel || joinWithReconnect) { //Change side when reconnect
+            Program.I().ocgcore.onDuelResultConfirmed();
+        }
     }
 
     GameObject handres = null;
@@ -741,7 +749,7 @@ public class Room : WindowServantSP
                 code = r.ReadInt32();
                 string hexOutput = "0x"+String.Format("{0:X}", code);
                 Program.I().selectServer.set_version(hexOutput);
-                RMSshow_none(InterString.Get("你输入的版本号和服务器不一致,[7CFC00]YGOPro2已经智能切换版本号[-]，请重新链接。"));
+                RMSshow_none(InterString.Get("你输入的版本号和服务器不一致,[7CFC00]KoishiPro2已经智能切换版本号[-]，请重新链接。"));
                 break;
             default:
                 break;

Assets/SibylSystem/Room/RoomList.cs

@@ -111,8 +111,8 @@ public class RoomList : WindowServantSP
         string versionString = UIHelper.getByName<UIInput>(Program.I().selectServer.gameObject, "version_").value;
         if (versionString == "")
         {
-            UIHelper.getByName<UIInput>(Program.I().selectServer.gameObject, "version_").value = "0x1348";
-            versionString = "0x1348";
+            UIHelper.getByName<UIInput>(Program.I().selectServer.gameObject, "version_").value = "0x1349";
+            versionString = "0x1349";
         }
         Program.I().roomList.hide();
         Program.I().selectServer.KF_onlineGame(Name, ipString, portString, versionString, pswString);

Assets/SibylSystem/Setting/Setting.cs

@@ -52,7 +52,7 @@ public class Setting : WindowServant2D
         {
             if (collection[i].name.Length > 0 && collection[i].name[0] == '*')
             {
-                if (collection[i].name == "*mouseParticle" || collection[i].name == "*showOff" || collection[i].name == "*Efield")
+                if (collection[i].name == "*mouseParticle" || collection[i].name == "*showOff" || collection[i].name == "*Efield" || collection[i].name == "*AutoPicDownload")
                 {
                     collection[i].value = UIHelper.fromStringToBool(Config.Get(collection[i].name, "1"));
                 }

Assets/SibylSystem/selectServer/SelectServer.cs

@@ -164,8 +164,8 @@ public class SelectServer : WindowServantSP
         string versionString = UIHelper.getByName<UIInput>(gameObject, "version_").value;
         if (versionString == "")
         {
-            UIHelper.getByName<UIInput>(gameObject, "version_").value = "0x1348";
-            versionString = "0x1348";
+            UIHelper.getByName<UIInput>(gameObject, "version_").value = "0x1349";
+            versionString = "0x1349";
         }
         KF_onlineGame(Name, ipString, portString, versionString, pswString);
     }

Assets/YGOSharp/CardsManager.cs

@@ -19,17 +19,13 @@ namespace YGOSharp
         {
             nullName = InterString.Get("未知卡片");
             nullString = "";
-            nullString += "欢迎使用：\r\nYGOPro2 For Android";
+            nullString += "欢迎使用 KoishiPro2 iOS，本软件免责声明：[url=http://koishi.222diy.gdn/lab.html][u]http://koishi.222diy.gdn/lab.html[/u][/url]";
             nullString += "\r\n\r\n";
-            nullString += "源码：";
-            nullString += "\r\n「Android」\r\n[url=https://github.com/purerosefallen/ygopro2][u]https://github.com/purerosefallen/ygopro2[/u][/url]";
-            //nullString += "\r\nWindows：[url=https://github.com/lllyasviel/YGOProUnity_V2][u]https://github.com/lllyasviel/YGOProUnity_V2[/u][/url]";
-            //nullString += "\r\n\r\n「Windows」\r\n[url=https://github.com/mercury233/ygopro2][u]https://github.com/mercury233/ygopro2[/u][/url]";
-            nullString += "\r\n\r\n\r\n";
-            //nullString += "欢迎加入QQ群：";
-            //nullString += "\r\n①：[url=https://jq.qq.com/?_wv=1027&k=5nq6xJe][u]649612818[/u][/url]";
-            //nullString += "\r\n③：[url=https://jq.qq.com/?_wv=1027&k=50MZVQA][u]831010207[/u][/url]";
-            //nullString += "\r\n②：[url=https://jq.qq.com/?_wv=1027&k=5idyod3][u]559276772[/u][/url]";
+            nullString += "KoishiPro2 iOS的用户QQ群627975038，游戏中遇到任何bug欢迎提交";
+            nullString += "\r\n\r\n";
+            nullString += "更多关于电脑/安卓版KoishiPro及7210服务器的信息可加QQ群338443272";
+            nullString += "\r\n\r\n";
+            nullString += "喜欢游戏王DIY的朋友欢迎来222服QQ群642043095";
             using (SqliteConnection connection = new SqliteConnection("Data Source=" + databaseFullPath))
             {
                 connection.Open();

Assets/YGOSharp/Enums/Query.cs

@@ -23,6 +23,7 @@
         Owner = 0x40000,
         Status = 0x80000,
         LScale = 0x200000,
-        RScale = 0x400000
+        RScale = 0x400000,
+        Link = 0x800000
     }
 }