rm

Assets/Plugins/System.Web.Extensions.dll.meta

-fileFormatVersion: 2
-guid: b10274a215435d242a8dbfe97336d0c3
-timeCreated: 1481637487
-licenseType: Pro
-PluginImporter:
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    data:
-      first:
-        Any: 
-      second:
-        enabled: 1
-        settings: {}
-    data:
-      first:
-        Editor: Editor
-      second:
-        enabled: 0
-        settings:
-          DefaultValueInitialized: true
-    data:
-      first:
-        Windows Store Apps: WindowsStoreApps
-      second:
-        enabled: 0
-        settings:
-          CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/SibylSystem/Menu/Menu.cs

@@ -95,7 +95,7 @@ public class Menu : WindowServantSP
         Program.I().quit();
         Program.Running = false;
         TcpHelper.SaveRecord();
-#if !UNITY_EDITOR || UNITY_ANDROID // IL2CPP 使用此方法才能退出
+#if !UNITY_EDITOR || UNITY_ANDROID || UNITY_IPHONE // IL2CPP 使用此方法才能退出
         Application.Quit();
 #elif
         Process.GetCurrentProcess().Kill();
@@ -134,11 +134,11 @@ public class Menu : WindowServantSP
 
     void onClickJoinQQ()
     {
-#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
-        Application.OpenURL("https://jq.qq.com/?_wv=1027&k=50MZVQA");
-#elif UNITY_ANDROID //Android
+#if !UNITY_EDITOR || UNITY_ANDROID //Android
         AndroidJavaObject jo = new AndroidJavaObject("cn.unicorn369.library.API");
         jo.Call("doJoinQQGroup", "UHm3h3hSrmgp-iYqMiZcc2zO5J1Q8OyW");
+#elif
+        Application.OpenURL("https://jq.qq.com/?_wv=1027&k=50MZVQA");
 #endif
     }
 

Assets/SibylSystem/Program.cs

@@ -355,7 +355,6 @@ public class Program : MonoBehaviour
         });
         go(300, () =>
         {
-            //UpdateClient();
             InterString.initialize("config" + AppLanguage.LanguageDir() + "/translation.conf");   //System Language
             GameTextureManager.initialize();
             Config.initialize("config/config.conf");
@@ -502,71 +501,6 @@ public class Program : MonoBehaviour
             }
         }
     }
-    private void UpdateClient()
-    {
-        try
-        {
-            WWW w = new WWW("https://api.github.com/repos/szefo09/updateYGOPro2/contents/");
-            while (!w.isDone)
-            {
-                if (Application.internetReachability == NetworkReachability.NotReachable || !string.IsNullOrEmpty(w.error))
-                {
-                    throw new Exception("No Internet connection!");
-                }
-            }
-            List<ApiFile> toDownload = new List<ApiFile>();
-            List<ApiFile> apiFromGit = new System.Web.Script.Serialization.JavaScriptSerializer().Deserialize<List<ApiFile>>(w.text);
-            if (!File.Exists("updates/SHAs.txt"))
-            {
-                Directory.CreateDirectory("updates");
-                toDownload.AddRange(apiFromGit);
-            }
-
-            if (File.Exists("updates/SHAs.txt"))
-            {
-                List<ApiFile> local = new System.Web.Script.Serialization.JavaScriptSerializer().Deserialize<List<ApiFile>>(File.ReadAllText("updates/SHAs.txt"));
-                foreach (ApiFile file in apiFromGit)
-                {
-                    if (local.FirstOrDefault(x => x.name == file.name)==null || file.sha != local.FirstOrDefault(x => x.name == file.name).sha)
-                    {
-                        toDownload.Add(file);
-                    }
-                }
-                foreach (ApiFile f in local)
-                {
-                    if (apiFromGit.FirstOrDefault(x => x.name == f.name) == null || f.name != apiFromGit.FirstOrDefault(x => x.name == f.name).name)
-                    {
-                        if (File.Exists("cdb/" + f.name))
-                        {
-                            File.Delete("cdb/" + f.name);
-                        }
-                        if (File.Exists("config/" + f.name))
-                        {
-                            File.Delete("config/" + f.name);
-                        }
-
-                    }
-                }
-            }
-            HttpDldFile httpDldFile = new HttpDldFile();
-            foreach (var dl in toDownload)
-            {
-                if (Path.GetExtension(dl.name) == ".cdb" && !(Application.internetReachability == NetworkReachability.NotReachable))
-                {
-                    httpDldFile.Download(dl.download_url, Path.Combine("cdb/", dl.name));
-                }
-                if (Path.GetExtension(dl.name) == ".conf" && !(Application.internetReachability == NetworkReachability.NotReachable))
-                {
-                    httpDldFile.Download(dl.download_url, Path.Combine("config/", dl.name));
-                }
-            }
-            File.WriteAllText("updates/SHAs.txt", w.text);
-        }
-        catch (Exception e)
-        {
-            File.Delete("updates/SHAs.txt");
-        }
-    }
 
     public GameObject mouseParticle;
 
