适配抖音云启动

Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/ShowLoginUIEventHandle.cs

@@ -14,29 +14,84 @@ namespace ET.Client
         private string mIP;
         private int mPort;
         private string strRoomToken;
+        private bool bEnd = false;
+
+        private bool bIsCloud = false;
+        private bool bIsMobile = false;
+        private bool bIsFullScreen = false;
+        private int iScreenHeight = 0;
+        private int iScreenWidth = 0;
 
         protected override async ETTask OnEvent(ShowLoginUIEvent a)
+        {
+            InitArgs();
+            UIHelper.RemoveAllUiExceptSth();
+            UIPackage.RemovePackage("CheckForResUpdate");
+
+            var view = await UIHelper.Create( "Login" );
+            InitLogin( view ).Coroutine();
+        }
+
+        private void InitArgs()
         {
             var args = Environment.GetCommandLineArgs();
             for (var i = 0; i < args.Length; i++)
             {
-                Log.Debug("args: " + args[i]);
-                if (args[i].StartsWith("-token="))
+                var arg = args[i];
+                bool hasNext = args.Length > i + 1;
+
+                if (arg.StartsWith("-token="))
                 {
                     strRoomToken = args[i][7..];
                     Log.Debug($"env token: {strRoomToken}");
-                    break;
+                    continue;
+                }
+                switch(arg)
+                {
+                    case "-cloud-game":
+                        bIsCloud = hasNext && args[i + 1] == "1";
+                        Log.Debug($"args: -cloud-game: {bIsCloud}");
+                        ++i;
+                        break;
+                    case "-mobile":
+                        bIsMobile = hasNext && args[i + 1] == "1";
+                        Log.Debug($"args: -mobile: {bIsMobile}");
+                        ++i;
+                        break;
+                    case "-screen-fullscreen":
+                        bIsFullScreen = hasNext && args[i + 1] == "1";
+                        Log.Debug($"args: -screen-fullscreen: {bIsFullScreen}");
+                        ++i;
+                        break;
+                    case "-screen-height":
+                        try
+                        {
+                            if(hasNext)
+                            {
+                                iScreenHeight = int.Parse(args[i + 1]);
+                                Log.Debug($"args: -screen-height: {iScreenHeight}");
+                            }
+                        }
+                        catch { }
+                        ++i;
+                        break;
+                    case "-screen-width":
+                        try
+                        {
+                            if (hasNext)
+                            {
+                                iScreenWidth = int.Parse(args[i + 1]);
+                                Log.Debug($"args: -screen-width: {iScreenWidth}");
+                            }
+                        }
+                        catch { }
+                        ++i;
+                        break;
                 }
             }
-
-            UIHelper.RemoveAllUiExceptSth();
-
-            var view = await UIHelper.Create( "Login" );
-            InitLogin( view ).Coroutine();
-
-            UIPackage.RemovePackage( "CheckForResUpdate" );
         }
 
+
         private void InitServerList(GComboBox list)
         {
             var saveip = GameSetting.Instance.GetString(GameSetting.Sets.Server_str);
@@ -93,15 +148,20 @@ namespace ET.Client
                 mIP = info.Ip;
                 mPort = info.Port;
             });
+            list.visible = false;
         }
 
         private void InitResolutionList(GComboBox list)
         {
-#if UNITY_EDITOR             
-            list.visible = false;
-#elif UNITY_STANDALONE
-            list.visible = true;
-            int val = GameSetting.Instance.GetInt(GameSetting.Sets.Resolution_int, 0);
+            list.visible = !bIsCloud;
+            if(bIsFullScreen)
+            {
+                if(iScreenHeight == 0) iScreenHeight = Screen.height;
+                if(iScreenWidth == 0) iScreenWidth = iScreenHeight * 9 / 16;
+                Log.Debug($"fullscreen : {iScreenWidth}X{iScreenHeight}");
+            }
+            
+            int val = GameSetting.Instance.GetInt(GameSetting.Sets.Resolution_int, iScreenHeight);
             int select = -1;
             List<string> showlist = new();
             foreach (var info in ResolutionInfo.ResolutionList)
@@ -117,9 +177,6 @@ namespace ET.Client
             {
                 select = 0;
             }
-            var cur = ResolutionInfo.ResolutionList[select];
-            Screen.SetResolution(cur.X, cur.Y, false);
-            Log.Debug($"Default resolution x:{cur.X}, y:{cur.Y}");
 
             list.items = showlist.ToArray();
             list.selectedIndex = select;
@@ -131,7 +188,29 @@ namespace ET.Client
                 Screen.SetResolution(info.X, info.Y, false);
                 Log.Debug($"SetResolution x:{info.X}, y:{info.Y}");
             });
