up

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

@@ -124,6 +124,7 @@ function CLLPStart.onLoadPanelAfter(p)
     local count = #(lateLoadPanels)
     if (panelIndex >= count) then
         --已经加载完
+        isLogined = true
         CLLPStart.connectServer()
     end
 end
@@ -144,10 +145,11 @@ function CLLPStart.connectServer()
     -- showHotWheel()
     -- Net.self:connect(selectedServer.host, bio2number(selectedServer.port))
 
+    isLogined = true
     NetProto.init(
         function(success)
             if success then
-                CLLPStart.doEnterGame()
+                CLLPStart.showGuid()
             else
                 CLUIUtl.showConfirm(
                     "与服务器失去联系",
@@ -232,6 +234,14 @@ function CLLPStart.doEnterGame()
     end
 end
 
+CLLPStart.showGuid = function()
+    if Prefs.getShowGuid() then
+        getPanelAsy("PanelGuid", onLoadedPanelTT, CLLPStart.doEnterGame)
+    else
+        CLLPStart.doEnterGame()
+    end
+end
+
 CLLPStart.hideSplash = function()
     local p2 = CLPanelManager.getPanel("PanelSplash")
     if (p2 ~= nil) then