@@ -1266,26 +1200,5 @@ public class Program : MonoBehaviour
     {
         PrintToChat(InterString.Get("非常抱歉，因为技术原因，此功能暂时无法使用。请关注官方网站获取更多消息。"));
     }
-    //递归创建目录
-    private static void DirPaths(string filefullpath)
-    {
-        if (!File.Exists(filefullpath))
-        {
-            string dirpath = filefullpath.Substring(0, filefullpath.LastIndexOf("/"));
-            string[] paths = dirpath.Split("/");
-            if (paths.Length > 1)
-            {
-                string path = paths[0];
-                for (int i = 1; i < paths.Length; i++)
-                {
-                    path += "/" + paths[i];
-                    if (!Directory.Exists(path))
-                    {
-                        Directory.CreateDirectory(path);
-                    }
-                }
-            }
-        }
-    }
 
 }

Assets/SibylSystem/ResourceManagers/ApiFile.cs

-public class Links
-{
-    public string self { get; set; }
-    public string git { get; set; }
-    public string html { get; set; }
-}
-
-public class ApiFile
-{
-    public string name { get; set; }
-    public string path { get; set; }
-    public string sha { get; set; }
-    public int size { get; set; }
-    public string url { get; set; }
-    public string html_url { get; set; }
-    public string git_url { get; set; }
-    public string download_url { get; set; }
-    public string type { get; set; }
-    public Links _links { get; set; }
-}
\ No newline at end of file

Assets/SibylSystem/ResourceManagers/ApiFile.cs.meta

-fileFormatVersion: 2
-guid: 40ff7876fde6c9c4982e888bf428b76e
-timeCreated: 1547757047
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/SibylSystem/ResourceManagers/HttpDldFile.cs

@@ -19,7 +19,10 @@ public class HttpDldFile
             {
                 Directory.CreateDirectory(Path.GetDirectoryName(filename));
             }
-
+            if (File.Exists(filename + ".tmp"))
+            {
+                File.Delete(filename + ".tmp");
+            }
             using (var client = new TimeoutWebClient())
             {
                 ServicePointManager.ServerCertificateValidationCallback = MyRemoteCertificateValidationCallback;

Assets/transUI/prefab/trans_roomSingle.prefab

@@ -1050,7 +1050,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 117994}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 166, y: 41, z: 0}
+  m_LocalPosition: {x: 166, y: 42, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 453502}
@@ -1429,10 +1429,10 @@ Transform:
   - {fileID: 400648}
   - {fileID: 488322}
   - {fileID: 445046}
-  - {fileID: 484798}
-  - {fileID: 465104}
   - {fileID: 485342}
+  - {fileID: 465104}
   - {fileID: 4511999061189684}
+  - {fileID: 484798}
   - {fileID: 453502}
   - {fileID: 455356}
   - {fileID: 400318}
@@ -1589,7 +1589,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 112266}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 445.95, y: -120, z: 0}
+  m_LocalPosition: {x: 250, y: -200, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 409896}
@@ -1729,7 +1729,7 @@ Transform:
   - {fileID: 467750}
   - {fileID: 475628}
   m_Father: {fileID: 451664}
-  m_RootOrder: 3
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &485054
 Transform:
@@ -1751,13 +1751,13 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 188422}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 445.95, y: -80, z: 0}
+  m_LocalPosition: {x: 250, y: -160, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 410540}
   - {fileID: 451416}
   m_Father: {fileID: 451664}
-  m_RootOrder: 5
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &486866
 Transform:
@@ -3070,7 +3070,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3012
+  startingRenderQueue: 3024
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 1
@@ -3302,7 +3302,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 54
+  aspectRatio: 6
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
   mFont: {fileID: 0}