-#endif
+
+            if (iScreenWidth == 0 || iScreenHeight == 0)
+            {
+                var cur = ResolutionInfo.ResolutionList[select];
+                iScreenWidth = cur.X;
+                iScreenHeight = cur.Y;
+            }
+
+            Screen.SetResolution(iScreenWidth, iScreenHeight, bIsFullScreen);
+        }
+
+        private async ETTask FakeUpdate(GComboBox listsvr, GComboBox listResolution)
+        {
+            while(!bEnd)
+            {
+                await TimerComponent.Instance.WaitAsync(100);
+                if(Input.GetKey(KeyCode.F11))
+                {
+                    listsvr.visible = true;
+                    listResolution.visible = true;
+                    break;
+                }
+            }
         }
 
         private async ETTask InitLogin(GComponent view)
@@ -141,17 +220,11 @@ namespace ET.Client
             var listResolution = view.GetChild("listResolution").asComboBox;
             InitServerList(listSvr);
             InitResolutionList(listResolution);
+            FakeUpdate(listSvr, listResolution).Coroutine();
 
             var tips = comp.GetChild( "txt_tips" );
             var inputID = comp.GetChild("txtID").asTextInput;
             var imgtips = comp.GetChild("img_tips");
-            /*var roomid = GameSetting.Instance.GetInt( GameSetting.Sets.TiktokRoomId_int );
-            if(roomid > 0 )
-            {
-                inputID.text = roomid.ToString();
-            }
-            inputID.onChanged.Set( () => { tips.visible = false; } );*/
-
             inputID.text = strRoomToken;
             var btn = comp.GetChild("btn_go").asButton;
             btn.onClick.Add(async () =>
@@ -178,9 +251,11 @@ namespace ET.Client
                                     "\n抖音:[color=#FF0000]奥陌陌网络科技[/color]" +
                                     "\n微信：[color=#FF0000]omm_wh[/color]";
                     }
+                    listSvr.visible = true;
                 }
                 else
                 {
+                    bEnd = true;
                     imgtips.visible = false;
                 }
             });
@@ -193,11 +268,11 @@ namespace ET.Client
                             "\n抖音:[color=#FF0000]奥陌陌网络科技[/color]" +
                             "\n微信：[color=#FF0000]omm_wh[/color]";
             }
-            else
-            {
-                await TimerComponent.Instance.WaitAsync(500);
-                btn.FireClick(false, true);
-            }
+            //else if(bIsFullScreen || bIsCloud)
+            //{
+            //    await TimerComponent.Instance.WaitAsync(1000);
+            //    btn.FireClick(false, true);
+            //}
         }
     }
 }

Unity/Assets/Scripts/Codes/Model/Client/Login/ServerInfo.cs

@@ -14,6 +14,11 @@ namespace ET.Client
         static ServerInfo()
         {
             ServerList = new(){
+                new ServerInfo{
+                    ShowName = "git 1",
+                    Ip = "47.122.5.112",
+                    Port = 30300
+                },
                 new ServerInfo{
                     ShowName = "本地[localhost:30300]",
                     Ip = "127.0.0.1",
@@ -29,11 +34,6 @@ namespace ET.Client
                     Ip = "192.168.0.102",
                     Port = 30300
                 },
-                new ServerInfo{
-                    ShowName = "外网[47.122.5.112:30300]",
-                    Ip = "47.122.5.112",
-                    Port = 30300
-                },
             };
         }
     }

Unity/Assets/Scripts/Codes/Model/Client/ResolutionInfo.cs

@@ -9,11 +9,17 @@
     {
         ResolutionList = new ResolutionInfo[]
         {
+             new ResolutionInfo
+            {
+                ShowName = "1080p-横屏",
+                X = 608,
+                Y = 1080,
+            },
             new ResolutionInfo
             {
-                ShowName = "4K",
-                X = 1125,
-                Y = 2000
+                ShowName = "1080p-竖屏",
+                X = 1080,
+                Y = 1920,
             },
             new ResolutionInfo
             {
@@ -23,9 +29,9 @@
             },
             new ResolutionInfo
             {
-                ShowName = "1080p",
-                X = 540,
-                Y = 960,
+                ShowName = "4K",
+                X = 1125,
+                Y = 2000
             },
         };
     }