upgrade

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua

@@ -153,26 +153,22 @@ function CLLPStart.connectServer()
     -- Net.self:connect(selectedServer.host, bio2number(selectedServer.port))
 
     isLogined = true
-    CLLPStart.selectServer(
-        function()
-            NetProto.init(
-                function(success)
-                    if success then
-                        CLLPStart.showGuid()
-                    else
-                        CLUIUtl.showConfirm(
-                            "与服务器失去联系",
-                            false,
-                            "重试",
-                            CLLPStart.connectServer,
-                            "退出",
-                            function()
-                                Application.Quit()
-                            end
-                        )
+    NetProto.init(
+        function(success)
+            if success then
+                CLLPStart.showGuid()
+            else
+                CLUIUtl.showConfirm(
+                    "与服务器失去联系",
+                    false,
+                    "重试",
+                    CLLPStart.connectServer,
+                    "退出",
+                    function()
+                        Application.Quit()
                     end
-                end
-            )
+                )
+            end
         end
     )
 end
@@ -266,25 +262,6 @@ CLLPStart.showGuid = function()
     end
 end
 
-CLLPStart.selectServer = function(callback)
-    local userName = Prefs.getUserName()
-    if isNilOrEmpty(userName) then
-        Utl.doCallback(callback)
-        return
-    end
-
-    DBUser.isWhiteUser(
-        userName,
-        function(iswhite)
-            if iswhite then
-                getPanelAsy("PanelSelectServer", onLoadedPanelTT, {callback = callback})
-            else
-                Utl.doCallback(callback)
-            end
-        end
-    )
-end
-
 CLLPStart.hideSplash = function()
     local p2 = CLPanelManager.getPanel("PanelSplash")
     if (p2 ~= nil) then