@@ -3460,7 +3460,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3011
+  startingRenderQueue: 3023
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 1
@@ -4175,7 +4175,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3001
+  startingRenderQueue: 3009
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 4
@@ -4483,7 +4483,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3011
+  startingRenderQueue: 3023
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 1
@@ -5499,7 +5499,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3010
+  startingRenderQueue: 3022
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 1
@@ -5849,13 +5849,13 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1238559612182500}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 250, y: -280, z: 0}
+  m_LocalPosition: {x: 445.95, y: -200, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4556926232661520}
   - {fileID: 4585612933708238}
   m_Father: {fileID: 451664}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4556926232661520
 Transform:
@@ -6046,7 +6046,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3009
+  startingRenderQueue: 3018
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3

Assets/transUI/prefab/trans_roomTag.prefab

@@ -1329,7 +1329,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 194540}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 166, y: 42, z: 0}
+  m_LocalPosition: {x: 166, y: 43, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 455356}
@@ -1424,10 +1424,10 @@ Transform:
   - {fileID: 480264}
   - {fileID: 427814}
   - {fileID: 476912}
-  - {fileID: 484798}
-  - {fileID: 465104}
   - {fileID: 485342}
+  - {fileID: 465104}
   - {fileID: 4861700506703376}
+  - {fileID: 484798}
   - {fileID: 4068840967973514}
   m_Father: {fileID: 427332}
   m_RootOrder: 0
@@ -1589,7 +1589,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 112266}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 445.95, y: -120, z: 0}
+  m_LocalPosition: {x: 250, y: -200, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 409896}
@@ -1742,7 +1742,7 @@ Transform:
   - {fileID: 467750}
   - {fileID: 475628}
   m_Father: {fileID: 451664}
-  m_RootOrder: 11
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &485054
 Transform:
@@ -1764,13 +1764,13 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 188422}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 445.95, y: -80, z: 0}
+  m_LocalPosition: {x: 250, y: -160, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 410540}
   - {fileID: 451416}
   m_Father: {fileID: 451664}
-  m_RootOrder: 13
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &488322
 Transform:
@@ -3085,7 +3085,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3012
+  startingRenderQueue: 3021
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 1
@@ -3475,7 +3475,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3011
+  startingRenderQueue: 3020
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 1
@@ -4448,7 +4448,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3013
+  startingRenderQueue: 3024
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 1
@@ -5499,7 +5499,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3010
+  startingRenderQueue: 3019
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 1
@@ -5889,13 +5889,13 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1073799502854010}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 250, y: -280, z: 0}
+  m_LocalPosition: {x: 445.95, y: -200, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4653350655704036}
   - {fileID: 4771281691859354}
   m_Father: {fileID: 451664}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &65087089135282972
 BoxCollider:
@@ -6410,7 +6410,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3009
+  startingRenderQueue: 3017
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3

Assets/transUI/prefab/trans_setting.prefab

@@ -18494,7 +18494,7 @@ Transform:
   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_LocalPosition: {x: 15, y: 245, z: 0}
   m_LocalScale: {x: 0.99846995, y: 0.99846995, z: 0.99846995}
   m_Children:
   - {fileID: 4230898429811844}
@@ -18578,7 +18578,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1409564597213602}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 15, y: 245, z: 0}
+  m_LocalPosition: {x: 15, y: 215, z: 0}
   m_LocalScale: {x: 0.99846995, y: 0.99846995, z: 0.99846995}
   m_Children:
   - {fileID: 4972888354459798}
@@ -19712,7 +19712,7 @@ MonoBehaviour:
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
   mFont: {fileID: 0}
-  mText: "\u81EA\u52A8\u4E0B\u8F7D\u7F3A\u5931\u5361\u56FE"
+  mText: "\u81EA\u52A8\u4E0B\u8F7D\u5361\u56FE\u548C\u65B0\u5361"
   mFontSize: 18
   mFontStyle: 0
   mAlignment: 0
@@ -19877,7 +19877,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 10
+  aspectRatio: 12.25
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
   mFont: {fileID: 0}

ProjectSettings/ProjectSettings.asset

@@ -537,6 +537,7 @@ PlayerSettings:
   platformArchitecture:
     iOS: 2
   scriptingBackend:
+    Android: 1
     Metro: 2
     Standalone: 0
     WP8: 2